srcpkgs/g*: convert patches to -Np1

* gcc is kept at -Np0, because of void-cross ```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 · 7fc9190f0e
parent be5369a0cb
commit 7fc9190f0e
248 changed files with 621 additions and 715 deletions
--- a/srcpkgs/gamin/patches/0001-Poll-files-on-nfs4.patch
+++ b/srcpkgs/gamin/patches/0001-Poll-files-on-nfs4.patch
@ -12,8 +12,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=693006
 server/gam_fs.c | 1 +
 1 file changed, 1 insertion(+)

--- server/gam_fs.c.orig
-+++ server/gam_fs.c
+--- a/server/gam_fs.c
+++ b/server/gam_fs.c
@@ -178,6 +178,7 @@ gam_fs_init (void)
 		gam_fs_set ("reiserfs", GFS_MT_DEFAULT, 0);
 		gam_fs_set ("novfs", GFS_MT_POLL, 30);
--- a/srcpkgs/gamin/patches/0002-Fix-compilation-of-recent-glib-removing-G_CONST_RETU.patch
+++ b/srcpkgs/gamin/patches/0002-Fix-compilation-of-recent-glib-removing-G_CONST_RETU.patch
@ -13,8 +13,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658884
 server/gam_subscription.h | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- server/gam_node.c.orig
-+++ server/gam_node.c
+--- a/server/gam_node.c
+++ b/server/gam_node.c
@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboolean is_dir)
  * it has finished with the string.  If it must keep it longer, it
  * should makes its own copy.  The returned string must not be freed.
@ -24,8 +24,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658884
 gam_node_get_path(GamNode * node)
 {
     g_assert(node);
--- server/gam_node.h.orig
-+++ server/gam_node.h
+--- a/server/gam_node.h
+++ b/server/gam_node.h
@@ -58,7 +58,7 @@ gboolean              gam_node_is_dir              (GamNode         *node);
 void                  gam_node_set_is_dir          (GamNode         *node,
 						   gboolean        is_dir);
@ -35,8 +35,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658884
 
 GList                *gam_node_get_subscriptions   (GamNode         *node);
 
--- server/gam_subscription.c.orig
-+++ server/gam_subscription.c
+--- a/server/gam_subscription.c
+++ b/server/gam_subscription.c
@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription * sub)
  * @param sub the GamSubscription
  * @returns The path being monitored.  It should not be freed.
@ -46,8 +46,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658884
 gam_subscription_get_path(GamSubscription * sub)
 {
     if (sub == NULL)
--- server/gam_subscription.h.orig
-+++ server/gam_subscription.h
+--- a/server/gam_subscription.h
+++ b/server/gam_subscription.h
@@ -21,7 +21,7 @@ int                  gam_subscription_pathlen      (GamSubscription *sub);
 
 int                  gam_subscription_get_reqno    (GamSubscription *sub);
--- a/srcpkgs/gamin/patches/0004-fix-possible-server-deadlock-in-ih_sub_cancel.patch
+++ b/srcpkgs/gamin/patches/0004-fix-possible-server-deadlock-in-ih_sub_cancel.patch
@ -22,8 +22,8 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
 server/inotify-helper.h | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

--- server/inotify-helper.c.orig
-+++ server/inotify-helper.c
+--- a/server/inotify-helper.c
+++ b/server/inotify-helper.c
@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
 
 /**
@ -48,8 +48,8 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
 	return TRUE;
 }
 
--- server/inotify-helper.h.orig
-+++ server/inotify-helper.h
+--- a/server/inotify-helper.h
+++ b/server/inotify-helper.h
@@ -34,7 +34,6 @@ gboolean	 ih_startup		(event_callback_t ecb,
 					 found_callback_t fcb);
 gboolean	 ih_running		(void);
--- a/srcpkgs/gamin/patches/disable-tests-for-cross-build.patch
+++ b/srcpkgs/gamin/patches/disable-tests-for-cross-build.patch
@ -1,6 +1,6 @@
 Disable abstract socket namespace test since can't be achieved while cross-building.
--- configure.in.ORIG
-+++ configure.in
+--- a/configure.in
+++ b/configure.in
@@ -388,47 +388,9 @@
 #### Abstract sockets
 
--- a/srcpkgs/gamin/patches/gamin-manape.patch
+++ b/srcpkgs/gamin/patches/gamin-manape.patch
@ -2,8 +2,8 @@ Don't try to build with -DG_DISABLE_DEPRECATED - glib has moved on

 source: https://src.fedoraproject.org/cgit/rpms/gamin.git/plain/gamin-manape.patch

--- server/Makefile.am.manape	2008-11-12 15:45:28.000000000 -0500
-+++ server/Makefile.am	2011-07-20 21:06:37.465307638 -0400
+--- a/server/Makefile.am.manape	2008-11-12 15:45:28.000000000 -0500
+++ b/server/Makefile.am	2011-07-20 21:06:37.465307638 -0400
@@ -6,8 +6,7 @@ INCLUDES =						\
 	-I$(top_srcdir)/lib				\
 	-I$(top_srcdir)/libgamin			\
--- a/srcpkgs/gamin/patches/musl.patch
+++ b/srcpkgs/gamin/patches/musl.patch
@ -3,8 +3,8 @@ source: https://mail.gnome.org/archives/gamin-list/2016-April/msg00000.html
 The musl C library does not provide the non portable
 PTHREAD_MUTEX_RECURSIVE_NP. Test for PTHREAD_MUTEX_RECURSIVE_NP only.

--- libgamin/gam_data.c.orig
-+++ libgamin/gam_data.c
+--- a/libgamin/gam_data.c
+++ b/libgamin/gam_data.c
@@ -470,7 +470,7 @@ gamin_data_new(void)
     }
     if (is_threaded > 0) {
--- a/srcpkgs/gamin/template
+++ b/srcpkgs/gamin/template
@ -13,7 +13,6 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org/~veillard/gamin/"
 distfiles="$GNOME_SITE/gamin/0.1/gamin-${version}.tar.bz2"
 checksum=a59948b20ce2f14136c013f155abb8c8d51db2ea167c063ff33461e453fec10a
-patch_args=-Np0

 pre_configure() {
 	autoreconf -fi
--- a/srcpkgs/gammu/patches/fix-musl.patch
+++ b/srcpkgs/gammu/patches/fix-musl.patch
@ -1,7 +1,7 @@
 diff --git a/libgammu/device/devfunc.c b/libgammu/device/devfunc.c
 index e751cd3..631afb5 100644
--- libgammu/device/devfunc.c
-+++ libgammu/device/devfunc.c
+--- a/libgammu/device/devfunc.c
+++ b/libgammu/device/devfunc.c
@@ -24,6 +24,7 @@
 #  include <signal.h>
 #  include <sys/socket.h>
@ -12,8 +12,8 @@ index e751cd3..631afb5 100644
 #include "devfunc.h"
 diff --git a/libgammu/device/proxy/proxy.c b/libgammu/device/proxy/proxy.c
 index c68e00e..57f3c4d 100644
--- libgammu/device/proxy/proxy.c
-+++ libgammu/device/proxy/proxy.c
+--- a/libgammu/device/proxy/proxy.c
+++ b/libgammu/device/proxy/proxy.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <sys/time.h>
@ -24,8 +24,8 @@ index c68e00e..57f3c4d 100644
 #include "../../gsmcomon.h"
 diff --git a/libgammu/device/serial/ser_unx.c b/libgammu/device/serial/ser_unx.c
 index c0fbd57..5699238 100644
--- libgammu/device/serial/ser_unx.c
-+++ libgammu/device/serial/ser_unx.c
+--- a/libgammu/device/serial/ser_unx.c
+++ b/libgammu/device/serial/ser_unx.c
@@ -28,6 +28,7 @@
 #include <assert.h>
 #include <unistd.h>
--- a/srcpkgs/gammu/template
+++ b/srcpkgs/gammu/template
@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
 homepage="https://wammu.eu"
 distfiles="https://dl.cihar.com/gammu/releases/gammu-${version}.tar.bz2"
 checksum=6197f8b4d35746d31567e61880121def676f225eba05276648410eaa6ce60c9f
-patch_args=-Np0

 gammu-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
--- a/srcpkgs/gatling/patches/gatling.c.patch
+++ b/srcpkgs/gatling/patches/gatling.c.patch
@ -1,6 +1,6 @@
 # patch gatling.c to use capability headers from the kernel instead of libcap
--- gatling.c.orig	2021-04-04 21:51:17.641001871 +0000
-+++ gatling.c	2021-04-04 21:51:49.798095616 +0000
+--- a/gatling.c	2021-04-04 21:51:17.641001871 +0000
+++ b/gatling.c	2021-04-04 21:51:49.798095616 +0000
@@ -62,7 +62,7 @@
 
 #ifdef __linux__
--- a/srcpkgs/gatling/template
+++ b/srcpkgs/gatling/template
@ -12,7 +12,6 @@ license="GPL-2.0-only"
 homepage="http://www.fefe.de/gatling"
 distfiles="https://www.fefe.de/gatling/$pkgname-$version.tar.xz"
 checksum=5f96438ee201d7f1f6c2e0849ff273b196bdc7493f29a719ce8ed08c8be6365b
-patch_args=-Np0

 CFLAGS="-std=c99 -I${XBPS_CROSS_BASE}/usr/include/libowfat -fcommon"

--- a/srcpkgs/gavl/patches/cross-test.patch
+++ b/srcpkgs/gavl/patches/cross-test.patch
@ -1,7 +1,7 @@
 diff --git configure configure
 index d3702c3..79a958b 100755
--- configure
-+++ configure
+--- a/configure
+++ b/configure
@@ -11188,7 +11188,7 @@ LIBS=$RT_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_MONOTONIC" >&5
 $as_echo_n "checking for CLOCK_MONOTONIC... " >&6; }
--- a/srcpkgs/gavl/patches/musl-sched_h.patch
+++ b/srcpkgs/gavl/patches/musl-sched_h.patch
@ -1,5 +1,5 @@
--- src/benchmark.c	2012-06-08 13:49:30.000000000 +0200
-+++ src/benchmark.c	2015-10-03 13:23:43.279324001 +0200
+--- a/src/benchmark.c	2012-06-08 13:49:30.000000000 +0200
+++ b/src/benchmark.c	2015-10-03 13:23:43.279324001 +0200
@@ -21,6 +21,8 @@
 
 
--- a/srcpkgs/gavl/template
+++ b/srcpkgs/gavl/template
@ -11,7 +11,6 @@ homepage="http://gmerlin.sourceforge.net/gavl.html"
 distfiles="${SOURCEFORGE_SITE}/gmerlin/gavl/${version}/gavl-${version}.tar.gz"
 checksum=51aaac41391a915bd9bad07710957424b046410a276e7deaff24a870929d33ce
 CFLAGS="-lm"
-patch_args=-Np0

 gavl-devel_package() {
 	depends="gavl>=${version}_${revision}"
--- a/srcpkgs/gbdfed/patches/Makefile.in.patch
+++ b/srcpkgs/gbdfed/patches/Makefile.in.patch
@ -1,5 +1,5 @@
--- Makefile.in-	2010-04-16 16:38:59.000000000 +0200
-+++ Makefile.in	2014-07-06 19:01:18.669249288 +0200
+--- a/Makefile.in-	2010-04-16 16:38:59.000000000 +0200
+++ b/Makefile.in	2014-07-06 19:01:18.669249288 +0200
@@ -27,9 +27,9 @@
 CC = @CC@
 CFLAGS = @XX_CFLAGS@ @CFLAGS@
--- a/srcpkgs/gbdfed/patches/num_signals.patch
+++ b/srcpkgs/gbdfed/patches/num_signals.patch
@ -1,5 +1,5 @@
--- glyphedit.c	2010-04-16 16:39:04.000000000 +0200
-+++ glyphedit.c	2011-11-23 21:30:25.479413052 +0100
+--- a/glyphedit.c	2010-04-16 16:39:04.000000000 +0200
+++ b/glyphedit.c	2011-11-23 21:30:25.479413052 +0100
@@ -104,7 +104,8 @@
     GLYPH_MODIFIED = 0,
     POINTER_MOVED,
--- a/srcpkgs/gbdfed/template
+++ b/srcpkgs/gbdfed/template
@ -12,7 +12,6 @@ license="BSD-2-Clause, MIT"
 homepage="http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"
 distfiles="https://src.fedoraproject.org/repo/pkgs/gbdfed/gbdfed-${version}.tar.bz2/2a2e1cbfe8566db6d302f0b9ab79b8dd/gbdfed-${version}.tar.bz2"
 checksum=5db25d4ce688dcb188dee056e58614a94a5e4fce4b6066fbb310951ab999093c
-patch_args=-Np0

 post_install() {
 	sed '/^$/q' <gbdfed.c >LICENSE
--- a/srcpkgs/gcal/patches/fseeko.patch
+++ b/srcpkgs/gcal/patches/fseeko.patch
@ -1,7 +1,7 @@
 diff --git lib/fseeko.c lib/fseeko.c
 index 5ae106f..d47481d 100644
--- lib/fseeko.c
-+++ lib/fseeko.c
+--- a/lib/fseeko.c
+++ b/lib/fseeko.c
@@ -1,9 +1,9 @@
 /* An fseeko() function that, together with fflush(), is POSIX compliant.
 -   Copyright (C) 2007-2017 Free Software Foundation, Inc.
--- a/srcpkgs/gcal/template
+++ b/srcpkgs/gcal/template
@ -11,4 +11,3 @@ license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/gcal/"
 distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=91b56c40b93eee9bda27ec63e95a6316d848e3ee047b5880ed71e5e8e60f61ab
-patch_args=-Np0
--- a/srcpkgs/gcc-multilib/patches/fix-inline_vfprintf.patch
+++ b/srcpkgs/gcc-multilib/patches/fix-inline_vfprintf.patch
@ -5,8 +5,8 @@ not guarantee inlined code for _FORTIFY_SOURCE=2.
 Here we just don't include <stdio.h> and declare
 the required types and functions locally.

--- libitm/util.cc	2015-09-02 17:19:01.176016940 +0200
-+++ libitm/util.cc	2015-09-02 17:20:03.045016757 +0200
+--- a/libitm/util.cc	2015-09-02 17:19:01.176016940 +0200
+++ b/libitm/util.cc	2015-09-02 17:20:03.045016757 +0200
@@ -24,10 +24,15 @@
 
 #include "libitm_i.h"
--- a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
+++ b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch
@ -1,5 +1,5 @@
--- libiberty/Makefile.in	2020-12-03 20:45:14.000000000 +0100
-+++ libiberty/Makefile.in	2021-01-23 18:39:45.891324445 +0100
+--- a/libiberty/Makefile.in	2020-12-03 20:45:14.000000000 +0100
+++ b/libiberty/Makefile.in	2021-01-23 18:39:45.891324445 +0100
@@ -111,7 +111,7 @@
 
 INCDIR=$(srcdir)/$(MULTISRCTOP)../include
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@ -2,7 +2,6 @@
 archs="x86_64"
 _triplet="x86_64-unknown-linux-gnu"
 _majorver=10.2
-patch_args=-Np0

 pkgname=gcc-multilib
 version=${_majorver}.1pre1
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@ -8,7 +8,6 @@ _gmp_version=6.2.0
 _mpfr_version=4.1.0
 _mpc_version=1.1.0
 _isl_version=0.21
-patch_args=-Np0

 pkgname=gcc
 # we are using a 10-stable git snapshot alpine is using in order
--- a/srcpkgs/gcolor2/patches/gcolor2-0.4-amd64.patch
+++ b/srcpkgs/gcolor2/patches/gcolor2-0.4-amd64.patch
@ -1,5 +1,5 @@
--- src/callbacks.c	2005-07-12 14:06:12.000000000 -0400
-+++ src/callbacks.c	2007-02-17 19:19:38.000000000 -0500
+--- a/src/callbacks.c	2005-07-12 14:06:12.000000000 -0400
+++ b/src/callbacks.c	2007-02-17 19:19:38.000000000 -0500
@@ -4,6 +4,9 @@
 
 #include <gtk/gtk.h>
@ -29,8 +29,8 @@
 void add_color_to_treeview ()
 {
 	GtkTreeView      *treeview;
--- src/main.c	2005-07-11 10:55:49.000000000 -0400
-+++ src/main.c	2007-02-17 19:18:23.000000000 -0500
+--- a/src/main.c	2005-07-11 10:55:49.000000000 -0400
+++ b/src/main.c	2007-02-17 19:18:23.000000000 -0500
@@ -4,6 +4,10 @@
 
 #include <gtk/gtk.h>
--- a/srcpkgs/gcolor2/template
+++ b/srcpkgs/gcolor2/template
@ -11,7 +11,6 @@ license="GPL-2.0-only"
 homepage="http://gcolor2.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=89bd6c6d27ba5a679ec60057de8497855072f520515b490e5986fc3509774f23
-patch_args=-Np0

 CFLAGS="-fcommon"

--- a/srcpkgs/gdm/patches/take-out-the-trash.patch
+++ b/srcpkgs/gdm/patches/take-out-the-trash.patch
@ -1,5 +1,5 @@
--- meson.build
-+++ meson.build
+--- a/meson.build
+++ b/meson.build
@@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers')
   libwrap_dep = cc.find_library('libwrap')
 endif
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@ -24,7 +24,6 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GDM"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e
-patch_args=-Np0

 conf_files="
 	/etc/gdm/custom.conf
--- a/srcpkgs/gdmap/patches/gtk-fix.patch
+++ b/srcpkgs/gdmap/patches/gtk-fix.patch
@ -1,5 +1,5 @@
--- src/gui_support.c	2008/05/23 14:54:28	1.2
-+++ src/gui_support.c	2012/01/06 13:51:36	1.3
+--- a/src/gui_support.c	2008/05/23 14:54:28	1.2
+++ b/src/gui_support.c	2012/01/06 13:51:36	1.3
@@ -85,7 +85,11 @@
   const char* text;
 
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@ -12,7 +12,6 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
-patch_args=-Np0

 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
--- a/srcpkgs/geary/patches/libucontext.patch
+++ b/srcpkgs/geary/patches/libucontext.patch
@ -1,8 +1,8 @@
 For whatever reason they don't use pkg-config for this.
 We will substitute this as needed from the template.

--- meson.build
-+++ meson.build
+--- a/meson.build
+++ b/meson.build
@@ -138,7 +138,8 @@ if libunwind_dep.found()
      dependencies: [
        valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]),
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@ -20,7 +20,6 @@ homepage="https://wiki.gnome.org/Apps/Geary"
 _series=${version%.${version#*.*.}}
 distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz"
 checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812
-patch_args=-Np0

 post_patch() {
 	case "$XBPS_TARGET_MACHINE" in
--- a/srcpkgs/geda/patches/snarf_cpp_opts.patch
+++ b/srcpkgs/geda/patches/snarf_cpp_opts.patch
@ -1,5 +1,5 @@
--- gschem/src/Makefile.am	2020-12-12 16:20:18.000000000 +0100
-+++ gschem/src/Makefile.am	2020-12-20 12:55:06.921054480 +0100
+--- a/gschem/src/Makefile.am	2020-12-12 16:20:18.000000000 +0100
+++ b/gschem/src/Makefile.am	2020-12-20 12:55:06.921054480 +0100
@@ -152,12 +152,12 @@
 	$(AM_V_SNARF)CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts)
 
--- a/srcpkgs/geda/template
+++ b/srcpkgs/geda/template
@ -18,7 +18,6 @@ distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version}
 checksum=e862ab241528538fa3bee2739261f568011102b60c5e39a2f0358663c042c8a4
 python_version=2
 replaces="geda-data>=0"
-patch_args=-Np0

 CFLAGS="-Wno-deprecated-declarations -fcommon -Wno-unused-function"

--- a/srcpkgs/geis/patches/fix-gcc6-indentation.patch
+++ b/srcpkgs/geis/patches/fix-gcc6-indentation.patch
@ -1,5 +1,5 @@
--- libgeis/geis_subscription.c	2013-05-29 13:24:59.000000000 +0200
-+++ libgeis/geis_subscription.c	2016-10-04 10:50:16.159001608 +0200
+--- a/libgeis/geis_subscription.c	2013-05-29 13:24:59.000000000 +0200
+++ b/libgeis/geis_subscription.c	2016-10-04 10:50:16.159001608 +0200
@@ -239,7 +239,7 @@
   {
     if (bag->sub_store[i])
--- a/srcpkgs/geis/patches/gcc-7.patch
+++ b/srcpkgs/geis/patches/gcc-7.patch
@ -16,8 +16,8 @@ Bug-Debian: https://bugs.debian.org/853415

 ---

--- libgeis/geis_v1.c
-+++ libgeis/geis_v1.c
+--- a/libgeis/geis_v1.c
+++ b/libgeis/geis_v1.c
@@ -610,7 +610,7 @@ _v1_subscribe_device(GeisInstance instan
                      const char **gesture_list)
 {
--- a/srcpkgs/geis/template
+++ b/srcpkgs/geis/template
@ -12,7 +12,6 @@ license="GPL-3.0-only"
 homepage="https://launchpad.net/geis"
 distfiles="https://launchpad.net/geis/trunk/$version/+download/geis-$version.tar.xz"
 checksum=8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb
-patch_args=-Np0

 if [ -n "$CROSS_BUILD" ]; then
 	configure_args+=" --enable-integration-tests=no"
--- a/srcpkgs/geos/patches/geos-arm.patch
+++ b/srcpkgs/geos/patches/geos-arm.patch
@ -1,7 +1,7 @@
 see http://trac.osgeo.org/geos/ticket/222

--- src/inlines.cpp	2020-12-09 18:17:36.000000000 +0100
-+++ src/inlines.cpp	2021-02-02 09:57:11.270098998 +0100
+--- a/src/inlines.cpp	2020-12-09 18:17:36.000000000 +0100
+++ b/src/inlines.cpp	2021-02-02 09:57:11.270098998 +0100
@@ -62,7 +62,9 @@
 #include <geos/geomgraph/TopologyLocation.inl>
 #include <geos/geomgraph/index/SegmentIntersector.inl>
--- a/srcpkgs/geos/template
+++ b/srcpkgs/geos/template
@ -9,7 +9,6 @@ license="LGPL-2.1-or-later"
 homepage="https://trac.osgeo.org/geos"
 distfiles="https://download.osgeo.org/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a
-patch_args=-Np0

 geos-devel_package() {
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
--- a/srcpkgs/gfm/patches/no-kde.patch
+++ b/srcpkgs/gfm/patches/no-kde.patch
@ -1,5 +1,5 @@
--- src/Makefile.am.orig
-+++ src/Makefile.am
+--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,18 +8,18 @@
 # build instructions
 gfm_CPPFLAGS = @TIFILES_CFLAGS@ @TICONV_CFLAGS@ @TICALCS_CFLAGS@ \
@ -22,8 +22,8 @@
 
 # automake wants all .c files listed explicitly. This sucks. qmake does the
 # right thing with just "*.c".
--- configure.ac.orig
-+++ configure.ac
+--- a/configure.ac
+++ b/configure.ac
@@ -90,22 +90,23 @@
 AC_CHECK_FUNCS([getcwd memset mkdir strcasecmp strchr strdup strrchr strstr])
 
--- a/srcpkgs/gfm/template
+++ b/srcpkgs/gfm/template
@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
 homepage="https://www.ticalc.org"
 distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${_tilpver}/${pkgname}-${version}.tar.bz2"
 checksum=09031ac0abf686b6a8bc9935f331ef460415783a1057f11b0af993526b52017f
-patch_args=-Np0

 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" gettext-devel"
--- a/srcpkgs/gftp/patches/cross.patch
+++ b/srcpkgs/gftp/patches/cross.patch
@ -1,5 +1,5 @@
--- configure.orig
-+++ configure
+--- a/configure
+++ b/configure
@@ -5967,77 +5967,9 @@
     ;;
 esac
--- a/srcpkgs/gftp/patches/ftbfs.patch
+++ b/srcpkgs/gftp/patches/ftbfs.patch
@ -1,8 +1,8 @@
 We need sysmacros.h for major/minor. Also, stropts.h has been
 removed from glibc in the 2.30 version and is actually not used.

--- lib/gftp.h
-+++ lib/gftp.h
+--- a/lib/gftp.h
+++ b/lib/gftp.h
@@ -48,6 +48,7 @@
 #endif
 #include <sys/wait.h>
@ -11,8 +11,8 @@ removed from glibc in the 2.30 version and is actually not used.
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <glib.h>
--- lib/pty.c
-+++ lib/pty.c
+--- a/lib/pty.c
+++ b/lib/pty.c
@@ -61,10 +61,6 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name)
 
 #elif HAVE_GRANTPT
--- a/srcpkgs/gftp/patches/musl.patch
+++ b/srcpkgs/gftp/patches/musl.patch
@ -1,5 +1,5 @@
--- lib/fsplib/fsplib.h.orig
-+++ lib/fsplib/fsplib.h
+--- a/lib/fsplib/fsplib.h
+++ b/lib/fsplib/fsplib.h
@@ -3,6 +3,7 @@
 #include <time.h>
 #include <dirent.h>
--- a/srcpkgs/gftp/template
+++ b/srcpkgs/gftp/template
@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
 homepage="https://www.gftp.org"
 distfiles="https://sources.voidlinux.org/gftp-${version}/gftp-${version}.tar.bz2"
 checksum=5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd
-patch_args=-Np0
--- a/srcpkgs/gfuzz/patches/helper-gofuzz.patch
+++ b/srcpkgs/gfuzz/patches/helper-gofuzz.patch
@ -1,5 +1,5 @@
--- libgrequest/helper.go
-+++ libgrequest/helper.go
+--- a/libgrequest/helper.go
+++ b/libgrequest/helper.go
@@ -123,9 +123,9 @@
 
 // PrintHelp : cli help info
--- a/srcpkgs/gfuzz/patches/main-gofuzz.patch
+++ b/srcpkgs/gfuzz/patches/main-gofuzz.patch
@ -1,5 +1,5 @@
--- main.go
-+++ main.go
+--- a/main.go
+++ b/main.go
@@ -7,7 +7,7 @@
 	"strings"
 	"time"
--- a/srcpkgs/gfuzz/template
+++ b/srcpkgs/gfuzz/template
@ -12,4 +12,3 @@ license="Apache-2.0"
 homepage="https://github.com/braaaax/gfz"
 distfiles="${homepage}/archive/v${version}.tar.gz"
 checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f
-patch_args=-Np0
--- a/srcpkgs/giac/patches/fgamma.patch
+++ b/srcpkgs/giac/patches/fgamma.patch
@ -1,5 +1,5 @@
--- src/first.h.orig	2017-09-22 20:44:12.000000000 +0200
-+++ src/first.h	2017-11-14 15:26:53.529711489 +0100
+--- a/src/first.h	2017-09-22 20:44:12.000000000 +0200
+++ b/src/first.h	2017-11-14 15:26:53.529711489 +0100
@@ -503,7 +503,7 @@
 #if defined(__MINGW_H) || defined(VISUALC) // FIXME gamma, not used
 inline float fgamma(float f1){ return f1; }
--- a/srcpkgs/giac/patches/invmod.patch
+++ b/srcpkgs/giac/patches/invmod.patch
@ -1,5 +1,5 @@
--- src/modpoly.cc.orig	2020-02-18 10:07:10.000000000 -0300
-+++ src/modpoly.cc	2021-03-08 02:18:09.443740199 -0300
+--- a/src/modpoly.cc	2020-02-18 10:07:10.000000000 -0300
+++ b/src/modpoly.cc	2021-03-08 02:18:09.443740199 -0300
@@ -92,7 +92,10 @@
   gen invenv(const gen & g,environment * env){
     if (g.type==_USER)
--- a/srcpkgs/giac/patches/malloc.patch
+++ b/srcpkgs/giac/patches/malloc.patch
@ -1,5 +1,5 @@
--- src/History.cc.orig	2017-10-02 10:23:46.000000000 +0200
-+++ src/History.cc	2017-11-14 15:42:12.119849965 +0100
+--- a/src/History.cc	2017-10-02 10:23:46.000000000 +0200
+++ b/src/History.cc	2017-11-14 15:42:12.119849965 +0100
@@ -3828,7 +3828,7 @@
       // mode_s += "Time: ";
       // double t=double(clock());
--- a/srcpkgs/giac/patches/pari_2_11.patch
+++ b/srcpkgs/giac/patches/pari_2_11.patch
@ -4,8 +4,8 @@ See https://trac.sagemath.org/ticket/25567
 and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102

 diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1
--- check/TP11-sol.cas.out1	2014-10-21 10:51:48.000000000 +0200
-+++ check/TP11-sol.cas.out1	2018-08-07 17:04:12.528052773 +0200
+--- a/check/TP11-sol.cas.out1	2014-10-21 10:51:48.000000000 +0200
+++ b/check/TP11-sol.cas.out1	2018-08-07 17:04:12.528052773 +0200
@@ -10,7 +10,7 @@
 1073741824000000000000000000061203284109000000000000000000000000008409,
 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241,
--- a/srcpkgs/giac/template
+++ b/srcpkgs/giac/template
@ -13,7 +13,6 @@ license="GPL-3.0-or-later"
 homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
 distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz"
 checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4
-patch_args=-Np0

 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812
 LDFLAGS="-Wl,-z,stack-size=2097152"
--- a/srcpkgs/giflib/patches/restore-deprecated-utility-functions.patch
+++ b/srcpkgs/giflib/patches/restore-deprecated-utility-functions.patch
@ -1,8 +1,8 @@
 Source: Gentoo, written by Gary Stein
 Upstream: No
 Reason: restores deprecated GifQuantizeBuffer which some packages (notably libgdiplus) still use
--- Makefile	2019-03-28 14:57:23.000000000 -0400
-+++ Makefile	2019-03-31 23:38:20.700603561 -0400
+--- a/Makefile	2019-03-28 14:57:23.000000000 -0400
+++ b/Makefile	2019-03-31 23:38:20.700603561 -0400
@@ -67,8 +67,8 @@
 
 $(UTILS):: libgif.a libutil.a
--- a/srcpkgs/giflib/template
+++ b/srcpkgs/giflib/template
@ -10,7 +10,6 @@ license="MIT"
 homepage="https://sourceforge.net/projects/giflib/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd
-patch_args=-Np0

 CFLAGS="-fPIC"

--- a/srcpkgs/giggle/patches/0001-Fix-628184-Giggle-does-not-display-diff-for-files-th.patch
+++ b/srcpkgs/giggle/patches/0001-Fix-628184-Giggle-does-not-display-diff-for-files-th.patch
@ -15,8 +15,8 @@ Signed-off-by: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>

 diff --git src/giggle-diff-view.c src/giggle-diff-view.c
 index ff6bbe3..2fbb8eb 100644
--- src/giggle-diff-view.c
-+++ src/giggle-diff-view.c
+--- a/src/giggle-diff-view.c
+++ b/src/giggle-diff-view.c
@@ -665,6 +665,11 @@ diff_view_parse_patch (GiggleDiffView *view)
 			}
 		} else if (g_str_has_prefix (line, "--- a/") || g_str_has_prefix (line, "+++ b/")) {
--- a/srcpkgs/giggle/patches/0002-include-gtksource.h-instead-of-gtksourceview.h.patch
+++ b/srcpkgs/giggle/patches/0002-include-gtksource.h-instead-of-gtksourceview.h.patch
@ -14,8 +14,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=697220

 diff --git configure.ac configure.ac
 index a7011f8..3e47b48 100644
--- configure.ac
-+++ configure.ac
+--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ dnl  ------------------
 GLIB_REQUIRED_VERSION=2.30
 GDK_PIXBUF_REQUIRED_VERSION=2.22
@ -27,8 +27,8 @@ index a7011f8..3e47b48 100644
 
 diff --git src/giggle-diff-view.h src/giggle-diff-view.h
 index 74fb983..28266e3 100644
--- src/giggle-diff-view.h
-+++ src/giggle-diff-view.h
+--- a/src/giggle-diff-view.h
+++ b/src/giggle-diff-view.h
@@ -21,8 +21,7 @@
 
 #include <glib-object.h>
@ -41,8 +41,8 @@ index 74fb983..28266e3 100644
 
 diff --git src/giggle-view-file.c src/giggle-view-file.c
 index 130af4a..94c6c76 100644
--- src/giggle-view-file.c
-+++ src/giggle-view-file.c
+--- a/src/giggle-view-file.c
+++ b/src/giggle-view-file.c
@@ -38,8 +38,7 @@
 #include <gio/gio.h>
 #include <glib/gi18n.h>
--- a/srcpkgs/giggle/patches/0004-Port-to-vte-2.91-API.patch
+++ b/srcpkgs/giggle/patches/0004-Port-to-vte-2.91-API.patch
@ -11,8 +11,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=743537

 diff --git configure.ac configure.ac
 index 6e27733..72e7bd1 100644
--- configure.ac
-+++ configure.ac
+--- a/configure.ac
+++ b/configure.ac
@@ -106,7 +106,7 @@ AC_ARG_ENABLE([terminal],
 AS_IF([test "x$enable_terminal" = "xyes"],
       [
@ -24,8 +24,8 @@ index 6e27733..72e7bd1 100644
                                      [Use features from vte])
 diff --git plugins/giggle-view-terminal.c plugins/giggle-view-terminal.c
 index 06a9a50..cd107f2 100644
--- plugins/giggle-view-terminal.c
-+++ plugins/giggle-view-terminal.c
+--- a/plugins/giggle-view-terminal.c
+++ b/plugins/giggle-view-terminal.c
@@ -186,15 +186,16 @@ giggle_view_terminal_append_tab (GiggleViewTerminal *view,
 	real_argv[1] = NULL;
 	spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO;
--- a/srcpkgs/giggle/patches/0005-Fixed-bug-of-GUI-not-remembering-settings.patch
+++ b/srcpkgs/giggle/patches/0005-Fixed-bug-of-GUI-not-remembering-settings.patch
@ -12,8 +12,8 @@ This patch replaces "git repo-config" with "git config".

 diff --git libgiggle-git/giggle-git-config-read.c libgiggle-git/giggle-git-config-read.c
 index 7b4fdb9..7f24e1d 100644
--- libgiggle-git/giggle-git-config-read.c
-+++ libgiggle-git/giggle-git-config-read.c
+--- a/libgiggle-git/giggle-git-config-read.c
+++ b/libgiggle-git/giggle-git-config-read.c
@@ -120,7 +120,7 @@ static gboolean
 git_config_read_get_command_line (GiggleJob  *job,
 				  gchar     **command_line)
@ -25,8 +25,8 @@ index 7b4fdb9..7f24e1d 100644
 
 diff --git libgiggle-git/giggle-git-config-write.c libgiggle-git/giggle-git-config-write.c
 index e026e4f..7fd2b07 100644
--- libgiggle-git/giggle-git-config-write.c
-+++ libgiggle-git/giggle-git-config-write.c
+--- a/libgiggle-git/giggle-git-config-write.c
+++ b/libgiggle-git/giggle-git-config-write.c
@@ -184,13 +184,13 @@ git_config_write_get_command_line (GiggleJob  *job,
 	if (priv->value) {
 		value = g_shell_quote (priv->value);
--- a/srcpkgs/giggle/patches/cross.patch
+++ b/srcpkgs/giggle/patches/cross.patch
@ -1,7 +1,7 @@
 diff --git configure.ac configure.ac
 index a7011f8..1ab7a52 100644
--- configure.ac
-+++ configure.ac
+--- a/configure.ac
+++ b/configure.ac
@@ -125,30 +125,6 @@ dnl  ----------------------
 
 AC_DEFINE(_GNU_SOURCE, 1, [Enable GNU Extensions])
@ -34,8 +34,8 @@ index a7011f8..1ab7a52 100644
 dnl | Language Support |---------------------------------------
 dnl  ------------------
 diff --git libgiggle-git/giggle-git-revisions.c libgiggle-git/giggle-git-revisions.c
--- libgiggle-git/giggle-git-revisions.c
-+++ libgiggle-git/giggle-git-revisions.c
+--- a/libgiggle-git/giggle-git-revisions.c
+++ b/libgiggle-git/giggle-git-revisions.c
@@ -130,7 +130,7 @@ git_revisions_get_command_line (GiggleJob  *job,
 static struct tm *
 git_revisions_get_time (const gchar *date)
--- a/srcpkgs/giggle/template
+++ b/srcpkgs/giggle/template
@ -14,7 +14,6 @@ homepage="https://wiki.gnome.org/Apps/giggle"
 distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz"
 checksum=ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59
 lib32disabled=yes
-patch_args=-Np0

 CFLAGS="-fcommon"

--- a/srcpkgs/gimp/patches/fix-cross.patch
+++ b/srcpkgs/gimp/patches/fix-cross.patch
@ -1,5 +1,5 @@
--- plug-ins/script-fu/Makefile.am.orig	2018-05-18 00:03:53.095184079 +0200
-+++ plug-ins/script-fu/Makefile.am	2018-05-18 00:04:50.184762769 +0200
+--- a/plug-ins/script-fu/Makefile.am	2018-05-18 00:03:53.095184079 +0200
+++ b/plug-ins/script-fu/Makefile.am	2018-05-18 00:04:50.184762769 +0200
@@ -14,6 +14,7 @@ else
 libm = -lm
 endif
--- a/srcpkgs/gimp/patches/fix-segfault.patch
+++ b/srcpkgs/gimp/patches/fix-segfault.patch
@ -1,7 +1,7 @@
 diff --git app/dialogs/dialogs.c app/dialogs/dialogs.c
 index 064f2c4..b17d82f 100644
--- app/dialogs/dialogs.c
-+++ app/dialogs/dialogs.c
+--- a/app/dialogs/dialogs.c
+++ b/app/dialogs/dialogs.c
@@ -534,11 +534,15 @@ dialogs_init (Gimp            *gimp,
                                      menu_factory);
   gimp_dialog_factory_set_singleton (factory);
@ -31,8 +31,8 @@ index 064f2c4..b17d82f 100644
 }
 diff --git app/widgets/gimpactiongroup.c app/widgets/gimpactiongroup.c
 index 04bd1b6..12eff51 100644
--- app/widgets/gimpactiongroup.c
-+++ app/widgets/gimpactiongroup.c
+--- a/app/widgets/gimpactiongroup.c
+++ b/app/widgets/gimpactiongroup.c
@@ -393,7 +393,7 @@ gimp_action_group_add_actions (GimpActionGroup       *group,
   for (i = 0; i < n_entries; i++)
     {
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@ -23,7 +23,6 @@ checksum=bd1bb762368c0dd3175cf05006812dd676949c3707e21f4e6857435cb435989e
 python_version=2
 lib32disabled=yes
 no_generic_pkgconfig_link=yes
-patch_args=-Np0

 pre_configure() {
 	NOCONFIGURE=1 autoreconf -fi
--- a/srcpkgs/git-annex/patches/ghc8.8.3.patch
+++ b/srcpkgs/git-annex/patches/ghc8.8.3.patch
@ -1,5 +1,5 @@
--- git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
-+++ git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
+--- a/git-annex.cabal	2020-04-01 21:09:23.653315424 +0200
+++ b/git-annex.cabal	2020-04-01 20:50:23.080838029 +0200
@@ -304,6 +304,7 @@
   Build-Depends:
    base (>= 4.11.1.0 && < 5.0),
--- a/srcpkgs/git-annex/template
+++ b/srcpkgs/git-annex/template
@ -15,7 +15,6 @@ distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-
 checksum=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d
 nopie_files="/usr/bin/git-annex"
 nocross=yes
-patch_args=-Np0

 # These install steps are pulled from the install target in the
 # git-annex Makefile. The target can't be called directly because it is
--- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch
+++ b/srcpkgs/git-mediate/patches/ghc8.8.3.patch
@ -1,5 +1,5 @@
--- git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
-+++ git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
+--- a/git-mediate.cabal	2001-09-09 03:46:40.000000000 +0200
+++ b/git-mediate.cabal	2020-03-30 15:32:48.959537620 +0200
@@ -72,7 +72,7 @@
   ghc-options:         -O2 -Wall
   -- other-extensions:
--- a/srcpkgs/git-mediate/template
+++ b/srcpkgs/git-mediate/template
@ -13,4 +13,3 @@ distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-
 checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d
 nocross=yes
 nopie_files="/usr/bin/git-mediate"
-patch_args=-Np0
--- a/srcpkgs/gitea/patches/config.patch
+++ b/srcpkgs/gitea/patches/config.patch
@ -1,5 +1,5 @@
--- custom/conf/app.example.ini	2021-04-22 15:48:34.959214467 +0300
-+++ custom/conf/app.example.ini	2021-04-22 15:48:25.414266118 +0300
+--- a/custom/conf/app.example.ini	2021-04-22 15:48:34.959214467 +0300
+++ b/custom/conf/app.example.ini	2021-04-22 15:48:25.414266118 +0300
@@ -9,7 +9,7 @@
 ; App name that shows in every page title
 APP_NAME = Gitea: Git with a cup of tea
--- a/srcpkgs/gitea/template
+++ b/srcpkgs/gitea/template
@ -33,7 +33,6 @@ homepage="https://gitea.io"
 changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md"
 distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"
 checksum=d04bca934feba35600aaf739c82b7cbe7d8b911a086d7ac54f0710b689a85ac3
-patch_args=-Np0

 system_accounts="_gitea"
 _gitea_homedir="/var/lib/gitea"
--- a/srcpkgs/gitg/patches/vala.patch
+++ b/srcpkgs/gitg/patches/vala.patch
@ -1,5 +1,5 @@
--- libgitg/gitg-diff-view-file-selectable.vala	2019-07-25 13:13:01.000000000 +0200
-+++ libgitg/gitg-diff-view-file-selectable.vala	2020-09-06 14:36:26.374965220 +0200
+--- a/libgitg/gitg-diff-view-file-selectable.vala	2019-07-25 13:13:01.000000000 +0200
+++ b/libgitg/gitg-diff-view-file-selectable.vala	2020-09-06 14:36:26.374965220 +0200
@@ -54,7 +54,7 @@
 
 		buffer.get_start_iter(out iter);
--- a/srcpkgs/gitg/patches/vapi.patch
+++ b/srcpkgs/gitg/patches/vapi.patch
@ -21,7 +21,7 @@ Subject: [PATCH] vala: Remove obsolete vapi files
 diff --git a/vapi/gio-windows-2.0.vapi b/vapi/gio-windows-2.0.vapi
 deleted file mode 100644
 index 39c9da28..00000000
--- vapi/gio-windows-2.0.vapi
+--- a/vapi/gio-windows-2.0.vapi
 +++ /dev/null
@@ -1,21 +0,0 @@
 -[CCode (cprefix = "G", lower_case_cprefix = "g_")]
@ -48,7 +48,7 @@ index 39c9da28..00000000
 diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
 deleted file mode 100644
 index 37de9592..00000000
--- vapi/glib-2.0.vapi
+--- a/vapi/glib-2.0.vapi
 +++ /dev/null
@@ -1,6173 +0,0 @@
 -/* glib-2.0.vala
@ -6227,7 +6227,7 @@ index 37de9592..00000000
 diff --git a/vapi/gtksourceview-3.0.deps b/vapi/gtksourceview-3.0.deps
 deleted file mode 100644
 index 1306ac49..00000000
--- vapi/gtksourceview-3.0.deps
+--- a/vapi/gtksourceview-3.0.deps
 +++ /dev/null
@@ -1,7 +0,0 @@
 -atk
@ -6240,7 +6240,7 @@ index 1306ac49..00000000
 diff --git a/vapi/gtksourceview-3.0.vapi b/vapi/gtksourceview-3.0.vapi
 deleted file mode 100644
 index f1b8f66e..00000000
--- vapi/gtksourceview-3.0.vapi
+--- a/vapi/gtksourceview-3.0.vapi
 +++ /dev/null
@@ -1,937 +0,0 @@
 -/* gtksourceview-3.0.vapi generated by vapigen-0.28, do not modify. */
@ -7183,14 +7183,14 @@ index f1b8f66e..00000000
 diff --git a/vapi/libsoup-2.4.deps b/vapi/libsoup-2.4.deps
 deleted file mode 100644
 index cd10dfde..00000000
--- vapi/libsoup-2.4.deps
+--- a/vapi/libsoup-2.4.deps
 +++ /dev/null
@@ -1 +0,0 @@
 -gio-2.0
 diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi
 deleted file mode 100644
 index bcbe7d00..00000000
--- vapi/libsoup-2.4.vapi
+--- a/vapi/libsoup-2.4.vapi
 +++ /dev/null
@@ -1,1396 +0,0 @@
 -/* libsoup-2.4.vapi generated by vapigen, do not modify. */
--- a/srcpkgs/gitg/template
+++ b/srcpkgs/gitg/template
@ -15,7 +15,6 @@ license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Gitg"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a
-patch_args=-Np0

 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static"
--- a/srcpkgs/gkrellm/patches/libressl.patch
+++ b/srcpkgs/gkrellm/patches/libressl.patch
@ -1,7 +1,7 @@
 diff --git src/mail.c src/mail.c
 index 6615f31..205b56f 100644
--- src/mail.c
-+++ src/mail.c
+--- a/src/mail.c
+++ b/src/mail.c
 -#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L)
 +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
 static void
--- a/srcpkgs/gkrellm/template
+++ b/srcpkgs/gkrellm/template
@ -11,7 +11,6 @@ license="GPL-3.0.or-later"
 homepage="http://gkrellm.srcbox.net"
 distfiles="${homepage}/releases/gkrellm-${version}.tar.bz2"
 checksum=1ee0643ed9ed99f88c1504c89d9ccb20780cf29319c904b68e80a8e7c8678c06
-patch_args=-Np0

 do_install() {
 	make PREFIX=/usr DESTDIR=${DESTDIR} STRIP= install
--- a/srcpkgs/glances/patches/no-check-update.patch
+++ b/srcpkgs/glances/patches/no-check-update.patch
@ -1,5 +1,5 @@
--- glances/main.py
-+++ glances/main.py
+--- a/glances/main.py
+++ b/glances/main.py
@@ -109,6 +109,7 @@
         """Manage the command line arguments."""
         # Read the command line arguments
--- a/srcpkgs/glances/template
+++ b/srcpkgs/glances/template
@ -12,7 +12,6 @@ license="LGPL-3.0-or-later"
 homepage="https://github.com/nicolargo/glances"
 distfiles="https://github.com/nicolargo/glances/archive/v${version}.tar.gz"
 checksum=5839a110af35af35b7a1d30c15e59c59359480c2eaec852d30480c96b8cf8d76
-patch_args=-Np0

 post_install() {
 	vsconf conf/glances.conf
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@ -1,7 +1,7 @@
 diff --git gio/tests/meson.build gio/tests/meson.build
 index a926ae01a..c2093cf4e 100644
--- gio/tests/meson.build
-+++ gio/tests/meson.build
+--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -50,7 +50,6 @@ gio_tests = {
   'cancellable' : {},
   'contexts' : {},
@ -29,8 +29,8 @@ index a926ae01a..c2093cf4e 100644
     input : 'test4.gresource.xml',
 diff --git glib/tests/meson.build glib/tests/meson.build
 index c77ccdd14..b0dab692a 100644
--- glib/tests/meson.build
-+++ glib/tests/meson.build
+--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
@@ -11,21 +11,13 @@ glib_tests = {
   'cache' : {},
   'charset' : {},
--- a/srcpkgs/glib/patches/gobject_init_on_demand.patch
+++ b/srcpkgs/glib/patches/gobject_init_on_demand.patch
@ -2,8 +2,8 @@ Initialize the gobject system on demand, i.e. before it is
 expected to be initialized. Do this only once by checking
 a local static variable gobject_initialized.

--- gobject/gtype.c	2016-08-17 17:20:47.000000000 +0200
-+++ gobject/gtype.c	2016-09-01 21:56:31.777406646 +0200
+--- a/gobject/gtype.c	2016-08-17 17:20:47.000000000 +0200
+++ b/gobject/gtype.c	2016-09-01 21:56:31.777406646 +0200
@@ -209,6 +209,9 @@
 static gboolean				type_node_is_a_L		(TypeNode		*node,
 									 TypeNode		*iface_node);
--- a/srcpkgs/glib/patches/quark_init_on_demand.patch
+++ b/srcpkgs/glib/patches/quark_init_on_demand.patch
@ -2,8 +2,8 @@ musl does not run ctors in the assumed order that glib-2.46 expects.
 Call g_quark_init() where it is expected to have been called.


--- glib/gquark.c	2016-08-17 17:20:47.000000000 +0200
-+++ glib/gquark.c	2016-08-30 07:49:13.298234757 +0200
+--- a/glib/gquark.c	2016-08-17 17:20:47.000000000 +0200
+++ b/glib/gquark.c	2016-08-30 07:49:13.298234757 +0200
@@ -57,6 +57,9 @@
 void
 g_quark_init (void)
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@ -17,7 +17,6 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb
-patch_args=-Np0

 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
--- a/srcpkgs/gloox/patches/gloox-musl.patch
+++ b/srcpkgs/gloox/patches/gloox-musl.patch
@ -1,5 +1,5 @@
--- src/connectiontcpserver.cpp.orig	2017-02-21 13:32:58.000000000 +0100
-+++ src/connectiontcpserver.cpp	2018-01-03 08:38:57.121764510 +0100
+--- a/src/connectiontcpserver.cpp	2017-02-21 13:32:58.000000000 +0100
+++ b/src/connectiontcpserver.cpp	2018-01-03 08:38:57.121764510 +0100
@@ -51,7 +51,7 @@
 #endif
 
--- a/srcpkgs/gloox/template
+++ b/srcpkgs/gloox/template
@ -11,7 +11,6 @@ license="GPL-3.0-or-later"
 homepage="https://camaya.net/gloox"
 distfiles="https://camaya.net/download/gloox-${version}.tar.bz2"
 checksum=4ade1b14848ccfcd89a505a4fff05116c24f13cef8d02fab0ade2717117ec964
-patch_args=-Np0

 gloox-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
--- a/srcpkgs/gltron/patches/gltron-0.70-configure.patch
+++ b/srcpkgs/gltron/patches/gltron-0.70-configure.patch
@ -1,7 +1,7 @@
 configure.in is written poorly so it just stomps all over CFLAGS

--- configure
-+++ configure
+--- a/configure
+++ b/configure
@@ -2805,7 +2805,7 @@
   RANLIB="$ac_cv_prog_RANLIB"
 fi
--- a/srcpkgs/gltron/patches/gltron-0.70-debian.patch
+++ b/srcpkgs/gltron/patches/gltron-0.70-debian.patch
@ -1,7 +1,7 @@
 Ripped from Debian patchset 6

--- src/include/game/game_data.h
-+++ src/include/game/game_data.h
+--- a/src/include/game/game_data.h
+++ b/src/include/game/game_data.h
@@ -71,7 +71,7 @@
 typedef struct AI {
   int active;
@ -11,8 +11,8 @@ Ripped from Debian patchset 6
 	segment2 left, right, front, backleft;
 } AI;
 
--- src/include/video/fonttex.h
-+++ src/include/video/fonttex.h
+--- a/src/include/video/fonttex.h
+++ b/src/include/video/fonttex.h
@@ -10,7 +10,7 @@
   int lower; /* lowest ascii character (normally: 32) */
   int upper; /* highest ascii character (normally: 126) */
@ -22,8 +22,8 @@ Ripped from Debian patchset 6
 
   char *fontname;
   char *bitmapname;
--- src/video/trail.c
-+++ src/video/trail.c
+--- a/src/video/trail.c
+++ b/src/video/trail.c
@@ -19,7 +19,7 @@
   n[1] = s->vStart.v[1] - s->vDirection.v[0];
   tmp[0] = eye[0] - s->vStart.v[0];
--- a/srcpkgs/gltron/patches/gltron-0.70-prototypes.patch
+++ b/srcpkgs/gltron/patches/gltron-0.70-prototypes.patch
@ -1,7 +1,7 @@
 scripting.h declares these params as const so make sure they're the same.

--- nebu/scripting/scripting.c
-+++ nebu/scripting/scripting.c
+--- a/nebu/scripting/scripting.c
+++ b/nebu/scripting/scripting.c
@@ -169,16 +169,16 @@
   return status;
 }    
--- a/srcpkgs/gltron/patches/stdint.patch
+++ b/srcpkgs/gltron/patches/stdint.patch
@ -1,5 +1,5 @@
--- lua/src/lib/liolib.c	2003-06-30 21:15:26.000000000 +0200
-+++ lua/src/lib/liolib.c.new	2020-02-04 23:08:47.840943907 +0100
+--- a/lua/src/lib/liolib.c	2003-06-30 21:15:26.000000000 +0200
+++ b/lua/src/lib/liolib.c.new	2020-02-04 23:08:47.840943907 +0100
@@ -6,6 +6,7 @@
 */
 
--- a/srcpkgs/gltron/template
+++ b/srcpkgs/gltron/template
@ -12,4 +12,3 @@ license="GPL-2.0-only"
 homepage="http://gltron.org/"
 distfiles="${SOURCEFORGE_SITE}/gltron/gltron-${version}-source.tar.gz"
 checksum="e0c8ebb41a18a1f8d7302a9c2cb466f5b1dd63e9a9966c769075e6b6bdad8bb0"
-patch_args=-Np0
--- a/srcpkgs/glusterfs/patches/patch-xlators_cloudsync_ssl.patch
+++ b/srcpkgs/glusterfs/patches/patch-xlators_cloudsync_ssl.patch
@ -1,5 +1,5 @@
--- xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c.orig	2019-04-01 11:59:35.934987018 -0400
-+++ xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c	2019-04-01 12:01:04.701774641 -0400
+--- a/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c	2019-04-01 11:59:35.934987018 -0400
+++ b/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c	2019-04-01 12:01:04.701774641 -0400
@@ -300,7 +300,7 @@
 char *
 aws_sign_request(char *const str, char *awssekey)
--- a/srcpkgs/glusterfs/template
+++ b/srcpkgs/glusterfs/template
@ -18,7 +18,6 @@ license="GPL-2.0-or-later, LGPL-3.0-only"
 homepage="https://www.gluster.org/"
 distfiles="https://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz"
 checksum=6f29ae4ab2c270ade0cd14a3f733d7d33fda78e79e81b148cd50711f65069d87
-patch_args=-Np0

 case "$XBPS_TARGET_MACHINE" in
 	*-musl) broken="not yet supported";;
--- a/srcpkgs/glyr/patches/fix-cflags.patch
+++ b/srcpkgs/glyr/patches/fix-cflags.patch
@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 ===================================================================
--- CMakeLists.txt.orig
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ exec_program(
 IF(CMAKE_BUILD_TYPE STREQUAL "debug")
     SET(GLYR_DEBUG TRUE)
--- a/srcpkgs/glyr/patches/musl-execinfo.patch
+++ b/srcpkgs/glyr/patches/musl-execinfo.patch
@ -1,5 +1,5 @@
--- src/glyrc/glyrc.c.original
-+++ src/glyrc/glyrc.c
+--- a/src/glyrc/glyrc.c.original
+++ b/src/glyrc/glyrc.c
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
--- a/srcpkgs/glyr/template
+++ b/srcpkgs/glyr/template
@ -11,7 +11,6 @@ license="LGPL-3.0-or-later"
 homepage="https://github.com/sahib/glyr"
 distfiles="https://github.com/sahib/glyr/archive/${version}.tar.gz"
 checksum=77e8da60221c8d27612e4a36482069f26f8ed74a1b2768ebc373c8144ca806e8
-patch_args=-Np0

 glyr-devel_package() {
 	depends="glyr>=${version}_${revision}"
--- a/srcpkgs/gmrun/patches/00_gcc43_fix.patch
+++ b/srcpkgs/gmrun/patches/00_gcc43_fix.patch
@ -1,5 +1,5 @@
--- src/gtkcompletionline.cc.orig	2003-11-16 11:55:07.000000000 +0100
-+++ src/gtkcompletionline.cc	2008-05-08 08:51:22.000000000 +0200
+--- a/src/gtkcompletionline.cc	2003-11-16 11:55:07.000000000 +0100
+++ b/src/gtkcompletionline.cc	2008-05-08 08:51:22.000000000 +0200
@@ -29,6 +29,7 @@
 #include <set>
 #include <sstream>
@ -8,8 +8,8 @@
 #include <vector>
 using namespace std;
 
--- src/ci_string.h.orig	2001-05-16 16:39:31.000000000 +0200
-+++ src/ci_string.h	2008-05-08 08:51:33.000000000 +0200
+--- a/src/ci_string.h	2001-05-16 16:39:31.000000000 +0200
+++ b/src/ci_string.h	2008-05-08 08:51:33.000000000 +0200
@@ -7,6 +7,7 @@
 #define __CI_STRING_H__
 
@ -18,8 +18,8 @@
 #include <ctype.h>
 
 struct ci_char_traits : public std::char_traits<char>
--- src/prefs.cc.orig	2002-08-16 12:48:22.000000000 +0200
-+++ src/prefs.cc	2008-05-08 08:51:54.000000000 +0200
+--- a/src/prefs.cc	2002-08-16 12:48:22.000000000 +0200
+++ b/src/prefs.cc	2008-05-08 08:51:54.000000000 +0200
@@ -13,6 +13,7 @@
 #include <fstream>
 #include <iostream>
@ -28,8 +28,8 @@
 
 #include <list>
 
--- src/main.cc.orig	2003-11-16 11:55:07.000000000 +0100
-+++ src/main.cc	2008-05-08 09:03:11.000000000 +0200
+--- a/src/main.cc	2003-11-16 11:55:07.000000000 +0100
+++ b/src/main.cc	2008-05-08 09:03:11.000000000 +0200
@@ -14,6 +14,7 @@
 #include <gdk/gdkkeysyms.h>
 
@ -39,8 +39,8 @@
 #include <sstream>
 #include <vector>

--- src/gtkcompletionline.cc.orig	2009-06-19 22:38:14.000000000 +0400
-+++ src/gtkcompletionline.cc	2009-06-19 22:37:14.000000000 +0400
+--- a/src/gtkcompletionline.cc	2009-06-19 22:38:14.000000000 +0400
+++ b/src/gtkcompletionline.cc	2009-06-19 22:37:14.000000000 +0400
@@ -376,7 +377,7 @@
   return 0;
 }
--- a/srcpkgs/gmrun/patches/6a0ea012a7f51fdc5639bedabe446c9035461cda.diff
+++ b/srcpkgs/gmrun/patches/6a0ea012a7f51fdc5639bedabe446c9035461cda.diff
@ -14,8 +14,8 @@ https://launchpadlibrarian.net/295253441/gmrun-tdp-patch.diff

 diff --git src/gtkcompletionline.cc src/gtkcompletionline.cc
 index c21f7e3..5211a87 100644
--- src/gtkcompletionline.cc
-+++ src/gtkcompletionline.cc
+--- a/src/gtkcompletionline.cc
+++ b/src/gtkcompletionline.cc
@@ -77,22 +77,26 @@ static gboolean
 on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data);
 
@ -64,8 +64,8 @@ index c21f7e3..5211a87 100644
 static void
 diff --git src/gtkcompletionline.h src/gtkcompletionline.h
 index 5e14cd7..0d7f2dc 100644
--- src/gtkcompletionline.h
-+++ src/gtkcompletionline.h
+--- a/src/gtkcompletionline.h
+++ b/src/gtkcompletionline.h
@@ -76,7 +76,7 @@ extern "C++" {
     void (* cancel)(GtkCompletionLine *cl);
   };
--- a/srcpkgs/gmrun/template
+++ b/srcpkgs/gmrun/template
@ -11,7 +11,6 @@ license="GPL-2.0-or-later"
 homepage="http://sf.net/projects/gmrun"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=17297bce53249ccc7145931db22251b47f77ac355f78cf8abf1e87ae16341fa0
-patch_args=-Np0

 post_install() {
 	vlicense COPYING
--- a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch
+++ b/srcpkgs/gnome-authenticator/patches/fix-zbar.patch
@ -1,7 +1,7 @@
 diff --git meson.build meson.build
 index 8eed8f8..a1e38ab 100644
--- meson.build
-+++ meson.build
+--- a/meson.build
+++ b/meson.build
@@ -24,7 +24,7 @@ dependency('gobject-2.0')
 dependency('gobject-introspection-1.0')
 dependency('gtk+-3.0', version: '>=3.16')
--- a/srcpkgs/gnome-authenticator/template
+++ b/srcpkgs/gnome-authenticator/template
@ -15,7 +15,6 @@ license="GPL-3.0-or-later"
 homepage="https://gitlab.gnome.org/World/Authenticator"
 distfiles="${homepage}/-/archive/${version}/Authenticator-${version}.tar.gz"
 checksum="d7250fbef1de2dcb599a55ff3d40dcc6ed5618fe89d50ec795281d8ba3123d5b"
-patch_args=-Np0

 post_patch() {
 	find src/Authenticator/widgets -type f -exec \
--- a/srcpkgs/gnome-desktop/patches/build.patch
+++ b/srcpkgs/gnome-desktop/patches/build.patch
@ -6,8 +6,8 @@ Date:   Wed Aug 12 05:26:00 2020 +0200

 diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h
 index 111bab3..7698672 100644
--- libgnome-desktop/gnome-rr.h
-+++ libgnome-desktop/gnome-rr.h
+--- a/libgnome-desktop/gnome-rr.h
+++ b/libgnome-desktop/gnome-rr.h
@@ -28,6 +28,7 @@
 #error    GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h
 #endif
--- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
+++ b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch
@ -1,7 +1,7 @@
 diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build
 index c365b44..33af6f4 100644
--- libgnome-desktop/meson.build
-+++ libgnome-desktop/meson.build
+--- a/libgnome-desktop/meson.build
+++ b/libgnome-desktop/meson.build
@@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency(
   link_with: libgnome_desktop
 )
@ -35,8 +35,8 @@ index c365b44..33af6f4 100644
   libraries: libgnome_desktop,
 diff --git a/meson_options.txt b/meson_options.txt
 index e3402a1..1dbaf5d 100644
--- meson_options.txt
-+++ meson_options.txt
+--- a/meson_options.txt
+++ b/meson_options.txt
@@ -28,3 +28,7 @@ option('gtk_doc',
 option('installed_tests',
   type: 'boolean', value: false, description: 'Enable installed tests'
--- a/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch
+++ b/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch
@ -1,7 +1,7 @@
 diff --git libgnome-desktop/gnome-desktop-thumbnail-script.c libgnome-desktop/gnome-desktop-thumbnail-script.c
 index cfbbad0..efad40b 100644
--- libgnome-desktop/gnome-desktop-thumbnail-script.c
-+++ libgnome-desktop/gnome-desktop-thumbnail-script.c
+--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
@@ -532,7 +532,7 @@ add_bwrap (GPtrArray   *array,
   add_args (array,
 	    "bwrap",
--- a/Show more
+++ b/Show more