From 9b416a02f389ec7853076a208762f2762f70d489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 6 Dec 2020 19:56:29 -0300 Subject: [PATCH 1/2] fuse-zip: remove CXXFLAGS workaround. No longer necessary. Also fix distfile location, for some reason the 0.7.1 tarball had been removed from downloads. --- srcpkgs/fuse-zip/template | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/srcpkgs/fuse-zip/template b/srcpkgs/fuse-zip/template index db224196e5c..5b7859ce824 100644 --- a/srcpkgs/fuse-zip/template +++ b/srcpkgs/fuse-zip/template @@ -2,6 +2,7 @@ pkgname=fuse-zip version=0.7.1 revision=1 +wrksrc=agalanin-fuse-zip-0865d60054d9 build_style=gnu-makefile make_build_args="all doc" make_install_args="prefix=/usr" @@ -11,9 +12,5 @@ short_desc="FUSE file system for ZIP archives" maintainer="Matthias von Faber " license="GPL-3.0-or-later" homepage="https://bitbucket.org/agalanin/fuse-zip" -distfiles="${homepage}/downloads/${pkgname}-${version}.tar.gz" -checksum=7dac61c3f27f9041545ab1a22bb772ea282ed2dea25a0220dcecfa6801b5b121 - -pre_build() { - vsed -i '/^CXXFLAGS=/d' Makefile lib/Makefile -} +distfiles="${homepage}/get/${version}.tar.gz" +checksum=771302586ca734bf845effcea999c38f4c2e984e29605912eb3470fbeea0b195 From dfdbbd808eac8f27a4acb4d17d128129a09ca26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 6 Dec 2020 19:56:48 -0300 Subject: [PATCH 2/2] splix: remove unnecessary build_style. Also xlint. --- srcpkgs/splix/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template index 60315c5d7b6..366aab114bc 100644 --- a/srcpkgs/splix/template +++ b/srcpkgs/splix/template @@ -1,20 +1,19 @@ -# Template file for 'splix-svn' +# Template file for 'splix' pkgname=splix version=2.0.0+svn315 revision=3 wrksrc="$pkgname-$version.orig" -build_style=gnu-makefile makedepends="cups-devel mit-krb5-devel jbigkit-devel" short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)" maintainer="Andrea Brancaleoni " -license="GPL-2" +license="GPL-2.0-only" homepage="http://splix.ap2c.org" distfiles="${DEBIAN_SITE}/main/s/$pkgname/${pkgname}_$version.orig.tar.gz" checksum="578a81bd5b1b97756a539c3bb6339fd109d54419887a73e705941da8aa7fac52" -CXXFLAGS=" -fno-strict-aliasing" +CXXFLAGS="-fno-strict-aliasing" do_build() { - sed -i rules.mk \ + vsed -i rules.mk \ -e's;$(CXX) -o;$(CXX) $(LDFLAGS) -o;' make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \ CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" STRIP="true" drv