From 71261f81dbef1c268c2410c0a44c9ae7a67b62ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 6 Dec 2020 19:55:56 -0300 Subject: [PATCH 1/4] crypto++: remove CXXFLAGS workaround. No longer necessary. Also fix distfiles location and wrksrc. Distfiles from the project's homepage couldn't be fetched due to certificate errors. --- srcpkgs/crypto++/template | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template index d56e7ff2c20..cccd5e77ea8 100644 --- a/srcpkgs/crypto++/template +++ b/srcpkgs/crypto++/template @@ -2,7 +2,8 @@ pkgname=crypto++ version=820 revision=2 -create_wrksrc=yes +_version="${version:0:1}_${version:1:1}_${version:2:1}" +wrksrc=cryptopp-CRYPTOPP_${_version} build_style=gnu-makefile make_build_args="PREFIX=/usr" make_build_target="dynamic static libcryptopp.pc" @@ -11,9 +12,9 @@ hostmakedepends="unzip" short_desc="Free C++ class library of cryptographic schemes" maintainer="Orphaned " license="BSL-1.0" -homepage="http://www.cryptopp.com/" -distfiles="http://www.cryptopp.com/cryptopp${version}.zip" -checksum=03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058 +homepage="https://www.cryptopp.com/" +distfiles="https://github.com/weidai11/cryptopp/archive/CRYPTOPP_${_version}.tar.gz" +checksum=e3bcd48a62739ad179ad8064b523346abb53767bcbefc01fe37303412292343e CXXFLAGS="-DNDEBUG -fPIC" @@ -21,9 +22,6 @@ if [ "$XBPS_CROSS" ]; then make_build_args+=" -f GNUmakefile-cross" fi -post_extract() { - sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile -} post_install() { vlicense License.txt LICENSE } From dc60412de8a76088b5e5ce92d280592c4dfece37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Sun, 6 Dec 2020 19:56:15 -0300 Subject: [PATCH 2/4] espeak: remove CXXFLAGS workaround. No longer necessary. --- srcpkgs/espeak/template | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template index 354ae5d6988..4161b04dd94 100644 --- a/srcpkgs/espeak/template +++ b/srcpkgs/espeak/template @@ -5,6 +5,7 @@ revision=5 wrksrc="${pkgname}-${version}-source" build_wrksrc=src build_style=gnu-makefile +make_build_args="AUDIO=runtime" hostmakedepends="unzip" makedepends="pulseaudio-devel portaudio-devel" short_desc="Text to Speech engine" @@ -18,10 +19,6 @@ pre_configure() { cp portaudio19.h portaudio.h } -do_build() { - make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime -} - libespeak_package() { short_desc+=" - runtime libraries" pkg_install() { From 88fbd59a1cdac1000c8ef661a979abb4a3aa378d 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 3/4] 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 e89495dc5b1ae054c0e6c2a59fb745b8c57071e9 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 4/4] splix: remove unnecessary build_style. --- srcpkgs/splix/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template index 60315c5d7b6..a1405f0793c 100644 --- a/srcpkgs/splix/template +++ b/srcpkgs/splix/template @@ -3,7 +3,6 @@ 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 "