Skip to content

Commit

Permalink
snapper: update to 0.9.0; adopt
Browse files Browse the repository at this point in the history
  • Loading branch information
folliehiyuki committed Apr 20, 2021
1 parent 7763059 commit 3002228
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 196 deletions.
29 changes: 19 additions & 10 deletions srcpkgs/snapper/patches/0001-disable-locale-tests.patch
@@ -1,31 +1,40 @@
These 4 tests fail with error:
std::runtime_error: locale::facet::_S_create_c_locale name not valid

diff --git testsuite/Makefile.am testsuite/Makefile.am
index d7e30b8..001f834 100644
index ccb84d3..9774a9c 100644
--- testsuite/Makefile.am
+++ testsuite/Makefile.am
@@ -7,8 +7,8 @@ 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

check_PROGRAMS = sysconfig-get1.test dirname1.test basename1.test \
- equal-date.test dbus-escape.test cmp-lt.test humanstring.test \
- equal-date.test dbus-escape.test cmp-lt.test humanstring.test uuid.test \
- table.test table-formatter.test csv-formatter.test json-formatter.test \
+ equal-date.test dbus-escape.test \
- getopts.test scan-datetime.test root-prefix.test range.test limit.test
+ equal-date.test dbus-escape.test uuid.test \
+ csv-formatter.test json-formatter.test \
getopts.test
+ getopts.test scan-datetime.test root-prefix.test

if ENABLE_BTRFS_QUOTA
@@ -27,12 +27,6 @@ EXTRA_DIST = $(noinst_SCRIPTS) sysconfig-get1.txt sysconfig-set1.txt
check_PROGRAMS += qgroup1.test
@@ -29,14 +29,8 @@ equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la

equal_date_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
scan_datetime_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la

-humanstring_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
-
uuid_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la

-table_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
-
-table_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
-
csv_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la

json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la $(JSONC_LIBS)
@@ -44,7 +38,3 @@ json_formatter_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils
getopts_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la

lvm_utils_test_LDADD = -lboost_unit_test_framework ../snapper/libsnapper.la
-
-range_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
-
-limit_test_LDADD = -lboost_unit_test_framework ../client/utils/libutils.la
164 changes: 0 additions & 164 deletions srcpkgs/snapper/patches/0002-backport-equal-date-test.patch

This file was deleted.

13 changes: 13 additions & 0 deletions srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch
@@ -0,0 +1,13 @@
diff --git client/cleanup.cc client/cleanup.cc
index 801c0f5..e57a0a8 100644
--- client/cleanup.cc
+++ client/cleanup.cc
@@ -51,7 +51,7 @@ struct Parameters
MinFreeLimit free_limit;


- void read(const ProxyConfig& config, const char* name, long int& value)
+ void read(const ProxyConfig& config, const char* name, time_t& value)
{
const map<string, string>& raw = config.getAllValues();
map<string, string>::const_iterator pos = raw.find(name);
19 changes: 0 additions & 19 deletions srcpkgs/snapper/patches/0003-backport-fix-jsonc-linkage.patch

This file was deleted.

6 changes: 3 additions & 3 deletions srcpkgs/snapper/template
@@ -1,6 +1,6 @@
# Template file for 'snapper'
pkgname=snapper
version=0.8.15
version=0.9.0
revision=1
build_style=gnu-configure
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
Expand All @@ -13,11 +13,11 @@ makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel
json-c-devel"
depends="dbus"
short_desc="Tool for Linux filesystem snapshot management"
maintainer="Orphaned <orphan@voidlinux.org>"
maintainer="FollieHiyuki <folliekazetani@protonmail.com>"
license="GPL-2.0-only"
homepage="http://snapper.io"
distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz"
checksum=fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2
checksum=ca7b17d0213aa5281ff08d968b4e029b78bb3870eb79fd7bc7f879b17f5c969e
lib32disabled=yes

if [ "$XBPS_TARGET_LIBC" = musl ]
Expand Down

0 comments on commit 3002228

Please sign in to comment.