srcpkgs/k*: 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 · dd9d4a1979
commit dd9d4a1979
parent 1a06b0d5d7
88 changed files with 153 additions and 191 deletions
--- a/srcpkgs/k3b/patches/fix-musl.patch
+++ b/srcpkgs/k3b/patches/fix-musl.patch
@ -1,5 +1,5 @@
--- src/k3bsystemproblemdialog.cpp.orig	2018-05-31 08:02:32.713467562 +0200
-+++ src/k3bsystemproblemdialog.cpp	2018-05-31 08:02:42.902478072 +0200
+--- a/src/k3bsystemproblemdialog.cpp	2018-05-31 08:02:32.713467562 +0200
+++ b/src/k3bsystemproblemdialog.cpp	2018-05-31 08:02:42.902478072 +0200
@@ -57,7 +57,7 @@
 #include <langinfo.h>
 #endif
--- a/srcpkgs/k3b/template
+++ b/srcpkgs/k3b/template
@ -16,4 +16,3 @@ license="GPL-2.0-or-later"
 homepage="https://kde.org/applications/en/multimedia/org.kde.k3b"
 distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz"
 checksum=986c5073c944dbda5b49e3c1a2fbf340fb1c6af941e80b6a0020fadd1be9034b
-patch_args=-Np0
--- a/srcpkgs/kanshi/patches/assert.patch
+++ b/srcpkgs/kanshi/patches/assert.patch
@ -9,8 +9,8 @@ Date:   Tue Feb 2 17:18:42 2021 -0300

 diff --git parser.c parser.c
 index 40146e8..0ed1ba1 100644
--- parser.c
-+++ parser.c
+--- a/parser.c
+++ b/parser.c
@@ -1,5 +1,4 @@
 #define _POSIX_C_SOURCE 200809L
 -#include <assert.h>
--- a/srcpkgs/kanshi/template
+++ b/srcpkgs/kanshi/template
@ -11,7 +11,6 @@ license="MIT"
 homepage="https://github.com/emersion/kanshi"
 distfiles="https://github.com/emersion/kanshi/archive/v${version}.tar.gz"
 checksum=f7e782d2b49380aed370213b8d74af9fe806d9dc94b3c19179475f4b18e26566
-patch_args=-Np0

 post_install() {
 	vlicense LICENSE
--- a/srcpkgs/katarakt/patches/not-an-octal-number.patch
+++ b/srcpkgs/katarakt/patches/not-an-octal-number.patch
@ -1,5 +1,5 @@
--- katarakt.pro.orig	2020-11-21 07:57:05.333858604 +0700
-+++ katarakt.pro	2020-11-21 07:58:23.713527253 +0700
+--- a/katarakt.pro	2020-11-21 07:57:05.333858604 +0700
+++ b/katarakt.pro	2020-11-21 07:58:23.713527253 +0700
@@ -17,9 +17,9 @@
 
     isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config    # same as in link_pkgconfig.prf
--- a/srcpkgs/katarakt/template
+++ b/srcpkgs/katarakt/template
@ -13,7 +13,6 @@ homepage="https://wwwcip.cs.fau.de/~go18gomu/katarakt"
 #distfiles="https://wwwcip.cs.fau.de/~go18gomu/katarakt/tarballs/katarakt-${version}.tar.xz"
 distfiles="https://gitlab.cs.fau.de/Qui_Sum/katarakt/-/archive/v${version}/katarakt-v${version}.tar.gz"
 checksum=f60b3b7477975301a6c6657eb0a24d5cc28d321cca70e9746d4d1ea91e239c46
-patch_args=-Np0

 post_build() {
 	make doc
--- a/srcpkgs/kauth/patches/crossbuild-support.patch
+++ b/srcpkgs/kauth/patches/crossbuild-support.patch
@ -1,5 +1,5 @@
--- cmake/KF5AuthMacros.cmake	2018-08-26 14:57:02.703186769 +0200
-+++ cmake/KF5AuthMacros.cmake	2018-08-26 14:58:26.469054620 +0200
+--- a/cmake/KF5AuthMacros.cmake	2018-08-26 14:57:02.703186769 +0200
+++ b/cmake/KF5AuthMacros.cmake	2018-08-26 14:58:26.469054620 +0200
@@ -63,12 +63,21 @@
     set(_output ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.policy)
     get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE)
--- a/srcpkgs/kauth/template
+++ b/srcpkgs/kauth/template
@ -12,7 +12,6 @@ license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kauth"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=cb617df419d60c1087a1ac53bc601ffaf590798f2f346dbc26b01ea94a3286fc
-patch_args=-Np0

 do_check() {
 	cd build
--- a/srcpkgs/kbd/patches/fix-euro-symbol-es-keymap.patch
+++ b/srcpkgs/kbd/patches/fix-euro-symbol-es-keymap.patch
@ -1,5 +1,5 @@
--- data/keymaps/i386/qwerty/es.map.orig	2011-10-13 21:46:53.119563897 +0200
-+++ data/keymaps/i386/qwerty/es.map	2011-10-13 21:47:10.406129770 +0200
+--- a/data/keymaps/i386/qwerty/es.map	2011-10-13 21:46:53.119563897 +0200
+++ b/data/keymaps/i386/qwerty/es.map	2011-10-13 21:47:10.406129770 +0200
@@ -10,6 +10,7 @@
 keymaps 0-2,4,6,8-9,12
 include "qwerty-layout"
--- a/srcpkgs/kbd/patches/kbd-2.0.2-backspace-1.patch
+++ b/srcpkgs/kbd/patches/kbd-2.0.2-backspace-1.patch
@ -11,8 +11,8 @@ Updated for 1.13 (drop ru.map, the change is upstream, and add ru_win.map,
 ru-cp1251.map) by Ken Moffat <ken at linuxfromscratch dot org>.
 Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.

--- data/keymaps/i386/dvorak/dvorak-l.map	2008-06-20 12:36:01.000000000 +0100
-+++ data/keymaps/i386/dvorak/dvorak-l.map	2008-12-03 22:27:55.000000000 +0000
+--- a/data/keymaps/i386/dvorak/dvorak-l.map	2008-06-20 12:36:01.000000000 +0100
+++ b/data/keymaps/i386/dvorak/dvorak-l.map	2008-12-03 22:27:55.000000000 +0000
@@ -43,7 +43,7 @@
 		keycode  11 = three		numbersign
 		keycode  12 = two		at
@ -22,8 +22,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 ! --------------------------------------------------------------------------
 ! Row 3
 ! --------------------------------------------------------------------------
--- data/keymaps/i386/dvorak/dvorak-r.map	2008-06-20 12:36:01.000000000 +0100
-+++ data/keymaps/i386/dvorak/dvorak-r.map	2008-12-03 22:28:13.000000000 +0000
+--- a/data/keymaps/i386/dvorak/dvorak-r.map	2008-06-20 12:36:01.000000000 +0100
+++ b/data/keymaps/i386/dvorak/dvorak-r.map	2008-12-03 22:28:13.000000000 +0000
@@ -43,7 +43,7 @@
 		keycode  11 = slash		question
 		keycode  12 = bracketleft	braceleft
@ -33,8 +33,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 ! --------------------------------------------------------------------------
 ! Row 3
 ! --------------------------------------------------------------------------
--- data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-10-23 20:03:58.000000000 +0100
-+++ data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-12-03 22:40:32.000000000 +0000
+--- a/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-10-23 20:03:58.000000000 +0100
+++ b/data/keymaps/i386/fgGIod/tr_f-latin5.map	2008-12-03 22:40:32.000000000 +0000
@@ -51,7 +51,7 @@
 	alt     keycode  12 = Meta_minus      
 keycode  13 = minus            underscore      
@ -44,8 +44,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	alt     keycode  14 = Meta_Delete     
 keycode  15 = Tab              Meta_Tab             
 	alt     keycode  15 = Meta_Tab        
--- data/keymaps/i386/qwerty/lt.l4.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/lt.l4.map	2008-12-03 22:42:14.000000000 +0000
+--- a/data/keymaps/i386/qwerty/lt.l4.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/lt.l4.map	2008-12-03 22:42:14.000000000 +0000
@@ -205,7 +205,7 @@
 #	edit this if you want the key above <Enter> to delete symbols above
 # cursor, not before.
@ -64,8 +64,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	      Remove	       Remove		Remove		 Remove	    \
 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
 	      Boot	       Boot		Boot		 Boot
--- data/keymaps/i386/qwerty/lt.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/lt.map	2008-12-03 22:42:58.000000000 +0000
+--- a/data/keymaps/i386/qwerty/lt.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/lt.map	2008-12-03 22:42:58.000000000 +0000
@@ -204,7 +204,7 @@
 #	edit this if you want the key above <Enter> to delete symbols above
 # cursor, not before.
@ -84,8 +84,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	      Remove	       Remove		Remove		 Remove	    \
 	      Meta_Delete      Meta_Delete	Meta_Delete	 Meta_Delete \
 	      Boot	       Boot		Boot		 Boot
--- data/keymaps/i386/qwerty/no-latin1.map	2008-06-20 12:36:00.000000000 +0100
-+++ data/keymaps/i386/qwerty/no-latin1.map	2008-12-03 22:44:25.000000000 +0000
+--- a/data/keymaps/i386/qwerty/no-latin1.map	2008-06-20 12:36:00.000000000 +0100
+++ b/data/keymaps/i386/qwerty/no-latin1.map	2008-12-03 22:44:25.000000000 +0000
@@ -3,7 +3,7 @@
 # Send comments to Kjetil T. Homme <kjetilho@ifi.uio.no>
 include "linux-with-alt-and-altgr"
@ -95,8 +95,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 strings as usual
 
 	keycode   1 = Escape
--- data/keymaps/i386/qwerty/ru1.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/ru1.map	2008-12-03 22:45:32.000000000 +0000
+--- a/data/keymaps/i386/qwerty/ru1.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/ru1.map	2008-12-03 22:45:32.000000000 +0000
@@ -143,8 +143,8 @@
 
 # The keycode "0xFF" is too dangerous for many programs (including emacs).
@ -108,8 +108,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	control	keycode  27 =	Control_bracketright
 altgr	control	keycode  27 =	Control_bracketright
 	alt	keycode  27 =	Meta_bracketright
--- data/keymaps/i386/qwerty/ru2.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/ru2.map	2008-12-03 22:46:15.000000000 +0000
+--- a/data/keymaps/i386/qwerty/ru2.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/ru2.map	2008-12-03 22:46:15.000000000 +0000
@@ -46,7 +46,7 @@
 	alt	keycode  12 =	Meta_minus
 		keycode  13 =	equal	plus		equal	plus
@ -119,8 +119,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	alt	keycode  14 =	Meta_Delete
 		keycode  15 =	Tab	Tab		Tab	Tab	
 	alt	keycode  15 =	Meta_Tab	
--- data/keymaps/i386/qwerty/ru-cp1251.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/ru-cp1251.map	2008-12-03 22:47:12.000000000 +0000
+--- a/data/keymaps/i386/qwerty/ru-cp1251.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/ru-cp1251.map	2008-12-03 22:47:12.000000000 +0000
@@ -39,7 +39,7 @@
 	alt	keycode  12 =	Meta_minus
 		keycode  13 =	equal	plus		equal	plus
@ -130,8 +130,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	alt	keycode  14 =	Meta_Delete
 		keycode  15 =	Tab
 	alt	keycode  15 =	Meta_Tab	
--- data/keymaps/i386/qwerty/ru-ms.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/ru-ms.map	2008-12-03 22:48:10.000000000 +0000
+--- a/data/keymaps/i386/qwerty/ru-ms.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/ru-ms.map	2008-12-03 22:48:10.000000000 +0000
@@ -89,8 +89,8 @@
 altgr	alt     keycode  13 =    Meta_equal
 	shift alt keycode  13 = 	Meta_plus
@ -143,8 +143,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	alt	keycode  14 =	Meta_Delete
 altgr	alt     keycode  14 = 	Meta_Delete
 		keycode  15 =	Tab	Tab		Tab	Tab	
--- data/keymaps/i386/qwerty/ru_win.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/ru_win.map	2008-12-03 22:49:17.000000000 +0000
+--- a/data/keymaps/i386/qwerty/ru_win.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/ru_win.map	2008-12-03 22:49:17.000000000 +0000
@@ -42,7 +42,7 @@
 	alt	keycode  12 =	Meta_minus
 		keycode  13 =	equal	plus		equal	plus
@ -154,8 +154,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	alt	keycode  14 =	Meta_Delete
 		keycode  15 =	Tab	Tab		Tab	Tab	
 	alt	keycode  15 =	Meta_Tab	
--- data/keymaps/i386/qwerty/se-ir209.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/se-ir209.map	2008-12-03 22:50:18.000000000 +0000
+--- a/data/keymaps/i386/qwerty/se-ir209.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/se-ir209.map	2008-12-03 22:50:18.000000000 +0000
@@ -345,7 +345,7 @@
 	keycode 109 = Next	Scroll_Forward
 	keycode 110 = Insert
@ -165,8 +165,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 control alt	keycode 111 = Boot
 control altgr	keycode 111 = Boot
 
--- data/keymaps/i386/qwerty/se-lat6.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/se-lat6.map	2008-12-03 22:50:44.000000000 +0000
+--- a/data/keymaps/i386/qwerty/se-lat6.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/se-lat6.map	2008-12-03 22:50:44.000000000 +0000
@@ -374,6 +374,6 @@
 	keycode 109 = Next	Scroll_Forward
 	keycode 110 = Insert
@ -175,8 +175,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 +	keycode 111 = Remove
 control alt	keycode 111 = Boot
 control altgr	keycode 111 = Boot
--- data/keymaps/i386/qwerty/tr_q-latin5.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/tr_q-latin5.map	2008-12-03 22:52:09.000000000 +0000
+--- a/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/tr_q-latin5.map	2008-12-03 22:52:09.000000000 +0000
@@ -49,7 +49,7 @@
 	alt     keycode  12 = Meta_minus
 keycode  13 = minus            underscore
@ -186,8 +186,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	alt     keycode  14 = Meta_Delete
 keycode  15 = Tab              Meta_Tab
 	alt     keycode  15 = Meta_Tab
--- data/keymaps/i386/qwerty/ua.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/ua.map	2008-12-03 22:52:52.000000000 +0000
+--- a/data/keymaps/i386/qwerty/ua.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/ua.map	2008-12-03 22:52:52.000000000 +0000
@@ -249,7 +249,7 @@
 	shift ctrll ctrlr keycode  13 = plus
 	alt ctrll ctrlr keycode  13 = Meta_equal
@ -197,8 +197,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	control	keycode  14 = BackSpace       
 	alt	keycode  14 = Meta_Delete     
 	ctrlr	keycode  14 = BackSpace
--- data/keymaps/i386/qwerty/ua-utf.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/ua-utf.map	2008-12-03 22:53:36.000000000 +0000
+--- a/data/keymaps/i386/qwerty/ua-utf.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/ua-utf.map	2008-12-03 22:53:36.000000000 +0000
@@ -250,7 +250,7 @@
 	shift ctrll ctrlr keycode  13 = plus
 	alt ctrll ctrlr keycode  13 = Meta_equal
@ -208,8 +208,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	control	keycode  14 = BackSpace       
 	alt	keycode  14 = Meta_Delete     
 	ctrlr	keycode  14 = BackSpace
--- data/keymaps/i386/qwerty/ua-utf-ws.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/ua-utf-ws.map	2008-12-03 22:54:06.000000000 +0000
+--- a/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/ua-utf-ws.map	2008-12-03 22:54:06.000000000 +0000
@@ -260,7 +260,7 @@
 	shift ctrll ctrlr keycode  13 = plus
 	alt ctrll ctrlr keycode  13 = Meta_equal
@ -219,8 +219,8 @@ Re-diffed against 1.15 by Matt Burgess <matthew at linuxfromscratch.org>.
 	control	keycode  14 = BackSpace       
 	alt	keycode  14 = Meta_Delete     
 	ctrlr	keycode  14 = BackSpace
--- data/keymaps/i386/qwerty/ua-ws.map	2008-10-23 20:03:59.000000000 +0100
-+++ data/keymaps/i386/qwerty/ua-ws.map	2008-12-03 22:54:23.000000000 +0000
+--- a/data/keymaps/i386/qwerty/ua-ws.map	2008-10-23 20:03:59.000000000 +0100
+++ b/data/keymaps/i386/qwerty/ua-ws.map	2008-12-03 22:54:23.000000000 +0000
@@ -260,7 +260,7 @@
 	shift ctrll ctrlr keycode  13 = plus
 	alt ctrll ctrlr keycode  13 = Meta_equal
--- a/srcpkgs/kbd/template
+++ b/srcpkgs/kbd/template
@ -13,7 +13,6 @@ homepage="http://www.kbd-project.org/"
 distfiles="${KERNEL_SITE}/utils/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f
 replaces="kbd-data>=0"
-patch_args=-Np0

 post_patch() {
 	# Rename keymap files with the same names
--- a/srcpkgs/kcgi/patches/ppc-sandbox.patch
+++ b/srcpkgs/kcgi/patches/ppc-sandbox.patch
@ -1,5 +1,5 @@
--- configure
-+++ configure
+--- a/configure
+++ b/configure
@@ -444,6 +444,15 @@ if [ ${HAVE_SECCOMP_FILTER} -eq 1 ]; then
 		arm*)
 			echo "#define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARM"
--- a/srcpkgs/kcgi/patches/seccomp.patch
+++ b/srcpkgs/kcgi/patches/seccomp.patch
@ -1,5 +1,5 @@
--- sandbox-seccomp-filter.c.orig
-+++ sandbox-seccomp-filter.c
+--- a/sandbox-seccomp-filter.c
+++ b/sandbox-seccomp-filter.c
@@ -89,7 +89,12 @@
 	/* Load the syscall number for checking. */
 	BPF_STMT(BPF_LD+BPF_W+BPF_ABS,
--- a/srcpkgs/kcgi/template
+++ b/srcpkgs/kcgi/template
@ -16,7 +16,6 @@ homepage="http://kristaps.bsd.lv/kcgi/"
 changelog="https://kristaps.bsd.lv/kcgi/archive.html"
 distfiles="http://kristaps.bsd.lv/kcgi/snapshots/kcgi-${version}.tgz"
 checksum=06ed033de3723651d76e2fac1c2442aaa3a28ac231cbfda4142dfb8782cab363
-patch_args=-Np0

 seccomp_audit_get_suffix() {
 	case "$1" in
--- a/srcpkgs/kcm-wacomtablet/patches/QPainterPath.patch
+++ b/srcpkgs/kcm-wacomtablet/patches/QPainterPath.patch
@ -1,5 +1,5 @@
--- src/kcmodule/pressurecurvewidget.cpp	2019-07-21 20:35:36.000000000 +0200
-+++ src/kcmodule/pressurecurvewidget.cpp	2020-09-02 16:40:32.608875141 +0200
+--- a/src/kcmodule/pressurecurvewidget.cpp	2019-07-21 20:35:36.000000000 +0200
+++ b/src/kcmodule/pressurecurvewidget.cpp	2020-09-02 16:40:32.608875141 +0200
@@ -22,6 +22,7 @@
 //Qt includes
 #include <QDebug>
--- a/srcpkgs/kcm-wacomtablet/template
+++ b/srcpkgs/kcm-wacomtablet/template
@ -15,4 +15,3 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/system/wacomtablet"
 distfiles="${KDE_SITE}/wacomtablet/${version}/wacomtablet-${version}.tar.xz"
 checksum=c80ce63a41f6fcbb50ac4c2130ed2f8273c4b744e62e33d4b714bf83e8e5f7a4
-patch_args=-Np0
--- a/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
+++ b/srcpkgs/kconfig/patches/add-crossbuild-support-for-its-tools.patch
@ -7,8 +7,8 @@ Contrary to reference above, paths to these tools are hardcoded in this package.
 If not, packages that depend on it will have to indicate each binary "native" paths in case
 of cross-build, since these cmake directive lines are always evalued at *their* build time.

--- KF5ConfigConfig.cmake.in.ORIG
-+++ KF5ConfigConfig.cmake.in
+--- a/KF5ConfigConfig.cmake.in
+++ b/KF5ConfigConfig.cmake.in
@@ -11,5 +11,13 @@ if(CMAKE_CROSSCOMPILING AND KF5_HOST_TOOLING)
     include("${KCONFIGCOMPILER_PATH}")
 else()
@ -23,8 +23,8 @@ of cross-build, since these cmake directive lines are always evalued at *their*
 +    endif()
 endif()
 include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigMacros.cmake")
--- KF5ConfigMacros.cmake.ORIG
-+++ KF5ConfigMacros.cmake
+--- a/KF5ConfigMacros.cmake
+++ b/KF5ConfigMacros.cmake
@@ -89,8 +89,12 @@
        endif()
 
@ -39,8 +39,8 @@ of cross-build, since these cmake directive lines are always evalued at *their*
                           ARGS ${_kcfg_FILE} ${_tmp_FILE} -d ${CMAKE_CURRENT_BINARY_DIR}/${_rel_PATH}
                           MAIN_DEPENDENCY ${_tmp_FILE}
                           DEPENDS ${_kcfg_FILE})
--- src/kconfig_compiler/CMakeLists.txt.ORIG
-+++ src/kconfig_compiler/CMakeLists.txt
+--- a/src/kconfig_compiler/CMakeLists.txt
+++ b/src/kconfig_compiler/CMakeLists.txt
@@ -12,6 +12,7 @@
     if(BUILD_TESTING)
         message(WARNING "Testing should be disabled on cross-compilation")
--- a/srcpkgs/kconfig/template
+++ b/srcpkgs/kconfig/template
@ -11,7 +11,6 @@ license="LGPL-2.0-only, LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kconfig"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=7c84a05609a22a2bd7185fc46e73a0d39604340574d5e85e24b170e84f84eee8
-patch_args=-Np0

 do_check() {
 	cd build
--- a/srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch
+++ b/srcpkgs/kcoreaddons/patches/desktoptojson-usage-crossbuild.patch
@ -2,8 +2,8 @@ fix cmake code for cross-build usage.
 Initial directive "command KF5::desktoptojson ..." points
 the target's arch desktoptojson binary instead of the host's one.

--- KF5CoreAddonsMacros.cmake.ORIG
-+++ KF5CoreAddonsMacros.cmake
+--- a/KF5CoreAddonsMacros.cmake
+++ b/KF5CoreAddonsMacros.cmake
@@ -45,7 +45,8 @@
         _desktop_to_json_cmake28(${desktop} ${json} ${DESKTOP_TO_JSON_COMPAT_MODE})
         return()
--- a/srcpkgs/kcoreaddons/template
+++ b/srcpkgs/kcoreaddons/template
@ -12,7 +12,6 @@ license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kcoreaddons"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=723c99b63c159f6c70ef4a56acbab8afdc54a9fa3269ff7a21ed2467179e8a57
-patch_args=-Np0

 post_install() {
 	vsed -e 's;${_IMPORT_PREFIX};/usr;g' \
--- a/srcpkgs/kcov/patches/cmake.patch
+++ b/srcpkgs/kcov/patches/cmake.patch
@ -1,5 +1,5 @@
--- src/CMakeLists.txt	2021-02-07 23:38:14.980629462 +0100
-+++ -	2021-02-07 23:46:37.827992991 +0100
+--- a/src/CMakeLists.txt	2021-02-07 23:38:14.980629462 +0100
+++ b/src/CMakeLists.txt	2021-02-07 23:38:14.980629462 +0100
@@ -412,9 +412,9 @@
 		stdc++
 		${CMAKE_THREAD_LIBS_INIT}
--- a/srcpkgs/kcov/patches/musl.patch
+++ b/srcpkgs/kcov/patches/musl.patch
@ -1,5 +1,5 @@
--- src/engines/ptrace_linux.cc
-+++ src/engines/ptrace_linux.cc
+--- a/src/engines/ptrace_linux.cc
+++ b/src/engines/ptrace_linux.cc
@@ -8,6 +8,10 @@
 #  include <elf.h>
 #endif
--- a/srcpkgs/kcov/template
+++ b/srcpkgs/kcov/template
@ -11,4 +11,3 @@ license="GPL-2.0-only"
 homepage="https://simonkagstrom.github.io/kcov/index.html"
 distfiles="https://github.com/SimonKagstrom/kcov/archive/v${version}.tar.gz"
 checksum=b37af60d81a9b1e3b140f9473bdcb7975af12040feb24cc666f9bb2bb0be68b4
-patch_args=-Np0
--- a/srcpkgs/kdb/patches/postgresql12.patch
+++ b/srcpkgs/kdb/patches/postgresql12.patch
@ -10,8 +10,8 @@ ABSTIMEOID and RELTIMEOID were removed, as their data types were dropped.

 diff --git src/drivers/postgresql/PostgresqlTypes.cpp src/drivers/postgresql/PostgresqlTypes.cpp
 index ea576d69..0697129e 100644
--- src/drivers/postgresql/PostgresqlTypes.cpp
-+++ src/drivers/postgresql/PostgresqlTypes.cpp
+--- a/src/drivers/postgresql/PostgresqlTypes.cpp
+++ b/src/drivers/postgresql/PostgresqlTypes.cpp
@@ -36,6 +36,7 @@
 #endif
 #include <libpq-fe.h>
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@ -12,7 +12,6 @@ license="LGPL-2.0-or-later"
 homepage="http://www.kexi-project.org/"
 distfiles="${KDE_SITE}/kdb/src/kdb-${version}.tar.xz"
 checksum=8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069
-patch_args=-Np0

 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3"
--- a/srcpkgs/kdelibs4support/patches/ksslcertificate.patch
+++ b/srcpkgs/kdelibs4support/patches/ksslcertificate.patch
@ -1,5 +1,5 @@
--- src/kssl/ksslcertificate.cpp	2017-11-05 01:28:12.000000000 -0700
-+++ src/kssl/ksslcertificate.cpp	2017-11-13 01:45:27.716000000 -0700
+--- a/src/kssl/ksslcertificate.cpp	2017-11-05 01:28:12.000000000 -0700
+++ b/src/kssl/ksslcertificate.cpp	2017-11-13 01:45:27.716000000 -0700
@@ -168,7 +168,7 @@
         return rc;
     }
--- a/srcpkgs/kdelibs4support/patches/ksslutils.patch
+++ b/srcpkgs/kdelibs4support/patches/ksslutils.patch
@ -1,5 +1,5 @@
--- src/kssl/ksslutils.cpp	2017-11-05 01:28:12.000000000 -0700
-+++ src/kssl/ksslutils.cpp	2017-11-13 01:35:49.020000000 -0700
+--- a/src/kssl/ksslutils.cpp	2017-11-05 01:28:12.000000000 -0700
+++ b/src/kssl/ksslutils.cpp	2017-11-13 01:35:49.020000000 -0700
@@ -96,7 +96,7 @@
 {
     char *rep = KOSSL::self()->i2s_ASN1_INTEGER(nullptr, aint);
--- a/srcpkgs/kdelibs4support/template
+++ b/srcpkgs/kdelibs4support/template
@ -18,7 +18,6 @@ license="LGPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdelibs4support"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
 checksum=ea1a7e50e36fee629e4d9b1bf44bf27a169174d95dc36d37d4af82a5cf50e432
-patch_args=-Np0

 if [ "$CROSS_BUILD" ]; then
 	# gettaddrinfo runtime test is always fine (can't be achieved in crossbuild)
--- a/srcpkgs/kdesignerplugin/patches/kdesignerplugin-on-crossbuild.patch
+++ b/srcpkgs/kdesignerplugin/patches/kdesignerplugin-on-crossbuild.patch
@ -1,7 +1,7 @@
 On cross-build, use the host's binary.
 Apply to both cross-build kdesignerplugin's package and use its package from others.
--- KF5DesignerPluginMacros.cmake.ORIG
-+++ KF5DesignerPluginMacros.cmake
+--- a/KF5DesignerPluginMacros.cmake
+++ b/KF5DesignerPluginMacros.cmake
@@ -51,9 +51,14 @@
     get_filename_component(basename ${input} NAME_WE)
     set(source ${CMAKE_CURRENT_BINARY_DIR}/${basename}widgets.cpp)
--- a/srcpkgs/kdesignerplugin/template
+++ b/srcpkgs/kdesignerplugin/template
@ -13,7 +13,6 @@ license="LGPL-2.1-only"
 homepage="https://invent.kde.org/frameworks/kdesignerplugin"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/portingAids/${pkgname}-${version}.tar.xz"
 checksum=203ff1989d7c076498d442698e8e70d158fb69094d056e18100ac74e064a0c8d
-patch_args=-Np0

 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-qmake qt5-tools python kgendesignerplugin kdoctools"
--- a/srcpkgs/kdevelop-python/patches/kdev-python-1.7.0-py3-doc-syntax.patch
+++ b/srcpkgs/kdevelop-python/patches/kdev-python-1.7.0-py3-doc-syntax.patch
@ -4,8 +4,8 @@ Byte-compiling python fails on this file at package installation.

 source: https://src.fedoraproject.org/rpms/kdevelop-python/raw/master/f/kdev-python-1.7.0-py3-doc-syntax.patch

--- documentation_files/__builtin_types__.py.ORIG
-+++ documentation_files/__builtin_types__.py
+--- a/documentation_files/__builtin_types__.py
+++ b/documentation_files/__builtin_types__.py
@@ -44,14 +44,6 @@
 		"""
 		pass
--- a/srcpkgs/kdevelop-python/template
+++ b/srcpkgs/kdevelop-python/template
@ -18,7 +18,6 @@ homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/kdevelop/${version}/src/kdev-python-${version}.tar.xz"
 checksum=20f9b771b961262ded986a4f32b8d259ad9f7bc48bb29eac0a5d5853be1d917f
 python_version=3
-patch_args=-Np0

 post_install() {
 	# don't install this python2 script: generates documentation_files, useless at runtime
--- a/srcpkgs/kdevelop/patches/use-std-c99.patch
+++ b/srcpkgs/kdevelop/patches/use-std-c99.patch
@ -2,8 +2,8 @@ KDECompilerSettings (of extra-cmake-modules 5.40) sets "-std=iso9899:1990" that
 too restrictive for C build with Qt *.h files: comments in c++ style. 
 Let's use C99 instead.

--- CMakeLists.txt.ORIG
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,8 @@
 include(KDEInstallDirs)
 include(KDECMakeSettings)
--- a/srcpkgs/kdevelop/template
+++ b/srcpkgs/kdevelop/template
@ -19,7 +19,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.kdevelop.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
 checksum=0f86bc3fe53f761c1e3e3f7544577a0c41433be8bff310cf2e729f76f4363bf6
-patch_args=-Np0

 build_options="webengine"
 desc_option_webengine="Use Qt5 WebEngine for documentation"
--- a/srcpkgs/kdoctools/patches/cmake_macro_cross.patch
+++ b/srcpkgs/kdoctools/patches/cmake_macro_cross.patch
@ -1,5 +1,5 @@
--- KF5DocToolsMacros.cmake.orig
-+++ KF5DocToolsMacros.cmake
+--- a/KF5DocToolsMacros.cmake
+++ b/KF5DocToolsMacros.cmake
@@ -86 +86 @@ set(KDOCTOOLS_SERIALIZE_TOOL "" CACHE ST
 -set(KDOCTOOLS_MEINPROC_EXECUTABLE "KF5::meinproc5")
 +set(KDOCTOOLS_MEINPROC_EXECUTABLE "meinproc5")
--- a/srcpkgs/kdoctools/template
+++ b/srcpkgs/kdoctools/template
@ -17,7 +17,6 @@ license="LGPL-2.1-or-later"
 homepage="https://invent.kde.org/frameworks/kdoctools"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=d3a4ea0d5c0348fff228aa5ba14a7d3eb00296c0f00b9ac9d4b74e56a89e395b
-patch_args=-Np0

 pre_check() {
 	export PATH="$PATH:${wrksrc}/build/bin"
--- a/srcpkgs/kea/patches/fix-musl-ethaddr.patch
+++ b/srcpkgs/kea/patches/fix-musl-ethaddr.patch
@ -1,5 +1,5 @@
--- src/lib/dhcp/pkt_filter_lpf.cc	2016-09-27 12:32:02.000000000 +0200
-+++ src/lib/dhcp/pkt_filter_lpf.cc	2016-12-07 12:14:25.850716385 +0100
+--- a/src/lib/dhcp/pkt_filter_lpf.cc	2016-09-27 12:32:02.000000000 +0200
+++ b/src/lib/dhcp/pkt_filter_lpf.cc	2016-12-07 12:14:25.850716385 +0100
@@ -13,7 +13,9 @@
 #include <exceptions/exceptions.h>
 #include <fcntl.h>
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@ -21,7 +21,6 @@ license="MPL-2.0, Apache-2.0"
 homepage="https://kea.isc.org"
 distfiles="http://ftp.isc.org/isc/kea/${version/.P/-P}/kea-${version/.P/-P}.tar.gz"
 checksum=324a06f488645bee587e49a45d491b525f53417c56b219f1cb37461fdefd9d91
-patch_args=-Np0

 build_options="botan mysql pgsql"
 desc_option_botan="With Botan SSL support"
--- a/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
+++ b/srcpkgs/keditbookmarks/patches/20.08.3--fix-tests.patch
@ -6,8 +6,8 @@ Subject: [PATCH] fix-tests

 diff --git src/kbookmarkmodel/tests/CMakeLists.txt src/kbookmarkmodel/tests/CMakeLists.txt
 index 54df341..c07a310 100644
--- src/kbookmarkmodel/tests/CMakeLists.txt
-+++ src/kbookmarkmodel/tests/CMakeLists.txt
+--- a/src/kbookmarkmodel/tests/CMakeLists.txt
+++ b/src/kbookmarkmodel/tests/CMakeLists.txt
@@ -5,7 +5,11 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 ###### kbookmarkmodeltest ######
 
--- a/srcpkgs/keditbookmarks/template
+++ b/srcpkgs/keditbookmarks/template
@ -12,4 +12,3 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://www.kde.org/"
 distfiles="${KDE_SITE}/release-service/${version}/src/keditbookmarks-${version}.tar.xz"
 checksum=a57eec8ff05b6a6fea5367b489f67d8de7483aaede4c39692c347da15ba9eec3
-patch_args=-Np0
--- a/srcpkgs/kernel-libc-headers/patches/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
+++ b/srcpkgs/kernel-libc-headers/patches/1-4-glibc-specific-inclusion-of-sysinfo.h-in-kernel.h.patch
@ -1,5 +1,5 @@
--- include/uapi/linux/kernel.h.orig
-+++ include/uapi/linux/kernel.h
+--- a/include/uapi/linux/kernel.h
+++ b/include/uapi/linux/kernel.h
@@ -1,7 +1,9 @@
 #ifndef _UAPI_LINUX_KERNEL_H
 #define _UAPI_LINUX_KERNEL_H
--- a/srcpkgs/kernel-libc-headers/patches/1-8-if_tunnel.h.patch
+++ b/srcpkgs/kernel-libc-headers/patches/1-8-if_tunnel.h.patch
@ -1,7 +1,7 @@
 Reverts 1fe8e0f074c77aa41aaa579345a9e675acbebfa9

--- include/uapi/linux/if_tunnel.h
-+++ include/uapi/linux/if_tunnel.h
+--- a/include/uapi/linux/if_tunnel.h
+++ b/include/uapi/linux/if_tunnel.h
@@ -2,9 +2,6 @@
 #define _UAPI_IF_TUNNEL_H_
 
--- a/srcpkgs/kernel-libc-headers/template
+++ b/srcpkgs/kernel-libc-headers/template
@ -10,7 +10,6 @@ license="GPL-2.0-only"
 homepage="http://www.kernel.org"
 distfiles="$KERNEL_SITE/kernel/v${version%%.*}.x/linux-${version}.tar.xz"
 checksum=904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec
-patch_args=-Np0

 if [ "$CHROOT_READY" ]; then
 	hostmakedepends="perl"
--- a/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch
+++ b/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch
@ -1,7 +1,7 @@
 Use ELFv2 ABI for big endian.

--- purgatory/arch/ppc64/Makefile
-+++ purgatory/arch/ppc64/Makefile
+--- a/purgatory/arch/ppc64/Makefile
+++ b/purgatory/arch/ppc64/Makefile
@@ -14,8 +14,8 @@ ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -msoft-float \
 ppc64_PURGATORY_EXTRA_ASFLAGS += -m64
 ifeq ($(SUBARCH),BE)
--- a/srcpkgs/kexec-tools/template
+++ b/srcpkgs/kexec-tools/template
@ -13,7 +13,6 @@ homepage="http://kernel.org/pub/linux/utils/kernel/kexec/"
 distfiles="${KERNEL_SITE}/utils/kernel/kexec/${pkgname}-${version}.tar.xz"
 checksum=96c97f49ed86049f8b72722cb53e7fe3693e5a4f31e78a3a6249e3d18dac49c2
 skip_extraction="${pkgname}-${version}.tar.xz"
-patch_args=-Np0

 CFLAGS="-fcommon"

--- a/srcpkgs/kexi/patches/ftbfs.patch
+++ b/srcpkgs/kexi/patches/ftbfs.patch
@ -1,5 +1,5 @@
--- src/widget/utils/kexidisplayutils.h
-+++ src/widget/utils/kexidisplayutils.h
+--- a/src/widget/utils/kexidisplayutils.h
+++ b/src/widget/utils/kexidisplayutils.h
@@ -24,6 +24,7 @@
 
 #include <QFont>
--- a/srcpkgs/kexi/patches/musl.patch
+++ b/srcpkgs/kexi/patches/musl.patch
@ -1,5 +1,5 @@
--- src/migration/mdb/3rdparty/mdbtools/libmdb/catalog.c	2018-03-06 22:46:18.503349370 +0100
-+++ -	2018-03-08 17:46:06.180713979 +0100
+--- a/src/migration/mdb/3rdparty/mdbtools/libmdb/catalog.c	2018-03-06 22:46:18.503349370 +0100
+++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/catalog.c	2018-03-06 22:46:18.503349370 +0100
@@ -17,6 +17,7 @@
  */
 
@ -8,8 +8,8 @@
 
 #ifdef DMALLOC
 #include "dmalloc.h"
--- src/migration/mdb/3rdparty/mdbtools/libmdb/data.c	2018-03-06 22:46:18.503349370 +0100
-+++ -	2018-03-08 17:48:39.415096470 +0100
+--- a/src/migration/mdb/3rdparty/mdbtools/libmdb/data.c	2018-03-06 22:46:18.503349370 +0100
+++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/data.c	2018-03-06 22:46:18.503349370 +0100
@@ -18,6 +18,7 @@
 
 #include <time.h>
@ -18,8 +18,8 @@
 #include "mdbtools.h"
 
 #ifdef DMALLOC
--- src/migration/mdb/3rdparty/mdbtools/libmdb/sargs.c	2018-03-06 22:46:18.507349448 +0100
-+++ -	2018-03-08 17:50:30.904907033 +0100
+--- a/src/migration/mdb/3rdparty/mdbtools/libmdb/sargs.c	2018-03-06 22:46:18.507349448 +0100
+++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/sargs.c	2018-03-06 22:46:18.507349448 +0100
@@ -27,6 +27,7 @@
  * a mdb_test_[type]() function and invoke it from mdb_test_sarg()
  */
@ -28,8 +28,8 @@
 #include <time.h>
 #include "mdbtools.h"
 #ifdef DMALLOC
--- src/migration/mdb/3rdparty/mdbtools/libmdb/table.c	2018-03-06 22:46:18.507349448 +0100
-+++ -	2018-03-08 17:52:10.360145846 +0100
+--- a/src/migration/mdb/3rdparty/mdbtools/libmdb/table.c	2018-03-06 22:46:18.507349448 +0100
+++ b/src/migration/mdb/3rdparty/mdbtools/libmdb/table.c	2018-03-06 22:46:18.507349448 +0100
@@ -16,6 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
--- a/srcpkgs/kexi/template
+++ b/srcpkgs/kexi/template
@ -14,7 +14,6 @@ homepage="http://www.kexi-project.org/"
 distfiles="${KDE_SITE}/kexi/src/kexi-${version}.tar.xz"
 checksum=7a813f9ea815a09c1e733d0e7dc879c64eee85f075389e87e6aab99cf0c1c1ff
 replaces="calligra-kexi>=0"
-patch_args=-Np0

 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools python3 kcoreaddons"
--- a/srcpkgs/keyutils/patches/request-key.conf.patch
+++ b/srcpkgs/keyutils/patches/request-key.conf.patch
@ -1,5 +1,5 @@
--- request-key.conf.old	2013-05-28 15:34:10.966001242 +0200
-+++ request-key.conf	2013-05-28 15:35:34.857969598 +0200
+--- a/request-key.conf.old	2013-05-28 15:34:10.966001242 +0200
+++ b/request-key.conf	2013-05-28 15:35:34.857969598 +0200
@@ -31,11 +31,11 @@
 
 #OP	TYPE	DESCRIPTION	CALLOUT INFO	PROGRAM ARG1 ARG2 ARG3 ...
--- a/srcpkgs/keyutils/template
+++ b/srcpkgs/keyutils/template
@ -9,7 +9,6 @@ homepage="https://www.kernel.org"
 distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${pkgname}-${version}.tar.gz"
 checksum=a61d5706136ae4c05bd48f86186bcfdbd88dd8bd5107e3e195c924cfc1b39bb4
 conf_files="/etc/request-key.conf"
-patch_args=-Np0

 pre_build() {
 	# Fix musl build - doesn't hurt glibc either
--- a/srcpkgs/kicad/patches/disable-warnings.patch
+++ b/srcpkgs/kicad/patches/disable-warnings.patch
@ -1,7 +1,7 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 21bebddbb1..956de85b13 100644
--- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,12 +197,6 @@ perform_feature_checks()
 if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     include(CheckCXXCompilerFlag)
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@ -22,7 +22,6 @@ homepage="http://kicad-pcb.org"
 distfiles="https://gitlab.com/kicad/code/${pkgname}/-/archive/${version}/kicad-${version}.tar.gz"
 checksum=296341f30ada2c7f4a1c54720eab425835a93349527d4bf08f73f280d19695ed
 python_version=3
-patch_args=-Np0

 build_options="spice occt"
 build_options_default="spice occt"
--- a/srcpkgs/kid3/patches/musl.patch
+++ b/srcpkgs/kid3/patches/musl.patch
@ -1,5 +1,5 @@
--- src/core/model/kid3application.cpp.orig
-+++ src/core/model/kid3application.cpp
+--- a/src/core/model/kid3application.cpp
+++ b/src/core/model/kid3application.cpp
@@ -918,7 +918,7 @@
       taggedFile->closeFileHandle();
     }
--- a/srcpkgs/kid3/template
+++ b/srcpkgs/kid3/template
@ -20,7 +20,6 @@ license="GPL-2.0-only"
 homepage="https://kid3.kde.org"
 distfiles="${SOURCEFORGE_SITE}/kid3/kid3-${version}.tar.gz"
 checksum=71ef8c58227302737ebbed3b7f476f9f48e76ea894952d916dc33d9c08f96e08
-patch_args=-Np0

 build_options="KDE mp3 mp4 flac vorbis taglib chromaprint"
 build_options_default="mp3 mp4 flac vorbis taglib chromaprint"
--- a/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch
+++ b/srcpkgs/kig/patches/0001-fix-boost-python-bindung-with-boost-1.67.patch
@ -13,8 +13,8 @@ Subject: [PATCH] fix boost python bindung with boost 1.67+

 diff --git CMakeLists.txt CMakeLists.txt
 index 229d2723..f0138bf4 100644
--- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(KF5XmlGui 5.1 REQUIRED)
 find_package(KF5Crash 5.15 REQUIRED)
 find_package(KF5CoreAddons REQUIRED)
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@ -12,4 +12,3 @@ license="GPL-2.0-only"
 homepage="https://www.kde.org/applications/education/kig/"
 distfiles="${KDE_SITE}/release-service/${version}/src/kig-${version}.tar.xz"
 checksum=5939d298b40d265f1ddef4bd81540b1a26204d858f85db5847cc102366a5ce58
-patch_args=-Np0
--- a/srcpkgs/kinit/patches/musl.patch
+++ b/srcpkgs/kinit/patches/musl.patch
@ -1,5 +1,5 @@
--- src/start_kdeinit/start_kdeinit.c.orig      2016-12-05 13:14:54.587791669 +0400
-+++ src/start_kdeinit/start_kdeinit.c   2016-12-05 13:15:35.196844455 +0400
+--- a/src/start_kdeinit/start_kdeinit.c.orig      2016-12-05 13:14:54.587791669 +0400
+++ b/src/start_kdeinit/start_kdeinit.c   2016-12-05 13:15:35.196844455 +0400
@@ -19,6 +19,7 @@

 #include <config-kdeinit.h>
--- a/srcpkgs/kinit/template
+++ b/srcpkgs/kinit/template
@ -12,7 +12,6 @@ license="LGPL-2.0-only"
 homepage="https://invent.kde.org/frameworks/kinit"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=c164e8df6350b069f634f5e7c42625026088c10886c1b934ab9e5243cc988c8a
-patch_args=-Np0

 kinit-devel_package() {
 	short_desc+=" - development"
--- a/srcpkgs/kio/patches/musl.patch
+++ b/srcpkgs/kio/patches/musl.patch
@ -1,5 +1,5 @@
--- src/kpac/kpac_dhcp_helper.old	2016-04-03 21:55:42.000000000 +0100
-+++ src/kpac/kpac_dhcp_helper.c	2016-07-21 08:42:04.989005565 +0100
+--- a/src/kpac/kpac_dhcp_helper.old	2016-04-03 21:55:42.000000000 +0100
+++ b/src/kpac/kpac_dhcp_helper.c	2016-07-21 08:42:04.989005565 +0100
@@ -17,6 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
@ -8,8 +8,8 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <sys/types.h>
--- ./src/ioslaves/file/kauth/fdsender.cpp	2018-02-18 09:28:09.195854002 +0100
-+++ ./src/ioslaves/file/kauth/fdsender.cpp	2018-02-18 09:28:30.013527072 +0100
+--- a/src/ioslaves/file/kauth/fdsender.cpp	2018-02-18 09:28:09.195854002 +0100
+++ b/src/ioslaves/file/kauth/fdsender.cpp	2018-02-18 09:28:30.013527072 +0100
@@ -18,6 +18,7 @@
     License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 ***/
--- a/srcpkgs/kio/template
+++ b/srcpkgs/kio/template
@ -16,7 +16,6 @@ license="LGPL-2.0-or-later"
 homepage="https://invent.kde.org/frameworks/kio"
 distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=faa5a519e0cccb7197a4025f4b267a7683b49ad9d03e730a57969f33072f51c1
-patch_args=-Np0

 do_check() {
 	cd build
--- a/srcpkgs/kmod/patches/stdout.patch
+++ b/srcpkgs/kmod/patches/stdout.patch
@ -1,8 +1,8 @@
 Use /proc/self/fd/1 instead of /dev/stdout, so we can use
 `kmod static-nodes` before udev is running.

--- tools/static-nodes.c.orig
-+++ tools/static-nodes.c
+--- a/tools/static-nodes.c
+++ b/tools/static-nodes.c
@@ -156,7 +156,7 @@
 {
 	struct utsname kernel;
--- a/srcpkgs/kmod/patches/strndupa.patch
+++ b/srcpkgs/kmod/patches/strndupa.patch
@ -1,7 +1,7 @@
 diff --git a/libkmod/libkmod-util.c b/libkmod/libkmod-util.c
 index df12433..142e767 100644
--- shared/util.c
-+++ shared/util.c
+--- a/shared/util.c
+++ b/shared/util.c
@@ -334,7 +334,9 @@ int mkdir_p(const char *path, int len, mode_t mode)
 {
 	char *start, *end;
--- a/srcpkgs/kmod/template
+++ b/srcpkgs/kmod/template
@ -17,7 +17,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"
 distfiles="${KERNEL_SITE}/utils/kernel/kmod/kmod-${version}.tar.xz"
 checksum=c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c
-patch_args=-Np0

 post_install() {
 	vinstall ${FILESDIR}/depmod-search.conf 644 usr/lib/depmod.d search.conf
--- a/srcpkgs/kmscon/patches/define-SIGUNUSED-for-GLIBC.patch
+++ b/srcpkgs/kmscon/patches/define-SIGUNUSED-for-GLIBC.patch
@ -1,5 +1,5 @@
--- src/pty.c
-+++ src/pty.c
+--- a/src/pty.c
+++ b/src/pty.c
@@ -46,6 +46,14 @@
 
 #define KMSCON_NREAD 16384
--- a/srcpkgs/kmscon/patches/sysmacros.patch
+++ b/srcpkgs/kmscon/patches/sysmacros.patch
@ -1,5 +1,5 @@
--- src/uterm_vt.c	2013-10-23 23:15:18.865000000 +0200
-+++ src/uterm_vt.c	2020-05-27 11:59:09.636287929 +0200
+--- a/src/uterm_vt.c	2013-10-23 23:15:18.865000000 +0200
+++ b/src/uterm_vt.c	2020-05-27 11:59:09.636287929 +0200
@@ -40,6 +40,7 @@
 #include <sys/ioctl.h>
 #include <sys/signalfd.h>
--- a/srcpkgs/kmscon/template
+++ b/srcpkgs/kmscon/template
@ -15,7 +15,6 @@ homepage="http://www.freedesktop.org/wiki/Software/kmscon"
 distfiles="${FREEDESKTOP_SITE}/kmscon/releases/kmscon-${version}.tar.xz"
 checksum=0ab01c1cdc4fbd692ce765e80478bc2d9663a7c55a5c75cc7ac421366ee6ae2b
 lib32disabled=yes
-patch_args=-Np0

 case "$XBPS_TARGET_MACHINE" in
 	ppc*) broken="ftbfs";;
--- a/srcpkgs/kobodeluxe/patches/fix-const_strchr.patch
+++ b/srcpkgs/kobodeluxe/patches/fix-const_strchr.patch
@ -1,5 +1,5 @@
--- graphics/window.cpp	2007-12-14 10:13:24.000000000 +0100
-+++ graphics/window.cpp	2015-10-11 17:14:24.004560636 +0200
+--- a/graphics/window.cpp	2007-12-14 10:13:24.000000000 +0100
+++ b/graphics/window.cpp	2015-10-11 17:14:24.004560636 +0200
@@ -398,7 +398,7 @@
 		 */
 		if(token)
--- a/srcpkgs/kobodeluxe/patches/fix-pipe12_name.patch
+++ b/srcpkgs/kobodeluxe/patches/fix-pipe12_name.patch
@ -1,8 +1,8 @@
 The name pipe2 clashes with unistd.h function pipe2(3),
 thus rename pipe1 and pipe2 to kpipe1 and kpipe2.

--- enemies.h	2007-12-24 09:18:52.000000000 +0100
-+++ enemies.h	2015-10-11 17:20:42.882531076 +0200
+--- a/enemies.h	2007-12-24 09:18:52.000000000 +0100
+++ b/enemies.h	2015-10-11 17:20:42.882531076 +0200
@@ -70,9 +70,9 @@
 extern const enemy_kind bomb2;
 extern const enemy_kind bombdeto;
@ -40,8 +40,8 @@ thus rename pipe1 and pipe2 to kpipe1 and kpipe2.
 }
 
 
--- enemy.cpp	2007-12-24 11:36:46.000000000 +0100
-+++ enemy.cpp	2015-10-11 17:20:18.011533017 +0200
+--- a/enemy.cpp	2007-12-24 11:36:46.000000000 +0100
+++ b/enemy.cpp	2015-10-11 17:20:18.011533017 +0200
@@ -713,7 +713,7 @@
 
 void _enemy::kill_cannon()
--- a/srcpkgs/kobodeluxe/template
+++ b/srcpkgs/kobodeluxe/template
@ -14,7 +14,6 @@ homepage="http://olofson.net/kobodl"
 distfiles="${homepage}/download/KoboDeluxe-${version}.tar.bz2"
 checksum=0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c
 replaces="kobodeluxe-data>=0"
-patch_args=-Np0

 post_extract() {
 	bsdtar xf icons.tar.gz
--- a/srcpkgs/kodi-addon-inputstream-adaptive/patches/ppc.patch
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/patches/ppc.patch
@ -1,5 +1,5 @@
--- wvdecrypter/cdm/build/build_config.h
-+++ wvdecrypter/cdm/build/build_config.h
+--- a/wvdecrypter/cdm/build/build_config.h
+++ b/wvdecrypter/cdm/build/build_config.h
@@ -123,6 +123,20 @@
 #define ARCH_CPU_ARM64 1
 #define ARCH_CPU_64_BITS 1
--- a/srcpkgs/kodi-addon-inputstream-adaptive/template
+++ b/srcpkgs/kodi-addon-inputstream-adaptive/template
@ -13,7 +13,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/peak3d/inputstream.adaptive"
 distfiles="https://github.com/peak3d/inputstream.adaptive/archive/${version}-${_kodi_release}.tar.gz"
 checksum=353207f5f98bf81ce8d79cec903c28da8c0227d7c7a632692c910d81e59c2dbe
-patch_args=-Np0

 if [ -n "${CROSS_BUILD}" ]; then
 	configure_args+=" -DCMAKE_MODULE_PATH=${XBPS_CROSS_BASE}/usr/share/kodi/cmake"
--- a/srcpkgs/kore/patches/musl.patch
+++ b/srcpkgs/kore/patches/musl.patch
@ -1,5 +1,5 @@
--- include/kore/kore.h	2018-12-23 22:58:19.554780573 +0100
-+++ include/kore/kore.h	2018-12-23 22:58:40.453780146 +0100
+--- a/include/kore/kore.h	2018-12-23 22:58:19.554780573 +0100
+++ b/include/kore/kore.h	2018-12-23 22:58:40.453780146 +0100
@@ -44,6 +44,7 @@
 #include <syslog.h>
 #include <unistd.h>
--- a/srcpkgs/kore/patches/platform.patch
+++ b/srcpkgs/kore/patches/platform.patch
@ -1,5 +1,5 @@
--- ./misc/linux-platform.sh	2020-09-02 14:26:51.393112635 +0200
-+++ ./misc/linux-platform.sh	2020-09-02 14:28:26.281114976 +0200
+--- a/misc/linux-platform.sh	2020-09-02 14:26:51.393112635 +0200
+++ b/misc/linux-platform.sh	2020-09-02 14:28:26.281114976 +0200
@@ -2,7 +2,7 @@
 #
 # Linux specific defines and system call maps.
--- a/srcpkgs/kore/patches/ppc64.patch
+++ b/srcpkgs/kore/patches/ppc64.patch
@ -12,8 +12,8 @@ Subject: [PATCH] add ppc64* support

 diff --git misc/linux-platform.sh misc/linux-platform.sh
 index 2acde97..0d949d2 100755
--- misc/linux-platform.sh
-+++ misc/linux-platform.sh
+--- a/misc/linux-platform.sh
+++ b/misc/linux-platform.sh
@@ -22,6 +22,14 @@ case "$PLATFORM" in
 		seccomp_audit_arch=AUDIT_ARCH_AARCH64
 		syscall_file=$BASE/linux/aarch64_syscall.h.in
@ -33,7 +33,7 @@ diff --git misc/linux/ppc64_syscall.h.in misc/linux/ppc64_syscall.h.in
 new file mode 100644
 index 0000000..b935864
 --- /dev/null
-+++ misc/linux/ppc64_syscall.h.in
+++ b/misc/linux/ppc64_syscall.h.in
@@ -0,0 +1,390 @@
 +#define __NR_restart_syscall          0
 +#define __NR_exit                     1
@ -425,8 +425,8 @@ index 0000000..b935864
 +#define __NR_pidfd_open		434
 +#define __NR_clone3		435
 +
--- src/seccomp.c.orig	2021-01-24 11:27:12.401550281 +0100
-+++ src/seccomp.c	2021-01-24 11:30:18.102787637 +0100
+--- a/src/seccomp.c	2021-01-24 11:27:12.401550281 +0100
+++ b/src/seccomp.c	2021-01-24 11:30:18.102787637 +0100
@@ -460,13 +460,19 @@
 	struct iovec			iov;
 #if defined(__arm__)
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@ -16,7 +16,6 @@ homepage="https://kore.io"
 distfiles="https://kore.io/releases/kore-${version}.tar.gz"
 checksum=b7d73b005fde0ea01c356a54e4bbd8a209a4dff9cf315802a127ce7267efbe61
 disable_parallel_build=yes
-patch_args=-Np0

 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
--- a/srcpkgs/krita/patches/invalid-MimeType.patch
+++ b/srcpkgs/krita/patches/invalid-MimeType.patch
@ -1,5 +1,5 @@
--- ./plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
-+++ -	2020-06-27 20:35:38.810268638 +0200
+--- a/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
+++ b/plugins/impex/jpeg/krita_jpeg.desktop	2020-06-16 14:21:56.000000000 +0200
@@ -2,7 +2,7 @@
 Categories=Qt;KDE;Office;Graphics;
 Exec=krita %F
--- a/srcpkgs/krita/patches/musl.patch
+++ b/srcpkgs/krita/patches/musl.patch
@ -1,5 +1,5 @@
--- libs/image/tests/kis_paint_device_test.cpp	2019-09-30 15:18:28.000000000 +0200
-+++ -	2019-10-01 16:45:18.829596521 +0200
+--- a/libs/image/tests/kis_paint_device_test.cpp	2019-09-30 15:18:28.000000000 +0200
+++ b/libs/image/tests/kis_paint_device_test.cpp	2019-09-30 15:18:28.000000000 +0200
@@ -2354,7 +2354,7 @@
 
         qDebug() << "Iteration:" << i;
--- a/srcpkgs/krita/template
+++ b/srcpkgs/krita/template
@ -23,7 +23,6 @@ distfiles="${KDE_SITE}/krita/${version}/krita-${version}.tar.gz"
 checksum=4bfd7280870d1060a00d1123d836fc1a5b5bf8a028676679f0268cd5e7fb7568
 python_version=3
 replaces="calligra-krita>=0"
-patch_args=-Np0

 case "$XBPS_TARGET_MACHINE" in
 	i686*|x86_64*) makedepends+=" vc";;
--- a/srcpkgs/krusader/patches/0001-fix-missing-sys_types_h-includes.patch
+++ b/srcpkgs/krusader/patches/0001-fix-missing-sys_types_h-includes.patch
@ -1,5 +1,5 @@
--- krusader/DiskUsage/filelightParts/fileTree.h
-+++ krusader/DiskUsage/filelightParts/fileTree.h
+--- a/krusader/DiskUsage/filelightParts/fileTree.h
+++ b/krusader/DiskUsage/filelightParts/fileTree.h
@@ -26,6 +26,7 @@
 #include <time.h>
 #include <stdlib.h>
@ -8,8 +8,8 @@
 
 // TODO these are pointlessly general purpose now, make them incredibly specific
 
--- krusader/FileSystem/krpermhandler.h
-+++ krusader/FileSystem/krpermhandler.h
+--- a/krusader/FileSystem/krpermhandler.h
+++ b/krusader/FileSystem/krpermhandler.h
@@ -42,6 +42,7 @@
 #include <time.h>
 #include <stdlib.h>
--- a/srcpkgs/krusader/template
+++ b/srcpkgs/krusader/template
@ -12,4 +12,3 @@ license="GPL-2.0-or-later"
 homepage="https://www.krusader.org/"
 distfiles="${KDE_SITE}/krusader/${version}/krusader-${version}.tar.xz"
 checksum=41a39a43b3c42dd1d1ecaea86df30caff6a061fecc1d66f60859b2a3ca976109
-patch_args=-Np0
--- a/srcpkgs/kscreenlocker/patches/musl.patch
+++ b/srcpkgs/kscreenlocker/patches/musl.patch
@ -1,5 +1,5 @@
--- kcheckpass/kcheckpass.c.orig	2016-12-20 15:34:56.868688234 +0400
-+++ kcheckpass/kcheckpass.c	2016-12-20 15:35:48.092223200 +0400
+--- a/kcheckpass/kcheckpass.c	2016-12-20 15:34:56.868688234 +0400
+++ b/kcheckpass/kcheckpass.c	2016-12-20 15:35:48.092223200 +0400
@@ -45,6 +45,7 @@
  *
  *****************************************************************/
--- a/srcpkgs/kscreenlocker/template
+++ b/srcpkgs/kscreenlocker/template
@ -15,7 +15,6 @@ license="GPL-2.0-or-later"
 homepage="https://invent.kde.org/plasma/kscreenlocker"
 distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz"
 checksum=9803b976b6cc14fa5216de17481609ebf46d28c314284d9e74e8f9b181cb9bba
-patch_args=-Np0

 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wayland-devel"
--- a/srcpkgs/ksysguard/patches/musl.patch
+++ b/srcpkgs/ksysguard/patches/musl.patch
@ -1,5 +1,5 @@
--- ksysguardd/Linux/netstat.c.orig	2016-12-20 14:11:50.955834485 +0400
-+++ ksysguardd/Linux/netstat.c	2016-12-20 14:12:42.736385772 +0400
+--- a/ksysguardd/Linux/netstat.c	2016-12-20 14:11:50.955834485 +0400
+++ b/ksysguardd/Linux/netstat.c	2016-12-20 14:12:42.736385772 +0400
@@ -32,6 +32,10 @@
 #include "ccont.h"
 #include "netstat.h"
--- a/srcpkgs/ksysguard/template
+++ b/srcpkgs/ksysguard/template
@ -15,4 +15,3 @@ license="GPL-2.0-or-later, GFDL-1.2-only"
 homepage="https://invent.kde.org/plasma/ksysguard"
 distfiles="${KDE_SITE}/ksysguard/${version}/${pkgname}-${version}.tar.xz"
 checksum=0f9c624e5fbb2aee906d8d9563c5a7eb09eaf38bc8e4382c072f9e6d8854622d
-patch_args=-Np0
--- a/srcpkgs/kvirc/patches/qt5.15.patch
+++ b/srcpkgs/kvirc/patches/qt5.15.patch
@ -1,5 +1,5 @@
--- src/modules/iograph/libkviiograph.cpp	2019-01-01 23:51:16.000000000 +0100
-+++ -	2020-07-04 13:44:49.924079987 +0200
+--- a/src/modules/iograph/libkviiograph.cpp	2019-01-01 23:51:16.000000000 +0100
+++ b/src/modules/iograph/libkviiograph.cpp	2019-01-01 23:51:16.000000000 +0100
@@ -33,6 +33,7 @@
 #include "KviOptions.h"
 #include "kvi_socket.h"
--- a/srcpkgs/kvirc/template
+++ b/srcpkgs/kvirc/template
@ -15,7 +15,6 @@ license="GPL-2.0-or-later"
 homepage="http://www.kvirc.net"
 distfiles="ftp://ftp.kvirc.net/pub/kvirc/${version}/source/KVIrc-${version}.tar.bz2"
 checksum=76cd4cdcaca5e4056f086cdcbb6122c2ca7e331d6e66c7ebc57d32565f626a65
-patch_args=-Np0

 if [ "$CROSS_BUILD" ];then
 	hostmakedepends+=" qt5-qmake qt5-host-tools"
--- a/srcpkgs/kwallet-cli/patches/GNUmakefile.patch
+++ b/srcpkgs/kwallet-cli/patches/GNUmakefile.patch
@ -1,5 +1,5 @@
--- GNUmakefile
-+++ GNUmakefile
+--- a/GNUmakefile
+++ b/GNUmakefile
@@ -61 +61,2 @@
 -CPPFLAGS+=	${KDE_INCS} -D_GNU_SOURCE
 +CPPFLAGS+=	${KDE_INCS} -fPIC -D_GNU_SOURCE
--- a/srcpkgs/kwallet-cli/template
+++ b/srcpkgs/kwallet-cli/template
@ -14,7 +14,6 @@ license="custom:MirOS, LGPL-3.0-or-later"
 homepage="https://www.mirbsd.org/kwalletcli.htm"
 distfiles="http://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-${version}.tar.gz"
 checksum=f228e5b179f6eb92289b9635382e676990dd58cd193ce42b61d3150c8a06b12d
-patch_args=-Np0

 post_patch() {
 	vsed -i GNUmakefile -e "s|-I/usr/include|-I${XBPS_CROSS_BASE}/usr/include|g"