diff -Nru sushi-1.4.0+git20160822+dfsg/debian/changelog sushi-1.4.0+git20160822+dfsg/debian/changelog --- sushi-1.4.0+git20160822+dfsg/debian/changelog 2017-03-20 22:22:18.000000000 +0000 +++ sushi-1.4.0+git20160822+dfsg/debian/changelog 2018-02-22 16:55:33.000000000 +0000 @@ -1,3 +1,10 @@ +sushi (1.4.0+git20160822+dfsg-4+rpi1) buster-staging; urgency=medium + + * Add fix for MINIUPNPC_API_VERSION 14, thanks to nanard for the suggestion + that the patch is based on. (Closes: 889055) + + -- Peter Michael Green Thu, 22 Feb 2018 16:55:33 +0000 + sushi (1.4.0+git20160822+dfsg-4) unstable; urgency=medium * Revert following change introduced in 1.4.0+git20160822+dfsg-3, it diff -Nru sushi-1.4.0+git20160822+dfsg/debian/patches/miniupnpc-api-14.diff sushi-1.4.0+git20160822+dfsg/debian/patches/miniupnpc-api-14.diff --- sushi-1.4.0+git20160822+dfsg/debian/patches/miniupnpc-api-14.diff 1970-01-01 00:00:00.000000000 +0000 +++ sushi-1.4.0+git20160822+dfsg/debian/patches/miniupnpc-api-14.diff 2018-02-22 16:55:33.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Add fix for MINIUPNPC_API_VERSION 14 + thanks to nanard for the suggestion + that the patch is based on. +Author: Peter Michael Green +Bug-Debian: https://bugs.debian.org/889055 + +--- sushi-1.4.0+git20160822+dfsg.orig/maki/source/plugins/upnp.c ++++ sushi-1.4.0+git20160822+dfsg/maki/source/plugins/upnp.c +@@ -267,8 +267,11 @@ init (void) + gchar addr[64] = { '\0' }; + #ifdef HAVE_MINIUPNPC_16 + gint error; +- ++#if defined(MINIUPNPC_API_VERSION) && (MINIUPNPC_API_VERSION >= 14) ++ miniupnpc_dev = upnpDiscover(1000, NULL, NULL, 0, 0, 2, &error); /* use default TTL of 2 */ ++#else + miniupnpc_dev = upnpDiscover(1000, NULL, NULL, 0, 0, &error); ++#endif + #else + miniupnpc_dev = upnpDiscover(1000, NULL, NULL, 0); + #endif diff -Nru sushi-1.4.0+git20160822+dfsg/debian/patches/series sushi-1.4.0+git20160822+dfsg/debian/patches/series --- sushi-1.4.0+git20160822+dfsg/debian/patches/series 2017-03-18 15:37:47.000000000 +0000 +++ sushi-1.4.0+git20160822+dfsg/debian/patches/series 2018-02-22 16:55:33.000000000 +0000 @@ -2,3 +2,4 @@ nigiri-00-fix-gobject-import.diff nigiri-01-fix-urwid-indexerror.diff nigiri-02-none-has-no-auto_scroll.diff +miniupnpc-api-14.diff