srcpkgs/a*: convert patches to -Np1

* arduino and antiword is kept at -Np0 ```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 09:18:31 +07:00 · 2021-06-19 09:18:31 +07:00 · ae69000001
commit ae69000001
parent 9978e00086
154 changed files with 300 additions and 354 deletions
--- a/srcpkgs/a2jmidid/patches/musl-no-execinfo.patch
+++ b/srcpkgs/a2jmidid/patches/musl-no-execinfo.patch
@ -1,5 +1,5 @@
--- sigsegv.c.orig	2016-06-06 15:56:47.355074711 +0200
-+++ sigsegv.c	2016-06-06 15:55:40.740071274 +0200
+--- a/sigsegv.c	2016-06-06 15:56:47.355074711 +0200
+++ b/sigsegv.c	2016-06-06 15:55:40.740071274 +0200
@@ -28,7 +28,9 @@
 #include <signal.h>
 #include <ucontext.h>
--- a/srcpkgs/a2jmidid/patches/musl-ppc.patch
+++ b/srcpkgs/a2jmidid/patches/musl-ppc.patch
@ -1,8 +1,8 @@
 This fixes build on ppc32/musl but also fixes incorrect usage of uc_regs
 on glibc (uc_regs is an mcontext_t pointer, you can't index it directly)

--- sigsegv.c
-+++ sigsegv.c
+--- a/sigsegv.c
+++ b/sigsegv.c
@@ -97,7 +97,11 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) {
     for(i = 0; i < NGREG; i++)
         a2j_error("reg[%02d]       = 0x" REGFORMAT, i,
--- a/srcpkgs/a2jmidid/template
+++ b/srcpkgs/a2jmidid/template
@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/linuxaudio/a2jmidid/"
 distfiles="https://github.com/linuxaudio/a2jmidid/archive/${version}.tar.gz"
 checksum=2828d283e0c9a65f0683881f09676c8c35c45c97a8a56cf77b43b4ef0231df06
-patch_args=-Np0
--- a/srcpkgs/a2ps/patches/CVE-2001-1593.diff
+++ b/srcpkgs/a2ps/patches/CVE-2001-1593.diff
@ -1,7 +1,7 @@
 Index: b/lib/routines.c
 ===================================================================
--- lib/routines.c
-+++ lib/routines.c
+--- a/lib/routines.c
+++ b/lib/routines.c
@@ -242,3 +242,50 @@
   /* Don't complain if you can't unlink.  Who cares of a tmp file? */
   unlink (filename);
@ -55,8 +55,8 @@ Index: b/lib/routines.c
 +}
 Index: b/lib/routines.h
 ===================================================================
--- lib/routines.h
-+++ lib/routines.h
+--- a/lib/routines.h
+++ b/lib/routines.h
@@ -255,7 +255,8 @@
 /* If _STR_ is not defined, give it a tempname in _TMPDIR_ */
 #define tempname_ensure(Str)				\
--- a/srcpkgs/a2ps/patches/CVE-2014-0466.diff
+++ b/srcpkgs/a2ps/patches/CVE-2014-0466.diff
@ -6,8 +6,8 @@ Bug-Debian: http://bugs.debian.org/742902
 Author: Salvatore Bonaccorso <carnil@debian.org>
 Last-Update: 2014-03-28

--- contrib/fixps.in
-+++ contrib/fixps.in
+--- a/contrib/fixps.in
+++ b/contrib/fixps.in
@@ -389,7 +389,7 @@
   	eval "$command" ;;
       gs)
@ -17,8 +17,8 @@ Last-Update: 2014-03-28
     esac
   )
 fi
--- contrib/fixps.m4
-+++ contrib/fixps.m4
+--- a/contrib/fixps.m4
+++ b/contrib/fixps.m4
@@ -307,7 +307,7 @@
   	eval "$command" ;;
       gs)
--- a/srcpkgs/a2ps/template
+++ b/srcpkgs/a2ps/template
@ -14,7 +14,6 @@ homepage="http://www.gnu.org/software/a2ps/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4
 conf_files="/etc/a2ps/a2ps.cfg /etc/a2ps/a2ps-site.cfg"
-patch_args=-Np0

 LDFLAGS="-lm"

--- a/srcpkgs/abduco/patches/0001-Use-fixed-size-integer-types-in-protocol-messages.patch
+++ b/srcpkgs/abduco/patches/0001-Use-fixed-size-integer-types-in-protocol-messages.patch
@ -19,8 +19,8 @@ as client and server (anything else is unsupported anyway!).

 diff --git abduco.c abduco.c
 index 3c60a36..1bd6304 100644
--- abduco.c
-+++ abduco.c
+--- a/abduco.c
+++ b/abduco.c
@@ -15,6 +15,7 @@
  */
 #include <errno.h>
@ -51,8 +51,8 @@ index 3c60a36..1bd6304 100644
 
 diff --git client.c client.c
 index 744f061..2c2192b 100644
--- client.c
-+++ client.c
+--- a/client.c
+++ b/client.c
@@ -78,7 +78,7 @@ static int client_mainloop(void) {
 			if (ioctl(STDIN_FILENO, TIOCGWINSZ, &ws) != -1) {
 				Packet pkt = {
@ -64,8 +64,8 @@ index 744f061..2c2192b 100644
 				if (client_send_packet(&pkt))
 diff --git debug.c debug.c
 index b5748ab..e904e33 100644
--- debug.c
-+++ debug.c
+--- a/debug.c
+++ b/debug.c
@@ -29,7 +29,7 @@ static void print_packet(const char *prefix, Packet *pkt) {
 		fwrite(pkt->u.msg, pkt->len, 1, stderr);
 		break;
@ -86,8 +86,8 @@ index b5748ab..e904e33 100644
 	fprintf(stderr, "\n");
 diff --git server.c server.c
 index 78ccbe2..6f62cfb 100644
--- server.c
-+++ server.c
+--- a/server.c
+++ b/server.c
@@ -224,7 +224,10 @@ static void server_mainloop(void) {
 				case MSG_REDRAW:
 					if (!(c->flags & CLIENT_READONLY) && (client_packet.type == MSG_REDRAW || c == server.clients)) {
--- a/srcpkgs/abduco/patches/0002-Fix-length-of-MSG_RESIZE-packet.patch
+++ b/srcpkgs/abduco/patches/0002-Fix-length-of-MSG_RESIZE-packet.patch
@ -10,8 +10,8 @@ We no longer send the complete struct winsize.

 diff --git client.c client.c
 index 2c2192b..f26bc8f 100644
--- client.c
-+++ client.c
+--- a/client.c
+++ b/client.c
@@ -79,7 +79,7 @@ static int client_mainloop(void) {
 				Packet pkt = {
 					.type = MSG_RESIZE,
--- a/srcpkgs/abduco/patches/0003-Avoid-use-of-BUFSIZ-to-guarantee-system-independent-.patch
+++ b/srcpkgs/abduco/patches/0003-Avoid-use-of-BUFSIZ-to-guarantee-system-independent-.patch
@ -10,8 +10,8 @@ Subject: [PATCH 3/4] Avoid use of BUFSIZ to guarantee system independent

 diff --git abduco.c abduco.c
 index 1bd6304..335907d 100644
--- abduco.c
-+++ abduco.c
+--- a/abduco.c
+++ b/abduco.c
@@ -75,7 +75,7 @@ typedef struct {
 	uint32_t type;
 	uint32_t len;
--- a/srcpkgs/abduco/patches/0004-Correct-EOF-handling-on-client-stdin.patch
+++ b/srcpkgs/abduco/patches/0004-Correct-EOF-handling-on-client-stdin.patch
@ -11,8 +11,8 @@ of #15.

 diff --git client.c client.c
 index f26bc8f..6cf70c7 100644
--- client.c
-+++ client.c
+--- a/client.c
+++ b/client.c
@@ -129,6 +129,9 @@ static int client_mainloop(void) {
 				} else if (!(client.flags & CLIENT_READONLY)) {
 					client_send_packet(&pkt);
--- a/srcpkgs/abduco/template
+++ b/srcpkgs/abduco/template
@ -10,7 +10,6 @@ license="ISC"
 homepage="http://www.brain-dump.org/projects/abduco/"
 distfiles="http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=c90909e13fa95770b5afc3b59f311b3d3d2fdfae23f9569fa4f96a3e192a35f4
-patch_args=-Np0

 post_install() {
 	vlicense LICENSE
--- a/srcpkgs/abook/patches/inline.patch
+++ b/srcpkgs/abook/patches/inline.patch
@ -1,6 +1,6 @@
 diff -ur database.h database.h
--- database.h	2015-10-04 10:38:25.000000000 +0800
-+++ database.h	2018-02-15 21:11:46.311673251 +0800
+--- a/database.h	2015-10-04 10:38:25.000000000 +0800
+++ b/database.h	2018-02-15 21:11:46.311673251 +0800
@@ -61,7 +61,7 @@
 /*
  * Field operations
--- a/srcpkgs/abook/template
+++ b/srcpkgs/abook/template
@ -11,7 +11,6 @@ license="GPL-2.0-or-later"
 homepage="http://abook.sourceforge.net/"
 distfiles="http://abook.sourceforge.net/devel/${pkgname}-${version}.tar.gz"
 checksum=f0a90df8694fb34685ecdd45d97db28b88046c15c95e7b0700596028bd8bc0f9
-patch_args=-Np0

 post_extract() {
 	autoreconf --install
--- a/srcpkgs/accountsservice/patches/musl-fgetspent_r.patch
+++ b/srcpkgs/accountsservice/patches/musl-fgetspent_r.patch
@ -1,7 +1,7 @@
 diff --git a/src/daemon.c b/src/daemon.c
 index 312394a..e7b3c58 100644
--- src/daemon.c
-+++ src/daemon.c
+--- a/src/daemon.c
+++ b/src/daemon.c
@@ -140,6 +140,28 @@ error_get_type (void)
 #define MAX_LOCAL_USERS 50
 #endif
--- a/srcpkgs/accountsservice/patches/musl-wtmp.patch
+++ b/srcpkgs/accountsservice/patches/musl-wtmp.patch
@ -1,7 +1,7 @@
 Reason: fix build on musl
 Tidy up and send upstream soon...
--- meson.build
-+++ meson.build
+--- a/meson.build
+++ b/meson.build
@@ -82,8 +82,7 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURC
 elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
   config_h.set('PATH_WTMP', '_PATH_WTMPX')
--- a/srcpkgs/accountsservice/template
+++ b/srcpkgs/accountsservice/template
@ -17,7 +17,6 @@ checksum=ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b
 make_dirs="
 /var/lib/AccountsService/users 755 root root
 /var/lib/AccountsService/icons 755 root root"
-patch_args=-Np0

 # Package build options
 build_options="elogind gir"
--- a/srcpkgs/acct/patches/cross.patch
+++ b/srcpkgs/acct/patches/cross.patch
@ -1,5 +1,5 @@
--- configure.orig	2017-07-02 17:54:06.000000000 +0200
-+++ configure	2018-09-05 19:44:40.854646115 +0200
+--- a/configure	2017-07-02 17:54:06.000000000 +0200
+++ b/configure	2018-09-05 19:44:40.854646115 +0200
@@ -29608,7 +29608,7 @@
 
 fi
--- a/srcpkgs/acct/template
+++ b/srcpkgs/acct/template
@ -9,7 +9,6 @@ license="GPL-3.0-or-later"
 maintainer="Orphaned <orphan@voidlinux.org>"
 distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=4c15bf2b58b16378bcc83f70e77d4d40ab0b194acf2ebeefdb507f151faa663f
-patch_args=-Np0

 if [ "$CROSS_BUILD" ]; then
 	post_extract() {
--- a/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
+++ b/srcpkgs/acpi_call-dkms/patches/linux4.12.patch
@ -1,5 +1,5 @@
--- acpi_call.c.orig	2017-01-03 17:17:55.000000000 +0000
-+++ acpi_call.c	2017-07-15 00:28:28.259960007 +0000
+--- a/acpi_call.c	2017-01-03 17:17:55.000000000 +0000
+++ b/acpi_call.c	2017-07-15 00:28:28.259960007 +0000
@@ -7,7 +7,7 @@
 #include <linux/version.h>
 #include <linux/proc_fs.h>
--- a/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
+++ b/srcpkgs/acpi_call-dkms/patches/linux5.6.patch
@ -1,5 +1,5 @@
--- acpi_call.c.orig	2017-01-03 18:17:55.000000000 +0100
-+++ acpi_call.c	2020-03-31 10:35:40.493575868 +0200
+--- a/acpi_call.c	2017-01-03 18:17:55.000000000 +0100
+++ b/acpi_call.c	2020-03-31 10:35:40.493575868 +0200
@@ -347,11 +347,18 @@
     return ret;
 }
--- a/srcpkgs/acpi_call-dkms/template
+++ b/srcpkgs/acpi_call-dkms/template
@ -10,7 +10,6 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/damadmai/acpi_call"
 distfiles="$homepage/archive/v$version.tar.gz"
 checksum=c48a0a8768d657a8da7b59d7dbf6276554313fa6a0cb012fa4cf85a77e55f44b
-patch_args=-Np0

 dkms_modules="acpi_call ${version}"
 depends="dkms"
--- a/srcpkgs/acpid/patches/disable-logging-to-console.patch
+++ b/srcpkgs/acpid/patches/disable-logging-to-console.patch
@ -1,5 +1,5 @@
--- acpid.c
-+++ acpid.c
+--- a/acpid.c
+++ b/acpid.c
@@ -389,7 +389,7 @@ open_log(void)
 	int log_opts;
 
--- a/srcpkgs/acpid/patches/portability.patch
+++ b/srcpkgs/acpid/patches/portability.patch
@ -3,8 +3,8 @@ Portability fixes:
 - Do not use isfdtype()... rather use fstat(2).
 - Define TEMP_FAILURE_RETRY if needed.

--- acpid.h	2014-02-26 01:36:58.788146100 +0100
-+++ acpid.h	2014-12-28 06:58:18.252702509 +0100
+--- a/acpid.h	2014-02-26 01:36:58.788146100 +0100
+++ b/acpid.h	2014-12-28 06:58:18.252702509 +0100
@@ -39,6 +39,15 @@
 
 #define PACKAGE 		"acpid"
@ -21,8 +21,8 @@ Portability fixes:
 /*
  * acpid.c
  */
--- kacpimon/libnetlink.c	2013-02-24 14:20:06.624844873 +0100
-+++ kacpimon/libnetlink.c	2014-12-28 06:59:50.283706615 +0100
+--- a/kacpimon/libnetlink.c	2013-02-24 14:20:06.624844873 +0100
+++ b/kacpimon/libnetlink.c	2014-12-28 06:59:50.283706615 +0100
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <sys/uio.h>
@ -31,8 +31,8 @@ Portability fixes:
 #include "libnetlink.h"
 
 void rtnl_close(struct rtnl_handle *rth)
--- libnetlink.c	2012-07-15 00:29:38.168312376 +0200
-+++ libnetlink.c	2014-12-28 06:59:17.379705147 +0100
+--- a/libnetlink.c	2012-07-15 00:29:38.168312376 +0200
+++ b/libnetlink.c	2014-12-28 06:59:17.379705147 +0100
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <sys/uio.h>
@ -41,8 +41,8 @@ Portability fixes:
 #include "libnetlink.h"
 
 void rtnl_close(struct rtnl_handle *rth)
--- sock.c	2013-08-15 01:30:44.655673004 +0200
-+++ sock.c	2014-12-28 07:11:31.198737890 +0100
+--- a/sock.c	2013-08-15 01:30:44.655673004 +0200
+++ b/sock.c	2014-12-28 07:11:31.198737890 +0100
@@ -53,7 +54,12 @@ int non_root_clients;
 int
 is_socket(int fd)
--- a/srcpkgs/acpid/template
+++ b/srcpkgs/acpid/template
@ -10,7 +10,6 @@ homepage="https://sourceforge.net/projects/acpid2/"
 distfiles="${SOURCEFORGE_SITE}/acpid2/acpid-${version}.tar.xz"
 checksum=f2d2d30b3edc3234bd82f6f7186699a6aa3c85c8d20bc4e30e9b3c68a1ed157e
 conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh"
-patch_args=-Np0

 post_install() {
 	vinstall ${FILESDIR}/handler.sh 755 etc/acpi
--- a/srcpkgs/actiona/patches/bytearray-constdata.patch
+++ b/srcpkgs/actiona/patches/bytearray-constdata.patch
@ -1,5 +1,5 @@
--- actions/actionpacksystem/systeminfo/linux/qstorageinfo_linux.cpp	2018-07-17 20:29:12.000000000 +0200
-+++ actions/actionpacksystem/systeminfo/linux/qstorageinfo_linux.cpp	2018-07-28 13:26:14.340872982 +0200
+--- a/actions/actionpacksystem/systeminfo/linux/qstorageinfo_linux.cpp	2018-07-17 20:29:12.000000000 +0200
+++ b/actions/actionpacksystem/systeminfo/linux/qstorageinfo_linux.cpp	2018-07-28 13:26:14.340872982 +0200
@@ -98,7 +98,7 @@
     }
 #else
--- a/srcpkgs/actiona/patches/no-updater.patch
+++ b/srcpkgs/actiona/patches/no-updater.patch
@ -1,5 +1,5 @@
--- actiona.pro	2015-06-22 17:22:46.000000000 +0200
-+++ actiona.pro	2015-10-08 12:08:09.582973444 +0200
+--- a/actiona.pro	2015-06-22 17:22:46.000000000 +0200
+++ b/actiona.pro	2015-10-08 12:08:09.582973444 +0200
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 CONFIG = ordered
--- a/srcpkgs/actiona/patches/socket-include-order.patch
+++ b/srcpkgs/actiona/patches/socket-include-order.patch
@ -1,5 +1,5 @@
--- actions/actionpacksystem/systeminfo/linux/qnetworkinfo_linux.cpp	2018-07-17 20:29:12.000000000 +0200
-+++ actions/actionpacksystem/systeminfo/linux/qnetworkinfo_linux.cpp	2018-07-27 20:12:49.889568736 +0200
+--- a/actions/actionpacksystem/systeminfo/linux/qnetworkinfo_linux.cpp	2018-07-17 20:29:12.000000000 +0200
+++ b/actions/actionpacksystem/systeminfo/linux/qnetworkinfo_linux.cpp	2018-07-27 20:12:49.889568736 +0200
@@ -62,11 +62,11 @@
 #endif // QT_NO_UDEV
 
--- a/srcpkgs/actiona/patches/use-lrelease-qt5.patch
+++ b/srcpkgs/actiona/patches/use-lrelease-qt5.patch
@ -1,5 +1,5 @@
--- actiona.pro	2020-05-07 12:41:07.738401940 +0200
-+++ actiona.pro	2020-05-07 12:47:22.744386988 +0200
+--- a/actiona.pro	2020-05-07 12:41:07.738401940 +0200
+++ b/actiona.pro	2020-05-07 12:47:22.744386988 +0200
@@ -15,7 +15,7 @@
 
 isEmpty(QMAKE_LRELEASE) {
--- a/srcpkgs/actiona/template
+++ b/srcpkgs/actiona/template
@ -14,7 +14,6 @@ license="GPL-3.0-or-later"
 homepage="https://actiona.tools/"
 distfiles="https://github.com/Jmgr/${pkgname}/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=447065e380f8f37db4c8af01df8e1b9d7189cd256205f758845b71d8de6f37ea
-patch_args=-Np0

 post_build() {
 	lrelease-qt5 locale/*.ts
--- a/srcpkgs/afterstep/patches/39-Fix-parallel-builds.patch
+++ b/srcpkgs/afterstep/patches/39-Fix-parallel-builds.patch
@ -15,8 +15,8 @@ https://buildd.debian.org/status/fetch.php?pkg=afterstep&arch=amd64&ver=2.2.12-1

 diff --git a/libAfterConf/Makefile.in b/libAfterConf/Makefile.in
 index fa049a3..686a958 100644
--- libAfterConf/Makefile.in
-+++ libAfterConf/Makefile.in
+--- a/libAfterConf/Makefile.in
+++ b/libAfterConf/Makefile.in
@@ -52,7 +52,7 @@ make_standard_categories:	make_standard_categories.o
 PrintDesktopEntries.o:	DesktopEntry.c
 		$(CC) $(CCFLAGS) $(EXTRA_DEFINES) -DPRINT_DESKTOP_ENTRIES $(INCLUDES) $(EXTRA_INCLUDES) -c DesktopEntry.c -o PrintDesktopEntries.o
--- a/srcpkgs/afterstep/patches/40-Fix-few-gcc-warnings.patch
+++ b/srcpkgs/afterstep/patches/40-Fix-few-gcc-warnings.patch
@ -13,8 +13,8 @@ Subject: 40 Fix few gcc warnings

 diff --git a/libAfterImage/import.c b/libAfterImage/import.c
 index f2c7ad1..c80b9c3 100644
--- libAfterImage/import.c
-+++ libAfterImage/import.c
+--- a/libAfterImage/import.c
+++ b/libAfterImage/import.c
@@ -585,7 +585,7 @@ get_thumbnail_asimage( ASImageManager* imageman, const char *file, int thumb_wid
 
 	if (imageman && file)
@ -53,8 +53,8 @@ index f2c7ad1..c80b9c3 100644
 	
 diff --git a/libAfterImage/ungif.c b/libAfterImage/ungif.c
 index cb9c628..faa1da7 100644
--- libAfterImage/ungif.c
-+++ libAfterImage/ungif.c
+--- a/libAfterImage/ungif.c
+++ b/libAfterImage/ungif.c
@@ -153,7 +153,8 @@ get_gif_image_desc( GifFileType *gif, SavedImage *im )
 		{
 			im->ImageDesc.ColorMap = MakeMapObject(gif->Image.ColorMap->ColorCount, NULL);
@ -67,8 +67,8 @@ index cb9c628..faa1da7 100644
  		}
 diff --git a/src/ASDocGen/ASDocGen.c b/src/ASDocGen/ASDocGen.c
 index f8d38e9..bed04b8 100644
--- src/ASDocGen/ASDocGen.c
-+++ src/ASDocGen/ASDocGen.c
+--- a/src/ASDocGen/ASDocGen.c
+++ b/src/ASDocGen/ASDocGen.c
@@ -880,7 +880,7 @@ gen_glossary( const char *dest_dir, const char *file, ASDocType doc_type )
 	LOCAL_DEBUG_OUT( "Glossary has %ld items", Glossary->items_num);
 	if( (doc_type == DocType_HTML	|| doc_type == DocType_PHP ) && Glossary->items_num > 0 )
@ -107,8 +107,8 @@ index f8d38e9..bed04b8 100644
 		
 diff --git a/src/ASMount/main.c b/src/ASMount/main.c
 index 9a42b49..ae22ad5 100644
--- src/ASMount/main.c
-+++ src/ASMount/main.c
+--- a/src/ASMount/main.c
+++ b/src/ASMount/main.c
@@ -1238,7 +1238,9 @@ void init_ASMount(ASFlagType flags, const char *cmd)
 	reloadButtons();
 	AppState.volumes = create_asbidirlist (ASVolume_destroy);
@ -131,8 +131,8 @@ index 9a42b49..ae22ad5 100644
 #else	
 diff --git a/src/afterstep/cover.c b/src/afterstep/cover.c
 index 5455c48..11a76a4 100644
--- src/afterstep/cover.c
-+++ src/afterstep/cover.c
+--- a/src/afterstep/cover.c
+++ b/src/afterstep/cover.c
@@ -101,7 +101,7 @@ void do_anim_shape_blocks (void *vdata)
 #ifdef SHAPE
 	struct ASDeskAniBlocks *data = (struct ASDeskAniBlocks *)vdata;
@ -154,8 +154,8 @@ index 5455c48..11a76a4 100644
 			continue;
 diff --git a/src/afterstep/dbus.c b/src/afterstep/dbus.c
 index d7594d9..d311094 100644
--- src/afterstep/dbus.c
-+++ src/afterstep/dbus.c
+--- a/src/afterstep/dbus.c
+++ b/src/afterstep/dbus.c
@@ -240,11 +240,13 @@ Bool get_gnome_autosave ()
 {
 	Bool autosave = False;
--- a/srcpkgs/afterstep/patches/43-Fix-gcc-warning.patch
+++ b/srcpkgs/afterstep/patches/43-Fix-gcc-warning.patch
@ -9,8 +9,8 @@ Fix "undefined behaviour" warning

 diff --git a/libAfterConf/Database.c b/libAfterConf/Database.c
 index c10df0d..1cfc7f9 100644
--- libAfterConf/Database.c
-+++ libAfterConf/Database.c
+--- a/libAfterConf/Database.c
+++ b/libAfterConf/Database.c
@@ -578,7 +578,8 @@ void delete_name_list (name_list ** head)
 		style_delete (*head, head);
 }
--- a/srcpkgs/afterstep/patches/44-Fix-build-with-gcc-5.patch
+++ b/srcpkgs/afterstep/patches/44-Fix-build-with-gcc-5.patch
@ -25,8 +25,8 @@ Bug-Debian: https://bugs.debian.org/777768

 diff --git a/libAfterBase/asvector.h b/libAfterBase/asvector.h
 index 242bbb8..ec83231 100644
--- libAfterBase/asvector.h
-+++ libAfterBase/asvector.h
+--- a/libAfterBase/asvector.h
+++ b/libAfterBase/asvector.h
@@ -38,7 +38,7 @@ ASVector *append_vector( ASVector *v, void * data, size_t size );
 /* returns index on success, -1 on failure */
 int vector_insert_elem( ASVector *v, void *data, size_t size, void *sibling, int before );
@ -38,8 +38,8 @@ index 242bbb8..ec83231 100644
 int vector_remove_elem( ASVector *v, void *data );
 diff --git a/libAfterBase/output.h b/libAfterBase/output.h
 index fd186a7..ef21919 100644
--- libAfterBase/output.h
-+++ libAfterBase/output.h
+--- a/libAfterBase/output.h
+++ b/libAfterBase/output.h
@@ -56,7 +56,7 @@ Bool show_debug( const char *file, const char *func, int line, const char *msg_f
 
 
@ -51,8 +51,8 @@ index fd186a7..ef21919 100644
  * your compiler . Thanks!!! */
 diff --git a/libAfterBase/parse.h b/libAfterBase/parse.h
 index 193fbba..e4db499 100644
--- libAfterBase/parse.h
-+++ libAfterBase/parse.h
+--- a/libAfterBase/parse.h
+++ b/libAfterBase/parse.h
@@ -73,7 +73,7 @@ format_geometry ( int x, int y, unsigned int width, unsigned int height, int fla
 
 double parse_math(const char* str, char** endptr, double size);
@ -64,8 +64,8 @@ index 193fbba..e4db499 100644
 char *hex_to_buffer(void *data, size_t bytes, char* buffer);
 diff --git a/libAfterConf/Feel.c b/libAfterConf/Feel.c
 index 0f2224b..787964d 100644
--- libAfterConf/Feel.c
-+++ libAfterConf/Feel.c
+--- a/libAfterConf/Feel.c
+++ b/libAfterConf/Feel.c
@@ -29,6 +29,8 @@
 
 #include "afterconf.h"
@ -77,8 +77,8 @@ index 0f2224b..787964d 100644
 	{ASA_Virtual, WINDOWBOX_Virtual_ID, 0}
 diff --git a/libAfterStep/colorscheme.c b/libAfterStep/colorscheme.c
 index 6cdeb56..5b93107 100644
--- libAfterStep/colorscheme.c
-+++ libAfterStep/colorscheme.c
+--- a/libAfterStep/colorscheme.c
+++ b/libAfterStep/colorscheme.c
@@ -162,7 +162,7 @@ static inline ARGB32 MAKE_ARGB32_SHADE100 (CARD32 a, int s100)
 	return MAKE_ARGB32_GREY8 (a, s8);
 }
@ -90,8 +90,8 @@ index 6cdeb56..5b93107 100644
 {
 diff --git a/libAfterStep/event.c b/libAfterStep/event.c
 index a27759b..8c7a449 100644
--- libAfterStep/event.c
-+++ libAfterStep/event.c
+--- a/libAfterStep/event.c
+++ b/libAfterStep/event.c
@@ -202,7 +202,7 @@ void sync_event_queue (Bool forget)
 /****************************************************************************
  * Records the time of the last processed event. Used in XSetInputFocus
@ -103,8 +103,8 @@ index a27759b..8c7a449 100644
 		register Time *ptime =
 diff --git a/libAfterStep/functions.h b/libAfterStep/functions.h
 index fb565f1..a50f4e3 100644
--- libAfterStep/functions.h
-+++ libAfterStep/functions.h
+--- a/libAfterStep/functions.h
+++ b/libAfterStep/functions.h
@@ -314,7 +314,7 @@ FunctionCode change_func_code (const char *func_name, FunctionCode new_code);
 void init_func_data (FunctionData * data);
 void copy_func_data (FunctionData * dst, FunctionData * src);
@ -116,8 +116,8 @@ index fb565f1..a50f4e3 100644
 void destroy_func_data( FunctionData **pdata );
 diff --git a/libAfterStep/mylook.h b/libAfterStep/mylook.h
 index 7bff0b8..a002aa8 100644
--- libAfterStep/mylook.h
-+++ libAfterStep/mylook.h
+--- a/libAfterStep/mylook.h
+++ b/libAfterStep/mylook.h
@@ -397,7 +397,7 @@ void myback_delete( MyBackground **myback, ASImageManager *imman );
 MyDesktopConfig *create_mydeskconfig( int desk, char *data );
 void init_deskconfigs_list( MyLook *look );
@ -142,8 +142,8 @@ index 7bff0b8..a002aa8 100644
 
 diff --git a/libAfterStep/session.h b/libAfterStep/session.h
 index 536e225..73945d8 100644
--- libAfterStep/session.h
-+++ libAfterStep/session.h
+--- a/libAfterStep/session.h
+++ b/libAfterStep/session.h
@@ -49,7 +49,7 @@ void 	   destroy_assession (ASSession * session);
 void       update_default_session ( ASSession *session, int func);
 
@ -155,8 +155,8 @@ index 536e225..73945d8 100644
 void 	   change_desk_session (ASSession * session, int desk, const char *new_val, int function);
 diff --git a/src/WinList2/WinList.c b/src/WinList2/WinList.c
 index 6db35ac..6c98f38 100644
--- src/WinList2/WinList.c
-+++ src/WinList2/WinList.c
+--- a/src/WinList2/WinList.c
+++ b/src/WinList2/WinList.c
@@ -976,7 +976,7 @@ moveresize_main_canvas( int width, int height )
 void
 postponed_rearrange_winlist( void *vdata )
@ -168,8 +168,8 @@ index 6db35ac..6c98f38 100644
 
 diff --git a/src/afterstep/asinternals.h b/src/afterstep/asinternals.h
 index 81b3249..9f75fd8 100644
--- src/afterstep/asinternals.h
-+++ src/afterstep/asinternals.h
+--- a/src/afterstep/asinternals.h
+++ b/src/afterstep/asinternals.h
@@ -575,6 +575,7 @@ void asdbus_shutdown();
 void asdbus_process_messages ();
 
@ -202,8 +202,8 @@ index 81b3249..9f75fd8 100644
 				int pointer_mode, int keyboard_mode, Window confine_to, Cursor cursor);
 diff --git a/src/afterstep/events.c b/src/afterstep/events.c
 index 5588ffb..19e5441 100644
--- src/afterstep/events.c
-+++ src/afterstep/events.c
+--- a/src/afterstep/events.c
+++ b/src/afterstep/events.c
@@ -46,6 +46,7 @@
 #include "../../libAfterStep/moveresize.h"
 
@ -214,8 +214,8 @@ index 5588ffb..19e5441 100644
 # include <sys/shm.h>
 diff --git a/src/afterstep/menuitem.c b/src/afterstep/menuitem.c
 index 1adcb65..8a35186 100644
--- src/afterstep/menuitem.c
-+++ src/afterstep/menuitem.c
+--- a/src/afterstep/menuitem.c
+++ b/src/afterstep/menuitem.c
@@ -55,6 +55,8 @@
 
 #include "dirtree.h"
--- a/srcpkgs/afterstep/patches/45-Fix-libAfterBase-Makefile.patch
+++ b/srcpkgs/afterstep/patches/45-Fix-libAfterBase-Makefile.patch
@ -11,8 +11,8 @@ by libAfterImage.

 diff --git a/libAfterBase/Makefile.in b/libAfterBase/Makefile.in
 index 41f53c6..3dc63b7 100644
--- libAfterBase/Makefile.in
-+++ libAfterBase/Makefile.in
+--- a/libAfterBase/Makefile.in
+++ b/libAfterBase/Makefile.in
@@ -137,7 +137,6 @@ install.script:
 install.dyn:
 		@( echo "$(INSTALL_LIB) $(LIB_SHARED).$(LIBVER) $(LIBDIR)"; \
--- a/srcpkgs/afterstep/patches/50-cross-safe-min-max.patch
+++ b/srcpkgs/afterstep/patches/50-cross-safe-min-max.patch
@ -1,7 +1,7 @@
 diff --git libAfterBase/configure.in libAfterBase/configure.in
 index 4bc2232..f250692 100644
--- libAfterBase/configure.in
-+++ libAfterBase/configure.in
+--- a/libAfterBase/configure.in
+++ b/libAfterBase/configure.in
@@ -228,12 +228,7 @@ if test "x$enable_xlocale" = "xyes"; then
 fi
 
--- a/srcpkgs/afterstep/patches/51-configure-pass-cross-alias-down.patch
+++ b/srcpkgs/afterstep/patches/51-configure-pass-cross-alias-down.patch
@ -1,7 +1,7 @@
 diff --git configure configure
 index bc9a30e..95e7b3a 100755
--- configure
-+++ configure
+--- a/configure
+++ b/configure
@@ -6254,6 +6254,8 @@ FROM_AFTERSTEP_CONFIGURE=yes
 export FROM_AFTERSTEP_CONFIGURE
 
--- a/srcpkgs/afterstep/patches/52-libafterimage-cross.patch
+++ b/srcpkgs/afterstep/patches/52-libafterimage-cross.patch
@ -1,7 +1,7 @@
 diff --git libAfterImage/configure.in libAfterImage/configure.in
 index ca49a50..780e0ff 100644
--- libAfterImage/configure.in
-+++ libAfterImage/configure.in
+--- a/libAfterImage/configure.in
+++ b/libAfterImage/configure.in
@@ -590,21 +590,21 @@ else
 					  )
 	  if test "x$have_ft2build" = "xno" ; then
--- a/srcpkgs/afterstep/template
+++ b/srcpkgs/afterstep/template
@ -13,7 +13,6 @@ license="MIT"
 homepage="http://www.afterstep.org/"
 distfiles="https://github.com/sashavasko/${pkgname}-devel/archive/${version}.tar.gz"
 checksum=7a82d06a9ce432ef3b0856ff39f6da416aa8cbc249dbb2ff3c1cdcb02e2ca46d
-patch_args=-Np0

 pre_configure() {
 	autoreconf -fi libAfterBase
--- a/srcpkgs/agg/patches/agg-2.4-depends.patch
+++ b/srcpkgs/agg/patches/agg-2.4-depends.patch
@ -1,5 +1,5 @@
--- font_freetype/Makefile.am	2005-10-18 11:45:40.000000000 +0100
-+++ font_freetype/Makefile.am	2006-07-10 15:11:55.000000000 +0100
+--- a/font_freetype/Makefile.am	2005-10-18 11:45:40.000000000 +0100
+++ b/font_freetype/Makefile.am	2006-07-10 15:11:55.000000000 +0100
@@ -4,8 +4,9 @@
 agginclude_HEADERS = agg_font_freetype.h
 lib_LTLIBRARIES = libaggfontfreetype.la
@ -11,8 +11,8 @@
 +libaggfontfreetype_la_LIBADD = ../src/libagg.la @FREETYPE_LIBS@
 endif
 
--- src/platform/sdl/Makefile.am	2005-10-17 23:49:35.000000000 +0100
-+++ src/platform/sdl/Makefile.am	2006-07-10 15:11:55.000000000 +0100
+--- a/src/platform/sdl/Makefile.am	2005-10-17 23:49:35.000000000 +0100
+++ b/src/platform/sdl/Makefile.am	2006-07-10 15:11:55.000000000 +0100
@@ -5,6 +5,6 @@
 libaggplatformsdl_la_LDFLAGS = -version-info @AGG_LIB_VERSION@
 libaggplatformsdl_la_SOURCES = agg_platform_support.cpp
@ -21,8 +21,8 @@
 +libaggplatformsdl_la_LIBADD = ../../libagg.la @SDL_LIBS@
 endif
 
--- configure.in	2006-10-09 05:06:36.000000000 +0100
-+++ configure.in	2007-01-07 14:07:39.000000000 +0000
+--- a/configure.in	2006-10-09 05:06:36.000000000 +0100
+++ b/configure.in	2007-01-07 14:07:39.000000000 +0000
@@ -122,7 +122,8 @@
 fi
 AM_CONDITIONAL(ENABLE_X11,[test x$no_x = x -a xno != x$enable_platform -a x$win32_host != xyes])
@ -33,8 +33,8 @@
 dnl ###############################################
 
 dnl Settung up library version
--- src/platform/X11/Makefile.am	2006-12-11 00:59:45.000000000 +0000
-+++ src/platform/X11/Makefile.am	2007-01-07 14:07:39.000000000 +0000
+--- a/src/platform/X11/Makefile.am	2006-12-11 00:59:45.000000000 +0000
+++ b/src/platform/X11/Makefile.am	2007-01-07 14:07:39.000000000 +0000
@@ -1,8 +1,8 @@
 if ENABLE_X11
 lib_LTLIBRARIES = libaggplatformX11.la
--- a/srcpkgs/agg/patches/agg-2.5-pkgconfig.patch
+++ b/srcpkgs/agg/patches/agg-2.5-pkgconfig.patch
@ -1,5 +1,5 @@
--- libagg.pc.in.orig	2007-01-07 13:58:28.000000000 +0000
-+++ libagg.pc.in	2007-01-07 14:02:40.000000000 +0000
+--- a/libagg.pc.in	2007-01-07 13:58:28.000000000 +0000
+++ b/libagg.pc.in	2007-01-07 14:02:40.000000000 +0000
@@ -6,5 +6,6 @@
 Name: libagg
 Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
--- a/srcpkgs/agg/patches/gcc82.patch
+++ b/srcpkgs/agg/patches/gcc82.patch
@ -1,5 +1,5 @@
--- include/agg_renderer_outline_aa.h	2006-10-09 06:07:08.000000000 +0200
-+++ include/agg_renderer_outline_aa.h	2018-08-22 11:06:28.038930861 +0200
+--- a/include/agg_renderer_outline_aa.h	2006-10-09 06:07:08.000000000 +0200
+++ b/include/agg_renderer_outline_aa.h	2018-08-22 11:06:28.038930861 +0200
@@ -1375,7 +1375,7 @@
         //---------------------------------------------------------------------
         void profile(const line_profile_aa& prof) { m_profile = &prof; }
--- a/srcpkgs/agg/template
+++ b/srcpkgs/agg/template
@ -13,7 +13,6 @@ homepage="http://www.antigrain.com/"
 license="GPL-2.0-or-later"
 distfiles="http://www.antigrain.com/agg-${version}.tar.gz"
 checksum=ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f
-patch_args=-Np0

 pre_configure() {
 	sed -e '/AM_C_PROTOTYPES/d' -i configure.in
--- a/srcpkgs/allegro4/patches/mesa10-uncompat.patch
+++ b/srcpkgs/allegro4/patches/mesa10-uncompat.patch
@ -7,8 +7,8 @@ once mesa-10 contains the above commit.

 	-- xtraeme

--- addons/allegrogl/include/allegrogl/GLext/glx_ext_api.h.orig	2014-01-05 09:08:26.796542194 +0100
-+++ addons/allegrogl/include/allegrogl/GLext/glx_ext_api.h	2014-01-05 09:08:46.115682136 +0100
+--- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_api.h	2014-01-05 09:08:26.796542194 +0100
+++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_api.h	2014-01-05 09:08:46.115682136 +0100
@@ -59,8 +59,8 @@ AGL_API(void, DestroyGLXVideoSourceSGIX,
 /* GLX_EXT_import_context */
 AGL_API(Display *, GetCurrentDisplayEXT, (void))
--- a/srcpkgs/allegro4/template
+++ b/srcpkgs/allegro4/template
@ -17,7 +17,6 @@ homepage="http://alleg.sourceforge.net/"
 homepage="https://liballeg.org"
 distfiles="https://github.com/liballeg/allegro5/releases/download/${version}/allegro-${version}.tar.gz"
 checksum=ec19dbc9a021244582b4819b3583ee594b50141f9fcf6944a4ed8069cbf8d4d4
-patch_args=-Np0

 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
--- a/srcpkgs/allegro5/patches/time64.patch
+++ b/srcpkgs/allegro5/patches/time64.patch
@ -1,5 +1,5 @@
--- src/linux/lhaptic.c	2015-06-01 21:58:12.000000000 +0200
-+++ src/linux/lhaptic.c	2020-12-06 09:50:58.475010832 +0100
+--- a/src/linux/lhaptic.c	2015-06-01 21:58:12.000000000 +0200
+++ b/src/linux/lhaptic.c	2020-12-06 09:50:58.475010832 +0100
@@ -57,6 +57,7 @@
 
 
--- a/srcpkgs/allegro5/template
+++ b/srcpkgs/allegro5/template
@ -17,7 +17,6 @@ license="Allegro License (MIT alike)"
 homepage="https://liballeg.org/"
 distfiles="https://github.com/liballeg/allegro5/releases/download/${version}/allegro-${version}.tar.gz"
 checksum=5de8189ec051e1865f359654f86ec68e2a12a94edd00ad06d1106caa5ff27763
-patch_args=-Np0

 post_install() {
 	vlicense LICENSE.txt
--- a/srcpkgs/alsa-firmware/patches/musl.patch
+++ b/srcpkgs/alsa-firmware/patches/musl.patch
@ -1,5 +1,5 @@
--- hdsploader/multiface_firmware_rev11.dat.orig
-+++ hdsploader/multiface_firmware_rev11.dat
+--- a/hdsploader/multiface_firmware_rev11.dat
+++ b/hdsploader/multiface_firmware_rev11.dat
@@ -1,5 +1,5 @@
 /* stored in little-endian */
 -static u_int32_t multiface_firmware_rev11[24413] = {
@ -7,8 +7,8 @@
 0xffffffff, 0x66aa9955, 0x8001000c, 0xe0000000, 0x8006800c, 0xb0000000,
 0x8004800c, 0xb4fc0100, 0x8003000c, 0x00000000, 0x8001000c, 0x90000000,
 0x8004000c, 0x00000000, 0x8001000c, 0x80000000, 0x0002000c, 0x581a000a,
--- hdsploader/digiface_firmware_rev11.dat.orig
-+++ hdsploader/digiface_firmware_rev11.dat
+--- a/hdsploader/digiface_firmware_rev11.dat
+++ b/hdsploader/digiface_firmware_rev11.dat
@@ -1,5 +1,5 @@
 /* stored in little-endian */
 -static u_int32_t digiface_firmware_rev11[24413] = {
@ -16,8 +16,8 @@
 0xffffffff, 0x66aa9955, 0x8001000c, 0xe0000000, 0x8006800c, 0xb0000000,
 0x8004800c, 0xb4fc0100, 0x8003000c, 0x00000000, 0x8001000c, 0x90000000,
 0x8004000c, 0x00000000, 0x8001000c, 0x80000000, 0x0002000c, 0x581a000a,
--- hdsploader/digiface_firmware.dat.orig
-+++ hdsploader/digiface_firmware.dat
+--- a/hdsploader/digiface_firmware.dat
+++ b/hdsploader/digiface_firmware.dat
@@ -1,5 +1,5 @@
 /* stored in little-endian */
 -static u_int32_t digiface_firmware[24413] = {
@ -25,8 +25,8 @@
 0xffffffff, 0x66aa9955, 0x8001000c, 0xe0000000, 0x8006800c, 0xb0000000,
 0x8004800c, 0xb4fc0100, 0x8003000c, 0x00000000, 0x8001000c, 0x90000000,
 0x8004000c, 0x00000000, 0x8001000c, 0x80000000, 0x0002000c, 0x581a000a,
--- hdsploader/tobin.c.orig
-+++ hdsploader/tobin.c
+--- a/hdsploader/tobin.c
+++ b/hdsploader/tobin.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
@ -43,8 +43,8 @@
 {
 	FILE *out;
 	
--- hdsploader/multiface_firmware.dat.orig
-+++ hdsploader/multiface_firmware.dat
+--- a/hdsploader/multiface_firmware.dat
+++ b/hdsploader/multiface_firmware.dat
@@ -1,5 +1,5 @@
 /* stored in little-endian */
 -static u_int32_t multiface_firmware[24413] = {
--- a/srcpkgs/alsa-firmware/template
+++ b/srcpkgs/alsa-firmware/template
@ -12,7 +12,6 @@ distfiles="https://www.alsa-project.org/files/pub/firmware/${pkgname}-${version}
 checksum=b67b6d7d08bcfc247ef6ff0ab88a99c188305a3cf57ae2dfd0bcd9a5b36cd5bb
 nostrip=yes
 ignore_elf_files="/usr/share/alsa/firmware/mixartloader/miXart8.elf"
-patch_args=-Np0

 pre_configure() {
 	export CC="${BUILD_CC}" CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
--- a/srcpkgs/alsa-tools/patches/musl-__sighandler_t.patch
+++ b/srcpkgs/alsa-tools/patches/musl-__sighandler_t.patch
@ -1,5 +1,5 @@
--- ./ld10k1/src/ld10k1_fnc1.c.orig	2015-09-10 22:54:40.229499746 -0400
-+++ ./ld10k1/src/ld10k1_fnc1.c	2015-09-10 23:09:37.236472375 -0400
+--- a/ld10k1/src/ld10k1_fnc1.c	2015-09-10 22:54:40.229499746 -0400
+++ b/ld10k1/src/ld10k1_fnc1.c	2015-09-10 23:09:37.236472375 -0400
@@ -23,6 +23,10 @@
 #include "config.h"
 #endif
--- a/srcpkgs/alsa-tools/template
+++ b/srcpkgs/alsa-tools/template
@ -12,7 +12,6 @@ homepage="http://alsa-project.org"
 distfiles="https://www.alsa-project.org/files/pub/tools/alsa-tools-${version}.tar.bz2"
 checksum=bfd3c7aae1289269605d3da02279159b10e3dabdd31e658cbceaa30170957349
 python_version=3
-patch_args=-Np0

 _tools="
 	as10k1 echomixer envy24control hdajackretask hdajacksensetest hda-verb hdspconf
--- a/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
+++ b/srcpkgs/amdvlk/patches/cmake-build-type-none.patch
@ -1,7 +1,7 @@
 Index: llvm-project/llvm/CMakeLists.txt
 ===================================================================
--- llvm-project/llvm/CMakeLists.txt.orig
-+++ llvm-project/llvm/CMakeLists.txt
+--- a/llvm-project/llvm/CMakeLists.txt
+++ b/llvm-project/llvm/CMakeLists.txt
@@ -251,11 +251,6 @@ endif()
 
 string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
@ -16,8 +16,8 @@ Index: llvm-project/llvm/CMakeLists.txt
 set(LLVM_TOOLS_INSTALL_DIR "bin" CACHE STRING "Path for binary subdirectory (defaults to 'bin')")
 Index: pal/cmake/Modules/AmdCmakeHelper.cmake
 ===================================================================
--- pal/cmake/Modules/AmdCmakeHelper.cmake.orig
-+++ pal/cmake/Modules/AmdCmakeHelper.cmake
+--- a/pal/cmake/Modules/AmdCmakeHelper.cmake
+++ b/pal/cmake/Modules/AmdCmakeHelper.cmake
@@ -37,11 +37,6 @@ if (CMAKE_CONFIGURATION_TYPES)
 else()
     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
@ -32,8 +32,8 @@ Index: pal/cmake/Modules/AmdCmakeHelper.cmake
         set(CMAKE_BUILD_TYPE_RELEASE OFF)
 Index: xgl/CMakeLists.txt
 ===================================================================
--- xgl/CMakeLists.txt.orig
-+++ xgl/CMakeLists.txt
+--- a/xgl/CMakeLists.txt
+++ b/xgl/CMakeLists.txt
@@ -181,11 +181,6 @@ if (CMAKE_CONFIGURATION_TYPES)
 else()
     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
@ -46,8 +46,8 @@ Index: xgl/CMakeLists.txt
     if(capital_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
         set(CMAKE_BUILD_TYPE_DEBUG ON)
         set(CMAKE_BUILD_TYPE_RELEASE OFF)
--- xgl/cmake/Modules/AmdCmakeHelper.cmake	2021-04-07 06:57:17.000000000 +0200
-+++ -	2021-04-26 14:11:03.415683706 +0200
+--- a/xgl/cmake/Modules/AmdCmakeHelper.cmake	2021-04-07 06:57:17.000000000 +0200
+++ b/xgl/cmake/Modules/AmdCmakeHelper.cmake	2021-04-07 06:57:17.000000000 +0200
@@ -35,11 +35,6 @@
 else()
     string(TOUPPER "${CMAKE_BUILD_TYPE}" capital_CMAKE_BUILD_TYPE)
--- a/srcpkgs/amdvlk/patches/musl.patch
+++ b/srcpkgs/amdvlk/patches/musl.patch
@ -1,5 +1,5 @@
--- pal/shared/gpuopen/src/posix/ddPosixSocket.cpp	2019-10-18 11:06:42.000000000 +0200
-+++ -	2019-10-29 20:15:35.614608453 +0100
+--- a/pal/shared/gpuopen/src/posix/ddPosixSocket.cpp	2019-10-18 11:06:42.000000000 +0200
+++ b/pal/shared/gpuopen/src/posix/ddPosixSocket.cpp	2019-10-18 11:06:42.000000000 +0200
@@ -34,7 +34,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@ -42,7 +42,6 @@ checksum="ec17d7f7c7af5adaa2fee7744321da3665be215105df7c3fc72bfeff2575a509
 186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
 nocross=yes
 lib32files="/usr/share/vulkan/icd.d/amd_icd32.json"
-patch_args=-Np0

 case "$XBPS_TARGET_MACHINE" in
 	i686*) nodebug=yes;;
--- a/srcpkgs/angrysearch/patches/00-fiximport.patch
+++ b/srcpkgs/angrysearch/patches/00-fiximport.patch
@ -1,7 +1,7 @@
 diff --git angrysearch.py angrysearch.py
 index 33c181d..ef9d5a2 100644
--- angrysearch.py
-+++ angrysearch.py
+--- a/angrysearch.py
+++ b/angrysearch.py
@@ -18,6 +18,8 @@ import subprocess
 import sys
 import time
--- a/srcpkgs/angrysearch/template
+++ b/srcpkgs/angrysearch/template
@ -13,7 +13,6 @@ homepage="https://github.com/dotheevo/angrysearch/"
 distfiles="http://github.com/dotheevo/${pkgname}/archive/v${version}.tar.gz"
 checksum=9a550649c3efafb26660860758f2e75702ce96a0a0c50dc34ced2967b51a843f
 python_version=3
-patch_args=-Np0

 do_install() {
 	vinstall angrysearch.desktop 644 "usr/share/applications"
--- a/srcpkgs/anjuta/patches/fix-unistd_h.patch
+++ b/srcpkgs/anjuta/patches/fix-unistd_h.patch
@ -1,7 +1,7 @@
 Fix wrong include for musl libc.

--- launcher/anjuta-launcher.c	2014-10-17 21:35:31.000000000 +0200
-+++ launcher/anjuta-launcher.c	2015-09-09 22:09:06.719400546 +0200
+--- a/launcher/anjuta-launcher.c	2014-10-17 21:35:31.000000000 +0200
+++ b/launcher/anjuta-launcher.c	2015-09-09 22:09:06.719400546 +0200
@@ -22,7 +22,7 @@
 #endif
 
--- a/srcpkgs/anjuta/patches/python.patch
+++ b/srcpkgs/anjuta/patches/python.patch
@ -1,5 +1,5 @@
--- configure.ac.orig	2020-07-04 20:59:04.718066026 +0700
-+++ configure.ac	2020-07-04 20:59:54.542554633 +0700
+--- a/configure.ac	2020-07-04 20:59:04.718066026 +0700
+++ b/configure.ac	2020-07-04 20:59:54.542554633 +0700
@@ -370,7 +370,7 @@
 	[have_python="no"])
 
--- a/srcpkgs/anjuta/patches/vala.patch
+++ b/srcpkgs/anjuta/patches/vala.patch
@ -1,5 +1,5 @@
--- configure.ac.orig	2020-07-04 20:32:36.223805943 +0700
-+++ configure.ac	2020-07-04 20:33:01.432033914 +0700
+--- a/configure.ac	2020-07-04 20:32:36.223805943 +0700
+++ b/configure.ac	2020-07-04 20:33:01.432033914 +0700
@@ -338,7 +338,7 @@
 else
         AC_MSG_RESULT(no)
--- a/srcpkgs/anjuta/patches/vala048.patch
+++ b/srcpkgs/anjuta/patches/vala048.patch
@ -9,8 +9,8 @@ Subject: [PATCH] language-support-vala: Support for vala 0.48 API

 diff --git a/plugins/language-support-vala/plugin.vala b/plugins/language-support-vala/plugin.vala
 index 13d35fec4..718d74cc8 100644
--- plugins/language-support-vala/plugin.vala
-+++ plugins/language-support-vala/plugin.vala
+--- a/plugins/language-support-vala/plugin.vala
+++ b/plugins/language-support-vala/plugin.vala
@@ -414,11 +414,19 @@ public class ValaPlugin : Plugin, IAnjuta.Preferences {
 			builder.append_printf ("%s sender", widget.get_full_name ());
 
--- a/srcpkgs/anjuta/template
+++ b/srcpkgs/anjuta/template
@ -22,7 +22,6 @@ license="GPL-2.0-or-later"
 homepage="https://projects.gnome.org/anjuta"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=42a93130ed3ee02d064a7094e94e1ffae2032b3f35a87bf441e37fc3bb3a148f
-patch_args=-Np0

 build_options="gir"
 build_options_default="gir"
--- a/srcpkgs/anki/patches/fix_mpv_args.patch
+++ b/srcpkgs/anki/patches/fix_mpv_args.patch
@ -1,5 +1,5 @@
--- ./anki/mpv.py
-+++ ./anki/mpv.py
+--- a/anki/mpv.py
+++ b/anki/mpv.py
@@ -104,9 +104,9 @@
         """
         self.argv = [self.executable]
@ -13,8 +13,8 @@
     def _start_process(self):
         """Start the mpv process.

--- ./anki/sound.py
-+++ ./anki/sound.py
+--- a/anki/sound.py
+++ b/anki/sound.py
@@ -123,10 +123,7 @@
 
 def setMpvConfigBase(base):
--- a/srcpkgs/anki/template
+++ b/srcpkgs/anki/template
@ -13,7 +13,6 @@ homepage="https://apps.ankiweb.net"
 changelog="https://apps.ankiweb.net/docs/changes.html"
 distfiles="https://apps.ankiweb.net/downloads/archive/anki-$version-source.tgz"
 checksum=5a53760164c77d619f55107a13099cffe620566a7f610b61b6c4b52487f3bb89
-patch_args=-Np0

 python_version=3

--- a/srcpkgs/antimicrox/patches/time64.patch
+++ b/srcpkgs/antimicrox/patches/time64.patch
@ -1,5 +1,5 @@
--- src/eventhandlers/uinputeventhandler.cpp	2020-10-02 09:51:36.000000000 +0200
-+++ src/eventhandlers/uinputeventhandler.cpp	2020-12-06 10:17:47.922175141 +0100
+--- a/src/eventhandlers/uinputeventhandler.cpp	2020-10-02 09:51:36.000000000 +0200
+++ b/src/eventhandlers/uinputeventhandler.cpp	2020-12-06 10:17:47.922175141 +0100
@@ -498,9 +498,12 @@
 {
     struct input_event ev;
--- a/srcpkgs/antimicrox/template
+++ b/srcpkgs/antimicrox/template
@ -13,7 +13,6 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/AntiMicroX/antimicrox"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=53c6b0e6c8ea8c3a5527b56e1ad052eae983ba36abfc090769c6164bc5f342dd
-patch_args=-Np0

 libantimicrox_package() {
 	short_desc+=" - libraries"
--- a/srcpkgs/apache/patches/libressl.patch
+++ b/srcpkgs/apache/patches/libressl.patch
@ -1,5 +1,5 @@
--- modules/ssl/ssl_engine_init.c.orig  2018-10-30 16:25:09.084840429 +0100
-+++ modules/ssl/ssl_engine_init.c       2018-10-30 16:25:55.019411636 +0100
+--- a/modules/ssl/ssl_engine_init.c.orig  2018-10-30 16:25:09.084840429 +0100
+++ b/modules/ssl/ssl_engine_init.c       2018-10-30 16:25:55.019411636 +0100
@@ -1492,7 +1492,7 @@
     X509_STORE_CTX *sctx;
     X509_STORE *store = SSL_CTX_get_cert_store(mctx->ssl_ctx);
--- a/srcpkgs/apache/template
+++ b/srcpkgs/apache/template
@ -37,7 +37,6 @@ homepage="http://httpd.apache.org/"
 changelog="http://www.apache.org/dist/httpd/CHANGES_2.4"
 distfiles="https://archive.apache.org/dist/httpd/httpd-${version}.tar.bz2"
 checksum=1bc826e7b2e88108c7e4bf43c026636f77a41d849cfb667aa7b5c0b86dbf966c
-patch_args=-Np0

 system_accounts="_${pkgname}"
 _apache_homedir="/srv/www/$pkgname"
--- a/srcpkgs/apl/patches/musl.patch
+++ b/srcpkgs/apl/patches/musl.patch
@ -1,5 +1,5 @@
--- src/Error.hh.orig	2019-06-24 11:12:35.825267571 +0200
-+++ src/Error.hh	2019-06-24 11:12:46.505396162 +0200
+--- a/src/Error.hh	2019-06-24 11:12:35.825267571 +0200
+++ b/src/Error.hh	2019-06-24 11:12:46.505396162 +0200
@@ -26,6 +26,8 @@
 #include "ErrorCode.hh"
 #include "UCS_string.hh"
--- a/srcpkgs/apl/patches/ppc.patch
+++ b/srcpkgs/apl/patches/ppc.patch
@ -8,8 +8,8 @@ Tokenizer.cc:769:4: error: floating constant exceeds range of 'long double' [-We
    exp_0_9(1E30)
    ^~~~~~~

--- src/Tokenizer.cc
-+++ src/Tokenizer.cc
+--- a/src/Tokenizer.cc
+++ b/src/Tokenizer.cc
@@ -755,10 +755,10 @@
        MAX_TOKENIZE_DIGITS = MAX_TOKENIZE_DIGITS_1 - 1   // excl. rounding digit
      };
--- a/srcpkgs/apl/template
+++ b/srcpkgs/apl/template
@ -14,7 +14,6 @@ distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=144f4c858a0d430ce8f28be90a35920dd8e0951e56976cb80b55053fa0d8bbcb
 nocross="execs target binary: ./Gtk_server --ev1 > Gtk_events1.asciidoc"
 CXXFLAGS="-Wno-format-truncation -Wno-class-memaccess -Wno-maybe-uninitialized -Wno-restrict -Wno-cpp"
-patch_args=-Np0

 post_install() {
 	vdoc support-files/Dyalog-Keyboard/apl.xkb
--- a/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
+++ b/srcpkgs/appstream-glib/patches/0001-flip-archive_h-and-archive_entry_h-order-on-client-as-util.patch
@ -1,7 +1,7 @@
 They are in the wrong order.

--- client/as-util.c
-+++ client/as-util.c
+--- a/client/as-util.c
+++ b/client/as-util.c
@@ -27,8 +27,8 @@
 #include <gio/gio.h>
 
--- a/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch
+++ b/srcpkgs/appstream-glib/patches/0002-flip-archive_h-and-archive_entry_h-order-on-libappstream-glib-as-util.patch
@ -1,7 +1,7 @@
 They are in the wrong order.

--- libappstream-glib/as-utils.c
-+++ libappstream-glib/as-utils.c
+--- a/libappstream-glib/as-utils.c
+++ b/libappstream-glib/as-utils.c
@@ -34,8 +34,8 @@
 
 #include <fnmatch.h>
--- a/srcpkgs/appstream-glib/template
+++ b/srcpkgs/appstream-glib/template
@ -16,7 +16,6 @@ homepage="https://people.freedesktop.org/~hughsient/appstream-glib/"
 changelog="https://raw.githubusercontent.com/hughsie/appstream-glib/master/NEWS"
 distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz"
 checksum=ca1ed22e3bde3912cb903aaa7de085d55771da454f1c0573fd9608e1de9c4002
-patch_args=-Np0

 build_options="gir"
 build_options_default="gir"
--- a/srcpkgs/apr/patches/atomic64.patch
+++ b/srcpkgs/apr/patches/atomic64.patch
@ -9,8 +9,8 @@ Date:   Fri Jan 10 13:04:37 2020 +0100

 diff --git atomic/unix/builtins64.c atomic/unix/builtins64.c
 index 4a4b685..90b5c5e 100644
--- atomic/unix/builtins64.c
-+++ atomic/unix/builtins64.c
+--- a/atomic/unix/builtins64.c
+++ b/atomic/unix/builtins64.c
@@ -30,35 +30,34 @@ APR_DECLARE(void) apr_atomic_set64(volatile apr_uint64_t *mem, apr_uint64_t val)
 
 APR_DECLARE(apr_uint64_t) apr_atomic_add64(volatile apr_uint64_t *mem, apr_uint64_t val)
--- a/srcpkgs/apr/template
+++ b/srcpkgs/apr/template
@ -11,7 +11,6 @@ license="Apache-2.0"
 homepage="http://apr.apache.org/"
 distfiles="http://www.apache.org/dist/apr/apr-${version}.tar.bz2"
 checksum=e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea
-patch_args=-Np0

 # Do not redefine struct iovec in include/apr_want.h
 CFLAGS="-DAPR_IOVEC_DEFINED=1"
--- a/srcpkgs/apvlv/patches/cxxflags_from_env.patch
+++ b/srcpkgs/apvlv/patches/cxxflags_from_env.patch
@ -1,5 +1,5 @@
--- src/CMakeLists.txt.orig	2016-09-14 01:48:05.822928918 +0200
-+++ src/CMakeLists.txt	2016-09-14 01:48:54.906931451 +0200
+--- a/src/CMakeLists.txt	2016-09-14 01:48:05.822928918 +0200
+++ b/src/CMakeLists.txt	2016-09-14 01:48:54.906931451 +0200
@@ -1,7 +1,7 @@
 IF (WIN32)
   ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
--- a/srcpkgs/apvlv/template
+++ b/srcpkgs/apvlv/template
@ -14,4 +14,3 @@ homepage="http://naihe2010.github.io/apvlv/"
 distfiles="https://github.com/naihe2010/apvlv/archive/v${version}.tar.gz"
 checksum=a4a2f42a7e42715a21d2356def3ed93c180c6ae41128580addee42835e5374c2
 replaces="apvlv-git>=0"
-patch_args=-Np0
--- a/srcpkgs/aqbanking/patches/cmake-prefix.patch
+++ b/srcpkgs/aqbanking/patches/cmake-prefix.patch
@ -1,5 +1,5 @@
--- aqbanking-config.cmake.in	2018-01-10 16:09:39.079835643 +0100
-+++ aqbanking-config.cmake.in	2018-01-10 16:11:18.140403253 +0100
+--- a/aqbanking-config.cmake.in	2018-01-10 16:09:39.079835643 +0100
+++ b/aqbanking-config.cmake.in	2018-01-10 16:11:18.140403253 +0100
@@ -19,7 +19,18 @@
 include(CMakeFindDependencyMacro)
 find_dependency(gwenhywfar "@GWENHYWFAR_MINIMUM_VERSION@")
--- a/srcpkgs/aqbanking/template
+++ b/srcpkgs/aqbanking/template
@ -12,7 +12,6 @@ homepage="http://www.aquamaniac.de/aqbanking"
 distfiles="https://www.aquamaniac.de/rdm/attachments/download/372/${pkgname}-${version}.tar.gz"
 checksum=a0e85da2072c927bc32cfd808caaccfdabe34725e75618b08d8049306d8355cc
 disable_parallel_build=yes
-patch_args=-Np0

 if [ "$CROSS_BUILD" ]; then
 	export PKG_CONFIG_PATH=${XBPS_CROSS_BASE}/usr/lib/pkgconfig
--- a/srcpkgs/aqemu/patches/stdexcept.patch
+++ b/srcpkgs/aqemu/patches/stdexcept.patch
@ -9,8 +9,8 @@ Subject: [PATCH] stdexcept

 diff --git src/docopt/docopt_value.h src/docopt/docopt_value.h
 index ddb8a8e..99aa545 100644
--- src/docopt/docopt_value.h
-+++ src/docopt/docopt_value.h
+--- a/src/docopt/docopt_value.h
+++ b/src/docopt/docopt_value.h
@@ -13,7 +13,7 @@
 #include <iosfwd>
 #include <string>
--- a/srcpkgs/aqemu/template
+++ b/srcpkgs/aqemu/template
@ -12,7 +12,6 @@ license="GPL-2.0-only"
 homepage="http://aqemu.sourceforge.net"
 distfiles="https://github.com/TBK/aqemu/archive/v${version}.tar.gz"
 checksum=576ae78de936518a1de057355ffc192b59e42be934f0111122b2c5fcafe318a7
-patch_args=-Np0

 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
--- a/srcpkgs/ardour/patches/6.0-fix-build.patch
+++ b/srcpkgs/ardour/patches/6.0-fix-build.patch
@ -1,7 +1,7 @@
 diff --git libs/ardour/wscript libs/ardour/wscript
 index 49cea6a..a7f8e84 100644
--- libs/ardour/wscript
-+++ libs/ardour/wscript
+--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -384,7 +384,7 @@ def build(bld):
 
     # remove '${DEFINES_ST:DEFINES}' from run_str.
--- a/srcpkgs/ardour/patches/6.0-fix-runtime.patch
+++ b/srcpkgs/ardour/patches/6.0-fix-runtime.patch
@ -1,5 +1,5 @@
--- libs/pbd/pbd/pthread_utils.h.orig	2020-09-18 22:30:18.353441907 +0700
-+++ libs/pbd/pbd/pthread_utils.h	2020-09-18 22:37:07.059363532 +0700
+--- a/libs/pbd/pbd/pthread_utils.h	2020-09-18 22:30:18.353441907 +0700
+++ b/libs/pbd/pbd/pthread_utils.h	2020-09-18 22:37:07.059363532 +0700
@@ -49,7 +49,7 @@
 #include "pbd/signals.h"
 
--- a/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch
+++ b/srcpkgs/ardour/patches/use-bundled-qm-dsp.patch
@ -10,8 +10,8 @@ Subject: [PATCH] use bundled qm-dsp

 diff --git libs/qm-dsp/wscript libs/qm-dsp/wscript
 index 92dc9502b1..dbbff16722 100644
--- libs/qm-dsp/wscript
-+++ libs/qm-dsp/wscript
+--- a/libs/qm-dsp/wscript
+++ b/libs/qm-dsp/wscript
@@ -23,17 +23,10 @@ def options(opt):
     autowaf.set_options(opt)
 
@ -34,8 +34,8 @@ index 92dc9502b1..dbbff16722 100644
     obj.source = '''
 diff --git wscript wscript
 index 4b5acb0ad7..c0358af37e 100644
--- wscript
-+++ wscript
+--- a/wscript
+++ b/wscript
@@ -991,8 +991,6 @@ def configure(conf):
 
     if Options.options.use_external_libs:
--- a/srcpkgs/ardour/template
+++ b/srcpkgs/ardour/template
@ -18,7 +18,6 @@ short_desc="Professional-grade digital audio workstation"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="GPL-2.0-or-later"
 homepage="http://ardour.org"
-patch_args=-Np0

 CXXFLAGS="-fpermissive"

--- a/srcpkgs/argon2/patches/explicit-bzero.patch
+++ b/srcpkgs/argon2/patches/explicit-bzero.patch
@ -1,7 +1,7 @@
 # reason: use explizit_bzero on musl too!

--- src/core.c
-+++ src/core.c
+--- a/src/core.c
+++ b/src/core.c
@@ -27,6 +27,7 @@
 
 /* for explicit_bzero() on glibc */
--- a/srcpkgs/argon2/patches/libdir.patch
+++ b/srcpkgs/argon2/patches/libdir.patch
@ -2,8 +2,8 @@
 #   upstream believes Ubuntu/Debian are the only ones
 #   to report "$(uname -s)-$(uname -m)" as Linux-x86_64 ...

--- Makefile
-+++ Makefile
+--- a/Makefile
+++ b/Makefile
@@ -138,14 +138,6 @@
 LIBRARY_REL ?= lib
 PKGCONFIG_REL ?= libdata
--- a/srcpkgs/argon2/template
+++ b/srcpkgs/argon2/template
@ -14,7 +14,6 @@ license="CC0-1.0, Apache-2.0"
 homepage="https://github.com/P-H-C/phc-winner-argon2"
 distfiles="https://github.com/P-H-C/phc-winner-argon2/archive/${version}.tar.gz"
 checksum=daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c
-patch_args=-Np0

 libargon2_package() {
 	short_desc="Password hashing library"
--- a/srcpkgs/argyllcms/patches/fix-gcc6-attribute_numsup_h.patch
+++ b/srcpkgs/argyllcms/patches/fix-gcc6-attribute_numsup_h.patch
@ -1,6 +1,6 @@

--- numlib/numsup.h	2015-10-26 05:17:33.000000000 +0100
-+++ numlib/numsup.h	2016-10-04 10:10:28.732000000 +0200
+--- a/numlib/numsup.h	2015-10-26 05:17:33.000000000 +0100
+++ b/numlib/numsup.h	2016-10-04 10:10:28.732000000 +0200
@@ -324,7 +324,7 @@
 #define error_program g_log->tag
 extern void set_exe_path(char *arg0);
--- a/srcpkgs/argyllcms/template
+++ b/srcpkgs/argyllcms/template
@ -12,7 +12,6 @@ license="AGPL-3.0-or-later, GPL-2.0-or-later, GPL-3.0-or-later"
 homepage="https://www.argyllcms.com/"
 distfiles="https://www.argyllcms.com/Argyll_V${version}_src.zip"
 checksum=be378ca836b17b8684db05e9feaab138d711835ef00a04a76ac0ceacd386a3e3
-patch_args=-Np0

 # Build system look only under / for headers and libraries. Breaks cross.
 nocross=yes
--- a/srcpkgs/ark/patches/disable-xar-test.patch
+++ b/srcpkgs/ark/patches/disable-xar-test.patch
@ -6,8 +6,8 @@ Subject: [PATCH] disable xar test

 diff --git autotests/kerfuffle/extracttest.cpp autotests/kerfuffle/extracttest.cpp
 index 9178611..c1d3f13 100644
--- autotests/kerfuffle/extracttest.cpp
-+++ autotests/kerfuffle/extracttest.cpp
+--- a/autotests/kerfuffle/extracttest.cpp
+++ b/autotests/kerfuffle/extracttest.cpp
@@ -350,23 +350,6 @@ void ExtractTest::testExtraction_data()
         qDebug() << "lz4 executable not found in path. Skipping lz4 test.";
     }
@ -34,8 +34,8 @@ index 9178611..c1d3f13 100644
             << archivePath
 diff --git autotests/kerfuffle/loadtest.cpp autotests/kerfuffle/loadtest.cpp
 index 8c5f52d..cbb47cf 100644
--- autotests/kerfuffle/loadtest.cpp
-+++ autotests/kerfuffle/loadtest.cpp
+--- a/autotests/kerfuffle/loadtest.cpp
+++ b/autotests/kerfuffle/loadtest.cpp
@@ -181,13 +181,6 @@ void LoadTest::testProperties_data()
         qDebug() << "lz4 executable not found in path. Skipping lz4 test.";
     }
--- a/srcpkgs/ark/template
+++ b/srcpkgs/ark/template
@ -14,7 +14,6 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/utilities/org.kde.ark"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
 checksum=09e0294c36a881585183bf165020ef832bfbbd181547ea26eb78268aab46a768
-patch_args=-Np0

 do_check() {
 	cd build
--- a/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
+++ b/srcpkgs/armadillo/patches/9.700.2--include_dirs.patch
@ -6,8 +6,8 @@ Subject: [PATCH] Absolute paths can't match both cross and native use

 diff --git include/armadillo_bits/config.hpp.cmake include/armadillo_bits/config.hpp.cmake
 index be42243..a285e35 100644
--- include/armadillo_bits/config.hpp.cmake
-+++ include/armadillo_bits/config.hpp.cmake
+--- a/include/armadillo_bits/config.hpp.cmake
+++ b/include/armadillo_bits/config.hpp.cmake
@@ -50,7 +50,7 @@
 #endif
 
--- a/srcpkgs/armadillo/template
+++ b/srcpkgs/armadillo/template
@ -12,7 +12,6 @@ license="Apache-2.0"
 homepage="http://arma.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/arma/${pkgname}-${version}.tar.xz"
 checksum=d78658c9442addf7f718eb05881150ee3ec25604d06dd3af4942422b3ce26d05
-patch_args=-Np0

 build_options="hdf5"
 desc_option_hdf5="HDF5 support"
--- a/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
+++ b/srcpkgs/artyfx/patches/fix-avtk-cmake-sse.patch
@ -1,5 +1,5 @@
--- src/avtk/CMakeLists.txt	2016-12-24 19:36:45.000000000 +0000
-+++ src/avtk/CMakeLists.txt	2019-03-09 11:20:24.063980037 +0000
+--- a/src/avtk/CMakeLists.txt	2016-12-24 19:36:45.000000000 +0000
+++ b/src/avtk/CMakeLists.txt	2019-03-09 11:20:24.063980037 +0000
@@ -55,8 +55,13 @@
 link_directories   ( ${X11_LIBRARY_DIRS} )
 
--- a/srcpkgs/artyfx/patches/fix-lv2-1.18.patch
+++ b/srcpkgs/artyfx/patches/fix-lv2-1.18.patch
@ -1,5 +1,5 @@
--- src/ui/lv2_ui.cxx	2016-12-24 20:36:45.000000000 +0100
-+++ src/ui/lv2_ui.cxx	2020-12-25 22:17:21.206336431 +0100
+--- a/src/ui/lv2_ui.cxx	2016-12-24 20:36:45.000000000 +0100
+++ b/src/ui/lv2_ui.cxx	2020-12-25 22:17:21.206336431 +0100
@@ -33,7 +33,7 @@
 #include "whaaa.hxx"
 
--- a/srcpkgs/artyfx/patches/respect-our-cflags.patch
+++ b/srcpkgs/artyfx/patches/respect-our-cflags.patch
@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 ===================================================================
--- CMakeLists.txt.orig
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,17 +24,17 @@ pkg_check_modules(SND sndfile REQUIRED)
 include_directories( ${SND_INCLUDE_DIRS}  )
 #target_link_libraries( avtkDemo ${CAIRO_LIBRARIES}  )
--- a/srcpkgs/artyfx/template
+++ b/srcpkgs/artyfx/template
@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
 homepage="http://openavproductions.com/artyfx/"
 distfiles="https://github.com/openAVproductions/openAV-ArtyFX/archive/release-$version.tar.gz"
 checksum=a2a8d02b47bea44d0053cd4f8c6411f68a6fe9b9e4348a4139cd9bfd70105c00
-patch_args=-Np0

 case "$XBPS_TARGET_MACHINE" in
 	armv7*)
--- a/srcpkgs/asignify/patches/musl.patch
+++ b/srcpkgs/asignify/patches/musl.patch
@ -1,5 +1,5 @@
--- libasignify/sha2.h.orig	2015-06-13 11:00:00.647603180 +0200
-+++ libasignify/sha2.h	2015-06-13 11:00:43.070069529 +0200
+--- a/libasignify/sha2.h	2015-06-13 11:00:00.647603180 +0200
+++ b/libasignify/sha2.h	2015-06-13 11:00:43.070069529 +0200
@@ -59,7 +59,11 @@ typedef struct _SHA2_CTX {
 	uint8_t	buffer[SHA512_BLOCK_LENGTH];
 } SHA2_CTX;
--- a/srcpkgs/asignify/template
+++ b/srcpkgs/asignify/template
@ -10,7 +10,6 @@ license="BSD-2-Clause"
 homepage="https://github.com/vstakhov/asignify"
 distfiles="https://github.com/vstakhov/asignify/archive/${version}.tar.gz"
 checksum=81272713900b51049633139549181fa23e56eeb580e0ea0325546d2fe7ca503d
-patch_args=-Np0

 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
--- a/srcpkgs/assimp/patches/musl.patch
+++ b/srcpkgs/assimp/patches/musl.patch
@ -1,5 +1,5 @@
--- contrib/zip/src/zip.h	2019-09-24 19:28:59.000000000 +0200
-+++ -	2019-09-29 00:15:02.408202128 +0200
+--- a/contrib/zip/src/zip.h	2019-09-24 19:28:59.000000000 +0200
+++ b/contrib/zip/src/zip.h	2019-09-24 19:28:59.000000000 +0200
@@ -20,7 +20,7 @@
 #endif
 
--- a/Show more
+++ b/Show more