diff options
Diffstat (limited to 'testing/snapper')
| -rw-r--r-- | testing/snapper/APKBUILD | 12 | ||||
| -rw-r--r-- | testing/snapper/musl-boost.patch | 49 | ||||
| -rw-r--r-- | testing/snapper/musl-dbus.patch | 8 |
3 files changed, 4 insertions, 65 deletions
diff --git a/testing/snapper/APKBUILD b/testing/snapper/APKBUILD index 3f50e05178..fed70a2917 100644 --- a/testing/snapper/APKBUILD +++ b/testing/snapper/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=snapper -pkgver=0.8.2 -pkgrel=1 +pkgver=0.8.3 +pkgrel=0 pkgdesc="Manage filesystem snapshots and allow undo of system modifications" url="https://snapper.io" arch="all !armhf !armv7" # armhf: fails to build @@ -11,7 +11,7 @@ license="GPL-2.0" options="!check" depends="dbus" makedepends="automake autoconf libtool bash - btrfs-progs-dev e2fsprogs-dev dbus-dev acl-dev + btrfs-progs-dev e2fsprogs-dev dbus-dev acl-dev lvm2-dev libxml2-dev boost-dev bsd-compat-headers boost-thread gettext-dev libxslt docbook-xsl" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" @@ -23,10 +23,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/openSUSE/snapper/archive/v$p musl-_nl_msg_cat_cntr.patch musl-__isleap.patch musl-types.patch - musl-boost.patch remove-systemd.patch fix-poll_h.patch - musl-dbus.patch regex.patch" builddir="$srcdir/$pkgname-$pkgver" @@ -71,7 +69,7 @@ package() { install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/$pkgname } -sha512sums="53e801e5e3c939a63833fab143c665e2289e128004dd67dcc98826b994d2150b268af021505b0f98982d66ea520a2d98279da15a904a003f2a0a1f1fac80124f snapper-0.8.2.tar.gz +sha512sums="60d82854a323d4a872344a147efca7344a1bbcd9f9c5e607d037f335472f83070d7d4662c53b0fbcbaedea1bf008b63226beec7318a85b7b7343eff7009f34af snapper-0.8.3.tar.gz a9eec8105e94c4eb097aa293754b0de45420a297ad845933a7be66b3ff49af409dd427e9bd1de569c49982c619211d1e90183ed8bf8550acb0fa9d83176e22bf musl-posix.patch ddcd279f77007fe905df27b904dc84c8c2eebf0cf42c9f992fdc992e2912ddaab59712c13a798243c4f81727c04ef8e0993773686ab0c682e41726a2bcad962b musl-mode_t.patch f2581e1b5f05a43daea77b27b0c383d4f201bffb485ef1af9e6fcbe26e8dfa44bab36c23ca2d8ea7963fba0c3507d014bdbf1bc0c582c790b9e627fc97b62820 musl-mktime.patch @@ -79,8 +77,6 @@ ed393b476a679ebc8f130e34826958a30aa98dc7ac77c0c324a486cc3ed8539584552a305e2ddcb8 d5305df362df7db3b882cb491d32d11f479d1d56b21a39bc5e0cbdf7cdf70341eb566e7374bb9acc6d4fa1db027d4f009857fed21ef48ed311efaaa1be7b6329 musl-_nl_msg_cat_cntr.patch 8278c469def65e58cb2aee039882d1d237b4b404386472f9540da11a1d3cddd60dda08a99074f9f418b328ce2c4ac73d3190a74a6fe3e00eab9adb4fed87a4ec musl-__isleap.patch 8bc2b42bbee927ce88f77e71a9594da3b6e54e92008e5603c6d8db35b3ec37add456bcc52d7d6a913c69a395c73bd3f6a3934ea549d4cc0097cb65613f61ed48 musl-types.patch -a0c25dc1cc7ec1cc512f41302ecd293b2207902a79b9d2ee3b92585d1aab554f5c0546add8fb12ad3b5936636f3a86516287ac1667122c6045f5ef33fcbfc14b musl-boost.patch 61401ac8e91b838231e018490af61e7fe8c954750eaff4a9ff4e435aea78531cfa2882e354cb088a3a43951d869bdf7c516969a437195362f700e655878bcd71 remove-systemd.patch 2730b5d3d627e5d6140df1509a4676e4a8429f73a12804b88f0ef7dab46097f35ac209f3456bb0094a09843ebb810887a6392c3a6a308d27f43f2ea9621e586d fix-poll_h.patch -11627af9713013dfc4cbdca5a5be644cd49fe205edcaa6eaf64507903edd241f262e40e97a091b0f8ee3b495fe2c8fb904e4dbcc0e4e5bfabcc16c66654f561b musl-dbus.patch 6f70b20b1fdc4e935deaef9bc8978068041732e5296d0c9924cbd09f1b3bd0a46e4579f6b3542d7e1f17081dd88960cad7d19e56420f8d91ba906fa1f19f4842 regex.patch" diff --git a/testing/snapper/musl-boost.patch b/testing/snapper/musl-boost.patch deleted file mode 100644 index f549e52341..0000000000 --- a/testing/snapper/musl-boost.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/examples/c++-lib/Makefile.am b/examples/c++-lib/Makefile.am -index 52c81e5..715de51 100644 ---- a/examples/c++-lib/Makefile.am -+++ b/examples/c++-lib/Makefile.am -@@ -5,7 +5,7 @@ - AM_CPPFLAGS = -I$(top_srcdir) - - LDADD = ../../snapper/libsnapper.la --AM_LDFLAGS = -lboost_system -+AM_LDFLAGS = -lboost_system-mt - - noinst_PROGRAMS = List ListAll Create CmpDirs CreateNumber CreateTimeline - -diff --git a/server/Makefile.am b/server/Makefile.am -index 2a6a4c2..e007710 100644 ---- a/server/Makefile.am -+++ b/server/Makefile.am -@@ -14,4 +14,4 @@ snapperd_SOURCES = \ - Types.cc Types.h - - snapperd_LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lrt --snapperd_LDFLAGS = -lboost_system -lboost_thread -lpthread -+snapperd_LDFLAGS = -lboost_system-mt -lboost_thread-mt -lpthread -diff --git a/testsuite-cmp/Makefile.am b/testsuite-cmp/Makefile.am -index 81104bf..d88644e 100644 ---- a/testsuite-cmp/Makefile.am -+++ b/testsuite-cmp/Makefile.am -@@ -3,7 +3,7 @@ - # - - AM_CPPFLAGS = -I$(top_srcdir) --AM_LDFLAGS = -lboost_system -+AM_LDFLAGS = -lboost_system-mt - - LDADD = ../snapper/libsnapper.la - -diff --git a/snapper/Makefile.am b/snapper/Makefile.am -index 36467da..cb05a3b 100644 ---- a/snapper/Makefile.am -+++ b/snapper/Makefile.am -@@ -62,7 +62,7 @@ libsnapper_la_SOURCES += \ - endif - - libsnapper_la_LDFLAGS = -version-info @LIBVERSION_INFO@ --libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm -+libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm - if ENABLE_ROLLBACK - libsnapper_la_LIBADD += -lmount - endif diff --git a/testing/snapper/musl-dbus.patch b/testing/snapper/musl-dbus.patch deleted file mode 100644 index cf2334f650..0000000000 --- a/testing/snapper/musl-dbus.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/dbus/Makefile.am -+++ b/dbus/Makefile.am -@@ -12,4 +12,4 @@ - DBusMainLoop.cc DBusMainLoop.h - - libdbus_la_LIBADD = $(DBUS_LIBS) --libdbus_la_LDFLAGS = -lboost_system -lboost_thread -+libdbus_la_LDFLAGS = -lboost_system-mt -lboost_thread-mt |