Date: Monday, December 28, 2020 @ 19:28:57 Author: mtorromeo Revision: 795892
upgpkg: snapper 0.8.15-1 Added: snapper/trunk/jsonc-config-fix.patch Modified: snapper/trunk/PKGBUILD Deleted: snapper/trunk/macro-iterator-fix.patch --------------------------+ PKGBUILD | 18 +-- jsonc-config-fix.patch | 13 ++ macro-iterator-fix.patch | 264 --------------------------------------------- 3 files changed, 22 insertions(+), 273 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-28 19:28:50 UTC (rev 795891) +++ PKGBUILD 2020-12-28 19:28:57 UTC (rev 795892) @@ -2,13 +2,13 @@ # Contributor: Tom Kuther <gim...@sonnenkinder.org> pkgname=snapper -pkgver=0.8.14 -pkgrel=3 +pkgver=0.8.15 +pkgrel=1 pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping." arch=('x86_64') url="http://snapper.io" license=('GPL2') -depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs' 'acl') +depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs' 'acl' 'json-c') makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git' 'systemd') optdepends=('pam: pam_snapper') backup=('etc/conf.d/snapper') @@ -16,14 +16,14 @@ "conf-d.patch" "cron-rename.patch" "drift-file-path.patch" - "macro-iterator-fix.patch" - "usr-paths.patch") -sha256sums=('d3abe4d542dade06b361e7c89b5de03bb5202853bc5e314ca74080caa24923f6' + "usr-paths.patch" + "jsonc-config-fix.patch") +sha256sums=('fe0e32912275713f8fad17dbe510f32dbba8526365a849e3f7d6c786d43cfca2' '267118a198583fc1ff10f376e108c0600844e0b1370e44ac4674b20332bff106' 'df980fe0faa6a21f8df59b90d486e50e4fc766de808049e77a52d1a73d139b82' '093c7993e466a0cf9c0794a971825f5f1b40047512857bc124ed0d63dbb306d6' - 'c894c041964eeb55d461d1476486b878851556892b93a6fa1738743f46027e9d' - 'a49de7878ee5420bec934542699e9b57861666686d05406dc863f6a557f7f253') + 'a49de7878ee5420bec934542699e9b57861666686d05406dc863f6a557f7f253' + 'e44531677707871999bc6522b533f5581ec40e9a08412c291c77ab795a4727c3') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -30,8 +30,8 @@ patch -p1 -i "$srcdir/conf-d.patch" patch -p1 -i "$srcdir/cron-rename.patch" patch -p1 -i "$srcdir/drift-file-path.patch" - patch -p1 -i "$srcdir/macro-iterator-fix.patch" patch -p1 -i "$srcdir/usr-paths.patch" + patch -p1 -i "$srcdir/jsonc-config-fix.patch" } build() { Added: jsonc-config-fix.patch =================================================================== --- jsonc-config-fix.patch (rev 0) +++ jsonc-config-fix.patch 2020-12-28 19:28:57 UTC (rev 795892) @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 839d012..eead71d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -194,9 +194,7 @@ fi + + PKG_CHECK_MODULES(DBUS, dbus-1) + PKG_CHECK_MODULES(XML2, libxml-2.0) +-if test "x$with_zypp" = "xyes"; then + PKG_CHECK_MODULES(JSONC, json-c, [], [AC_MSG_WARN([Cannot find json-c. Please install libjson-c-devel])]) +-fi + + AC_CHECK_HEADER(acl/libacl.h,[],[AC_MSG_ERROR([Cannout find libacl headers. Please install libacl-devel])]) Deleted: macro-iterator-fix.patch =================================================================== --- macro-iterator-fix.patch 2020-12-28 19:28:50 UTC (rev 795891) +++ macro-iterator-fix.patch 2020-12-28 19:28:57 UTC (rev 795892) @@ -1,264 +0,0 @@ -diff --git a/client/Command.h b/client/Command.h -index 9ce7760..53cb601 100644 ---- a/client/Command.h -+++ b/client/Command.h -@@ -23,6 +23,7 @@ - #define SNAPPER_CLI_COMMAND_H - - #include <string> -+#include <iterator> - #include <vector> - - #include "client/GlobalOptions.h" -diff --git a/client/Options.h b/client/Options.h -index 10bfe1d..f94688f 100644 ---- a/client/Options.h -+++ b/client/Options.h -@@ -23,6 +23,7 @@ - #define SNAPPER_CLI_OPTIONS_H - - #include <string> -+#include <iterator> - #include <vector> - - #include "client/utils/GetOpts.h" -diff --git a/client/cleanup.cc b/client/cleanup.cc -index e1d5f5b..0c2a084 100644 ---- a/client/cleanup.cc -+++ b/client/cleanup.cc -@@ -22,6 +22,7 @@ - - - #include <iostream> -+#include <iterator> - #include <vector> - - #include "dbus/DBusMessage.h" -diff --git a/client/commands.h b/client/commands.h -index 11cbc0e..9db78dd 100644 ---- a/client/commands.h -+++ b/client/commands.h -@@ -22,6 +22,7 @@ - - - #include <string> -+#include <iterator> - #include <vector> - #include <map> - -diff --git a/client/proxy.h b/client/proxy.h -index 606105e..828a786 100644 ---- a/client/proxy.h -+++ b/client/proxy.h -@@ -25,6 +25,7 @@ - - - #include <memory> -+#include <iterator> - #include <vector> - #include <list> - #include <map> -diff --git a/client/types.h b/client/types.h -index 9217eac..86fc101 100644 ---- a/client/types.h -+++ b/client/types.h -@@ -22,6 +22,7 @@ - - - #include <string> -+#include <iterator> - #include <vector> - #include <map> - -diff --git a/dbus/DBusMessage.h b/dbus/DBusMessage.h -index 09190d0..bf5c519 100644 ---- a/dbus/DBusMessage.h -+++ b/dbus/DBusMessage.h -@@ -28,6 +28,7 @@ - #include <dbus/dbus.h> - - #include <string> -+#include <iterator> - #include <vector> - #include <list> - #include <map> -diff --git a/snapper/Acls.h b/snapper/Acls.h -index 6aa5d7e..4bed783 100644 ---- a/snapper/Acls.h -+++ b/snapper/Acls.h -@@ -22,6 +22,7 @@ - #define SNAPPER_ACLS_H - - #include <string> -+#include <iterator> - #include <vector> - #include <sys/acl.h> - -diff --git a/snapper/AppUtil.h b/snapper/AppUtil.h -index 75947a1..3b52d65 100644 ---- a/snapper/AppUtil.h -+++ b/snapper/AppUtil.h -@@ -32,6 +32,7 @@ - #include <string> - #include <list> - #include <map> -+#include <iterator> - #include <vector> - #include <stdexcept> - #include <chrono> -diff --git a/snapper/AsciiFile.h b/snapper/AsciiFile.h -index 63e0abb..930333a 100644 ---- a/snapper/AsciiFile.h -+++ b/snapper/AsciiFile.h -@@ -25,6 +25,7 @@ - - - #include <string> -+#include <iterator> - #include <vector> - #include <map> - -diff --git a/snapper/BtrfsUtils.h b/snapper/BtrfsUtils.h -index dd3dd17..65dc21a 100644 ---- a/snapper/BtrfsUtils.h -+++ b/snapper/BtrfsUtils.h -@@ -27,6 +27,7 @@ - - #include <stdint.h> - #include <string> -+#include <iterator> - #include <vector> - - -diff --git a/snapper/Compare.h b/snapper/Compare.h -index 0b56c85..fbff80c 100644 ---- a/snapper/Compare.h -+++ b/snapper/Compare.h -@@ -25,6 +25,7 @@ - - - #include <string> -+#include <iterator> - #include <vector> - #include <functional> - -diff --git a/snapper/Enum.h b/snapper/Enum.h -index f2abd7f..279d370 100644 ---- a/snapper/Enum.h -+++ b/snapper/Enum.h -@@ -25,6 +25,7 @@ - - - #include <string> -+#include <iterator> - #include <vector> - #include <algorithm> - #include <exception> -diff --git a/snapper/File.h b/snapper/File.h -index ade271b..9cf7547 100644 ---- a/snapper/File.h -+++ b/snapper/File.h -@@ -27,6 +27,7 @@ - #include <sys/stat.h> - - #include <string> -+#include <iterator> - #include <vector> - - -diff --git a/snapper/FileUtils.h b/snapper/FileUtils.h -index 21eed79..c318251 100644 ---- a/snapper/FileUtils.h -+++ b/snapper/FileUtils.h -@@ -26,6 +26,7 @@ - - #include <fcntl.h> - #include <string> -+#include <iterator> - #include <vector> - #include <functional> - #include <boost/thread.hpp> -diff --git a/snapper/Filesystem.h b/snapper/Filesystem.h -index fb8f020..dcd904d 100644 ---- a/snapper/Filesystem.h -+++ b/snapper/Filesystem.h -@@ -26,6 +26,7 @@ - - - #include <string> -+#include <iterator> - #include <vector> - #include <utility> - -diff --git a/snapper/LvmCache.cc b/snapper/LvmCache.cc -index f610b60..f62d32c 100644 ---- a/snapper/LvmCache.cc -+++ b/snapper/LvmCache.cc -@@ -20,6 +20,7 @@ - - #include "config.h" - -+#include <iterator> - #include <vector> - #include <boost/algorithm/string.hpp> - -diff --git a/snapper/LvmCache.h b/snapper/LvmCache.h -index 5d5e3e3..24a2abf 100644 ---- a/snapper/LvmCache.h -+++ b/snapper/LvmCache.h -@@ -24,6 +24,7 @@ - #include <map> - #include <set> - #include <string> -+#include <iterator> - #include <vector> - - #include <boost/noncopyable.hpp> -diff --git a/snapper/Snapper.h b/snapper/Snapper.h -index cd36e75..49cafb7 100644 ---- a/snapper/Snapper.h -+++ b/snapper/Snapper.h -@@ -25,6 +25,7 @@ - #define SNAPPER_SNAPPER_H - - -+#include <iterator> - #include <vector> - #include <boost/noncopyable.hpp> - -diff --git a/snapper/SnapperTypes.h b/snapper/SnapperTypes.h -index 6b482ce..f670a78 100644 ---- a/snapper/SnapperTypes.h -+++ b/snapper/SnapperTypes.h -@@ -25,6 +25,7 @@ - - - #include <string> -+#include <iterator> - #include <vector> - #include <ostream> - #include <boost/algorithm/string.hpp> -diff --git a/snapper/SystemCmd.h b/snapper/SystemCmd.h -index 3d38604..a11a3a4 100644 ---- a/snapper/SystemCmd.h -+++ b/snapper/SystemCmd.h -@@ -28,6 +28,7 @@ - #include <stdio.h> - - #include <string> -+#include <iterator> - #include <vector> - #include <list> - #include <boost/noncopyable.hpp> -diff --git a/snapper/XAttributes.h b/snapper/XAttributes.h -index 434b4d9..014fe4d 100644 ---- a/snapper/XAttributes.h -+++ b/snapper/XAttributes.h -@@ -24,6 +24,7 @@ - - #include <stdint.h> - #include <map> -+#include <iterator> - #include <vector> - #include <string> - #include <ostream>