From f43cf4f469eef09a7473a030742620a00391622f Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 30 Mar 2022 00:38:27 +0200 Subject: [PATCH 1/2] do-patch: allow use of --directory parameter --- 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 4e1e0063bd30eaca635e4ddb112161123caa494c Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 30 Mar 2022 00:57:00 +0200 Subject: [PATCH 2/2] wine: patch into $build_wrksrc --- srcpkgs/wine/patches/musl-limits.patch | 4 ++-- srcpkgs/wine/patches/musl-rpath.patch | 8 ++++---- srcpkgs/wine/patches/musl-uid-t.patch | 4 ++-- srcpkgs/wine/template | 2 ++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/srcpkgs/wine/patches/musl-limits.patch b/srcpkgs/wine/patches/musl-limits.patch index 45cb7cbd5106..6a46158221b4 100644 --- a/srcpkgs/wine/patches/musl-limits.patch +++ b/srcpkgs/wine/patches/musl-limits.patch @@ -1,5 +1,5 @@ ---- a/wine-7.5/dlls/winebus.sys/bus_udev.c 2021-10-23 15:38:33.225064731 +0200 -+++ b/wine-7.5/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 4ed5e2642d9f..68b25589b42b 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.5/configure -+++ b/wine-7.5/configure +--- a/configure ++++ b/configure @@ -11137,6 +11137,38 @@ fi LIBWINE_DEPENDS="wine.map" @@ -43,8 +43,8 @@ index 774a95ce003..d408e77cc78 100755 diff --git a/configure.ac b/configure.ac index 8c5066a3de6..01ede86df1e 100644 ---- a/wine-7.5/configure.ac -+++ b/wine-7.5/configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -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 a358997c3963..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.5/server/security.h 2022-01-29 08:23:43.759508270 +0100 -+++ b/wine-7.5/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 e9598ba932a0..4480f830a603 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,