snapper: update to 0.8.1

This commit is contained in:
Stephen Walker-Weinshenker 2018-12-02 00:17:58 -07:00 committed by Michael Aldridge
parent 3e3230e415
commit f48d02bcd5
2 changed files with 32 additions and 5 deletions

View file

@ -0,0 +1,27 @@
fixing btrfs4.19 issues conflicting with boost
--- snapper/Btrfs.cc
+++ snapper/Btrfs.cc
@@ -41,6 +41,9 @@
#include <btrfs/send.h>
#include <btrfs/send-stream.h>
#include <btrfs/send-utils.h>
+#ifdef swap
+#undef swap
+#endif
#include <boost/version.hpp>
#include <boost/thread.hpp>
#endif
--- snapper/BtrfsUtils.cc
+++ snapper/BtrfsUtils.cc
@@ -34,6 +34,9 @@
#ifdef HAVE_LIBBTRFS
#include <btrfs/ioctl.h>
#include <btrfs/send-utils.h>
+#ifdef swap
+#undef swap
+#endif
#endif
#include <algorithm>
#include <functional>

View file

@ -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 <xtraeme@voidlinux.eu>"
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