diff mbox series

[meta-oe] snapper: update 0.12.2 -> 0.13.0

Message ID 20260218140234.388441-1-f_l_k@t-online.de
State New
Headers show
Series [meta-oe] snapper: update 0.12.2 -> 0.13.0 | expand

Commit Message

Markus Volk Feb. 18, 2026, 2:02 p.m. UTC 
- Remove 0001-Fix-build-with-boost-1.89.patch. Seems to be fixed
  upstream
- Use VIRTUAL-RUNTIME_dbus
- Use manpages class

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../0001-Fix-build-with-boost-1.89.patch      | 89 -------------------
 .../{snapper_0.12.2.bb => snapper_0.13.0.bb}  | 14 ++-
 2 files changed, 6 insertions(+), 97 deletions(-)
 delete mode 100644 meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch
 rename meta-oe/recipes-support/snapper/{snapper_0.12.2.bb => snapper_0.13.0.bb} (70%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch b/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch
deleted file mode 100644
index a6598b5635..0000000000
--- a/meta-oe/recipes-support/snapper/snapper/0001-Fix-build-with-boost-1.89.patch
+++ /dev/null
@@ -1,89 +0,0 @@ 
-From c33e7707da86a23c4ad7e2451ddb04df419d6412 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 31 Aug 2025 00:13:07 -0700
-Subject: [PATCH] Fix build with boost 1.89
-
-boost 1.89+ does not have boost system lib anymore all needed functions
-are now in header
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- dbus/Makefile.am             | 2 +-
- examples/c++-lib/Makefile.am | 1 -
- server/Makefile.am           | 2 +-
- snapper/Makefile.am          | 2 +-
- testsuite-cmp/Makefile.am    | 1 -
- zypp-plugin/Makefile.am      | 1 -
- 6 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/dbus/Makefile.am b/dbus/Makefile.am
-index 9c0456a..2078d7d 100644
---- a/dbus/Makefile.am
-+++ b/dbus/Makefile.am
-@@ -15,4 +15,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/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am
-index 52c81e5..f55da6f 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 c03f373..1aef916 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/Makefile.am b/snapper/Makefile.am
-index b0fe55c..d75599f 100644
---- a/snapper/Makefile.am
-+++ b/snapper/Makefile.am
-@@ -71,7 +71,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 81104bf..555bc3b 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 9d102e0..e395f59 100644
---- a/zypp-plugin/Makefile.am
-+++ b/zypp-plugin/Makefile.am
-@@ -33,7 +33,6 @@ forwarding_zypp_plugin_SOURCES = \
- forwarding_zypp_plugin_LDADD = \
- 	../snapper/libsnapper.la \
- 	../stomp/libstomp.la \
--	-lboost_system \
- 	-lpthread
- 
- TESTS = solvable-matcher.test
diff --git a/meta-oe/recipes-support/snapper/snapper_0.12.2.bb b/meta-oe/recipes-support/snapper/snapper_0.13.0.bb
similarity index 70%
rename from meta-oe/recipes-support/snapper/snapper_0.12.2.bb
rename to meta-oe/recipes-support/snapper/snapper_0.13.0.bb
index 981ca84c13..8b899abfda 100644
--- a/meta-oe/recipes-support/snapper/snapper_0.12.2.bb
+++ b/meta-oe/recipes-support/snapper/snapper_0.13.0.bb
@@ -3,22 +3,20 @@  HOMEPAGE = "https://github.com/openSUSE/snapper"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-DEPENDS = "acl boost btrfs-tools dbus e2fsprogs json-c libxml2 lvm2 ncurses zlib"
+DEPENDS = "acl boost btrfs-tools ${VIRTUAL-RUNTIME_dbus} e2fsprogs json-c libxml2 lvm2 ncurses zlib"
 
 # Build separation is slightly broken
-inherit autotools-brokensep pkgconfig gettext
+inherit autotools-brokensep pkgconfig gettext manpages
 
-SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master \
-           file://0001-Fix-build-with-boost-1.89.patch \
-          "
-SRCREV = "4f3d2b2fc58aefa976668cd25b8eac02ba0f85e7"
+SRC_URI = "git://github.com/openSUSE/snapper.git;protocol=https;branch=master"
+SRCREV = "3a3bd97083976d28538d402284ff947b4aab5b8f"
 
 EXTRA_OECONF += "--disable-zypp"
 
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'api-documentation systemd pam', d)}"
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd pam', d)}"
 PACKAGECONFIG[pam] = "--enable-pam --with-pam-security=${base_libdir}/security, --disable-pam,libpam"
 PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
-PACKAGECONFIG[api-documentation] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native"
+PACKAGECONFIG[manpages] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native"
 
 # Avoid HOSTTOOLS path in binaries
 export DIFF_BIN = "${bindir}/diff"