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 --- core/gpgme/PKGBUILD | 14 ++++++++++---- core/libaio/PKGBUILD | 14 ++++++++++---- core/libgpg-error/PKGBUILD | 18 +++++++++++------- core/m4/PKGBUILD | 16 +++++++++++----- 4 files changed, 42 insertions(+), 20 deletions(-) (limited to 'core') 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 + ' +)" -- cgit v1.2.3-54-g00ecf