From 4a37d87b49ab7699da773241d5cb53efc5cb265c Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 11 Jun 2018 20:26:28 +0200 Subject: [PATCH] Simplify patching ing mingw-w64-qt5-base* --- qt5-base/mingw-w64-angle/PKGBUILD | 15 +-------------- qt5-base/mingw-w64-dynamic/PKGBUILD | 15 +-------------- qt5-base/mingw-w64-static/PKGBUILD | 15 +-------------- qt5-base/mingw-w64/PKGBUILD | 15 +-------------- 4 files changed, 4 insertions(+), 56 deletions(-) diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD index 58727e8f..21682889 100644 --- a/qt5-base/mingw-w64-angle/PKGBUILD +++ b/qt5-base/mingw-w64-angle/PKGBUILD @@ -143,25 +143,12 @@ if ! isDefault; then fi fi -patch() { - local input_found= - local patch_file= - for arg in $@; do - if [[ $input_found ]]; then - patch_file="$arg" - break - fi - [[ $arg == -i ]] && input_found=1 - done - msg2 "Applying patch $patch_file" - /usr/bin/patch $@ -} - prepare() { cd "${srcdir}/${_pkgfqn}" # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do + msg2 "Applying patch $patch" patch -p1 -i "$patch" done diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD index 51ed1a80..376d373a 100644 --- a/qt5-base/mingw-w64-dynamic/PKGBUILD +++ b/qt5-base/mingw-w64-dynamic/PKGBUILD @@ -143,25 +143,12 @@ if ! isDefault; then fi fi -patch() { - local input_found= - local patch_file= - for arg in $@; do - if [[ $input_found ]]; then - patch_file="$arg" - break - fi - [[ $arg == -i ]] && input_found=1 - done - msg2 "Applying patch $patch_file" - /usr/bin/patch $@ -} - prepare() { cd "${srcdir}/${_pkgfqn}" # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do + msg2 "Applying patch $patch" patch -p1 -i "$patch" done diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index b706b5a6..2c240415 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -143,25 +143,12 @@ if ! isDefault; then fi fi -patch() { - local input_found= - local patch_file= - for arg in $@; do - if [[ $input_found ]]; then - patch_file="$arg" - break - fi - [[ $arg == -i ]] && input_found=1 - done - msg2 "Applying patch $patch_file" - /usr/bin/patch $@ -} - prepare() { cd "${srcdir}/${_pkgfqn}" # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do + msg2 "Applying patch $patch" patch -p1 -i "$patch" done diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 6bf45ece..97219767 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -143,25 +143,12 @@ if ! isDefault; then fi fi -patch() { - local input_found= - local patch_file= - for arg in $@; do - if [[ $input_found ]]; then - patch_file="$arg" - break - fi - [[ $arg == -i ]] && input_found=1 - done - msg2 "Applying patch $patch_file" - /usr/bin/patch $@ -} - prepare() { cd "${srcdir}/${_pkgfqn}" # apply patches; further descriptions can be found in patch files itself for patch in "$srcdir/"*.patch; do + msg2 "Applying patch $patch" patch -p1 -i "$patch" done