From 2daf5647b6961ff6281d5c89b50783e5258a6b4b Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 5 Mar 2020 10:12:42 +0100 Subject: do not overwrite prepare if it already existed --- community/bazel/PKGBUILD | 13 +++++++++---- community/embree/PKGBUILD | 14 ++++++++++---- community/exa/PKGBUILD | 14 ++++++++++---- community/fig2dev/PKGBUILD | 18 ++++++++++++------ community/haskell-gauge/PKGBUILD | 19 ++++++++++++------- community/lbzip2/PKGBUILD | 14 ++++++++++---- community/libnids/PKGBUILD | 14 ++++++++++---- community/python-libnacl/PKGBUILD | 18 ++++++++++++------ community/smbnetfs/PKGBUILD | 12 +++++++++--- community/vamp-aubio-plugins/PKGBUILD | 16 +++++++++++----- community/xaos/PKGBUILD | 16 +++++++++++----- core/gpgme/PKGBUILD | 14 ++++++++++---- core/libaio/PKGBUILD | 14 ++++++++++---- core/libgpg-error/PKGBUILD | 18 +++++++++++------- core/m4/PKGBUILD | 16 +++++++++++----- extra/devtools/PKGBUILD | 22 ++++++++++++++-------- extra/mutter/PKGBUILD | 17 +++++++++++------ extra/xfce4-diskperf-plugin/PKGBUILD | 14 ++++++++++---- 18 files changed, 193 insertions(+), 90 deletions(-) diff --git a/community/bazel/PKGBUILD b/community/bazel/PKGBUILD index dbf28e9b..7dd96e62 100644 --- a/community/bazel/PKGBUILD +++ b/community/bazel/PKGBUILD @@ -1,6 +1,11 @@ depends=("${depends[@]/java-environment>=8/java-environment=8}") -prepare() { - sed -i 's|#error This code for 64 bit Unix|//#error This code for 64 bit Unix|g' \ - ${srcdir}/src/tools/singlejar/mapped_file.h -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i sed -i '"'"'s|#error This code for 64 bit Unix|//#error This code for 64 bit Unix|g'"'"' ${srcdir}/src/tools/singlejar/mapped_file.h + ' +)" diff --git a/community/embree/PKGBUILD b/community/embree/PKGBUILD index ee543197..522a3482 100644 --- a/community/embree/PKGBUILD +++ b/community/embree/PKGBUILD @@ -15,7 +15,13 @@ eval "$( # applying a counter-patch here source+=('embree-3.2.0-intrinsic.patch') sha256sums+=('7d5e44a034b02e14d7d37cd038d8c279d13d66b54a449c09e0687458f117723f') -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i "$srcdir/embree-3.2.0-intrinsic.patch" -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "$srcdir/$pkgname-$pkgver" \ + patch -Np1 -i "$srcdir/embree-3.2.0-intrinsic.patch" + ' +)" diff --git a/community/exa/PKGBUILD b/community/exa/PKGBUILD index 1de368f8..f0d6c232 100644 --- a/community/exa/PKGBUILD +++ b/community/exa/PKGBUILD @@ -3,7 +3,13 @@ source+=('exa-ascii-deprecated.patch') md5sums+=('ce36630a183f5d5be9f1a334bdf8a7cc') -prepare() { - cd "$pkgname" - patch -Np1 -i ../exa-ascii-deprecated.patch -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "$srcdir/$pkgname" \ + patch -Np1 -i ../exa-ascii-deprecated.patch + ' +)" diff --git a/community/fig2dev/PKGBUILD b/community/fig2dev/PKGBUILD index b761add0..56b41da9 100644 --- a/community/fig2dev/PKGBUILD +++ b/community/fig2dev/PKGBUILD @@ -1,6 +1,12 @@ -prepare() { - find "${pkgname}-${pkgver}" \ - -exec sed -i ' - s/Invalid resolution information (-1)\./Invalid spline object./g - ' {} \; -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i find "${srcdir}/${pkgname}-${pkgver}" \ + -exec sed -i '"'"' \ + s/Invalid resolution information (-1)\./Invalid spline object./g \ + '"'"' {} \; + ' +)" diff --git a/community/haskell-gauge/PKGBUILD b/community/haskell-gauge/PKGBUILD index a5bd662e..eeba4490 100644 --- a/community/haskell-gauge/PKGBUILD +++ b/community/haskell-gauge/PKGBUILD @@ -1,10 +1,15 @@ # temporarily disabled 'verbose' test, see upstream: # https://github.com/vincenthz/hs-gauge/issues/54 -prepare() { - cd "${srcdir}/${_hkgname}-${pkgver}" - - sed -i '/test-suite verbose/, /test-suite quick/ { s/\(.*\)/#\1/ }' gauge.cabal - sed -i 's/#test-suite quick/test-suite quick/' gauge.cabal - sed -i '/^#.*/d' gauge.cabal -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "${srcdir}/${_hkgname}-${pkgver}" \ + sed -i '"'"'/test-suite verbose/, /test-suite quick/ { s/\(.*\)/#\1/ }'"'"' gauge.cabal \ + sed -i '"'"'s/#test-suite quick/test-suite quick/'"'"' gauge.cabal \ + sed -i '"'"'/^#.*/d'"'"' gauge.cabal + ' +)" diff --git a/community/lbzip2/PKGBUILD b/community/lbzip2/PKGBUILD index 682e25f3..1bb52877 100644 --- a/community/lbzip2/PKGBUILD +++ b/community/lbzip2/PKGBUILD @@ -2,7 +2,13 @@ source+=('4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.patch') sha256sums+=('5eca4665b147655ce99f9ae5eff50e7db2714ba957e41e20b50d80533aeb6bef') -prepare() { - cd "${srcdir}"/$pkgname-$pkgver - patch -p1 -i ../4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.patch -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "${srcdir}"/$pkgname-$pkgver \ + patch -p1 -i ../4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.patch + ' +)" diff --git a/community/libnids/PKGBUILD b/community/libnids/PKGBUILD index 13578e05..7a510454 100644 --- a/community/libnids/PKGBUILD +++ b/community/libnids/PKGBUILD @@ -5,7 +5,13 @@ source+=('libnids-1.24-inline.patch') sha256sums+=('3aea2351877c2a789d753ac66f1323a3d575dead9fb04c559e221dbebdfc7e3e') -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i "$srcdir/libnids-1.24-inline.patch" -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "$srcdir/$pkgname-$pkgver" \ + patch -Np1 -i "$srcdir/libnids-1.24-inline.patch" + ' +)" diff --git a/community/python-libnacl/PKGBUILD b/community/python-libnacl/PKGBUILD index ca82c81d..6eda5b5e 100644 --- a/community/python-libnacl/PKGBUILD +++ b/community/python-libnacl/PKGBUILD @@ -1,9 +1,15 @@ # see https://bbs.archlinux32.org/viewtopic.php?pid=224 # and https://github.com/saltstack/libnacl/issues/103 -prepare() { - sed -i ' - s/m, mlen,/m, ctypes.byref(mlen),/ - ' "libnacl-${pkgver}/libnacl/__init__.py" - cp -r libnacl-$pkgver{,-py2} -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i sed -i '"'"' \ + s/m, mlen,/m, ctypes.byref(mlen),/ \ + '"'"' "libnacl-${pkgver}/libnacl/__init__.py" \ + cp -r libnacl-$pkgver{,-py2} + ' +)" diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD index 6c6147a8..8156b28e 100644 --- a/community/smbnetfs/PKGBUILD +++ b/community/smbnetfs/PKGBUILD @@ -1,4 +1,10 @@ # https://sourceforge.net/p/smbnetfs/git/ci/f0e109dcc9e14b914d8f5877b4482e79d24a0ad6/ -prepare() { - sed -i '\,^#include $,d' "$srcdir"/$pkgname-$pkgver/src/function.c -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i sed -i '"'"'\,^#include $,d'"'"' "$srcdir"/$pkgname-$pkgver/src/function.c + ' +)" diff --git a/community/vamp-aubio-plugins/PKGBUILD b/community/vamp-aubio-plugins/PKGBUILD index c07e32f7..7d884b2e 100644 --- a/community/vamp-aubio-plugins/PKGBUILD +++ b/community/vamp-aubio-plugins/PKGBUILD @@ -1,5 +1,11 @@ -prepare() { - sed -i ' - 48 s/x86_64/i686/ - ' vamp-aubio-plugins-0.5.1/wscript -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i sed -i '"'"' \ + 48 s/x86_64/i686/ \ + '"'"' vamp-aubio-plugins-0.5.1/wscript + ' +)" diff --git a/community/xaos/PKGBUILD b/community/xaos/PKGBUILD index d3dd57f2..15dd3e6c 100644 --- a/community/xaos/PKGBUILD +++ b/community/xaos/PKGBUILD @@ -1,8 +1,14 @@ source+=('xaos.patch') sha256sums+=('b07cdc88be38a30a40bccc2f999bff50ae8a25fc10ed4f2f7c7e2ff117f085e5') -prepare() { - patch -p1 -N -i "$srcdir/xaos.patch" -d "$srcdir/$pkgname-$pkgver" - gendesk -f -n --pkgname=$pkgname --pkgdesc="$pkgdesc" \ - --categories='Application;Graphics' -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i patch -p1 -N -i "$srcdir/xaos.patch" -d "$srcdir/$pkgname-$pkgver" \ + gendesk -f -n --pkgname=$pkgname --pkgdesc="$pkgdesc" \\\ + --categories='"'"'Application;Graphics'"'"' + ' +)" diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD index d7f790eb..d48edca2 100644 --- a/core/gpgme/PKGBUILD +++ b/core/gpgme/PKGBUILD @@ -4,10 +4,16 @@ source+=(0004-Avoid-Y2038-problem-on-32-bit-architectures.patch) sha256sums+=('0c788590e0bb7cc9da04457f94360ceef9cb9fc0525e6bfbf9fbb8d72801ae8f') -prepare() { - cd ${pkgbase}-${pkgver} - patch -Np1 -i "$srcdir/0004-Avoid-Y2038-problem-on-32-bit-architectures.patch" -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "${srcdir}/${pkgbase}-${pkgver}" \ + patch -Np1 -i "$srcdir/0004-Avoid-Y2038-problem-on-32-bit-architectures.patch" + ' +)" # no GUI stuff on i486 makedepends=(${makedepends[@]//qt5-base/}) diff --git a/core/libaio/PKGBUILD b/core/libaio/PKGBUILD index a4cbd68f..1809af7b 100644 --- a/core/libaio/PKGBUILD +++ b/core/libaio/PKGBUILD @@ -11,7 +11,13 @@ eval "$( # see also FS#60283 source+=('libaio-0.3.111-sizeof-template.patch') md5sums+=('8c240ea721460fa2d34f9e134b57544d') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../libaio-0.3.111-sizeof-template.patch -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "${srcdir}/${pkgname}-${pkgver}" \ + patch -Np1 -i ../libaio-0.3.111-sizeof-template.patch + ' +)" diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD index 304d11ab..e6bb70dd 100644 --- a/core/libgpg-error/PKGBUILD +++ b/core/libgpg-error/PKGBUILD @@ -1,9 +1,13 @@ # gawk namspace conflict, see FS#63761 -prepare() { - cd ${pkgname}-${pkgver} - sed -i \ - -e "s/namespace/varerrno/g" \ - src/{Makefile.am,mkstrtable.awk} - ./autogen.sh -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "${srcdir}/${pkgname}-${pkgver}" \ + sed -i -e "s/namespace/varerrno/g" src/{Makefile.am,mkstrtable.awk} \ + ./autogen.sh + ' +)" diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD index ad7195a3..99059a2a 100644 --- a/core/m4/PKGBUILD +++ b/core/m4/PKGBUILD @@ -2,8 +2,14 @@ source+=('m4-1.4.18-glibc-change-work-around.patch') md5sums+=('01968e8f3a5be62de1c849668db8042b') -prepare() { - cd $pkgname-$pkgver - patch -p1 -i "$srcdir/m4-1.4.18-glibc-change-work-around.patch" - echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd $pkgname-$pkgver \ + patch -p1 -i "$srcdir/m4-1.4.18-glibc-change-work-around.patch" \ + echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h + ' +)" diff --git a/extra/devtools/PKGBUILD b/extra/devtools/PKGBUILD index 19bd31a0..37f0da9d 100644 --- a/extra/devtools/PKGBUILD +++ b/extra/devtools/PKGBUILD @@ -17,14 +17,20 @@ unset b2sums makedepends+=('asciidoc') -prepare() { - cd "${srcdir}/${pkgname}32-v${pkgver}" - sed -i ' - s,\$working_dir/etc/pacman\.d/mirrorlist32,/dev/null, - s/mirrorlist32/mirrorlist/g - ' 'arch-nspawn.in' - sed -i 's@s,/mirrorlist\\\$\$,\\032,;\?@@' 'Makefile' -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "${srcdir}/${pkgname}32-v${pkgver}" \ + sed -i '"'"' \ + s,\$working_dir/etc/pacman\.d/mirrorlist32,/dev/null, \ + s/mirrorlist32/mirrorlist/g \ + '"'"' '"'"'arch-nspawn.in'"'"' \ + sed -i '"'"'s@s,/mirrorlist\\\$\$,\\032,;\?@@'"'"' '"'"'Makefile'"'"' + ' +)" eval "$( declare -f prepare build check package | \ diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 60ceb6fa..8a8a4f44 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -9,9 +9,14 @@ eval "$( source+=(fix-build.diff) sha256sums+=('28aa24daed161f2566ca2b159beb43285184c533956b851a7eb318de741da935') -prepare() { - cd $pkgname - - # fix build with libglvnd's EGL headers - git apply -3 ../fix-build.diff -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $i cd "$srcdir/$pkgname" \ + # fix build with libglvnd's EGL headers \ + git apply -3 ../fix-build.diff + ' +)" diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD index f42f1cb5..74532d0b 100644 --- a/extra/xfce4-diskperf-plugin/PKGBUILD +++ b/extra/xfce4-diskperf-plugin/PKGBUILD @@ -1,5 +1,11 @@ # see https://bugs.archlinux.org/task/60632 -prepare() { - cd $pkgname-$pkgver - sed -i '/#include / a #include /' panel-plugin/devperf.c -} +eval "$( + { + declare -f prepare || \ + printf 'prepare() {\n}\n' + } \ + | sed ' + $ i cd "$srcdir/$pkgname-$pkgver"\ + sed -i '"'"'/#include / a #include /'"'"' panel-plugin/devperf.c + ' +)" -- cgit v1.2.3