From 78730a430323e04378c48a6ce972d8086b70f181 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Sun, 15 Nov 2020 18:58:40 -0600 Subject: [PATCH] partclone: update to 0.3.17 --- srcpkgs/partclone/patches/0001-musl.patch | 40 +++++++++++++++++++++++ srcpkgs/partclone/patches/musl.patch | 23 ------------- srcpkgs/partclone/template | 6 ++-- 3 files changed, 43 insertions(+), 26 deletions(-) create mode 100644 srcpkgs/partclone/patches/0001-musl.patch delete mode 100644 srcpkgs/partclone/patches/musl.patch diff --git a/srcpkgs/partclone/patches/0001-musl.patch b/srcpkgs/partclone/patches/0001-musl.patch new file mode 100644 index 00000000000000..6720add1959405 --- /dev/null +++ b/srcpkgs/partclone/patches/0001-musl.patch @@ -0,0 +1,40 @@ +From 3ea1aa99242204e3c1841ac11d9f7064591d3bff Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Sun, 15 Nov 2020 18:53:54 -0600 +Subject: [PATCH] musl + +--- + src/btrfs/kernel-lib/rbtree.h | 4 ++++ + src/main.c | 1 - + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git src/btrfs/kernel-lib/rbtree.h src/btrfs/kernel-lib/rbtree.h +index 6d68907..affab1d 100644 +--- src/btrfs/kernel-lib/rbtree.h ++++ src/btrfs/kernel-lib/rbtree.h +@@ -38,6 +38,10 @@ + extern "C" { + #endif + ++#ifndef __always_inline ++#define __always_inline inline__attribute__((always_inline)) ++#endif ++ + struct rb_node { + unsigned long __rb_parent_color; + struct rb_node *rb_right; +diff --git src/main.c src/main.c +index babcf0c..8a543f3 100644 +--- src/main.c ++++ src/main.c +@@ -22,7 +22,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +2.29.2 + diff --git a/srcpkgs/partclone/patches/musl.patch b/srcpkgs/partclone/patches/musl.patch deleted file mode 100644 index 815bc7fe3564c8..00000000000000 --- a/srcpkgs/partclone/patches/musl.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- src/main.c.orig -+++ src/main.c -@@ -20,7 +20,6 @@ - #include - #include - #include --#include - #include - #include - #include ---- src/btrfs/rbtree.h.orig -+++ src/btrfs/rbtree.h -@@ -38,6 +38,10 @@ - extern "C" { - #endif - -+#ifndef __always_inline -+#define __always_inline inline __attribute__((always_inline)) -+#endif -+ - struct rb_node { - unsigned long __rb_parent_color; - struct rb_node *rb_right; diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template index 3c504c88a71782..59c975d935415c 100644 --- a/srcpkgs/partclone/template +++ b/srcpkgs/partclone/template @@ -1,7 +1,7 @@ # Template file for 'partclone' pkgname=partclone -version=0.3.14 -revision=2 +version=0.3.17 +revision=1 build_style=gnu-configure configure_args="--disable-rpath --enable-ncursesw --enable-f2fs --enable-extfs --enable-hfsp --enable-fat --enable-exfat @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://www.partclone.org/" distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz" -checksum=c298d2e7a6da97660325ca9296174e94e78dfc161df01bfdb1ea36c7001a6879 +checksum=ef1391db3801e4b3ef82fc9417f1d7f0542b7229b3394120072b2dfeae0bbbb0 CFLAGS="-DBTRFS_DISABLE_BACKTRACE" pre_configure() {