From c4b7b79f9626389e9fb866071ab64f8218d49954 Mon Sep 17 00:00:00 2001 From: meator Date: Sun, 27 Oct 2024 14:01:09 +0100 Subject: [PATCH] snapper: update to 0.11.2. --- common/shlibs | 2 +- .../patches/0001-disable-locale-tests.patch | 6 ++--- .../patches/fix-missing-include-musl.patch | 27 +++++++++++++++++++ srcpkgs/snapper/template | 8 +++--- 4 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/snapper/patches/fix-missing-include-musl.patch diff --git a/common/shlibs b/common/shlibs index 338c0eb0b37..d4419f1c393 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1454,7 +1454,7 @@ libgfrpc.so.0 libglusterfs-8.3_2 libgfxdr.so.0 libglusterfs-8.3_2 libgfapi.so.0 libglusterfs-8.3_2 libglusterd.so.0 libglusterfs-8.3_2 -libsnapper.so.6 libsnapper-0.10.2_1 +libsnapper.so.7 libsnapper-0.11.2_1 libtsm.so.4 libtsm-4.0.2_1 libxine.so.2 libxine-1.2.4_1 libjbig2dec.so.0 libjbig2dec-0.11_1 diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch index f39d90ec944..fa083c2f066 100644 --- a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch +++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch @@ -1,15 +1,13 @@ -diff --git testsuite/Makefile.am testsuite/Makefile.am -index ccb84d3..9774a9c 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test \ -- equal-date.test dbus-escape.test cmp-lt.test humanstring.test uuid.test \ +- equal-date.test cmp-lt.test humanstring.test uuid.test \ - table.test table-formatter.test csv-formatter.test json-formatter.test \ - getopts.test scan-datetime.test root-prefix.test range.test limit.test -+ equal-date.test dbus-escape.test uuid.test \ ++ equal-date.test uuid.test \ + csv-formatter.test json-formatter.test \ + getopts.test scan-datetime.test root-prefix.test diff --git a/srcpkgs/snapper/patches/fix-missing-include-musl.patch b/srcpkgs/snapper/patches/fix-missing-include-musl.patch new file mode 100644 index 00000000000..3d613e71db8 --- /dev/null +++ b/srcpkgs/snapper/patches/fix-missing-include-musl.patch @@ -0,0 +1,27 @@ +From d103eaeae169708ca567f092182a89b79e5ab9db Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 20 Oct 2024 07:52:33 -0700 +Subject: [PATCH] Include linux/types.h for __u16/__u32/__u64 type + +This header is included indirectly with glibc but when using musl +it ends up with compilation failure + +BcachefsUtils.cc:85:20: error: use of undeclared identifier '__u32' + 85 | args.dirfd = (__u32) fddst; + | ^ +--- + snapper/BcachefsUtils.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/snapper/BcachefsUtils.cc b/snapper/BcachefsUtils.cc +index e9163ffb..1d328a78 100644 +--- a/snapper/BcachefsUtils.cc ++++ b/snapper/BcachefsUtils.cc +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include + #include + diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 2f9e7a22f81..1aabb8fa838 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,7 +1,7 @@ # Template file for 'snapper' pkgname=snapper -version=0.10.3 -revision=4 +version=0.11.2 +revision=1 build_style=gnu-configure configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d" conf_files="/etc/conf.d/snapper" @@ -17,7 +17,7 @@ maintainer="Orphaned " license="GPL-2.0-only" homepage="http://snapper.io" distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz" -checksum=adc207cc049d3b2302201d3bc8ad4c49dd9cf61192273e0bca118d35c3e940cc +checksum=d2a33935f94f30b22aecbdfdecccf651b3616fa698aec266646a9d06043bfd6f lib32disabled=yes if [ "$XBPS_TARGET_LIBC" = musl ] @@ -30,7 +30,7 @@ pre_configure() { # rename cron scripts sed -i -e 's@suse.de-@@g' scripts/Makefile.am # fix config location in cron scripts - sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-{daily,hourly} + sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-hourly # fix pam plugin install location sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am