mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
snapper: update to 0.11.2.
This commit is contained in:
parent
42112ea557
commit
c4b7b79f96
4 changed files with 34 additions and 9 deletions
|
@ -1454,7 +1454,7 @@ libgfrpc.so.0 libglusterfs-8.3_2
|
||||||
libgfxdr.so.0 libglusterfs-8.3_2
|
libgfxdr.so.0 libglusterfs-8.3_2
|
||||||
libgfapi.so.0 libglusterfs-8.3_2
|
libgfapi.so.0 libglusterfs-8.3_2
|
||||||
libglusterd.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
|
libtsm.so.4 libtsm-4.0.2_1
|
||||||
libxine.so.2 libxine-1.2.4_1
|
libxine.so.2 libxine-1.2.4_1
|
||||||
libjbig2dec.so.0 libjbig2dec-0.11_1
|
libjbig2dec.so.0 libjbig2dec-0.11_1
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
diff --git testsuite/Makefile.am testsuite/Makefile.am
|
|
||||||
index ccb84d3..9774a9c 100644
|
|
||||||
--- a/testsuite/Makefile.am
|
--- a/testsuite/Makefile.am
|
||||||
+++ b/testsuite/Makefile.am
|
+++ b/testsuite/Makefile.am
|
||||||
@@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
|
@@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
|
||||||
LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
|
LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework
|
||||||
|
|
||||||
check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test \
|
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 \
|
- table.test table-formatter.test csv-formatter.test json-formatter.test \
|
||||||
- getopts.test scan-datetime.test root-prefix.test range.test limit.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 \
|
+ csv-formatter.test json-formatter.test \
|
||||||
+ getopts.test scan-datetime.test root-prefix.test
|
+ getopts.test scan-datetime.test root-prefix.test
|
||||||
|
|
||||||
|
|
27
srcpkgs/snapper/patches/fix-missing-include-musl.patch
Normal file
27
srcpkgs/snapper/patches/fix-missing-include-musl.patch
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
From d103eaeae169708ca567f092182a89b79e5ab9db Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
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 <cstring>
|
||||||
|
#include <cerrno>
|
||||||
|
+#include <linux/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'snapper'
|
# Template file for 'snapper'
|
||||||
pkgname=snapper
|
pkgname=snapper
|
||||||
version=0.10.3
|
version=0.11.2
|
||||||
revision=4
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
|
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
|
||||||
conf_files="/etc/conf.d/snapper"
|
conf_files="/etc/conf.d/snapper"
|
||||||
|
@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="GPL-2.0-only"
|
license="GPL-2.0-only"
|
||||||
homepage="http://snapper.io"
|
homepage="http://snapper.io"
|
||||||
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
|
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
|
||||||
checksum=adc207cc049d3b2302201d3bc8ad4c49dd9cf61192273e0bca118d35c3e940cc
|
checksum=d2a33935f94f30b22aecbdfdecccf651b3616fa698aec266646a9d06043bfd6f
|
||||||
lib32disabled=yes
|
lib32disabled=yes
|
||||||
|
|
||||||
if [ "$XBPS_TARGET_LIBC" = musl ]
|
if [ "$XBPS_TARGET_LIBC" = musl ]
|
||||||
|
@ -30,7 +30,7 @@ pre_configure() {
|
||||||
# rename cron scripts
|
# rename cron scripts
|
||||||
sed -i -e 's@suse.de-@@g' scripts/Makefile.am
|
sed -i -e 's@suse.de-@@g' scripts/Makefile.am
|
||||||
# fix config location in cron scripts
|
# 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
|
# fix pam plugin install location
|
||||||
sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am
|
sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am
|
||||||
|
|
Loading…
Add table
Reference in a new issue