srcpkgs/c*: convert patches to -Np1

```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+$,[0-9]\+$\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,$^--- $$./$*,\1a/, s,[.][Oo][Rr][Ii][Gg]$[ /]$,\1, s/[.][Oo][Rr][Ii][Gg]$// s/[.]patched[.]$[^.]$/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,$^+++ $$./$*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ```
2025-06-05 06:33:50 +02:00 · 2021-06-19 09:18:31 +07:00 · 2021-06-19 09:18:31 +07:00 · c987560802
commit c987560802
parent c6ce65d3d0
230 changed files with 743 additions and 821 deletions
--- a/srcpkgs/c-blosc/patches/musl.patch
+++ b/srcpkgs/c-blosc/patches/musl.patch
@ -1,5 +1,5 @@
--- bench/bench.c.orig	2020-03-04 10:56:43.124243579 +0100
+--- a/bench/bench.c	2020-03-04 10:56:43.124243579 +0100
-+++ bench/bench.c	2020-03-04 10:57:31.571747005 +0100
+++ b/bench/bench.c	2020-03-04 10:57:31.571747005 +0100
@@ -38,7 +38,7 @@
   #include <sys/time.h>
 #elif defined(__unix__) || defined(__HAIKU__)
--- a/srcpkgs/c-blosc/template
+++ b/srcpkgs/c-blosc/template
@ -12,7 +12,6 @@ license="BSD-3-Clause, MIT"
 homepage="https://www.blosc.org"
 distfiles="https://github.com/Blosc/c-blosc/archive/v${version}.tar.gz"
 checksum=42c4d3fcce52af9f8e2078f8f57681bfc711706a3330cb72b9b39e05ae18a413
 patch_args=-Np0
 post_install() {
 	vlicense LICENSES/BLOSC.txt
--- a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
+++ b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch
@ -4,8 +4,8 @@ Description: Support OpenSSL 1.1
 structs having been made opaque.
 Bug-Debian: https://bugs.debian.org/828589
--- src/osdep/unix/ssl_unix.c
+--- a/src/osdep/unix/ssl_unix.c
-+++ src/osdep/unix/ssl_unix.c
+++ b/src/osdep/unix/ssl_unix.c
@@ -227,8 +227,16 @@ static char *ssl_start_work (SSLSTREAM *
 				/* disable certificate validation? */
   if (flags & NET_NOVALIDATECERT)
--- a/srcpkgs/c-client/patches/c-client-2006k_GENTOO_amd64-so-fix.patch
+++ b/srcpkgs/c-client/patches/c-client-2006k_GENTOO_amd64-so-fix.patch
@ -1,6 +1,6 @@
 diff -r 7c3e6c6ef2ba src/osdep/unix/Makefile
--- src/osdep/unix/Makefile	Thu Feb 21 18:51:32 2008 +0100
+--- a/src/osdep/unix/Makefile	Thu Feb 21 18:51:32 2008 +0100
-+++ src/osdep/unix/Makefile	Thu Feb 21 18:53:15 2008 +0100
+++ b/src/osdep/unix/Makefile	Thu Feb 21 18:53:15 2008 +0100
@@ -962,6 +962,9 @@ onceenv:
 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
--- a/srcpkgs/c-client/template
+++ b/srcpkgs/c-client/template
@ -11,7 +11,6 @@ homepage="http://www.washington.edu/imap"
 distfiles="http://ftp.ntua.gr/pub/net/mail/imap/imap-${version}.tar.gz"
 checksum=53e15a2b5c1bc80161d42e9f69792a3fa18332b7b771910131004eb520004a28
 nocross=yes
 patch_args=-Np0
 do_configure() {
 	sed \
--- a/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch
+++ b/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch
@ -1,5 +1,5 @@
--- sbin/update-ca-certificates.orig	2015-05-29 11:09:43.922158838 +0200
+--- a/sbin/update-ca-certificates	2015-05-29 11:09:43.922158838 +0200
-+++ sbin/update-ca-certificates	2015-05-29 11:10:06.842632933 +0200
+++ b/sbin/update-ca-certificates	2015-05-29 11:10:06.842632933 +0200
@@ -24,12 +24,12 @@
 verbose=0
 fresh=0
--- a/srcpkgs/ca-certificates/template
+++ b/srcpkgs/ca-certificates/template
@ -13,7 +13,6 @@ license="GPL-2.0-or-later, MPL-2.0"
 homepage="https://tracker.debian.org/pkg/ca-certificates"
 distfiles="${DEBIAN_SITE}/main/c/${pkgname}/${pkgname}_${version}.tar.xz"
 checksum=daa3afae563711c30a0586ddae4336e8e3974c2b627faaca404c4e0141b64665
 patch_args=-Np0
 post_extract() {
 	$BUILD_CC $BUILD_CFLAGS ${FILESDIR}/certdata2pem.c -o ${wrksrc}/mozilla/certdata2pem
--- a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
+++ b/srcpkgs/cabal-install/patches/ghc-8.8.4.patch
@ -1,5 +1,5 @@
--- bootstrap.sh	2001-09-09 03:46:40.000000000 +0200
+--- a/bootstrap.sh	2001-09-09 03:46:40.000000000 +0200
-+++ bootstrap.sh	2020-09-12 15:29:54.913108294 +0200
+++ b/bootstrap.sh	2020-09-12 15:29:54.913108294 +0200
@@ -230,19 +230,19 @@
                        # >= 0.2.* && < 0.6
 MTL_VER="2.2.2";       MTL_VER_REGEXP="[2]\."
--- a/srcpkgs/cabal-install/template
+++ b/srcpkgs/cabal-install/template
@ -13,7 +13,6 @@ distfiles="https://hackage.haskell.org/packages/archive/${pkgname}/${version}/${
 checksum=a0555e895aaf17ca08453fde8b19af96725da8398e027aa43a49c1658a600cb0
 nopie_files="/usr/bin/cabal"
 nocross=yes
 patch_args=-Np0
 do_build() {
 	PREFIX=$PWD/build sh bootstrap.sh --jobs ${XBPS_MAKEJOBS} --user
--- a/srcpkgs/cackey/patches/no-rpath.patch
+++ b/srcpkgs/cackey/patches/no-rpath.patch
@ -1,7 +1,7 @@
 Index: configure.ac
 ===================================================================
--- configure.ac.orig
+--- a/configure.ac
-+++ configure.ac
+++ b/configure.ac
@@ -212,9 +212,6 @@ fi
 dnl Set version script, to limit the scope of symbols
 DC_SETVERSIONSCRIPT(libcackey.vers, libcackey.syms)
--- a/srcpkgs/cackey/template
+++ b/srcpkgs/cackey/template
@ -13,7 +13,6 @@ homepage="http://www.rkeene.org/projects/info/wiki/161"
 distfiles="http://cackey.rkeene.org/download/$version/cackey-$version.tar.gz"
 checksum=e2074055bab8eb1c277bfa3355767c50f792d5b87bf41f9c0d1af0e77f311583
 CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/PCSC"
 patch_args=-Np0
 pre_configure() {
 	autoreconf -fi
--- a/srcpkgs/cadence/patches/QPainterPath.patch
+++ b/srcpkgs/cadence/patches/QPainterPath.patch
@ -1,5 +1,5 @@
--- c++/patchcanvas/canvasbezierline.cpp	2019-11-17 21:34:05.000000000 +0100
+--- a/c++/patchcanvas/canvasbezierline.cpp	2019-11-17 21:34:05.000000000 +0100
-+++ c++/patchcanvas/canvasbezierline.cpp	2020-09-02 13:13:34.042234477 +0200
+++ b/c++/patchcanvas/canvasbezierline.cpp	2020-09-02 13:13:34.042234477 +0200
@@ -18,6 +18,7 @@
 #include "canvasbezierline.h"
@ -8,8 +8,8 @@
 #include "canvasport.h"
 #include "canvasportglow.h"
--- c++/patchcanvas/canvasbezierlinemov.cpp	2019-11-17 21:34:05.000000000 +0100
+--- a/c++/patchcanvas/canvasbezierlinemov.cpp	2019-11-17 21:34:05.000000000 +0100
-+++ c++/patchcanvas/canvasbezierlinemov.cpp	2020-09-02 13:13:27.093234119 +0200
+++ b/c++/patchcanvas/canvasbezierlinemov.cpp	2020-09-02 13:13:27.093234119 +0200
@@ -18,6 +18,7 @@
 #include "canvasbezierlinemov.h"
@ -18,8 +18,8 @@
 #include "canvasport.h"
--- c++/widgets/pixmapdial.cpp	2019-11-17 21:34:05.000000000 +0100
+--- a/c++/widgets/pixmapdial.cpp	2019-11-17 21:34:05.000000000 +0100
-+++ c++/widgets/pixmapdial.cpp	2020-09-02 13:13:16.853233591 +0200
+++ b/c++/widgets/pixmapdial.cpp	2020-09-02 13:13:16.853233591 +0200
@@ -21,6 +21,7 @@
 #include <QtCore/QTimer>
--- a/srcpkgs/cadence/template
+++ b/srcpkgs/cadence/template
@ -16,7 +16,6 @@ license="GPL-2.0-only"
 homepage="http://kxstudio.linuxaudio.org/Applications:Cadence"
 distfiles="https://github.com/falkTX/Cadence/archive/v${version}.tar.gz"
 checksum=e530787ded0d53a3004c7a8260114ddb970c2aea43875d62eccd599ac96e1fd1
 patch_args=-Np0
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
--- a/srcpkgs/calc/patches/endian-32.patch
+++ b/srcpkgs/calc/patches/endian-32.patch
@ -25,8 +25,8 @@ Bug-Debian: http://bugs.debian.org/414893
 Forwarded: yes
 Author: Martin Buck <mbuck@debian.org>
 ---
--- file.c
+--- a/file.c
-+++ file.c
+++ b/file.c
@@ -1367,7 +1367,7 @@
 	ret.len = FILEPOS_BITS/BASEB;
 	ret.v = alloc(ret.len);
--- a/srcpkgs/calc/template
+++ b/srcpkgs/calc/template
@ -11,7 +11,6 @@ homepage="http://www.isthe.com/chongo/tech/comp/calc/index.html"
 distfiles="http://www.isthe.com/chongo/src/calc/calc-${version}.tar.bz2"
 checksum=eb1dc5dd680019e30264109167e20539fe9ac869049d8b1639781a51d1dea84c
 disable_parallel_build=yes
 patch_args=-Np0
 post_extract() {
 	case $XBPS_TARGET_MACHINE in
--- a/srcpkgs/cantata/patches/musl.patch
+++ b/srcpkgs/cantata/patches/musl.patch
@ -1,5 +1,5 @@
--- 3rdparty/solid-lite/backends/udisks2/udisksblock.h.orig	2016-01-08 19:44:42.000000000 +0100
+--- a/3rdparty/solid-lite/backends/udisks2/udisksblock.h	2016-01-08 19:44:42.000000000 +0100
-+++ 3rdparty/solid-lite/backends/udisks2/udisksblock.h	2017-03-09 11:41:06.071250302 +0100
+++ b/3rdparty/solid-lite/backends/udisks2/udisksblock.h	2017-03-09 11:41:06.071250302 +0100
@@ -21,6 +21,7 @@
 #ifndef UDISKS2BLOCK_H
 #define UDISKS2BLOCK_H
@ -8,8 +8,8 @@
 #include <solid-lite/ifaces/block.h>
 #include "udisksdeviceinterface.h"
--- gui/main.cpp.orig	2018-06-16 10:09:13.072771604 +0200
+--- a/gui/main.cpp	2018-06-16 10:09:13.072771604 +0200
-+++ gui/main.cpp	2018-06-16 10:10:00.840162507 +0200
+++ b/gui/main.cpp	2018-06-16 10:10:00.840162507 +0200
@@ -260,7 +260,7 @@
     qInstallMessageHandler(cantataQtMsgHandler);
 }
--- a/srcpkgs/cantata/template
+++ b/srcpkgs/cantata/template
@ -17,4 +17,3 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/cdrummond/cantata"
 distfiles="https://github.com/CDrummond/cantata/releases/download/v${version}/${pkgname}-${version}.tar.bz2"
 checksum=3ed25d0c838720af7ed08b89a30f3e05d6952d40a5f520f29b3558b2eacdec82
 patch_args=-Np0
--- a/srcpkgs/caps/patches/musl.patch
+++ b/srcpkgs/caps/patches/musl.patch
@ -1,5 +1,5 @@
--- basics.h	2019-01-07 16:13:33.353999394 +0100
+--- a/basics.h	2019-01-07 16:13:33.353999394 +0100
-+++ basics.h	2019-01-07 16:13:44.915942123 +0100
+++ b/basics.h	2019-01-07 16:13:44.915942123 +0100
@@ -46,17 +46,18 @@
 #include <assert.h>
--- a/srcpkgs/caps/template
+++ b/srcpkgs/caps/template
@ -11,7 +11,6 @@ license="GPL-3.0-or-later"
 homepage="http://quitte.de/dsp/caps.html"
 distfiles="http://quitte.de/dsp/${pkgname}_${version}.tar.bz2"
 checksum=e7496c5bce05abebe3dcb635926153bbb58a9337a6e423f048d3b61d8a4f98c9
 patch_args=-Np0
 pre_build() {
 	make_build_args="CC=${CXX} LD=${LD}"
--- a/srcpkgs/cargo/patches/fix-serde.diff
+++ b/srcpkgs/cargo/patches/fix-serde.diff
@ -1,8 +1,8 @@
 This patch was downloaded from "https://github.com/alexcrichton/cargo/commit/f097d02ea62111493b9f06d096a94dfddd020415.diff"
 diff --git src/cargo/util/config/de.rs src/cargo/util/config/de.rs
 index 758f5c23f1..a70cd0dce8 100644
--- src/cargo/util/config/de.rs
+--- a/src/cargo/util/config/de.rs
-+++ src/cargo/util/config/de.rs
+++ b/src/cargo/util/config/de.rs
@@ -527,7 +527,7 @@ impl<'de, 'config> de::MapAccess<'de> for ValueDeserializer<'config> {
                 seed.deserialize(Tuple2Deserializer(0i32, path.to_string_lossy()))
             }
--- a/srcpkgs/cargo/patches/link-static.patch
+++ b/srcpkgs/cargo/patches/link-static.patch
@ -1,5 +1,5 @@
--- Cargo.toml	2019-01-02 22:49:06.000000000 +0100
+--- a/Cargo.toml	2019-01-02 22:49:06.000000000 +0100
-+++ Cargo.toml	2019-02-13 15:12:44.616810828 +0100
+++ b/Cargo.toml	2019-02-13 15:12:44.616810828 +0100
@@ -116,3 +116,5 @@ doc = false
 deny-warnings = []
 vendored-openssl = ["openssl/vendored"]
--- a/srcpkgs/cargo/template
+++ b/srcpkgs/cargo/template
@ -14,7 +14,6 @@ homepage="https://crates.io/"
 distfiles="https://github.com/rust-lang/cargo/archive/${version}.tar.gz"
 checksum=59ba1ce05becb4a5e0772d334d75f9dce3d5487ca288ac986e786241bb1cbac5
 replaces="cargo-tree>=0"
 patch_args=-Np0
 build_options="static bindist"
 desc_option_bindist="Generate a tarball for bootstrap"
--- a/srcpkgs/catch2/patches/musl-test.patch
+++ b/srcpkgs/catch2/patches/musl-test.patch
@ -2,8 +2,8 @@ From: Johnnynator
 errno on Musl and Glibc expand differently by one space
 ---
--- scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
+--- a/scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
-+++ -	2020-12-31 16:19:56.118506507 +0100
+++ b/scripts/approvalTests.py	2019-12-28 21:24:04.000000000 +0100
@@ -44,7 +44,7 @@
 # errno macro expands into various names depending on platform, so we need to fix them up as well
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@ -15,7 +15,6 @@ license="BSL-1.0"
 homepage="https://github.com/catchorg/Catch2"
 distfiles="https://github.com/catchorg/Catch2/archive/v${version}/${pkgname}-v${version}.tar.gz"
 checksum=e7eb70b3d0ac2ed7dcf14563ad808740c29e628edde99e973adad373a2b5e4df
 patch_args=-Np0
 post_install() {
 	vlicense LICENSE.txt
--- a/srcpkgs/catdoc/patches/001-XLS_parsing_improvements.patch
+++ b/srcpkgs/catdoc/patches/001-XLS_parsing_improvements.patch
@ -6,8 +6,8 @@ Description: Improve the XLS parsing:
 * Accept different versions of BOF and XF records.
 * Add more #defines for record types.
--- src/xlsparse.c
+--- a/src/xlsparse.c
-+++ src/xlsparse.c
+++ b/src/xlsparse.c
@@ -107,12 +107,13 @@
 			itemsread = catdoc_read(rec, 1, reclen, input);
 			rec[reclen] = '\0';
@ -86,8 +86,8 @@ Description: Improve the XLS parsing:
 				if (!formatTable) {
 					fprintf(stderr,"Out of memory for format table");
 					exit (1);
--- src/xltypes.h
+--- a/src/xltypes.h
-+++ src/xltypes.h
+++ b/src/xltypes.h
@@ -20,7 +20,7 @@
 #define AUTOFILTERINFO 		 0x9D
 #define BACKUP 		         0x40
--- a/srcpkgs/catdoc/patches/002-CVE-2017-11110.patch
+++ b/srcpkgs/catdoc/patches/002-CVE-2017-11110.patch
@ -7,8 +7,8 @@ Author: Andreas Stieger <astieger@suse.com>
 Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
 Last-Update: 2017-07-20
--- src/ole.c
+--- a/src/ole.c
-+++ src/ole.c
+++ b/src/ole.c
@@ -106,6 +106,11 @@ FILE* ole_init(FILE *f, void *buffer, si
 		return NULL;
 	}
--- a/srcpkgs/catdoc/patches/003-Fix_OLENAMELENGTH.patch
+++ b/srcpkgs/catdoc/patches/003-Fix_OLENAMELENGTH.patch
@ -4,8 +4,8 @@ Forwarded: no
 Author: Robert Zavalczki <robert.zavalczki@gmail.com>
 Last-Update: 2017-09-13
--- src/ole.c
+--- a/src/ole.c
-+++ src/ole.c
+++ b/src/ole.c
@@ -342,7 +342,7 @@
 	e->blocks=NULL;
--- a/srcpkgs/catdoc/template
+++ b/srcpkgs/catdoc/template
@ -11,7 +11,6 @@ license="GPL-2.0-only"
 homepage="http://www.wagner.pp.ru/~vitus/software/catdoc/"
 distfiles="http://ftp.wagner.pp.ru/pub/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796
 patch_args=-Np0
 do_install() {
 	vmkdir usr/share/man/man1
--- a/srcpkgs/cbang/patches/sys_time_h.patch
+++ b/srcpkgs/cbang/patches/sys_time_h.patch
@ -1,5 +1,5 @@
--- src/cbang/time/Timer.h	2020-01-20 01:56:06.000000000 +0100
+--- a/src/cbang/time/Timer.h	2020-01-20 01:56:06.000000000 +0100
-+++ src/cbang/time/Timer.h	2020-04-06 09:05:08.440687355 +0200
+++ b/src/cbang/time/Timer.h	2020-04-06 09:05:08.440687355 +0200
@@ -38,9 +38,7 @@
 #endif // _WIN32
--- a/srcpkgs/cbang/template
+++ b/srcpkgs/cbang/template
@ -14,7 +14,6 @@ license="LGPL-2.1-only"
 homepage="https://github.com/CauldronDevelopmentLLC/cbang"
 distfiles="https://github.com/CauldronDevelopmentLLC/cbang/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=8aa5efacf419b712b5bd0172c9d56301bdcbd477cb590ceec25c3595a192e9c0
 patch_args=-Np0
 pre_build() {
 	make_build_args+=" prefix=$DESTDIR/usr"
--- a/srcpkgs/ccextractor/patches/disable_arm_neon.patch
+++ b/srcpkgs/ccextractor/patches/disable_arm_neon.patch
@ -1,5 +1,5 @@
--- src/thirdparty/libpng/pngpriv.h.orig	2021-06-13 21:05:33.000000000 +0200
+--- a/src/thirdparty/libpng/pngpriv.h	2021-06-13 21:05:33.000000000 +0200
-+++ src/thirdparty/libpng/pngpriv.h	2021-06-17 17:35:17.217940102 +0200
+++ b/src/thirdparty/libpng/pngpriv.h	2021-06-17 17:35:17.217940102 +0200
@@ -107,6 +107,7 @@
  * this in $(CC), e.g. "CC=gcc -mfpu=neon", but people who build libpng rarely
  * do this.
--- a/srcpkgs/ccextractor/template
+++ b/srcpkgs/ccextractor/template
@ -15,7 +15,6 @@ changelog="https://raw.githubusercontent.com/CCExtractor/ccextractor/master/docs
 distfiles="https://github.com/CCExtractor/${pkgname}/archive/v${version}.tar.gz"
 checksum=bbe8d95347d0cf31bd26489b733fd959a7b98c681f14c59309bff54713fd539d
 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/tesseract -DPNG_POWERPC_VSX_OPT=0 -fcommon"
 patch_args=-Np0
 pre_configure() {
 	sed -i -e "s/tesseract --version/tesseract-ocr --version/g" configure.ac
--- a/srcpkgs/ccl/patches/musl-fixes.patch
+++ b/srcpkgs/ccl/patches/musl-fixes.patch
@ -1,5 +1,5 @@
--- lisp-kernel/lisp-debug.c	2015-11-07 07:10:11.000000000 +1100
+--- a/lisp-kernel/lisp-debug.c	2015-11-07 07:10:11.000000000 +1100
-+++ lisp-kernel/lisp-debug.c	2016-12-18 10:35:29.070710875 +1100
+++ b/lisp-kernel/lisp-debug.c	2016-12-18 10:35:29.070710875 +1100
@@ -36,6 +36,11 @@
 #include <dlfcn.h>
 #endif
@ -12,8 +12,8 @@
 FILE *dbgout = NULL, *dbgin=NULL;
--- lisp-kernel/pmcl-kernel.c	2015-11-07 07:10:11.000000000 +1100
+--- a/lisp-kernel/pmcl-kernel.c	2015-11-07 07:10:11.000000000 +1100
-+++ lisp-kernel/pmcl-kernel.c	2016-12-18 10:34:36.854708181 +1100
+++ b/lisp-kernel/pmcl-kernel.c	2016-12-18 10:34:36.854708181 +1100
@@ -36,7 +36,7 @@
 #endif
@ -34,8 +34,8 @@
 +  #endif
   /*
    * According arch_prctl(2), there's no function prototype for
--- lisp-kernel/thread_manager.c	2015-11-07 07:10:11.000000000 +1100
+--- a/lisp-kernel/thread_manager.c	2015-11-07 07:10:11.000000000 +1100
-+++ lisp-kernel/thread_manager.c	2016-12-18 10:32:35.095701899 +1100
+++ b/lisp-kernel/thread_manager.c	2016-12-18 10:32:35.095701899 +1100
@@ -185,7 +185,7 @@
 void
 set_thread_affinity(TCR *target, unsigned cpuno)
@ -45,8 +45,8 @@
 #ifndef ANDROID                 /* too useful to be in Android ... */
   pthread_t thread = (pthread_t)(target->osid);
   cpu_set_t mask;
--- lisp-kernel/x86-exceptions.c	2015-11-07 07:10:11.000000000 +1100
+--- a/lisp-kernel/x86-exceptions.c	2015-11-07 07:10:11.000000000 +1100
-+++ lisp-kernel/x86-exceptions.c	2016-12-18 10:30:47.952696372 +1100
+++ b/lisp-kernel/x86-exceptions.c	2016-12-18 10:30:47.952696372 +1100
@@ -29,7 +29,9 @@
 #ifdef LINUX
 #include <strings.h>
--- a/srcpkgs/ccl/patches/nopie.patch
+++ b/srcpkgs/ccl/patches/nopie.patch
@ -1,5 +1,5 @@
--- lisp-kernel/linuxx8664/Makefile.orig
+--- a/lisp-kernel/linuxx8664/Makefile
-+++ lisp-kernel/linuxx8664/Makefile
+++ b/lisp-kernel/linuxx8664/Makefile
@@ -69,7 +69,7 @@
 all:	../../lx86cl64
@ -9,8 +9,8 @@
 LINK_MAP = ./elf_x86_64.x
 USE_LINK_MAP = # -T ./elf_x86_64.x
--- lisp-kernel/linuxx8632/Makefile.orig
+--- a/lisp-kernel/linuxx8632/Makefile
-+++ lisp-kernel/linuxx8632/Makefile
+++ b/lisp-kernel/linuxx8632/Makefile
@@ -69,7 +69,7 @@
 all:	../../lx86cl
--- a/srcpkgs/ccl/template
+++ b/srcpkgs/ccl/template
@ -21,7 +21,6 @@ nopie=1
 nostrip=1
 disable_parallel_build=1
 python_version=3
 patch_args=-Np0
 case $XBPS_MACHINE in
 	x86_64*) _arch=64 ;;
--- a/srcpkgs/cclive/patches/fix-boost-067.patch
+++ b/srcpkgs/cclive/patches/fix-boost-067.patch
@ -1,5 +1,5 @@
--- src/cc/progressbar.h	2013-11-23 11:46:27.000000000 +0200
+--- a/src/cc/progressbar.h	2013-11-23 11:46:27.000000000 +0200
-+++ src/cc/progressbar.h	2018-06-03 02:23:36.603414837 +0300
+++ b/src/cc/progressbar.h	2018-06-03 02:23:36.603414837 +0300
@@ -316,7 +316,7 @@ private:
   static inline std::string eta_from_seconds(const double s)
--- a/srcpkgs/cclive/patches/fix-missing-iostream-includes.patch
+++ b/srcpkgs/cclive/patches/fix-missing-iostream-includes.patch
@ -1,7 +1,7 @@
 diff --git a/src/cc/error.h b/src/cc/error.h
 index c1d80ab..98a4a10 100644
--- src/cc/error.h
+--- a/src/cc/error.h
-+++ src/cc/error.h
+++ b/src/cc/error.h
@@ -21,6 +21,7 @@
 #ifndef cc__error_h
 #define cc__error_h
@ -12,8 +12,8 @@ index c1d80ab..98a4a10 100644
 #include <boost/exception/diagnostic_information.hpp>
 diff --git a/src/cc/log.h b/src/cc/log.h
 index 2b2c986..77708f5 100644
--- src/cc/log.h
+--- a/src/cc/log.h
-+++ src/cc/log.h
+++ b/src/cc/log.h
@@ -21,6 +21,7 @@
 #ifndef cc__log_h
 #define cc__log_h
@ -24,8 +24,8 @@ index 2b2c986..77708f5 100644
 #include <boost/iostreams/filtering_stream.hpp>
 diff --git a/src/cc/options.h b/src/cc/options.h
 index 6c45ce8..d757bfb 100644
--- src/cc/options.h
+--- a/src/cc/options.h
-+++ src/cc/options.h
+++ b/src/cc/options.h
@@ -21,6 +21,8 @@
 #ifndef cc__options_h
 #define cc__options_h
--- a/srcpkgs/cclive/patches/musl-strerror_r.patch
+++ b/srcpkgs/cclive/patches/musl-strerror_r.patch
@ -1,5 +1,5 @@
--- src/cc/error.h	2018-12-29 15:15:13.042776367 +0100
+--- a/src/cc/error.h	2018-12-29 15:15:13.042776367 +0100
-+++ -	2018-12-29 15:24:13.933668360 +0100
+++ b/src/cc/error.h	2018-12-29 15:15:13.042776367 +0100
@@ -40,7 +40,8 @@
 static inline std::string strerror(const int ec)
 {
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@ -12,7 +12,6 @@ homepage="http://cclive.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=2edeaf5d76455723577e0b593f0322a97f1e0c8b0cffcc70eca8b5d17374a495
 CPPFLAGS="-P"
 patch_args=-Np0
 post_install() {
 	vlicense COPYING
--- a/srcpkgs/ccsm/patches/prefix.patch
+++ b/srcpkgs/ccsm/patches/prefix.patch
@ -1,5 +1,5 @@
--- setup.py	2017-03-02 11:35:41.688884000 -0800
+--- a/setup.py	2017-03-02 11:35:41.688884000 -0800
-+++ setup.py	2017-03-02 11:36:07.745885086 -0800
+++ b/setup.py	2017-03-02 11:36:07.745885086 -0800
@@ -103,7 +103,7 @@
 if not prefix and "PREFIX" in os.environ:
     prefix = os.environ["PREFIX"]
--- a/srcpkgs/ccsm/template
+++ b/srcpkgs/ccsm/template
@ -12,7 +12,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/compiz-reloaded"
 distfiles="https://github.com/compiz-reloaded/ccsm/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=99192a021631cc5a82131fbc03d2f1b7e587892878902113d9bde57a6b00bfa4
 patch_args=-Np0
 if [ -z "$CROSS_BUILD" ]; then
 	makedepends+=" python-gobject-devel"
--- a/srcpkgs/cdb/patches/errno.patch
+++ b/srcpkgs/cdb/patches/errno.patch
@ -1,5 +1,5 @@
--- error.h	2016-02-22 14:53:04.541809816 +0000
+--- a/error.h	2016-02-22 14:53:04.541809816 +0000
-+++ error.h	2016-02-22 14:54:20.978714226 +0000
+++ b/error.h	2016-02-22 14:54:20.978714226 +0000
@@ -1,3 +1,4 @@
 +#include <errno.h>
 #ifndef ERROR_H
--- a/srcpkgs/cdb/patches/makefile.patch
+++ b/srcpkgs/cdb/patches/makefile.patch
@ -1,5 +1,5 @@
--- Makefile.orig	2000-02-19 15:42:05.000000000 -0500
+--- a/Makefile	2000-02-19 15:42:05.000000000 -0500
-+++ Makefile	2016-02-22 16:58:48.006067048 -0500
+++ b/Makefile	2016-02-22 16:58:48.006067048 -0500
@@ -2,7 +2,7 @@
 SHELL=/bin/sh
--- a/srcpkgs/cdb/template
+++ b/srcpkgs/cdb/template
@ -9,7 +9,6 @@ license="Public Domain"
 homepage="http://cr.yp.to/cdb.html"
 distfiles="http://cr.yp.to/cdb/cdb-${version}.tar.gz"
 checksum="1919577799a50c080a8a05a1cbfa5fa7e7abc823d8d7df2eeb181e624b7952c5"
 patch_args=-Np0
 alternatives="
 cdb:cdbdump:/usr/bin/cdb-dump
--- a/srcpkgs/cdecl/patches/fix-reserved_keyword.patch
+++ b/srcpkgs/cdecl/patches/fix-reserved_keyword.patch
@ -1,5 +1,5 @@
--- cdecl.c	2009-10-20 11:25:25.000000000 +0200
+--- a/cdecl.c	2009-10-20 11:25:25.000000000 +0200
-+++ cdecl.c	2016-10-21 12:29:34.791599362 +0200
+++ b/cdecl.c	2016-10-21 12:29:34.791599362 +0200
@@ -245,7 +245,7 @@
 /* for unsupported combinations of types. */
 void mbcheck()
--- a/srcpkgs/cdecl/template
+++ b/srcpkgs/cdecl/template
@ -14,7 +14,6 @@ homepage="http://cdecl.org/"
 distfiles="${homepage}files/${wrksrc}.tar.gz"
 checksum=9ee6402be7e4f5bb5e6ee60c6b9ea3862935bf070e6cecd0ab0842305406f3ac
 CFLAGS="-DUSE_READLINE"
 patch_args=-Np0
 pre_build() {
 	flex -l -o cdlex.c cdlex.l
--- a/srcpkgs/cdm/patches/fix-bashisms.patch
+++ b/srcpkgs/cdm/patches/fix-bashisms.patch
@ -2,8 +2,8 @@ Source: maxice8
 Upstream: to be upstreamed
 Reason: fixes running it with POSIX shells
--- src/profile.sh
+--- a/src/profile.sh
-+++ src/profile.sh
+++ b/src/profile.sh
@@ -1,8 +1,8 @@
 # To avoid potential situation where cdm(1) crashes on every TTY, here we
 # default to execute cdm(1) on tty1 only, and leave other TTYs untouched.
--- a/srcpkgs/cdm/template
+++ b/srcpkgs/cdm/template
@ -9,7 +9,6 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/evertiro/cdm"
 distfiles="https://github.com/evertiro/cdm/archive/${version}.tar.gz"
 checksum=530042165ce65cdff3ec62ba9f077d0e8c6744c13f5d449d84fe2506a79d2e56
 patch_args=-Np0
 do_install() {
 	sed -i 's| /| $PKGDESTDIR/|g' install.sh
--- a/srcpkgs/cdparanoia/patches/autoconf-init-ac_cv_objext.patch
+++ b/srcpkgs/cdparanoia/patches/autoconf-init-ac_cv_objext.patch
@ -2,8 +2,8 @@ AC_PROG_CC will initialise a lot of value which is used by
 - AC_HEADER_STDC; and
 - AC_CHECK_SIZEOF
 ---
--- configure.in
+--- a/configure.in
-+++ configure.in
+++ b/configure.in
@@ -5,9 +5,7 @@ cp $srcdir/configure.sub $srcdir/config.sub
 AC_CANONICAL_HOST
--- a/srcpkgs/cdparanoia/patches/gcc.diff
+++ b/srcpkgs/cdparanoia/patches/gcc.diff
@ -1,7 +1,7 @@
 Index: interface/test_interface.c
 ===================================================================
--- interface/test_interface.c	(Revision 15337)
+--- a/interface/test_interface.c	(Revision 15337)
-+++ interface/test_interface.c	(Revision 15340)
+++ b/interface/test_interface.c	(Revision 15340)
@@ -66,9 +66,9 @@
   if(!fd)fd=fdopen(d->cdda_fd,"r");
@ -16,8 +16,8 @@ Index: interface/test_interface.c
   sectors-=1;
 Index: interface/cdda_interface.h
 ===================================================================
--- interface/cdda_interface.h	(Revision 15337)
+--- a/interface/cdda_interface.h	(Revision 15337)
-+++ interface/cdda_interface.h	(Revision 15340)
+++ b/interface/cdda_interface.h	(Revision 15340)
@@ -84,7 +84,7 @@
   int is_atapi;
   int is_mmc;
@ -29,8 +29,8 @@ Index: interface/cdda_interface.h
 Index: interface/interface.c
 ===================================================================
--- interface/interface.c	(Revision 15337)
+--- a/interface/interface.c	(Revision 15337)
-+++ interface/interface.c	(Revision 15340)
+++ b/interface/interface.c	(Revision 15340)
@@ -39,9 +39,9 @@
     if(d->drive_model)free(d->drive_model);
     if(d->cdda_fd!=-1)close(d->cdda_fd);
@ -55,8 +55,8 @@ Index: interface/interface.c
 Index: interface/scsi_interface.c
 ===================================================================
--- interface/scsi_interface.c	(Revision 15337)
+--- a/interface/scsi_interface.c	(Revision 15337)
-+++ interface/scsi_interface.c	(Revision 15340)
+++ b/interface/scsi_interface.c	(Revision 15340)
@@ -15,13 +15,13 @@
 static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
   struct timespec tv1;
@ -490,8 +490,8 @@ Index: interface/scsi_interface.c
 }
 Index: interface/cooked_interface.c
 ===================================================================
--- interface/cooked_interface.c	(Revision 15337)
+--- a/interface/cooked_interface.c	(Revision 15337)
-+++ interface/cooked_interface.c	(Revision 15340)
+++ b/interface/cooked_interface.c	(Revision 15340)
@@ -13,13 +13,13 @@
 static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
   struct timespec tv1;
@ -512,8 +512,8 @@ Index: interface/cooked_interface.c
 }
 Index: interface/scan_devices.c
 ===================================================================
--- interface/scan_devices.c	(Revision 15337)
+--- a/interface/scan_devices.c	(Revision 15337)
-+++ interface/scan_devices.c	(Revision 15340)
+++ b/interface/scan_devices.c	(Revision 15340)
@@ -264,11 +264,11 @@
   d->interface=COOKED_IOCTL;
   d->bigendianp=-1; /* We don't know yet... */
--- a/srcpkgs/cdparanoia/patches/makefile.in-install.patch
+++ b/srcpkgs/cdparanoia/patches/makefile.in-install.patch
@ -1,5 +1,5 @@
--- Makefile.in
+--- a/Makefile.in
-+++ Makefile.in
+++ b/Makefile.in
@@ -19,10 +19,10 @@ RANLIB=@RANLIB@
 INSTALL=@INSTALL@
 prefix=@prefix@
--- a/srcpkgs/cdparanoia/patches/musl.patch
+++ b/srcpkgs/cdparanoia/patches/musl.patch
@ -1,5 +1,5 @@
--- utils.h.orig	2020-04-13 01:11:27.959275309 +0200
+--- a/utils.h	2020-04-13 01:11:27.959275309 +0200
-+++ utils.h	2020-04-13 01:11:38.213384799 +0200
+++ b/utils.h	2020-04-13 01:11:38.213384799 +0200
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <errno.h>
--- a/srcpkgs/cdparanoia/template
+++ b/srcpkgs/cdparanoia/template
@ -11,7 +11,6 @@ license="GPL-2.0-or-later"
 homepage="https://www.xiph.org/paranoia/"
 distfiles="http://downloads.xiph.org/releases/$pkgname/$pkgname-III-$version.src.tgz"
 checksum=005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
 patch_args=-Np0
 CFLAGS="-Du_int16_t=uint16_t -Du_int32_t=uint32_t"
 disable_parallel_build=yes
--- a/srcpkgs/cegui/patches/fix-ccache-rule.patch
+++ b/srcpkgs/cegui/patches/fix-ccache-rule.patch
@ -3,8 +3,8 @@ Set the ccache prefix by means of RULE_LAUNCH_COMPILE and
 RULE_LAUNCH_LINK only, if the environment's variable CXX is
 not already a symbolic link to ccache.
--- CMakeLists.txt
+--- a/CMakeLists.txt
-+++ CMakeLists.txt
+++ b/CMakeLists.txt
@@ -137,8 +137,14 @@
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
--- a/srcpkgs/cegui/patches/musl_execinfo.patch
+++ b/srcpkgs/cegui/patches/musl_execinfo.patch
@ -1,5 +1,5 @@
--- cegui/src/Exceptions.cpp
+--- a/cegui/src/Exceptions.cpp
-+++ cegui/src/Exceptions.cpp
+++ b/cegui/src/Exceptions.cpp
@@ -39,7 +39,7 @@
 #   include <dbghelp.h>
 #elif defined(__ANDROID__)
--- a/srcpkgs/cegui/template
+++ b/srcpkgs/cegui/template
@ -23,7 +23,6 @@ homepage="http://cegui.org.uk/"
 distfiles="https://github.com/cegui/cegui/archive/${_githash}.tar.gz"
 checksum=70156257313b81d068d6592887157dd16b91d7bc0dfdcba02a96ed371d329e64
 replaces="cegui-data>=0 cegui-sample>=0"
 patch_args=-Np0
 build_options="gtk irrlicht ogre python"
 desc_option_irrlicht="Enable support for Irrlicht"
--- a/srcpkgs/cegui07/patches/fix-build.patch
+++ b/srcpkgs/cegui07/patches/fix-build.patch
@ -1,5 +1,5 @@
--- cegui/include/CEGUISystem.h.orig
+--- a/cegui/include/CEGUISystem.h
-+++ cegui/include/CEGUISystem.h
+++ b/cegui/include/CEGUISystem.h
@@ -1123,12 +1123,6 @@
            ScriptModule* scriptModule, const String& configFile,
            const String& logFile);
@ -27,8 +27,8 @@
 };
 } // End of  CEGUI namespace section
--- cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h.orig
+--- a/cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h
-+++ cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h
+++ b/cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h
@@ -291,12 +291,6 @@
     */
     OpenGLRenderer(const Size& display_size, const TextureTargetType tt_type);
@ -56,8 +56,8 @@
   };
 } // End of  CEGUI namespace section
--- cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp.orig
+--- a/cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
-+++ cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
+++ b/cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
@@ -145,7 +145,7 @@
                 processElement(childNode->ToElement());
                 break;
@ -67,8 +67,8 @@
                     d_handler->text((utf8*)childNode->ToText()->Value());
                 break;
--- configure.ac.orig
+--- a/configure.ac
-+++ configure.ac
+++ b/configure.ac
@@ -14,7 +14,8 @@
 AC_INIT([CEGUI], [CEGUI_RELEASE_VERSION], [http://mantis.cegui.org.uk/], [CEGUI])
--- a/srcpkgs/cegui07/template
+++ b/srcpkgs/cegui07/template
@ -20,7 +20,6 @@ license="MIT"
 homepage="http://cegui.org.uk/"
 distfiles="${SOURCEFORGE_SITE}/crayzedsgui/CEGUI%20Mk-2/${version}/CEGUI-${version}.tar.gz"
 checksum=7c3b264def08b46de749c2acaba363e907479d924612436f3bd09da2e474bb8c
 patch_args=-Np0
 build_options="irrlicht python"
 desc_option_irrlicht="Enable support for Irrlicht"
--- a/srcpkgs/celestia-glut/patches/NULL_notdecleared.patch
+++ b/srcpkgs/celestia-glut/patches/NULL_notdecleared.patch
@ -1,5 +1,5 @@
--- src/celengine/frametree.h.orig	2014-04-26 16:08:47.217900392 +0200
+--- a/src/celengine/frametree.h	2014-04-26 16:08:47.217900392 +0200
-+++ src/celengine/frametree.h	2014-04-26 16:09:09.601899991 +0200
+++ b/src/celengine/frametree.h	2014-04-26 16:09:09.601899991 +0200
@@ -13,6 +13,7 @@
 #ifndef _CELENGINE_FRAMETREE_H_
 #define _CELENGINE_FRAMETREE_H_
--- a/srcpkgs/celestia-glut/patches/Z_BEST_COMPRESSION.patch
+++ b/srcpkgs/celestia-glut/patches/Z_BEST_COMPRESSION.patch
@ -1,5 +1,5 @@
--- src/celestia/imagecapture.cpp.orig	2014-04-26 16:15:37.185893050 +0200
+--- a/src/celestia/imagecapture.cpp	2014-04-26 16:15:37.185893050 +0200
-+++ src/celestia/imagecapture.cpp	2014-04-26 16:16:56.697891627 +0200
+++ b/src/celestia/imagecapture.cpp	2014-04-26 16:16:56.697891627 +0200
@@ -31,6 +31,9 @@
 #include "png.h"
 #endif
--- a/srcpkgs/celestia-glut/patches/fix-stdint_redefine.patch
+++ b/srcpkgs/celestia-glut/patches/fix-stdint_redefine.patch
@ -1,7 +1,7 @@
 Do not try to redefine INT64_MAX, if it is already defined.
--- src/celutil/basictypes.h	2011-06-05 18:11:15.000000000 +0200
+--- a/src/celutil/basictypes.h	2011-06-05 18:11:15.000000000 +0200
-+++ src/celutil/basictypes.h	2016-09-02 17:41:33.335187908 +0200
+++ b/src/celutil/basictypes.h	2016-09-02 17:41:33.335187908 +0200
@@ -31,7 +31,9 @@
 #include <limits>
 typedef          int64_t int64;
--- a/srcpkgs/celestia-glut/patches/memcpy_notdecleared.patch
+++ b/srcpkgs/celestia-glut/patches/memcpy_notdecleared.patch
@ -1,5 +1,5 @@
--- src/celengine/image.cpp.orig	2014-04-26 14:41:56.359993709 +0200
+--- a/src/celengine/image.cpp	2014-04-26 14:41:56.359993709 +0200
-+++ src/celengine/image.cpp	2014-04-26 14:42:16.886993341 +0200
+++ b/src/celengine/image.cpp	2014-04-26 14:42:16.886993341 +0200
@@ -42,6 +42,7 @@
 #include "jpeglib.h"
 #else
@ -9,8 +9,8 @@
 #endif
 }
--- src/celengine/texture.cpp.orig	2014-04-26 15:54:19.937915924 +0200
+--- a/src/celengine/texture.cpp	2014-04-26 15:54:19.937915924 +0200
-+++ src/celengine/texture.cpp	2014-04-26 15:54:46.992915439 +0200
+++ b/src/celengine/texture.cpp	2014-04-26 15:54:46.992915439 +0200
@@ -28,6 +28,7 @@
 #include <cstdlib>
 #include <cstdio>
--- a/srcpkgs/celestia-glut/patches/missing_mathlib.patch
+++ b/srcpkgs/celestia-glut/patches/missing_mathlib.patch
@ -1,5 +1,5 @@
--- src/celmath/intersect.h.orig	2014-04-26 15:57:58.793912004 +0200
+--- a/src/celmath/intersect.h	2014-04-26 15:57:58.793912004 +0200
-+++ src/celmath/intersect.h	2014-04-26 16:00:49.024908956 +0200
+++ b/src/celmath/intersect.h	2014-04-26 16:00:49.024908956 +0200
@@ -15,7 +15,7 @@
 #include "ray.h"
 #include "sphere.h"
--- a/srcpkgs/celestia-glut/template
+++ b/srcpkgs/celestia-glut/template
@ -14,7 +14,6 @@ license="GPL-2.0-only"
 homepage="https://celestia.space"
 distfiles="${SOURCEFORGE_SITE}/celestia/celestia-${version}.tar.gz"
 checksum="d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4"
 patch_args=-Np0
 provides="celestia-${version}_${revision}"
 replaces="celestia>=0"
--- a/srcpkgs/celestia-gtk/patches/NULL_notdecleared.patch
+++ b/srcpkgs/celestia-gtk/patches/NULL_notdecleared.patch
@ -1,5 +1,5 @@
--- src/celengine/frametree.h.orig	2014-04-26 16:08:47.217900392 +0200
+--- a/src/celengine/frametree.h	2014-04-26 16:08:47.217900392 +0200
-+++ src/celengine/frametree.h	2014-04-26 16:09:09.601899991 +0200
+++ b/src/celengine/frametree.h	2014-04-26 16:09:09.601899991 +0200
@@ -13,6 +13,7 @@
 #ifndef _CELENGINE_FRAMETREE_H_
 #define _CELENGINE_FRAMETREE_H_
--- a/srcpkgs/celestia-gtk/patches/Z_BEST_COMPRESSION.patch
+++ b/srcpkgs/celestia-gtk/patches/Z_BEST_COMPRESSION.patch
@ -1,5 +1,5 @@
--- src/celestia/imagecapture.cpp.orig	2014-04-26 16:15:37.185893050 +0200
+--- a/src/celestia/imagecapture.cpp	2014-04-26 16:15:37.185893050 +0200
-+++ src/celestia/imagecapture.cpp	2014-04-26 16:16:56.697891627 +0200
+++ b/src/celestia/imagecapture.cpp	2014-04-26 16:16:56.697891627 +0200
@@ -31,6 +31,9 @@
 #include "png.h"
 #endif
--- a/srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch
+++ b/srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch
@ -1,5 +1,5 @@
--- src/celutil/basictypes.h	2011-06-05 18:11:15.000000000 +0200
+--- a/src/celutil/basictypes.h	2011-06-05 18:11:15.000000000 +0200
-+++ src/celutil/basictypes.h	2016-09-02 17:41:33.335187908 +0200
+++ b/src/celutil/basictypes.h	2016-09-02 17:41:33.335187908 +0200
@@ -31,7 +31,9 @@
 #include <limits>
 typedef          int64_t int64;
--- a/srcpkgs/celestia-gtk/patches/memcpy_notdecleared.patch
+++ b/srcpkgs/celestia-gtk/patches/memcpy_notdecleared.patch
@ -1,5 +1,5 @@
--- src/celengine/image.cpp.orig	2014-04-26 14:41:56.359993709 +0200
+--- a/src/celengine/image.cpp	2014-04-26 14:41:56.359993709 +0200
-+++ src/celengine/image.cpp	2014-04-26 14:42:16.886993341 +0200
+++ b/src/celengine/image.cpp	2014-04-26 14:42:16.886993341 +0200
@@ -42,6 +42,7 @@
 #include "jpeglib.h"
 #else
@ -9,8 +9,8 @@
 #endif
 }
--- src/celengine/texture.cpp.orig	2014-04-26 15:54:19.937915924 +0200
+--- a/src/celengine/texture.cpp	2014-04-26 15:54:19.937915924 +0200
-+++ src/celengine/texture.cpp	2014-04-26 15:54:46.992915439 +0200
+++ b/src/celengine/texture.cpp	2014-04-26 15:54:46.992915439 +0200
@@ -28,6 +28,7 @@
 #include <cstdlib>
 #include <cstdio>
--- a/srcpkgs/celestia-gtk/patches/missing_mathlib.patch
+++ b/srcpkgs/celestia-gtk/patches/missing_mathlib.patch
@ -1,5 +1,5 @@
--- src/celmath/intersect.h.orig	2014-04-26 15:57:58.793912004 +0200
+--- a/src/celmath/intersect.h	2014-04-26 15:57:58.793912004 +0200
-+++ src/celmath/intersect.h	2014-04-26 16:00:49.024908956 +0200
+++ b/src/celmath/intersect.h	2014-04-26 16:00:49.024908956 +0200
@@ -15,7 +15,7 @@
 #include "ray.h"
 #include "sphere.h"
--- a/srcpkgs/celestia-gtk/template
+++ b/srcpkgs/celestia-gtk/template
@ -14,7 +14,6 @@ license="GPL-2.0-only"
 homepage="https://celestia.space"
 distfiles="${SOURCEFORGE_SITE}/celestia/celestia-${version}.tar.gz"
 checksum="d35570ccb9440fc0bd3e73eb9b4c3e8a4c25f3ae444a13d1175053fa16dc34c4"
 patch_args=-Np0
 provides="celestia-${version}_${revision}"
 replaces="celestia>=0"
--- a/srcpkgs/chafa/patches/i686-musl.patch
+++ b/srcpkgs/chafa/patches/i686-musl.patch
@ -1,5 +1,5 @@
--- chafa/internal/chafa-popcnt.c
+--- a/chafa/internal/chafa-popcnt.c
-+++ chafa/internal/chafa-popcnt.c
+++ b/chafa/internal/chafa-popcnt.c
@@ -23,6 +23,10 @@
 #include "chafa/chafa.h"
 #include "chafa/chafa-private.h"
--- a/srcpkgs/chafa/template
+++ b/srcpkgs/chafa/template
@ -11,7 +11,6 @@ license="LGPL-3.0-or-later"
 homepage="https://hpjansson.org/chafa/"
 distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz"
 checksum=0706e101a6e0e806335aeb57445e2f6beffe0be29a761f561979e81691c2c681
 patch_args=-Np0
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*) ;;
--- a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
+++ b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch
@ -1,7 +1,7 @@
 diff --git chatterino.pro chatterino.pro
 index d8b14bbe..f7657f06 100644
--- chatterino.pro
+--- a/chatterino.pro
-+++ chatterino.pro
+++ b/chatterino.pro
@@ -12,10 +12,17 @@
 #  - BOOST_DIRECTORY (C:\local\boost\ by default) (Windows only)
@ -40,8 +40,8 @@ index d8b14bbe..f7657f06 100644
     message("Using conan packages")
 diff --git src/common/Credentials.cpp src/common/Credentials.cpp
 index 87abecb9..5de78130 100644
--- src/common/Credentials.cpp
+--- a/src/common/Credentials.cpp
-+++ src/common/Credentials.cpp
+++ b/src/common/Credentials.cpp
@@ -1,12 +1,12 @@
 #include "Credentials.hpp"
--- a/srcpkgs/chatterino2/template
+++ b/srcpkgs/chatterino2/template
@ -29,7 +29,6 @@ e8755e68ff6fc39b4338d424ee9aed2ed5a8eab6eb37af69de2ff21b8dc94e66
 f387cc7eaf27dec462bc85a212619f8086167cf0b47e11825b8580d35a740dfe
 5a5cd8338fcb0a14a4bbe0840f83505d0444a9000956145e85e5550feeb744b0
 eb492b89e67f4ec632bd43f2701d53e355f1d1afbec3cd3af5891c1a6aaaa454"
 patch_args=-Np0
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
--- a/srcpkgs/chatty/patches/config_dir.patch
+++ b/srcpkgs/chatty/patches/config_dir.patch
@ -1,5 +1,5 @@
-*** src/chatty/Chatty.java	2017-12-26 11:56:51.000000000 -0500
+*** a/src/chatty/Chatty.java	2017-12-26 11:56:51.000000000 -0500
--- src/chatty/Chatty.patched.java	2018-02-19 04:41:33.348588121 -0500
+--- a/src/chatty/Chatty.java	2018-02-19 04:41:33.348588121 -0500
 ***************
 *** 91,97 ****
       * Custom Settings directory, either the current working directory if the
--- a/srcpkgs/chatty/patches/disable_version_check.patch
+++ b/srcpkgs/chatty/patches/disable_version_check.patch
@ -1,5 +1,5 @@
-*** src/chatty/Chatty.java	2018-02-19 04:22:40.961744905 -0500
+*** a/src/chatty/Chatty.java	2018-02-19 04:22:40.961744905 -0500
--- src/chatty/Chatty.patched.java	2018-02-19 04:24:16.080555756 -0500
+--- a/src/chatty/Chatty.java	2018-02-19 04:24:16.080555756 -0500
 ***************
 *** 60,66 ****
       * Enable Version Checker (if you compile and distribute this yourself, you
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@ -10,7 +10,6 @@ license="GPL-3.0-only"
 homepage="http://chatty.github.io/"
 distfiles="https://github.com/chatty/chatty/archive/v${version}.tar.gz"
 checksum=2eed3a4ed4f1ea58d89e535182bd32771522e4bccb5aa3bf4329aec9d7ab554c
 patch_args=-Np0
 do_build() {
 	gradle shadowJar
--- a/srcpkgs/chkrootkit/patches/fcntl.patch
+++ b/srcpkgs/chkrootkit/patches/fcntl.patch
@ -1,5 +1,5 @@
--- chklastlog.c
+--- a/chklastlog.c
-+++ chklastlog.c
+++ b/chklastlog.c
@@ -41,6 +41,7 @@ int main () { return 0; }
 #include <stdlib.h>
 #endif
@ -8,8 +8,8 @@
 #include <unistd.h>
 #include <string.h>
 #include <signal.h>
--- chkproc.c
+--- a/chkproc.c
-+++ chkproc.c
+++ b/chkproc.c
@@ -62,6 +62,7 @@ int main (){ return 0; }
 #include <string.h>
 #include <errno.h>
@ -18,8 +18,8 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <stdlib.h>
--- chkwtmp.c
+--- a/chkwtmp.c
-+++ chkwtmp.c
+++ b/chkwtmp.c
@@ -25,6 +25,7 @@ int main () { return 0; }
 #include <stdio.h>
 #include <stdlib.h>
--- a/srcpkgs/chkrootkit/patches/path_max.patch
+++ b/srcpkgs/chkrootkit/patches/path_max.patch
@ -1,5 +1,5 @@
--- chkdirs.c
+--- a/chkdirs.c
-+++ chkdirs.c
+++ b/chkdirs.c
@@ -33,6 +33,7 @@
 #include <sys/syslimits.h>
 #endif
--- a/srcpkgs/chkrootkit/template
+++ b/srcpkgs/chkrootkit/template
@ -10,7 +10,6 @@ license="BSD-2-Clause"
 homepage="http://www.chkrootkit.org"
 distfiles="ftp://ftp.pangeia.com.br/pub/seg/pac/chkrootkit-${version}.tar.gz"
 checksum=7262dae33b338976828b5d156b70d159e0043c0db43ada8dee66c97387cf45b5
 patch_args=-Np0
 CFLAGS="-fPIC"
 LDFLAGS="-fPIC"
--- a/srcpkgs/chmlib/patches/aarch64-ppc64.patch
+++ b/srcpkgs/chmlib/patches/aarch64-ppc64.patch
@ -1,5 +1,5 @@
--- src/chm_lib.c	2017-07-07 20:15:32.999769723 +0200
+--- a/src/chm_lib.c	2017-07-07 20:15:32.999769723 +0200
-+++ src/chm_lib.c	2017-07-07 20:16:22.291847266 +0200
+++ b/src/chm_lib.c	2017-07-07 20:16:22.291847266 +0200
@@ -164,7 +164,7 @@
 /* x86-64 */
--- a/srcpkgs/chmlib/patches/arm-ppc-32.patch
+++ b/srcpkgs/chmlib/patches/arm-ppc-32.patch
@ -1,5 +1,5 @@
--- src/chm_lib.c	2009-05-23 08:43:31.000000000 -0600
+--- a/src/chm_lib.c	2009-05-23 08:43:31.000000000 -0600
-+++ src/chm_lib.c	2011-01-21 17:42:45.000000000 -0700
+++ b/src/chm_lib.c	2011-01-21 17:42:45.000000000 -0700
@@ -153,7 +153,7 @@
 /* Sparc        */
 /* MIPS         */
--- a/srcpkgs/chmlib/template
+++ b/srcpkgs/chmlib/template
@ -10,7 +10,6 @@ license="LGPL-2.1-or-later"
 homepage="http://www.jedrea.com/chmlib/"
 distfiles="http://www.jedrea.com/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=3449d64b0cf71578b2c7e3ddc048d4af3661f44a83941ea074a7813f3a59ffa3
 patch_args=-Np0
 libchmlib_package() {
 	short_desc="Library for dealing with Microsoft ITSS/CHM format files"
--- a/srcpkgs/choosenim/patches/system-libarchive.patch
+++ b/srcpkgs/choosenim/patches/system-libarchive.patch
@ -1,7 +1,7 @@
 diff --git choosenim.nimble choosenim.nimble
 index 7ba9b36..dc47faa 100644
--- choosenim.nimble
+--- a/choosenim.nimble
-+++ choosenim.nimble
+++ b/choosenim.nimble
@@ -14,7 +14,7 @@ skipExt = @["nim"]
 # Dependencies
@ -13,8 +13,8 @@ index 7ba9b36..dc47faa 100644
 requires "osinfo >= 0.3.0"
 diff --git nimarchive/nimarchive/archive.nim nimarchive/nimarchive/archive.nim
 index 1d45140..d5361e0 100644
--- nimarchive/nimarchive/archive.nim
+--- a/nimarchive/nimarchive/archive.nim
-+++ nimarchive/nimarchive/archive.nim
+++ b/nimarchive/nimarchive/archive.nim
@@ -2,28 +2,6 @@ import os, strutils
 import nimterop/[build, cimport]
@ -59,8 +59,8 @@ index 1d45140..d5361e0 100644
 +cImport(@[archivePath, archiveEntryPath], recurse = false)
 diff --git nimarchive/nimarchive/iconv.nim nimarchive/nimarchive/iconv.nim
 index d983398..4f61a5b 100644
--- nimarchive/nimarchive/iconv.nim
+--- a/nimarchive/nimarchive/iconv.nim
-+++ nimarchive/nimarchive/iconv.nim
+++ b/nimarchive/nimarchive/iconv.nim
@@ -2,15 +2,3 @@ import os, strutils
 import nimterop/build
@ -79,8 +79,8 @@ index d983398..4f61a5b 100644
 -)
 diff --git src/choosenimpkg/ssl.nim src/choosenimpkg/ssl.nim
 index f20b246..7576066 100644
--- src/choosenimpkg/ssl.nim
+--- a/src/choosenimpkg/ssl.nim
-+++ src/choosenimpkg/ssl.nim
+++ b/src/choosenimpkg/ssl.nim
@@ -2,19 +2,3 @@ import strutils
 import nimterop/[build, cimport]
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@ -13,7 +13,6 @@ distfiles="${homepage}/archive/v${version}.tar.gz>choosenim-${version}.tar.gz
 https://github.com/genotrance/nimarchive/archive/v0.5.4.tar.gz>nimarchive-0.5.4.tar.gz"
 checksum="0e78a59cfb3cf7926f8dff3a4215949ccfaecd6c6dddc3b2e062098b5da03edb
 c38e8c66c2eac2bc021d450f2b60d0e45c5355df963d0133930448639c0bd8d4"
 patch_args=-Np0
 case "$XBPS_TARGET_MACHINE" in
 	ppc-musl) broken="ftbfs" ;;
--- a/srcpkgs/choqok/patches/ftbfs.patch
+++ b/srcpkgs/choqok/patches/ftbfs.patch
@ -1,7 +1,7 @@
 Lots of things require QMap, no longer implicitly included.
--- libchoqok/plugin.h
+--- a/libchoqok/plugin.h
-+++ libchoqok/plugin.h
+++ b/libchoqok/plugin.h
@@ -25,6 +25,7 @@
 #define CHOQOKPLUGIN_H
--- a/srcpkgs/choqok/template
+++ b/srcpkgs/choqok/template
@ -12,7 +12,6 @@ license="GPL-3.0-or-later"
 homepage="http://choqok.kde.org/"
 distfiles="${KDE_SITE}/${pkgname}/${version%.*}/src/${pkgname}-${version}.tar.xz"
 checksum=26600d95f152c3e04881efb7fb3eb07b5c52fa6ffee838690f28b45defb4a47e
 patch_args=-Np0
 if [ -n "$CROSS_BUILD" ]; then
 	hostmakedepends+=" kcoreaddons kdoctools ${makedepends}"
--- a/srcpkgs/chromium/patches/browser-size_t.patch
+++ b/srcpkgs/chromium/patches/browser-size_t.patch
@ -1,5 +1,5 @@
--- chrome/browser/search/background/ntp_backgrounds.h	2020-08-10 20:39:20.000000000 +0200
+--- a/chrome/browser/search/background/ntp_backgrounds.h	2020-08-10 20:39:20.000000000 +0200
-+++ chrome/browser/search/background/ntp_backgrounds.h	2020-09-04 13:48:22.640023256 +0200
+++ b/chrome/browser/search/background/ntp_backgrounds.h	2020-09-04 13:48:22.640023256 +0200
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_SEARCH_BACKGROUND_NTP_BACKGROUNDS_H_
--- a/srcpkgs/chromium/patches/chromium-88-glibc-2.33.patch
+++ b/srcpkgs/chromium/patches/chromium-88-glibc-2.33.patch
@ -2,8 +2,8 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=1904652
 diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
--- sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix	2021-01-25 10:11:45.427436398 -0500
+--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix	2021-01-25 10:11:45.427436398 -0500
-+++ sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc	2021-01-25 10:12:51.337699003 -0500
+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc	2021-01-25 10:12:51.337699003 -0500
@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
     return RestrictKillTarget(current_pid, sysno);
   }
@ -24,8 +24,8 @@ diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy
       SyscallSets::IsCurrentDirectory(sysno)) {
     return Error(fs_denied_errno);
 diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
--- sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix	2021-01-25 10:13:10.179774081 -0500
+--- a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix	2021-01-25 10:13:10.179774081 -0500
-+++ sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc	2021-01-25 10:16:18.790525746 -0500
+++ b/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc	2021-01-25 10:16:18.790525746 -0500
@@ -6,6 +6,8 @@
 #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
@ -83,8 +83,8 @@ diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers
 #if !defined(OS_NACL_NONSFI)
   if (seccomp_crash_key)
 diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
--- sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix	2021-01-25 10:16:36.982598236 -0500
+--- a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix	2021-01-25 10:16:36.982598236 -0500
-+++ sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h	2021-01-25 10:18:45.705111027 -0500
+++ b/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h	2021-01-25 10:18:45.705111027 -0500
@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
 // sched_setparam(), sched_setscheduler()
 SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
@ -105,8 +105,8 @@ diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers
 // Allocates a crash key so that Seccomp information can be recorded.
 void AllocateCrashKeys();
 diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc
--- sandbox/linux/services/syscall_wrappers.cc.fstatfix	2021-01-25 10:18:53.307141311 -0500
+--- a/sandbox/linux/services/syscall_wrappers.cc.fstatfix	2021-01-25 10:18:53.307141311 -0500
-+++ sandbox/linux/services/syscall_wrappers.cc	2021-01-25 10:19:46.982355293 -0500
+++ b/sandbox/linux/services/syscall_wrappers.cc	2021-01-25 10:19:46.982355293 -0500
@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
 #endif  // defined(MEMORY_SANITIZER)
@ -122,8 +122,8 @@ diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc.fstatf
 +
 }  // namespace sandbox
 diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h.fstatfix chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h
--- sandbox/linux/services/syscall_wrappers.h.fstatfix	2021-01-25 10:19:53.115379741 -0500
+--- a/sandbox/linux/services/syscall_wrappers.h.fstatfix	2021-01-25 10:19:53.115379741 -0500
-+++ sandbox/linux/services/syscall_wrappers.h	2021-01-25 10:20:45.485588421 -0500
+++ b/sandbox/linux/services/syscall_wrappers.h	2021-01-25 10:20:45.485588421 -0500
@@ -17,6 +17,7 @@ struct sock_fprog;
 struct rlimit64;
 struct cap_hdr;
--- a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
+++ b/srcpkgs/chromium/patches/chromium-90-ruy-include.patch
@ -9,8 +9,8 @@ Subject: [PATCH] IWYU: include limits for std::numeric_limits
 diff --git a/third_party/ruy/src/ruy/block_map.cc b/third_party/ruy/src/ruy/block_map.cc
 index 44e5039..a7a7559 100644
--- third_party/ruy/src/ruy/block_map.cc
+--- a/third_party/ruy/src/ruy/block_map.cc
-+++ third_party/ruy/src/ruy/block_map.cc
+++ b/third_party/ruy/src/ruy/block_map.cc
@@ -17,6 +17,7 @@ limitations under the License.
 #include <algorithm>
--- a/srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch
+++ b/srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch
@ -1,6 +1,6 @@
 This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
--- third_party/closure_compiler/compiler.py	2021-05-20 04:17:53.000000000 +0200
+--- a/third_party/closure_compiler/compiler.py	2021-05-20 04:17:53.000000000 +0200
-+++ -	2021-05-25 20:31:10.102971765 +0200
+++ b/third_party/closure_compiler/compiler.py	2021-05-20 04:17:53.000000000 +0200
@@ -13,8 +13,9 @@
--- a/srcpkgs/chromium/patches/chromium-system-nodejs.patch
+++ b/srcpkgs/chromium/patches/chromium-system-nodejs.patch
@ -1,5 +1,5 @@
--- third_party/node/node.py	2021-05-20 04:17:54.000000000 +0200
+--- a/third_party/node/node.py	2021-05-20 04:17:54.000000000 +0200
-+++ -	2021-05-25 11:57:32.895222559 +0200
+++ b/third_party/node/node.py	2021-05-20 04:17:54.000000000 +0200
@@ -17,11 +17,12 @@
   if platform.system() == 'Darwin' and platform.machine() == 'arm64':
       return os.path.join(os_path.join(os_path.dirname(__file__), 'mac',
--- a/srcpkgs/chromium/patches/chromium-webrtc-r0.patch
+++ b/srcpkgs/chromium/patches/chromium-webrtc-r0.patch
@ -17,8 +17,8 @@ Commit-Queue: Raphael Kubo da Costa (rakuco) <raphael.kubo.da.costa@intel.com>
 Cr-Commit-Position: refs/heads/master@{#20292}
 ---
--- third_party/webrtc/p2p/base/port.cc
+--- a/third_party/webrtc/p2p/base/port.cc
-+++ third_party/webrtc/p2p/base/port.cc
+++ b/third_party/webrtc/p2p/base/port.cc
@@ -10,6 +10,8 @@
 #include "p2p/base/port.h"
--- a/srcpkgs/chromium/patches/fix-crash-in-ThemeService.patch
+++ b/srcpkgs/chromium/patches/fix-crash-in-ThemeService.patch
@ -21,8 +21,8 @@ Cr-Commit-Position: refs/heads/master@{#872164}
 diff --git chrome/browser/themes/theme_service.h chrome/browser/themes/theme_service.h
 index 592d40ae9de0f..337dfac9a040f 100644
--- chrome/browser/themes/theme_service.h
+--- a/chrome/browser/themes/theme_service.h
-+++ chrome/browser/themes/theme_service.h
+++ b/chrome/browser/themes/theme_service.h
@@ -299,6 +299,10 @@ class ThemeService : public KeyedService,
   // The number of infobars currently displayed.
   int number_of_reinstallers_ = 0;
--- a/srcpkgs/chromium/patches/libc_malloc.patch
+++ b/srcpkgs/chromium/patches/libc_malloc.patch
@ -1,5 +1,5 @@
--- base/process/memory_linux.cc.orig	2017-09-15 08:41:43.000000000 +0000
+--- a/base/process/memory_linux.cc	2017-09-15 08:41:43.000000000 +0000
-+++ base/process/memory_linux.cc	2017-09-15 08:44:39.804995469 +0000
+++ b/base/process/memory_linux.cc	2017-09-15 08:44:39.804995469 +0000
@@ -21,6 +21,12 @@
 #include "third_party/tcmalloc/chromium/src/gperftools/tcmalloc.h"
 #endif
@ -13,8 +13,8 @@
 namespace base {
 size_t g_oom_size = 0U;
--- base/process/memory_linux.cc.orig	2020-08-30 14:18:35.401132593 -0400
+--- a/base/process/memory_linux.cc	2020-08-30 14:18:35.401132593 -0400
-+++ base/process/memory_linux.cc	2020-08-30 14:19:08.030199189 -0400
+++ b/base/process/memory_linux.cc	2020-08-30 14:19:08.030199189 -0400
@@ -141,7 +141,7 @@
     (!defined(LIBC_GLIBC) && !BUILDFLAG(USE_TCMALLOC))
   *result = malloc(size);
--- a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
+++ b/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
@ -2,8 +2,8 @@ Use monotonic clock for pthread_cond_timedwait with musl too.
 diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
 index 5ea7083..c13027e 100644
--- ./v8/src/base/platform/condition-variable.cc
+--- a/v8/src/base/platform/condition-variable.cc
-+++ ./v8/src/base/platform/condition-variable.cc
+++ b/v8/src/base/platform/condition-variable.cc
@@ -16,7 +16,7 @@ namespace base {
 ConditionVariable::ConditionVariable() {
--- a/srcpkgs/chromium/patches/no-execinfo.patch
+++ b/srcpkgs/chromium/patches/no-execinfo.patch
@ -1,5 +1,5 @@
--- base/debug/stack_trace_posix.cc.orig	2019-05-14 14:49:44.000000000 -0400
+--- a/base/debug/stack_trace_posix.cc	2019-05-14 14:49:44.000000000 -0400
-+++ base/debug/stack_trace_posix.cc	2019-07-02 10:43:43.490045013 -0400
+++ b/base/debug/stack_trace_posix.cc	2019-07-02 10:43:43.490045013 -0400
@@ -27,7 +27,7 @@
 #if !defined(USE_SYMBOLIZE)
 #include <cxxabi.h>
--- a/srcpkgs/chromium/patches/no-getcontext.patch
+++ b/srcpkgs/chromium/patches/no-getcontext.patch
@ -1,5 +1,5 @@
--- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.orig	2015-12-06 09:59:55.554536646 +0100
+--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc	2015-12-06 09:59:55.554536646 +0100
-+++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc	2015-12-06 10:01:16.818238035 +0100
+++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc	2015-12-06 10:01:16.818238035 +0100
@@ -477,7 +477,9 @@ bool ExceptionHandler::SimulateSignalDel
   siginfo.si_code = SI_USER;
   siginfo.si_pid = getpid();
--- a/srcpkgs/chromium/patches/sandbox-membarrier.patch
+++ b/srcpkgs/chromium/patches/sandbox-membarrier.patch
@ -1,5 +1,5 @@
--- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
@@ -370,6 +370,7 @@
   switch (sysno) {
     case __NR_exit:
--- a/srcpkgs/chromium/patches/sandbox-sched_getparam.patch
+++ b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch
@ -3,8 +3,8 @@ musl uses them for pthread_getschedparam()
 source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e
--- sandbox/policy/linux/bpf_renderer_policy_linux.cc.orig	2019-10-08 21:03:18.253080425 +0200
+--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc	2019-10-08 21:03:18.253080425 +0200
-+++ sandbox/policy/linux/bpf_renderer_policy_linux.cc	2019-10-08 21:04:19.648549718 +0200
+++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc	2019-10-08 21:04:19.648549718 +0200
@@ -88,10 +88,10 @@
     case __NR_sysinfo:
     case __NR_times:
--- a/Show more
+++ b/Show more