Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] [RFC] patch_args: allow use of --directory parameter
@ 2022-03-29 23:10 tibequadorian
  2022-03-29 23:20 ` [PR PATCH] [Updated] " tibequadorian
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: tibequadorian @ 2022-03-29 23:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1897 bytes --]

There is a new pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages do-patch-input
https://github.com/void-linux/void-packages/pull/36409

[RFC] patch_args: allow use of --directory parameter
`patch(1)` has a `-d/--directory` parameter which allows it 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 is applied. So far, patches had to be updated if $build_wrksrc changes, which is suboptimal.

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.
This PR tries to solve that by using standard input instead of `-i`.

Included is an example with wine making use of that change.

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36409.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-do-patch-input-36409.patch --]
[-- Type: text/x-diff, Size: 3644 bytes --]

From f43cf4f469eef09a7473a030742620a00391622f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
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 <tibequadorian@posteo.de>
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 <stdlib.h>
  #include <stdio.h>
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,

^ permalink raw reply	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2022-04-10  9:06 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-29 23:10 [PR PATCH] [RFC] patch_args: allow use of --directory parameter tibequadorian
2022-03-29 23:20 ` [PR PATCH] [Updated] " tibequadorian
2022-03-31 18:58 ` [PR REVIEW] " paper42
2022-03-31 19:19 ` tibequadorian
2022-03-31 19:26 ` paper42
2022-03-31 19:59 ` tibequadorian
2022-03-31 20:45 ` paper42
2022-04-09 11:03 ` paper42
2022-04-09 11:38 ` [PR PATCH] [Updated] " tibequadorian
2022-04-10  9:06 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).