From 635e9da391995fe80fb8cd5783363a62a52a54c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 19 Jun 2021 10:03:21 +0700
Subject: [PATCH] srcpkgs/q*: convert patches to -Np1

* par is kept at -Np0

```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
	for p in ${template%/template}/patches/*; do
		sed -i '
			\,^[+-][+-][+-] /dev/null,b
			/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
			s,^[*][*][*] ,&a/,
			/^--- /{
				s,\(^--- \)\(./\)*,\1a/,
				s,[.-][Oo][Rr][Ii][Gg]\([	/]\),\1,
				s/[.-][Oo][Rr][Ii][Gg]$//
				s/[.]patched[.]\([^.]\)/.\1/
				h
			}
			/^+++ -/{
				g
				s/^--- a/+++ b/
				b
			}
			s,\(^+++ \)\(./\)*,\1b/,
		' "$p"
	done
	sed -i '/^patch_args=/d' $template
done
```
---
 srcpkgs/qca-qt5/patches/cmake.patch           |  4 +-
 srcpkgs/qca-qt5/patches/libressl.patch        |  4 +-
 srcpkgs/qca-qt5/template                      |  1 -
 .../qdirstat/patches/fix-allperms-musl.patch  |  4 +-
 srcpkgs/qdirstat/template                     |  1 -
 srcpkgs/qingy/patches/fix-musl.patch          |  8 +-
 srcpkgs/qingy/template                        |  1 -
 srcpkgs/qmltermwidget/patches/iswspace.patch  |  4 +-
 srcpkgs/qmltermwidget/template                |  1 -
 srcpkgs/qmmp/patches/default-pulseaudio.patch |  4 +-
 .../qmmp/patches/projectM-config_inp.patch    |  8 +-
 srcpkgs/qmmp/template                         |  1 -
 srcpkgs/qomui/patches/remove-geoip-dep.patch  |  4 +-
 srcpkgs/qomui/template                        |  1 -
 srcpkgs/qpdfview/patches/qt5-5.15.0.patch     |  4 +-
 srcpkgs/qpdfview/template                     |  1 -
 .../patches/configure.py-objdir-support.patch |  4 +-
 srcpkgs/qscintilla-qt5/template               |  1 -
 srcpkgs/qsstv/patches/hamlib42.patch          |  4 +-
 srcpkgs/qsstv/template                        |  1 -
 srcpkgs/qt5-fsarchiver/patches/cross.patch    |  4 +-
 .../patches/fix-install-target.patch          |  4 +-
 srcpkgs/qt5-fsarchiver/patches/musl.patch     |  4 +-
 srcpkgs/qt5-fsarchiver/template               |  1 -
 srcpkgs/qt5-styleplugins/patches/qt5.15.patch |  8 +-
 srcpkgs/qt5-styleplugins/template             |  1 -
 srcpkgs/qt5-webkit/patches/armv6.patch        | 12 +--
 srcpkgs/qt5-webkit/patches/bison3.7.patch     |  4 +-
 srcpkgs/qt5-webkit/patches/jsc-musl.patch     |  4 +-
 srcpkgs/qt5-webkit/patches/mips-isa-32.patch  |  4 +-
 srcpkgs/qt5-webkit/patches/mips-isa-rev.patch |  4 +-
 .../qt5-webkit/patches/musl-mcontext.patch    |  4 +-
 srcpkgs/qt5-webkit/patches/musl-ppc.patch     |  4 +-
 srcpkgs/qt5-webkit/patches/ppc-llint.patch    |  4 +-
 .../qt5-webkit/patches/qt-musl-execinfo.patch |  4 +-
 .../qt5-webkit/patches/reduce-exports.patch   |  8 +-
 srcpkgs/qt5-webkit/template                   |  1 -
 srcpkgs/qt5/patches/0001-addlr.patch          |  4 +-
 srcpkgs/qt5/patches/0002-gl-lib-dir.patch     |  4 +-
 .../qt5/patches/0007-musl-iconv-no-bom.patch  |  4 +-
 .../0014-musl-set_thread_name_np.patch        |  4 +-
 .../qt5/patches/0016-musl-stackbottom.patch   |  4 +-
 srcpkgs/qt5/patches/0018-musl-timeval.patch   |  4 +-
 .../0048-big-endian-qtquick-software.patch    |  4 +-
 .../qt5/patches/0049-big-endian-scroll.patch  |  4 +-
 srcpkgs/qt5/patches/0050-qmake-mkspecs.patch  |  8 +-
 srcpkgs/qt5/template                          |  1 -
 .../qt5pas/patches/01-inlines-hidden.patch    |  4 +-
 srcpkgs/qt5pas/patches/02-lazarus-2.0.0.patch | 88 +++++++++----------
 srcpkgs/qt5pas/template                       |  1 -
 srcpkgs/qt6-base/patches/libatomic.patch      |  4 +-
 srcpkgs/qt6-base/patches/musl-limits.patch    |  8 +-
 srcpkgs/qt6-base/template                     |  1 -
 srcpkgs/qtav/patches/qt5-5.15.0.patch         |  8 +-
 srcpkgs/qtav/template                         |  1 -
 .../patches/musl-no-malloc_trim.patch         |  4 +-
 srcpkgs/qtcreator/template                    |  1 -
 .../qtcurve/patches/gtkprops_constexpr.patch  |  4 +-
 srcpkgs/qtcurve/patches/qt5-5.15.0.patch      |  4 +-
 srcpkgs/qtcurve/template                      |  1 -
 srcpkgs/qtfm/patches/QPainterPath.patch       |  8 +-
 srcpkgs/qtfm/template                         |  1 -
 srcpkgs/qtikz/patches/fix-version.patch       |  4 +-
 srcpkgs/qtikz/template                        |  1 -
 .../patches/use-kwallet-dbus-def.patch        |  4 +-
 srcpkgs/qtkeychain-qt5/template               |  1 -
 srcpkgs/qtpass/patches/qmake-qt5.13.patch     |  4 +-
 srcpkgs/qtpass/template                       |  1 -
 srcpkgs/quassel/patches/qt5-14.patch          |  4 +-
 srcpkgs/quassel/template                      |  1 -
 srcpkgs/quickjs/patches/atomic.patch          |  4 +-
 srcpkgs/quickjs/template                      |  1 -
 srcpkgs/quota/patches/reallocarray.patch      |  8 +-
 srcpkgs/quota/template                        |  1 -
 .../patches/musl-temp-failure-retry.patch     |  4 +-
 srcpkgs/qv4l2/patches/musl.patch              |  8 +-
 srcpkgs/qv4l2/patches/time64.patch            |  4 +-
 srcpkgs/qv4l2/template                        |  1 -
 78 files changed, 170 insertions(+), 196 deletions(-)

diff --git a/srcpkgs/qca-qt5/patches/cmake.patch b/srcpkgs/qca-qt5/patches/cmake.patch
index 6e9e5c9c5e5..ad3351ce3e1 100644
--- a/srcpkgs/qca-qt5/patches/cmake.patch
+++ b/srcpkgs/qca-qt5/patches/cmake.patch
@@ -1,5 +1,5 @@
---- CMakeLists.txt	2019-04-24 14:58:14.000000000 +0200
-+++ -	2019-12-12 23:58:20.783902817 +0100
+--- a/CMakeLists.txt	2019-04-24 14:58:14.000000000 +0200
++++ b/CMakeLists.txt	2019-04-24 14:58:14.000000000 +0200
 @@ -264,7 +264,8 @@
                 QCA_LIBRARY_INSTALL_DIR
                 QCA_FEATURE_INSTALL_DIR
diff --git a/srcpkgs/qca-qt5/patches/libressl.patch b/srcpkgs/qca-qt5/patches/libressl.patch
index 5cdea3f1934..4efefc39953 100644
--- a/srcpkgs/qca-qt5/patches/libressl.patch
+++ b/srcpkgs/qca-qt5/patches/libressl.patch
@@ -1,5 +1,5 @@
---- plugins/qca-ossl/qca-ossl.cpp.bak	2020-08-13 20:47:26.316272036 +0200
-+++ plugins/qca-ossl/qca-ossl.cpp	2020-08-13 21:14:09.838349311 +0200
+--- a/plugins/qca-ossl/qca-ossl.cpp.bak	2020-08-13 20:47:26.316272036 +0200
++++ b/plugins/qca-ossl/qca-ossl.cpp	2020-08-13 21:14:09.838349311 +0200
 @@ -41,7 +41,13 @@
  #include <openssl/pkcs12.h>
  #include <openssl/ssl.h>
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index a9effca5f71..9e1cd59b839 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -15,7 +15,6 @@ license="LGPL-2.1-or-later"
 homepage="https://userbase.kde.org/QCA"
 distfiles="${KDE_SITE}/qca/${version}/qca-${version}.tar.xz"
 checksum=c13851109abefc4623370989fae3a745bf6b1acb3c2a13a8958539823e974e4b
-patch_args=-Np0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"
diff --git a/srcpkgs/qdirstat/patches/fix-allperms-musl.patch b/srcpkgs/qdirstat/patches/fix-allperms-musl.patch
index 7719b4b380f..f1f23ee0995 100644
--- a/srcpkgs/qdirstat/patches/fix-allperms-musl.patch
+++ b/srcpkgs/qdirstat/patches/fix-allperms-musl.patch
@@ -2,8 +2,8 @@ ALLPERMS isn't specified in POSIX so musl doesn't define it
 
 diff --git a/src/FileInfo.cpp b/src/FileInfo.cpp
 index 5cc198c..197d40c 100644
---- src/FileInfo.cpp
-+++ src/FileInfo.cpp
+--- a/src/FileInfo.cpp
++++ b/src/FileInfo.cpp
 @@ -24,6 +24,10 @@
  #include "Logger.h"
  #include "Exception.h"
diff --git a/srcpkgs/qdirstat/template b/srcpkgs/qdirstat/template
index 05e775e52c3..efed1890b40 100644
--- a/srcpkgs/qdirstat/template
+++ b/srcpkgs/qdirstat/template
@@ -11,7 +11,6 @@ license="GPL-2.0-only"
 homepage="https://github.com/shundhammer/qdirstat"
 distfiles="https://github.com/shundhammer/qdirstat/archive/${version}.tar.gz"
 checksum=fb40181972092d80994d3d04802c43298b70a21f1e636d5490a2bfbd1cb407d9
-patch_args=-Np0
 
 post_install() {
 	vman man/qdirstat.1
diff --git a/srcpkgs/qingy/patches/fix-musl.patch b/srcpkgs/qingy/patches/fix-musl.patch
index 47d1a02b8d5..7d285912a00 100644
--- a/srcpkgs/qingy/patches/fix-musl.patch
+++ b/srcpkgs/qingy/patches/fix-musl.patch
@@ -1,5 +1,5 @@
---- ./src/libraries/misc.h.orig	2016-03-31 23:28:06.023869695 +0200
-+++ ./src/libraries/misc.h	2016-03-31 23:28:12.069869242 +0200
+--- a/src/libraries/misc.h	2016-03-31 23:28:06.023869695 +0200
++++ b/src/libraries/misc.h	2016-03-31 23:28:12.069869242 +0200
 @@ -30,6 +30,7 @@
  #endif
  
@@ -8,8 +8,8 @@
  
  /* Computes the integer part of the base 10 log */
  int int_log10(int n);
---- src/libraries/vt.c.orig	2016-03-31 23:33:35.641845025 +0200
-+++ src/libraries/vt.c	2016-03-31 23:33:49.739843970 +0200
+--- a/src/libraries/vt.c	2016-03-31 23:33:35.641845025 +0200
++++ b/src/libraries/vt.c	2016-03-31 23:33:49.739843970 +0200
 @@ -101,9 +101,9 @@ int switch_to_tty(int tty)
    
    if (!ttyname) return 0;
diff --git a/srcpkgs/qingy/template b/srcpkgs/qingy/template
index 207775603de..02c89bd1cca 100644
--- a/srcpkgs/qingy/template
+++ b/srcpkgs/qingy/template
@@ -15,7 +15,6 @@ homepage="http://qingy.sourceforge.net"
 #distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 distfiles="https://sources.voidlinux.org/qingy-1.0.0/qingy-1.0.0.tar.bz2"
 checksum=de4b4b398d5ba81ab2544729864676a04ddc6ae818b357ee09a8770293740cd3
-patch_args=-Np0
 
 make_dirs="/var/lib/misc 0755 root root"
 
diff --git a/srcpkgs/qmltermwidget/patches/iswspace.patch b/srcpkgs/qmltermwidget/patches/iswspace.patch
index 89695c53b52..ad7e717a5b2 100644
--- a/srcpkgs/qmltermwidget/patches/iswspace.patch
+++ b/srcpkgs/qmltermwidget/patches/iswspace.patch
@@ -1,7 +1,7 @@
 Index: lib/TerminalCharacterDecoder.cpp
 ===================================================================
---- lib/TerminalCharacterDecoder.cpp.orig
-+++ lib/TerminalCharacterDecoder.cpp
+--- a/lib/TerminalCharacterDecoder.cpp
++++ b/lib/TerminalCharacterDecoder.cpp
 @@ -22,6 +22,8 @@
  // Own
  #include "TerminalCharacterDecoder.h"
diff --git a/srcpkgs/qmltermwidget/template b/srcpkgs/qmltermwidget/template
index a770f2f1fd2..8a5b2fa230e 100644
--- a/srcpkgs/qmltermwidget/template
+++ b/srcpkgs/qmltermwidget/template
@@ -11,4 +11,3 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/Swordfish90/qmltermwidget"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=23e19eedb59d6fe3e37ecc06872f54befd94384946926e009c42c4b39914cfe2
-patch_args=-Np0
diff --git a/srcpkgs/qmmp/patches/default-pulseaudio.patch b/srcpkgs/qmmp/patches/default-pulseaudio.patch
index bdf4793702e..4ff1da96269 100644
--- a/srcpkgs/qmmp/patches/default-pulseaudio.patch
+++ b/srcpkgs/qmmp/patches/default-pulseaudio.patch
@@ -1,5 +1,5 @@
---- src/qmmp/output.cpp	2016-10-04 11:49:39.000000000 +0200
-+++ src/qmmp/output.cpp	2016-10-11 12:07:30.574173779 +0200
+--- a/src/qmmp/output.cpp	2016-10-04 11:49:39.000000000 +0200
++++ b/src/qmmp/output.cpp	2016-10-11 12:07:30.574173779 +0200
 @@ -14,6 +14,9 @@
  #include "qmmpplugincache_p.h"
  #include "output.h"
diff --git a/srcpkgs/qmmp/patches/projectM-config_inp.patch b/srcpkgs/qmmp/patches/projectM-config_inp.patch
index aa8c1b46c46..f2bc53dba57 100644
--- a/srcpkgs/qmmp/patches/projectM-config_inp.patch
+++ b/srcpkgs/qmmp/patches/projectM-config_inp.patch
@@ -1,5 +1,5 @@
---- src/plugins/Visual/projectm/projectm.pro	2021-02-04 20:09:45.000000000 +0100
-+++ src/plugins/Visual/projectm/projectm.pro	2021-02-12 15:19:03.951750274 +0100
+--- a/src/plugins/Visual/projectm/projectm.pro	2021-02-04 20:09:45.000000000 +0100
++++ b/src/plugins/Visual/projectm/projectm.pro	2021-02-12 15:19:03.951750274 +0100
 @@ -22,6 +22,7 @@
      LIBS += -L/usr/lib -I/usr/include
      #projectM config path
@@ -9,8 +9,8 @@
      for(path, PROJECTM_CONFIG_FILES) {
           exists($$path) {
 diff -rub a/src/plugins/Visual/projectm/projectmwidget.cpp b/src/plugins/Visual/projectm/projectmwidget.cpp
---- src/plugins/Visual/projectm/projectmwidget.cpp	2021-02-04 20:09:45.000000000 +0100
-+++ src/plugins/Visual/projectm/projectmwidget.cpp	2021-02-12 15:22:26.833419341 +0100
+--- a/src/plugins/Visual/projectm/projectmwidget.cpp	2021-02-04 20:09:45.000000000 +0100
++++ b/src/plugins/Visual/projectm/projectmwidget.cpp	2021-02-12 15:22:26.833419341 +0100
 @@ -34,7 +34,7 @@
  #include "projectmwidget.h"
  
diff --git a/srcpkgs/qmmp/template b/srcpkgs/qmmp/template
index c27e8e39090..d8b8ec1d0d7 100644
--- a/srcpkgs/qmmp/template
+++ b/srcpkgs/qmmp/template
@@ -21,7 +21,6 @@ license="GPL-3.0-or-later"
 homepage="http://qmmp.ylsoftware.com"
 distfiles="http://qmmp.ylsoftware.com/files/${pkgname}-${version}.tar.bz2"
 checksum=f513774357836ad4983fa216c84cf5db634284faebec48c461733838917fd664
-patch_args=-Np0
 
 qmmp-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qomui/patches/remove-geoip-dep.patch b/srcpkgs/qomui/patches/remove-geoip-dep.patch
index 662ba3f9ff6..fe7f26203ec 100644
--- a/srcpkgs/qomui/patches/remove-geoip-dep.patch
+++ b/srcpkgs/qomui/patches/remove-geoip-dep.patch
@@ -1,5 +1,5 @@
---- qomui/update.py
-+++ qomui/update.py
+--- a/qomui/update.py
++++ b/qomui/update.py
 @@ -991,9 +991,7 @@
  
                  if ip != 0:
diff --git a/srcpkgs/qomui/template b/srcpkgs/qomui/template
index 73235d778f8..b74138381be 100644
--- a/srcpkgs/qomui/template
+++ b/srcpkgs/qomui/template
@@ -15,4 +15,3 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/corrad1nho/qomui"
 distfiles="https://github.com/corrad1nho/qomui/archive/v${version}.tar.gz"
 checksum=78187864a4368fed06f6e58c4d411053a1d1193d625ee79be0a57bf0938b1d0b
-patch_args=-Np0
diff --git a/srcpkgs/qpdfview/patches/qt5-5.15.0.patch b/srcpkgs/qpdfview/patches/qt5-5.15.0.patch
index f4249f23337..969de8982cc 100644
--- a/srcpkgs/qpdfview/patches/qt5-5.15.0.patch
+++ b/srcpkgs/qpdfview/patches/qt5-5.15.0.patch
@@ -1,5 +1,5 @@
---- sources/model.h	2019-07-24 21:18:33.000000000 +0200
-+++ sources/model.h	2020-07-28 17:11:17.441765416 +0200
+--- a/sources/model.h	2019-07-24 21:18:33.000000000 +0200
++++ b/sources/model.h	2020-07-28 17:11:17.441765416 +0200
 @@ -27,6 +27,7 @@
  #include <QtPlugin>
  #include <QWidget>
diff --git a/srcpkgs/qpdfview/template b/srcpkgs/qpdfview/template
index 4aa5122a193..19cb2bb34ad 100644
--- a/srcpkgs/qpdfview/template
+++ b/srcpkgs/qpdfview/template
@@ -14,7 +14,6 @@ license="GPL-2.0-or-later"
 homepage="https://launchpad.net/qpdfview"
 distfiles="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"
 checksum=cc642e7fa74029373ca9b9fbc29adc4883f8b455130a78ad54746d6844a0396c
-patch_args=-Np0
 
 pre_configure() {
 	lrelease qpdfview.pro
diff --git a/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch b/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
index bca4b87dc88..774e4eb5a86 100644
--- a/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
+++ b/srcpkgs/qscintilla-qt5/patches/configure.py-objdir-support.patch
@@ -5,8 +5,8 @@ patch the configure script for the Python bindings to support object dir
 builds
 Index: Python/configure.py
 ===================================================================
---- Python/configure.py	2014-07-05 10:02:02.318834374 -0400
-+++ Python/configure.py	2014-07-05 10:02:02.306834375 -0400
+--- a/Python/configure.py	2014-07-05 10:02:02.318834374 -0400
++++ b/Python/configure.py	2014-07-05 10:02:02.306834375 -0400
 @@ -31,6 +31,8 @@
  import optparse
  import sys
diff --git a/srcpkgs/qscintilla-qt5/template b/srcpkgs/qscintilla-qt5/template
index 1d68d8f7032..5bc6c853075 100644
--- a/srcpkgs/qscintilla-qt5/template
+++ b/srcpkgs/qscintilla-qt5/template
@@ -13,7 +13,6 @@ license="GPL-3.0-only"
 homepage="https://www.riverbankcomputing.com/software/qscintilla/intro"
 distfiles="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz"
 checksum=029bdc476a069fda2cea3cd937ba19cc7fa614fb90578caef98ed703b658f4a1
-patch_args=-Np0
 
 qscintilla-qt5-devel_package() {
 	short_desc+=" - development files"
diff --git a/srcpkgs/qsstv/patches/hamlib42.patch b/srcpkgs/qsstv/patches/hamlib42.patch
index a4608969575..f12b1414ade 100644
--- a/srcpkgs/qsstv/patches/hamlib42.patch
+++ b/srcpkgs/qsstv/patches/hamlib42.patch
@@ -1,7 +1,7 @@
 Index: rig/rigcontrol.cpp
 ===================================================================
---- rig/rigcontrol.cpp
-+++ rig/rigcontrol.cpp
+--- a/rig/rigcontrol.cpp
++++ b/rig/rigcontrol.cpp
 @@ -34,6 +34,10 @@
  
  #define MAXCONFLEN 128
diff --git a/srcpkgs/qsstv/template b/srcpkgs/qsstv/template
index 8230401d919..73c1080fcad 100644
--- a/srcpkgs/qsstv/template
+++ b/srcpkgs/qsstv/template
@@ -14,7 +14,6 @@ homepage="http://users.telenet.be/on4qz/qsstv/"
 changelog="http://users.telenet.be/on4qz/qsstv/manual/changelog.html"
 distfiles="http://users.telenet.be/on4qz/qsstv/downloads/qsstv_${version}.tar.gz"
 checksum=177e286090c71f8a033646b39c3b6abe212cc06718c1ecc9ddc7024198cb7e40
-patch_args=-Np0
 
 post_install() {
 	vinstall icons/qsstv.png 644 usr/share/pixmaps
diff --git a/srcpkgs/qt5-fsarchiver/patches/cross.patch b/srcpkgs/qt5-fsarchiver/patches/cross.patch
index 074c4a6c940..77179e11ee1 100644
--- a/srcpkgs/qt5-fsarchiver/patches/cross.patch
+++ b/srcpkgs/qt5-fsarchiver/patches/cross.patch
@@ -1,5 +1,5 @@
---- qt5-fsarchiver.pro.orig	2018-06-22 00:01:06.101404975 +0200
-+++ qt5-fsarchiver.pro	2018-06-22 00:01:45.933869386 +0200
+--- a/qt5-fsarchiver.pro	2018-06-22 00:01:06.101404975 +0200
++++ b/qt5-fsarchiver.pro	2018-06-22 00:01:45.933869386 +0200
 @@ -9,7 +9,7 @@
  QT += widgets gui core
  
diff --git a/srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch b/srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch
index 64115795cbb..f4a80d00046 100644
--- a/srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch
+++ b/srcpkgs/qt5-fsarchiver/patches/fix-install-target.patch
@@ -1,5 +1,5 @@
---- qt5-fsarchiver.pro.orig	2018-06-21 23:15:21.665117797 +0200
-+++ qt5-fsarchiver.pro	2018-06-21 23:15:36.159276907 +0200
+--- a/qt5-fsarchiver.pro	2018-06-21 23:15:21.665117797 +0200
++++ b/qt5-fsarchiver.pro	2018-06-21 23:15:36.159276907 +0200
 @@ -147,7 +147,7 @@
             src/writebuf.c
  RESOURCES += src/icon.qrc
diff --git a/srcpkgs/qt5-fsarchiver/patches/musl.patch b/srcpkgs/qt5-fsarchiver/patches/musl.patch
index 19728cff1c7..0740c57949c 100644
--- a/srcpkgs/qt5-fsarchiver/patches/musl.patch
+++ b/srcpkgs/qt5-fsarchiver/patches/musl.patch
@@ -1,5 +1,5 @@
---- src/common.c.orig	2018-06-21 23:29:12.238999543 +0200
-+++ src/common.c	2018-06-21 23:30:28.347795214 +0200
+--- a/src/common.c	2018-06-21 23:29:12.238999543 +0200
++++ b/src/common.c	2018-06-21 23:30:28.347795214 +0200
 @@ -34,7 +34,7 @@
  #include <time.h>
  #include <limits.h>
diff --git a/srcpkgs/qt5-fsarchiver/template b/srcpkgs/qt5-fsarchiver/template
index 4eea7d4c7ec..46c87a9e7bd 100644
--- a/srcpkgs/qt5-fsarchiver/template
+++ b/srcpkgs/qt5-fsarchiver/template
@@ -15,7 +15,6 @@ license="GPL-2.0-only"
 homepage="https://sourceforge.net/projects/qt4-fsarchiver"
 distfiles="${SOURCEFORGE_SITE}/qt4-fsarchiver/${pkgname}-${_realversion}.tar.gz"
 checksum=b32e02c9e1fc8038482752f5620d88b103b700ed29314bd55dcf6486f5c6f175
-patch_args=-Np0
 
 CFLAGS="-fcommon"
 
diff --git a/srcpkgs/qt5-styleplugins/patches/qt5.15.patch b/srcpkgs/qt5-styleplugins/patches/qt5.15.patch
index 9f8f382de5a..f753bd2c820 100644
--- a/srcpkgs/qt5-styleplugins/patches/qt5.15.patch
+++ b/srcpkgs/qt5-styleplugins/patches/qt5.15.patch
@@ -1,5 +1,5 @@
---- src/plugins/styles/gtk2/qgtkstyle_p.cpp	2017-03-11 10:23:02.000000000 +0100
-+++ -	2020-06-13 19:46:47.729544729 +0200
+--- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp	2017-03-11 10:23:02.000000000 +0100
++++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp	2017-03-11 10:23:02.000000000 +0100
 @@ -508,7 +508,6 @@
        if (oldTheme != QGtkStylePrivate::getThemeName()) {
            oldTheme = QGtkStylePrivate::getThemeName();
@@ -8,8 +8,8 @@
            QApplication::setPalette(newPalette);
            if (!QGtkStylePrivate::instances.isEmpty()) {
                QGtkStylePrivate::instances.last()->initGtkWidgets();
---- src/plugins/styles/gtk2/qgtkstyle.cpp	2020-06-13 19:48:41.746108796 +0200
-+++ -	2020-06-13 19:48:47.476009571 +0200
+--- a/src/plugins/styles/gtk2/qgtkstyle.cpp	2020-06-13 19:48:41.746108796 +0200
++++ b/src/plugins/styles/gtk2/qgtkstyle.cpp	2020-06-13 19:48:41.746108796 +0200
 @@ -440,7 +440,7 @@
      // not supported as these should be entirely determined by
      // current Gtk settings
diff --git a/srcpkgs/qt5-styleplugins/template b/srcpkgs/qt5-styleplugins/template
index 33c7271cd77..4399c87d86c 100644
--- a/srcpkgs/qt5-styleplugins/template
+++ b/srcpkgs/qt5-styleplugins/template
@@ -14,7 +14,6 @@ license="LGPL-2.1-only, LGPL-3.0-only"
 homepage="https://github.com/qt/qtstyleplugins"
 distfiles="https://github.com/qt/qtstyleplugins/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=29ec24fa8df64be161ad06d0e5af3ba1a20bfe265004f5fe4ab9f5f3abf9a5ba
-patch_args=-Np0
 
 # Cross builds fail with -fuse-ld=gold
 LDFLAGS="-Wl,-fuse-ld=bfd"
diff --git a/srcpkgs/qt5-webkit/patches/armv6.patch b/srcpkgs/qt5-webkit/patches/armv6.patch
index e60ac2a1c9a..d2911d6d717 100644
--- a/srcpkgs/qt5-webkit/patches/armv6.patch
+++ b/srcpkgs/qt5-webkit/patches/armv6.patch
@@ -23,8 +23,8 @@ Reviewed by NOBODY (OOPS!).
 
 diff --git Source/JavaScriptCore/llint/LowLevelInterpreter.asm Source/JavaScriptCore/llint/LowLevelInterpreter.asm
 index ab3c0c8e771..6c32eef8852 100644
---- Source/JavaScriptCore/llint/LowLevelInterpreter.asm
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
 @@ -1167,7 +1167,13 @@ macro setEntryAddress(index, label)
          move index, t4
          storep t1, [a0, t4, 8]
@@ -42,8 +42,8 @@ index ab3c0c8e771..6c32eef8852 100644
          storep t4, [a0, t3, 4]
 diff --git Source/JavaScriptCore/offlineasm/arm.rb Source/JavaScriptCore/offlineasm/arm.rb
 index c8064a59196..a9c40c8995c 100644
---- Source/JavaScriptCore/offlineasm/arm.rb
-+++ Source/JavaScriptCore/offlineasm/arm.rb
+--- a/Source/JavaScriptCore/offlineasm/arm.rb
++++ b/Source/JavaScriptCore/offlineasm/arm.rb
 @@ -504,6 +504,8 @@ class Instruction
          when "mvlbl"
                  $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
@@ -55,8 +55,8 @@ index c8064a59196..a9c40c8995c 100644
          when "bieq", "bpeq", "bbeq"
 diff --git Source/JavaScriptCore/offlineasm/instructions.rb Source/JavaScriptCore/offlineasm/instructions.rb
 index bbfce7193b3..8cc1cb961ce 100644
---- Source/JavaScriptCore/offlineasm/instructions.rb
-+++ Source/JavaScriptCore/offlineasm/instructions.rb
+--- a/Source/JavaScriptCore/offlineasm/instructions.rb
++++ b/Source/JavaScriptCore/offlineasm/instructions.rb
 @@ -261,7 +261,8 @@ X86_INSTRUCTIONS =
  ARM_INSTRUCTIONS =
      [
diff --git a/srcpkgs/qt5-webkit/patches/bison3.7.patch b/srcpkgs/qt5-webkit/patches/bison3.7.patch
index b7c3711bcdf..57855f12e50 100644
--- a/srcpkgs/qt5-webkit/patches/bison3.7.patch
+++ b/srcpkgs/qt5-webkit/patches/bison3.7.patch
@@ -1,5 +1,5 @@
---- Source/WebCore/css/makegrammar.pl	2020-04-14 00:51:51.000000000 +0200
-+++ Source/WebCore/css/makegrammar.pl	2020-10-25 14:59:39.879927464 +0100
+--- a/Source/WebCore/css/makegrammar.pl	2020-04-14 00:51:51.000000000 +0200
++++ b/Source/WebCore/css/makegrammar.pl	2020-10-25 14:59:39.879927464 +0100
 @@ -73,7 +73,6 @@
  }
  
diff --git a/srcpkgs/qt5-webkit/patches/jsc-musl.patch b/srcpkgs/qt5-webkit/patches/jsc-musl.patch
index b8b77523196..0165f21dc25 100644
--- a/srcpkgs/qt5-webkit/patches/jsc-musl.patch
+++ b/srcpkgs/qt5-webkit/patches/jsc-musl.patch
@@ -1,5 +1,5 @@
---- Source/JavaScriptCore/runtime/Options.h	2020-04-14 00:51:51.000000000 +0200
-+++ -	2020-07-11 18:53:50.372744315 +0200
+--- a/Source/JavaScriptCore/runtime/Options.h	2020-04-14 00:51:51.000000000 +0200
++++ b/Source/JavaScriptCore/runtime/Options.h	2020-04-14 00:51:51.000000000 +0200
 @@ -40,6 +40,16 @@
  
  namespace JSC {
diff --git a/srcpkgs/qt5-webkit/patches/mips-isa-32.patch b/srcpkgs/qt5-webkit/patches/mips-isa-32.patch
index cfa3b72296c..4e823f4e3c0 100644
--- a/srcpkgs/qt5-webkit/patches/mips-isa-32.patch
+++ b/srcpkgs/qt5-webkit/patches/mips-isa-32.patch
@@ -1,5 +1,5 @@
---- Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h	2019-08-15 20:56:14.000000000 +0200
-+++ Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h	2020-03-04 10:43:29.468482593 +0100
+--- a/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h	2019-08-15 20:56:14.000000000 +0200
++++ b/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h	2020-03-04 10:43:29.468482593 +0100
 @@ -315,11 +315,7 @@
  
      void countLeadingZeros32(RegisterID src, RegisterID dest)
diff --git a/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch b/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch
index 78d03b9d3e4..b696ae4c53e 100644
--- a/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch
+++ b/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch
@@ -1,5 +1,5 @@
---- Source/WTF/wtf/Platform.h	2020-04-14 00:51:51.000000000 +0200
-+++ Source/WTF/wtf/Platform.h	2020-08-02 15:08:02.169747050 +0200
+--- a/Source/WTF/wtf/Platform.h	2020-04-14 00:51:51.000000000 +0200
++++ b/Source/WTF/wtf/Platform.h	2020-08-02 15:08:02.169747050 +0200
 @@ -95,7 +95,12 @@
  #define WTF_MIPS_PIC (defined __PIC__)
  #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v)
diff --git a/srcpkgs/qt5-webkit/patches/musl-mcontext.patch b/srcpkgs/qt5-webkit/patches/musl-mcontext.patch
index c15587f1991..32ae39b2668 100644
--- a/srcpkgs/qt5-webkit/patches/musl-mcontext.patch
+++ b/srcpkgs/qt5-webkit/patches/musl-mcontext.patch
@@ -1,5 +1,5 @@
---- Source/JavaScriptCore/heap/MachineStackMarker.cppg	2019-01-12 19:48:12.801137040 +0100
-+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp	2019-01-12 20:09:03.662201571 +0100
+--- a/Source/JavaScriptCore/heap/MachineStackMarker.cppg	2019-01-12 19:48:12.801137040 +0100
++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp	2019-01-12 20:09:03.662201571 +0100
 @@ -681,7 +681,19 @@
  #endif
  
diff --git a/srcpkgs/qt5-webkit/patches/musl-ppc.patch b/srcpkgs/qt5-webkit/patches/musl-ppc.patch
index 21d3017397e..cb3b961b939 100644
--- a/srcpkgs/qt5-webkit/patches/musl-ppc.patch
+++ b/srcpkgs/qt5-webkit/patches/musl-ppc.patch
@@ -1,5 +1,5 @@
---- Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
+--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
 @@ -87,7 +87,11 @@ static void pthreadSignalHandlerSuspendResume(int, siginfo_t*, void* ucontext)
  
      ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
diff --git a/srcpkgs/qt5-webkit/patches/ppc-llint.patch b/srcpkgs/qt5-webkit/patches/ppc-llint.patch
index 2fc5a46e523..96440d2e2e3 100644
--- a/srcpkgs/qt5-webkit/patches/ppc-llint.patch
+++ b/srcpkgs/qt5-webkit/patches/ppc-llint.patch
@@ -3,8 +3,8 @@ This fixes JavaScriptCore on big endian systems (mainly ppc).
 Without the patch, attempting to run any JS results in
 a crash as the generated code was endian specific.
 
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
 @@ -1500,13 +1500,13 @@ _llint_op_put_by_id:
      loadp StructureChain::m_vector[t3], t3
      assert(macro (ok) btpnz t3, ok end)
diff --git a/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch b/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch
index d3adbba9c32..d017b895697 100644
--- a/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch
+++ b/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch
@@ -1,5 +1,5 @@
---- Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp	2018-01-20 16:53:35.000000000 +0100
-+++ Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp	2019-01-12 18:56:04.698975664 +0100
+--- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp	2018-01-20 16:53:35.000000000 +0100
++++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp	2019-01-12 18:56:04.698975664 +0100
 @@ -51,8 +51,10 @@
  #include <cxxabi.h>
  #if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
diff --git a/srcpkgs/qt5-webkit/patches/reduce-exports.patch b/srcpkgs/qt5-webkit/patches/reduce-exports.patch
index 7addb0f7c16..f5c2a5d82d4 100644
--- a/srcpkgs/qt5-webkit/patches/reduce-exports.patch
+++ b/srcpkgs/qt5-webkit/patches/reduce-exports.patch
@@ -3,8 +3,8 @@ Author: Dmitry Shachnev <mitya57@debian.org>
 Forwarded: not-needed
 Last-Update: 2017-08-27
 
---- Source/WTF/wtf/ExportMacros.h
-+++ Source/WTF/wtf/ExportMacros.h
+--- a/Source/WTF/wtf/ExportMacros.h
++++ b/Source/WTF/wtf/ExportMacros.h
 @@ -56,7 +56,7 @@
  
  #elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
@@ -14,8 +14,8 @@ Last-Update: 2017-08-27
  #define WTF_IMPORT_DECLARATION WTF_EXPORT_DECLARATION
  #define WTF_HIDDEN_DECLARATION __attribute__((visibility("hidden")))
  
---- Source/cmake/OptionsQt.cmake
-+++ Source/cmake/OptionsQt.cmake
+--- a/Source/cmake/OptionsQt.cmake
++++ b/Source/cmake/OptionsQt.cmake
 @@ -658,6 +658,7 @@ if (COMPILER_IS_GCC_OR_CLANG AND UNIX)
      if (NOT SHARED_CORE)
          set(CMAKE_C_FLAGS "-fvisibility=hidden ${CMAKE_C_FLAGS}")
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 353a7e6609b..b2e7813cc45 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -25,7 +25,6 @@ license="LGPL-2.1-or-later"
 homepage="https://www.qt.io/"
 distfiles="https://download.qt.io/snapshots/ci/qtwebkit/${_v}/${_snap}/src/submodules/qtwebkit-opensource-src-${_v}.tar.xz"
 checksum=9a6ed083154c7ec850081102b299afa928ca7e48bbdf2b5f3ae152425e46eb17
-patch_args=-Np0
 
 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include"
 CXXFLAGS="-fpermissive -Wno-class-memaccess -Wno-redundant-move -Wno-deprecated-copy"
diff --git a/srcpkgs/qt5/patches/0001-addlr.patch b/srcpkgs/qt5/patches/0001-addlr.patch
index 1d2b4651bc4..5b27ae82760 100644
--- a/srcpkgs/qt5/patches/0001-addlr.patch
+++ b/srcpkgs/qt5/patches/0001-addlr.patch
@@ -6,8 +6,8 @@ On GLIBC this seems to only happen with programs that load qt5-webengine(?)
 ---
 diff --git qtbasesrc/corelib/global/qlibraryinfo.cpp qtbasesrc/corelib/global/qlibraryinfo.cpp
 index 8bcf67e73d..28d7355310 100644
---- qtbase/src/corelib/global/qlibraryinfo.cpp
-+++ qtbase/src/corelib/global/qlibraryinfo.cpp
+--- a/qtbase/src/corelib/global/qlibraryinfo.cpp
++++ b/qtbase/src/corelib/global/qlibraryinfo.cpp
 @@ -558,6 +558,12 @@ static QString getRelocatablePrefix()
      int result = dladdr(reinterpret_cast<void *>(&QLibraryInfo::isDebugBuild), &info);
      if (result > 0 && info.dli_fname)
diff --git a/srcpkgs/qt5/patches/0002-gl-lib-dir.patch b/srcpkgs/qt5/patches/0002-gl-lib-dir.patch
index d74d4e97d1d..c8e17b9b5b5 100644
--- a/srcpkgs/qt5/patches/0002-gl-lib-dir.patch
+++ b/srcpkgs/qt5/patches/0002-gl-lib-dir.patch
@@ -1,5 +1,5 @@
---- ./qtbase/src/gui/Qt5GuiConfigExtras.cmake.in	2020-09-19 13:27:22.130997854 +0200
-+++ -	2020-09-19 13:36:44.503955926 +0200
+--- a/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in	2020-09-19 13:27:22.130997854 +0200
++++ b/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in	2020-09-19 13:27:22.130997854 +0200
 @@ -106,12 +106,6 @@
                  set(Qt5Gui_${_cmake_lib_name}_LIBRARY ${_lib})
              else()
diff --git a/srcpkgs/qt5/patches/0007-musl-iconv-no-bom.patch b/srcpkgs/qt5/patches/0007-musl-iconv-no-bom.patch
index 8bf35ec1ec8..c520edd4ff7 100644
--- a/srcpkgs/qt5/patches/0007-musl-iconv-no-bom.patch
+++ b/srcpkgs/qt5/patches/0007-musl-iconv-no-bom.patch
@@ -1,5 +1,5 @@
---- qtbase/src/corelib/codecs/qiconvcodec.cpp	2017-01-18 15:20:58.000000000 +0100
-+++ qtbase/src/corelib/codecs/qiconvcodec.cpp	2017-02-21 14:33:32.423808603 +0100
+--- a/qtbase/src/corelib/codecs/qiconvcodec.cpp	2017-01-18 15:20:58.000000000 +0100
++++ b/qtbase/src/corelib/codecs/qiconvcodec.cpp	2017-02-21 14:33:32.423808603 +0100
 @@ -64,7 +64,7 @@
  #elif defined(Q_OS_AIX)
  #  define NO_BOM
diff --git a/srcpkgs/qt5/patches/0014-musl-set_thread_name_np.patch b/srcpkgs/qt5/patches/0014-musl-set_thread_name_np.patch
index d7fa4fd4127..23af3794a0f 100644
--- a/srcpkgs/qt5/patches/0014-musl-set_thread_name_np.patch
+++ b/srcpkgs/qt5/patches/0014-musl-set_thread_name_np.patch
@@ -1,5 +1,5 @@
---- qtlocation/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp	2017-11-14 18:03:52.000000000 +0100
-+++ qtlocation/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp	2018-01-27 19:49:19.691858141 +0100
+--- a/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp	2017-11-14 18:03:52.000000000 +0100
++++ b/qtlocation/src/3rdparty/mapbox-gl-native/platform/default/thread.cpp	2018-01-27 19:49:19.691858141 +0100
 @@ -11,17 +11,21 @@
  
  std::string getCurrentThreadName() {
diff --git a/srcpkgs/qt5/patches/0016-musl-stackbottom.patch b/srcpkgs/qt5/patches/0016-musl-stackbottom.patch
index fdfc19298ae..52e8035d227 100644
--- a/srcpkgs/qt5/patches/0016-musl-stackbottom.patch
+++ b/srcpkgs/qt5/patches/0016-musl-stackbottom.patch
@@ -1,8 +1,8 @@
 For musl libc the stackBottom for the main thread is recalculated
 just as it is for Android. See: https://bugreports.qt.io/browse/QTBUG-44268
 
---- qtdeclarative/src/qml/jsruntime/qv4engine.cpp	2016-02-26 10:34:34.000000000 +0100
-+++ qtdeclarative/src/qml/jsruntime/qv4engine.cpp	2016-04-04 21:52:43.780823136 +0200
+--- a/qtdeclarative/src/qml/jsruntime/qv4engine.cpp	2016-02-26 10:34:34.000000000 +0100
++++ b/qtdeclarative/src/qml/jsruntime/qv4engine.cpp	2016-04-04 21:52:43.780823136 +0200
 @@ -94,6 +94,11 @@
  #include <valgrind/memcheck.h>
  #endif
diff --git a/srcpkgs/qt5/patches/0018-musl-timeval.patch b/srcpkgs/qt5/patches/0018-musl-timeval.patch
index 939fb58b265..225ae725d99 100644
--- a/srcpkgs/qt5/patches/0018-musl-timeval.patch
+++ b/srcpkgs/qt5/patches/0018-musl-timeval.patch
@@ -1,5 +1,5 @@
---- qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h	2017-11-22 09:57:45.000000000 +0100
-+++ qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h	2018-01-27 19:17:31.333759690 +0100
+--- a/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h	2017-11-22 09:57:45.000000000 +0100
++++ b/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h	2018-01-27 19:17:31.333759690 +0100
 @@ -47,6 +47,7 @@
  
  // The order of the following includes is mandatory, because some
diff --git a/srcpkgs/qt5/patches/0048-big-endian-qtquick-software.patch b/srcpkgs/qt5/patches/0048-big-endian-qtquick-software.patch
index 313e9ca5ca3..205c631bf55 100644
--- a/srcpkgs/qt5/patches/0048-big-endian-qtquick-software.patch
+++ b/srcpkgs/qt5/patches/0048-big-endian-qtquick-software.patch
@@ -12,8 +12,8 @@ so the user doesn't have to specify QT_QUICK_BACKEND
 
 diff --git qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp
 index 66add51..a0fdaa2 100644
---- qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp
-+++ qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp
+--- a/qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp
++++ b/qtdeclarative/src/quick/scenegraph/qsgcontextplugin.cpp
 @@ -139,7 +139,10 @@ QSGAdaptationBackendData *contextFactory()
          // If this platform does not support OpenGL, and no backend has been set
          // default to the software renderer
diff --git a/srcpkgs/qt5/patches/0049-big-endian-scroll.patch b/srcpkgs/qt5/patches/0049-big-endian-scroll.patch
index 013fa6a1ab4..0ed4e371420 100644
--- a/srcpkgs/qt5/patches/0049-big-endian-scroll.patch
+++ b/srcpkgs/qt5/patches/0049-big-endian-scroll.patch
@@ -1,5 +1,5 @@
---- qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
-+++ qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+--- a/qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
++++ b/qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
 @@ -43,6 +43,7 @@
  #include "qxcbwindow.h"
  #include "qtouchdevice.h"
diff --git a/srcpkgs/qt5/patches/0050-qmake-mkspecs.patch b/srcpkgs/qt5/patches/0050-qmake-mkspecs.patch
index 86ebb555013..57a92bd0370 100644
--- a/srcpkgs/qt5/patches/0050-qmake-mkspecs.patch
+++ b/srcpkgs/qt5/patches/0050-qmake-mkspecs.patch
@@ -1,7 +1,7 @@
 diff --git qtbase/mkspecs/features/qt_build_config.prf qtbase/mkspecs/features/qt_build_config.prf
 index 8273ba3fe1..b674f42109 100644
---- qtbase/mkspecs/features/qt_build_config.prf
-+++ qtbase/mkspecs/features/qt_build_config.prf
+--- a/qtbase/mkspecs/features/qt_build_config.prf
++++ b/qtbase/mkspecs/features/qt_build_config.prf
 @@ -11,6 +11,10 @@
  
  !contains(QMAKE_INTERNAL_INCLUDED_FILES, .*qmodule\\.pri) {
@@ -15,8 +15,8 @@ index 8273ba3fe1..b674f42109 100644
      } else {
 diff --git qtbase/mkspecs/features/qt_config.prf qtbase/mkspecs/features/qt_config.prf
 index 93c54e3010..aaff26b52a 100644
---- qtbase/mkspecs/features/qt_config.prf
-+++ qtbase/mkspecs/features/qt_config.prf
+--- a/qtbase/mkspecs/features/qt_config.prf
++++ b/qtbase/mkspecs/features/qt_config.prf
 @@ -1,6 +1,10 @@
  # This file is loaded as one of the last things by all qmakespecs.
  
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1e05f7e7ff6..a88df53ca34 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -32,7 +32,6 @@ python_version=2 #unverified
 replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
  qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
 lib32mode=full
-patch_args=-Np0
 
 CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
 # Required for musl libc
diff --git a/srcpkgs/qt5pas/patches/01-inlines-hidden.patch b/srcpkgs/qt5pas/patches/01-inlines-hidden.patch
index 6684ee3718a..1c7b3f59e82 100644
--- a/srcpkgs/qt5pas/patches/01-inlines-hidden.patch
+++ b/srcpkgs/qt5pas/patches/01-inlines-hidden.patch
@@ -3,8 +3,8 @@ the amount of exported symbols that we need to take
 care of in the .symbols file.
 Index: libqtpas/Qt5Pas.pro
 ===================================================================
---- Qt5Pas.pro
-+++ Qt5Pas.pro
+--- a/Qt5Pas.pro
++++ b/Qt5Pas.pro
 @@ -21,7 +21,7 @@ TEMPLATE = lib
  VPATH = src
  MOC_DIR = tmp
diff --git a/srcpkgs/qt5pas/patches/02-lazarus-2.0.0.patch b/srcpkgs/qt5pas/patches/02-lazarus-2.0.0.patch
index 0f8d07c3dcf..df7caae7ac6 100644
--- a/srcpkgs/qt5pas/patches/02-lazarus-2.0.0.patch
+++ b/srcpkgs/qt5pas/patches/02-lazarus-2.0.0.patch
@@ -1,8 +1,8 @@
 Description: new source included in lazarus-1.8~rc2
 Index: Qt5Pas.pro
 ===================================================================
---- Qt5Pas.pro
-+++ Qt5Pas.pro
+--- a/Qt5Pas.pro
++++ b/Qt5Pas.pro
 @@ -121,7 +121,10 @@ HEADERS +=  \
             qsize_c.h \
             qstring_c.h \
@@ -81,8 +81,8 @@ Index: Qt5Pas.pro
             qstackedlayout_hook_c.cpp \
 Index: src/chandles.h
 ===================================================================
---- src/chandles.h
-+++ src/chandles.h
+--- a/src/chandles.h
++++ b/src/chandles.h
 @@ -23,6 +23,8 @@ typedef unsigned int PTRUINT;
  
  typedef struct QAbstractButton__ { PTRINT dummy; } *QAbstractButtonH;
@@ -104,7 +104,7 @@ Index: src/chandles.h
 Index: src/qbackingstore_c.cpp
 ===================================================================
 --- /dev/null
-+++ src/qbackingstore_c.cpp
++++ b/src/qbackingstore_c.cpp
 @@ -0,0 +1,78 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -187,7 +187,7 @@ Index: src/qbackingstore_c.cpp
 Index: src/qbackingstore_c.h
 ===================================================================
 --- /dev/null
-+++ src/qbackingstore_c.h
++++ b/src/qbackingstore_c.h
 @@ -0,0 +1,32 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -224,7 +224,7 @@ Index: src/qbackingstore_c.h
 Index: src/qmargins_c.cpp
 ===================================================================
 --- /dev/null
-+++ src/qmargins_c.cpp
++++ b/src/qmargins_c.cpp
 @@ -0,0 +1,73 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -302,7 +302,7 @@ Index: src/qmargins_c.cpp
 Index: src/qmargins_c.h
 ===================================================================
 --- /dev/null
-+++ src/qmargins_c.h
++++ b/src/qmargins_c.h
 @@ -0,0 +1,31 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -337,8 +337,8 @@ Index: src/qmargins_c.h
 +#endif
 Index: src/qobject_c.cpp
 ===================================================================
---- src/qobject_c.cpp
-+++ src/qobject_c.cpp
+--- a/src/qobject_c.cpp
++++ b/src/qobject_c.cpp
 @@ -177,3 +177,10 @@ void QObject_deleteLater(QObjectH handle
  	((QObject *)handle)->deleteLater();
  }
@@ -352,8 +352,8 @@ Index: src/qobject_c.cpp
 +}
 Index: src/qobject_c.h
 ===================================================================
---- src/qobject_c.h
-+++ src/qobject_c.h
+--- a/src/qobject_c.h
++++ b/src/qobject_c.h
 @@ -47,5 +47,6 @@ C_EXPORT uint QObject_registerUserData()
  C_EXPORT QObjectH QObject_parent(QObjectH handle);
  C_EXPORT bool QObject_inherits(QObjectH handle, const char* classname);
@@ -364,7 +364,7 @@ Index: src/qobject_c.h
 Index: src/qscreen_c.cpp
 ===================================================================
 --- /dev/null
-+++ src/qscreen_c.cpp
++++ b/src/qscreen_c.cpp
 @@ -0,0 +1,178 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -547,7 +547,7 @@ Index: src/qscreen_c.cpp
 Index: src/qscreen_c.h
 ===================================================================
 --- /dev/null
-+++ src/qscreen_c.h
++++ b/src/qscreen_c.h
 @@ -0,0 +1,49 @@
 +//******************************************************************************
 +//  Copyright (c) 2007 by Željan Rikalo
@@ -601,7 +601,7 @@ Index: src/qscreen_c.h
 Index: src/qscreen_hook_c.cpp
 ===================================================================
 --- /dev/null
-+++ src/qscreen_hook_c.cpp
++++ b/src/qscreen_hook_c.cpp
 @@ -0,0 +1,68 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -674,7 +674,7 @@ Index: src/qscreen_hook_c.cpp
 Index: src/qscreen_hook_c.h
 ===================================================================
 --- /dev/null
-+++ src/qscreen_hook_c.h
++++ b/src/qscreen_hook_c.h
 @@ -0,0 +1,30 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -709,7 +709,7 @@ Index: src/qscreen_hook_c.h
 Index: src/qscreen_hook.h
 ===================================================================
 --- /dev/null
-+++ src/qscreen_hook.h
++++ b/src/qscreen_hook.h
 @@ -0,0 +1,190 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -904,7 +904,7 @@ Index: src/qscreen_hook.h
 Index: src/qsurface_c.cpp
 ===================================================================
 --- /dev/null
-+++ src/qsurface_c.cpp
++++ b/src/qsurface_c.cpp
 @@ -0,0 +1,45 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -954,7 +954,7 @@ Index: src/qsurface_c.cpp
 Index: src/qsurface_c.h
 ===================================================================
 --- /dev/null
-+++ src/qsurface_c.h
++++ b/src/qsurface_c.h
 @@ -0,0 +1,25 @@
 +//******************************************************************************
 +//  Copyright (c) 2007 by Željan Rikalo
@@ -984,7 +984,7 @@ Index: src/qsurface_c.h
 Index: src/qsurfaceformat_c.cpp
 ===================================================================
 --- /dev/null
-+++ src/qsurfaceformat_c.cpp
++++ b/src/qsurfaceformat_c.cpp
 @@ -0,0 +1,202 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -1191,7 +1191,7 @@ Index: src/qsurfaceformat_c.cpp
 Index: src/qsurfaceformat_c.h
 ===================================================================
 --- /dev/null
-+++ src/qsurfaceformat_c.h
++++ b/src/qsurfaceformat_c.h
 @@ -0,0 +1,57 @@
 +//******************************************************************************
 +//  Copyright (c) 2007 by Željan Rikalo
@@ -1253,7 +1253,7 @@ Index: src/qsurfaceformat_c.h
 Index: src/qwindow_c.cpp
 ===================================================================
 --- /dev/null
-+++ src/qwindow_c.cpp
++++ b/src/qwindow_c.cpp
 @@ -0,0 +1,548 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -1806,7 +1806,7 @@ Index: src/qwindow_c.cpp
 Index: src/qwindow_c.h
 ===================================================================
 --- /dev/null
-+++ src/qwindow_c.h
++++ b/src/qwindow_c.h
 @@ -0,0 +1,123 @@
 +//******************************************************************************
 +//  Copyright (c) 2007 by Željan Rikalo
@@ -1934,7 +1934,7 @@ Index: src/qwindow_c.h
 Index: src/qwindow_hook_c.cpp
 ===================================================================
 --- /dev/null
-+++ src/qwindow_hook_c.cpp
++++ b/src/qwindow_hook_c.cpp
 @@ -0,0 +1,112 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -2051,7 +2051,7 @@ Index: src/qwindow_hook_c.cpp
 Index: src/qwindow_hook_c.h
 ===================================================================
 --- /dev/null
-+++ src/qwindow_hook_c.h
++++ b/src/qwindow_hook_c.h
 @@ -0,0 +1,38 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -2094,7 +2094,7 @@ Index: src/qwindow_hook_c.h
 Index: src/qwindow_hook.h
 ===================================================================
 --- /dev/null
-+++ src/qwindow_hook.h
++++ b/src/qwindow_hook.h
 @@ -0,0 +1,341 @@
 +//******************************************************************************
 +//  Copyright (c) 2017 by Željan Rikalo
@@ -2439,8 +2439,8 @@ Index: src/qwindow_hook.h
 +#endif
 Index: qt5.pas
 ===================================================================
---- qt5.pas
-+++ qt5.pas
+--- a/qt5.pas
++++ b/qt5.pas
 @@ -78,11 +78,7 @@ type
    QtHandle = LongWord;
    {$ENDIF}
@@ -2456,8 +2456,8 @@ Index: qt5.pas
    QRgb = longword;
 Index: src/qpaintdevice_c.cpp
 ===================================================================
---- src/qpaintdevice_c.cpp
-+++ src/qpaintdevice_c.cpp
+--- a/src/qpaintdevice_c.cpp
++++ b/src/qpaintdevice_c.cpp
 @@ -71,6 +71,12 @@ int QPaintDevice_devicePixelRatio(QPaint
  	return (int) ((QPaintDevice *)handle)->devicePixelRatio();
  }
@@ -2473,8 +2473,8 @@ Index: src/qpaintdevice_c.cpp
  	return (int) ((QPaintDevice *)handle)->colorCount();
 Index: src/qpaintdevice_c.h
 ===================================================================
---- src/qpaintdevice_c.h
-+++ src/qpaintdevice_c.h
+--- a/src/qpaintdevice_c.h
++++ b/src/qpaintdevice_c.h
 @@ -27,6 +27,7 @@ C_EXPORT int QPaintDevice_logicalDpiY(QP
  C_EXPORT int QPaintDevice_physicalDpiX(QPaintDeviceH handle);
  C_EXPORT int QPaintDevice_physicalDpiY(QPaintDeviceH handle);
@@ -2485,8 +2485,8 @@ Index: src/qpaintdevice_c.h
  
 Index: src/qplaintextedit_c.cpp
 ===================================================================
---- src/qplaintextedit_c.cpp
-+++ src/qplaintextedit_c.cpp
+--- a/src/qplaintextedit_c.cpp
++++ b/src/qplaintextedit_c.cpp
 @@ -355,6 +355,21 @@ void QPlainTextEdit_zoomOut(QPlainTextEd
  	((QPlainTextEdit *)handle)->zoomOut(range);
  }
@@ -2511,8 +2511,8 @@ Index: src/qplaintextedit_c.cpp
  	return (QPlainTextDocumentLayoutH) new QPlainTextDocumentLayout((QTextDocument*)document);
 Index: src/qplaintextedit_c.h
 ===================================================================
---- src/qplaintextedit_c.h
-+++ src/qplaintextedit_c.h
+--- a/src/qplaintextedit_c.h
++++ b/src/qplaintextedit_c.h
 @@ -79,6 +79,9 @@ C_EXPORT void QPlainTextEdit_appendHtml(
  C_EXPORT void QPlainTextEdit_centerCursor(QPlainTextEditH handle);
  C_EXPORT void QPlainTextEdit_zoomIn(QPlainTextEditH handle, int range);
@@ -2525,8 +2525,8 @@ Index: src/qplaintextedit_c.h
  C_EXPORT int QPlainTextDocumentLayout_hitTest(QPlainTextDocumentLayoutH handle, const QPointFH AnonParam1, Qt::HitTestAccuracy AnonParam2);
 Index: src/qprinterinfo_c.cpp
 ===================================================================
---- src/qprinterinfo_c.cpp
-+++ src/qprinterinfo_c.cpp
+--- a/src/qprinterinfo_c.cpp
++++ b/src/qprinterinfo_c.cpp
 @@ -83,6 +83,11 @@ void QPrinterInfo_availablePrinters(PPtr
  	copyQListTemplateToPtrIntArrayWithNew(t_retval, retval);
  }
@@ -2541,8 +2541,8 @@ Index: src/qprinterinfo_c.cpp
  	*(QPrinterInfo *)retval = QPrinterInfo::defaultPrinter();
 Index: src/qprinterinfo_c.h
 ===================================================================
---- src/qprinterinfo_c.h
-+++ src/qprinterinfo_c.h
+--- a/src/qprinterinfo_c.h
++++ b/src/qprinterinfo_c.h
 @@ -27,6 +27,7 @@ C_EXPORT bool QPrinterInfo_isNull(QPrint
  C_EXPORT bool QPrinterInfo_isDefault(QPrinterInfoH handle);
  C_EXPORT void QPrinterInfo_supportedPaperSizes(QPrinterInfoH handle, PPtrIntArray retval);
@@ -2553,8 +2553,8 @@ Index: src/qprinterinfo_c.h
  
 Index: src/qtextedit_c.cpp
 ===================================================================
---- src/qtextedit_c.cpp
-+++ src/qtextedit_c.cpp
+--- a/src/qtextedit_c.cpp
++++ b/src/qtextedit_c.cpp
 @@ -472,3 +472,17 @@ void QTextEdit_zoomOut(QTextEditH handle
  	((QTextEdit *)handle)->zoomOut(range);
  }
@@ -2575,8 +2575,8 @@ Index: src/qtextedit_c.cpp
 +
 Index: src/qtextedit_c.h
 ===================================================================
---- src/qtextedit_c.h
-+++ src/qtextedit_c.h
+--- a/src/qtextedit_c.h
++++ b/src/qtextedit_c.h
 @@ -100,5 +100,7 @@ C_EXPORT void QTextEdit_append(QTextEdit
  C_EXPORT void QTextEdit_scrollToAnchor(QTextEditH handle, PWideString name);
  C_EXPORT void QTextEdit_zoomIn(QTextEditH handle, int range);
diff --git a/srcpkgs/qt5pas/template b/srcpkgs/qt5pas/template
index 56747994f4a..93113c71703 100644
--- a/srcpkgs/qt5pas/template
+++ b/srcpkgs/qt5pas/template
@@ -12,7 +12,6 @@ license="LGPL-3.0-or-later"
 homepage="https://svn.freepascal.org/svn/lazarus/trunk/lcl/interfaces/qt5/cbindings"
 distfiles="${DEBIAN_SITE}/main/libq/libqtpas/libqtpas_${version}.orig.tar.xz"
 checksum=fcc5f695d60d5f72bf501b2fa779e8a1a2636c8d991270b5b3fef3d0e990365c
-patch_args=-Np0
 
 post_install() {
 	vinstall qt5.pas 0644 usr/share/pascal/qt5
diff --git a/srcpkgs/qt6-base/patches/libatomic.patch b/srcpkgs/qt6-base/patches/libatomic.patch
index edbe5e609d5..2f7a807518e 100644
--- a/srcpkgs/qt6-base/patches/libatomic.patch
+++ b/srcpkgs/qt6-base/patches/libatomic.patch
@@ -1,7 +1,7 @@
 Index: cmake/FindWrapAtomic.cmake
 ===================================================================
---- cmake/FindWrapAtomic.cmake.orig
-+++ cmake/FindWrapAtomic.cmake
+--- a/cmake/FindWrapAtomic.cmake
++++ b/cmake/FindWrapAtomic.cmake
 @@ -38,7 +38,8 @@ endif()
  
  add_library(WrapAtomic::WrapAtomic INTERFACE IMPORTED)
diff --git a/srcpkgs/qt6-base/patches/musl-limits.patch b/srcpkgs/qt6-base/patches/musl-limits.patch
index 54f96779b31..5a75f4fe38a 100644
--- a/srcpkgs/qt6-base/patches/musl-limits.patch
+++ b/srcpkgs/qt6-base/patches/musl-limits.patch
@@ -1,5 +1,5 @@
---- qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
-+++ -	2020-10-07 22:40:03.905629969 +0200
+--- a/qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
++++ b/qmake/library/ioutils.cpp	2020-09-24 17:55:53.000000000 +0200
 @@ -40,6 +40,7 @@
  #  include <unistd.h>
  #  include <utime.h>
@@ -8,8 +8,8 @@
  #  include <errno.h>
  #endif
  
---- src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
-+++ -	2020-10-07 22:42:32.333434381 +0200
+--- a/src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
++++ b/src/corelib/io/qstorageinfo_unix.cpp	2020-09-24 17:55:53.000000000 +0200
 @@ -58,6 +58,7 @@
  #  include <sys/vfs.h>
  #  include <mntent.h>
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index a78f7793089..bb043213a36 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -30,7 +30,6 @@ homepage="https://www.qt.io"
 distfiles="https://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qtbase-everywhere-src-${version}.tar.xz"
 checksum=21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
 python_version=3
-patch_args=-Np0
 
 if [ "$CROSS_BUILD" ]; then
 	# QtSetup fails native builds if this is set
diff --git a/srcpkgs/qtav/patches/qt5-5.15.0.patch b/srcpkgs/qtav/patches/qt5-5.15.0.patch
index 3ed32b993d9..182a690ef68 100644
--- a/srcpkgs/qtav/patches/qt5-5.15.0.patch
+++ b/srcpkgs/qtav/patches/qt5-5.15.0.patch
@@ -1,5 +1,5 @@
---- src/QtAV/FilterContext.h	2019-07-11 02:58:59.000000000 +0200
-+++ src/QtAV/FilterContext.h	2020-07-25 11:16:49.931296324 +0200
+--- a/src/QtAV/FilterContext.h	2019-07-11 02:58:59.000000000 +0200
++++ b/src/QtAV/FilterContext.h	2020-07-25 11:16:49.931296324 +0200
 @@ -26,6 +26,7 @@
  #include <QtCore/QByteArray>
  #include <QtCore/QRect>
@@ -8,8 +8,8 @@
  /*
   * QPainterFilterContext, D2DFilterContext, ...
   */
---- qml/SGVideoNode.cpp	2019-07-11 02:58:59.000000000 +0200
-+++ qml/SGVideoNode.cpp	2020-07-25 11:20:28.307307590 +0200
+--- a/qml/SGVideoNode.cpp	2019-07-11 02:58:59.000000000 +0200
++++ b/qml/SGVideoNode.cpp	2020-07-25 11:20:28.307307590 +0200
 @@ -25,6 +25,7 @@
  #include "QtAV/VideoFrame.h"
  #include <QtCore/QScopedPointer>
diff --git a/srcpkgs/qtav/template b/srcpkgs/qtav/template
index b59c58a6f19..0d85ec07648 100644
--- a/srcpkgs/qtav/template
+++ b/srcpkgs/qtav/template
@@ -17,7 +17,6 @@ homepage="http://www.qtav.org"
 changelog="https://raw.githubusercontent.com/wang-bin/QtAV/master/Changelog"
 distfiles="https://github.com/wang-bin/QtAV/archive/v${version}.tar.gz"
 checksum=a493d54d105b32c526f05188e4d7a8cf3508ecac697aae088721ffad20982288
-patch_args=-Np0
 
 post_install() {
 	vmkdir usr/bin
diff --git a/srcpkgs/qtcreator/patches/musl-no-malloc_trim.patch b/srcpkgs/qtcreator/patches/musl-no-malloc_trim.patch
index f871c007b76..36c850f3104 100644
--- a/srcpkgs/qtcreator/patches/musl-no-malloc_trim.patch
+++ b/srcpkgs/qtcreator/patches/musl-no-malloc_trim.patch
@@ -1,5 +1,5 @@
---- src/app/main.cpp	2020-08-25 13:26:21.000000000 +0200
-+++ src/app/main.cpp	2020-09-03 14:21:38.975668939 +0200
+--- a/src/app/main.cpp	2020-08-25 13:26:21.000000000 +0200
++++ b/src/app/main.cpp	2020-09-03 14:21:38.975668939 +0200
 @@ -718,8 +718,10 @@
          {
              m_trimTimer.setSingleShot(true);
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 0439190aee4..e4655807058 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -19,7 +19,6 @@ distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${ve
 checksum=5ca9457987e7af0af929c310cc995496388076b6a0b9c429828c60bf0eec1b4d
 replaces="qtcreator-data>=0"
 python_version=3
-patch_args=-Np0
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" libexecinfo-devel"
diff --git a/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch b/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch
index c0e80d1e316..e16ddaaa28c 100644
--- a/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch
+++ b/srcpkgs/qtcurve/patches/gtkprops_constexpr.patch
@@ -13,8 +13,8 @@ BUG: 408286
 
 diff --git a/lib/utils/gtkprops.h b/lib/utils/gtkprops.h
 index abc0675..e248255 100644
---- lib/utils/gtkprops.h
-+++ lib/utils/gtkprops.h
+--- a/lib/utils/gtkprops.h
++++ b/lib/utils/gtkprops.h
 @@ -74,7 +74,7 @@ class GtkWidgetProps {
          };
  #define DEF_WIDGET_SIG_CONN_PROPS(name)                                 \
diff --git a/srcpkgs/qtcurve/patches/qt5-5.15.0.patch b/srcpkgs/qtcurve/patches/qt5-5.15.0.patch
index 23fcf61c046..3077fd54113 100644
--- a/srcpkgs/qtcurve/patches/qt5-5.15.0.patch
+++ b/srcpkgs/qtcurve/patches/qt5-5.15.0.patch
@@ -1,5 +1,5 @@
---- qt5/style/qtcurve.h	2017-06-03 21:16:00.000000000 +0200
-+++ qt5/style/qtcurve.h	2020-07-25 11:06:21.935263927 +0200
+--- a/qt5/style/qtcurve.h	2017-06-03 21:16:00.000000000 +0200
++++ b/qt5/style/qtcurve.h	2020-07-25 11:06:21.935263927 +0200
 @@ -32,6 +32,7 @@
  #include <QColor>
  #include <QFont>
diff --git a/srcpkgs/qtcurve/template b/srcpkgs/qtcurve/template
index 7f98001a6e9..19a4d792d66 100644
--- a/srcpkgs/qtcurve/template
+++ b/srcpkgs/qtcurve/template
@@ -16,4 +16,3 @@ homepage="https://quickgit.kde.org/?p=qtcurve.git"
 distfiles="https://github.com/KDE/qtcurve/archive/${version}.tar.gz"
 checksum=fbfdafdac90d4c540dd55a4accfecfc3a17c1f532c5241e28003348beafaca15
 nocross="tries to execute a helper binary compiled for target on the host"
-patch_args=-Np0
diff --git a/srcpkgs/qtfm/patches/QPainterPath.patch b/srcpkgs/qtfm/patches/QPainterPath.patch
index ac495e8bbf9..c550fe9ebb8 100644
--- a/srcpkgs/qtfm/patches/QPainterPath.patch
+++ b/srcpkgs/qtfm/patches/QPainterPath.patch
@@ -1,5 +1,5 @@
---- libfm/iconlist.h	2019-06-04 07:47:00.000000000 +0200
-+++ libfm/iconlist.h	2020-08-31 18:50:21.401362347 +0200
+--- a/libfm/iconlist.h	2019-06-04 07:47:00.000000000 +0200
++++ b/libfm/iconlist.h	2020-08-31 18:50:21.401362347 +0200
 @@ -9,6 +9,7 @@
  #include <QStyledItemDelegate>
  #include <QModelIndex>
@@ -8,8 +8,8 @@
  
  class IconListDelegate : public QItemDelegate
  {
---- libfm/iconview.h	2019-06-04 07:47:00.000000000 +0200
-+++ libfm/iconview.h	2020-08-31 18:50:30.723362828 +0200
+--- a/libfm/iconview.h	2019-06-04 07:47:00.000000000 +0200
++++ b/libfm/iconview.h	2020-08-31 18:50:30.723362828 +0200
 @@ -11,6 +11,7 @@
  #include <QKeyEvent>
  #include <QModelIndex>
diff --git a/srcpkgs/qtfm/template b/srcpkgs/qtfm/template
index 5013481bb25..f2c8e889e6c 100644
--- a/srcpkgs/qtfm/template
+++ b/srcpkgs/qtfm/template
@@ -14,4 +14,3 @@ homepage="https://github.com/rodlie/qtfm"
 changelog="https://raw.githubusercontent.com/rodlie/qtfm/master/ChangeLog"
 distfiles="https://github.com/rodlie/qtfm/archive/${version}.tar.gz"
 checksum=b9c707443e20644f6e5f0393ce5158843724ac08f92cf8d7ea8e1109957b5c00
-patch_args=-Np0
diff --git a/srcpkgs/qtikz/patches/fix-version.patch b/srcpkgs/qtikz/patches/fix-version.patch
index 281758d23dc..5565fba7bc4 100644
--- a/srcpkgs/qtikz/patches/fix-version.patch
+++ b/srcpkgs/qtikz/patches/fix-version.patch
@@ -1,5 +1,5 @@
---- qtikz.pro
-+++ qtikz.pro
+--- a/qtikz.pro
++++ b/qtikz.pro
 @@ -5,7 +5,7 @@
  ORGNAME = "Florian_Hackenberger"
  APPNAME = qtikz
diff --git a/srcpkgs/qtikz/template b/srcpkgs/qtikz/template
index 53aab78b871..5ec999d3aae 100644
--- a/srcpkgs/qtikz/template
+++ b/srcpkgs/qtikz/template
@@ -13,7 +13,6 @@ license="GPL-2.0-or-later"
 homepage="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/"
 distfiles="https://github.com/fhackenberger/ktikz/archive/${version}.tar.gz"
 checksum=03f6ee335ca1abb23216870a6df71406ab44a4899875d4695b8594cfb789a127
-patch_args=-Np0
 
 post_patch() {
 	vsed -e '/include.*QPainter/a #include <QtGui/QPainterPath>' \
diff --git a/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
index d97fcc7890b..44368a4d891 100644
--- a/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
+++ b/srcpkgs/qtkeychain-qt5/patches/use-kwallet-dbus-def.patch
@@ -2,8 +2,8 @@ Use kwallet interface definition from the kwallet package,
 instead of using the out-of-date provided in qtkeychain package
 see https://github.com/frankosterfeld/qtkeychain/issues/172
 
---- CMakeLists.txt.ORIG	2020-09-08 15:13:16.000000000 +0200
-+++ CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
+--- a/CMakeLists.txt	2020-09-08 15:13:16.000000000 +0200
++++ b/CMakeLists.txt	2020-11-13 13:50:56.648621533 +0100
 @@ -169,7 +169,7 @@
  
      add_definitions(-DKEYCHAIN_DBUS=1)
diff --git a/srcpkgs/qtkeychain-qt5/template b/srcpkgs/qtkeychain-qt5/template
index 8b32a4cb72f..4e4c982850a 100644
--- a/srcpkgs/qtkeychain-qt5/template
+++ b/srcpkgs/qtkeychain-qt5/template
@@ -12,7 +12,6 @@ license="BSD-2-Clause"
 homepage="https://github.com/frankosterfeld/qtkeychain"
 distfiles="https://github.com/frankosterfeld/${pkgname%-*}/archive/v${version}.tar.gz"
 checksum=77fc6841c1743d9e6bd499989481cd9239c21bc9bf0760d41a4f4068d2f0a49d
-patch_args=-Np0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-tools-devel"
diff --git a/srcpkgs/qtpass/patches/qmake-qt5.13.patch b/srcpkgs/qtpass/patches/qmake-qt5.13.patch
index cc20f357b02..46c840e33c6 100644
--- a/srcpkgs/qtpass/patches/qmake-qt5.13.patch
+++ b/srcpkgs/qtpass/patches/qmake-qt5.13.patch
@@ -1,5 +1,5 @@
---- src/src.pro	2018-06-04 11:43:53.000000000 +0200
-+++ -	2019-07-10 02:36:51.536590804 +0200
+--- a/src/src.pro	2018-06-04 11:43:53.000000000 +0200
++++ b/src/src.pro	2018-06-04 11:43:53.000000000 +0200
 @@ -7,6 +7,32 @@
  CONFIG += c++11 staticlib
  CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG_OUTPUT
diff --git a/srcpkgs/qtpass/template b/srcpkgs/qtpass/template
index 728711eeeef..cce56db1986 100644
--- a/srcpkgs/qtpass/template
+++ b/srcpkgs/qtpass/template
@@ -14,7 +14,6 @@ homepage="https://qtpass.org/"
 changelog="https://raw.githubusercontent.com/IJHack/QtPass/master/CHANGELOG.md"
 distfiles="https://github.com/IJHack/${pkgname}/archive/v${version}.tar.gz"
 checksum=7a68e1afe68462c878c212a79c40ade5ba14b72710c5e62450cf54c7b5621254
-patch_args=-Np0
 
 do_install() {
 	vbin main/qtpass
diff --git a/srcpkgs/quassel/patches/qt5-14.patch b/srcpkgs/quassel/patches/qt5-14.patch
index 053ce94d864..31aa2366a9d 100644
--- a/srcpkgs/quassel/patches/qt5-14.patch
+++ b/srcpkgs/quassel/patches/qt5-14.patch
@@ -1,8 +1,8 @@
 # upstream: yes
 # picked from 579e559a6322209df7cd51c34801fecff5fe734b
 
---- src/common/types.h
-+++ src/common/types.h
+--- a/src/common/types.h
++++ b/src/common/types.h
 @@ -140,6 +140,7 @@
  typedef QList<MsgId> MsgIdList;
  typedef QList<BufferId> BufferIdList;
diff --git a/srcpkgs/quassel/template b/srcpkgs/quassel/template
index dae691d2745..47d529f56b8 100644
--- a/srcpkgs/quassel/template
+++ b/srcpkgs/quassel/template
@@ -18,7 +18,6 @@ license="GPL-2.0-only, GPL-3.0-only"
 homepage="https://www.quassel-irc.org"
 distfiles="https://quassel-irc.org/pub/quassel-${version}.tar.bz2"
 checksum=48efee9778743b1db9f44efb91d1c913104db01190c57f2ff57483c39a97e855
-patch_args=-Np0
 
 build_options="ldap"
 
diff --git a/srcpkgs/quickjs/patches/atomic.patch b/srcpkgs/quickjs/patches/atomic.patch
index 2e67bc6719a..c6b658a3c86 100644
--- a/srcpkgs/quickjs/patches/atomic.patch
+++ b/srcpkgs/quickjs/patches/atomic.patch
@@ -1,5 +1,5 @@
---- qjsc.c
-+++ qjsc.c
+--- a/qjsc.c
++++ b/qjsc.c
 @@ -452,6 +452,9 @@ static int output_executable(const char *out_filename, const char *cfilename,
      *arg++ = "-lm";
      *arg++ = "-ldl";
diff --git a/srcpkgs/quickjs/template b/srcpkgs/quickjs/template
index 42de1ba7fd9..a1c9f8d1c36 100644
--- a/srcpkgs/quickjs/template
+++ b/srcpkgs/quickjs/template
@@ -13,7 +13,6 @@ license="MIT"
 homepage="https://bellard.org/quickjs/"
 distfiles="https://bellard.org/quickjs/quickjs-${version//./-}.tar.xz"
 checksum=a45bface4c3379538dea8533878d694e289330488ea7028b105f72572fe7fe1a
-patch_args=-Np0
 
 if [ "$CROSS_BUILD" ]; then
 	make_build_args+=" CROSS_PREFIX=${XBPS_CROSS_TRIPLET}-"
diff --git a/srcpkgs/quota/patches/reallocarray.patch b/srcpkgs/quota/patches/reallocarray.patch
index b269f5ab3b5..db5d71146e0 100644
--- a/srcpkgs/quota/patches/reallocarray.patch
+++ b/srcpkgs/quota/patches/reallocarray.patch
@@ -1,7 +1,7 @@
 Index: configure.ac
 ===================================================================
---- configure.ac.orig
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -38,6 +38,9 @@ AC_C_INLINE
  AC_CHECK_FUNC([nl_langinfo], [
      AC_DEFINE([HAVE_NL_LANGINFO], 1, [Use nl_langinfo for querying locale])
@@ -14,8 +14,8 @@ Index: configure.ac
  # Gettext support
 Index: quota.c
 ===================================================================
---- quota.c.orig
-+++ quota.c
+--- a/quota.c
++++ b/quota.c
 @@ -48,6 +48,10 @@
  #define FL_SHOW_DEVICE 32768
  #define FL_PROJECT 65536
diff --git a/srcpkgs/quota/template b/srcpkgs/quota/template
index 9d103e08c4b..2751287061f 100644
--- a/srcpkgs/quota/template
+++ b/srcpkgs/quota/template
@@ -13,7 +13,6 @@ license="GPL-2"
 homepage="https://sourceforge.net/projects/linuxquota/"
 distfiles="${SOURCEFORGE_SITE}/linuxquota/quota-tools/${pkgname}-${version}.tar.gz"
 checksum=2f3e03039f378d4f0d97acdb49daf581dcaad64d2e1ddf129495fd579fbd268d
-patch_args=-Np0
 
 pre_configure() {
 	autoreconf -fi
diff --git a/srcpkgs/qv4l2/patches/musl-temp-failure-retry.patch b/srcpkgs/qv4l2/patches/musl-temp-failure-retry.patch
index f83075340ff..8296dc76b5f 100644
--- a/srcpkgs/qv4l2/patches/musl-temp-failure-retry.patch
+++ b/srcpkgs/qv4l2/patches/musl-temp-failure-retry.patch
@@ -1,5 +1,5 @@
---- lib/libdvbv5/dvb-dev-local.c
-+++ lib/libdvbv5/dvb-dev-local.c
+--- a/lib/libdvbv5/dvb-dev-local.c
++++ b/lib/libdvbv5/dvb-dev-local.c
 @@ -44,6 +44,16 @@
  # define _(string) string
  #endif
diff --git a/srcpkgs/qv4l2/patches/musl.patch b/srcpkgs/qv4l2/patches/musl.patch
index af02c58a91f..869ca324f29 100644
--- a/srcpkgs/qv4l2/patches/musl.patch
+++ b/srcpkgs/qv4l2/patches/musl.patch
@@ -1,7 +1,7 @@
 diff --git utils/ir-ctl/keymap.h utils/ir-ctl/keymap.h
 index f2b2963..51e4440 100644
---- utils/ir-ctl/keymap.h
-+++ utils/ir-ctl/keymap.h
+--- a/utils/ir-ctl/keymap.h
++++ b/utils/ir-ctl/keymap.h
 @@ -1,6 +1,11 @@
  /* SPDX-License-Identifier: GPL-2.0 */
  #ifndef __KEYMAP_H
@@ -37,8 +37,8 @@ index f2b2963..51e4440 100644
  void free_keymap(struct keymap *map);
 diff --git utils/keytable/keymap.h utils/keytable/keymap.h
 index f2b2963..51e4440 100644
---- utils/keytable/keymap.h
-+++ utils/keytable/keymap.h
+--- a/utils/keytable/keymap.h
++++ b/utils/keytable/keymap.h
 @@ -1,6 +1,11 @@
  /* SPDX-License-Identifier: GPL-2.0 */
  #ifndef __KEYMAP_H
diff --git a/srcpkgs/qv4l2/patches/time64.patch b/srcpkgs/qv4l2/patches/time64.patch
index a4253cc7a57..fdfc7de4cb2 100644
--- a/srcpkgs/qv4l2/patches/time64.patch
+++ b/srcpkgs/qv4l2/patches/time64.patch
@@ -1,5 +1,5 @@
---- utils/keytable/keytable.c	2019-09-22 11:22:54.000000000 +0200
-+++ utils/keytable/keytable.c	2021-01-15 14:48:30.569549169 +0100
+--- a/utils/keytable/keytable.c	2019-09-22 11:22:54.000000000 +0200
++++ b/utils/keytable/keytable.c	2021-01-15 14:48:30.569549169 +0100
 @@ -1533,7 +1533,7 @@
  
  		for (i = 0; i < rd / sizeof(struct input_event); i++) {
diff --git a/srcpkgs/qv4l2/template b/srcpkgs/qv4l2/template
index 585527fe471..292be169c20 100644
--- a/srcpkgs/qv4l2/template
+++ b/srcpkgs/qv4l2/template
@@ -14,7 +14,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://linuxtv.org/"
 distfiles="https://linuxtv.org/downloads/v4l-utils/v4l-utils-${version}.tar.bz2"
 checksum=6cb60d822eeed20486a03cc23e0fc65956fbc1e85e0c1a7477f68bbd9802880d
-patch_args=-Np0
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" qt5-host-tools qt5-devel"