srcpkgs/f*: convert patches to -Np1

* fpc is kept at -Np0 ```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+$,[0-9]\+$\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,$^--- $$./$*,\1a/, s,[.][Oo][Rr][Ii][Gg]$[ /]$,\1, s/[.][Oo][Rr][Ii][Gg]$// s/[.]patched[.]$[^.]$/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,$^+++ $$./$*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ```
2021-06-19 10:03:21 +07:00 · 2021-06-19 10:03:21 +07:00 · be5369a0cb
parent a03d116397
commit be5369a0cb
177 changed files with 403 additions and 454 deletions
--- a/srcpkgs/faad2/patches/fix-stack_usage.patch
+++ b/srcpkgs/faad2/patches/fix-stack_usage.patch
@ -3,8 +3,8 @@ firefox and icecat in the function ps_decode(), this is a try
 to reduce the stack footprint of faad2 decoding by making the
 main arrays X_left[][] and X_right[][] use static __thread storage.

--- libfaad/sbr_dec.c	2009-01-26 23:32:31.000000000 +0100
-+++ libfaad/sbr_dec.c	2015-09-11 12:44:28.305989011 +0200
+--- a/libfaad/sbr_dec.c	2009-01-26 23:32:31.000000000 +0100
+++ b/libfaad/sbr_dec.c	2015-09-11 12:44:28.305989011 +0200
@@ -602,8 +602,12 @@
     uint8_t l, k;
     uint8_t dont_process = 0;
@ -20,8 +20,8 @@ main arrays X_left[][] and X_right[][] use static __thread storage.
 
     if (sbr == NULL)
         return 20;
--- libfaad/ps_dec.c	2009-01-26 23:32:31.000000000 +0100
-+++ libfaad/ps_dec.c	2015-09-11 13:02:37.898985783 +0200
+--- a/libfaad/ps_dec.c	2009-01-26 23:32:31.000000000 +0100
+++ b/libfaad/ps_dec.c	2015-09-11 13:02:37.898985783 +0200
@@ -1039,10 +1039,10 @@
     const complex_t *Phi_Fract_SubQmf;
     uint8_t temp_delay_ser[NO_ALLPASS_LINKS];
--- a/srcpkgs/faad2/template
+++ b/srcpkgs/faad2/template
@ -11,7 +11,6 @@ license="GPL-2.0-or-later"
 homepage="http://www.audiocoding.com/"
 distfiles="https://github.com/knik0/faad2/archive/${version//./_}.tar.gz"
 checksum=0c6d9636c96f95c7d736f097d418829ced8ec6dbd899cc6cc82b728480a84bfb
-patch_args=-Np0

 pre_configure() {
 	autoreconf -vfi
--- a/srcpkgs/fake-hwclock/patches/manpage.patch
+++ b/srcpkgs/fake-hwclock/patches/manpage.patch
@ -1,5 +1,5 @@
--- o.fake-hwclock.8	2019-10-03 01:19:44.542744670 -0400
-+++ fake-hwclock.8	2019-10-03 01:21:03.241032055 -0400
+--- a/o.fake-hwclock.8	2019-10-03 01:19:44.542744670 -0400
+++ b/fake-hwclock.8	2019-10-03 01:21:03.241032055 -0400
@@ -1,4 +1,4 @@
 -.TH FAKE-HWCLOCK 8 "1 October 2014" Debian
 +.TH FAKE-HWCLOCK 8 "4 October 2019" Linux
--- a/srcpkgs/fake-hwclock/template
+++ b/srcpkgs/fake-hwclock/template
@ -9,7 +9,6 @@ license="GPL-2.0-only"
 homepage="https://tracker.debian.org/pkg/fake-hwclock"
 distfiles="${DEBIAN_SITE}/main/f/${pkgname}/${pkgname}_${version}.tar.xz"
 checksum=02a825f7460ab06b370c203250606c67b0effffa1645a4a4f7ff3928eec4957e
-patch_args=-Np0

 conf_files="/etc/default/fake-hwclock"

--- a/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch
+++ b/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch
@ -25,8 +25,8 @@ Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>

 diff --git a/configure.ac b/configure.ac
 index 73415d2..ddde5c9 100644
--- configure.ac
-+++ configure.ac
+--- a/configure.ac
+++ b/configure.ac
@@ -25,42 +25,6 @@ AC_CACHE_CHECK([which IPC method to use],
 	       [ac_cv_use_ipc],
 	       [ac_cv_use_ipc=sysv])
--- a/srcpkgs/fakeroot/patches/fakeroot-no64.patch
+++ b/srcpkgs/fakeroot/patches/fakeroot-no64.patch
@ -1,5 +1,5 @@
--- libfakeroot.c.orig
-+++ libfakeroot.c
+--- a/libfakeroot.c
+++ b/libfakeroot.c
@@ -81,12 +81,14 @@
 #define SEND_STAT64(a,b,c) send_stat64(a,b,c)
 #define SEND_GET_STAT(a,b) send_get_stat(a,b)
--- a/srcpkgs/fakeroot/patches/fakeroot-stdint.patch
+++ b/srcpkgs/fakeroot/patches/fakeroot-stdint.patch
@ -1,5 +1,5 @@
--- faked.c.orig
-+++ faked.c
+--- a/faked.c
+++ b/faked.c
@@ -514,11 +514,11 @@
 
 #ifdef FAKEROOT_DB_PATH
--- a/srcpkgs/fakeroot/template
+++ b/srcpkgs/fakeroot/template
@ -13,7 +13,6 @@ license="GPL-3.0-or-later"
 homepage="https://salsa.debian.org/clint/fakeroot"
 distfiles="${DEBIAN_SITE}/main/f/fakeroot/${pkgname}_${version}.orig.tar.gz"
 checksum=8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c
-patch_args=-Np0

 lib32disabled=yes

--- a/srcpkgs/falkon/patches/musl-execinfo.patch
+++ b/srcpkgs/falkon/patches/musl-execinfo.patch
@ -1,5 +1,5 @@
--- src/main/main.cpp	2018-03-09 14:27:10.849179401 +0100
-+++ src/main/main.cpp	2018-03-09 14:27:44.623709876 +0100
+--- a/src/main/main.cpp	2018-03-09 14:27:10.849179401 +0100
+++ b/src/main/main.cpp	2018-03-09 14:27:44.623709876 +0100
@@ -22,7 +22,7 @@
 #include <QMessageBox> // For QT_REQUIRE_VERSION
 #include <iostream>
--- a/srcpkgs/falkon/patches/qt-5.15-fix.patch
+++ b/srcpkgs/falkon/patches/qt-5.15-fix.patch
@ -1,5 +1,5 @@
--- src/lib/tools/qztools.cpp	2019-03-19 19:06:45.000000000 +0100
-+++ src/lib/tools/qztools.cpp	2020-06-25 09:14:08.074700925 +0200
+--- a/src/lib/tools/qztools.cpp	2019-03-19 19:06:45.000000000 +0100
+++ b/src/lib/tools/qztools.cpp	2020-06-25 09:14:08.074700925 +0200
@@ -25,6 +25,7 @@
 #include <QByteArray>
 #include <QPixmap>
--- a/srcpkgs/falkon/patches/verticaltabsplugin-qfile.patch
+++ b/srcpkgs/falkon/patches/verticaltabsplugin-qfile.patch
@ -1,5 +1,5 @@
--- src/plugins/VerticalTabs/verticaltabsplugin.cpp	2019-03-19 19:06:45.000000000 +0100
-+++ src/plugins/VerticalTabs/verticaltabsplugin.cpp	2020-04-04 16:13:30.073076918 +0200
+--- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp	2019-03-19 19:06:45.000000000 +0100
+++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp	2020-04-04 16:13:30.073076918 +0200
@@ -30,6 +30,7 @@
 #include "../config.h"
 #include "desktopfile.h"
--- a/srcpkgs/falkon/template
+++ b/srcpkgs/falkon/template
@ -16,7 +16,6 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/KDE/falkon"
 distfiles="${KDE_SITE}/falkon/${version%.*}/falkon-${version}.tar.xz"
 checksum=ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587
-patch_args=-Np0

 LDFLAGS="-Wl,--no-fatal-warnings"

--- a/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch
+++ b/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch
@ -1,5 +1,5 @@
--- common-modified/gst-glib-gen.mak	2014-09-03 04:47:25.000000000 +0200
-+++ common-modified/gst-glib-gen.mak	2020-01-27 14:47:28.704958877 +0100
+--- a/common-modified/gst-glib-gen.mak	2014-09-03 04:47:25.000000000 +0200
+++ b/common-modified/gst-glib-gen.mak	2020-01-27 14:47:28.704958877 +0100
@@ -6,7 +6,7 @@
 #glib_gen_prefix=gst_color_balance
 #glib_gen_basename=colorbalance
--- a/srcpkgs/farstream/template
+++ b/srcpkgs/farstream/template
@ -15,7 +15,6 @@ license="LGPL-2.1-or-later"
 homepage="http://www.freedesktop.org/wiki/Software/Farstream"
 distfiles="${FREEDESKTOP_SITE}/farstream/releases/$pkgname/$pkgname-$version.tar.gz"
 checksum=cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b
-patch_args=-Np0

 build_options="gir"
 build_options_default="gir"
--- a/srcpkgs/fastd/patches/fix-segfault.patch
+++ b/srcpkgs/fastd/patches/fix-segfault.patch
@ -1,5 +1,5 @@
--- src/crypto/mac/macs.c.in.orig	2015-01-29 06:41:45.000000000 +0100
-+++ src/crypto/mac/macs.c.in	2015-12-19 14:41:42.579958439 +0100
+--- a/src/crypto/mac/macs.c.in	2015-01-29 06:41:45.000000000 +0100
+++ b/src/crypto/mac/macs.c.in	2015-12-19 14:41:42.579958439 +0100
@@ -67,7 +67,7 @@ static inline bool mac_available(const f
 void fastd_mac_init(void) {
 	size_t i, j;
--- a/srcpkgs/fastd/template
+++ b/srcpkgs/fastd/template
@ -17,7 +17,6 @@ conf_files="
 /etc/fastd/fastd.conf"
 make_dirs="/etc/fastd/peers	755	root 	root"
 CFLAGS="-I$XBPS_CROSS_BASE/usr/include/sodium"
-patch_args=-Np0

 pre_configure() {
 	# remove ssse3 requirement to support older AMD CPUs.
--- a/srcpkgs/fastjar/patches/0001-Properly-zero-terminate-filename.patch
+++ b/srcpkgs/fastjar/patches/0001-Properly-zero-terminate-filename.patch
@ -4,8 +4,8 @@ http://cvs.savannah.gnu.org/viewvc/fastjar/jartool.c?root=fastjar&r1=1.59&r2=1.6

 	* jartool.c (read_entries): Properly zero-terminate filename.

--- jartool.c	2009/09/06 22:16:00	1.59
-+++ jartool.c	2010/03/01 15:38:43	1.60
+--- a/jartool.c	2009/09/06 22:16:00	1.59
+++ b/jartool.c	2010/03/01 15:38:43	1.60
@@ -790,6 +790,7 @@
 		   progname, jarfile);
 	  return 1;
--- a/srcpkgs/fastjar/patches/0002-Fix-write-return-value-check.patch
+++ b/srcpkgs/fastjar/patches/0002-Fix-write-return-value-check.patch
@ -4,8 +4,8 @@ http://cvs.savannah.gnu.org/viewvc/fastjar/jartool.c?root=fastjar&r1=1.60&r2=1.6

 	* jartool.c (add_file_to_jar): Fix write return value check.

--- jartool.c	2010/03/01 15:38:43	1.60
-+++ jartool.c	2010/06/10 08:46:10	1.61
+--- a/jartool.c	2010/03/01 15:38:43	1.60
+++ b/jartool.c	2010/06/10 08:46:10	1.61
@@ -1258,7 +1258,7 @@
       exit_on_error("write");
 
--- a/srcpkgs/fastjar/patches/CVE-2010-2322.patch
+++ b/srcpkgs/fastjar/patches/CVE-2010-2322.patch
@ -1,7 +1,7 @@
 Index: fastjar-0.98/jartool.c
 ===================================================================
--- jartool.c	2010-05-19 14:54:57.367665309 +0200
-+++ jartool.c	2010-05-19 14:54:57.381665355 +0200
+--- a/jartool.c	2010-05-19 14:54:57.367665309 +0200
+++ b/jartool.c	2010-05-19 14:54:57.381665355 +0200
@@ -1731,8 +1731,18 @@
       struct stat sbuf;
       int depth = 0;
--- a/srcpkgs/fastjar/template
+++ b/srcpkgs/fastjar/template
@ -10,4 +10,3 @@ license="GPL-2.0-or-later"
 homepage="http://savannah.nongnu.org/projects/fastjar"
 distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145
-patch_args=-Np0
--- a/srcpkgs/faust/patches/faust-musl-stacktrace.patch
+++ b/srcpkgs/faust/patches/faust-musl-stacktrace.patch
@ -1,5 +1,5 @@
--- compiler/errors/errormsg.cpp-old	2019-12-22 19:47:17.694670614 +0100
-+++ compiler/errors/errormsg.cpp	2019-12-22 19:48:25.145673133 +0100
+--- a/compiler/errors/errormsg.cpp-old	2019-12-22 19:47:17.694670614 +0100
+++ b/compiler/errors/errormsg.cpp	2019-12-22 19:48:25.145673133 +0100
@@ -43,9 +43,11 @@
             gGlobal->printCompilationOptions(str);
         }
--- a/srcpkgs/faust/patches/faust-voidlinux-lib_and_arch_paths.patch
+++ b/srcpkgs/faust/patches/faust-voidlinux-lib_and_arch_paths.patch
@ -1,5 +1,5 @@
--- compiler/libcode.cpp-old	2019-12-22 19:50:13.663677186 +0100
-+++ compiler/libcode.cpp	2019-12-22 19:51:42.011680485 +0100
+--- a/compiler/libcode.cpp-old	2019-12-22 19:50:13.663677186 +0100
+++ b/compiler/libcode.cpp	2019-12-22 19:51:42.011680485 +0100
@@ -733,11 +733,11 @@
 }
 static void printArchDir()
--- a/srcpkgs/faust/template
+++ b/srcpkgs/faust/template
@ -11,7 +11,6 @@ license="GPL-2.0-or-later"
 homepage="http://faust.grame.fr/"
 distfiles=https://github.com/grame-cncm/faust/releases/download/${version}/${pkgname}-${version}.tar.gz
 checksum="6cf64b8ee92c2db74d7d83d726b0ecb6f7e141deeadf4cd40c60e467893e0bfc"
-patch_args=-Np0

 # Android stuffs, used by the 'faust2android' script.
 nostrip_files="libsndfile.so "
--- a/srcpkgs/fbida/patches/ida-desktop.patch
+++ b/srcpkgs/fbida/patches/ida-desktop.patch
@ -1,5 +1,5 @@
--- desktop/ida.desktop	2008-08-28 00:33:58.000000000 +0200
-+++ desktop/ida.desktop	2008-08-28 00:33:58.000000000 +0200
+--- a/desktop/ida.desktop	2008-08-28 00:33:58.000000000 +0200
+++ b/desktop/ida.desktop	2008-08-28 00:33:58.000000000 +0200
@@ -1,9 +1,10 @@
 [Desktop Entry]
 Type=Application
--- a/srcpkgs/fbida/template
+++ b/srcpkgs/fbida/template
@ -18,7 +18,6 @@ checksum=95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438
 depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision}
 fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})"
 nocross="Requires cairo-gl.pc for the target which Void does not have"
-patch_args=-Np0

 build_options="ida"
 desc_option_ida="Build ida motif application (needs motif-devel)"
--- a/srcpkgs/fbreader/patches/arm.patch
+++ b/srcpkgs/fbreader/patches/arm.patch
@ -1,5 +1,5 @@
--- zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp.orig	2018-03-17 07:35:31.000000000 +0000
-+++ zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2018-03-17 07:37:07.801751090 +0000
+--- a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2018-03-17 07:35:31.000000000 +0000
+++ b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2018-03-17 07:37:07.801751090 +0000
@@ -86,7 +86,7 @@
 }
 
--- a/srcpkgs/fbreader/patches/cross.patch
+++ b/srcpkgs/fbreader/patches/cross.patch
@ -1,7 +1,7 @@
 diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk
 index f7f696f..e96ee33 100644
--- makefiles/arch/desktop.mk
-+++ makefiles/arch/desktop.mk
+--- a/makefiles/arch/desktop.mk
+++ b/makefiles/arch/desktop.mk
@@ -7,10 +7,8 @@ IMAGEDIR = $(INSTALLDIR)/share/pixmaps
 APPIMAGEDIR = $(INSTALLDIR)/share/pixmaps/%APPLICATION_NAME%
 
--- a/srcpkgs/fbreader/patches/narrowing.patch
+++ b/srcpkgs/fbreader/patches/narrowing.patch
@ -1,7 +1,7 @@
 diff --git a/fbreader/src/formats/doc/OleStorage.cpp b/fbreader/src/formats/doc/OleStorage.cpp
 index 016f9fd..a7ab81a 100644
--- fbreader/src/formats/doc/OleStorage.cpp
-+++ fbreader/src/formats/doc/OleStorage.cpp
+--- a/fbreader/src/formats/doc/OleStorage.cpp
+++ b/fbreader/src/formats/doc/OleStorage.cpp
@@ -59,7 +59,7 @@ bool OleStorage::init(shared_ptr<ZLInputStream> stream, std::size_t streamSize)
 		clear();
 		return false;
--- a/srcpkgs/fbreader/patches/qt5.patch
+++ b/srcpkgs/fbreader/patches/qt5.patch
@ -1,7 +1,7 @@
 diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk
 index 4267113..3b46102 100644
--- makefiles/arch/desktop.mk
-+++ makefiles/arch/desktop.mk
+--- a/makefiles/arch/desktop.mk
+++ b/makefiles/arch/desktop.mk
@@ -12,29 +12,11 @@ AR = ar rsu
 AR = ar rsu
 LD = g++
@ -41,8 +41,8 @@ index 4267113..3b46102 100644
 RM_QUIET = rm -rf
 diff --git a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
 index 47067d3..119a5ee 100644
--- zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
-+++ zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+--- a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+++ b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
@@ -24,7 +24,9 @@
 #include <QtCore/QDir>
 #include <QtCore/QList>
@ -70,8 +70,8 @@ index 47067d3..119a5ee 100644
 		reply = const_cast<QNetworkAccessManager&>(myManager).get(networkRequest);
 diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
 index a3e5b35..ab41684 100644
--- zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
-+++ zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
@@ -17,14 +17,14 @@
  * 02110-1301, USA.
  */
@ -92,8 +92,8 @@ index a3e5b35..ab41684 100644

 diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
 index 472f05f..b9809c8 100644
--- zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
-+++ zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
@@ -17,10 +17,10 @@
  * 02110-1301, USA.
  */
@ -111,8 +111,8 @@ index 472f05f..b9809c8 100644

 diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
 index 1cddaf9..2b65cc1 100644
--- zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
-+++ zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
@@ -18,9 +18,9 @@
  */

@ -128,8 +128,8 @@ index 1cddaf9..2b65cc1 100644
 #include <ZLFile.h>
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
 index 6de2c72..d942d47 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
@@ -19,12 +19,12 @@
 
 #include <algorithm>
@ -149,8 +149,8 @@ index 6de2c72..d942d47 100644
 #include <ZLibrary.h>
 diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
 index 4f09cfc..51f1545 100644
--- zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
-+++ zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
@@ -20,12 +20,12 @@
 #ifndef __ZLQTITEMSLISTWIDGET_H__
 #define __ZLQTITEMSLISTWIDGET_H__
@ -172,8 +172,8 @@ index 4f09cfc..51f1545 100644
 
 diff --git a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
 index dfcbc0b..bd2689e 100644
--- zlibrary/ui/src/qt4/application/LineEditParameter.cpp
-+++ zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+--- a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+++ b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
@@ -17,9 +17,9 @@
  * 02110-1301, USA.
  */
@ -189,8 +189,8 @@ index dfcbc0b..bd2689e 100644
 #include "ZLQtApplicationWindow.h"
 diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
 index 6241514..e0b143b 100644
--- zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
-+++ zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
@@ -17,17 +17,17 @@
  * 02110-1301, USA.
  */
@ -218,8 +218,8 @@ index 6241514..e0b143b 100644
 #include <ZLibrary.h>
 diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
 index 3b4fd3a..42ff2c8 100644
--- zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
-+++ zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
@@ -22,8 +22,8 @@
 
 #include <map>
@ -233,8 +233,8 @@ index 3b4fd3a..42ff2c8 100644
 class QDockWidget;
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
 index 24eb897..c17e86c 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
@@ -17,8 +17,8 @@
  * 02110-1301, USA.
  */
@ -248,8 +248,8 @@ index 24eb897..c17e86c 100644
 
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
 index 068039d..811cec8 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
@@ -20,8 +20,8 @@
 #ifndef __ZLQTDIALOG_H__
 #define __ZLQTDIALOG_H__
@ -263,8 +263,8 @@ index 068039d..811cec8 100644
 
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
 index e8ff422..352c350 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
@@ -17,10 +17,10 @@
  * 02110-1301, USA.
  */
@ -282,8 +282,8 @@ index e8ff422..352c350 100644
 #include "ZLQtOptionView.h"
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
 index d5eb4d4..2fc769b 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
@@ -17,11 +17,11 @@
  * 02110-1301, USA.
  */
@ -302,8 +302,8 @@ index d5eb4d4..2fc769b 100644
 #include "ZLQtDialog.h"
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
 index ec9e73c..a50a40d 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
@@ -17,7 +17,7 @@
  * 02110-1301, USA.
  */
@ -315,8 +315,8 @@ index ec9e73c..a50a40d 100644
 
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
 index 48a1b8f..90d50fb 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
@@ -19,16 +19,16 @@
 
 #include <cctype>
@ -346,8 +346,8 @@ index 48a1b8f..90d50fb 100644
 #include <ZLDialogManager.h>
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
 index f6c36fb..7fe855a 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
@@ -17,11 +17,11 @@
  * 02110-1301, USA.
  */
@ -367,8 +367,8 @@ index f6c36fb..7fe855a 100644
 #include <ZLDialogManager.h>
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
 index e38b62a..ad26fba 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
@@ -20,9 +20,9 @@
 #ifndef __ZLQTOPTIONSDIALOG_H__
 #define __ZLQTOPTIONSDIALOG_H__
@ -384,8 +384,8 @@ index e38b62a..ad26fba 100644
 
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
 index 98e469e..5a1d574 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
@@ -19,11 +19,11 @@
 
 #include <unistd.h>
@ -405,8 +405,8 @@ index 98e469e..5a1d574 100644
 #include "../dialogs/ZLQtDialogManager.h"
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
 index df6c73b..837bce5 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
@@ -22,11 +22,11 @@
 
 #include <string>
@ -425,8 +425,8 @@ index df6c73b..837bce5 100644
 #include <ZLProgressDialog.h>
 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
 index 9cf7c47..03f1223 100644
--- zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
-+++ zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
@@ -24,12 +24,12 @@
 #include <QtCore/QSet>
 #include <QtCore/QMap>
@ -448,8 +448,8 @@ index 9cf7c47..03f1223 100644
 
 diff --git a/zlibrary/ui/src/qt4/library/ZLQApplication.h b/zlibrary/ui/src/qt4/library/ZLQApplication.h
 index c08c536..a714fa9 100644
--- zlibrary/ui/src/qt4/library/ZLQApplication.h
-+++ zlibrary/ui/src/qt4/library/ZLQApplication.h
+--- a/zlibrary/ui/src/qt4/library/ZLQApplication.h
+++ b/zlibrary/ui/src/qt4/library/ZLQApplication.h
@@ -20,7 +20,7 @@
 #ifndef __ZLQAPPLICATION_H__
 #define __ZLQAPPLICATION_H__
@ -461,8 +461,8 @@ index c08c536..a714fa9 100644
 
 diff --git a/zlibrary/ui/src/qt4/library/ZLibrary.cpp b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
 index 9648e95..a544031 100644
--- zlibrary/ui/src/qt4/library/ZLibrary.cpp
-+++ zlibrary/ui/src/qt4/library/ZLibrary.cpp
+--- a/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+++ b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
@@ -19,7 +19,7 @@
 
 #include <QtCore/QTextCodec>
@ -483,8 +483,8 @@ index 9648e95..a544031 100644
 
 diff --git a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
 index cdaef01..a259c65 100644
--- zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
-+++ zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+--- a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+++ b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
@@ -3,7 +3,7 @@
 
 #include <QtCore/QTimer>
@ -496,8 +496,8 @@ index cdaef01..a259c65 100644
 class QtWaitingSpinner : public QWidget {
 diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
 index 1b8ebcc..6f3b4e3 100644
--- zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
-+++ zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
@@ -20,11 +20,11 @@
 #ifndef __ZLQTPREVIEWWIDGET_H__
 #define __ZLQTPREVIEWWIDGET_H__
@ -517,8 +517,8 @@ index 1b8ebcc..6f3b4e3 100644
 #include <ZLTreePageNode.h>
 diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
 index f6e174c..c360965 100644
--- zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
-+++ zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
@@ -21,8 +21,8 @@
 #define __ZLQTSEARCHFIELD_H__
 
@ -532,8 +532,8 @@ index f6e174c..c360965 100644
 #include "ZLQtItemsListWidget.h"
 diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
 index 4f5d196..615050c 100644
--- zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
-+++ zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
@@ -19,8 +19,8 @@
 
 #include <algorithm>
@ -563,8 +563,8 @@ index 4f5d196..615050c 100644
 
 diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
 index 6fabf00..ccec1e3 100644
--- zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
-+++ zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
@@ -20,7 +20,7 @@
 #ifndef __ZLQTVIEWWIDGET_H__
 #define __ZLQTVIEWWIDGET_H__
--- a/srcpkgs/fbreader/template
+++ b/srcpkgs/fbreader/template
@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
 homepage="http://www.fbreader.org/"
 distfiles="http://www.fbreader.org/files/desktop/${pkgname}-sources-${version}.tgz"
 checksum=3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9
-patch_args=-Np0

 do_build() {
 	sed -e "s:-llinebreak:-lunibreak:" -i makefiles/config.mk zlibrary/text/Makefile
--- a/srcpkgs/fbterm/patches/fix-gcc6-narrowing.patch
+++ b/srcpkgs/fbterm/patches/fix-gcc6-narrowing.patch
@ -1,5 +1,5 @@
--- src/lib/vterm_states.cpp	2015-05-09 08:36:45.000000000 +0200
-+++ src/lib/vterm_states.cpp	2016-10-26 14:21:02.409309316 +0200
+--- a/src/lib/vterm_states.cpp	2015-05-09 08:36:45.000000000 +0200
+++ b/src/lib/vterm_states.cpp	2016-10-26 14:21:02.409309316 +0200
@@ -22,6 +22,7 @@
 #include "vterm.h"
 
--- a/srcpkgs/fbterm/patches/fix-musl.patch
+++ b/srcpkgs/fbterm/patches/fix-musl.patch
@ -1,5 +1,5 @@
--- src/improxy.cpp.orig	2015-09-03 21:53:02.344049550 +0200
-+++ src/improxy.cpp	2015-09-03 21:52:56.378049997 +0200
+--- a/src/improxy.cpp	2015-09-03 21:53:02.344049550 +0200
+++ b/src/improxy.cpp	2015-09-03 21:52:56.378049997 +0200
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <errno.h>
@ -8,8 +8,8 @@
 #include "improxy.h"
 #include "immessage.h"
 #include "fbconfig.h"
--- src/signalfd.h.orig	2015-09-03 21:54:58.500040857 +0200
-+++ src/signalfd.h	2015-09-03 21:55:04.521040406 +0200
+--- a/src/signalfd.h	2015-09-03 21:54:58.500040857 +0200
+++ b/src/signalfd.h	2015-09-03 21:55:04.521040406 +0200
@@ -20,6 +20,7 @@
 #define	_SYS_SIGNALFD_H	1
 
@ -19,8 +19,8 @@
 #include <stdint.h>
 

--- src/fbterm.cpp.orig	2015-09-03 22:05:54.491985444 +0200
-+++ src/fbterm.cpp	2015-09-03 22:04:51.465990161 +0200
+--- a/src/fbterm.cpp	2015-09-03 22:05:54.491985444 +0200
+++ b/src/fbterm.cpp	2015-09-03 22:04:51.465990161 +0200
@@ -23,6 +23,8 @@
 #include <signal.h>
 #include <sys/ioctl.h>
@ -39,8 +39,8 @@
 			if (pid > 0) {
 				FbShellManager::instance()->childProcessExited(pid);
 			}
--- src/mouse.cpp.orig	2015-09-03 22:00:12.119017385 +0200
-+++ src/mouse.cpp	2015-09-03 22:00:21.070016715 +0200
+--- a/src/mouse.cpp	2015-09-03 22:00:12.119017385 +0200
+++ b/src/mouse.cpp	2015-09-03 22:00:21.070016715 +0200
@@ -26,6 +26,7 @@ DEFINE_INSTANCE(Mouse)
 
 #include <stddef.h>
@ -49,8 +49,8 @@
 #include <stdlib.h>
 #include <gpm.h>
 #include <sys/ioctl.h>
--- src/fbio.cpp.orig	2015-09-03 22:12:07.833957502 +0200
-+++ src/fbio.cpp	2015-09-03 22:11:50.633958789 +0200
+--- a/src/fbio.cpp	2015-09-03 22:12:07.833957502 +0200
+++ b/src/fbio.cpp	2015-09-03 22:11:50.633958789 +0200
@@ -20,6 +20,7 @@
 
 #include <unistd.h>
--- a/srcpkgs/fbterm/template
+++ b/srcpkgs/fbterm/template
@ -13,7 +13,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/izmntuk/fbterm"
 distfiles="https://github.com/izmntuk/${pkgname}/archive/v${version%.*}.tar.gz"
 checksum=68e9742b23d6f143d809a5930f5f22c7e55d7c14a4ab2c8a842e0b5c27b1f863
-patch_args=-Np0

 post_configure() {
 	sed -i "s,tic,& -o $DESTDIR/usr/share/terminfo," terminfo/Makefile
--- a/srcpkgs/fbv/patches/giflib-5.1.patch
+++ b/srcpkgs/fbv/patches/giflib-5.1.patch
@ -1,6 +1,6 @@
 diff -wbBur gif.c gif.c
--- gif.c	2003-08-25 00:23:02.000000000 +0400
-+++ gif.c	2014-05-29 18:39:41.337332872 +0400
+--- a/gif.c	2003-08-25 00:23:02.000000000 +0400
+++ b/gif.c	2014-05-29 18:39:41.337332872 +0400
@@ -31,10 +31,10 @@
 #include <string.h>
 #define min(a,b) ((a) < (b) ? (a) : (b))
--- a/srcpkgs/fbv/patches/libpng-1.5.13.patch
+++ b/srcpkgs/fbv/patches/libpng-1.5.13.patch
@ -11,8 +11,8 @@ Subject: [PATCH 1/1] For libpng 1.5.13 the jmpbuf pointer for the png_structp

 diff --git png.c png.c
 index 2b59269..52b6797 100644
--- png.c
-+++ png.c
+--- a/png.c
+++ b/png.c
@@ -69,7 +69,7 @@ int fh_png_load(char *name,unsigned char *buffer, unsigned char ** alpha,int x,i
         fclose(fh); return(FH_ERROR_FORMAT);
     }
--- a/srcpkgs/fbv/template
+++ b/srcpkgs/fbv/template
@ -10,7 +10,6 @@ license="GPL-2.0-or-later"
 homepage="http://www.eclis.ch/fbv/"
 distfiles="http://s-tech.elsat.net.pl/fbv/fbv-${version}.tar.gz"
 checksum=9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c
-patch_args=-Np0

 do_configure() {
 	sed -i '/^CFLAGS/d' Makefile
--- a/srcpkgs/fbxkb/patches/fbxkb.patch
+++ b/srcpkgs/fbxkb/patches/fbxkb.patch
@ -1,8 +1,8 @@
 Found on Arch User Repository, adapted for -p0


--- fbxkb.c	2006-12-18 23:47:52.000000000 +0200
-+++ fbxkb.c	2012-01-15 22:27:30.571427088 +0200
+--- a/fbxkb.c	2006-12-18 23:47:52.000000000 +0200
+++ b/fbxkb.c	2012-01-15 22:27:30.571427088 +0200
@@ -378,10 +378,11 @@ read_kbd_description()
             g_assert((no >= 0) && (no < ngroups));
             if (group2info[no].sym != NULL) {
@ -18,8 +18,8 @@ Found on Arch User Repository, adapted for -p0
         }
         XFree(sym_name);
     }
--- Makefile.common	2004-10-16 01:18:59.000000000 +0300
-+++ Makefile.common	2012-01-15 23:20:02.081020564 +0200
+--- a/Makefile.common	2004-10-16 01:18:59.000000000 +0300
+++ b/Makefile.common	2012-01-15 23:20:02.081020564 +0200

@@ -16,7 +16,7 @@ endif
 endif
--- a/srcpkgs/fbxkb/template
+++ b/srcpkgs/fbxkb/template
@ -11,7 +11,6 @@ license="MIT"
 homepage="http://fbxkb.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz"
 checksum="fcbaf4ed9a70f58ea1316b19da74e2ca8b3fb0e2de5a73c849317589ce840ef2"
-patch_args=-Np0

 pre_build() {
 # Substitute compiler,
--- a/srcpkgs/fceux/patches/isascii-musl.patch
+++ b/srcpkgs/fceux/patches/isascii-musl.patch
@ -1,7 +1,7 @@
 diff --git src/drivers/Qt/HexEditor.cpp src/drivers/Qt/HexEditor.cpp
 index 8f078ac..010b2cf 100644
--- src/drivers/Qt/HexEditor.cpp
-+++ src/drivers/Qt/HexEditor.cpp
+--- a/src/drivers/Qt/HexEditor.cpp
+++ b/src/drivers/Qt/HexEditor.cpp
@@ -43,6 +43,8 @@
 #include "Qt/ConsoleUtilities.h"
 #include "Qt/ConsoleWindow.h"
--- a/srcpkgs/fceux/template
+++ b/srcpkgs/fceux/template
@ -12,4 +12,3 @@ license="GPL-2.0-or-later"
 homepage="https://fceux.com/web/home.html"
 distfiles="https://github.com/TASVideos/fceux/archive/fceux-${version}.tar.gz"
 checksum=0d3b02b3f15032f7675acb95423fd81fae286615313dfbc58cdd4de2bce17f6e
-patch_args=-Np0
--- a/srcpkgs/fcitx-anthy/patches/musl.patch
+++ b/srcpkgs/fcitx-anthy/patches/musl.patch
@ -1,5 +1,5 @@
--- src/utils.h
-+++ src/utils.h
+--- a/src/utils.h
+++ b/src/utils.h
@@ -22,6 +22,7 @@
 #define __FCITX_ANTHY_UTILS_H__
 
--- a/srcpkgs/fcitx-anthy/template
+++ b/srcpkgs/fcitx-anthy/template
@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
 homepage="https://fcitx-im.org/"
 distfiles="https://github.com/fcitx/fcitx-anthy/archive/${version}.tar.gz"
 checksum=dcb561138508757f37da8a85bdf296368b592649b15ab76e8706db47cc25402a
-patch_args=-Np0

 CXXFLAGS='-D_GNU_SOURCE'

--- a/srcpkgs/fcron/patches/fcron.patch
+++ b/srcpkgs/fcron/patches/fcron.patch
@ -1,5 +1,5 @@
--- configure.in.orig
-+++ configure.in
+--- a/configure.in
+++ b/configure.in
@@ -201,7 +201,6 @@
   if test ! -x "$SENDMAIL" ; then
     dnl ... but it is not an executable file!
@ -8,8 +8,8 @@
   else
     dnl ... and it is valid
     AC_MSG_RESULT([$SENDMAIL])
--- script/user-group.orig
-+++ script/user-group
+--- a/script/user-group
+++ b/script/user-group
@@ -1,4 +1,5 @@
 #!/bin/sh
 +exit 0
--- a/srcpkgs/fcron/patches/force-pam.patch
+++ b/srcpkgs/fcron/patches/force-pam.patch
@ -9,8 +9,8 @@ Subject: [PATCH] force pam

 diff --git configure.in configure.in
 index 590d5b2..22ed5d7 100644
--- configure.in
-+++ configure.in
+--- a/configure.in
+++ b/configure.in
@@ -865,6 +865,7 @@ if test "$usepam" != "0" && echo "$LIBS" | grep -- "-lpam" > /dev/null ; then
 else
   usepam=0
--- a/srcpkgs/fcron/template
+++ b/srcpkgs/fcron/template
@ -31,7 +31,6 @@ license="GPL-2.0-or-later"
 homepage="http://fcron.free.fr"
 distfiles="$homepage/archives/$pkgname-$version.src.tar.gz"
 checksum=9aead33a0926e2eec123698c502114c6d67b483fe1ec232969fae6809b0bab60
-patch_args=-Np0

 alternatives="
 crond:crond:/etc/sv/fcron
--- a/srcpkgs/ferm/patches/mod_makefile.patch
+++ b/srcpkgs/ferm/patches/mod_makefile.patch
@ -1,5 +1,5 @@
--- Makefile.orig	2017-08-12 17:55:29.265988875 +0200
-+++ Makefile	2017-08-12 17:56:17.492988011 +0200
+--- a/Makefile	2017-08-12 17:55:29.265988875 +0200
+++ b/Makefile	2017-08-12 17:56:17.492988011 +0200
@@ -122,7 +122,6 @@
 	rm -rf $(DISTDIR)
 	install -d -m 755 $(DISTDIR) $(DISTDIR)/src $(DISTDIR)/doc $(DISTDIR)/examples
--- a/srcpkgs/ferm/template
+++ b/srcpkgs/ferm/template
@ -10,7 +10,6 @@ license="GPL-2.0-or-later"
 homepage="http://ferm.foo-projects.org/"
 distfiles="http://ferm.foo-projects.org/download/${version:0:3}/ferm-${version}.tar.xz"
 checksum=689541465e7c073cbd604c9cd18f113c31c0b41bb12614726a59b17e44058885
-patch_args=-Np0

 do_install() {
 	make install PREFIX=${DESTDIR}/usr
--- a/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch
+++ b/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch
@ -16,8 +16,8 @@ Fixes ticket #9077.

 diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
 index 58e480dd2c..4f5382e4c1 100644
--- libswscale/ppc/yuv2rgb_altivec.c
-+++ libswscale/ppc/yuv2rgb_altivec.c
+--- a/libswscale/ppc/yuv2rgb_altivec.c
+++ b/libswscale/ppc/yuv2rgb_altivec.c
@@ -425,13 +425,13 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in,          \
 }
 
--- a/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch
+++ b/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch
@ -14,8 +14,8 @@ Fixes users who check the return value matches what they expect.

 diff --git a/libswscale/aarch64/swscale_unscaled.c b/libswscale/aarch64/swscale_unscaled.c
 index 551daad9e353..c7a2a1037df8 100644
--- libswscale/aarch64/swscale_unscaled.c
-+++ libswscale/aarch64/swscale_unscaled.c
+--- a/libswscale/aarch64/swscale_unscaled.c
+++ b/libswscale/aarch64/swscale_unscaled.c
@@ -42,15 +42,14 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[],
                                            uint8_t *dst[], int dstStride[]) {               \
     const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE };                                   \
@ -63,8 +63,8 @@ index 551daad9e353..c7a2a1037df8 100644
 #define DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx)                                               \
 diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S
 index b7446aa10511..f4b220fb608e 100644
--- libswscale/aarch64/yuv2rgb_neon.S
-+++ libswscale/aarch64/yuv2rgb_neon.S
+--- a/libswscale/aarch64/yuv2rgb_neon.S
+++ b/libswscale/aarch64/yuv2rgb_neon.S
@@ -142,6 +142,7 @@
 .macro declare_func ifmt ofmt
 function ff_\ifmt\()_to_\ofmt\()_neon, export=1
--- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
+++ b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch
@ -1,5 +1,5 @@
--- libavfilter/vf_drawtext.c	2017-10-26 21:03:03.000000000 +0200
-+++ libavfilter/vf_drawtext.c	2017-11-21 11:06:49.602284422 +0100
+--- a/libavfilter/vf_drawtext.c	2017-10-26 21:03:03.000000000 +0200
+++ b/libavfilter/vf_drawtext.c	2017-11-21 11:06:49.602284422 +0100
@@ -39,6 +39,15 @@
 #endif
 #include <fenv.h>
--- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
+++ b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch
@ -12,8 +12,8 @@ Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704

 diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
 index 5854587a255..f12fdc457a4 100644
--- libavcodec/vaapi_h264.c
-+++ libavcodec/vaapi_h264.c
+--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx)
     H264SliceContext *sl = &h->slice_ctx[0];
     int ret;
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@ -10,7 +10,6 @@ homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
 distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz"
 checksum=46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb
-patch_args=-Np0

 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
--- a/srcpkgs/fifengine/patches/swig.patch
+++ b/srcpkgs/fifengine/patches/swig.patch
@ -9,8 +9,8 @@ Subject: [PATCH] removed flags that are not supported with swig 4.0

 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 126322ce0..25c695630 100644
--- CMakeLists.txt
-+++ CMakeLists.txt
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -893,7 +893,7 @@ if(build-python)
   find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT)
   include_directories(${PYTHON_INCLUDE_PATH})
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@ -14,4 +14,3 @@ license="LGPL-2.1-or-later"
 homepage="https://github.com/fifengine/fifengine"
 distfiles="https://github.com/fifengine/fifengine/archive/${version}.tar.gz"
 checksum=e882b55befa36ae2f1a89ada16af0f814a1b78f7cbe6021ec5b1605604cf8ff8
-patch_args=-Np0
--- a/srcpkgs/fig2dev/patches/CVE-2019-19555.patch
+++ b/srcpkgs/fig2dev/patches/CVE-2019-19555.patch
@ -18,8 +18,8 @@
   &t->type, &t->font, &t->size, &t->pen,
   &t->color, &t->depth, &t->angle,
   &t->flags, &t->height, &t->length,
--- fig2dev/tests/read.at
-+++ fig2dev/tests/read.at
+--- a/fig2dev/tests/read.at
+++ b/fig2dev/tests/read.at
@@ -359,6 +359,17 @@
 ], 0, ignore)
 AT_CLEANUP
--- a/srcpkgs/fig2dev/template
+++ b/srcpkgs/fig2dev/template
@ -13,7 +13,6 @@ homepage="http://www.xfig.org/"
 distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz"
 checksum=6336ac492d0f71dfb7a1dd8f4d78eae17aa57a34f743d4e5ba9814991c2da7ae
 replaces="transfig>=0"
-patch_args=-Np0

 post_install() {
 	sed '/^$/q' <fig2dev/fig2dev.c >LICENSE
--- a/srcpkgs/filelight/patches/musl.patch
+++ b/srcpkgs/filelight/patches/musl.patch
@ -1,5 +1,5 @@
--- src/radialMap/sincos.h	2018-05-06 06:10:38.000000000 +0200
-+++ -	2018-05-25 01:24:06.234265312 +0200
+--- a/src/radialMap/sincos.h	2018-05-06 06:10:38.000000000 +0200
+++ b/src/radialMap/sincos.h	2018-05-06 06:10:38.000000000 +0200
@@ -21,10 +21,10 @@
 
 #ifndef SINCOS_H
@ -13,8 +13,8 @@
 
 #include <qmath.h>
 
--- src/radialMap/sincos.h	2018-05-25 01:30:46.775385798 +0200
-+++ -	2018-05-25 01:34:59.788609200 +0200
+--- a/src/radialMap/sincos.h	2018-05-25 01:30:46.775385798 +0200
+++ b/src/radialMap/sincos.h	2018-05-25 01:30:46.775385798 +0200
@@ -23,23 +23,4 @@
 #define SINCOS_H
 #define _GNU_SOURCE
--- a/srcpkgs/filelight/template
+++ b/srcpkgs/filelight/template
@ -12,4 +12,3 @@ license="GPL-2.0-only"
 homepage="https://utils.kde.org/projects/filelight/"
 distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz"
 checksum=618f91b9da8eebbb6b96e3d74d9e89a7c088ca08b1682ff6c4e65b53a3da5d20
-patch_args=-Np0
--- a/srcpkgs/filezilla/patches/cross.patch
+++ b/srcpkgs/filezilla/patches/cross.patch
@ -1,5 +1,5 @@
--- configure	2019-05-08 10:44:58.580806039 +0200
-+++ configure	2019-05-08 10:45:35.185289121 +0200
+--- a/configure	2019-05-08 10:44:58.580806039 +0200
+++ b/configure	2019-05-08 10:45:35.185289121 +0200
@@ -17628,7 +17628,7 @@
   "$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=x86_64-w64-mingw32 || exit 1
 else
--- a/srcpkgs/filezilla/patches/missing-list-include.patch
+++ b/srcpkgs/filezilla/patches/missing-list-include.patch
@ -1,5 +1,5 @@
--- src/interface/Mainfrm.h	2020-03-11 19:25:00.949572120 +0100
-+++ src/interface/Mainfrm.h	2020-03-11 19:25:15.536378827 +0100
+--- a/src/interface/Mainfrm.h	2020-03-11 19:25:00.949572120 +0100
+++ b/src/interface/Mainfrm.h	2020-03-11 19:25:15.536378827 +0100
@@ -8,6 +8,8 @@
 
 #include <wx/timer.h>
--- a/srcpkgs/filezilla/template
+++ b/srcpkgs/filezilla/template
@ -16,7 +16,6 @@ homepage="https://filezilla-project.org"
 changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co"
 distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"
 checksum=703a199c13bb681d6eb0e3fe6e1cc9d0b690016acdd47b26bd12a2a95ff4aa6a
-patch_args=-Np0

 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils"
--- a/srcpkgs/fingerprint-gui/patches/fix-udev-paths.patch
+++ b/srcpkgs/fingerprint-gui/patches/fix-udev-paths.patch
@ -1,5 +1,5 @@
--- bin/fingerprint-helper/fingerprint-helper.pro	2016-11-21 15:24:35.315792087 +0300
-+++ bin/fingerprint-helper/fingerprint-helper.pro	2016-11-21 15:25:24.527899001 +0300
+--- a/bin/fingerprint-helper/fingerprint-helper.pro	2016-11-21 15:24:35.315792087 +0300
+++ b/bin/fingerprint-helper/fingerprint-helper.pro	2016-11-21 15:25:24.527899001 +0300
@@ -22,8 +22,8 @@
 QMAKE_CXXFLAGS+=-fno-strict-aliasing
 
@ -12,8 +12,8 @@
 
 INSTALLS += target uinput-rules
  
--- fingerprint.pro	2016-11-21 15:33:45.215341967 +0300
-+++ fingerprint.pro	2016-11-21 15:36:26.077954927 +0300
+--- a/fingerprint.pro	2016-11-21 15:33:45.215341967 +0300
+++ b/fingerprint.pro	2016-11-21 15:36:26.077954927 +0300
@@ -17,8 +17,8 @@
                             install -m 644 ./upek/lib/libbsapi.so.4.0 ./upek/lib/libbsapi.so.4.3 $(INSTALL_ROOT)$${LIBDIR}; \
                         fi; \
--- a/srcpkgs/fingerprint-gui/patches/fix-udev-rules-groups.patch
+++ b/srcpkgs/fingerprint-gui/patches/fix-udev-rules-groups.patch
@ -1,5 +1,5 @@
--- upek/91-fingerprint-gui-upek.rules        2017-01-12 19:48:38.325444912 +0300
-+++ upek/91-fingerprint-gui-upek.rules     2017-01-12 19:50:35.799120728 +0300
+--- a/upek/91-fingerprint-gui-upek.rules        2017-01-12 19:48:38.325444912 +0300
+++ b/upek/91-fingerprint-gui-upek.rules     2017-01-12 19:50:35.799120728 +0300
@@ -7,6 +7,10 @@
 ATTRS{idVendor}=="147e", ATTRS{idProduct}=="100[0123]", SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev"
 ATTRS{idVendor}=="147e", ATTRS{idProduct}=="300[01]",   SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev"
--- a/srcpkgs/fingerprint-gui/patches/musl.patch
+++ b/srcpkgs/fingerprint-gui/patches/musl.patch
@ -1,5 +1,5 @@
--- src/FingerprintPAM.cpp.orig	2016-04-12 05:13:32.786979623 +0200
-+++ src/FingerprintPAM.cpp	2016-04-12 05:13:58.427980946 +0200
+--- a/src/FingerprintPAM.cpp	2016-04-12 05:13:32.786979623 +0200
+++ b/src/FingerprintPAM.cpp	2016-04-12 05:13:58.427980946 +0200
@@ -38,6 +38,7 @@
 #include <errno.h>
 #include <pwd.h>
--- a/srcpkgs/fingerprint-gui/patches/time64.patch
+++ b/srcpkgs/fingerprint-gui/patches/time64.patch
@ -1,7 +1,7 @@
 Index: src/FingerprintHelper.cpp
 ===================================================================
--- src/FingerprintHelper.cpp.orig
-+++ src/FingerprintHelper.cpp
+--- a/src/FingerprintHelper.cpp
+++ b/src/FingerprintHelper.cpp
@@ -75,9 +75,12 @@ void pluginMessage(const char *msg){
 // Send <enter> to uinput
 bool uinputSendEnter(int uinput){
--- a/srcpkgs/fingerprint-gui/template
+++ b/srcpkgs/fingerprint-gui/template
@ -14,7 +14,6 @@ license="GPL-2.0-or-later"
 homepage="http://www.ullrich-online.cc/fingerprint/"
 distfiles="https://github.com/maksbotan/${pkgname}/archive/v${version}-qt5.tar.gz"
 checksum=a28d43e7e505f8ed15c8360bd91603eaf3206c225a542d0116669caafd89154c
-patch_args=-Np0

 # build system deals poorly with cross headers so include
 # them manually
--- a/srcpkgs/firefox-esr/patches/big-endian-image-decoders.patch
+++ b/srcpkgs/firefox-esr/patches/big-endian-image-decoders.patch
@ -10,8 +10,8 @@ https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096
 imported patch decoder_workaround.patch

 diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
--- image/decoders/nsGIFDecoder2.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsGIFDecoder2.cpp	Fri Mar 27 13:06:18 2020 +0100
+--- a/image/decoders/nsGIFDecoder2.cpp	Thu Feb 27 12:57:14 2020 +0100
+++ b/image/decoders/nsGIFDecoder2.cpp	Fri Mar 27 13:06:18 2020 +0100
@@ -422,6 +422,9 @@
   MOZ_ASSERT(mSwizzleFn);
   uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
@ -23,8 +23,8 @@ diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
 
 LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
 diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
--- image/decoders/nsJPEGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsJPEGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+--- a/image/decoders/nsJPEGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
+++ b/image/decoders/nsJPEGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
@@ -263,6 +263,9 @@
         case JCS_YCbCr:
           // By default, we will output directly to BGRA. If we need to apply
@ -44,8 +44,8 @@ diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
         case JCS_CMYK:
         case JCS_YCCK:
 diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
--- image/decoders/nsPNGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsPNGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+--- a/image/decoders/nsPNGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
+++ b/image/decoders/nsPNGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
@@ -361,7 +361,7 @@
                                    IResumable* aOnResume) {
   MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");
@ -71,8 +71,8 @@ diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
 
 LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
 diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp
--- image/decoders/nsWebPDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsWebPDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+--- a/image/decoders/nsWebPDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
+++ b/image/decoders/nsWebPDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
@@ -237,7 +237,12 @@
   // WebP doesn't guarantee that the alpha generated matches the hint in the
   // header, so we always need to claim the input is BGRA. If the output is
--- a/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch
+++ b/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch
@ -1,5 +1,5 @@
--- media/libopus/silk/arm/arm_silk_map.c.orig	2019-03-19 20:55:01.249609964 +0100
-+++ media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:25.769400255 +0100
+--- a/media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:01.249609964 +0100
+++ b/media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:25.769400255 +0100
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
--- a/srcpkgs/firefox-esr/patches/fix-cross.patch
+++ b/srcpkgs/firefox-esr/patches/fix-cross.patch
@ -3,8 +3,8 @@ overwrite HOST_* flags to get rid of -MF

 note: this patch was used from firefox-77 until 80, dropped with the update to 81

--- third_party/rust/glslopt/build.rs
-+++ third_party/rust/glslopt/build.rs
+--- a/third_party/rust/glslopt/build.rs
+++ b/third_party/rust/glslopt/build.rs
@@ -28,6 +28,8 @@
     env::remove_var(format!("CXXFLAGS_{}", &target));
     env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
--- a/srcpkgs/firefox-esr/patches/fix-desktop-icon-path.patch
+++ b/srcpkgs/firefox-esr/patches/fix-desktop-icon-path.patch
@ -1,5 +1,5 @@
--- taskcluster/docker/firefox-snap/firefox.desktop.orig	2019-01-18 19:31:39.428839442 +0100
-+++ taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:32:20.689063456 +0100
+--- a/taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:31:39.428839442 +0100
+++ b/taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:32:20.689063456 +0100
@@ -154,7 +154,7 @@
 Terminal=false
 X-MultipleArgs=false
--- a/srcpkgs/firefox-esr/patches/fix-fortify-inline.patch
+++ b/srcpkgs/firefox-esr/patches/fix-fortify-inline.patch
@ -1,5 +1,5 @@
--- media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
-+++ media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
+--- a/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
+++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h
@@ -27,8 +27,5 @@
 typedef int16_t    int16;
 typedef unsigned short ushort;
--- a/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch
@ -1,5 +1,5 @@
--- mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
+--- a/mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
+++ b/mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
@@ -41,7 +41,7 @@
 #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
 #endif
--- a/srcpkgs/firefox-esr/patches/fix-image-format-warning.patch
+++ b/srcpkgs/firefox-esr/patches/fix-image-format-warning.patch
@ -6,8 +6,8 @@
 # Parent  29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
 handle big-endian formats in Cairo format conversions

--- gfx/2d/HelpersCairo.h
-+++ gfx/2d/HelpersCairo.h
+--- a/gfx/2d/HelpersCairo.h
+++ b/gfx/2d/HelpersCairo.h
@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
     case SurfaceFormat::R5G6B5_UINT16:
       return CAIRO_FORMAT_RGB16_565;
--- a/srcpkgs/firefox-esr/patches/fix-tools.patch
+++ b/srcpkgs/firefox-esr/patches/fix-tools.patch
@ -1,5 +1,5 @@
--- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
-+++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
+--- a/tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:09:40.980448579 +0100
+++ b/tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
@@ -497,8 +501,10 @@
 ucontext_t sSyncUContext;
 
--- a/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
+++ b/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch
@ -1,5 +1,5 @@
--- js/src/wasm/WasmSignalHandlers.cpp
-+++ js/src/wasm/WasmSignalHandlers.cpp
+--- a/js/src/wasm/WasmSignalHandlers.cpp
+++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -243,9 +243,9 @@
 // If you run into compile problems on a tier-3 platform, you can disable the
 // emulation here.
--- a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
+++ b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch
@ -1,5 +1,5 @@
--- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2019-01-29 11:20:52.298793223 +0100
-+++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
+--- a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:20:52.298793223 +0100
+++ b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
@@ -14,7 +14,7 @@
 #ifndef __GLIBC_PREREQ
 #define __GLIBC_PREREQ(a, b) 0
--- a/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch
+++ b/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch
@ -2,8 +2,8 @@ Enable FLAC on platforms without ffvpx like powerpc*

 diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
 index 53fc3c9937f7..b23771ab80fa 100644
--- dom/media/flac/FlacDecoder.cpp
-+++ dom/media/flac/FlacDecoder.cpp
+--- a/dom/media/flac/FlacDecoder.cpp
+++ b/dom/media/flac/FlacDecoder.cpp
@@ -7,6 +7,7 @@
 #include "FlacDecoder.h"
 #include "MediaContainerType.h"
--- a/srcpkgs/firefox-esr/patches/mallinfo.patch
+++ b/srcpkgs/firefox-esr/patches/mallinfo.patch
@ -1,5 +1,5 @@
--- xpcom/base/nsMemoryReporterManager.cpp.orig	2019-03-19 17:12:20.844810044 +0100
-+++ xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:13:32.505133615 +0100
+--- a/xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:12:20.844810044 +0100
+++ b/xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:13:32.505133615 +0100
@@ -123,6 +123,7 @@
   return GetProcSelfSmapsPrivate(aN);
 }
--- a/srcpkgs/firefox-esr/patches/musl-rust.configure.patch
+++ b/srcpkgs/firefox-esr/patches/musl-rust.configure.patch
@ -1,5 +1,5 @@
--- build/moz.configure/rust.configure	2019-10-28 12:05:04.930404603 +0700
-+++ build/moz.configure/rust.configure	2019-10-28 12:09:42.742338957 +0700
+--- a/build/moz.configure/rust.configure	2019-10-28 12:05:04.930404603 +0700
+++ b/build/moz.configure/rust.configure	2019-10-28 12:09:42.742338957 +0700
@@ -297,11 +297,20 @@
                     suffix = 'hf'
                 else:
--- a/srcpkgs/firefox-esr/patches/ppc32-fix-build.patch
+++ b/srcpkgs/firefox-esr/patches/ppc32-fix-build.patch
@ -7,8 +7,8 @@ Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60
 Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e
 Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp

--- xpcom/reflect/xptcall/xptcall.h
-+++ xpcom/reflect/xptcall/xptcall.h
+--- a/xpcom/reflect/xptcall/xptcall.h
+++ b/xpcom/reflect/xptcall/xptcall.h
@@ -71,6 +71,11 @@ struct nsXPTCVariant {
     ExtendedVal ext;
   };
--- a/srcpkgs/firefox-esr/patches/rust-configure.patch
+++ b/srcpkgs/firefox-esr/patches/rust-configure.patch
@ -1,8 +1,8 @@
 Mozilla rustc check does not support crossbuild: let's remove it
 Remove calls to unwrap_rustup, they fail if rustup isn't present

--- build/moz.configure/rust.configure.orig	2019-10-17 04:19:59.000000000 +0700
-+++ build/moz.configure/rust.configure	2019-10-22 11:48:55.616022140 +0700
+--- a/build/moz.configure/rust.configure	2019-10-17 04:19:59.000000000 +0700
+++ b/build/moz.configure/rust.configure	2019-10-22 11:48:55.616022140 +0700
@@ -78,9 +78,6 @@
 
     return unwrap
--- a/srcpkgs/firefox-esr/patches/rust-has-i128.patch
+++ b/srcpkgs/firefox-esr/patches/rust-has-i128.patch
@ -1,8 +1,8 @@
 The configure check fails for cross builds.
 i128 is supported since rust-1.26, so it is safe for us to assume it is always present

--- third_party/rust/num-traits/build.rs.orig	2020-02-14 23:57:25.985355610 +0100
-+++ third_party/rust/num-traits/build.rs	2020-02-14 23:58:36.255710188 +0100
+--- a/third_party/rust/num-traits/build.rs	2020-02-14 23:57:25.985355610 +0100
+++ b/third_party/rust/num-traits/build.rs	2020-02-14 23:58:36.255710188 +0100
@@ -1,14 +1,5 @@
 -extern crate autocfg;
 -
--- a/srcpkgs/firefox-esr/patches/sandbox-fork.patch
+++ b/srcpkgs/firefox-esr/patches/sandbox-fork.patch
@ -1,7 +1,7 @@
 make SYS_fork non-fatal, musl uses it for fork(2)

--- security/sandbox/linux/SandboxFilter.cpp
-+++ security/sandbox/linux/SandboxFilter.cpp
+--- a/security/sandbox/linux/SandboxFilter.cpp
+++ b/security/sandbox/linux/SandboxFilter.cpp
@@ -1253,6 +1253,8 @@
         // usually do something reasonable on error.
       case __NR_clone:
--- a/srcpkgs/firefox-esr/patches/sandbox-largefile.patch
+++ b/srcpkgs/firefox-esr/patches/sandbox-largefile.patch
@ -1,5 +1,5 @@
--- security/sandbox/linux/SandboxFilter.cpp	2020-11-23 22:41:14.556378950 +0100
-+++ security/sandbox/linux/SandboxFilter.cpp	2020-11-23 22:40:23.595806444 +0100
+--- a/security/sandbox/linux/SandboxFilter.cpp	2020-11-23 22:41:14.556378950 +0100
+++ b/security/sandbox/linux/SandboxFilter.cpp	2020-11-23 22:40:23.595806444 +0100
@@ -68,7 +68,13 @@
 
 // The headers define O_LARGEFILE as 0 on x86_64, but we need the
--- a/srcpkgs/firefox-esr/patches/skia-sucks1.patch
+++ b/srcpkgs/firefox-esr/patches/skia-sucks1.patch
@ -1,8 +1,8 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
 https://bugzilla.mozilla.org/attachment.cgi?id=9028600

--- gfx/skia/skia/third_party/skcms/skcms.cc
-+++ gfx/skia/skia/third_party/skcms/skcms.cc
+--- a/gfx/skia/skia/third_party/skcms/skcms.cc
+++ b/gfx/skia/skia/third_party/skcms/skcms.cc
@@ -30,6 +30,8 @@
         #include <avx512fintrin.h>
         #include <avx512dqintrin.h>
@ -45,8 +45,8 @@ https://bugzilla.mozilla.org/attachment.cgi?id=9028600
 #endif
 }
 
--- gfx/2d/DrawTargetSkia.cpp
-+++ gfx/2d/DrawTargetSkia.cpp
+--- a/gfx/2d/DrawTargetSkia.cpp
+++ b/gfx/2d/DrawTargetSkia.cpp
@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
   return surfaceBounds.Intersect(bounds);
 }
@ -57,8 +57,8 @@ https://bugzilla.mozilla.org/attachment.cgi?id=9028600
 
 static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
                              const int32_t aStride, SurfaceFormat aFormat) {
--- gfx/2d/Types.h
-+++ gfx/2d/Types.h
+--- a/gfx/2d/Types.h
+++ b/gfx/2d/Types.h
@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t {
 // The following values are endian-independent synonyms. The _UINT32 suffix
 // indicates that the name reflects the layout when viewed as a uint32_t
--- a/srcpkgs/firefox-esr/patches/skia-sucks2.patch
+++ b/srcpkgs/firefox-esr/patches/skia-sucks2.patch
@ -4,8 +4,8 @@ For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text
 right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).

 diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
--- gfx/skia/skia/include/private/SkNx.h	Tue Aug 20 09:46:55 2019 +0200
-+++ gfx/skia/skia/include/private/SkNx.h	Mon Sep 09 10:04:06 2019 +0200
+--- a/gfx/skia/skia/include/private/SkNx.h	Tue Aug 20 09:46:55 2019 +0200
+++ b/gfx/skia/skia/include/private/SkNx.h	Mon Sep 09 10:04:06 2019 +0200
@@ -238,7 +238,18 @@
     AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
     AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
@ -26,8 +26,8 @@ diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
     AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
 
 diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h
--- gfx/skia/skia/src/opts/SkBlitMask_opts.h	Tue Aug 20 09:46:55 2019 +0200
-+++ gfx/skia/skia/src/opts/SkBlitMask_opts.h	Mon Sep 09 10:04:06 2019 +0200
+--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h	Tue Aug 20 09:46:55 2019 +0200
+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h	Mon Sep 09 10:04:06 2019 +0200
@@ -203,7 +203,13 @@
             //   ~~~>
             // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
--- a/srcpkgs/firefox-esr/patches/skia-sucks3.patch
+++ b/srcpkgs/firefox-esr/patches/skia-sucks3.patch
@ -13,8 +13,8 @@ Solution: This is not a real solution, but a hack. The real solution would have
 Side-effects: I have not yet found an unwanted side-effect.

 diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
--- gfx/2d/DrawTargetSkia.cpp	Tue Oct 22 12:27:22 2019 +0200
-+++ gfx/2d/DrawTargetSkia.cpp	Thu Oct 31 09:11:56 2019 +0100
+--- a/gfx/2d/DrawTargetSkia.cpp	Tue Oct 22 12:27:22 2019 +0200
+++ b/gfx/2d/DrawTargetSkia.cpp	Thu Oct 31 09:11:56 2019 +0100
@@ -1861,6 +1861,14 @@
       SkCanvas::kPreserveLCDText_SaveLayerFlag |
           (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
@ -30,8 +30,8 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
   mCanvas->saveLayer(saveRec);
 
   SetPermitSubpixelAA(aOpaque);
--- gfx/layers/composite/CompositableHost.cpp
-+++ gfx/layers/composite/CompositableHost.cpp
+--- a/gfx/layers/composite/CompositableHost.cpp
+++ b/gfx/layers/composite/CompositableHost.cpp
@@ -13,6 +13,7 @@
 #include "ImageHost.h"  // for ImageHostBuffered, etc
 #include "Layers.h"
--- a/srcpkgs/firefox-esr/patches/sndio.patch
+++ b/srcpkgs/firefox-esr/patches/sndio.patch
@ -1,5 +1,5 @@
--- old-configure.in.orig
-+++ old-configure.in
+--- a/old-configure.in
+++ b/old-configure.in
@@ -2818,6 +2818,22 @@
     _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES"
 fi
@ -23,8 +23,8 @@
 dnl ========================================================
 dnl =
 dnl = Maintainer debug option (no --enable equivalent)
--- media/libcubeb/src/moz.build.orig
-+++ media/libcubeb/src/moz.build
+--- a/media/libcubeb/src/moz.build
+++ b/media/libcubeb/src/moz.build
@@ -44,11 +44,13 @@
     ]
     DEFINES['USE_JACK'] = True
@ -40,8 +40,8 @@
     DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True
 
 if CONFIG['OS_TARGET'] == 'Darwin':
--- build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
-+++ -	2020-06-30 12:18:26.027756310 +0200
+--- a/build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
+++ b/build/moz.configure/old.configure	2020-06-30 12:17:04.087609070 +0200
@@ -210,6 +210,7 @@
 @old_configure_options(
     '--cache-file',
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@ -25,7 +25,6 @@ distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${versi
 checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
 lib32disabled=yes
 conflicts="firefox>=0"
-patch_args=-Np0

 build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
 build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
--- a/srcpkgs/firefox/patches/avoid-redefinition.patch
+++ b/srcpkgs/firefox/patches/avoid-redefinition.patch
@ -3,8 +3,8 @@ Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
 (linux/if.h), leading to redefinitions. We need to include net/if.h before
 linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
 Upstream: No
--- dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c.orig	2020-07-28 19:24:32.359751046 +0200
-+++ dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:37.856343751 +0200
+--- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:32.359751046 +0200
+++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c	2020-07-28 19:24:37.856343751 +0200
@@ -31,6 +31,7 @@
 */
 
--- a/srcpkgs/firefox/patches/big-endian-image-decoders.patch
+++ b/srcpkgs/firefox/patches/big-endian-image-decoders.patch
@ -10,8 +10,8 @@ https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096
 imported patch decoder_workaround.patch

 diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
--- image/decoders/nsGIFDecoder2.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsGIFDecoder2.cpp	Fri Mar 27 13:06:18 2020 +0100
+--- a/image/decoders/nsGIFDecoder2.cpp	Thu Feb 27 12:57:14 2020 +0100
+++ b/image/decoders/nsGIFDecoder2.cpp	Fri Mar 27 13:06:18 2020 +0100
@@ -422,6 +422,9 @@
   MOZ_ASSERT(mSwizzleFn);
   uint8_t* data = reinterpret_cast<uint8_t*>(aColormap);
@ -23,8 +23,8 @@ diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp
 
 LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator,
 diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
--- image/decoders/nsJPEGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsJPEGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+--- a/image/decoders/nsJPEGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
+++ b/image/decoders/nsJPEGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
@@ -263,6 +263,9 @@
         case JCS_YCbCr:
           // By default, we will output directly to BGRA. If we need to apply
@ -44,8 +44,8 @@ diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp
         case JCS_CMYK:
         case JCS_YCCK:
 diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
--- image/decoders/nsPNGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsPNGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+--- a/image/decoders/nsPNGDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
+++ b/image/decoders/nsPNGDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
@@ -361,7 +361,7 @@
                                    IResumable* aOnResume) {
   MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!");
@ -71,8 +71,8 @@ diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp
 
 LexerTransition<nsPNGDecoder::State> nsPNGDecoder::ReadPNGData(
 diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp
--- image/decoders/nsWebPDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
-+++ image/decoders/nsWebPDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
+--- a/image/decoders/nsWebPDecoder.cpp	Thu Feb 27 12:57:14 2020 +0100
+++ b/image/decoders/nsWebPDecoder.cpp	Fri Mar 27 13:06:18 2020 +0100
@@ -237,7 +237,12 @@
   // WebP doesn't guarantee that the alpha generated matches the hint in the
   // header, so we always need to claim the input is BGRA. If the output is
--- a/srcpkgs/firefox/patches/fix-arm-opus-include.patch
+++ b/srcpkgs/firefox/patches/fix-arm-opus-include.patch
@ -1,5 +1,5 @@
--- media/libopus/silk/arm/arm_silk_map.c.orig	2019-03-19 20:55:01.249609964 +0100
-+++ media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:25.769400255 +0100
+--- a/media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:01.249609964 +0100
+++ b/media/libopus/silk/arm/arm_silk_map.c	2019-03-19 20:55:25.769400255 +0100
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
--- a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch
+++ b/srcpkgs/firefox/patches/fix-desktop-icon-path.patch
@ -1,5 +1,5 @@
--- taskcluster/docker/firefox-snap/firefox.desktop.orig	2019-01-18 19:31:39.428839442 +0100
-+++ taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:32:20.689063456 +0100
+--- a/taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:31:39.428839442 +0100
+++ b/taskcluster/docker/firefox-snap/firefox.desktop	2019-01-18 19:32:20.689063456 +0100
@@ -154,7 +154,7 @@
 Terminal=false
 X-MultipleArgs=false
--- a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
+++ b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch
@ -1,5 +1,5 @@
--- mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
-+++ mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
+--- a/mozglue/misc/StackWalk.cpp	2017-04-11 04:13:21.000000000 +0200
+++ b/mozglue/misc/StackWalk.cpp	2017-11-29 15:23:07.218649970 +0100
@@ -41,7 +41,7 @@
 #define MOZ_STACKWALK_SUPPORTS_MACOSX 0
 #endif
--- a/srcpkgs/firefox/patches/fix-image-format-warning.patch
+++ b/srcpkgs/firefox/patches/fix-image-format-warning.patch
@ -6,8 +6,8 @@
 # Parent  29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5
 handle big-endian formats in Cairo format conversions

--- gfx/2d/HelpersCairo.h
-+++ gfx/2d/HelpersCairo.h
+--- a/gfx/2d/HelpersCairo.h
+++ b/gfx/2d/HelpersCairo.h
@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su
     case SurfaceFormat::R5G6B5_UINT16:
       return CAIRO_FORMAT_RGB16_565;
--- a/srcpkgs/firefox/patches/fix-tools.patch
+++ b/srcpkgs/firefox/patches/fix-tools.patch
@ -1,5 +1,5 @@
--- tools/profiler/core/platform-linux-android.cpp.orig	2019-01-29 12:09:40.980448579 +0100
-+++ tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
+--- a/tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:09:40.980448579 +0100
+++ b/tools/profiler/core/platform-linux-android.cpp	2019-01-29 12:11:09.689590967 +0100
@@ -497,8 +501,10 @@
 ucontext_t sSyncUContext;
 
--- a/srcpkgs/firefox/patches/fix-wasm-arm.patch
+++ b/srcpkgs/firefox/patches/fix-wasm-arm.patch
@ -1,5 +1,5 @@
--- js/src/wasm/WasmSignalHandlers.cpp
-+++ js/src/wasm/WasmSignalHandlers.cpp
+--- a/js/src/wasm/WasmSignalHandlers.cpp
+++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -243,9 +243,9 @@
 // If you run into compile problems on a tier-3 platform, you can disable the
 // emulation here.
--- a/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
+++ b/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch
@ -1,5 +1,5 @@
--- third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c.orig	2019-01-29 11:20:52.298793223 +0100
-+++ third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
+--- a/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:20:52.298793223 +0100
+++ b/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c	2019-01-29 11:21:48.250250850 +0100
@@ -14,7 +14,7 @@
 #ifndef __GLIBC_PREREQ
 #define __GLIBC_PREREQ(a, b) 0
--- a/srcpkgs/firefox/patches/flac-no-ffvpx.patch
+++ b/srcpkgs/firefox/patches/flac-no-ffvpx.patch
@ -2,8 +2,8 @@ Enable FLAC on platforms without ffvpx like powerpc*

 diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp
 index 53fc3c9937f7..b23771ab80fa 100644
--- dom/media/flac/FlacDecoder.cpp
-+++ dom/media/flac/FlacDecoder.cpp
+--- a/dom/media/flac/FlacDecoder.cpp
+++ b/dom/media/flac/FlacDecoder.cpp
@@ -7,6 +7,7 @@
 #include "FlacDecoder.h"
 #include "MediaContainerType.h"
--- a/srcpkgs/firefox/patches/mallinfo.patch
+++ b/srcpkgs/firefox/patches/mallinfo.patch
@ -1,5 +1,5 @@
--- xpcom/base/nsMemoryReporterManager.cpp.orig	2019-03-19 17:12:20.844810044 +0100
-+++ xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:13:32.505133615 +0100
+--- a/xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:12:20.844810044 +0100
+++ b/xpcom/base/nsMemoryReporterManager.cpp	2019-03-19 17:13:32.505133615 +0100
@@ -123,6 +123,7 @@
   return GetProcSelfSmapsPrivate(aN);
 }
--- a/Show More
+++ b/Show More