Bug#1037511: silverjuke: FTBFS with libupnp17

2023-06-20 Thread Bastian Germann

I am uploading a NMU with a trivial patch to fix this. The debdiff is attached 
and also available in the git repo.diff -Nru silverjuke-18.2.1/debian/changelog silverjuke-18.2.1/debian/changelog
--- silverjuke-18.2.1/debian/changelog  2022-09-18 20:21:55.0 +0200
+++ silverjuke-18.2.1/debian/changelog  2023-06-20 20:55:56.0 +0200
@@ -1,3 +1,13 @@
+silverjuke (18.2.1-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use newer UpnpInit2 API (Closes: #1037511)
+
+  [ Debian Janitor ]
+  * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, 
Repository-Browse.
+
+ -- Bastian Germann   Tue, 20 Jun 2023 20:55:56 +0200
+
 silverjuke (18.2.1-4) unstable; urgency=medium
 
   [ Dr. Tobias Quathamer ]
diff -Nru silverjuke-18.2.1/debian/patches/0003-Use-newer-UpnpInit2-API.patch 
silverjuke-18.2.1/debian/patches/0003-Use-newer-UpnpInit2-API.patch
--- silverjuke-18.2.1/debian/patches/0003-Use-newer-UpnpInit2-API.patch 
1970-01-01 01:00:00.0 +0100
+++ silverjuke-18.2.1/debian/patches/0003-Use-newer-UpnpInit2-API.patch 
2023-06-20 20:54:09.0 +0200
@@ -0,0 +1,21 @@
+From: Bastian Germann 
+Date: Tue, 20 Jun 2023 20:52:15 +0200
+Subject: Use newer UpnpInit2 API
+
+---
+ src/sjmodules/upnp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sjmodules/upnp.cpp b/src/sjmodules/upnp.cpp
+index a41b0e3..fa80f25 100644
+--- a/src/sjmodules/upnp.cpp
 b/src/sjmodules/upnp.cpp
+@@ -178,7 +178,7 @@ bool SjUpnpModule::InitLibupnp()
+ 
+   // init library - NB: we may be in a working thread here (eg. 
ImgThread), however, this seems not to be a problem
+   int error;
+-  if( (error=UpnpInit(NULL, 0)) != UPNP_E_SUCCESS ) {
++  if( (error=UpnpInit2(NULL, 0)) != UPNP_E_SUCCESS ) {
+   LogUpnpError("Cannot init", error);
+   ExitLibupnp();
+   return false; // error
diff -Nru silverjuke-18.2.1/debian/patches/series 
silverjuke-18.2.1/debian/patches/series
--- silverjuke-18.2.1/debian/patches/series 2022-09-18 20:21:40.0 
+0200
+++ silverjuke-18.2.1/debian/patches/series 2023-06-20 20:53:15.0 
+0200
@@ -1,3 +1,4 @@
 0001-Force-X11-for-wxGLCanvas.patch
 0002-Replace-URL-of-freedb-with-gnudb.gnudb.org.patch
+0003-Use-newer-UpnpInit2-API.patch
 wx3.2-compat.patch
diff -Nru silverjuke-18.2.1/debian/upstream/metadata 
silverjuke-18.2.1/debian/upstream/metadata
--- silverjuke-18.2.1/debian/upstream/metadata  1970-01-01 01:00:00.0 
+0100
+++ silverjuke-18.2.1/debian/upstream/metadata  2023-06-20 20:37:25.0 
+0200
@@ -0,0 +1,5 @@
+---
+Bug-Database: https://github.com/silverjuke/silverjuke/issues
+Bug-Submit: https://github.com/silverjuke/silverjuke/issues/new
+Repository: https://github.com/silverjuke/silverjuke.git
+Repository-Browse: https://github.com/silverjuke/silverjuke


Bug#1037511: silverjuke: FTBFS with libupnp17

2023-06-13 Thread Sebastian Ramacher
Source: silverjuke
Version: 18.2.1-4
Severity: serious
Tags: ftbfs sid trixie
Justification: fails to build from source (but built successfully in the past)

https://buildd.debian.org/status/fetch.php?pkg=silverjuke&arch=amd64&ver=18.2.1-4%2Bb3&stamp=1686650401&raw=0

g++ -DPACKAGE_NAME=\"silverjuke\" -DPACKAGE_TARNAME=\"silverjuke\" 
-DPACKAGE_VERSION=\"18.2.1\" -DPACKAGE_STRING=\"silverjuke\ 18.2.1\" 
-DPACKAGE_BUGREPORT=\"r...@b44t.com\" -DPACKAGE_URL=\"\" 
-DPACKAGE=\"silverjuke\" -DVERSION=\"18.2.1\" -DENABLE_NLS=1 -DHAVE_GETTEXT=1 
-DHAVE_DCGETTEXT=1 -DHAVE_STDIO_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 
-DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STRINGS_H=1 -DHAVE_SYS_STAT_H=1 
-DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DSTDC_HEADERS=1 -DHAVE_ENDIAN_H=1 -I.  
-Isrc -I/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.2 
-I/usr/include/wx-3.2 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ 
-I/usr/include/gstreamer-1.0 -I/usr/include/glib-2.0 
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/x86_64-linux-gnu 
-pthread-DPKGDATADIR=\"/usr/share/silverjuke\" 
-DPKGDOCDIR=\"/usr/share/doc/silverjuke\" -Wdate-time -D_FORTIFY_SOURCE=2 -Isrc 
-Wall -Wno-unused-but-set-variable -g
-I/usr/lib/x86_64-linux-gnu/wx/include/gtk3-unicode-3.2 -I/usr/include/wx-3.2 
-D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXGTK__ -pthread -g -O2 
-ffile-prefix-map=/<>=. -fstack-protector-strong -Wformat 
-Werror=format-security -c -o src/sjmodules/silverjuke-viewsettings.o `test -f 
'src/sjmodules/viewsettings.cpp' || echo './'`src/sjmodules/viewsettings.cpp
src/sjmodules/upnp.cpp: In member function ‘bool SjUpnpModule::InitLibupnp()’:
src/sjmodules/upnp.cpp:181:20: error: ‘UpnpInit’ was not declared in this 
scope; did you mean ‘UpnpInit2’?
  181 | if( (error=UpnpInit(NULL, 0)) != UPNP_E_SUCCESS ) {
  |^~~~
  |UpnpInit2
make[2]: *** [Makefile:3616: src/sjmodules/silverjuke-upnp.o] Error 1

Cheers
-- 
Sebastian Ramacher