Control: tags 1128148 + patch
Control: tags 1128148 + pending

Dear maintainer,

I've prepared an NMU for snapper (versioned as 0.10.6-1.3) and uploaded 
it to DELAYED/2. Please feel free to tell me if I should cancel it.

cu
Adrian
diffstat for snapper-0.10.6 snapper-0.10.6

 changelog                                                               |    7 
 patches/0001-do-not-link-with-stub-since-boost-1.69-libboost_syst.patch |  156 ++++++++++
 patches/series                                                          |    1 
 3 files changed, 164 insertions(+)

diff -Nru snapper-0.10.6/debian/changelog snapper-0.10.6/debian/changelog
--- snapper-0.10.6/debian/changelog	2024-09-10 09:48:47.000000000 +0300
+++ snapper-0.10.6/debian/changelog	2026-03-23 11:16:16.000000000 +0200
@@ -1,3 +1,10 @@
+snapper (0.10.6-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with Boost 1.90. (Closes: #1128148)
+
+ -- Adrian Bunk <[email protected]>  Mon, 23 Mar 2026 11:16:16 +0200
+
 snapper (0.10.6-1.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru snapper-0.10.6/debian/patches/0001-do-not-link-with-stub-since-boost-1.69-libboost_syst.patch snapper-0.10.6/debian/patches/0001-do-not-link-with-stub-since-boost-1.69-libboost_syst.patch
--- snapper-0.10.6/debian/patches/0001-do-not-link-with-stub-since-boost-1.69-libboost_syst.patch	1970-01-01 02:00:00.000000000 +0200
+++ snapper-0.10.6/debian/patches/0001-do-not-link-with-stub-since-boost-1.69-libboost_syst.patch	2026-03-23 11:15:59.000000000 +0200
@@ -0,0 +1,156 @@
+From 95f9da5b38722df405f81e56098c99a491480f4e Mon Sep 17 00:00:00 2001
+From: Arvin Schnell <[email protected]>
+Date: Fri, 5 Sep 2025 13:01:15 +0200
+Subject: - do not link with stub (since boost 1.69) libboost_system since
+ finally removed in boost 1.89
+
+---
+ dbus/Makefile.am                        | 2 +-
+ dists/debian/control                    | 2 +-
+ dists/debian/snapper-Debian.dsc.in.in   | 2 +-
+ dists/debian/snapper-Raspbian.dsc.in.in | 2 +-
+ dists/debian/snapper-xUbuntu.dsc.in.in  | 2 +-
+ examples/c++-lib/Makefile.am            | 1 -
+ server/Makefile.am                      | 2 +-
+ snapper.spec.in                         | 1 -
+ snapper/Makefile.am                     | 2 +-
+ testsuite-cmp/Makefile.am               | 1 -
+ zypp-plugin/Makefile.am                 | 1 -
+ 11 files changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/dbus/Makefile.am b/dbus/Makefile.am
+index 560b02f3..a6e76e7f 100644
+--- a/dbus/Makefile.am
++++ b/dbus/Makefile.am
+@@ -13,4 +13,4 @@ libdbus_la_SOURCES =					\
+ 	DBusMainLoop.cc		DBusMainLoop.h
+ 
+ libdbus_la_LIBADD = $(DBUS_LIBS)
+-libdbus_la_LDFLAGS = -lboost_system -lboost_thread
++libdbus_la_LDFLAGS = -lboost_thread
+diff --git a/dists/debian/control b/dists/debian/control
+index f94618f7..713e8b87 100644
+--- a/dists/debian/control
++++ b/dists/debian/control
+@@ -2,7 +2,7 @@ Source: snapper
+ Priority: optional
+ Section: admin
+ Maintainer: Arvin Schnell <[email protected]>
+-Build-Depends: debhelper (>= 4.1.16), g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl
++Build-Depends: debhelper (>= 4.1.16), g++, libboost-dev, libboost-thread-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libpam-dev, xsltproc, docbook-xsl
+ Homepage: http://en.opensuse.org/Portal:Snapper
+ 
+ Package: snapper
+diff --git a/dists/debian/snapper-Debian.dsc.in.in b/dists/debian/snapper-Debian.dsc.in.in
+index 9350cbf5..92e18a57 100644
+--- a/dists/debian/snapper-Debian.dsc.in.in
++++ b/dists/debian/snapper-Debian.dsc.in.in
+@@ -4,7 +4,7 @@ Version: @VERSION@-1
+ Binary: snapper
+ Maintainer: Arvin Schnell <[email protected]>
+ Architecture: any
+-Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, locales-all, ncurses-dev
++Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, locales-all, ncurses-dev
+ #
+ # The 'Files' line is generated during 'make package':
+ # Files:
+diff --git a/dists/debian/snapper-Raspbian.dsc.in.in b/dists/debian/snapper-Raspbian.dsc.in.in
+index 9350cbf5..92e18a57 100644
+--- a/dists/debian/snapper-Raspbian.dsc.in.in
++++ b/dists/debian/snapper-Raspbian.dsc.in.in
+@@ -4,7 +4,7 @@ Version: @VERSION@-1
+ Binary: snapper
+ Maintainer: Arvin Schnell <[email protected]>
+ Architecture: any
+-Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, locales-all, ncurses-dev
++Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, locales-all, ncurses-dev
+ #
+ # The 'Files' line is generated during 'make package':
+ # Files:
+diff --git a/dists/debian/snapper-xUbuntu.dsc.in.in b/dists/debian/snapper-xUbuntu.dsc.in.in
+index d37df8ea..71ccdf2c 100644
+--- a/dists/debian/snapper-xUbuntu.dsc.in.in
++++ b/dists/debian/snapper-xUbuntu.dsc.in.in
+@@ -4,7 +4,7 @@ Version: @VERSION@-1
+ Binary: snapper
+ Maintainer: Arvin Schnell <[email protected]>
+ Architecture: any
+-Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-system-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de, language-pack-fr, ncurses-dev
++Build-Depends: debhelper (>= 4.1.16), acl-dev, dbus, g++, libboost-dev, libboost-thread-dev, libboost-test-dev, libxml2-dev, libz-dev, libdbus-1-dev, libjson-c-dev, libpam-dev, xsltproc, docbook-xsl, language-pack-en, language-pack-de, language-pack-fr, ncurses-dev
+ #
+ # The 'Files' line is generated during 'make package':
+ # Files:
+diff --git a/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am
+index 52c81e52..f55da6ff 100644
+--- a/examples/c++-lib/Makefile.am
++++ b/examples/c++-lib/Makefile.am
+@@ -5,7 +5,6 @@
+ AM_CPPFLAGS = -I$(top_srcdir)
+ 
+ LDADD = ../../snapper/libsnapper.la
+-AM_LDFLAGS = -lboost_system
+ 
+ noinst_PROGRAMS = List ListAll Create CmpDirs CreateNumber CreateTimeline
+ 
+diff --git a/server/Makefile.am b/server/Makefile.am
+index c03f3731..1aef9160 100644
+--- a/server/Makefile.am
++++ b/server/Makefile.am
+@@ -16,4 +16,4 @@ snapperd_SOURCES =					\
+ 	FilesTransferTask.cc	FilesTransferTask.h
+ 
+ snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt
+-snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread
++snapperd_LDFLAGS = -lboost_thread -lpthread
+diff --git a/snapper.spec.in b/snapper.spec.in
+index bedcac12..fd586cd6 100644
+--- a/snapper.spec.in
++++ b/snapper.spec.in
+@@ -43,7 +43,6 @@ Group:          System/Packages
+ URL:            http://snapper.io/
+ Source:         snapper-%{version}.tar.xz
+ %if 0%{?suse_version}
+-BuildRequires:  libboost_system-devel
+ BuildRequires:  libboost_thread-devel
+ BuildRequires:  libboost_test-devel
+ %else
+diff --git a/snapper/Makefile.am b/snapper/Makefile.am
+index a03beceb..f14c1667 100644
+--- a/snapper/Makefile.am
++++ b/snapper/Makefile.am
+@@ -63,7 +63,7 @@ endif
+ 
+ libsnapper_la_CPPFLAGS = $(XML2_CFLAGS) $(ZLIB_CFLAGS)
+ libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@
+-libsnapper_la_LIBADD = -lboost_thread -lboost_system $(XML2_LIBS) -lacl $(ZLIB_LIBS)
++libsnapper_la_LIBADD = -lboost_thread $(XML2_LIBS) -lacl $(ZLIB_LIBS)
+ if ENABLE_ROLLBACK
+ libsnapper_la_LIBADD += -lmount
+ endif
+diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am
+index 81104bf1..555bc3bf 100644
+--- a/testsuite-cmp/Makefile.am
++++ b/testsuite-cmp/Makefile.am
+@@ -3,7 +3,6 @@
+ #
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)
+-AM_LDFLAGS = -lboost_system
+ 
+ LDADD = ../snapper/libsnapper.la
+ 
+diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am
+index 3e4ddf6c..aedbd25d 100644
+--- a/zypp-plugin/Makefile.am
++++ b/zypp-plugin/Makefile.am
+@@ -31,7 +31,6 @@ forwarding_zypp_plugin_SOURCES = \
+ 
+ forwarding_zypp_plugin_LDADD = \
+ 	../snapper/libsnapper.la \
+-	-lboost_system \
+ 	-lpthread
+ 
+ TESTS = solvable-matcher.test
+-- 
+2.47.3
+
diff -Nru snapper-0.10.6/debian/patches/series snapper-0.10.6/debian/patches/series
--- snapper-0.10.6/debian/patches/series	2023-09-19 15:56:59.000000000 +0300
+++ snapper-0.10.6/debian/patches/series	2026-03-23 11:16:16.000000000 +0200
@@ -2,3 +2,4 @@
 0004-fix-manpage.patch
 0005-drop-testsuite-real-to-avoid-to-be-installed-into-pa.patch
 0004-Add-some-missing-systemd-unit-directives.patch
+0001-do-not-link-with-stub-since-boost-1.69-libboost_syst.patch

Reply via email to