From 45496516a40ae785ddc11f11eaf876ba4923dbf9 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Sun, 13 May 2018 04:37:26 -0300 Subject: [PATCH] mergerfs: update to 2.24.2. Closes #14359. Signed-off-by: Enno Boland --- srcpkgs/mergerfs/patches/system-fuse.patch | 10 +++++----- srcpkgs/mergerfs/template | 20 ++++++++------------ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/srcpkgs/mergerfs/patches/system-fuse.patch b/srcpkgs/mergerfs/patches/system-fuse.patch index 39426f0ac7d..6d7a1d1ea99 100644 --- a/srcpkgs/mergerfs/patches/system-fuse.patch +++ b/srcpkgs/mergerfs/patches/system-fuse.patch @@ -1,13 +1,13 @@ ---- Makefile.orig 2017-06-04 20:12:49.459463768 +0200 -+++ Makefile 2017-06-04 20:14:04.535236799 +0200 -@@ -77,9 +77,8 @@ help: +--- Makefile ++++ Makefile +@@ -84,9 +84,8 @@ help: @echo "usage: make" @echo "make XATTR_AVAILABLE=0 - to build program without xattrs functionality (auto discovered otherwise)" --$(TARGET): src/version.hpp obj/obj-stamp libfuse/lib/.libs/libfuse.a $(OBJ) +-$(TARGET): version obj/obj-stamp libfuse/lib/.libs/libfuse.a $(OBJ) - cd libfuse && make - $(CXX) $(CFLAGS) $(OBJ) -o $@ libfuse/lib/.libs/libfuse.a -ldl $(LDFLAGS) -+$(TARGET): src/version.hpp obj/obj-stamp $(OBJ) ++$(TARGET): version obj/obj-stamp $(OBJ) + $(CXX) $(CFLAGS) $(OBJ) -o $@ -lfuse -ldl $(LDFLAGS) mount.mergerfs: $(TARGET) diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template index 1796f23acfa..454a428e5b3 100644 --- a/srcpkgs/mergerfs/template +++ b/srcpkgs/mergerfs/template @@ -1,27 +1,23 @@ # Template file for 'mergerfs' -pkgname="mergerfs" -version=2.23.1 +pkgname=mergerfs +version=2.24.2 revision=1 build_style=gnu-makefile -makedepends="fuse-devel attr-devel" -hostmakedepends="automake libtool pkg-config" +hostmakedepends="automake libtool pandoc pkg-config" +makedepends="attr-devel fuse-devel" short_desc="FUSE union filesystem" maintainer="Orphaned " license="ISC" homepage="https://github.com/trapexit/mergerfs" distfiles="${homepage}/archive/${version}/${pkgname}-${version}.tar.gz" -checksum=f38c3909c7145d291fa4cb85241f488efc01000ec9657a3cf72ee6ab4400c733 - -case "$XBPS_TARGET_MACHINE" in - *-musl) # Does not have pandoc - ;; - *) hostmakedepends+=" pandoc" - ;; -esac +checksum=bd0c9e5962361aae1040f341ebe05fe4ceef7c503e17e03d73b572643bfdfbfd pre_build() { sed -i 's|^CFLAGS[[:blank:]]*=|override CFLAGS +=|g' Makefile sed -i 's|^LDFLAGS[[:blank:]]*=|override LDFLAGS +=|g' Makefile + + echo "#pragma once" > src/version.hpp + echo "static const char MERGERFS_VERSION[] = \"${version}\";" >> src/version.hpp } post_install() {