From 3bb9b1e4450e1102fdd878f7fcff4fa18dc2d724 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 30 Mar 2022 00:38:27 +0200 Subject: [PATCH 1/3] patch_args: allow use of --directory parameter patch(1) has a -d/--directory parameter which allows us to specify a directory where the patch will be applied. This is especially useful when we have multiple distfiles and want to patch in $build_wrksrc because that's where the patch is usually applied. Problem is, that the -i parameter is also relative to the the -d parameter and thus fails to find the patch, when -d is set. We solve that by using standard input instead of -i. --- common/hooks/do-patch/00-patches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/hooks/do-patch/00-patches.sh b/common/hooks/do-patch/00-patches.sh index 9f7e21f017dc..64659dc30280 100644 --- a/common/hooks/do-patch/00-patches.sh +++ b/common/hooks/do-patch/00-patches.sh @@ -31,7 +31,7 @@ _process_patch() { cd "$wrksrc" msg_normal "$pkgver: patching: ${_patch}.\n" - patch -s ${_args} -i ${_patch} 2>/dev/null + patch -s ${_args} <${_patch} 2>/dev/null } hook() { From b3e2f235779c4b1eb43973f61630aa6e04e6363d Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 30 Mar 2022 00:57:00 +0200 Subject: [PATCH 2/3] wine: patch into $build_wrksrc --- srcpkgs/wine/patches/musl-limits.patch | 4 ++-- srcpkgs/wine/patches/musl-rpath.patch | 9 +++++++-- srcpkgs/wine/patches/musl-uid-t.patch | 4 ++-- srcpkgs/wine/template | 3 +++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch index 7546d45c7609..6a46158221b4 100644 --- a/srcpkgs/wine/patches/musl-limits.patch +++ b/srcpkgs/wine/patches/musl-limits.patch @@ -1,5 +1,5 @@ ---- a/wine-7.6/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 -+++ b/wine-7.6/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 +--- a/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 ++++ b/dlls/winebus.sys/bus_udev.c 2021-10-23 15:39:06.662064765 +0200 @@ -29,7 +29,8 @@ #include #include diff --git a/srcpkgs/wine/patches/musl-rpath.patch b/srcpkgs/wine/patches/musl-rpath.patch index e0b6f8626637..f522f7ecea2d 100644 --- a/srcpkgs/wine/patches/musl-rpath.patch +++ b/srcpkgs/wine/patches/musl-rpath.patch @@ -1,7 +1,7 @@ diff --git a/configure b/configure index 774a95ce003..d408e77cc78 100755 ---- a/wine-7.6/configure -+++ b/wine-7.6/configure +--- a/configure ++++ b/configure @@ -11137,6 +11137,38 @@ fi LIBWINE_DEPENDS="wine.map" @@ -43,8 +43,13 @@ index 774a95ce003..d408e77cc78 100755 diff --git a/configure.ac b/configure.ac index 8c5066a3de6..01ede86df1e 100644 +<<<<<<< HEAD --- a/wine-7.6/configure.ac +++ b/wine-7.6/configure.ac +======= +--- a/configure.ac ++++ b/configure.ac +>>>>>>> 6dccb4ef9c (wine: patch into $build_wrksrc) @@ -916,6 +916,9 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version") AC_SUBST(LIBWINE_DEPENDS,"wine.map") diff --git a/srcpkgs/wine/patches/musl-uid-t.patch b/srcpkgs/wine/patches/musl-uid-t.patch index a95011e3cca0..ac8dfca3bb2f 100644 --- a/srcpkgs/wine/patches/musl-uid-t.patch +++ b/srcpkgs/wine/patches/musl-uid-t.patch @@ -1,5 +1,5 @@ ---- a/wine-7.6/server/security.h 2022-01-29 08:23:43.759508270 +0100 -+++ b/wine-7.6/server/security.h 2022-01-29 08:24:07.976443565 +0100 +--- a/server/security.h 2022-01-29 08:23:43.759508270 +0100 ++++ b/server/security.h 2022-01-29 08:24:07.976443565 +0100 @@ -22,6 +22,7 @@ #define __WINE_SERVER_SECURITY_H diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 86d0acf0883b..beb10898af92 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -25,6 +25,8 @@ desc_option_xshm="Enable support for the X Shared Memory Extension" lib32mode=full archs="i686* x86_64*" +patch_args="-Np1 --directory=${build_wrksrc}" + _nopie=no if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then # build system adds -fno-PIC for 32bit builds, which, @@ -48,6 +50,7 @@ makedepends="gettext-devel ncurses-devel glu-devel libSM-devel depends="libXi libXinerama libXcomposite libXcursor libOSMesa desktop-file-utils hicolor-icon-theme liberation-fonts-ttf gnutls SDL2 wine-common>=${version}_${revision} libwine>=${version}_${revision}" +# This testsuite might hang indefinitely make_check=extended case $XBPS_TARGET_MACHINE in From 01b113900a54485feaf6b1670d7d7f3fb848cc6e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sat, 9 Apr 2022 13:38:04 +0200 Subject: [PATCH 3/3] chatterino2: patch into $build_wrksrc --- .../patches/0001-fix-desktop-icon-name.patch | 4 ++-- srcpkgs/chatterino2/patches/cmake.patch | 12 ++++++------ srcpkgs/chatterino2/template | 5 +++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch index 9f41d03190b7..1b0a6d6140e4 100644 --- a/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch +++ b/srcpkgs/chatterino2/patches/0001-fix-desktop-icon-name.patch @@ -1,7 +1,7 @@ diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop index 6ee45354..ece81f5c 100644 ---- a/chatterino2/resources/com.chatterino.chatterino.desktop -+++ b/chatterino2/resources/com.chatterino.chatterino.desktop +--- a/resources/com.chatterino.chatterino.desktop ++++ b/resources/com.chatterino.chatterino.desktop @@ -4,7 +4,7 @@ Version=1.0 Name=Chatterino Comment=Chat client for Twitch diff --git a/srcpkgs/chatterino2/patches/cmake.patch b/srcpkgs/chatterino2/patches/cmake.patch index a59d0a4eb9f0..8a5643566957 100644 --- a/srcpkgs/chatterino2/patches/cmake.patch +++ b/srcpkgs/chatterino2/patches/cmake.patch @@ -1,7 +1,7 @@ diff --git a/cmake/FindLRUCache.cmake b/cmake/FindLRUCache.cmake index 82905436..b0b89a4e 100644 ---- a/chatterino2/cmake/FindLRUCache.cmake -+++ b/chatterino2/cmake/FindLRUCache.cmake +--- a/cmake/FindLRUCache.cmake ++++ b/cmake/FindLRUCache.cmake @@ -1,6 +1,6 @@ include(FindPackageHandleStandardArgs) @@ -12,8 +12,8 @@ index 82905436..b0b89a4e 100644 diff --git a/cmake/FindPajladaSerialize.cmake b/cmake/FindPajladaSerialize.cmake index 4671874c..119284c2 100644 ---- a/chatterino2/cmake/FindPajladaSerialize.cmake -+++ b/chatterino2/cmake/FindPajladaSerialize.cmake +--- a/cmake/FindPajladaSerialize.cmake ++++ b/cmake/FindPajladaSerialize.cmake @@ -1,6 +1,6 @@ include(FindPackageHandleStandardArgs) @@ -24,8 +24,8 @@ index 4671874c..119284c2 100644 diff --git a/cmake/FindPajladaSignals.cmake b/cmake/FindPajladaSignals.cmake index f4c964ec..75efba20 100644 ---- a/chatterino2/cmake/FindPajladaSignals.cmake -+++ b/chatterino2/cmake/FindPajladaSignals.cmake +--- a/cmake/FindPajladaSignals.cmake ++++ b/cmake/FindPajladaSignals.cmake @@ -1,6 +1,6 @@ include(FindPackageHandleStandardArgs) diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index e1f99ac9e9fc..7bf7d6a37d04 100644 --- a/srcpkgs/chatterino2/template +++ b/srcpkgs/chatterino2/template @@ -9,7 +9,7 @@ _signals_commit="baf5bb04bd13b090e405e0447c89a811f7e23ddc" _qtkeychain_commit="de954627363b0b4bff9a2616f1a409b7e14d5df9" _sanitizers_cmake_commit="99e159ec9bc8dd362b08d18436bd40ff0648417b" create_wrksrc=yes -build_wrksrc="chatterino2" +build_wrksrc="chatterino2-${version}" build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="qt5-tools-devel qt5-multimedia-devel qt5-svg-devel @@ -40,8 +40,9 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then LIBS="-latomic" fi +patch_args="-Np1 --directory=${build_wrksrc}" + post_extract() { - mv "chatterino2-${version}" "${build_wrksrc}" rmdir ${build_wrksrc}/lib/libcommuni ${build_wrksrc}/lib/serialize \ ${build_wrksrc}/lib/settings ${build_wrksrc}/lib/signals \ ${build_wrksrc}/lib/rapidjson ${build_wrksrc}/lib/websocketpp \