moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

snapper: update to 0.8.2.

Browse source
This commit is contained in:
prspkt 2019-01-26 11:40:43 +02:00 • committed by maxice8
parent 7ba2fbd7d4
commit e6438b116a
3 changed files with 9 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

27
srcpkgs/snapper/patches/btrfs4.19_swap_fix.patch
View file

@ -1,27 +0,0 @@
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>

12
srcpkgs/snapper/patches/musl-strerror_r.patch
View file

@ -1,14 +1,14 @@
In musl libc the return type of strerror_r(2) is int (XSI-compliant). In musl libc the return type of strerror_r(2) is int (XSI-compliant).
We define MUSL_LIBC in CXXFLAGS to skip the wrong #else implementation. We define MUSL_LIBC in CXXFLAGS to skip the wrong #else implementation.
--- snapper/AppUtil.cc 2015-08-30 15:34:51.106531190 +0200 --- snapper/AppUtil.cc 2019-01-26 13:29:29.110490961 +0200
+++ snapper/AppUtil.cc 2015-08-30 15:35:41.996532260 +0200 +++ snapper/AppUtil.cc 2019-01-26 13:29:51.324648467 +0200
@@ -209,7 +209,7 @@ @@ -223,7 +223,7 @@ namespace snapper
string string
stringerror(int errnum) stringerror(int errnum)
{ {
-#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE -#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE
+#if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) || MUSL_LIBC +#if (_POSIX_C_SOURCE >= 200112L) && ! _GNU_SOURCE || MUSL_LIBC
char buf1[100]; char buf1[100];
if (strerror_r(errno, buf1, sizeof(buf1)-1) == 0) if (strerror_r(errnum, buf1, sizeof(buf1) - 1) == 0)
return string(buf1); return string(buf1);

6
srcpkgs/snapper/template
View file

@ -1,7 +1,7 @@
# Template file for 'snapper' # Template file for 'snapper'
pkgname=snapper pkgname=snapper
version=0.8.1 version=0.8.2
revision=2 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-zypp --with-conf=/etc/conf.d" configure_args="--disable-zypp --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper" conf_files="/etc/conf.d/snapper"
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@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=3f3b8b56bd15ddbee938ec3907f50619299617f10255a45e012037ab05f44094 checksum=ec311969fb69ca97890d4a932e13e82a01ef8ad8fb58a095df8ec5e25f8c4d7e
lib32disabled=yes lib32disabled=yes
case "$XBPS_TARGET_MACHINE" in case "$XBPS_TARGET_MACHINE" in