From f48d02bcd536447171886d06639472b54a09dbc9 Mon Sep 17 00:00:00 2001 From: Stephen Walker-Weinshenker Date: Sun, 2 Dec 2018 00:17:58 -0700 Subject: [PATCH] snapper: update to 0.8.1 --- .../snapper/patches/btrfs4.19_swap_fix.patch | 27 +++++++++++++++++++ srcpkgs/snapper/template | 10 +++---- 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/snapper/patches/btrfs4.19_swap_fix.patch diff --git a/srcpkgs/snapper/patches/btrfs4.19_swap_fix.patch b/srcpkgs/snapper/patches/btrfs4.19_swap_fix.patch new file mode 100644 index 00000000000..716501245d0 --- /dev/null +++ b/srcpkgs/snapper/patches/btrfs4.19_swap_fix.patch @@ -0,0 +1,27 @@ +fixing btrfs4.19 issues conflicting with boost +--- snapper/Btrfs.cc ++++ snapper/Btrfs.cc +@@ -41,6 +41,9 @@ + #include + #include + #include ++#ifdef swap ++#undef swap ++#endif + #include + #include + #endif + + +--- snapper/BtrfsUtils.cc ++++ snapper/BtrfsUtils.cc +@@ -34,6 +34,9 @@ + #ifdef HAVE_LIBBTRFS + #include + #include ++#ifdef swap ++#undef swap ++#endif + #endif + #include + #include diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index ec879aec5da..265084159c9 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -1,21 +1,21 @@ # Template file for 'snapper' pkgname=snapper -version=0.7.2 +version=0.8.1 revision=1 -lib32disabled=yes build_style=gnu-configure configure_args="--disable-zypp --with-conf=/etc/conf.d" +conf_files="/etc/conf.d/snapper" +make_dirs="/etc/snapper/configs 0755 root root" hostmakedepends="automake docbook-xsl libtool libxml2-devel libxslt pkg-config" makedepends="acl-devel boost-devel dbus-devel e2fsprogs-devel libbtrfs-devel libmount-devel libxml2-devel pam-devel" -conf_files="/etc/conf.d/snapper" -make_dirs="/etc/snapper/configs 0755 root root" short_desc="Tool for Linux filesystem snapshot management" maintainer="Juan RP " license="GPL-2.0-only" homepage="http://snapper.io" distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz" -checksum=005a848282a40dc1b85dbf6294a3b81aa4fd08ea2e17b294ee40374ceb14f8f7 +checksum=3f3b8b56bd15ddbee938ec3907f50619299617f10255a45e012037ab05f44094 +lib32disabled=yes case "$XBPS_TARGET_MACHINE" in *-musl) # We define MUSL_LIBC to pick the correct return type