From 3aa8eb99a784acd2959065f9742ac877b3d22384 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Mon, 26 Oct 2015 10:21:36 +0100 Subject: [PATCH] rmlint: update to 2.4.0. --- srcpkgs/rmlint/patches/musl-fts.patch | 35 --------------------------- srcpkgs/rmlint/template | 19 +++------------ 2 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 srcpkgs/rmlint/patches/musl-fts.patch diff --git a/srcpkgs/rmlint/patches/musl-fts.patch b/srcpkgs/rmlint/patches/musl-fts.patch deleted file mode 100644 index 8e5c42b367d..00000000000 --- a/srcpkgs/rmlint/patches/musl-fts.patch +++ /dev/null @@ -1,35 +0,0 @@ -Insert a check for the musl-fts library which will be used -for *-musl architectures. - ---- SConstruct 2015-05-10 01:34:58.000000000 +0200 -+++ SConstruct 2015-08-31 11:32:23.251480056 +0200 -@@ -286,6 +286,19 @@ - context.Result(rc) - return rc - -+def check_musl_fts(context): -+ rc = 1 -+ if tests.CheckHeader(context, 'fts.h'): -+ rc = 0 -+ -+ if tests.CheckLib(context, ['fts']): -+ rc = 0 -+ -+ conf.env['HAVE_FTS_H'] = rc -+ context.did_show_result = True -+ context.Result(rc) -+ return rc -+ - - def create_uninstall_target(env, path): - env.Command("uninstall-" + path, path, [ -@@ -448,7 +461,8 @@ - 'check_bigfiles': check_bigfiles, - 'check_c11': check_c11, - 'check_gettext': check_gettext, -- 'check_sqlite3': check_sqlite3 -+ 'check_sqlite3': check_sqlite3, -+ 'check_musl_fts': check_musl_fts - }) - - if not conf.CheckCC(): diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template index 89792e597bb..f658bf47d06 100644 --- a/srcpkgs/rmlint/template +++ b/srcpkgs/rmlint/template @@ -1,29 +1,18 @@ # Template file for 'rmlint' pkgname=rmlint -version=2.2.0 +version=2.4.0 revision=1 -hostmakedepends="git scons pkg-config" +hostmakedepends="git scons pkg-config python3 python3.4-Sphinx" makedepends="glib-devel libblkid-devel elfutils-devel json-glib-devel" short_desc="Extremely fast tool to remove duplicates" maintainer="Andrea Brancaleoni " license="GPL-3" homepage="http://rmlint.rtfd.org/" distfiles="https://github.com/sahib/$pkgname/archive/v$version.tar.gz" -checksum=b684aa73ec80423e1cc5e9cee9ae466f0ed0c6a2e5a88482a07d3306465ee6f1 - -case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" musl-fts" -esac - -pre_configure() { - case "$XBPS_TARGET_MACHINE" in - *-musl) # Add musl-fts to the libs - sed -i SConstruct -e "/conf\.check_sqlite3()/a conf.check_musl_fts()" - esac -} +checksum=f1c13681da073c4dc2f1173add85908d1e0e949659a1923ed7bfc0b2d1b8930d +nocross=y do_install() { - sed -i '/native/d' SConstruct scons CC="$CC" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" install --prefix=${DESTDIR}/usr vlicense COPYING }