srcpkgs/y*: convert patches to -Np1

```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+$,[0-9]\+$\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,$^--- $$./$*,\1a/, s,[.-][Oo][Rr][Ii][Gg]$[ /]$,\1, s/[.-][Oo][Rr][Ii][Gg]$// s/[.]patched[.]$[^.]$/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,$^+++ $$./$*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ```
2021-06-19 10:03:21 +07:00 · 2021-06-19 10:03:21 +07:00 · ad877a7e29
commit ad877a7e29
parent 3353bf4722
22 changed files with 26 additions and 36 deletions
--- a/srcpkgs/yabar/patches/gcc7.patch
+++ b/srcpkgs/yabar/patches/gcc7.patch
@ -9,8 +9,8 @@ Subject: [PATCH] Fix GCC 7 inline error from #154

 diff --git a/src/intern_blks/ya_intern.c b/src/intern_blks/ya_intern.c
 index 187e62d..2e6095f 100644
--- src/intern_blks/ya_intern.c
-+++ src/intern_blks/ya_intern.c
+--- a/src/intern_blks/ya_intern.c
+++ b/src/intern_blks/ya_intern.c
@@ -116,7 +116,7 @@ int ya_fscanf(char* fpath, ya_block_t *blk, char *fmt, ...) {
 	return ret;
 }
--- a/srcpkgs/yabar/template
+++ b/srcpkgs/yabar/template
@ -13,7 +13,6 @@ license="MIT"
 homepage="https://github.com/geommer/yabar"
 distfiles="https://github.com/geommer/${pkgname}/archive/${version}.tar.gz"
 checksum=f8cc613413328af78944ccb8063a5ba8e6be11797a883c419876e973e102fed0
-patch_args=-Np0

 post_install() {
 	vdoc README.md
--- a/srcpkgs/yabause-gtk/patches/fix-cflags.patch
+++ b/srcpkgs/yabause-gtk/patches/fix-cflags.patch
@ -1,7 +1,7 @@
 Index: src/CMakeLists.txt
 ===================================================================
--- src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -659,7 +659,7 @@ else ()
 	set(yabause_SOURCES ${yabause_SOURCES} sock-dummy.c thr-dummy.c)
 endif ()
--- a/srcpkgs/yabause-gtk/patches/rwx.patch
+++ b/srcpkgs/yabause-gtk/patches/rwx.patch
@ -1,5 +1,5 @@
--- src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
-+++ src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
+--- a/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:29:53.112870900 +0100
+++ b/src/sh2_dynarec/linkage_x64.s	2013-03-11 20:31:48.856778600 +0100
@@ -747,3 +747,7 @@ breakpoint:
 	ret
 	/* Set breakpoint here for debugging */
@ -8,8 +8,8 @@
 +#if defined(__linux__) && defined(__ELF__)
 +.section .note.GNU-stack,"",%progbits
 +#endif
--- src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
-+++ src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
+--- a/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:30:08.157693100 +0100
+++ b/src/sh2_dynarec/linkage_x86.s	2013-03-11 20:32:30.993310600 +0100
@@ -743,3 +743,7 @@ breakpoint:
 	ret
 	/* Set breakpoint here for debugging */
--- a/srcpkgs/yabause-gtk/template
+++ b/srcpkgs/yabause-gtk/template
@ -17,4 +17,3 @@ checksum=4334c43fe0f3ff297bac8e91f4e059fe5fd276291faff2489e37b5b3a4ccc2b2
 nopie=yes
 # Would need m68kmake built for the host
 nocross=yes
-patch_args=-Np0
--- a/srcpkgs/yarn-bin/patches/yarn.patch
+++ b/srcpkgs/yarn-bin/patches/yarn.patch
@ -1,5 +1,5 @@
--- bin/yarn.js.orig	2018-09-18 14:33:30.318123244 -0700
-+++ bin/yarn.js	2018-09-18 14:35:10.715515522 -0700
+--- a/bin/yarn.js	2018-09-18 14:33:30.318123244 -0700
+++ b/bin/yarn.js	2018-09-18 14:35:10.715515522 -0700
@@ -12,7 +12,7 @@
   process.exit(1); // eslint-disable-line no-process-exit
 } else {
--- a/srcpkgs/yarn-bin/template
+++ b/srcpkgs/yarn-bin/template
@ -10,7 +10,6 @@ homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"
 checksum=7e433d4a77e2c79e6a7ae4866782608a8e8bcad3ec6783580577c59538381a6e
 conflicts="yarn>=0"
-patch_args=-Np0

 do_extract() {
 	bsdtar xfz ${XBPS_SRCDISTDIR}/${pkgname}-${version}/yarn-v${version}.tar.gz --strip-components=1 -C ${wrksrc}
--- a/srcpkgs/yarn/patches/yarn.patch
+++ b/srcpkgs/yarn/patches/yarn.patch
@ -1,5 +1,5 @@
--- bin/yarn.js.orig	2018-09-18 14:33:30.318123244 -0700
-+++ bin/yarn.js	2018-09-18 14:35:10.715515522 -0700
+--- a/bin/yarn.js	2018-09-18 14:33:30.318123244 -0700
+++ b/bin/yarn.js	2018-09-18 14:35:10.715515522 -0700
@@ -12,7 +12,7 @@
   process.exit(1); // eslint-disable-line no-process-exit
 } else {
--- a/srcpkgs/yarn/template
+++ b/srcpkgs/yarn/template
@ -10,7 +10,6 @@ license="BSD-2-Clause"
 homepage="https://yarnpkg.com/"
 distfiles="https://github.com/yarnpkg/${pkgname}/archive/v${version}.tar.gz"
 checksum=66153f5fdd3078ce320c775990e4b4f03d5b596186f0e1fbceb34225abe3cd3e
-patch_args=-Np0

 conflicts="yarn-bin>=0"

--- a/srcpkgs/yeahconsole/patches/make.patch
+++ b/srcpkgs/yeahconsole/patches/make.patch
@ -1,5 +1,5 @@
--- Makefile
-+++ Makefile
+--- a/Makefile
+++ b/Makefile
@@ -14,11 +14,11 @@ OBJECTS := yeahconsole.o
 SOURCES := yeahconsole.c
 
--- a/srcpkgs/yeahconsole/template
+++ b/srcpkgs/yeahconsole/template
@ -10,7 +10,6 @@ license="GPL-3"
 homepage="http://phrat.de/yeahtools.html"
 distfiles="http://phrat.de/yeahconsole-${version}.tar.gz"
 checksum=fcf3481f78a263a70f1cb5163630fc22e78bb0915013eb05689c6f4aeb0583ef
-patch_args=-Np0

 do_install() {
 	vbin yeahconsole
--- a/srcpkgs/yeahwm/patches/fix-makefile.patch
+++ b/srcpkgs/yeahwm/patches/fix-makefile.patch
@ -2,8 +2,8 @@ Enable configurable CC and XROOT.
 Add missing $(LIBS) to link and remove strip.
 Add yeahwm.1 to install target.

--- Makefile	2004-11-21 19:11:04.000000000 +0100
-+++ Makefile	2015-10-25 23:20:45.306617941 +0100
+--- a/Makefile	2004-11-21 19:11:04.000000000 +0100
+++ b/Makefile	2015-10-25 23:20:45.306617941 +0100
@@ -1,11 +1,11 @@
 # If you don't use CC 
 -CC       = gcc
--- a/srcpkgs/yeahwm/patches/fix-shape.patch
+++ b/srcpkgs/yeahwm/patches/fix-shape.patch
@ -1,8 +1,8 @@
 Fix misplaced #ifdef. A closing brace is always required
 for switch() and an empty default is a bug.

--- main.c	2004-11-21 19:00:54.000000000 +0100
-+++ main.c	2015-10-25 23:08:33.060565151 +0100
+--- a/main.c	2004-11-21 19:00:54.000000000 +0100
+++ b/main.c	2015-10-25 23:08:33.060565151 +0100
@@ -173,12 +173,12 @@
             if (ev.xexpose.count == 0);
             handle_expose_event(&ev.xexpose);
--- a/srcpkgs/yeahwm/template
+++ b/srcpkgs/yeahwm/template
@ -11,7 +11,6 @@ license="Public Domain"
 homepage="http://phrat.de"
 distfiles="http://phrat.de/${pkgname}_${version}.tar.gz"
 checksum=c92ce98848c8b88d9b67c128e30710944c04a6454310254535c102b2b6fcee05
-patch_args=-Np0

 CFLAGS="-fcommon"

--- a/srcpkgs/yersinia/patches/fix_crossbuild.patch
+++ b/srcpkgs/yersinia/patches/fix_crossbuild.patch
@ -1,5 +1,5 @@
--- configure.orig
-+++ configure
+--- a/configure
+++ b/configure
@@ -4843,59 +4843,6 @@
 
 disable_bpf=no
--- a/srcpkgs/yersinia/template
+++ b/srcpkgs/yersinia/template
@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/tomac/yersinia"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=964f528dbffd904376ab7986e69b1e8639591c929e2f39186ac9ebf2d3bc761f
-patch_args=-Np0

 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" ${makedepends}"
--- a/srcpkgs/ympd/patches/fix-cflags.patch
+++ b/srcpkgs/ympd/patches/fix-cflags.patch
@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 ===================================================================
--- CMakeLists.txt.orig
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(${PROJECT_BINARY_DIR
 
 include(CheckCSourceCompiles)
--- a/srcpkgs/ympd/template
+++ b/srcpkgs/ympd/template
@ -11,7 +11,6 @@ license="GPL-2.0-only"
 homepage="https://www.ympd.org"
 distfiles="https://github.com/notandy/ympd/archive/v${version}.tar.gz"
 checksum=d9f68920cd93d1cfa971e1d7b9162a2b1724909bc9753c1338cecb3688d234d5
-patch_args=-Np0

 pre_configure() {
 	vsed -i CMakeLists.txt -e"s;-std=gnu99 -Wall;& -fcommon;"
--- a/srcpkgs/yoshimi/patches/fix-cflags.patch
+++ b/srcpkgs/yoshimi/patches/fix-cflags.patch
@ -1,7 +1,7 @@
 Index: src/CMakeLists.txt
 ===================================================================
--- src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -262,7 +262,6 @@ if (BuildForDebug)
     set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug})
     message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
--- a/srcpkgs/yoshimi/template
+++ b/srcpkgs/yoshimi/template
@ -14,7 +14,6 @@ license="GPL-2.0-or-later"
 homepage="https://yoshimi.github.io/"
 distfiles="https://github.com/Yoshimi/$pkgname/archive/$version.tar.gz"
 checksum=b80a8b49bdf0e1f6c382627afc46c82d03219b7e45cdecd933e6fc046a939967
-patch_args=-Np0

 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" argp-standalone";;
--- a/srcpkgs/yosys/patches/debian_patches_0010-Fix-adding-of-sys.path-in-yosys-smtbmc.patch
+++ b/srcpkgs/yosys/patches/debian_patches_0010-Fix-adding-of-sys.path-in-yosys-smtbmc.patch
@ -8,8 +8,8 @@ Subject: Fix adding of sys.path in yosys-smtbmc

 diff --git backends/smt2/Makefile.inc backends/smt2/Makefile.inc
 index 92941d4..2c0b7c6 100644
--- backends/smt2/Makefile.inc
-+++ backends/smt2/Makefile.inc
+--- a/backends/smt2/Makefile.inc
+++ b/backends/smt2/Makefile.inc
@@ -22,7 +22,7 @@ else
 TARGETS += yosys-smtbmc
 
--- a/srcpkgs/yosys/template
+++ b/srcpkgs/yosys/template
@ -16,7 +16,6 @@ license="ISC, MIT"
 homepage="http://www.clifford.at/yosys/about.html"
 distfiles="https://github.com/cliffordwolf/yosys/archive/yosys-${version}.tar.gz"
 checksum=f2e31371f9cf1b36cb4f57b23fd6eb849adc7d935dcf49f3c905aa5136382c2f
-patch_args=-Np0

 post_patch() {
 	vsed -i -e 's,-I[$](PREFIX)/include,,' \