diff --git a/srcpkgs/c-blosc/patches/musl.patch b/srcpkgs/c-blosc/patches/musl.patch index ae5956caa2..a6efd30ce4 100644 --- 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 -+++ bench/bench.c 2020-03-04 10:57:31.571747005 +0100 +--- a/bench/bench.c 2020-03-04 10:56:43.124243579 +0100 ++++ b/bench/bench.c 2020-03-04 10:57:31.571747005 +0100 @@ -38,7 +38,7 @@ #include #elif defined(__unix__) || defined(__HAIKU__) diff --git a/srcpkgs/c-blosc/template b/srcpkgs/c-blosc/template index b272c4a370..a488bfbf05 100644 --- 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 diff --git a/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch b/srcpkgs/c-client/patches/1006_openssl1.1_autoverify.patch index a8552ff268..087e747d59 100644 --- 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 -+++ src/osdep/unix/ssl_unix.c +--- a/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) diff --git 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 index 53b94d05a6..79b067d21f 100644 --- 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 -+++ src/osdep/unix/Makefile Thu Feb 21 18:53:15 2008 +0100 +--- a/src/osdep/unix/Makefile Thu Feb 21 18:51:32 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 diff --git a/srcpkgs/c-client/template b/srcpkgs/c-client/template index 83210555d1..bf65dc7277 100644 --- 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 \ diff --git a/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch b/srcpkgs/ca-certificates/patches/update-ca-certificates-destdir.patch index 35277d8d05..34008701e3 100644 --- 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 -+++ sbin/update-ca-certificates 2015-05-29 11:10:06.842632933 +0200 +--- a/sbin/update-ca-certificates 2015-05-29 11:09:43.922158838 +0200 ++++ b/sbin/update-ca-certificates 2015-05-29 11:10:06.842632933 +0200 @@ -24,12 +24,12 @@ verbose=0 fresh=0 diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index cd82c7f4c9..854e76a613 100644 --- 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 diff --git a/srcpkgs/cabal-install/patches/ghc-8.8.4.patch b/srcpkgs/cabal-install/patches/ghc-8.8.4.patch index 1dd08f07fb..f80c72add1 100644 --- 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 -+++ bootstrap.sh 2020-09-12 15:29:54.913108294 +0200 +--- a/bootstrap.sh 2001-09-09 03:46:40.000000000 +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]\." diff --git a/srcpkgs/cabal-install/template b/srcpkgs/cabal-install/template index 1db0f1c792..2c15789b1f 100644 --- 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 diff --git a/srcpkgs/cackey/patches/no-rpath.patch b/srcpkgs/cackey/patches/no-rpath.patch index 11384655aa..85ace755aa 100644 --- a/srcpkgs/cackey/patches/no-rpath.patch +++ b/srcpkgs/cackey/patches/no-rpath.patch @@ -1,7 +1,7 @@ Index: configure.ac =================================================================== ---- configure.ac.orig -+++ configure.ac +--- a/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) diff --git a/srcpkgs/cackey/template b/srcpkgs/cackey/template index 6358543e17..468dcd1c7b 100644 --- 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 diff --git a/srcpkgs/cadence/patches/QPainterPath.patch b/srcpkgs/cadence/patches/QPainterPath.patch index b05a38b438..6a6ba7cf21 100644 --- 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 -+++ c++/patchcanvas/canvasbezierline.cpp 2020-09-02 13:13:34.042234477 +0200 +--- a/c++/patchcanvas/canvasbezierline.cpp 2019-11-17 21:34:05.000000000 +0100 ++++ 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 -+++ c++/patchcanvas/canvasbezierlinemov.cpp 2020-09-02 13:13:27.093234119 +0200 +--- a/c++/patchcanvas/canvasbezierlinemov.cpp 2019-11-17 21:34:05.000000000 +0100 ++++ 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 -+++ c++/widgets/pixmapdial.cpp 2020-09-02 13:13:16.853233591 +0200 +--- a/c++/widgets/pixmapdial.cpp 2019-11-17 21:34:05.000000000 +0100 ++++ b/c++/widgets/pixmapdial.cpp 2020-09-02 13:13:16.853233591 +0200 @@ -21,6 +21,7 @@ #include diff --git a/srcpkgs/cadence/template b/srcpkgs/cadence/template index 283dc9312e..b429ab1f0f 100644 --- 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 diff --git a/srcpkgs/calc/patches/endian-32.patch b/srcpkgs/calc/patches/endian-32.patch index a45f22210a..6b1bedef73 100644 --- 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 --- ---- file.c -+++ file.c +--- a/file.c ++++ b/file.c @@ -1367,7 +1367,7 @@ ret.len = FILEPOS_BITS/BASEB; ret.v = alloc(ret.len); diff --git a/srcpkgs/calc/template b/srcpkgs/calc/template index d5c191ab4d..bc2087ca2b 100644 --- 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 diff --git a/srcpkgs/cantata/patches/musl.patch b/srcpkgs/cantata/patches/musl.patch index 0e76404f95..b524d66e24 100644 --- 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 -+++ 3rdparty/solid-lite/backends/udisks2/udisksblock.h 2017-03-09 11:41:06.071250302 +0100 +--- a/3rdparty/solid-lite/backends/udisks2/udisksblock.h 2016-01-08 19:44:42.000000000 +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 #include "udisksdeviceinterface.h" ---- gui/main.cpp.orig 2018-06-16 10:09:13.072771604 +0200 -+++ gui/main.cpp 2018-06-16 10:10:00.840162507 +0200 +--- a/gui/main.cpp 2018-06-16 10:09:13.072771604 +0200 ++++ b/gui/main.cpp 2018-06-16 10:10:00.840162507 +0200 @@ -260,7 +260,7 @@ qInstallMessageHandler(cantataQtMsgHandler); } diff --git a/srcpkgs/cantata/template b/srcpkgs/cantata/template index 428ce3175c..8ce1d756ac 100644 --- 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 diff --git a/srcpkgs/caps/patches/musl.patch b/srcpkgs/caps/patches/musl.patch index fda239c5fe..86c8d4fcb2 100644 --- 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 -+++ basics.h 2019-01-07 16:13:44.915942123 +0100 +--- a/basics.h 2019-01-07 16:13:33.353999394 +0100 ++++ b/basics.h 2019-01-07 16:13:44.915942123 +0100 @@ -46,17 +46,18 @@ #include diff --git a/srcpkgs/caps/template b/srcpkgs/caps/template index 853aec8890..5555e35858 100644 --- 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}" diff --git a/srcpkgs/cargo/patches/fix-serde.diff b/srcpkgs/cargo/patches/fix-serde.diff index d76499f5cd..8fc2cffee0 100644 --- 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 -+++ src/cargo/util/config/de.rs +--- a/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())) } diff --git a/srcpkgs/cargo/patches/link-static.patch b/srcpkgs/cargo/patches/link-static.patch index fac8adbf4e..6f38b77ce9 100644 --- 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 -+++ Cargo.toml 2019-02-13 15:12:44.616810828 +0100 +--- a/Cargo.toml 2019-01-02 22:49:06.000000000 +0100 ++++ b/Cargo.toml 2019-02-13 15:12:44.616810828 +0100 @@ -116,3 +116,5 @@ doc = false deny-warnings = [] vendored-openssl = ["openssl/vendored"] diff --git a/srcpkgs/cargo/template b/srcpkgs/cargo/template index 654bdfe4a9..9c9781d1fc 100644 --- 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" diff --git a/srcpkgs/catch2/patches/musl-test.patch b/srcpkgs/catch2/patches/musl-test.patch index f469dc45e0..481a5930db 100644 --- 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 -+++ - 2020-12-31 16:19:56.118506507 +0100 +--- a/scripts/approvalTests.py 2019-12-28 21:24:04.000000000 +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 diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template index 09607734bc..23e59016d3 100644 --- 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 diff --git a/srcpkgs/catdoc/patches/001-XLS_parsing_improvements.patch b/srcpkgs/catdoc/patches/001-XLS_parsing_improvements.patch index c5244947fb..24c31da3e0 100644 --- 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 -+++ src/xlsparse.c +--- a/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 -+++ src/xltypes.h +--- a/src/xltypes.h ++++ b/src/xltypes.h @@ -20,7 +20,7 @@ #define AUTOFILTERINFO 0x9D #define BACKUP 0x40 diff --git a/srcpkgs/catdoc/patches/002-CVE-2017-11110.patch b/srcpkgs/catdoc/patches/002-CVE-2017-11110.patch index 581e0ded9d..d36d5d63ce 100644 --- 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 Reviewed-by: Salvatore Bonaccorso Last-Update: 2017-07-20 ---- src/ole.c -+++ src/ole.c +--- a/src/ole.c ++++ b/src/ole.c @@ -106,6 +106,11 @@ FILE* ole_init(FILE *f, void *buffer, si return NULL; } diff --git a/srcpkgs/catdoc/patches/003-Fix_OLENAMELENGTH.patch b/srcpkgs/catdoc/patches/003-Fix_OLENAMELENGTH.patch index 2c2b9461b5..b752179020 100644 --- 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 Last-Update: 2017-09-13 ---- src/ole.c -+++ src/ole.c +--- a/src/ole.c ++++ b/src/ole.c @@ -342,7 +342,7 @@ e->blocks=NULL; diff --git a/srcpkgs/catdoc/template b/srcpkgs/catdoc/template index 06522d6921..ff26dbc5f7 100644 --- 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 diff --git a/srcpkgs/cbang/patches/sys_time_h.patch b/srcpkgs/cbang/patches/sys_time_h.patch index 4027989f41..1beef90009 100644 --- 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 -+++ src/cbang/time/Timer.h 2020-04-06 09:05:08.440687355 +0200 +--- a/src/cbang/time/Timer.h 2020-01-20 01:56:06.000000000 +0100 ++++ b/src/cbang/time/Timer.h 2020-04-06 09:05:08.440687355 +0200 @@ -38,9 +38,7 @@ #endif // _WIN32 diff --git a/srcpkgs/cbang/template b/srcpkgs/cbang/template index 739b521d98..63388b2aa8 100644 --- 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" diff --git a/srcpkgs/ccextractor/patches/disable_arm_neon.patch b/srcpkgs/ccextractor/patches/disable_arm_neon.patch index 0eb114e1dd..7ced789819 100644 --- 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 -+++ src/thirdparty/libpng/pngpriv.h 2021-06-17 17:35:17.217940102 +0200 +--- a/src/thirdparty/libpng/pngpriv.h 2021-06-13 21:05:33.000000000 +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. diff --git a/srcpkgs/ccextractor/template b/srcpkgs/ccextractor/template index 9bdd5e05fc..fe27e68b04 100644 --- 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 diff --git a/srcpkgs/ccl/patches/musl-fixes.patch b/srcpkgs/ccl/patches/musl-fixes.patch index 4fee1f4420..57ef9e47f7 100644 --- 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 -+++ lisp-kernel/lisp-debug.c 2016-12-18 10:35:29.070710875 +1100 +--- a/lisp-kernel/lisp-debug.c 2015-11-07 07:10:11.000000000 +1100 ++++ b/lisp-kernel/lisp-debug.c 2016-12-18 10:35:29.070710875 +1100 @@ -36,6 +36,11 @@ #include #endif @@ -12,8 +12,8 @@ FILE *dbgout = NULL, *dbgin=NULL; ---- 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 +--- a/lisp-kernel/pmcl-kernel.c 2015-11-07 07:10:11.000000000 +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 -+++ lisp-kernel/thread_manager.c 2016-12-18 10:32:35.095701899 +1100 +--- a/lisp-kernel/thread_manager.c 2015-11-07 07:10:11.000000000 +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 -+++ lisp-kernel/x86-exceptions.c 2016-12-18 10:30:47.952696372 +1100 +--- a/lisp-kernel/x86-exceptions.c 2015-11-07 07:10:11.000000000 +1100 ++++ b/lisp-kernel/x86-exceptions.c 2016-12-18 10:30:47.952696372 +1100 @@ -29,7 +29,9 @@ #ifdef LINUX #include diff --git a/srcpkgs/ccl/patches/nopie.patch b/srcpkgs/ccl/patches/nopie.patch index 328ceb4364..a096575384 100644 --- a/srcpkgs/ccl/patches/nopie.patch +++ b/srcpkgs/ccl/patches/nopie.patch @@ -1,5 +1,5 @@ ---- lisp-kernel/linuxx8664/Makefile.orig -+++ lisp-kernel/linuxx8664/Makefile +--- a/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 -+++ lisp-kernel/linuxx8632/Makefile +--- a/lisp-kernel/linuxx8632/Makefile ++++ b/lisp-kernel/linuxx8632/Makefile @@ -69,7 +69,7 @@ all: ../../lx86cl diff --git a/srcpkgs/ccl/template b/srcpkgs/ccl/template index d6a2bc83ee..5972ddeb0c 100644 --- 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 ;; diff --git a/srcpkgs/cclive/patches/fix-boost-067.patch b/srcpkgs/cclive/patches/fix-boost-067.patch index 0acd06ab0e..ea7076738e 100644 --- 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 -+++ src/cc/progressbar.h 2018-06-03 02:23:36.603414837 +0300 +--- a/src/cc/progressbar.h 2013-11-23 11:46:27.000000000 +0200 ++++ 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) diff --git a/srcpkgs/cclive/patches/fix-missing-iostream-includes.patch b/srcpkgs/cclive/patches/fix-missing-iostream-includes.patch index 305bd7e147..7b049a914b 100644 --- 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 -+++ src/cc/error.h +--- a/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 diff --git a/src/cc/log.h b/src/cc/log.h index 2b2c986..77708f5 100644 ---- src/cc/log.h -+++ src/cc/log.h +--- a/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 diff --git a/src/cc/options.h b/src/cc/options.h index 6c45ce8..d757bfb 100644 ---- src/cc/options.h -+++ src/cc/options.h +--- a/src/cc/options.h ++++ b/src/cc/options.h @@ -21,6 +21,8 @@ #ifndef cc__options_h #define cc__options_h diff --git a/srcpkgs/cclive/patches/musl-strerror_r.patch b/srcpkgs/cclive/patches/musl-strerror_r.patch index cec71dd684..feba32c358 100644 --- 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 -+++ - 2018-12-29 15:24:13.933668360 +0100 +--- a/src/cc/error.h 2018-12-29 15:15:13.042776367 +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) { diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template index d221a95f25..c43dbb9420 100644 --- 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 diff --git a/srcpkgs/ccsm/patches/prefix.patch b/srcpkgs/ccsm/patches/prefix.patch index 7dfb532f40..0c4ceb8d2b 100644 --- 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 -+++ setup.py 2017-03-02 11:36:07.745885086 -0800 +--- a/setup.py 2017-03-02 11:35:41.688884000 -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"] diff --git a/srcpkgs/ccsm/template b/srcpkgs/ccsm/template index 168445d7ec..7f27e3317f 100644 --- 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" diff --git a/srcpkgs/cdb/patches/errno.patch b/srcpkgs/cdb/patches/errno.patch index fe89c1eafe..03859f5844 100644 --- 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 -+++ error.h 2016-02-22 14:54:20.978714226 +0000 +--- a/error.h 2016-02-22 14:53:04.541809816 +0000 ++++ b/error.h 2016-02-22 14:54:20.978714226 +0000 @@ -1,3 +1,4 @@ +#include #ifndef ERROR_H diff --git a/srcpkgs/cdb/patches/makefile.patch b/srcpkgs/cdb/patches/makefile.patch index 0ea5a86272..4ff5019ecc 100644 --- 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 -+++ Makefile 2016-02-22 16:58:48.006067048 -0500 +--- a/Makefile 2000-02-19 15:42:05.000000000 -0500 ++++ b/Makefile 2016-02-22 16:58:48.006067048 -0500 @@ -2,7 +2,7 @@ SHELL=/bin/sh diff --git a/srcpkgs/cdb/template b/srcpkgs/cdb/template index 410f978ee7..c95afff379 100644 --- 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 diff --git a/srcpkgs/cdecl/patches/fix-reserved_keyword.patch b/srcpkgs/cdecl/patches/fix-reserved_keyword.patch index a8fde941b0..5731b50b4e 100644 --- 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 -+++ cdecl.c 2016-10-21 12:29:34.791599362 +0200 +--- a/cdecl.c 2009-10-20 11:25:25.000000000 +0200 ++++ b/cdecl.c 2016-10-21 12:29:34.791599362 +0200 @@ -245,7 +245,7 @@ /* for unsupported combinations of types. */ void mbcheck() diff --git a/srcpkgs/cdecl/template b/srcpkgs/cdecl/template index 6de8963571..e120ca3af5 100644 --- 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 diff --git a/srcpkgs/cdm/patches/fix-bashisms.patch b/srcpkgs/cdm/patches/fix-bashisms.patch index a81f665c94..81aa54af29 100644 --- 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 -+++ src/profile.sh +--- a/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. diff --git a/srcpkgs/cdm/template b/srcpkgs/cdm/template index 5f8a016741..f1fb8b2f64 100644 --- 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 diff --git a/srcpkgs/cdparanoia/patches/autoconf-init-ac_cv_objext.patch b/srcpkgs/cdparanoia/patches/autoconf-init-ac_cv_objext.patch index c5978b3ab4..5f431119a9 100644 --- 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 -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -5,9 +5,7 @@ cp $srcdir/configure.sub $srcdir/config.sub AC_CANONICAL_HOST diff --git a/srcpkgs/cdparanoia/patches/gcc.diff b/srcpkgs/cdparanoia/patches/gcc.diff index b157353e28..d75adfba1e 100644 --- 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) -+++ interface/test_interface.c (Revision 15340) +--- a/interface/test_interface.c (Revision 15337) ++++ 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) -+++ interface/cdda_interface.h (Revision 15340) +--- a/interface/cdda_interface.h (Revision 15337) ++++ 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) -+++ interface/interface.c (Revision 15340) +--- a/interface/interface.c (Revision 15337) ++++ 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) -+++ interface/scsi_interface.c (Revision 15340) +--- a/interface/scsi_interface.c (Revision 15337) ++++ 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) -+++ interface/cooked_interface.c (Revision 15340) +--- a/interface/cooked_interface.c (Revision 15337) ++++ 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) -+++ interface/scan_devices.c (Revision 15340) +--- a/interface/scan_devices.c (Revision 15337) ++++ b/interface/scan_devices.c (Revision 15340) @@ -264,11 +264,11 @@ d->interface=COOKED_IOCTL; d->bigendianp=-1; /* We don't know yet... */ diff --git a/srcpkgs/cdparanoia/patches/makefile.in-install.patch b/srcpkgs/cdparanoia/patches/makefile.in-install.patch index 6dbc6939a1..a9452ac881 100644 --- a/srcpkgs/cdparanoia/patches/makefile.in-install.patch +++ b/srcpkgs/cdparanoia/patches/makefile.in-install.patch @@ -1,5 +1,5 @@ ---- Makefile.in -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -19,10 +19,10 @@ RANLIB=@RANLIB@ INSTALL=@INSTALL@ prefix=@prefix@ diff --git a/srcpkgs/cdparanoia/patches/musl.patch b/srcpkgs/cdparanoia/patches/musl.patch index eab57ab42f..c0896221ed 100644 --- 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 -+++ utils.h 2020-04-13 01:11:38.213384799 +0200 +--- a/utils.h 2020-04-13 01:11:27.959275309 +0200 ++++ b/utils.h 2020-04-13 01:11:38.213384799 +0200 @@ -3,6 +3,7 @@ #include #include diff --git a/srcpkgs/cdparanoia/template b/srcpkgs/cdparanoia/template index 956184ded1..3cf09587f2 100644 --- 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 diff --git a/srcpkgs/cegui/patches/fix-ccache-rule.patch b/srcpkgs/cegui/patches/fix-ccache-rule.patch index 66a1929bef..4e4dd11426 100644 --- 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 -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -137,8 +137,14 @@ find_program(CCACHE_FOUND ccache) if(CCACHE_FOUND) diff --git a/srcpkgs/cegui/patches/musl_execinfo.patch b/srcpkgs/cegui/patches/musl_execinfo.patch index 3232324b81..feb659a09e 100644 --- a/srcpkgs/cegui/patches/musl_execinfo.patch +++ b/srcpkgs/cegui/patches/musl_execinfo.patch @@ -1,5 +1,5 @@ ---- cegui/src/Exceptions.cpp -+++ cegui/src/Exceptions.cpp +--- a/cegui/src/Exceptions.cpp ++++ b/cegui/src/Exceptions.cpp @@ -39,7 +39,7 @@ # include #elif defined(__ANDROID__) diff --git a/srcpkgs/cegui/template b/srcpkgs/cegui/template index 14cd66cd83..070fa66aff 100644 --- 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" diff --git a/srcpkgs/cegui07/patches/fix-build.patch b/srcpkgs/cegui07/patches/fix-build.patch index 42e360f971..2533061810 100644 --- a/srcpkgs/cegui07/patches/fix-build.patch +++ b/srcpkgs/cegui07/patches/fix-build.patch @@ -1,5 +1,5 @@ ---- cegui/include/CEGUISystem.h.orig -+++ cegui/include/CEGUISystem.h +--- a/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 -+++ cegui/include/RendererModules/OpenGL/CEGUIOpenGLRenderer.h +--- a/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 -+++ cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp +--- a/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 -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -14,7 +14,8 @@ AC_INIT([CEGUI], [CEGUI_RELEASE_VERSION], [http://mantis.cegui.org.uk/], [CEGUI]) diff --git a/srcpkgs/cegui07/template b/srcpkgs/cegui07/template index 352613cf01..3fa7f80a2e 100644 --- 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" diff --git a/srcpkgs/celestia-glut/patches/NULL_notdecleared.patch b/srcpkgs/celestia-glut/patches/NULL_notdecleared.patch index bc14c29a31..baf2e4a215 100644 --- 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 -+++ src/celengine/frametree.h 2014-04-26 16:09:09.601899991 +0200 +--- a/src/celengine/frametree.h 2014-04-26 16:08:47.217900392 +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_ diff --git a/srcpkgs/celestia-glut/patches/Z_BEST_COMPRESSION.patch b/srcpkgs/celestia-glut/patches/Z_BEST_COMPRESSION.patch index 90c6a34c10..c46c503417 100644 --- 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 -+++ src/celestia/imagecapture.cpp 2014-04-26 16:16:56.697891627 +0200 +--- a/src/celestia/imagecapture.cpp 2014-04-26 16:15:37.185893050 +0200 ++++ b/src/celestia/imagecapture.cpp 2014-04-26 16:16:56.697891627 +0200 @@ -31,6 +31,9 @@ #include "png.h" #endif diff --git a/srcpkgs/celestia-glut/patches/fix-stdint_redefine.patch b/srcpkgs/celestia-glut/patches/fix-stdint_redefine.patch index 2bd7de986d..4618ea01b6 100644 --- 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 -+++ src/celutil/basictypes.h 2016-09-02 17:41:33.335187908 +0200 +--- a/src/celutil/basictypes.h 2011-06-05 18:11:15.000000000 +0200 ++++ b/src/celutil/basictypes.h 2016-09-02 17:41:33.335187908 +0200 @@ -31,7 +31,9 @@ #include typedef int64_t int64; diff --git a/srcpkgs/celestia-glut/patches/memcpy_notdecleared.patch b/srcpkgs/celestia-glut/patches/memcpy_notdecleared.patch index 201721ba84..c7a67d94a2 100644 --- 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 -+++ src/celengine/image.cpp 2014-04-26 14:42:16.886993341 +0200 +--- a/src/celengine/image.cpp 2014-04-26 14:41:56.359993709 +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 -+++ src/celengine/texture.cpp 2014-04-26 15:54:46.992915439 +0200 +--- a/src/celengine/texture.cpp 2014-04-26 15:54:19.937915924 +0200 ++++ b/src/celengine/texture.cpp 2014-04-26 15:54:46.992915439 +0200 @@ -28,6 +28,7 @@ #include #include diff --git a/srcpkgs/celestia-glut/patches/missing_mathlib.patch b/srcpkgs/celestia-glut/patches/missing_mathlib.patch index a2f2ba2674..c8b637dcc0 100644 --- 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 -+++ src/celmath/intersect.h 2014-04-26 16:00:49.024908956 +0200 +--- a/src/celmath/intersect.h 2014-04-26 15:57:58.793912004 +0200 ++++ b/src/celmath/intersect.h 2014-04-26 16:00:49.024908956 +0200 @@ -15,7 +15,7 @@ #include "ray.h" #include "sphere.h" diff --git a/srcpkgs/celestia-glut/template b/srcpkgs/celestia-glut/template index 22f9e62c64..2ee6f0cd64 100644 --- 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" diff --git a/srcpkgs/celestia-gtk/patches/NULL_notdecleared.patch b/srcpkgs/celestia-gtk/patches/NULL_notdecleared.patch index bc14c29a31..baf2e4a215 100644 --- 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 -+++ src/celengine/frametree.h 2014-04-26 16:09:09.601899991 +0200 +--- a/src/celengine/frametree.h 2014-04-26 16:08:47.217900392 +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_ diff --git a/srcpkgs/celestia-gtk/patches/Z_BEST_COMPRESSION.patch b/srcpkgs/celestia-gtk/patches/Z_BEST_COMPRESSION.patch index 90c6a34c10..c46c503417 100644 --- 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 -+++ src/celestia/imagecapture.cpp 2014-04-26 16:16:56.697891627 +0200 +--- a/src/celestia/imagecapture.cpp 2014-04-26 16:15:37.185893050 +0200 ++++ b/src/celestia/imagecapture.cpp 2014-04-26 16:16:56.697891627 +0200 @@ -31,6 +31,9 @@ #include "png.h" #endif diff --git a/srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch b/srcpkgs/celestia-gtk/patches/fix-stdint_redefine.patch index 81e480a6c4..d8e3ccdbc6 100644 --- 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 -+++ src/celutil/basictypes.h 2016-09-02 17:41:33.335187908 +0200 +--- a/src/celutil/basictypes.h 2011-06-05 18:11:15.000000000 +0200 ++++ b/src/celutil/basictypes.h 2016-09-02 17:41:33.335187908 +0200 @@ -31,7 +31,9 @@ #include typedef int64_t int64; diff --git a/srcpkgs/celestia-gtk/patches/memcpy_notdecleared.patch b/srcpkgs/celestia-gtk/patches/memcpy_notdecleared.patch index 201721ba84..c7a67d94a2 100644 --- 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 -+++ src/celengine/image.cpp 2014-04-26 14:42:16.886993341 +0200 +--- a/src/celengine/image.cpp 2014-04-26 14:41:56.359993709 +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 -+++ src/celengine/texture.cpp 2014-04-26 15:54:46.992915439 +0200 +--- a/src/celengine/texture.cpp 2014-04-26 15:54:19.937915924 +0200 ++++ b/src/celengine/texture.cpp 2014-04-26 15:54:46.992915439 +0200 @@ -28,6 +28,7 @@ #include #include diff --git a/srcpkgs/celestia-gtk/patches/missing_mathlib.patch b/srcpkgs/celestia-gtk/patches/missing_mathlib.patch index a2f2ba2674..c8b637dcc0 100644 --- 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 -+++ src/celmath/intersect.h 2014-04-26 16:00:49.024908956 +0200 +--- a/src/celmath/intersect.h 2014-04-26 15:57:58.793912004 +0200 ++++ b/src/celmath/intersect.h 2014-04-26 16:00:49.024908956 +0200 @@ -15,7 +15,7 @@ #include "ray.h" #include "sphere.h" diff --git a/srcpkgs/celestia-gtk/template b/srcpkgs/celestia-gtk/template index b0001ac504..85e1c6ee1e 100644 --- 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" diff --git a/srcpkgs/chafa/patches/i686-musl.patch b/srcpkgs/chafa/patches/i686-musl.patch index 57d50f15b0..dc3469f9f0 100644 --- a/srcpkgs/chafa/patches/i686-musl.patch +++ b/srcpkgs/chafa/patches/i686-musl.patch @@ -1,5 +1,5 @@ ---- chafa/internal/chafa-popcnt.c -+++ chafa/internal/chafa-popcnt.c +--- a/chafa/internal/chafa-popcnt.c ++++ b/chafa/internal/chafa-popcnt.c @@ -23,6 +23,10 @@ #include "chafa/chafa.h" #include "chafa/chafa-private.h" diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template index b6c87f0e27..1b07026b9e 100644 --- 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*) ;; diff --git a/srcpkgs/chatterino2/patches/0001-use-system-deps.patch b/srcpkgs/chatterino2/patches/0001-use-system-deps.patch index 5f7ddfadb1..383c5ea23f 100644 --- 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 -+++ chatterino.pro +--- a/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 -+++ src/common/Credentials.cpp +--- a/src/common/Credentials.cpp ++++ b/src/common/Credentials.cpp @@ -1,12 +1,12 @@ #include "Credentials.hpp" diff --git a/srcpkgs/chatterino2/template b/srcpkgs/chatterino2/template index 642d3147fd..f69730b3a9 100644 --- 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" diff --git a/srcpkgs/chatty/patches/config_dir.patch b/srcpkgs/chatty/patches/config_dir.patch index c1a14ea4b5..a159acba9c 100644 --- 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 ---- src/chatty/Chatty.patched.java 2018-02-19 04:41:33.348588121 -0500 +*** a/src/chatty/Chatty.java 2017-12-26 11:56:51.000000000 -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 diff --git a/srcpkgs/chatty/patches/disable_version_check.patch b/srcpkgs/chatty/patches/disable_version_check.patch index e2abd26cee..5e689e513c 100644 --- 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 ---- src/chatty/Chatty.patched.java 2018-02-19 04:24:16.080555756 -0500 +*** a/src/chatty/Chatty.java 2018-02-19 04:22:40.961744905 -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 diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template index c4ab65395a..a13ad9765b 100644 --- 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 diff --git a/srcpkgs/chkrootkit/patches/fcntl.patch b/srcpkgs/chkrootkit/patches/fcntl.patch index dc0ee1594c..26ab42c0e4 100644 --- a/srcpkgs/chkrootkit/patches/fcntl.patch +++ b/srcpkgs/chkrootkit/patches/fcntl.patch @@ -1,5 +1,5 @@ ---- chklastlog.c -+++ chklastlog.c +--- a/chklastlog.c ++++ b/chklastlog.c @@ -41,6 +41,7 @@ int main () { return 0; } #include #endif @@ -8,8 +8,8 @@ #include #include #include ---- chkproc.c -+++ chkproc.c +--- a/chkproc.c ++++ b/chkproc.c @@ -62,6 +62,7 @@ int main (){ return 0; } #include #include @@ -18,8 +18,8 @@ #include #include #include ---- chkwtmp.c -+++ chkwtmp.c +--- a/chkwtmp.c ++++ b/chkwtmp.c @@ -25,6 +25,7 @@ int main () { return 0; } #include #include diff --git a/srcpkgs/chkrootkit/patches/path_max.patch b/srcpkgs/chkrootkit/patches/path_max.patch index 93534afa00..8046e94889 100644 --- a/srcpkgs/chkrootkit/patches/path_max.patch +++ b/srcpkgs/chkrootkit/patches/path_max.patch @@ -1,5 +1,5 @@ ---- chkdirs.c -+++ chkdirs.c +--- a/chkdirs.c ++++ b/chkdirs.c @@ -33,6 +33,7 @@ #include #endif diff --git a/srcpkgs/chkrootkit/template b/srcpkgs/chkrootkit/template index 1f614156b1..01558c933f 100644 --- 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" diff --git a/srcpkgs/chmlib/patches/aarch64-ppc64.patch b/srcpkgs/chmlib/patches/aarch64-ppc64.patch index 83c5150947..9342b8e339 100644 --- 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 -+++ src/chm_lib.c 2017-07-07 20:16:22.291847266 +0200 +--- a/src/chm_lib.c 2017-07-07 20:15:32.999769723 +0200 ++++ b/src/chm_lib.c 2017-07-07 20:16:22.291847266 +0200 @@ -164,7 +164,7 @@ /* x86-64 */ diff --git a/srcpkgs/chmlib/patches/arm-ppc-32.patch b/srcpkgs/chmlib/patches/arm-ppc-32.patch index fba2294603..cbe045c9ad 100644 --- 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 -+++ src/chm_lib.c 2011-01-21 17:42:45.000000000 -0700 +--- a/src/chm_lib.c 2009-05-23 08:43:31.000000000 -0600 ++++ b/src/chm_lib.c 2011-01-21 17:42:45.000000000 -0700 @@ -153,7 +153,7 @@ /* Sparc */ /* MIPS */ diff --git a/srcpkgs/chmlib/template b/srcpkgs/chmlib/template index 44f3de8568..a573c27d14 100644 --- 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" diff --git a/srcpkgs/choosenim/patches/system-libarchive.patch b/srcpkgs/choosenim/patches/system-libarchive.patch index a102f0c13b..a4cab336e9 100644 --- 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 -+++ choosenim.nimble +--- a/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 -+++ nimarchive/nimarchive/archive.nim +--- a/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 -+++ nimarchive/nimarchive/iconv.nim +--- a/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 -+++ src/choosenimpkg/ssl.nim +--- a/src/choosenimpkg/ssl.nim ++++ b/src/choosenimpkg/ssl.nim @@ -2,19 +2,3 @@ import strutils import nimterop/[build, cimport] diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template index eb5ee1d0fe..e2fb62b08d 100644 --- 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" ;; diff --git a/srcpkgs/choqok/patches/ftbfs.patch b/srcpkgs/choqok/patches/ftbfs.patch index 480ec481e2..600d28f951 100644 --- 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 -+++ libchoqok/plugin.h +--- a/libchoqok/plugin.h ++++ b/libchoqok/plugin.h @@ -25,6 +25,7 @@ #define CHOQOKPLUGIN_H diff --git a/srcpkgs/choqok/template b/srcpkgs/choqok/template index df6cbfc32b..75a2c16f63 100644 --- 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}" diff --git a/srcpkgs/chromium/patches/browser-size_t.patch b/srcpkgs/chromium/patches/browser-size_t.patch index fa214d987d..36af0ec6c4 100644 --- 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 -+++ chrome/browser/search/background/ntp_backgrounds.h 2020-09-04 13:48:22.640023256 +0200 +--- a/chrome/browser/search/background/ntp_backgrounds.h 2020-08-10 20:39:20.000000000 +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_ diff --git a/srcpkgs/chromium/patches/chromium-88-glibc-2.33.patch b/srcpkgs/chromium/patches/chromium-88-glibc-2.33.patch index 64306d5e42..d5228ce7b7 100644 --- 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 -+++ sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-01-25 10:12:51.337699003 -0500 +--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix 2021-01-25 10:11:45.427436398 -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 -+++ sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc 2021-01-25 10:16:18.790525746 -0500 +--- a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix 2021-01-25 10:13:10.179774081 -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 -+++ sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h 2021-01-25 10:18:45.705111027 -0500 +--- a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix 2021-01-25 10:16:36.982598236 -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 -+++ sandbox/linux/services/syscall_wrappers.cc 2021-01-25 10:19:46.982355293 -0500 +--- a/sandbox/linux/services/syscall_wrappers.cc.fstatfix 2021-01-25 10:18:53.307141311 -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 -+++ sandbox/linux/services/syscall_wrappers.h 2021-01-25 10:20:45.485588421 -0500 +--- a/sandbox/linux/services/syscall_wrappers.h.fstatfix 2021-01-25 10:19:53.115379741 -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; diff --git a/srcpkgs/chromium/patches/chromium-90-ruy-include.patch b/srcpkgs/chromium/patches/chromium-90-ruy-include.patch index 09f64266f9..81d5367807 100644 --- 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 -+++ third_party/ruy/src/ruy/block_map.cc +--- a/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 diff --git a/srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch b/srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch index 69c16fc0c4..117a50f8e4 100644 --- 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 -+++ - 2021-05-25 20:31:10.102971765 +0200 +--- a/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200 ++++ b/third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200 @@ -13,8 +13,9 @@ diff --git a/srcpkgs/chromium/patches/chromium-system-nodejs.patch b/srcpkgs/chromium/patches/chromium-system-nodejs.patch index 866b516656..eff56ba760 100644 --- 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 -+++ - 2021-05-25 11:57:32.895222559 +0200 +--- a/third_party/node/node.py 2021-05-20 04:17:54.000000000 +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', diff --git a/srcpkgs/chromium/patches/chromium-webrtc-r0.patch b/srcpkgs/chromium/patches/chromium-webrtc-r0.patch index 70bbede472..67574f6d54 100644 --- 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) Cr-Commit-Position: refs/heads/master@{#20292} --- ---- third_party/webrtc/p2p/base/port.cc -+++ third_party/webrtc/p2p/base/port.cc +--- a/third_party/webrtc/p2p/base/port.cc ++++ b/third_party/webrtc/p2p/base/port.cc @@ -10,6 +10,8 @@ #include "p2p/base/port.h" diff --git a/srcpkgs/chromium/patches/fix-crash-in-ThemeService.patch b/srcpkgs/chromium/patches/fix-crash-in-ThemeService.patch index 419e6e9d7c..f2a696a3a7 100644 --- 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 -+++ chrome/browser/themes/theme_service.h +--- a/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; diff --git a/srcpkgs/chromium/patches/libc_malloc.patch b/srcpkgs/chromium/patches/libc_malloc.patch index eda11ec866..ff672ea0fa 100644 --- 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 -+++ base/process/memory_linux.cc 2017-09-15 08:44:39.804995469 +0000 +--- a/base/process/memory_linux.cc 2017-09-15 08:41:43.000000000 +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 -+++ base/process/memory_linux.cc 2020-08-30 14:19:08.030199189 -0400 +--- a/base/process/memory_linux.cc 2020-08-30 14:18:35.401132593 -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); diff --git a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch index 33a8ea32c9..56a4ad1c80 100644 --- 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 -+++ ./v8/src/base/platform/condition-variable.cc +--- a/v8/src/base/platform/condition-variable.cc ++++ b/v8/src/base/platform/condition-variable.cc @@ -16,7 +16,7 @@ namespace base { ConditionVariable::ConditionVariable() { diff --git a/srcpkgs/chromium/patches/no-execinfo.patch b/srcpkgs/chromium/patches/no-execinfo.patch index 386997e8ed..b4241d0055 100644 --- 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 -+++ base/debug/stack_trace_posix.cc 2019-07-02 10:43:43.490045013 -0400 +--- a/base/debug/stack_trace_posix.cc 2019-05-14 14:49:44.000000000 -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 diff --git a/srcpkgs/chromium/patches/no-getcontext.patch b/srcpkgs/chromium/patches/no-getcontext.patch index b2a498734c..f9bc2e02d2 100644 --- 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 -+++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2015-12-06 10:01:16.818238035 +0100 +--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2015-12-06 09:59:55.554536646 +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(); diff --git a/srcpkgs/chromium/patches/sandbox-membarrier.patch b/srcpkgs/chromium/patches/sandbox-membarrier.patch index 86ca16fc2d..55ef251619 100644 --- 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 -+++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +--- a/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: diff --git a/srcpkgs/chromium/patches/sandbox-sched_getparam.patch b/srcpkgs/chromium/patches/sandbox-sched_getparam.patch index ba8af49c5f..b9e1dc7992 100644 --- 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 -+++ sandbox/policy/linux/bpf_renderer_policy_linux.cc 2019-10-08 21:04:19.648549718 +0200 +--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc 2019-10-08 21:03:18.253080425 +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: diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch index 0e8f57236e..67fb8fca62 100644 --- a/srcpkgs/chromium/patches/sndio.patch +++ b/srcpkgs/chromium/patches/sndio.patch @@ -1,6 +1,6 @@ diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn ---- media/BUILD.gn.orig 2020-06-03 20:40:26.000000000 +0200 -+++ media/BUILD.gn 2020-06-13 17:32:28.510395975 +0200 +--- a/media/BUILD.gn 2020-06-03 20:40:26.000000000 +0200 ++++ b/media/BUILD.gn 2020-06-13 17:32:28.510395975 +0200 @@ -65,6 +65,9 @@ defines += [ "DLOPEN_PULSEAUDIO" ] } @@ -12,8 +12,8 @@ diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media defines += [ "USE_CRAS" ] } diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn ---- media/audio/BUILD.gn.orig 2020-06-03 20:39:37.000000000 +0200 -+++ media/audio/BUILD.gn 2020-06-13 17:32:28.511395969 +0200 +--- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200 ++++ b/media/audio/BUILD.gn 2020-06-13 17:32:28.511395969 +0200 @@ -236,6 +236,17 @@ sources += [ "linux/audio_manager_linux.cc" ] } @@ -33,8 +33,8 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97 libs += [ "asound" ] sources += [ diff -Naur chromium-83.0.4103.97.orig/media/audio/linux/audio_manager_linux.cc chromium-83.0.4103.97/media/audio/linux/audio_manager_linux.cc ---- media/audio/linux/audio_manager_linux.cc.orig 2020-06-03 20:39:37.000000000 +0200 -+++ media/audio/linux/audio_manager_linux.cc 2020-06-13 18:09:43.623333167 +0200 +--- a/media/audio/linux/audio_manager_linux.cc 2020-06-03 20:39:37.000000000 +0200 ++++ b/media/audio/linux/audio_manager_linux.cc 2020-06-13 18:09:43.623333167 +0200 @@ -19,6 +19,11 @@ #include "media/audio/pulse/audio_manager_pulse.h" #include "media/audio/pulse/pulse_util.h" @@ -75,8 +75,8 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/linux/audio_manager_linux.cc c if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) { UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1); diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.cc chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.cc ---- media/audio/sndio/audio_manager_sndio.cc.orig 1970-01-01 01:00:00.000000000 +0100 -+++ media/audio/sndio/audio_manager_sndio.cc 2020-06-13 17:32:28.511395969 +0200 +--- a/media/audio/sndio/audio_manager_sndio.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/audio_manager_sndio.cc 2020-06-13 17:32:28.511395969 +0200 @@ -0,0 +1,148 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -227,8 +227,8 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.cc c + +} // namespace media diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.h chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.h ---- media/audio/sndio/audio_manager_sndio.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ media/audio/sndio/audio_manager_sndio.h 2020-06-13 17:32:28.511395969 +0200 +--- a/media/audio/sndio/audio_manager_sndio.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/audio_manager_sndio.h 2020-06-13 17:32:28.511395969 +0200 @@ -0,0 +1,65 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -296,8 +296,8 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.h ch + +#endif // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.cc chromium-83.0.4103.97/media/audio/sndio/sndio_input.cc ---- media/audio/sndio/sndio_input.cc.orig 1970-01-01 01:00:00.000000000 +0100 -+++ media/audio/sndio/sndio_input.cc 2020-06-13 17:32:28.511395969 +0200 +--- a/media/audio/sndio/sndio_input.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_input.cc 2020-06-13 17:32:28.511395969 +0200 @@ -0,0 +1,200 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -500,8 +500,8 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.cc chromium- + +} // namespace media diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.h chromium-83.0.4103.97/media/audio/sndio/sndio_input.h ---- media/audio/sndio/sndio_input.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ media/audio/sndio/sndio_input.h 2020-06-13 17:32:28.511395969 +0200 +--- a/media/audio/sndio/sndio_input.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_input.h 2020-06-13 17:32:28.511395969 +0200 @@ -0,0 +1,91 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -595,8 +595,8 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.h chromium-8 + +#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.cc chromium-83.0.4103.97/media/audio/sndio/sndio_output.cc ---- media/audio/sndio/sndio_output.cc.orig 1970-01-01 01:00:00.000000000 +0100 -+++ media/audio/sndio/sndio_output.cc 2020-06-13 17:32:28.511395969 +0200 +--- a/media/audio/sndio/sndio_output.cc 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_output.cc 2020-06-13 17:32:28.511395969 +0200 @@ -0,0 +1,183 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -782,8 +782,8 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.cc chromium + +} // namespace media diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-83.0.4103.97/media/audio/sndio/sndio_output.h ---- media/audio/sndio/sndio_output.h.orig 1970-01-01 01:00:00.000000000 +0100 -+++ media/audio/sndio/sndio_output.h 2020-06-13 17:32:28.511395969 +0200 +--- a/media/audio/sndio/sndio_output.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/media/audio/sndio/sndio_output.h 2020-06-13 17:32:28.511395969 +0200 @@ -0,0 +1,86 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -872,8 +872,8 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium- + +#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_ diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni ---- media/media_options.gni.orig 2020-06-03 20:40:26.000000000 +0200 -+++ media/media_options.gni 2020-06-13 17:32:28.512395963 +0200 +--- a/media/media_options.gni 2020-06-03 20:40:26.000000000 +0200 ++++ b/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200 @@ -119,6 +119,9 @@ # Enables runtime selection of ALSA library for audio. use_alsa = false diff --git a/srcpkgs/chromium/patches/webrtc-include.patch b/srcpkgs/chromium/patches/webrtc-include.patch index 92ec272a89..4110bef179 100644 --- a/srcpkgs/chromium/patches/webrtc-include.patch +++ b/srcpkgs/chromium/patches/webrtc-include.patch @@ -1,5 +1,5 @@ ---- third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc.orig 2019-02-21 21:21:24.488058990 +0100 -+++ third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc 2019-02-21 21:21:36.151961064 +0100 +--- a/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc 2019-02-21 21:21:24.488058990 +0100 ++++ b/third_party/webrtc/modules/desktop_capture/linux/window_capturer_x11.cc 2019-02-21 21:21:36.151961064 +0100 @@ -16,6 +16,7 @@ #include diff --git a/srcpkgs/chromium/patches/webrtc-size_t.patch b/srcpkgs/chromium/patches/webrtc-size_t.patch index ef7ea09cf6..dd46fe14cd 100644 --- a/srcpkgs/chromium/patches/webrtc-size_t.patch +++ b/srcpkgs/chromium/patches/webrtc-size_t.patch @@ -1,5 +1,5 @@ ---- third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-08-10 20:42:29.000000000 +0200 -+++ third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-09-04 12:47:07.014833633 +0200 +--- a/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-08-10 20:42:29.000000000 +0200 ++++ b/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h 2020-09-04 12:47:07.014833633 +0200 @@ -12,6 +12,7 @@ #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_ diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch index 792befb3a3..6d423d4091 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch @@ -15,8 +15,8 @@ the template by running the appropriate scripts diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn index 7198e59..3300485 100644 ---- third_party/libvpx/BUILD.gn -+++ third_party/libvpx/BUILD.gn +--- a/third_party/libvpx/BUILD.gn ++++ b/third_party/libvpx/BUILD.gn @@ -336,6 +336,8 @@ static_library("libvpx") { } else { sources = libvpx_srcs_arm64 @@ -28,8 +28,8 @@ index 7198e59..3300485 100644 configs -= [ "//build/config/compiler:chromium_code" ] diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh index bcf84b0..8a3f4f1 100755 ---- third_party/libvpx/generate_gni.sh -+++ third_party/libvpx/generate_gni.sh +--- a/third_party/libvpx/generate_gni.sh ++++ b/third_party/libvpx/generate_gni.sh @@ -361,6 +361,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}" gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}" diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch index 28fec28321..1c18041754 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch @@ -6,8 +6,8 @@ Date: Wed Mar 3 19:08:29 2021 +0100 diff --git build/download_nacl_toolchains.py build/download_nacl_toolchains.py index 286a92a27..ec36a85d3 100755 ---- build/download_nacl_toolchains.py -+++ build/download_nacl_toolchains.py +--- a/build/download_nacl_toolchains.py ++++ b/build/download_nacl_toolchains.py @@ -13,6 +13,10 @@ import sys @@ -21,8 +21,8 @@ index 286a92a27..ec36a85d3 100755 nacl_dir = os.path.join(src_dir, 'native_client') diff --git chrome/installer/linux/BUILD.gn chrome/installer/linux/BUILD.gn index 35f01d0a4..28f2e7475 100644 ---- chrome/installer/linux/BUILD.gn -+++ chrome/installer/linux/BUILD.gn +--- a/chrome/installer/linux/BUILD.gn ++++ b/chrome/installer/linux/BUILD.gn @@ -94,8 +94,6 @@ packaging_files = packaging_files_binaries + [ "$root_out_dir/xdg-mime", "$root_out_dir/xdg-settings", @@ -42,8 +42,8 @@ index 35f01d0a4..28f2e7475 100644 ] diff --git sandbox/features.gni sandbox/features.gni index db30ae6d6..9dc09bf53 100644 ---- sandbox/features.gni -+++ sandbox/features.gni +--- a/sandbox/features.gni ++++ b/sandbox/features.gni @@ -11,7 +11,8 @@ import("//build/config/nacl/config.gni") use_seccomp_bpf = (is_linux || is_chromeos || is_android) && (current_cpu == "x86" || current_cpu == "x64" || @@ -56,8 +56,8 @@ index db30ae6d6..9dc09bf53 100644 diff --git sandbox/linux/BUILD.gn sandbox/linux/BUILD.gn index e9a94b461..cca1a5da5 100644 ---- sandbox/linux/BUILD.gn -+++ sandbox/linux/BUILD.gn +--- a/sandbox/linux/BUILD.gn ++++ b/sandbox/linux/BUILD.gn @@ -427,6 +427,8 @@ component("sandbox_services") { source_set("sandbox_services_headers") { @@ -69,8 +69,8 @@ index e9a94b461..cca1a5da5 100644 "system_headers/arm_linux_ucontext.h", diff --git sandbox/linux/bpf_dsl/linux_syscall_ranges.h sandbox/linux/bpf_dsl/linux_syscall_ranges.h index 313511f22..0ca3a326f 100644 ---- sandbox/linux/bpf_dsl/linux_syscall_ranges.h -+++ sandbox/linux/bpf_dsl/linux_syscall_ranges.h +--- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h ++++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h @@ -56,6 +56,13 @@ #define MAX_PUBLIC_SYSCALL __NR_syscalls #define MAX_SYSCALL MAX_PUBLIC_SYSCALL @@ -87,8 +87,8 @@ index 313511f22..0ca3a326f 100644 #endif diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h index 1a407b952..a6aec544e 100644 ---- sandbox/linux/bpf_dsl/seccomp_macros.h -+++ sandbox/linux/bpf_dsl/seccomp_macros.h +--- a/sandbox/linux/bpf_dsl/seccomp_macros.h ++++ b/sandbox/linux/bpf_dsl/seccomp_macros.h @@ -16,6 +16,9 @@ #if defined(__mips__) // sys/user.h in eglibc misses size_t definition @@ -153,8 +153,8 @@ index 1a407b952..a6aec544e 100644 diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc index 6a1ec2389..f20c582dd 100644 ---- sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -+++ sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc @@ -88,7 +88,8 @@ bool IsBaselinePolicyWatched(int sysno) { SyscallSets::IsPrctl(sysno) || SyscallSets::IsProcessGroupOrSession(sysno) || @@ -195,8 +195,8 @@ index 6a1ec2389..f20c582dd 100644 #endif diff --git sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc index 01c046dda..7e5a6be82 100644 ---- sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc.orig 2021-04-15 13:11:10.481579470 -0400 -+++ sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc 2021-04-15 13:12:43.524831376 -0400 +--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc 2021-04-15 13:11:10.481579470 -0400 ++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc 2021-04-15 13:12:43.524831376 -0400 @@ -302,7 +302,7 @@ TEST_BASELINE_SIGSYS(__NR_syslog) TEST_BASELINE_SIGSYS(__NR_timer_create) @@ -208,8 +208,8 @@ index 01c046dda..7e5a6be82 100644 #endif diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc index 2a97d3916..8e81aa6cf 100644 ---- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.orig 2021-04-14 14:41:08.000000000 -0400 -+++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2021-04-15 13:17:57.808715733 -0400 +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2021-04-14 14:41:08.000000000 -0400 ++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2021-04-15 13:17:57.808715733 -0400 @@ -40,7 +40,8 @@ #include #if (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ @@ -295,8 +295,8 @@ index 2a97d3916..8e81aa6cf 100644 #endif diff --git sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h index ba4289f05..9a4d5ab2d 100644 ---- sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h -+++ sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h ++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h @@ -48,7 +48,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictMprotectFlags(); // O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME. SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands(); @@ -308,8 +308,8 @@ index ba4289f05..9a4d5ab2d 100644 SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand(); diff --git sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc index 642df7207..34f47eb73 100644 ---- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -+++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc @@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int sysno) { switch (sysno) { case __NR_gettimeofday: @@ -751,8 +751,8 @@ index 642df7207..34f47eb73 100644 return true; diff --git sandbox/linux/seccomp-bpf-helpers/syscall_sets.h sandbox/linux/seccomp-bpf-helpers/syscall_sets.h index 923533ec9..411f72acd 100644 ---- sandbox/linux/seccomp-bpf-helpers/syscall_sets.h -+++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.h +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h ++++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h @@ -43,13 +43,14 @@ class SANDBOX_EXPORT SyscallSets { static bool IsDeniedGetOrModifySocket(int sysno); @@ -791,8 +791,8 @@ index 923533ec9..411f72acd 100644 #endif diff --git sandbox/linux/seccomp-bpf/syscall.cc sandbox/linux/seccomp-bpf/syscall.cc index e47e98bf5..d53a7ff56 100644 ---- sandbox/linux/seccomp-bpf/syscall.cc -+++ sandbox/linux/seccomp-bpf/syscall.cc +--- a/sandbox/linux/seccomp-bpf/syscall.cc ++++ b/sandbox/linux/seccomp-bpf/syscall.cc @@ -18,7 +18,7 @@ namespace sandbox { namespace { @@ -891,8 +891,8 @@ index e47e98bf5..d53a7ff56 100644 } diff --git sandbox/linux/seccomp-bpf/trap.cc sandbox/linux/seccomp-bpf/trap.cc index f5b86a73a..5e6c4a068 100644 ---- sandbox/linux/seccomp-bpf/trap.cc -+++ sandbox/linux/seccomp-bpf/trap.cc +--- a/sandbox/linux/seccomp-bpf/trap.cc ++++ b/sandbox/linux/seccomp-bpf/trap.cc @@ -232,6 +232,20 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { SetIsInSigHandler(); } @@ -916,8 +916,8 @@ index f5b86a73a..5e6c4a068 100644 // evaluator registered with the sandbox. diff --git sandbox/linux/services/credentials.cc sandbox/linux/services/credentials.cc index d7b5d8c44..4adc6d0d4 100644 ---- sandbox/linux/services/credentials.cc -+++ sandbox/linux/services/credentials.cc +--- a/sandbox/linux/services/credentials.cc ++++ b/sandbox/linux/services/credentials.cc @@ -81,7 +81,7 @@ bool ChrootToSafeEmptyDir() { pid_t pid = -1; alignas(16) char stack_buf[PTHREAD_STACK_MIN]; @@ -929,8 +929,8 @@ index d7b5d8c44..4adc6d0d4 100644 #else diff --git sandbox/linux/services/syscall_wrappers.cc sandbox/linux/services/syscall_wrappers.cc index fcfd2aa12..f6eb32fb7 100644 ---- sandbox/linux/services/syscall_wrappers.cc -+++ sandbox/linux/services/syscall_wrappers.cc +--- a/sandbox/linux/services/syscall_wrappers.cc ++++ b/sandbox/linux/services/syscall_wrappers.cc @@ -58,7 +58,7 @@ long sys_clone(unsigned long flags, #if defined(ARCH_CPU_X86_64) return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls); @@ -942,8 +942,8 @@ index fcfd2aa12..f6eb32fb7 100644 #endif diff --git sandbox/linux/syscall_broker/broker_process.cc sandbox/linux/syscall_broker/broker_process.cc index d72c9d238..77f1d95f5 100644 ---- sandbox/linux/syscall_broker/broker_process.cc -+++ sandbox/linux/syscall_broker/broker_process.cc +--- a/sandbox/linux/syscall_broker/broker_process.cc ++++ b/sandbox/linux/syscall_broker/broker_process.cc @@ -169,7 +169,7 @@ bool BrokerProcess::IsSyscallBrokerable(int sysno, bool fast_check) const { #if defined(__NR_fstatat64) case __NR_fstatat64: @@ -955,8 +955,8 @@ index d72c9d238..77f1d95f5 100644 return !fast_check || allowed_command_set_.test(COMMAND_STAT); diff --git sandbox/linux/system_headers/linux_seccomp.h sandbox/linux/system_headers/linux_seccomp.h index 1fa47ed09..39cc9ab53 100644 ---- sandbox/linux/system_headers/linux_seccomp.h -+++ sandbox/linux/system_headers/linux_seccomp.h +--- a/sandbox/linux/system_headers/linux_seccomp.h ++++ b/sandbox/linux/system_headers/linux_seccomp.h @@ -41,6 +41,9 @@ #ifndef EM_AARCH64 #define EM_AARCH64 183 @@ -982,8 +982,8 @@ index 1fa47ed09..39cc9ab53 100644 #ifndef PR_SET_SECCOMP diff --git sandbox/linux/system_headers/linux_signal.h sandbox/linux/system_headers/linux_signal.h index f5a736761..515b21a5f 100644 ---- sandbox/linux/system_headers/linux_signal.h -+++ sandbox/linux/system_headers/linux_signal.h +--- a/sandbox/linux/system_headers/linux_signal.h ++++ b/sandbox/linux/system_headers/linux_signal.h @@ -13,7 +13,7 @@ // (not undefined, but defined different values and in different memory // layouts). So, fill the gap here. @@ -995,8 +995,8 @@ index f5a736761..515b21a5f 100644 #define LINUX_SIGINT 2 diff --git sandbox/linux/system_headers/linux_syscalls.h sandbox/linux/system_headers/linux_syscalls.h index 2b78a0cc3..0a70f5ea5 100644 ---- sandbox/linux/system_headers/linux_syscalls.h -+++ sandbox/linux/system_headers/linux_syscalls.h +--- a/sandbox/linux/system_headers/linux_syscalls.h ++++ b/sandbox/linux/system_headers/linux_syscalls.h @@ -35,5 +35,9 @@ #include "sandbox/linux/system_headers/arm64_linux_syscalls.h" #endif @@ -1009,8 +1009,8 @@ index 2b78a0cc3..0a70f5ea5 100644 diff --git sandbox/linux/system_headers/linux_ucontext.h sandbox/linux/system_headers/linux_ucontext.h index 22ce78027..a69b024c2 100644 ---- sandbox/linux/system_headers/linux_ucontext.h -+++ sandbox/linux/system_headers/linux_ucontext.h +--- a/sandbox/linux/system_headers/linux_ucontext.h ++++ b/sandbox/linux/system_headers/linux_ucontext.h @@ -11,6 +11,8 @@ #include "sandbox/linux/system_headers/arm_linux_ucontext.h" #elif defined(__i386__) @@ -1024,7 +1024,7 @@ diff --git sandbox/linux/system_headers/ppc64_linux_syscalls.h sandbox/linux/sys new file mode 100644 index 000000000..ccacffe22 --- /dev/null -+++ sandbox/linux/system_headers/ppc64_linux_syscalls.h ++++ b/sandbox/linux/system_headers/ppc64_linux_syscalls.h @@ -0,0 +1,12 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -1042,7 +1042,7 @@ diff --git sandbox/linux/system_headers/ppc64_linux_ucontext.h sandbox/linux/sys new file mode 100644 index 000000000..07728e087 --- /dev/null -+++ sandbox/linux/system_headers/ppc64_linux_ucontext.h ++++ b/sandbox/linux/system_headers/ppc64_linux_ucontext.h @@ -0,0 +1,12 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be @@ -1058,8 +1058,8 @@ index 000000000..07728e087 +#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_ diff --git sandbox/policy/linux/bpf_renderer_policy_linux.cc sandbox/policy/linux/bpf_renderer_policy_linux.cc index 2588fc792..d455c4601 100644 ---- sandbox/policy/linux/bpf_renderer_policy_linux.cc -+++ sandbox/policy/linux/bpf_renderer_policy_linux.cc +--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc ++++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc @@ -15,6 +15,11 @@ #include "sandbox/linux/system_headers/linux_syscalls.h" #include "sandbox/policy/linux/sandbox_linux.h" @@ -1074,8 +1074,8 @@ index 2588fc792..d455c4601 100644 #include diff --git third_party/angle/src/compiler/translator/InfoSink.h third_party/angle/src/compiler/translator/InfoSink.h index 3a807e1e3..5258617a7 100644 ---- third_party/angle/src/compiler/translator/InfoSink.h -+++ third_party/angle/src/compiler/translator/InfoSink.h +--- a/third_party/angle/src/compiler/translator/InfoSink.h ++++ b/third_party/angle/src/compiler/translator/InfoSink.h @@ -92,7 +92,16 @@ class TInfoSinkBase stream.precision(8); stream << f; @@ -1096,8 +1096,8 @@ index 3a807e1e3..5258617a7 100644 // Write boolean values as their names instead of integral value. diff --git third_party/angle/src/libANGLE/Constants.h third_party/angle/src/libANGLE/Constants.h index fcbc9246a..39ae66148 100644 ---- third_party/angle/src/libANGLE/Constants.h -+++ third_party/angle/src/libANGLE/Constants.h +--- a/third_party/angle/src/libANGLE/Constants.h ++++ b/third_party/angle/src/libANGLE/Constants.h @@ -9,6 +9,7 @@ #ifndef LIBANGLE_CONSTANTS_H_ #define LIBANGLE_CONSTANTS_H_ @@ -1108,8 +1108,8 @@ index fcbc9246a..39ae66148 100644 #include diff --git third_party/boringssl/BUILD.gn third_party/boringssl/BUILD.gn index 17cf9cda9..8ce96bd32 100644 ---- third_party/boringssl/BUILD.gn -+++ third_party/boringssl/BUILD.gn +--- a/third_party/boringssl/BUILD.gn ++++ b/third_party/boringssl/BUILD.gn @@ -103,6 +103,13 @@ if (is_win && !is_msan && current_cpu != "arm64") { } else { public_configs = [ ":no_asm_config" ] @@ -1126,8 +1126,8 @@ index 17cf9cda9..8ce96bd32 100644 } diff --git third_party/breakpad/BUILD.gn third_party/breakpad/BUILD.gn index 4af3d7bbf..adbf54159 100644 ---- third_party/breakpad/BUILD.gn -+++ third_party/breakpad/BUILD.gn +--- a/third_party/breakpad/BUILD.gn ++++ b/third_party/breakpad/BUILD.gn @@ -596,7 +596,6 @@ if (is_linux || is_chromeos || is_android) { "breakpad/src/client/minidump_file_writer.h", "breakpad/src/common/convert_UTF.cc", @@ -1161,8 +1161,8 @@ index 4af3d7bbf..adbf54159 100644 "breakpad/src/common/linux/linux_libc_support_unittest.cc", diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h index 07d9171a0..9aed4cb36 100644 ---- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h -+++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h +--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h ++++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h @@ -44,6 +44,8 @@ typedef MDRawContextARM RawContextCPU; typedef MDRawContextARM64_Old RawContextCPU; #elif defined(__mips__) @@ -1174,8 +1174,8 @@ index 07d9171a0..9aed4cb36 100644 #endif diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc index aae1dc13b..03afec7a5 100644 ---- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc -+++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc +--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc @@ -270,7 +270,42 @@ void ThreadInfo::FillCPUContext(RawContextCPU* out) const { out->float_save.fir = mcontext.fpc_eir; #endif @@ -1260,8 +1260,8 @@ index aae1dc13b..03afec7a5 100644 } // namespace google_breakpad diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h index fb216fa6d..593aac822 100644 ---- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h -+++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h +--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h ++++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h @@ -68,6 +68,10 @@ struct ThreadInfo { // Use the structures defined in struct user_regs_struct regs; @@ -1287,8 +1287,8 @@ index fb216fa6d..593aac822 100644 } // namespace google_breakpad diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc index 6eec1be24..741983a1a 100644 ---- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc @@ -254,6 +254,48 @@ void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc) { out->float_save.fir = uc->uc_mcontext.fpc_eir; // Unused. #endif @@ -1340,8 +1340,8 @@ index 6eec1be24..741983a1a 100644 } // namespace google_breakpad diff --git third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h index 7d4100881..c122ac92e 100644 ---- third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -+++ third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +--- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h ++++ b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h @@ -55,6 +55,9 @@ struct UContextReader { #elif defined(__aarch64__) static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc, @@ -1354,8 +1354,8 @@ index 7d4100881..c122ac92e 100644 #endif diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc index a6cb5f984..ae16b64d9 100644 ---- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -+++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc @@ -461,9 +461,16 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { memcpy(&g_crash_context_.float_state, fp_ptr, sizeof(g_crash_context_.float_state)); @@ -1407,8 +1407,8 @@ index a6cb5f984..ae16b64d9 100644 #endif diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h index f80843ea7..260dd10f7 100644 ---- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h -+++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h +--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h ++++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h @@ -192,7 +192,11 @@ class ExceptionHandler { siginfo_t siginfo; pid_t tid; // the crashing thread. @@ -1424,8 +1424,8 @@ index f80843ea7..260dd10f7 100644 // 'float_state' is not required. diff --git third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc index 35dcbfd4d..7934370fd 100644 ---- third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc -+++ third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc +--- a/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc @@ -307,7 +307,7 @@ TEST(ExceptionHandlerTest, ParallelChildCrashesDontHang) { } @@ -1459,8 +1459,8 @@ index 35dcbfd4d..7934370fd 100644 const pid_t child = fork(); diff --git third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc index fa3c1713a..6ce709e2f 100644 ---- third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc -+++ third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc +--- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc @@ -138,7 +138,9 @@ class MicrodumpWriter { const MicrodumpExtraInfo& microdump_extra_info, LinuxDumper* dumper) @@ -1505,8 +1505,8 @@ index fa3c1713a..6ce709e2f 100644 LinuxDumper* dumper_; diff --git third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc index 6339ac0cd..291af106b 100644 ---- third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc -+++ third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc +--- a/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc @@ -279,10 +279,19 @@ TEST(MicrodumpWriterTest, BasicWithMappings) { CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf); ASSERT_TRUE(ContainsMicrodump(buf)); @@ -1532,8 +1532,8 @@ index 6339ac0cd..291af106b 100644 buf.find("M 00001000 0000002A 00001000 " diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc index 415068983..b93e4afcf 100644 ---- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc -+++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc @@ -112,6 +112,9 @@ bool LinuxCoreDumper::GetThreadInfoByIndex(size_t index, ThreadInfo* info) { #elif defined(__mips__) stack_pointer = @@ -1558,8 +1558,8 @@ index 415068983..b93e4afcf 100644 info.mcontext.gregs[i - EF_R0] = status->pr_reg[i]; diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc index 7fd6532ad..199cbfffd 100644 ---- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc -+++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc @@ -765,7 +765,9 @@ bool LinuxDumper::GetStackInfo(const void** stack, size_t* stack_len, reinterpret_cast(int_stack_pointer & ~(page_size - 1)); @@ -1573,8 +1573,8 @@ index 7fd6532ad..199cbfffd 100644 if (!mapping) diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h index 7bee160f1..07bb2b81a 100644 ---- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h -+++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h @@ -63,7 +63,8 @@ namespace google_breakpad { (defined(__mips__) && _MIPS_SIM == _ABIO32) typedef Elf32_auxv_t elf_aux_entry; @@ -1587,8 +1587,8 @@ index 7bee160f1..07bb2b81a 100644 diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc index 331f4bb34..3f722947f 100644 ---- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc -+++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc @@ -51,6 +51,8 @@ #define TID_PTR_REGISTER "rcx" #elif defined(__mips__) @@ -1600,8 +1600,8 @@ index 331f4bb34..3f722947f 100644 #endif diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc index e3ddb81a6..fa28575ef 100644 ---- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc -+++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc @@ -149,19 +149,27 @@ bool LinuxPtraceDumper::CopyFromProcess(void* dest, pid_t child, return true; } @@ -1646,8 +1646,8 @@ index e3ddb81a6..fa28575ef 100644 #endif diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc index da71e15dc..12bfb317a 100644 ---- third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc -+++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc @@ -462,6 +462,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackReadWithMultipleThreads) { #elif defined(__mips__) pid_t* process_tid_location = @@ -1669,8 +1669,8 @@ index da71e15dc..12bfb317a 100644 #endif diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc index 32634ef00..2a56948de 100644 ---- third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc -+++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc @@ -136,7 +136,9 @@ class MinidumpWriter { : fd_(minidump_fd), path_(minidump_path), @@ -1726,8 +1726,8 @@ index 32634ef00..2a56948de 100644 LinuxDumper* dumper_; diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h index e3b0b16da..ccd8aa0a4 100644 ---- third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -+++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h @@ -48,6 +48,8 @@ class ExceptionHandler; #if defined(__aarch64__) @@ -1739,8 +1739,8 @@ index e3b0b16da..ccd8aa0a4 100644 #endif diff --git third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc index d192e5cbb..fc1bfa8d7 100644 ---- third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc -+++ third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc +--- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc ++++ b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc @@ -715,6 +715,9 @@ TEST(MinidumpWriterTest, InvalidStackPointer) { #elif defined(__mips__) context.context.uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP] = @@ -1753,8 +1753,8 @@ index d192e5cbb..fc1bfa8d7 100644 #endif diff --git third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc index 99362945c..c54ba7145 100644 ---- third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc -+++ third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc +--- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc ++++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc @@ -65,8 +65,7 @@ bool MemoryMappedFile::Map(const char* path, size_t offset) { } @@ -1767,8 +1767,8 @@ index 99362945c..c54ba7145 100644 #else diff --git third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc index fad59f40c..616496d67 100644 ---- third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc -+++ third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc +--- a/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc ++++ b/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc @@ -176,9 +176,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterMap) { TEST_F(MemoryMappedFileTest, MapWithOffset) { // Put more data in the test file this time. Offsets can only be @@ -1785,8 +1785,8 @@ index fad59f40c..616496d67 100644 } diff --git third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc index 5803b90d5..2a1cf14f0 100644 ---- third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc -+++ third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc +--- a/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc ++++ b/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc @@ -57,8 +57,9 @@ TEST(PageAllocatorTest, LargeObject) { EXPECT_EQ(0U, allocator.pages_allocated()); @@ -1800,8 +1800,8 @@ index 5803b90d5..2a1cf14f0 100644 ASSERT_FALSE(p == NULL); diff --git third_party/breakpad/breakpad/src/processor/exploitability_linux.cc third_party/breakpad/breakpad/src/processor/exploitability_linux.cc index 798056dfa..22bd81fff 100644 ---- third_party/breakpad/breakpad/src/processor/exploitability_linux.cc -+++ third_party/breakpad/breakpad/src/processor/exploitability_linux.cc +--- a/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc ++++ b/third_party/breakpad/breakpad/src/processor/exploitability_linux.cc @@ -202,12 +202,14 @@ bool ExploitabilityLinux::EndedOnIllegalWrite(uint64_t instruction_ptr) { // Check architecture and set architecture variable to corresponding flag // in objdump. @@ -1819,8 +1819,8 @@ index 798056dfa..22bd81fff 100644 // supported because objdump does not support ARM. diff --git third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc index 528ee5f21..72764d6c1 100644 ---- third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc -+++ third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc +--- a/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc ++++ b/third_party/breakpad/breakpad/src/processor/exploitability_unittest.cc @@ -104,6 +104,8 @@ ExploitabilityFor(const string& filename) { } @@ -1877,8 +1877,8 @@ index 528ee5f21..72764d6c1 100644 } // namespace diff --git third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc index aade82c99..195aa73f3 100644 ---- third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc -+++ third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc +--- a/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc ++++ b/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc @@ -77,6 +77,8 @@ #define ELF_ARCH EM_MIPS #elif defined(__aarch64__) @@ -1961,8 +1961,8 @@ index aade82c99..195aa73f3 100644 #endif diff --git third_party/crashpad/crashpad/CONTRIBUTORS third_party/crashpad/crashpad/CONTRIBUTORS index 8724b7f32..8e29424ef 100644 ---- third_party/crashpad/crashpad/CONTRIBUTORS -+++ third_party/crashpad/crashpad/CONTRIBUTORS +--- a/third_party/crashpad/crashpad/CONTRIBUTORS ++++ b/third_party/crashpad/crashpad/CONTRIBUTORS @@ -13,3 +13,4 @@ Mark Mentovai Robert Sesek Scott Graham @@ -1970,8 +1970,8 @@ index 8724b7f32..8e29424ef 100644 +Shawn Anastasio diff --git third_party/crashpad/crashpad/compat/linux/sys/user.h third_party/crashpad/crashpad/compat/linux/sys/user.h index 6ed77a98e..1fd83469a 100644 ---- third_party/crashpad/crashpad/compat/linux/sys/user.h -+++ third_party/crashpad/crashpad/compat/linux/sys/user.h +--- a/third_party/crashpad/crashpad/compat/linux/sys/user.h ++++ b/third_party/crashpad/crashpad/compat/linux/sys/user.h @@ -15,6 +15,7 @@ #ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_ #define CRASHPAD_COMPAT_LINUX_SYS_USER_H_ @@ -1982,8 +1982,8 @@ index 6ed77a98e..1fd83469a 100644 #include diff --git third_party/crashpad/crashpad/minidump/minidump_context.h third_party/crashpad/crashpad/minidump/minidump_context.h index 3a3e603cb..3118d9e9f 100644 ---- third_party/crashpad/crashpad/minidump/minidump_context.h -+++ third_party/crashpad/crashpad/minidump/minidump_context.h +--- a/third_party/crashpad/crashpad/minidump/minidump_context.h ++++ b/third_party/crashpad/crashpad/minidump/minidump_context.h @@ -592,6 +592,70 @@ struct MinidumpContextMIPS64 { uint64_t fir; }; @@ -2057,8 +2057,8 @@ index 3a3e603cb..3118d9e9f 100644 #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_H_ diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer.cc third_party/crashpad/crashpad/minidump/minidump_context_writer.cc index d7e53a493..d89eb9e01 100644 ---- third_party/crashpad/crashpad/minidump/minidump_context_writer.cc -+++ third_party/crashpad/crashpad/minidump/minidump_context_writer.cc +--- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc ++++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc @@ -101,6 +101,13 @@ MinidumpContextWriter::CreateFromSnapshot(const CPUContext* context_snapshot) { break; } @@ -2123,8 +2123,8 @@ index d7e53a493..d89eb9e01 100644 } // namespace crashpad diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer.h third_party/crashpad/crashpad/minidump/minidump_context_writer.h index d4ab936ee..1d22fc59c 100644 ---- third_party/crashpad/crashpad/minidump/minidump_context_writer.h -+++ third_party/crashpad/crashpad/minidump/minidump_context_writer.h +--- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h ++++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h @@ -315,6 +315,45 @@ class MinidumpContextMIPS64Writer final : public MinidumpContextWriter { DISALLOW_COPY_AND_ASSIGN(MinidumpContextMIPS64Writer); }; @@ -2173,8 +2173,8 @@ index d4ab936ee..1d22fc59c 100644 #endif // CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_ diff --git third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc index 3216a906b..a9fcbe9d8 100644 ---- third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc -+++ third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc +--- a/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc ++++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer_test.cc @@ -213,6 +213,21 @@ TEST(MinidumpContextWriter, MIPS64_FromSnapshot) { context, ExpectMinidumpContextMIPS64, kSeed); } @@ -2199,8 +2199,8 @@ index 3216a906b..a9fcbe9d8 100644 } // namespace crashpad diff --git third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc index 0974e3ddf..b71ec5880 100644 ---- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc -+++ third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc +--- a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc ++++ b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc @@ -135,6 +135,8 @@ std::string MinidumpMiscInfoDebugBuildString() { static constexpr char kCPU[] = "mips"; #elif defined(ARCH_CPU_MIPS64EL) @@ -2212,8 +2212,8 @@ index 0974e3ddf..b71ec5880 100644 #endif diff --git third_party/crashpad/crashpad/snapshot/capture_memory.cc third_party/crashpad/crashpad/snapshot/capture_memory.cc index 7a1b2763c..beda8da9e 100644 ---- third_party/crashpad/crashpad/snapshot/capture_memory.cc -+++ third_party/crashpad/crashpad/snapshot/capture_memory.cc +--- a/third_party/crashpad/crashpad/snapshot/capture_memory.cc ++++ b/third_party/crashpad/crashpad/snapshot/capture_memory.cc @@ -112,6 +112,11 @@ void CaptureMemory::PointedToByContext(const CPUContext& context, for (size_t i = 0; i < base::size(context.mipsel->regs); ++i) { MaybeCaptureMemoryAround(delegate, context.mipsel->regs[i]); @@ -2228,8 +2228,8 @@ index 7a1b2763c..beda8da9e 100644 #endif diff --git third_party/crashpad/crashpad/snapshot/cpu_architecture.h third_party/crashpad/crashpad/snapshot/cpu_architecture.h index 811a72095..f4f83981d 100644 ---- third_party/crashpad/crashpad/snapshot/cpu_architecture.h -+++ third_party/crashpad/crashpad/snapshot/cpu_architecture.h +--- a/third_party/crashpad/crashpad/snapshot/cpu_architecture.h ++++ b/third_party/crashpad/crashpad/snapshot/cpu_architecture.h @@ -43,7 +43,10 @@ enum CPUArchitecture { kCPUArchitectureMIPSEL, @@ -2244,8 +2244,8 @@ index 811a72095..f4f83981d 100644 } // namespace crashpad diff --git third_party/crashpad/crashpad/snapshot/cpu_context.cc third_party/crashpad/crashpad/snapshot/cpu_context.cc index c75b5555e..aeade577a 100644 ---- third_party/crashpad/crashpad/snapshot/cpu_context.cc -+++ third_party/crashpad/crashpad/snapshot/cpu_context.cc +--- a/third_party/crashpad/crashpad/snapshot/cpu_context.cc ++++ b/third_party/crashpad/crashpad/snapshot/cpu_context.cc @@ -169,6 +169,8 @@ uint64_t CPUContext::InstructionPointer() const { return arm->pc; case kCPUArchitectureARM64: @@ -2274,8 +2274,8 @@ index c75b5555e..aeade577a 100644 case kCPUArchitectureARM: diff --git third_party/crashpad/crashpad/snapshot/cpu_context.h third_party/crashpad/crashpad/snapshot/cpu_context.h index fb23c4679..eebede63c 100644 ---- third_party/crashpad/crashpad/snapshot/cpu_context.h -+++ third_party/crashpad/crashpad/snapshot/cpu_context.h +--- a/third_party/crashpad/crashpad/snapshot/cpu_context.h ++++ b/third_party/crashpad/crashpad/snapshot/cpu_context.h @@ -352,6 +352,24 @@ struct CPUContextMIPS64 { uint64_t fir; }; @@ -2311,8 +2311,8 @@ index fb23c4679..eebede63c 100644 diff --git third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h index 9f46a4897..aa677c4eb 100644 ---- third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h -+++ third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h +--- a/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h ++++ b/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.h @@ -15,6 +15,7 @@ #ifndef CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_ #define CRASHPAD_SNAPSHOT_LINUX_CPU_CONTEXT_LINUX_H_ @@ -2402,8 +2402,8 @@ index 9f46a4897..aa677c4eb 100644 diff --git third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc index d32bd1937..2dd538c2b 100644 ---- third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc -+++ third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc +--- a/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/debug_rendezvous_test.cc @@ -192,6 +192,8 @@ void TestAgainstTarget(PtraceConnection* connection) { device == 0 && inode == 0 && mapping_name == "[vdso]"; #if defined(ARCH_CPU_X86) @@ -2415,8 +2415,8 @@ index d32bd1937..2dd538c2b 100644 #endif diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc index cd40b3b12..6bcf23b6f 100644 ---- third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc -+++ third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc +--- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.cc @@ -323,6 +323,69 @@ bool ExceptionSnapshotLinux::ReadContext( reader, context_address, context_.mips64); } @@ -2489,8 +2489,8 @@ index cd40b3b12..6bcf23b6f 100644 bool ExceptionSnapshotLinux::Initialize(ProcessReaderLinux* process_reader, diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h index ea0cd2106..e42df520f 100644 ---- third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h -+++ third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h +--- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h ++++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux.h @@ -84,6 +84,8 @@ class ExceptionSnapshotLinux final : public ExceptionSnapshot { #elif defined(ARCH_CPU_MIPS_FAMILY) CPUContextMIPS mipsel; @@ -2502,8 +2502,8 @@ index ea0cd2106..e42df520f 100644 CPUContext context_; diff --git third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc index c17170b43..b6a714cc6 100644 ---- third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc -+++ third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc +--- a/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/exception_snapshot_linux_test.cc @@ -296,7 +296,28 @@ void ExpectContext(const CPUContext& actual, const NativeCPUContext& expected) { 0); #undef CPU_ARCH_NAME @@ -2535,8 +2535,8 @@ index c17170b43..b6a714cc6 100644 #endif diff --git third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc index ee246e8bc..9555dce04 100644 ---- third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc -+++ third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc +--- a/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/process_reader_linux.cc @@ -108,6 +108,8 @@ void ProcessReaderLinux::Thread::InitializeStack(ProcessReaderLinux* reader) { #elif defined(ARCH_CPU_MIPS_FAMILY) stack_pointer = reader->Is64Bit() ? thread_info.thread_context.t64.regs[29] @@ -2548,8 +2548,8 @@ index ee246e8bc..9555dce04 100644 #endif diff --git third_party/crashpad/crashpad/snapshot/linux/signal_context.h third_party/crashpad/crashpad/snapshot/linux/signal_context.h index 110024680..a1f2da259 100644 ---- third_party/crashpad/crashpad/snapshot/linux/signal_context.h -+++ third_party/crashpad/crashpad/snapshot/linux/signal_context.h +--- a/third_party/crashpad/crashpad/snapshot/linux/signal_context.h ++++ b/third_party/crashpad/crashpad/snapshot/linux/signal_context.h @@ -422,6 +422,89 @@ static_assert(offsetof(UContext, mcontext.fpregs) == "context offset mismatch"); #endif @@ -2642,8 +2642,8 @@ index 110024680..a1f2da259 100644 #endif // ARCH_CPU_X86_FAMILY diff --git third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc index a99da3e4b..03b973083 100644 ---- third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc -+++ third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc +--- a/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/system_snapshot_linux.cc @@ -204,6 +204,8 @@ CPUArchitecture SystemSnapshotLinux::GetCPUArchitecture() const { #elif defined(ARCH_CPU_MIPS_FAMILY) return process_reader_->Is64Bit() ? kCPUArchitectureMIPS64EL @@ -2685,8 +2685,8 @@ index a99da3e4b..03b973083 100644 #endif // ARCH_CPU_X86_FAMILY diff --git third_party/crashpad/crashpad/snapshot/linux/test_modules.cc third_party/crashpad/crashpad/snapshot/linux/test_modules.cc index b2450c206..7ba78b2ae 100644 ---- third_party/crashpad/crashpad/snapshot/linux/test_modules.cc -+++ third_party/crashpad/crashpad/snapshot/linux/test_modules.cc +--- a/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/test_modules.cc @@ -110,6 +110,8 @@ bool WriteTestModule(const base::FilePath& module_path, module.ehdr.e_machine = EM_AARCH64; #elif defined(ARCH_CPU_MIPSEL) || defined(ARCH_CPU_MIPS64EL) @@ -2698,8 +2698,8 @@ index b2450c206..7ba78b2ae 100644 module.ehdr.e_version = EV_CURRENT; diff --git third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc index e3e2bebdd..8ef43752e 100644 ---- third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc -+++ third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc +--- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc ++++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.cc @@ -186,6 +186,14 @@ bool ThreadSnapshotLinux::Initialize(ProcessReaderLinux* process_reader, thread.thread_info.float_context.f32, context_.mipsel); @@ -2717,8 +2717,8 @@ index e3e2bebdd..8ef43752e 100644 #endif diff --git third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h index 44cc6f6d9..d4136461e 100644 ---- third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h -+++ third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h +--- a/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h ++++ b/third_party/crashpad/crashpad/snapshot/linux/thread_snapshot_linux.h @@ -68,6 +68,8 @@ class ThreadSnapshotLinux final : public ThreadSnapshot { #elif defined(ARCH_CPU_MIPS_FAMILY) CPUContextMIPS mipsel; @@ -2728,8 +2728,8 @@ index 44cc6f6d9..d4136461e 100644 #else #error Port. #endif // ARCH_CPU_X86_FAMILY ---- third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc -+++ third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc +--- a/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc ++++ b/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc @@ -236,6 +236,12 @@ #elif defined(ARCH_CPU_BIG_ENDIAN) static constexpr char arch[] = "aarch64_be"; @@ -2745,8 +2745,8 @@ index 44cc6f6d9..d4136461e 100644 #endif diff --git third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc index d3d5ebdfb..3fd730cb5 100644 ---- third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc -+++ third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc +--- a/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc ++++ b/third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc @@ -56,6 +56,11 @@ bool AuxiliaryVector::Read(PtraceConnection* connection) { if (type == AT_IGNORE) { continue; @@ -2761,8 +2761,8 @@ index d3d5ebdfb..3fd730cb5 100644 return false; diff --git third_party/crashpad/crashpad/util/linux/ptracer.cc third_party/crashpad/crashpad/util/linux/ptracer.cc index 557e0d363..08ae434b8 100644 ---- third_party/crashpad/crashpad/util/linux/ptracer.cc -+++ third_party/crashpad/crashpad/util/linux/ptracer.cc +--- a/third_party/crashpad/crashpad/util/linux/ptracer.cc ++++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc @@ -398,6 +398,64 @@ bool GetThreadArea64(pid_t tid, return true; } @@ -2840,8 +2840,8 @@ index 557e0d363..08ae434b8 100644 &info->thread_specific_data_address, diff --git third_party/crashpad/crashpad/util/linux/thread_info.h third_party/crashpad/crashpad/util/linux/thread_info.h index 5b55c24a7..dea0d1f39 100644 ---- third_party/crashpad/crashpad/util/linux/thread_info.h -+++ third_party/crashpad/crashpad/util/linux/thread_info.h +--- a/third_party/crashpad/crashpad/util/linux/thread_info.h ++++ b/third_party/crashpad/crashpad/util/linux/thread_info.h @@ -28,6 +28,10 @@ #include #endif @@ -2962,8 +2962,8 @@ index 5b55c24a7..dea0d1f39 100644 }; diff --git third_party/crashpad/crashpad/util/misc/capture_context.h third_party/crashpad/crashpad/util/misc/capture_context.h index d21a24f19..acc325349 100644 ---- third_party/crashpad/crashpad/util/misc/capture_context.h -+++ third_party/crashpad/crashpad/util/misc/capture_context.h +--- a/third_party/crashpad/crashpad/util/misc/capture_context.h ++++ b/third_party/crashpad/crashpad/util/misc/capture_context.h @@ -69,6 +69,7 @@ using NativeCPUContext = ucontext_t; //! macOS/Linux/Fuchsia | x86_64 | `%%rdi` //! Linux | ARM/ARM64 | `r0`/`x0` @@ -2974,8 +2974,8 @@ index d21a24f19..acc325349 100644 //! this function. diff --git third_party/crashpad/crashpad/util/misc/capture_context_linux.S third_party/crashpad/crashpad/util/misc/capture_context_linux.S index 52215ee5d..b3e4a3ec7 100644 ---- third_party/crashpad/crashpad/util/misc/capture_context_linux.S -+++ third_party/crashpad/crashpad/util/misc/capture_context_linux.S +--- a/third_party/crashpad/crashpad/util/misc/capture_context_linux.S ++++ b/third_party/crashpad/crashpad/util/misc/capture_context_linux.S @@ -32,7 +32,7 @@ .balign 4, 0x0 .type CAPTURECONTEXT_SYMBOL, %function @@ -3202,8 +3202,8 @@ index 52215ee5d..b3e4a3ec7 100644 #endif // __i386__ diff --git third_party/crashpad/crashpad/util/misc/capture_context_test.cc third_party/crashpad/crashpad/util/misc/capture_context_test.cc index cf23c2def..5f264bc92 100644 ---- third_party/crashpad/crashpad/util/misc/capture_context_test.cc -+++ third_party/crashpad/crashpad/util/misc/capture_context_test.cc +--- a/third_party/crashpad/crashpad/util/misc/capture_context_test.cc ++++ b/third_party/crashpad/crashpad/util/misc/capture_context_test.cc @@ -57,7 +57,7 @@ void TestCaptureContext() { uintptr_t pc = ProgramCounterFromContext(context_1); @@ -3215,8 +3215,8 @@ index cf23c2def..5f264bc92 100644 const uintptr_t kReferencePC = diff --git third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc index 30a2ab21d..60509f21d 100644 ---- third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc -+++ third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc +--- a/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc ++++ b/third_party/crashpad/crashpad/util/misc/capture_context_test_util_linux.cc @@ -35,6 +35,8 @@ void SanityCheckContext(const NativeCPUContext& context) { EXPECT_EQ(context.uc_mcontext.regs[0], FromPointerCast(&context)); #elif defined(ARCH_CPU_MIPS_FAMILY) @@ -3246,8 +3246,8 @@ index 30a2ab21d..60509f21d 100644 diff --git third_party/crashpad/crashpad/util/posix/signals_test.cc third_party/crashpad/crashpad/util/posix/signals_test.cc index 54cc2f19f..298b5c993 100644 ---- third_party/crashpad/crashpad/util/posix/signals_test.cc -+++ third_party/crashpad/crashpad/util/posix/signals_test.cc +--- a/third_party/crashpad/crashpad/util/posix/signals_test.cc ++++ b/third_party/crashpad/crashpad/util/posix/signals_test.cc @@ -46,9 +46,9 @@ bool CanCauseSignal(int sig) { return sig == SIGABRT || sig == SIGALRM || @@ -3284,8 +3284,8 @@ index 54cc2f19f..298b5c993 100644 case SIGILL: { diff --git third_party/dav1d/BUILD.gn third_party/dav1d/BUILD.gn index 6b4566fc3..c07f732ad 100644 ---- third_party/dav1d/BUILD.gn -+++ third_party/dav1d/BUILD.gn +--- a/third_party/dav1d/BUILD.gn ++++ b/third_party/dav1d/BUILD.gn @@ -184,6 +184,8 @@ static_library("dav1d_8bit") { sources += arm_template_sources } else if (current_cpu == "arm64") { @@ -3338,7 +3338,7 @@ diff --git third_party/dav1d/config/linux/ppc64/config.h third_party/dav1d/confi new file mode 100644 index 000000000..9fbbf75cc --- /dev/null -+++ third_party/dav1d/config/linux/ppc64/config.h ++++ b/third_party/dav1d/config/linux/ppc64/config.h @@ -0,0 +1,39 @@ +/* + * Autogenerated by the Meson build system. @@ -3381,8 +3381,8 @@ index 000000000..9fbbf75cc + diff --git third_party/dav1d/dav1d_generated.gni third_party/dav1d/dav1d_generated.gni index c59cb0821..3060284a8 100644 ---- third_party/dav1d/dav1d_generated.gni -+++ third_party/dav1d/dav1d_generated.gni +--- a/third_party/dav1d/dav1d_generated.gni ++++ b/third_party/dav1d/dav1d_generated.gni @@ -82,6 +82,11 @@ arm_template_sources = [ "libdav1d/src/arm/mc_init_tmpl.c", ] @@ -3397,8 +3397,8 @@ index c59cb0821..3060284a8 100644 "libdav1d/src/cdef_tmpl.c", diff --git third_party/dav1d/generate_source.py third_party/dav1d/generate_source.py index 9ab5e00b8..ad3feffee 100755 ---- third_party/dav1d/generate_source.py.orig 2021-04-15 13:11:10.489579490 -0400 -+++ third_party/dav1d/generate_source.py 2021-04-15 13:19:08.229913892 -0400 +--- a/third_party/dav1d/generate_source.py 2021-04-15 13:11:10.489579490 -0400 ++++ b/third_party/dav1d/generate_source.py 2021-04-15 13:19:08.229913892 -0400 @@ -57,6 +57,8 @@ _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S")) _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c")) @@ -3410,8 +3410,8 @@ index 9ab5e00b8..ad3feffee 100755 diff --git third_party/dav1d/libdav1d/src/ppc/types.h third_party/dav1d/libdav1d/src/ppc/types.h index 0b4bd72f0..a0caa5e71 100644 ---- third_party/dav1d/libdav1d/src/ppc/types.h -+++ third_party/dav1d/libdav1d/src/ppc/types.h +--- a/third_party/dav1d/libdav1d/src/ppc/types.h ++++ b/third_party/dav1d/libdav1d/src/ppc/types.h @@ -51,4 +51,19 @@ #define u16l_to_i32(v) ((i32x4) vec_mergel((u16x8) v, vec_splat_u16(0))) #define i16l_to_i32(v) ((i32x4) vec_unpackl((i16x8)v)) @@ -3434,8 +3434,8 @@ index 0b4bd72f0..a0caa5e71 100644 #endif /* DAV1D_SRC_PPC_TYPES_H */ diff --git third_party/eigen3/BUILD.gn third_party/eigen3/BUILD.gn index 0d4e184..f2ce484 100644 ---- third_party/eigen3/BUILD.gn -+++ third_party/eigen3/BUILD.gn +--- a/third_party/eigen3/BUILD.gn ++++ b/third_party/eigen3/BUILD.gn @@ -22,4 +22,8 @@ config("eigen_includes") { # for this component on Windows on Arm due to compilation errors. defines += [ "EIGEN_DONT_VECTORIZE" ] @@ -3448,8 +3448,8 @@ index 0d4e184..f2ce484 100644 diff --git third_party/libaom/BUILD.gn third_party/libaom/BUILD.gn index 9b065bd..df3af02 100644 ---- third_party/libaom/BUILD.gn -+++ third_party/libaom/BUILD.gn +--- a/third_party/libaom/BUILD.gn ++++ b/third_party/libaom/BUILD.gn @@ -36,6 +36,8 @@ if (enable_libaom) { } else { cpu_arch_full = "arm" @@ -3461,8 +3461,8 @@ index 9b065bd..df3af02 100644 } diff --git third_party/libgav1/options.gni third_party/libgav1/options.gni index 11af801..4b13d05 100644 ---- third_party/libgav1/options.gni -+++ third_party/libgav1/options.gni +--- a/third_party/libgav1/options.gni ++++ b/third_party/libgav1/options.gni @@ -12,5 +12,5 @@ declare_args() { is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64") use_libgav1_parser = @@ -3472,8 +3472,8 @@ index 11af801..4b13d05 100644 } diff --git third_party/lss/linux_syscall_support.h third_party/lss/linux_syscall_support.h index e4ac22644..1c57015db 100644 ---- third_party/lss/linux_syscall_support.h -+++ third_party/lss/linux_syscall_support.h +--- a/third_party/lss/linux_syscall_support.h ++++ b/third_party/lss/linux_syscall_support.h @@ -3947,7 +3947,7 @@ struct kernel_statfs { LSS_REG(2, buf); LSS_BODY(void*, mmap2, "0"(__r2)); @@ -3494,8 +3494,8 @@ index e4ac22644..1c57015db 100644 LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d, diff --git third_party/pdfium/third_party/libpng16/pngpriv.h third_party/pdfium/third_party/libpng16/pngpriv.h index 583c26f..e03d697 100644 ---- third_party/pdfium/third_party/libpng16/pngpriv.h -+++ third_party/pdfium/third_party/libpng16/pngpriv.h +--- a/third_party/pdfium/third_party/libpng16/pngpriv.h ++++ b/third_party/pdfium/third_party/libpng16/pngpriv.h @@ -196,11 +196,7 @@ #endif @@ -3511,8 +3511,8 @@ index 583c26f..e03d697 100644 #ifndef PNG_INTEL_SSE_OPT diff --git third_party/pffft/src/pffft.c third_party/pffft/src/pffft.c index bdac4d784..51e0f2cac 100644 ---- third_party/pffft/src/pffft.c -+++ third_party/pffft/src/pffft.c +--- a/third_party/pffft/src/pffft.c ++++ b/third_party/pffft/src/pffft.c @@ -100,6 +100,7 @@ Altivec support macros */ @@ -3523,8 +3523,8 @@ index bdac4d784..51e0f2cac 100644 # define VZERO() ((vector float) vec_splat_u8(0)) diff --git third_party/skia/src/sksl/SkSLString.cpp third_party/skia/src/sksl/SkSLString.cpp index ec3e56964..4cf8999a2 100644 ---- third_party/skia/src/sksl/SkSLString.cpp -+++ third_party/skia/src/sksl/SkSLString.cpp +--- a/third_party/skia/src/sksl/SkSLString.cpp ++++ b/third_party/skia/src/sksl/SkSLString.cpp @@ -234,7 +234,12 @@ String to_string(double value) { if (needsDotZero) { buffer << ".0"; @@ -3541,8 +3541,8 @@ index ec3e56964..4cf8999a2 100644 bool stod(const StringFragment& s, SKSL_FLOAT* value) { diff --git third_party/sqlite/src/amalgamation/sqlite3.c third_party/sqlite/src/amalgamation/sqlite3.c index 6b4a7899d..b8c7fe414 100644 ---- third_party/sqlite/src/amalgamation/sqlite3.c -+++ third_party/sqlite/src/amalgamation/sqlite3.c +--- a/third_party/sqlite/src/amalgamation/sqlite3.c ++++ b/third_party/sqlite/src/amalgamation/sqlite3.c @@ -14474,7 +14474,8 @@ typedef INT16_TYPE LogEst; # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ @@ -3555,8 +3555,8 @@ index 6b4a7899d..b8c7fe414 100644 defined(__ARMEB__) || defined(__AARCH64EB__) diff --git third_party/sqlite/src/amalgamation_dev/sqlite3.c third_party/sqlite/src/amalgamation_dev/sqlite3.c index d30c9b7de..cf75a69d9 100644 ---- third_party/sqlite/src/amalgamation_dev/sqlite3.c -+++ third_party/sqlite/src/amalgamation_dev/sqlite3.c +--- a/third_party/sqlite/src/amalgamation_dev/sqlite3.c ++++ b/third_party/sqlite/src/amalgamation_dev/sqlite3.c @@ -14487,7 +14487,8 @@ typedef INT16_TYPE LogEst; # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ @@ -3569,8 +3569,8 @@ index d30c9b7de..cf75a69d9 100644 defined(__ARMEB__) || defined(__AARCH64EB__) diff --git third_party/sqlite/src/ext/rtree/rtree.c third_party/sqlite/src/ext/rtree/rtree.c index f5b57a5e2..80a2d0ad8 100644 ---- third_party/sqlite/src/ext/rtree/rtree.c -+++ third_party/sqlite/src/ext/rtree/rtree.c +--- a/third_party/sqlite/src/ext/rtree/rtree.c ++++ b/third_party/sqlite/src/ext/rtree/rtree.c @@ -450,7 +450,7 @@ struct RtreeMatchArg { #if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ @@ -3582,8 +3582,8 @@ index f5b57a5e2..80a2d0ad8 100644 # define SQLITE_BYTEORDER 4321 diff --git third_party/sqlite/src/src/sqliteInt.h third_party/sqlite/src/src/sqliteInt.h index 245070d4f..b25164e95 100644 ---- third_party/sqlite/src/src/sqliteInt.h -+++ third_party/sqlite/src/src/sqliteInt.h +--- a/third_party/sqlite/src/src/sqliteInt.h ++++ b/third_party/sqlite/src/src/sqliteInt.h @@ -877,7 +877,8 @@ typedef INT16_TYPE LogEst; # if defined(i386) || defined(__i386__) || defined(_M_IX86) || \ defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || \ @@ -3596,8 +3596,8 @@ index 245070d4f..b25164e95 100644 defined(__ARMEB__) || defined(__AARCH64EB__) diff --git third_party/webrtc/modules/desktop_capture/differ_block.cc third_party/webrtc/modules/desktop_capture/differ_block.cc index 4f0c5430c..54ee0829e 100644 ---- third_party/webrtc/modules/desktop_capture/differ_block.cc -+++ third_party/webrtc/modules/desktop_capture/differ_block.cc +--- a/third_party/webrtc/modules/desktop_capture/differ_block.cc ++++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc @@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) { static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr; @@ -3624,8 +3624,8 @@ index 4f0c5430c..54ee0829e 100644 diff --git third_party/webrtc/rtc_base/system/arch.h third_party/webrtc/rtc_base/system/arch.h index be2367b85..be4ee4233 100644 ---- third_party/webrtc/rtc_base/system/arch.h -+++ third_party/webrtc/rtc_base/system/arch.h +--- a/third_party/webrtc/rtc_base/system/arch.h ++++ b/third_party/webrtc/rtc_base/system/arch.h @@ -79,6 +79,18 @@ #elif defined(__EMSCRIPTEN__) #define WEBRTC_ARCH_32_BITS @@ -3647,8 +3647,8 @@ index be2367b85..be4ee4233 100644 #endif diff --git v8/BUILD.gn v8/BUILD.gn index f39529a3a..e84fc449e 100644 ---- v8/BUILD.gn -+++ v8/BUILD.gn +--- a/v8/BUILD.gn ++++ b/v8/BUILD.gn @@ -850,6 +850,12 @@ config("toolchain") { } if (host_byteorder == "little") { @@ -3664,8 +3664,8 @@ index f39529a3a..e84fc449e 100644 if (current_os == "aix") { diff --git ui/gl/features.gni ui/gl/features.gni index 5fda9b6..3d2dd8b 100644 ---- ui/gl/features.gni -+++ ui/gl/features.gni +--- a/ui/gl/features.gni ++++ b/ui/gl/features.gni @@ -32,5 +32,6 @@ declare_args() { (is_mac && use_egl) || is_chromeos_ash || is_fuchsia) && (target_cpu == "x86" || target_cpu == "x64" || @@ -3676,8 +3676,8 @@ index 5fda9b6..3d2dd8b 100644 } diff --git v8/test/BUILD.gn v8/test/BUILD.gn index fb872ad39..45fc585dd 100644 ---- v8/test/BUILD.gn -+++ v8/test/BUILD.gn +--- a/v8/test/BUILD.gn ++++ b/v8/test/BUILD.gn @@ -36,7 +36,7 @@ group("gn_all") { "benchmarks/cpp:gn_all", "cctest:cctest", diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-swiftshader.patch b/srcpkgs/chromium/patches/xxx-ppc64le-swiftshader.patch index 53549d17f5..df453f491d 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-swiftshader.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-swiftshader.patch @@ -1,5 +1,5 @@ ---- third_party/swiftshader/third_party/llvm-10.0/BUILD.gn -+++ third_party/swiftshader/third_party/llvm-10.0/BUILD.gn +--- a/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn ++++ b/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn @@ -574,6 +574,7 @@ swiftshader_llvm_source_set("swiftshader "llvm/lib/MC/MCAsmInfoCOFF.cpp", "llvm/lib/MC/MCAsmInfoDarwin.cpp", diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index cbc7e092ac..2c1bb5d7a3 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -11,7 +11,6 @@ homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" checksum=45d5a43ef798d20313c78fa8a075be0c22055e39c8481eb53eabda81df901b31 nocross=yes -patch_args=-Np0 lib32disabled=yes nodebug=yes diff --git a/srcpkgs/cinnamon-session/patches/timeout.patch b/srcpkgs/cinnamon-session/patches/timeout.patch index ed3cf6add6..9808a500b0 100644 --- a/srcpkgs/cinnamon-session/patches/timeout.patch +++ b/srcpkgs/cinnamon-session/patches/timeout.patch @@ -1,5 +1,5 @@ ---- cinnamon-session/csm-session-fill.c 2012-02-02 15:33:01.000000000 +0100 -+++ cinnamon-session/csm-session-fill.c 2012-06-10 02:39:46.184348462 +0200 +--- a/cinnamon-session/csm-session-fill.c 2012-02-02 15:33:01.000000000 +0100 ++++ b/cinnamon-session/csm-session-fill.c 2012-06-10 02:39:46.184348462 +0200 @@ -36,7 +36,7 @@ #define CSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider" @@ -9,8 +9,8 @@ typedef void (*GsmFillHandleProvider) (const char *provides, const char *default_provider, ---- tools/cinnamon-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 -+++ tools/cinnamon-session-check-accelerated.c 2012-06-10 02:42:08.013218006 +0200 +--- a/tools/cinnamon-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 ++++ b/tools/cinnamon-session-check-accelerated.c 2012-06-10 02:42:08.013218006 +0200 @@ -30,7 +30,7 @@ #include diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template index fa11221553..c27272b802 100644 --- a/srcpkgs/cinnamon-session/template +++ b/srcpkgs/cinnamon-session/template @@ -17,4 +17,3 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://linuxmint-developer-guide.readthedocs.io/en/latest/cinnamon.html#cinnamon-session" distfiles="https://github.com/linuxmint/${pkgname}/archive/${version}.tar.gz" checksum=66301a1eb748f646c419ced76f3388d8d6af0436716c737842cd85f359bd38d4 -patch_args=-Np0 diff --git a/srcpkgs/ck/patches/cross.patch b/srcpkgs/ck/patches/cross.patch index c2a9c4a528..c07cd7eabb 100644 --- a/srcpkgs/ck/patches/cross.patch +++ b/srcpkgs/ck/patches/cross.patch @@ -1,5 +1,5 @@ ---- configure.orig -+++ configure +--- a/configure ++++ b/configure @@ -636,10 +636,11 @@ } EOF @@ -16,8 +16,8 @@ if test "$r" -ne 0; then assert "" "update compiler" ---- src/Makefile.in.orig -+++ src/Makefile.in +--- a/src/Makefile.in ++++ b/src/Makefile.in @@ -25,7 +25,7 @@ $(LD) $(LDFLAGS) -o $(TARGET_DIR)/libck.so $(OBJECTS) diff --git a/srcpkgs/ck/patches/ppc32.patch b/srcpkgs/ck/patches/ppc32.patch index 48317577e6..f791f94cbf 100644 --- a/srcpkgs/ck/patches/ppc32.patch +++ b/srcpkgs/ck/patches/ppc32.patch @@ -1,7 +1,7 @@ Support Linux uname-style platform identifier for ppc32. ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -398,7 +398,7 @@ if test "x$PLATFORM" = "x"; then fi diff --git a/srcpkgs/ck/template b/srcpkgs/ck/template index 4cfe121c7f..f67b160c87 100644 --- a/srcpkgs/ck/template +++ b/srcpkgs/ck/template @@ -10,7 +10,6 @@ license="BSD-2-Clause" homepage="http://concurrencykit.org/" distfiles="https://github.com/concurrencykit/ck/archive/${version}.tar.gz" checksum=e730cb448fb0ecf9d19bf4c7efe9efc3c04dd9127311d87d8f91484742b0da24 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/ckmame/patches/gnu_source.patch b/srcpkgs/ckmame/patches/gnu_source.patch index 45625367f9..7e547d991e 100644 --- a/srcpkgs/ckmame/patches/gnu_source.patch +++ b/srcpkgs/ckmame/patches/gnu_source.patch @@ -1,5 +1,5 @@ ---- src/dir.c 2018-12-18 12:11:40.000000000 +0100 -+++ src/dir.c 2020-02-27 19:32:00.653813072 +0100 +--- a/src/dir.c 2018-12-18 12:11:40.000000000 +0100 ++++ b/src/dir.c 2020-02-27 19:32:00.653813072 +0100 @@ -31,7 +31,7 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -9,8 +9,8 @@ #include #include #include ---- src/ckmame.c 2018-12-18 12:11:40.000000000 +0100 -+++ src/ckmame.c 2020-02-27 19:39:05.451796134 +0100 +--- a/src/ckmame.c 2018-12-18 12:11:40.000000000 +0100 ++++ b/src/ckmame.c 2020-02-27 19:39:05.451796134 +0100 @@ -33,6 +33,7 @@ #include "config.h" @@ -19,8 +19,8 @@ #include #include #include ---- src/xmalloc.c 2018-12-18 12:11:40.000000000 +0100 -+++ src/xmalloc.c 2020-02-27 19:40:48.957792007 +0100 +--- a/src/xmalloc.c 2018-12-18 12:11:40.000000000 +0100 ++++ b/src/xmalloc.c 2020-02-27 19:40:48.957792007 +0100 @@ -33,6 +33,7 @@ #include "config.h" diff --git a/srcpkgs/ckmame/patches/use-mkstemp.patch b/srcpkgs/ckmame/patches/use-mkstemp.patch index cc2eacba13..2b294b1d84 100644 --- a/srcpkgs/ckmame/patches/use-mkstemp.patch +++ b/srcpkgs/ckmame/patches/use-mkstemp.patch @@ -1,5 +1,5 @@ ---- src/archive_dir.c 2018-12-18 12:11:40.000000000 +0100 -+++ src/archive_dir.c 2020-02-27 19:36:16.564802868 +0100 +--- a/src/archive_dir.c 2018-12-18 12:11:40.000000000 +0100 ++++ b/src/archive_dir.c 2020-02-27 19:36:16.564802868 +0100 @@ -307,6 +307,7 @@ make_tmp_name(archive_t *a, const char *name) { size_t i, len; diff --git a/srcpkgs/ckmame/template b/srcpkgs/ckmame/template index 3889029f0c..1b88f6a965 100644 --- a/srcpkgs/ckmame/template +++ b/srcpkgs/ckmame/template @@ -14,7 +14,6 @@ license="BSD-3-clause" homepage="https://nih.at/ckmame/" distfiles="https://github.com/nih-at/ckmame/archive/rel-${version//./-}.tar.gz>${pkgname}-${version}.tar.gz" checksum=9fc5dcf1d2dd75351b2cdf43ce10fecda7d97c8c1a8dd0fe1f653229bb316130 -patch_args=-Np0 post_install() { vlicense ${wrksrc}/LICENSE diff --git a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch index 9a91341513..3862f40ad9 100644 --- a/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch +++ b/srcpkgs/clazy/patches/2592a6e3393ebc75e16c91e606ad2015a16295c3.patch @@ -11,8 +11,8 @@ Required due to Clang changes https://github.com/llvm/llvm-project/commit/b3eff6 diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h index 4db141ab..1737d5a5 100644 ---- src/SourceCompatibilityHelpers.h -+++ src/SourceCompatibilityHelpers.h +--- a/src/SourceCompatibilityHelpers.h ++++ b/src/SourceCompatibilityHelpers.h @@ -29,6 +29,7 @@ #include #include @@ -55,8 +55,8 @@ index 4db141ab..1737d5a5 100644 #endif diff --git a/src/SuppressionManager.cpp b/src/SuppressionManager.cpp index 9d774ea6..9881388d 100644 ---- src/SuppressionManager.cpp -+++ src/SuppressionManager.cpp +--- a/src/SuppressionManager.cpp ++++ b/src/SuppressionManager.cpp @@ -24,7 +24,6 @@ #include "clazy_stl.h" diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template index 92023b7042..2c958d5d48 100644 --- a/srcpkgs/clazy/template +++ b/srcpkgs/clazy/template @@ -12,4 +12,3 @@ homepage="https://apps.kde.org/en/clazy" distfiles="${KDE_SITE}/clazy/${version}/src/${pkgname}-${version}.tar.xz" checksum=4c6c2e473e6aa011cc5fab120ebcffec3fc11a9cc677e21ad8c3ea676eb076f8 nocross="Clang cannot be installed as makedep" -patch_args=-Np0 diff --git a/srcpkgs/clementine/patches/musl.patch b/srcpkgs/clementine/patches/musl.patch index ad39814196..6f73862231 100644 --- a/srcpkgs/clementine/patches/musl.patch +++ b/srcpkgs/clementine/patches/musl.patch @@ -1,7 +1,7 @@ diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp index 8012c0c..ce77c77 100644 ---- ext/libclementine-common/core/logging.cpp -+++ ext/libclementine-common/core/logging.cpp +--- a/ext/libclementine-common/core/logging.cpp ++++ b/ext/libclementine-common/core/logging.cpp @@ -21,7 +21,7 @@ #include diff --git a/srcpkgs/clementine/patches/pb_namespace.patch b/srcpkgs/clementine/patches/pb_namespace.patch index c6f51300bf..5b1e851234 100644 --- a/srcpkgs/clementine/patches/pb_namespace.patch +++ b/srcpkgs/clementine/patches/pb_namespace.patch @@ -1,6 +1,6 @@ diff -ur ext/clementine-spotifyblob/spotifyclient.cpp ext/clementine-spotifyblob/spotifyclient.cpp ---- ext/clementine-spotifyblob/spotifyclient.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ ext/clementine-spotifyblob/spotifyclient.cpp 2021-02-19 12:03:48.233473023 -0500 +--- a/ext/clementine-spotifyblob/spotifyclient.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/clementine-spotifyblob/spotifyclient.cpp 2021-02-19 12:03:48.233473023 -0500 @@ -40,7 +40,7 @@ const int SpotifyClient::kWaveHeaderSize = 44; @@ -420,8 +420,8 @@ diff -ur ext/clementine-spotifyblob/spotifyclient.cpp ext/clementine-spotifyblob qApp->exit(); } diff -ur ext/clementine-spotifyblob/spotifyclient.h ext/clementine-spotifyblob/spotifyclient.h ---- ext/clementine-spotifyblob/spotifyclient.h 2020-09-23 22:34:08.000000000 -0400 -+++ ext/clementine-spotifyblob/spotifyclient.h 2021-02-19 12:03:48.233473023 -0500 +--- a/ext/clementine-spotifyblob/spotifyclient.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/clementine-spotifyblob/spotifyclient.h 2021-02-19 12:03:48.233473023 -0500 @@ -35,7 +35,7 @@ class MediaPipeline; class ResponseMessage; @@ -528,8 +528,8 @@ diff -ur ext/clementine-spotifyblob/spotifyclient.h ext/clementine-spotifyblob/s QMap> pending_search_album_browses_; diff -ur ext/clementine-tagreader/tagreaderworker.cpp ext/clementine-tagreader/tagreaderworker.cpp ---- ext/clementine-tagreader/tagreaderworker.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ ext/clementine-tagreader/tagreaderworker.cpp 2021-02-19 12:03:48.234473027 -0500 +--- a/ext/clementine-tagreader/tagreaderworker.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/clementine-tagreader/tagreaderworker.cpp 2021-02-19 12:03:48.234473027 -0500 @@ -25,10 +25,10 @@ #include @@ -563,8 +563,8 @@ diff -ur ext/clementine-tagreader/tagreaderworker.cpp ext/clementine-tagreader/t qApp->exit(); } diff -ur ext/clementine-tagreader/tagreaderworker.h ext/clementine-tagreader/tagreaderworker.h ---- ext/clementine-tagreader/tagreaderworker.h 2020-09-23 22:34:08.000000000 -0400 -+++ ext/clementine-tagreader/tagreaderworker.h 2021-02-19 12:03:48.234473027 -0500 +--- a/ext/clementine-tagreader/tagreaderworker.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/clementine-tagreader/tagreaderworker.h 2021-02-19 12:03:48.234473027 -0500 @@ -23,12 +23,12 @@ #include "tagreadermessages.pb.h" #include "core/messagehandler.h" @@ -581,8 +581,8 @@ diff -ur ext/clementine-tagreader/tagreaderworker.h ext/clementine-tagreader/tag private: diff -ur ext/libclementine-remote/remotecontrolmessages.proto ext/libclementine-remote/remotecontrolmessages.proto ---- ext/libclementine-remote/remotecontrolmessages.proto 2020-09-23 22:34:08.000000000 -0400 -+++ ext/libclementine-remote/remotecontrolmessages.proto 2021-02-19 12:03:48.234473027 -0500 +--- a/ext/libclementine-remote/remotecontrolmessages.proto 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/libclementine-remote/remotecontrolmessages.proto 2021-02-19 12:03:48.234473027 -0500 @@ -20,7 +20,7 @@ syntax = "proto2"; @@ -593,8 +593,8 @@ diff -ur ext/libclementine-remote/remotecontrolmessages.proto ext/libclementine- // The supported message types enum MsgType { diff -ur ext/libclementine-spotifyblob/spotifymessages.proto ext/libclementine-spotifyblob/spotifymessages.proto ---- ext/libclementine-spotifyblob/spotifymessages.proto 2020-09-23 22:34:08.000000000 -0400 -+++ ext/libclementine-spotifyblob/spotifymessages.proto 2021-02-19 12:03:48.234473027 -0500 +--- a/ext/libclementine-spotifyblob/spotifymessages.proto 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/libclementine-spotifyblob/spotifymessages.proto 2021-02-19 12:03:48.234473027 -0500 @@ -20,7 +20,7 @@ syntax = "proto2"; @@ -605,8 +605,8 @@ diff -ur ext/libclementine-spotifyblob/spotifymessages.proto ext/libclementine-s message LoginRequest { required string username = 1; diff -ur ext/libclementine-tagreader/gmereader.cpp ext/libclementine-tagreader/gmereader.cpp ---- ext/libclementine-tagreader/gmereader.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ ext/libclementine-tagreader/gmereader.cpp 2021-02-19 12:03:48.234473027 -0500 +--- a/ext/libclementine-tagreader/gmereader.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/libclementine-tagreader/gmereader.cpp 2021-02-19 12:03:48.234473027 -0500 @@ -20,7 +20,7 @@ } @@ -653,8 +653,8 @@ diff -ur ext/libclementine-tagreader/gmereader.cpp ext/libclementine-tagreader/g bool GME::VGM::GetPlaybackLength(const QByteArray& sample_count_bytes, diff -ur ext/libclementine-tagreader/gmereader.h ext/libclementine-tagreader/gmereader.h ---- ext/libclementine-tagreader/gmereader.h 2020-09-23 22:34:08.000000000 -0400 -+++ ext/libclementine-tagreader/gmereader.h 2021-02-19 12:03:48.235473030 -0500 +--- a/ext/libclementine-tagreader/gmereader.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/libclementine-tagreader/gmereader.h 2021-02-19 12:03:48.235473030 -0500 @@ -10,7 +10,7 @@ namespace GME { bool IsSupportedFormat(const QFileInfo& file_info); @@ -683,8 +683,8 @@ diff -ur ext/libclementine-tagreader/gmereader.h ext/libclementine-tagreader/gme * is returned via output parameter out_length. Returns false on error. */ bool GetPlaybackLength(const QByteArray& sample_count_bytes, diff -ur ext/libclementine-tagreader/tagreader.cpp ext/libclementine-tagreader/tagreader.cpp ---- ext/libclementine-tagreader/tagreader.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ ext/libclementine-tagreader/tagreader.cpp 2021-02-19 12:03:48.235473030 -0500 +--- a/ext/libclementine-tagreader/tagreader.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/libclementine-tagreader/tagreader.cpp 2021-02-19 12:03:48.235473030 -0500 @@ -143,7 +143,7 @@ } // namespace @@ -858,8 +858,8 @@ diff -ur ext/libclementine-tagreader/tagreader.cpp ext/libclementine-tagreader/t if (tag->audioProperties()) { song->set_length_nanosec(tag->audioProperties()->length() * kNsecPerSec); diff -ur ext/libclementine-tagreader/tagreader.h ext/libclementine-tagreader/tagreader.h ---- ext/libclementine-tagreader/tagreader.h 2020-09-23 22:34:08.000000000 -0400 -+++ ext/libclementine-tagreader/tagreader.h 2021-02-19 12:03:48.235473030 -0500 +--- a/ext/libclementine-tagreader/tagreader.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/libclementine-tagreader/tagreader.h 2021-02-19 12:03:48.235473030 -0500 @@ -57,16 +57,16 @@ TagReader(); @@ -923,8 +923,8 @@ diff -ur ext/libclementine-tagreader/tagreader.h ext/libclementine-tagreader/tag void SetUserTextFrame(const QString& description, const QString& value, diff -ur ext/libclementine-tagreader/tagreadermessages.proto ext/libclementine-tagreader/tagreadermessages.proto ---- ext/libclementine-tagreader/tagreadermessages.proto 2020-09-23 22:34:08.000000000 -0400 -+++ ext/libclementine-tagreader/tagreadermessages.proto 2021-02-19 12:03:48.235473030 -0500 +--- a/ext/libclementine-tagreader/tagreadermessages.proto 2020-09-23 22:34:08.000000000 -0400 ++++ b/ext/libclementine-tagreader/tagreadermessages.proto 2021-02-19 12:03:48.235473030 -0500 @@ -1,6 +1,6 @@ syntax = "proto2"; @@ -934,8 +934,8 @@ diff -ur ext/libclementine-tagreader/tagreadermessages.proto ext/libclementine-t message SongMetadata { enum Type { diff -ur src/core/song.cpp src/core/song.cpp ---- src/core/song.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/core/song.cpp 2021-02-19 12:03:48.236473033 -0500 +--- a/src/core/song.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/core/song.cpp 2021-02-19 12:03:48.236473033 -0500 @@ -526,7 +526,7 @@ return codec->toUnicode(tag.toUtf8()); } @@ -964,8 +964,8 @@ diff -ur src/core/song.cpp src/core/song.cpp void Song::InitFromQuery(const SqlRow& q, bool reliable_metadata, int col) { diff -ur src/core/song.h src/core/song.h ---- src/core/song.h 2020-09-23 22:34:08.000000000 -0400 -+++ src/core/song.h 2021-02-19 12:04:03.092521906 -0500 +--- a/src/core/song.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/core/song.h 2021-02-19 12:04:03.092521906 -0500 @@ -37,11 +37,11 @@ #include "config.h" #include "engines/engine_fwd.h" @@ -999,8 +999,8 @@ diff -ur src/core/song.h src/core/song.h // Simple accessors bool is_valid() const; diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp ---- src/core/tagreaderclient.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/core/tagreaderclient.cpp 2021-02-19 12:03:48.236473033 -0500 +--- a/src/core/tagreaderclient.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/core/tagreaderclient.cpp 2021-02-19 12:03:48.236473033 -0500 @@ -58,8 +58,8 @@ } @@ -1079,8 +1079,8 @@ diff -ur src/core/tagreaderclient.cpp src/core/tagreaderclient.cpp const QString url_string = download_url.toEncoded(); diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h ---- src/core/tagreaderclient.h 2020-09-23 22:34:08.000000000 -0400 -+++ src/core/tagreaderclient.h 2021-02-19 12:03:48.236473033 -0500 +--- a/src/core/tagreaderclient.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/core/tagreaderclient.h 2021-02-19 12:03:48.236473033 -0500 @@ -37,7 +37,7 @@ public: explicit TagReaderClient(QObject* parent = nullptr); @@ -1100,8 +1100,8 @@ diff -ur src/core/tagreaderclient.h src/core/tagreaderclient.h typedef TagReaderClient::ReplyType TagReaderReply; diff -ur src/globalsearch/spotifysearchprovider.cpp src/globalsearch/spotifysearchprovider.cpp ---- src/globalsearch/spotifysearchprovider.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/globalsearch/spotifysearchprovider.cpp 2021-02-19 12:03:48.236473033 -0500 +--- a/src/globalsearch/spotifysearchprovider.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/globalsearch/spotifysearchprovider.cpp 2021-02-19 12:03:48.236473033 -0500 @@ -49,16 +49,16 @@ if (!service_->IsBlobInstalled()) return nullptr; @@ -1188,8 +1188,8 @@ diff -ur src/globalsearch/spotifysearchprovider.cpp src/globalsearch/spotifysear AddSuggestionFromTrack(response.track(i)); } diff -ur src/globalsearch/spotifysearchprovider.h src/globalsearch/spotifysearchprovider.h ---- src/globalsearch/spotifysearchprovider.h 2020-09-23 22:34:08.000000000 -0400 -+++ src/globalsearch/spotifysearchprovider.h 2021-02-19 12:03:48.237473037 -0500 +--- a/src/globalsearch/spotifysearchprovider.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/globalsearch/spotifysearchprovider.h 2021-02-19 12:03:48.237473037 -0500 @@ -41,17 +41,17 @@ private slots: @@ -1214,8 +1214,8 @@ diff -ur src/globalsearch/spotifysearchprovider.h src/globalsearch/spotifysearch private: SpotifyServer* server_; diff -ur src/internet/core/cloudfileservice.cpp src/internet/core/cloudfileservice.cpp ---- src/internet/core/cloudfileservice.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/internet/core/cloudfileservice.cpp 2021-02-19 12:03:48.237473037 -0500 +--- a/src/internet/core/cloudfileservice.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/internet/core/cloudfileservice.cpp 2021-02-19 12:03:48.237473037 -0500 @@ -192,14 +192,14 @@ indexing_task_max_); } @@ -1234,8 +1234,8 @@ diff -ur src/internet/core/cloudfileservice.cpp src/internet/core/cloudfileservi metadata_pb.MergeFrom(message.metadata()); diff -ur src/internet/spotify/spotifyserver.cpp src/internet/spotify/spotifyserver.cpp ---- src/internet/spotify/spotifyserver.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/internet/spotify/spotifyserver.cpp 2021-02-19 12:03:48.237473037 -0500 +--- a/src/internet/spotify/spotifyserver.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/internet/spotify/spotifyserver.cpp 2021-02-19 12:03:48.237473037 -0500 @@ -31,7 +31,7 @@ #include "spotifymessages.pb.h" @@ -1535,8 +1535,8 @@ diff -ur src/internet/spotify/spotifyserver.cpp src/internet/spotify/spotifyserv SendOrQueueMessage(message); } diff -ur src/internet/spotify/spotifyserver.h src/internet/spotify/spotifyserver.h ---- src/internet/spotify/spotifyserver.h 2020-09-23 22:34:08.000000000 -0400 -+++ src/internet/spotify/spotifyserver.h 2021-02-19 12:03:48.237473037 -0500 +--- a/src/internet/spotify/spotifyserver.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/internet/spotify/spotifyserver.h 2021-02-19 12:03:48.237473037 -0500 @@ -31,7 +31,7 @@ class QTcpServer; class QTcpSocket; @@ -1626,8 +1626,8 @@ diff -ur src/internet/spotify/spotifyserver.h src/internet/spotify/spotifyserver #endif // INTERNET_SPOTIFY_SPOTIFYSERVER_H_ diff -ur src/internet/spotify/spotifyservice.cpp src/internet/spotify/spotifyservice.cpp ---- src/internet/spotify/spotifyservice.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/internet/spotify/spotifyservice.cpp 2021-02-19 12:03:48.238473040 -0500 +--- a/src/internet/spotify/spotifyservice.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/internet/spotify/spotifyservice.cpp 2021-02-19 12:03:48.238473040 -0500 @@ -85,7 +85,7 @@ search_box_(new SearchBoxWidget(this)), search_delay_(new QTimer(this)), @@ -1860,8 +1860,8 @@ diff -ur src/internet/spotify/spotifyservice.cpp src/internet/spotify/spotifyser } } diff -ur src/internet/spotify/spotifyservice.h src/internet/spotify/spotifyservice.h ---- src/internet/spotify/spotifyservice.h 2020-09-23 22:34:08.000000000 -0400 -+++ src/internet/spotify/spotifyservice.h 2021-02-19 12:03:48.238473040 -0500 +--- a/src/internet/spotify/spotifyservice.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/internet/spotify/spotifyservice.h 2021-02-19 12:03:48.238473040 -0500 @@ -93,7 +93,7 @@ LoginState login_state() const { return login_state_; } bool IsLoggedIn() const { return login_state_ == LoginState_LoggedIn; } @@ -1929,8 +1929,8 @@ diff -ur src/internet/spotify/spotifyservice.h src/internet/spotify/spotifyservi }; diff -ur src/internet/spotify/spotifysettingspage.cpp src/internet/spotify/spotifysettingspage.cpp ---- src/internet/spotify/spotifysettingspage.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/internet/spotify/spotifysettingspage.cpp 2021-02-19 12:03:48.238473040 -0500 +--- a/src/internet/spotify/spotifysettingspage.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/internet/spotify/spotifysettingspage.cpp 2021-02-19 12:03:48.238473040 -0500 @@ -59,9 +59,9 @@ ui_->login_state->AddCredentialField(ui_->password); ui_->login_state->AddCredentialGroup(ui_->account_group); @@ -1954,8 +1954,8 @@ diff -ur src/internet/spotify/spotifysettingspage.cpp src/internet/spotify/spoti s.value("volume_normalisation", false).toBool()); diff -ur src/main.cpp src/main.cpp ---- src/main.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/main.cpp 2021-02-19 12:03:48.238473040 -0500 +--- a/src/main.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/main.cpp 2021-02-19 12:03:48.238473040 -0500 @@ -191,7 +191,7 @@ "304c6f756e67652e6d786dba012a28414c42554d2920476f74616e2050726f6a65637" "4202d20416d6269656e74204c6f756e67652e6d786dc001c7a7efd104c801bad685e4" @@ -1966,8 +1966,8 @@ diff -ur src/main.cpp src/main.cpp } diff -ur src/networkremote/incomingdataparser.cpp src/networkremote/incomingdataparser.cpp ---- src/networkremote/incomingdataparser.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/networkremote/incomingdataparser.cpp 2021-02-19 12:03:48.239473043 -0500 +--- a/src/networkremote/incomingdataparser.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/networkremote/incomingdataparser.cpp 2021-02-19 12:03:48.239473043 -0500 @@ -97,99 +97,99 @@ bool IncomingDataParser::close_connection() { return close_connection_; } @@ -2237,8 +2237,8 @@ diff -ur src/networkremote/incomingdataparser.cpp src/networkremote/incomingdata song.Init(QStringFromStdString(pb.title()), QStringFromStdString(pb.artist()), QStringFromStdString(pb.album()), pb.length() * kNsecPerSec); diff -ur src/networkremote/incomingdataparser.h src/networkremote/incomingdataparser.h ---- src/networkremote/incomingdataparser.h 2020-09-23 22:34:08.000000000 -0400 -+++ src/networkremote/incomingdataparser.h 2021-02-19 12:03:48.239473043 -0500 +--- a/src/networkremote/incomingdataparser.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/networkremote/incomingdataparser.h 2021-02-19 12:03:48.239473043 -0500 @@ -16,7 +16,7 @@ bool close_connection(); @@ -2283,8 +2283,8 @@ diff -ur src/networkremote/incomingdataparser.h src/networkremote/incomingdatapa #endif // INCOMINGDATAPARSER_H diff -ur src/networkremote/networkremote.cpp src/networkremote/networkremote.cpp ---- src/networkremote/networkremote.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/networkremote/networkremote.cpp 2021-02-19 12:03:48.239473043 -0500 +--- a/src/networkremote/networkremote.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/networkremote/networkremote.cpp 2021-02-19 12:03:48.239473043 -0500 @@ -214,8 +214,8 @@ clients_.push_back(client); @@ -2297,8 +2297,8 @@ diff -ur src/networkremote/networkremote.cpp src/networkremote/networkremote.cpp } diff -ur src/networkremote/outgoingdatacreator.cpp src/networkremote/outgoingdatacreator.cpp ---- src/networkremote/outgoingdatacreator.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/networkremote/outgoingdatacreator.cpp 2021-02-19 12:03:48.239473043 -0500 +--- a/src/networkremote/outgoingdatacreator.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/networkremote/outgoingdatacreator.cpp 2021-02-19 12:03:48.239473043 -0500 @@ -144,7 +144,7 @@ return nullptr; } @@ -2711,8 +2711,8 @@ diff -ur src/networkremote/outgoingdatacreator.cpp src/networkremote/outgoingdat req.client_->SendData(&msg); diff -ur src/networkremote/outgoingdatacreator.h src/networkremote/outgoingdatacreator.h ---- src/networkremote/outgoingdatacreator.h 2020-09-23 22:34:08.000000000 -0400 -+++ src/networkremote/outgoingdatacreator.h 2021-02-19 12:03:48.239473043 -0500 +--- a/src/networkremote/outgoingdatacreator.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/networkremote/outgoingdatacreator.h 2021-02-19 12:03:48.239473043 -0500 @@ -49,7 +49,7 @@ void SetClients(QList* clients); @@ -2734,8 +2734,8 @@ diff -ur src/networkremote/outgoingdatacreator.h src/networkremote/outgoingdatac SongInfoProvider* ProviderByName(const QString& name) const; }; diff -ur src/networkremote/remoteclient.cpp src/networkremote/remoteclient.cpp ---- src/networkremote/remoteclient.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/networkremote/remoteclient.cpp 2021-02-19 12:03:48.240473046 -0500 +--- a/src/networkremote/remoteclient.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/networkremote/remoteclient.cpp 2021-02-19 12:03:48.240473046 -0500 @@ -103,33 +103,33 @@ } @@ -2818,8 +2818,8 @@ diff -ur src/networkremote/remoteclient.cpp src/networkremote/remoteclient.cpp if (authenticated_) { SendDataToClient(msg); diff -ur src/networkremote/remoteclient.h src/networkremote/remoteclient.h ---- src/networkremote/remoteclient.h 2020-09-23 22:34:08.000000000 -0400 -+++ src/networkremote/remoteclient.h 2021-02-19 12:03:48.240473046 -0500 +--- a/src/networkremote/remoteclient.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/networkremote/remoteclient.h 2021-02-19 12:03:48.240473046 -0500 @@ -16,11 +16,11 @@ ~RemoteClient(); @@ -2851,8 +2851,8 @@ diff -ur src/networkremote/remoteclient.h src/networkremote/remoteclient.h Application* app_; diff -ur src/networkremote/songsender.cpp src/networkremote/songsender.cpp ---- src/networkremote/songsender.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ src/networkremote/songsender.cpp 2021-02-19 12:03:48.240473046 -0500 +--- a/src/networkremote/songsender.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/networkremote/songsender.cpp 2021-02-19 12:03:48.240473046 -0500 @@ -67,29 +67,29 @@ transcoder_->Cancel(); } @@ -2970,8 +2970,8 @@ diff -ur src/networkremote/songsender.cpp src/networkremote/songsender.cpp // First gather all valid songs diff -ur src/networkremote/songsender.h src/networkremote/songsender.h ---- src/networkremote/songsender.h 2020-09-23 22:34:08.000000000 -0400 -+++ src/networkremote/songsender.h 2021-02-19 12:03:48.240473046 -0500 +--- a/src/networkremote/songsender.h 2020-09-23 22:34:08.000000000 -0400 ++++ b/src/networkremote/songsender.h 2021-02-19 12:03:48.240473046 -0500 @@ -30,7 +30,7 @@ static const quint32 kFileChunkSize; @@ -2991,8 +2991,8 @@ diff -ur src/networkremote/songsender.h src/networkremote/songsender.h void SendTotalFileSize(); void TranscodeLosslessFiles(); diff -ur tests/song_test.cpp tests/song_test.cpp ---- tests/song_test.cpp 2020-09-23 22:34:08.000000000 -0400 -+++ tests/song_test.cpp 2021-02-19 12:03:48.240473046 -0500 +--- a/tests/song_test.cpp 2020-09-23 22:34:08.000000000 -0400 ++++ b/tests/song_test.cpp 2021-02-19 12:03:48.240473046 -0500 @@ -45,7 +45,7 @@ static Song ReadSongFromFile(const QString& filename) { TagReader tag_reader; diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index c150fcf650..40a6ac8c70 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -22,7 +22,6 @@ homepage="https://www.clementine-player.org/" distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/${pkgname}-${_fullver}.tar.xz" checksum=e1fa2482b81336282a36a5451a0217c274e5b45aa3eeed83fe3fd29a5df59397 build_options="spotify" -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in x86_64 | i686 | armv7l) diff --git a/srcpkgs/cli-visualizer/patches/use-system-opt.patch b/srcpkgs/cli-visualizer/patches/use-system-opt.patch index 7819bdd613..6178dbc037 100644 --- a/srcpkgs/cli-visualizer/patches/use-system-opt.patch +++ b/srcpkgs/cli-visualizer/patches/use-system-opt.patch @@ -1,8 +1,8 @@ Don't let the buildsystem mess with optimization and debug flags and set stuff like -march=native which is not generic (and is very arch specific). ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -22,17 +22,13 @@ endif() set(PROJECT_VERSION ${vis_version}) project(${PROJECT_NAME} VERSION ${vis_version} LANGUAGES CXX C) diff --git a/srcpkgs/cli-visualizer/template b/srcpkgs/cli-visualizer/template index d95ce4d4b3..e758562274 100644 --- a/srcpkgs/cli-visualizer/template +++ b/srcpkgs/cli-visualizer/template @@ -13,7 +13,6 @@ distfiles="${homepage}/archive/v${version}.tar.gz" checksum=927e4c18403c7a40397e8698ffefd1b37250be20fa0ec55fda9a82cf9cc8ba51 build_options="pulseaudio" build_options_default="pulseaudio" -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/clib/patches/destdir.patch b/srcpkgs/clib/patches/destdir.patch index 32664b7489..52258eedfc 100644 --- a/srcpkgs/clib/patches/destdir.patch +++ b/srcpkgs/clib/patches/destdir.patch @@ -1,5 +1,5 @@ ---- Makefile.bck 2018-06-12 23:21:49.258145269 -0400 -+++ Makefile 2018-06-12 23:22:23.446097218 -0400 +--- a/Makefile.bck 2018-06-12 23:21:49.258145269 -0400 ++++ b/Makefile 2018-06-12 23:22:23.446097218 -0400 @@ -1,5 +1,6 @@ -CC ?= cc -PREFIX ?= /usr/local diff --git a/srcpkgs/clib/template b/srcpkgs/clib/template index f4802d32a7..6e3bf69b14 100644 --- a/srcpkgs/clib/template +++ b/srcpkgs/clib/template @@ -11,7 +11,6 @@ license="MIT" homepage="https://github.com/clibs/clib" distfiles="https://github.com/clibs/clib/archive/${version}.tar.gz" checksum=74643374883651a272ed8ac8e8a6789c0b4a4b13e20a9d45798fd770821e620d -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/clisp/patches/no-page.h.patch b/srcpkgs/clisp/patches/no-page.h.patch index df602bcb5b..aafb98a31e 100644 --- a/srcpkgs/clisp/patches/no-page.h.patch +++ b/srcpkgs/clisp/patches/no-page.h.patch @@ -1,5 +1,5 @@ ---- ./src/unix.d -+++ ./src/unix.d +--- a/src/unix.d ++++ b/src/unix.d @@ -135,9 +135,6 @@ #ifdef UNIX_AUX #include /* for SHMLBA */ diff --git a/srcpkgs/clisp/patches/readline-7.patch b/srcpkgs/clisp/patches/readline-7.patch index 939342c6f4..75adc511e7 100644 --- a/srcpkgs/clisp/patches/readline-7.patch +++ b/srcpkgs/clisp/patches/readline-7.patch @@ -1,5 +1,5 @@ ---- modules/readline/readline.lisp.orig 2016-09-20 22:23:51.876046496 +0200 -+++ modules/readline/readline.lisp 2016-09-20 22:24:11.070047486 +0200 +--- a/modules/readline/readline.lisp 2016-09-20 22:23:51.876046496 +0200 ++++ b/modules/readline/readline.lisp 2016-09-20 22:24:11.070047486 +0200 @@ -424,7 +424,7 @@ "The version of this incarnation of the readline library, e.g., 0x0402.")) (def-c-var gnu-readline-p (:name "rl_gnu_readline_p") (:type int) diff --git a/srcpkgs/clisp/template b/srcpkgs/clisp/template index f062b8a124..ee0941a3d5 100644 --- a/srcpkgs/clisp/template +++ b/srcpkgs/clisp/template @@ -21,7 +21,6 @@ lib32disabled=yes disable_parallel_build=yes build_options="readline" build_options_default="readline" -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in i686-musl) broken="*** - MULTIPLE-VALUE-SETQ: variable EXTRA-FILE-TYPES has no value";; diff --git a/srcpkgs/cln/patches/musl.patch b/srcpkgs/cln/patches/musl.patch index 12b8fe62f3..1fe357fc31 100644 --- a/srcpkgs/cln/patches/musl.patch +++ b/srcpkgs/cln/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/timing/cl_t_current2.cc.orig 2009-05-10 22:32:32.000000000 +0200 -+++ src/timing/cl_t_current2.cc 2017-06-07 15:14:54.972741636 +0200 +--- a/src/timing/cl_t_current2.cc 2009-05-10 22:32:32.000000000 +0200 ++++ b/src/timing/cl_t_current2.cc 2017-06-07 15:14:54.972741636 +0200 @@ -20,6 +20,7 @@ #include #include // defines HZ, unit for times() is 1/HZ seconds diff --git a/srcpkgs/cln/patches/unused.patch b/srcpkgs/cln/patches/unused.patch index e9c70de7b8..3163432c8f 100644 --- a/srcpkgs/cln/patches/unused.patch +++ b/srcpkgs/cln/patches/unused.patch @@ -1,5 +1,5 @@ ---- src/base/cl_macros.h.orig 2014-07-30 15:19:17.474034947 +0200 -+++ src/base/cl_macros.h 2014-07-30 15:19:28.210034058 +0200 +--- a/src/base/cl_macros.h 2014-07-30 15:19:17.474034947 +0200 ++++ b/src/base/cl_macros.h 2014-07-30 15:19:28.210034058 +0200 @@ -66,11 +66,7 @@ // Ignore a value (instead of assigning it to a variable). diff --git a/srcpkgs/cln/template b/srcpkgs/cln/template index 173890a0b8..fc771b0f9a 100644 --- a/srcpkgs/cln/template +++ b/srcpkgs/cln/template @@ -10,7 +10,6 @@ license="GPL-2.0-only" homepage="https://www.ginac.de/CLN/" distfiles="${homepage}/${pkgname}-${version}.tar.bz2" checksum=f492530e8879bda529009b6033e1923c8f4aae843149fc28c667c20b094d984a -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in arm*|aarch64*) CPPFLAGS="-DNO_ASM";; diff --git a/srcpkgs/clog/patches/musl-limits_h.patch b/srcpkgs/clog/patches/musl-limits_h.patch index 77930bbfc3..e9cb12760e 100644 --- a/srcpkgs/clog/patches/musl-limits_h.patch +++ b/srcpkgs/clog/patches/musl-limits_h.patch @@ -1,5 +1,5 @@ ---- src/libshared/src/FS.cpp -+++ src/libshared/src/FS.cpp +--- a/src/libshared/src/FS.cpp ++++ b/src/libshared/src/FS.cpp @@ -41,7 +41,7 @@ #include #include diff --git a/srcpkgs/clog/template b/srcpkgs/clog/template index 2195202ec9..b255ad949b 100644 --- a/srcpkgs/clog/template +++ b/srcpkgs/clog/template @@ -9,7 +9,6 @@ license="MIT" homepage="https://taskwarrior.org/docs/clog/" distfiles="http://gothenburgbitfactory.org/download/clog-${version}.tar.gz" checksum=fed44a8d398790ab0cf426c1b006e7246e20f3fcd56c0ec4132d24b05d5d2018 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/cloog/patches/install-fix.patch b/srcpkgs/cloog/patches/install-fix.patch index 3d08bda24a..97ee875db9 100644 --- a/srcpkgs/cloog/patches/install-fix.patch +++ b/srcpkgs/cloog/patches/install-fix.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2014-09-08 11:00:35.966486373 +0200 -+++ Makefile.in 2014-09-08 11:00:45.406523577 +0200 +--- a/Makefile.in 2014-09-08 11:00:35.966486373 +0200 ++++ b/Makefile.in 2014-09-08 11:00:45.406523577 +0200 @@ -1341,10 +1341,6 @@ version.h: @GIT_INDEX@ install-data-local: @test -z "$(pkgconfig_libdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfig_libdir)" diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template index d65b97fcf4..18a84032fd 100644 --- a/srcpkgs/cloog/template +++ b/srcpkgs/cloog/template @@ -12,7 +12,6 @@ license="LGPL-2.1-or-later" homepage="http://www.bastoul.net/cloog/" distfiles="https://github.com/periscop/cloog/releases/download/cloog-${version}/cloog-${version}.tar.gz" checksum=835c49951ff57be71dcceb6234d19d2cc22a3a5df84aea0a9d9760d92166fc72 -patch_args=-Np0 cloog-devel_package() { depends="${makedepends} cloog>=${version}_${revision}" diff --git a/srcpkgs/clucene/patches/clucene-core-2.3.3.4-install_contribs_lib.patch b/srcpkgs/clucene/patches/clucene-core-2.3.3.4-install_contribs_lib.patch index 082f76ebf9..c97a3acec2 100644 --- a/srcpkgs/clucene/patches/clucene-core-2.3.3.4-install_contribs_lib.patch +++ b/srcpkgs/clucene/patches/clucene-core-2.3.3.4-install_contribs_lib.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 -+++ CMakeLists.txt 2011-08-16 16:56:55.968268152 +0400 +--- a/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 ++++ b/CMakeLists.txt 2011-08-16 16:56:55.968268152 +0400 @@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS ) SET(BUILD_CONTRIBS_LIB 1) ENDIF ( BUILD_CONTRIBS ) @@ -9,8 +9,8 @@ ENDIF ( BUILD_CONTRIBS_LIB ) ---- src/contribs-lib/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 -+++ src/contribs-lib/CMakeLists.txt 2011-08-16 17:14:13.499275499 +0400 +--- a/src/contribs-lib/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300 ++++ b/src/contribs-lib/CMakeLists.txt 2011-08-16 17:14:13.499275499 +0400 @@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED ) TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs}) diff --git a/srcpkgs/clucene/patches/clucene-core-2.3.3.4-pkgconfig.patch b/srcpkgs/clucene/patches/clucene-core-2.3.3.4-pkgconfig.patch index 141ef83fb6..49012236ed 100644 --- a/srcpkgs/clucene/patches/clucene-core-2.3.3.4-pkgconfig.patch +++ b/srcpkgs/clucene/patches/clucene-core-2.3.3.4-pkgconfig.patch @@ -1,5 +1,5 @@ ---- src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes 2011-03-16 19:21:07.000000000 -0500 -+++ src/core/libclucene-core.pc.cmake 2012-03-19 09:01:00.689263954 -0500 +--- a/src/core/libclucene-core.pc.cmake.pkgconfig_sys_includes 2011-03-16 19:21:07.000000000 -0500 ++++ b/src/core/libclucene-core.pc.cmake 2012-03-19 09:01:00.689263954 -0500 @@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/i Name: libclucene Description: CLucene - a C++ search engine, ported from the popular Apache Lucene diff --git a/srcpkgs/clucene/patches/clucene-debug.patch b/srcpkgs/clucene/patches/clucene-debug.patch index 640454e2fb..4630117934 100644 --- a/srcpkgs/clucene/patches/clucene-debug.patch +++ b/srcpkgs/clucene/patches/clucene-debug.patch @@ -1,5 +1,5 @@ ---- src/core/CLucene/index/TermInfosReader.cpp -+++ src/core/CLucene/index/TermInfosReader.cpp +--- a/src/core/CLucene/index/TermInfosReader.cpp ++++ b/src/core/CLucene/index/TermInfosReader.cpp @@ -111,7 +111,7 @@ //destroy their elements #ifdef _DEBUG diff --git a/srcpkgs/clucene/patches/clucene-gcc-atomics.patch b/srcpkgs/clucene/patches/clucene-gcc-atomics.patch index 819e9a7d7a..f270449dd1 100644 --- a/srcpkgs/clucene/patches/clucene-gcc-atomics.patch +++ b/srcpkgs/clucene/patches/clucene-gcc-atomics.patch @@ -1,5 +1,5 @@ ---- src/shared/CLucene/config/threads.cpp 2012-02-23 12:06:55.355506304 +0000 -+++ src/shared/CLucene/config/threads.cpp 2012-02-23 12:07:17.131766381 +0000 +--- a/src/shared/CLucene/config/threads.cpp 2012-02-23 12:06:55.355506304 +0000 ++++ b/src/shared/CLucene/config/threads.cpp 2012-02-23 12:07:17.131766381 +0000 @@ -185,7 +185,7 @@ } @@ -18,8 +18,8 @@ return __sync_sub_and_fetch(theInteger, 1); #else SCOPED_LOCK_MUTEX(theInteger->THIS_LOCK) ---- src/shared/CLucene/LuceneThreads.h 2012-02-23 12:36:28.388299322 +0000 -+++ src/shared/CLucene/LuceneThreads.h 2012-02-23 12:37:23.131885433 +0000 +--- a/src/shared/CLucene/LuceneThreads.h 2012-02-23 12:36:28.388299322 +0000 ++++ b/src/shared/CLucene/LuceneThreads.h 2012-02-23 12:37:23.131885433 +0000 @@ -70,7 +70,7 @@ void NotifyAll(); }; diff --git a/srcpkgs/clucene/patches/clucene-multimap-put.patch b/srcpkgs/clucene/patches/clucene-multimap-put.patch index 36ed1fe22b..158de4decc 100644 --- a/srcpkgs/clucene/patches/clucene-multimap-put.patch +++ b/srcpkgs/clucene/patches/clucene-multimap-put.patch @@ -1,5 +1,5 @@ ---- src/core/CLucene/util/VoidMap.h -+++ src/core/CLucene/util/VoidMap.h +--- a/src/core/CLucene/util/VoidMap.h ++++ b/src/core/CLucene/util/VoidMap.h @@ -316,6 +316,7 @@ public: if ( _this::dk || _this::dv ) _this::remove(k); diff --git a/srcpkgs/clucene/patches/clucene-narrowing-conversions.patch b/srcpkgs/clucene/patches/clucene-narrowing-conversions.patch index f0e971c55d..df16b69239 100644 --- a/srcpkgs/clucene/patches/clucene-narrowing-conversions.patch +++ b/srcpkgs/clucene/patches/clucene-narrowing-conversions.patch @@ -1,5 +1,5 @@ ---- src/core/CLucene/queryParser/QueryParser.cpp.sav 2011-03-17 01:21:07.000000000 +0100 -+++ src/core/CLucene/queryParser/QueryParser.cpp 2012-03-09 18:20:58.000000000 +0100 +--- a/src/core/CLucene/queryParser/QueryParser.cpp.sav 2011-03-17 01:21:07.000000000 +0100 ++++ b/src/core/CLucene/queryParser/QueryParser.cpp 2012-03-09 18:20:58.000000000 +0100 @@ -79,7 +79,7 @@ _T("") }; @@ -9,8 +9,8 @@ const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0}; struct QueryParser::JJCalls { ---- src/core/CLucene/queryParser/QueryParserTokenManager.cpp.sav 2011-03-17 01:21:07.000000000 +0100 -+++ src/core/CLucene/queryParser/QueryParserTokenManager.cpp 2012-03-09 18:20:24.000000000 +0100 +--- a/src/core/CLucene/queryParser/QueryParserTokenManager.cpp.sav 2011-03-17 01:21:07.000000000 +0100 ++++ b/src/core/CLucene/queryParser/QueryParserTokenManager.cpp 2012-03-09 18:20:24.000000000 +0100 @@ -15,9 +15,9 @@ CL_NS_DEF(queryParser) diff --git a/srcpkgs/clucene/patches/clucene-warnings.patch b/srcpkgs/clucene/patches/clucene-warnings.patch index b9676d9026..3f774a01b7 100644 --- a/srcpkgs/clucene/patches/clucene-warnings.patch +++ b/srcpkgs/clucene/patches/clucene-warnings.patch @@ -1,5 +1,5 @@ ---- src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:37:22.531637934 +0000 -+++ src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:39:15.369916728 +0000 +--- a/src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:37:22.531637934 +0000 ++++ b/src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:39:15.369916728 +0000 @@ -7,6 +7,8 @@ #ifndef _lucene_analysis_AnalysisHeader_ #define _lucene_analysis_AnalysisHeader_ @@ -9,8 +9,8 @@ #include "CLucene/index/Payload.h" #include "CLucene/util/VoidList.h" #include "CLucene/LuceneThreads.h" ---- src/core/CLucene/search/Searchable.h 2012-02-22 12:37:22.513637729 +0000 -+++ src/core/CLucene/search/Searchable.h 2012-02-22 12:38:51.073641550 +0000 +--- a/src/core/CLucene/search/Searchable.h 2012-02-22 12:37:22.513637729 +0000 ++++ b/src/core/CLucene/search/Searchable.h 2012-02-22 12:38:51.073641550 +0000 @@ -7,6 +7,7 @@ #ifndef _lucene_search_Searcher_ #define _lucene_search_Searcher_ @@ -19,8 +19,8 @@ //#include "CLucene/index/IndexReader.h" CL_CLASS_DEF(index,Term) ---- src/core/CLucene/store/IndexInput.h 2012-02-22 12:37:22.508637673 +0000 -+++ src/core/CLucene/store/IndexInput.h 2012-02-22 12:39:00.465747935 +0000 +--- a/src/core/CLucene/store/IndexInput.h 2012-02-22 12:37:22.508637673 +0000 ++++ b/src/core/CLucene/store/IndexInput.h 2012-02-22 12:39:00.465747935 +0000 @@ -7,6 +7,8 @@ #ifndef _lucene_store_IndexInput_ #define _lucene_store_IndexInput_ @@ -30,8 +30,8 @@ #include "CLucene/LuceneThreads.h" #include "CLucene/util/Equators.h" ---- src/core/CLucene/util/Array.h 2012-02-22 12:37:22.510637696 +0000 -+++ src/core/CLucene/util/Array.h 2012-02-22 12:38:33.714444884 +0000 +--- a/src/core/CLucene/util/Array.h 2012-02-22 12:37:22.510637696 +0000 ++++ b/src/core/CLucene/util/Array.h 2012-02-22 12:38:33.714444884 +0000 @@ -7,6 +7,8 @@ #ifndef _lucene_util_Array_ #define _lucene_util_Array_ @@ -41,8 +41,8 @@ #include #include ---- src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:37:22.510637696 +0000 -+++ src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:38:40.316519685 +0000 +--- a/src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:37:22.510637696 +0000 ++++ b/src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:38:40.316519685 +0000 @@ -7,6 +7,8 @@ #ifndef _lucene_util_PriorityQueue_ #define _lucene_util_PriorityQueue_ diff --git a/srcpkgs/clucene/patches/fix-cl_test.patch b/srcpkgs/clucene/patches/fix-cl_test.patch index 33b3271956..a54739ab66 100644 --- a/srcpkgs/clucene/patches/fix-cl_test.patch +++ b/srcpkgs/clucene/patches/fix-cl_test.patch @@ -1,5 +1,5 @@ -*** src/test/contribs-lib/analysis/de/TestGermanStemFilter.cpp.orig 2020-08-27 19:02:04.024654943 -0300 ---- src/test/contribs-lib/analysis/de/TestGermanStemFilter.cpp 2020-08-27 19:02:26.219672761 -0300 +*** a/src/test/contribs-lib/analysis/de/TestGermanStemFilter.cpp.orig 2020-08-27 19:02:04.024654943 -0300 +--- a/src/test/contribs-lib/analysis/de/TestGermanStemFilter.cpp 2020-08-27 19:02:26.219672761 -0300 *************** *** 8,15 **** #include "test.h" diff --git a/srcpkgs/clucene/patches/fix-test.patch b/srcpkgs/clucene/patches/fix-test.patch index b9b063a9e2..1861fc9583 100644 --- a/srcpkgs/clucene/patches/fix-test.patch +++ b/srcpkgs/clucene/patches/fix-test.patch @@ -1,5 +1,5 @@ -*** src/test/test.h.orig 2020-08-27 18:47:10.782379958 -0300 ---- src/test/test.h 2020-08-27 18:47:16.518388700 -0300 +*** a/src/test/test.h.orig 2020-08-27 18:47:10.782379958 -0300 +--- a/src/test/test.h 2020-08-27 18:47:16.518388700 -0300 *************** *** 23,28 **** --- 23,29 ---- diff --git a/srcpkgs/clucene/patches/fix_zlib_detections.diff b/srcpkgs/clucene/patches/fix_zlib_detections.diff index bcd732a910..2b08883f59 100644 --- a/srcpkgs/clucene/patches/fix_zlib_detections.diff +++ b/srcpkgs/clucene/patches/fix_zlib_detections.diff @@ -8,8 +8,8 @@ Fixing ZLIB configuration in shared's CMakeLists diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt index 68314a7..3d1975e 100644 ---- src/shared/CMakeLists.txt -+++ src/shared/CMakeLists.txt +--- a/src/shared/CMakeLists.txt ++++ b/src/shared/CMakeLists.txt @@ -42,7 +42,7 @@ INCLUDE (CheckAtomicFunctions) find_package(ZLIB) IF ( ZLIB_FOUND ) diff --git a/srcpkgs/clucene/patches/multithreading.patch b/srcpkgs/clucene/patches/multithreading.patch index dd1a126412..d72af1f02b 100644 --- a/srcpkgs/clucene/patches/multithreading.patch +++ b/srcpkgs/clucene/patches/multithreading.patch @@ -1,8 +1,8 @@ Taken from https://code.foxkit.us/adelie/packages/-/blob/3acdda418554ecd64ea33df0f92ef51ba1548c8d/user/clucene/disable-threading.patch Adapted from https://sourceforge.net/p/clucene/bugs/197 ---- src/shared/CLucene/util/Misc.cpp 2011-03-16 20:21:07.000000000 -0400 -+++ src/shared/CLucene/util/Misc.cpp 2018-05-20 19:24:09.219901243 -0400 +--- a/src/shared/CLucene/util/Misc.cpp 2011-03-16 20:21:07.000000000 -0400 ++++ b/src/shared/CLucene/util/Misc.cpp 2018-05-20 19:24:09.219901243 -0400 @@ -466,6 +466,7 @@ std::string Misc::toString(const bool value){ return value ? "true" : "false"; @@ -19,8 +19,8 @@ Adapted from https://sourceforge.net/p/clucene/bugs/197 std::string Misc::toString(const int32_t value){ char buf[20]; TCHAR tbuf[20]; ---- src/shared/CLucene/util/Misc.h 2011-03-16 20:21:07.000000000 -0400 -+++ src/shared/CLucene/util/Misc.h 2018-05-20 19:24:09.219901243 -0400 +--- a/src/shared/CLucene/util/Misc.h 2011-03-16 20:21:07.000000000 -0400 ++++ b/src/shared/CLucene/util/Misc.h 2018-05-20 19:24:09.219901243 -0400 @@ -67,7 +67,9 @@ static std::string toString(const int32_t value); @@ -31,8 +31,8 @@ Adapted from https://sourceforge.net/p/clucene/bugs/197 static std::string toString(const bool value); static std::string toString(const float_t value); static std::string toString(const TCHAR* s, int32_t len=-1); ---- src/shared/CLucene/LuceneThreads.h 2011-03-16 20:21:07.000000000 -0400 -+++ src/shared/CLucene/LuceneThreads.h 2018-05-20 19:28:05.999899570 -0400 +--- a/src/shared/CLucene/LuceneThreads.h 2011-03-16 20:21:07.000000000 -0400 ++++ b/src/shared/CLucene/LuceneThreads.h 2018-05-20 19:28:05.999899570 -0400 @@ -13,10 +13,10 @@ #if defined(_CL_DISABLE_MULTITHREADING) diff --git a/srcpkgs/clucene/template b/srcpkgs/clucene/template index 67d9d96412..fe045cb363 100644 --- a/srcpkgs/clucene/template +++ b/srcpkgs/clucene/template @@ -15,7 +15,6 @@ license="LGPL-2+/ASL-2.0" maintainer="Orphaned " distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-core-${version}.tar.gz" checksum=ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = musl ]; then # threading segfaults on musl diff --git a/srcpkgs/clutter/patches/clutter-x11-startup-error.patch b/srcpkgs/clutter/patches/clutter-x11-startup-error.patch index 8612c8a775..afea91c0b8 100644 --- a/srcpkgs/clutter/patches/clutter-x11-startup-error.patch +++ b/srcpkgs/clutter/patches/clutter-x11-startup-error.patch @@ -19,8 +19,8 @@ Signed-off-by: Marc-Antoine Perennou diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c index d150e7c..b4e5f82 100644 ---- clutter/clutter-backend.c -+++ clutter/clutter-backend.c +--- a/clutter/clutter-backend.c ++++ b/clutter/clutter-backend.c @@ -545,12 +545,12 @@ static const struct { #ifdef CLUTTER_WINDOWING_GDK { CLUTTER_WINDOWING_GDK, clutter_backend_gdk_new }, diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index 44b3ab7c88..461e2fe079 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -18,7 +18,6 @@ license="LGPL-2.1-or-later" homepage="http://www.clutter-project.org" distfiles="${GNOME_SITE}/clutter/${version%.*}/clutter-${version}.tar.xz" checksum=8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6 -patch_args=-Np0 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/cmocka/patches/musl_uintptr.patch b/srcpkgs/cmocka/patches/musl_uintptr.patch index 6046cd4cd9..184321944b 100644 --- a/srcpkgs/cmocka/patches/musl_uintptr.patch +++ b/srcpkgs/cmocka/patches/musl_uintptr.patch @@ -11,8 +11,8 @@ Date: Wed Mar 29 15:22:38 2017 -0300 Signed-off-by: Breno Leitao ---- include/cmocka.h -+++ include/cmocka.h +--- a/include/cmocka.h ++++ b/include/cmocka.h @@ -110,7 +110,7 @@ ((LargestIntegralType)(value)) diff --git a/srcpkgs/cmocka/template b/srcpkgs/cmocka/template index dfe97283fa..ea0384420a 100644 --- a/srcpkgs/cmocka/template +++ b/srcpkgs/cmocka/template @@ -13,7 +13,6 @@ license="Apache-2.0" homepage="https://cmocka.org/" distfiles="https://cmocka.org/files/${version%.*}/cmocka-${version}.tar.xz" checksum=f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6 -patch_args=-Np0 cmocka-devel_package() { depends="cmocka-${version}_${revision}" diff --git a/srcpkgs/cmus/patches/pass-ldlibs.patch b/srcpkgs/cmus/patches/pass-ldlibs.patch index 57f8096b44..0330ae4845 100644 --- a/srcpkgs/cmus/patches/pass-ldlibs.patch +++ b/srcpkgs/cmus/patches/pass-ldlibs.patch @@ -11,8 +11,8 @@ Last-Update: 2019-09-07 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: cmus/Makefile =================================================================== ---- Makefile 2019-09-07 10:02:00.152453147 -0400 -+++ Makefile 2019-09-07 10:24:55.009937454 -0400 +--- a/Makefile 2019-09-07 10:02:00.152453147 -0400 ++++ b/Makefile 2019-09-07 10:24:55.009937454 -0400 @@ -22,7 +22,7 @@ FFMPEG_LIBS += $(shell pkg-config --libs libswresample) diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index 891beaef9a..fd8e518e2a 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -19,7 +19,6 @@ checksum=6fb799cae60db9324f03922bbb2e322107fd386ab429c0271996985294e2ef44 build_options="elogind" build_options_default="elogind" desc_option_elogind="Support MPRIS interface via elogind" -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/codeblocks/patches/000.v20.03-r12008.patch b/srcpkgs/codeblocks/patches/000.v20.03-r12008.patch index 252f0be0a4..5a125f6cef 100644 --- a/srcpkgs/codeblocks/patches/000.v20.03-r12008.patch +++ b/srcpkgs/codeblocks/patches/000.v20.03-r12008.patch @@ -7,8 +7,8 @@ r12008 | fuscated | 2020-03-30 19:14:41 +0200 (Mon, 30 Mar 2020) | 3 lines Index: src/plugins/contrib/dragscroll/dragscrollcfg.h =================================================================== ---- src/plugins/contrib/dragscroll/dragscrollcfg.h (revision 12007) -+++ src/plugins/contrib/dragscroll/dragscrollcfg.h (revision 12008) +--- a/src/plugins/contrib/dragscroll/dragscrollcfg.h (revision 12007) ++++ b/src/plugins/contrib/dragscroll/dragscrollcfg.h (revision 12008) @@ -35,7 +35,7 @@ wxString GetBitmapBaseName() const; void OnApply(); diff --git a/srcpkgs/codeblocks/patches/001.v20.03-r12012.patch b/srcpkgs/codeblocks/patches/001.v20.03-r12012.patch index 4c56dfc7fc..12988765ac 100644 --- a/srcpkgs/codeblocks/patches/001.v20.03-r12012.patch +++ b/srcpkgs/codeblocks/patches/001.v20.03-r12012.patch @@ -6,8 +6,8 @@ r12012 | mortenmacfly | 2020-03-31 17:44:13 +0200 (Tue, 31 Mar 2020) | 2 lines Index: src/plugins/contrib/keybinder/cbKeyConfigPanel.h =================================================================== ---- src/plugins/contrib/keybinder/cbKeyConfigPanel.h (revision 12011) -+++ src/plugins/contrib/keybinder/cbKeyConfigPanel.h (revision 12012) +--- a/src/plugins/contrib/keybinder/cbKeyConfigPanel.h (revision 12011) ++++ b/src/plugins/contrib/keybinder/cbKeyConfigPanel.h (revision 12012) @@ -10,10 +10,6 @@ #ifndef CBKEYCONFIGPANEL_H #define CBKEYCONFIGPANEL_H @@ -21,8 +21,8 @@ Index: src/plugins/contrib/keybinder/cbKeyConfigPanel.h // ---------------------------------------------------------------------------- Index: src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp =================================================================== ---- src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp (revision 12011) -+++ src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp (revision 12012) +--- a/src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp (revision 12011) ++++ b/src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp (revision 12012) @@ -12,10 +12,6 @@ // Modified CodeBlocks KeyBnder v2.0 2019/04/8 @@ -36,8 +36,8 @@ Index: src/plugins/contrib/keybinder/cbkeyConfigPanel.cpp #include Index: src/plugins/contrib/keybinder/cbkeybinder.cpp =================================================================== ---- src/plugins/contrib/keybinder/cbkeybinder.cpp (revision 12011) -+++ src/plugins/contrib/keybinder/cbkeybinder.cpp (revision 12012) +--- a/src/plugins/contrib/keybinder/cbkeybinder.cpp (revision 12011) ++++ b/src/plugins/contrib/keybinder/cbkeybinder.cpp (revision 12012) @@ -12,10 +12,6 @@ // Modified CodeBlocks KeyBnder v2.0 2019/04/8 @@ -51,8 +51,8 @@ Index: src/plugins/contrib/keybinder/cbkeybinder.cpp #include Index: src/plugins/contrib/keybinder/cbkeybinder.h =================================================================== ---- src/plugins/contrib/keybinder/cbkeybinder.h (revision 12011) -+++ src/plugins/contrib/keybinder/cbkeybinder.h (revision 12012) +--- a/src/plugins/contrib/keybinder/cbkeybinder.h (revision 12011) ++++ b/src/plugins/contrib/keybinder/cbkeybinder.h (revision 12012) @@ -10,14 +10,6 @@ #ifndef CBKEYBINDER_H #define CBKEYBINDER_H @@ -70,8 +70,8 @@ Index: src/plugins/contrib/keybinder/cbkeybinder.h #include Index: src/plugins/contrib/keybinder/keybinder.cpp =================================================================== ---- src/plugins/contrib/keybinder/keybinder.cpp (revision 12011) -+++ src/plugins/contrib/keybinder/keybinder.cpp (revision 12012) +--- a/src/plugins/contrib/keybinder/keybinder.cpp (revision 12011) ++++ b/src/plugins/contrib/keybinder/keybinder.cpp (revision 12012) @@ -12,11 +12,6 @@ // Modified Keybinder for CodeBlocks KeyBnder v2.0 2019/04/8 @@ -86,8 +86,8 @@ Index: src/plugins/contrib/keybinder/keybinder.cpp #include // Manager::Get()->GetAppWindow() Index: src/plugins/contrib/keybinder/keybinder.h =================================================================== ---- src/plugins/contrib/keybinder/keybinder.h (revision 12011) -+++ src/plugins/contrib/keybinder/keybinder.h (revision 12012) +--- a/src/plugins/contrib/keybinder/keybinder.h (revision 12011) ++++ b/src/plugins/contrib/keybinder/keybinder.h (revision 12012) @@ -16,10 +16,6 @@ #ifndef __KEYBINDER_G__ #define __KEYBINDER_G__ @@ -101,8 +101,8 @@ Index: src/plugins/contrib/keybinder/keybinder.h #include "wx/dialog.h" Index: src/plugins/contrib/keybinder/menuutils.cpp =================================================================== ---- src/plugins/contrib/keybinder/menuutils.cpp (revision 12011) -+++ src/plugins/contrib/keybinder/menuutils.cpp (revision 12012) +--- a/src/plugins/contrib/keybinder/menuutils.cpp (revision 12011) ++++ b/src/plugins/contrib/keybinder/menuutils.cpp (revision 12012) @@ -10,17 +10,10 @@ // RCS-ID: $Id$ @@ -123,8 +123,8 @@ Index: src/plugins/contrib/keybinder/menuutils.cpp #endif Index: src/plugins/contrib/keybinder/menuutils.h =================================================================== ---- src/plugins/contrib/keybinder/menuutils.h (revision 12011) -+++ src/plugins/contrib/keybinder/menuutils.h (revision 12012) +--- a/src/plugins/contrib/keybinder/menuutils.h (revision 12011) ++++ b/src/plugins/contrib/keybinder/menuutils.h (revision 12012) @@ -15,10 +15,6 @@ #ifndef __WX_MENUUTILS_H__ #define __WX_MENUUTILS_H__ diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template index c1f7945b39..33b9b9a778 100644 --- a/srcpkgs/codeblocks/template +++ b/srcpkgs/codeblocks/template @@ -14,7 +14,6 @@ license="GPL-3.0-only" homepage="http://www.codeblocks.org" distfiles="${SOURCEFORGE_SITE}/${pkgname}/Sources/${version}/${pkgname}-${version}.tar.xz" checksum=15eeb3e28aea054e1f38b0c7f4671b4d4d1116fd05f63c07aa95a91db89eaac5 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wxWidgets-devel tinyxml-devel" diff --git a/srcpkgs/codecrypt/patches/cryptopp.patch b/srcpkgs/codecrypt/patches/cryptopp.patch index d04c5add61..4b996fd6c8 100644 --- a/srcpkgs/codecrypt/patches/cryptopp.patch +++ b/srcpkgs/codecrypt/patches/cryptopp.patch @@ -1,5 +1,5 @@ ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -37,7 +37,7 @@ if test "$WITH_CRYPTOPP" = "yes"; then PKG_PROG_PKG_CONFIG([0.25]) diff --git a/srcpkgs/codecrypt/template b/srcpkgs/codecrypt/template index 51c0dcbbd0..cd32693070 100644 --- a/srcpkgs/codecrypt/template +++ b/srcpkgs/codecrypt/template @@ -11,7 +11,6 @@ license="LGPL-3.0-or-later" homepage="https://e-x-a.org/codecrypt" distfiles="https://github.com/exaexa/codecrypt/archive/v${version}.tar.gz" checksum=25f11bc361b4f8aca7245698334b5715b7d594d708a75e8cdb2aa732dc46eb96 -patch_args=-Np0 LDFLAGS="-lpthread" diff --git a/srcpkgs/codelite/patches/92ed90e07.patch b/srcpkgs/codelite/patches/92ed90e07.patch index 89fba88f14..5a469602e4 100644 --- a/srcpkgs/codelite/patches/92ed90e07.patch +++ b/srcpkgs/codelite/patches/92ed90e07.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Compilation fix for wx3.0 gtk+3 builds diff --git a/codelite_terminal/TextView.cpp b/codelite_terminal/TextView.cpp index 83d2e260c..5966f9972 100644 ---- codelite_terminal/TextView.cpp -+++ codelite_terminal/TextView.cpp +--- a/codelite_terminal/TextView.cpp ++++ b/codelite_terminal/TextView.cpp @@ -12,7 +12,11 @@ TextView::TextView(wxWindow* parent, wxWindowID winid) m_ctrl->SetCaretStyle(wxSTC_CARETSTYLE_BLOCK); m_ctrl->SetYCaretPolicy(wxSTC_CARET_STRICT | wxSTC_CARET_SLOP, 4); diff --git a/srcpkgs/codelite/patches/musl.patch b/srcpkgs/codelite/patches/musl.patch index 8a345ed975..d911036ddb 100644 --- a/srcpkgs/codelite/patches/musl.patch +++ b/srcpkgs/codelite/patches/musl.patch @@ -1,5 +1,5 @@ ---- codelitegcc/main.cpp.orig 2019-06-29 08:37:38.818622077 +0200 -+++ codelitegcc/main.cpp 2019-06-29 08:38:04.090937646 +0200 +--- a/codelitegcc/main.cpp 2019-06-29 08:37:38.818622077 +0200 ++++ b/codelitegcc/main.cpp 2019-06-29 08:38:04.090937646 +0200 @@ -33,6 +33,7 @@ extern int ExecuteProcessWIN(const std:: #include #include @@ -8,8 +8,8 @@ void WriteContent( const std::string& logfile, const std::string& filename, const std::string& flags ) { ---- sdk/codelite_indexer/libctags/read.c.orig 2019-06-29 08:54:26.592208449 +0200 -+++ sdk/codelite_indexer/libctags/read.c 2019-06-29 08:56:18.688608501 +0200 +--- a/sdk/codelite_indexer/libctags/read.c 2019-06-29 08:54:26.592208449 +0200 ++++ b/sdk/codelite_indexer/libctags/read.c 2019-06-29 08:56:18.688608501 +0200 @@ -605,6 +605,9 @@ extern int readChars (char *buffer, size #if defined(__WXMSW__) || defined(__APPLE__) || defined(__FreeBSD__) if(location < 0) @@ -29,8 +29,8 @@ #else sizeToRead = endPos.__pos - location.__pos; #endif ---- sdk/codelite_indexer/network/named_pipe.cpp.orig 2019-06-29 09:06:20.260132366 +0200 -+++ sdk/codelite_indexer/network/named_pipe.cpp 2019-06-29 09:06:38.468360112 +0200 +--- a/sdk/codelite_indexer/network/named_pipe.cpp 2019-06-29 09:06:20.260132366 +0200 ++++ b/sdk/codelite_indexer/network/named_pipe.cpp 2019-06-29 09:06:38.468360112 +0200 @@ -27,9 +27,9 @@ #ifndef __WXMSW__ @@ -42,8 +42,8 @@ #endif #ifdef __WXMSW__ ---- sdk/codelite_indexer/network/named_pipe_server.cpp.orig 2019-06-29 09:07:26.077955618 +0200 -+++ sdk/codelite_indexer/network/named_pipe_server.cpp 2019-06-29 09:07:35.484073269 +0200 +--- a/sdk/codelite_indexer/network/named_pipe_server.cpp 2019-06-29 09:07:26.077955618 +0200 ++++ b/sdk/codelite_indexer/network/named_pipe_server.cpp 2019-06-29 09:07:35.484073269 +0200 @@ -26,8 +26,8 @@ #include "named_pipe_server.h" #ifndef __WXMSW__ diff --git a/srcpkgs/codelite/patches/pango144.patch b/srcpkgs/codelite/patches/pango144.patch index cbb3762ac2..47a75e1d95 100644 --- a/srcpkgs/codelite/patches/pango144.patch +++ b/srcpkgs/codelite/patches/pango144.patch @@ -1,7 +1,7 @@ Pango now requires harfbuzz, but it's not searched for. ---- cmake/Modules/FindGTK3.cmake -+++ cmake/Modules/FindGTK3.cmake +--- a/cmake/Modules/FindGTK3.cmake ++++ b/cmake/Modules/FindGTK3.cmake @@ -60,6 +60,21 @@ if(NOT GLIB2_FOUND) set(_GTK3_found_all false) endif() diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template index db21463032..cedc1e11c2 100644 --- a/srcpkgs/codelite/template +++ b/srcpkgs/codelite/template @@ -20,7 +20,6 @@ distfiles="https://github.com/eranif/${pkgname}/archive/${version}.tar.gz" checksum=f2653fa42d6214999718236998cb223e6de00a498c0cfde795e901be693fb9ac nocross=yes python_version=2 #unverified -patch_args=-Np0 build_options="hunspell lldb mysql sftp" build_options_default="hunspell sftp" diff --git a/srcpkgs/coin3/patches/no-cpack.patch b/srcpkgs/coin3/patches/no-cpack.patch index 5417d2e66c..edc82c4abc 100644 --- a/srcpkgs/coin3/patches/no-cpack.patch +++ b/srcpkgs/coin3/patches/no-cpack.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.ORIG -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -815,4 +815,4 @@ # ############################################################################ diff --git a/srcpkgs/coin3/template b/srcpkgs/coin3/template index 3ed1add5ff..2130c0b8b2 100644 --- a/srcpkgs/coin3/template +++ b/srcpkgs/coin3/template @@ -14,7 +14,6 @@ license="BSD-3-Clause" homepage="https://coin3d.github.io/" distfiles="https://github.com/coin3d/coin/archive/Coin-${version}.tar.gz" checksum=b00d2a8e9d962397cf9bf0d9baa81bcecfbd16eef675a98c792f5cf49eb6e805 -patch_args=-Np0 CFLAGS=-DNDEBUG CXXFLAGS=-DNDEBUG diff --git a/srcpkgs/collectd/patches/gnu_source.patch b/srcpkgs/collectd/patches/gnu_source.patch index ac381e1f60..323ce0faca 100644 --- a/srcpkgs/collectd/patches/gnu_source.patch +++ b/srcpkgs/collectd/patches/gnu_source.patch @@ -1,8 +1,8 @@ # # Define GNU_SOURCE so perl will be properly detected # ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -48,6 +48,8 @@ PKG_PROG_PKG_CONFIG diff --git a/srcpkgs/collectd/template b/srcpkgs/collectd/template index b9fa105346..28fa815e85 100644 --- a/srcpkgs/collectd/template +++ b/srcpkgs/collectd/template @@ -23,7 +23,6 @@ homepage="https://collectd.org" distfiles="https://collectd.org/files/${pkgname}-${version}.tar.bz2" checksum=5bae043042c19c31f77eb8464e56a01a5454e0b39fa07cf7ad0f1bfc9c3a09d6 LDFLAGS="-lgcrypt" -patch_args=-Np0 build_options="rrdtool perl notify prometheus" desc_option_rrdtool="Enable support for RRDTool" diff --git a/srcpkgs/colord/patches/add-introspection-switch.patch b/srcpkgs/colord/patches/add-introspection-switch.patch index 5c0dfa91ce..6a995c7985 100644 --- a/srcpkgs/colord/patches/add-introspection-switch.patch +++ b/srcpkgs/colord/patches/add-introspection-switch.patch @@ -1,7 +1,7 @@ diff --git lib/colord/meson.build lib/colord/meson.build index 61f0518..9f7a246 100644 ---- lib/colord/meson.build -+++ lib/colord/meson.build +--- a/lib/colord/meson.build ++++ b/lib/colord/meson.build @@ -146,6 +146,7 @@ pkgg.generate( description : 'colord is a system daemon for managing color devices', ) @@ -20,8 +20,8 @@ index 61f0518..9f7a246 100644 gnome.generate_vapi('colord', diff --git lib/colorhug/meson.build lib/colorhug/meson.build index 03aefb7..b6d2624 100644 ---- lib/colorhug/meson.build -+++ lib/colorhug/meson.build +--- a/lib/colorhug/meson.build ++++ b/lib/colorhug/meson.build @@ -73,6 +73,7 @@ pkgg.generate( description : 'ColorHug is a simple display hardware colorimeter', ) @@ -40,8 +40,8 @@ index 03aefb7..b6d2624 100644 testdatadir = join_paths(meson.source_root(), 'data', 'tests') diff --git meson_options.txt meson_options.txt index 52af113..6661e16 100644 ---- meson_options.txt -+++ meson_options.txt +--- a/meson_options.txt ++++ b/meson_options.txt @@ -15,3 +15,4 @@ option('daemon_user', type : 'string', value : 'root', description : 'User for r option('pnp_ids', type : 'string', value : '', description : 'Location of pnp.ids if hwdb is not available') option('man', type : 'boolean', value : true, description : 'Generate man pages') diff --git a/srcpkgs/colord/patches/use-host-utils.patch b/srcpkgs/colord/patches/use-host-utils.patch index 856c0261f2..867954f219 100644 --- a/srcpkgs/colord/patches/use-host-utils.patch +++ b/srcpkgs/colord/patches/use-host-utils.patch @@ -1,5 +1,5 @@ ---- data/cmf/meson.build -+++ data/cmf/meson.build +--- a/data/cmf/meson.build ++++ b/data/cmf/meson.build @@ -1,3 +1,7 @@ +if meson.is_cross_build() + cd_idt8 = find_program('cd-it8') @@ -8,8 +8,8 @@ foreach arg: [ 'CIE1964-10deg-XYZ', 'CIE1931-2deg-XYZ' ] custom_target(arg, input: arg + '.csv', ---- data/profiles/meson.build -+++ data/profiles/meson.build +--- a/data/profiles/meson.build ++++ b/data/profiles/meson.build @@ -47,6 +47,10 @@ if get_option('print_profiles') icc_profiles += icc_print_profiles endif diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index 14bc56ad38..98739d4802 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -17,7 +17,6 @@ license="GPL-2.0-only" homepage="https://www.freedesktop.org/software/colord" distfiles="${homepage}/releases/${pkgname}-${version}.tar.xz" checksum=b774ea443d239f4a2ee1853bd678426e669ddeda413dcb71cea1638c4d6c5e17 -patch_args=-Np0 system_accounts="colord" colord_homedir="/var/lib/colord" diff --git a/srcpkgs/commoncpp2/patches/applog.patch b/srcpkgs/commoncpp2/patches/applog.patch index 9cc25480df..49aff6680b 100644 --- a/srcpkgs/commoncpp2/patches/applog.patch +++ b/srcpkgs/commoncpp2/patches/applog.patch @@ -1,5 +1,5 @@ ---- src/applog.cpp.orig 2016-12-02 18:23:28.705313984 +0100 -+++ src/applog.cpp 2016-12-02 18:23:45.455313926 +0100 +--- a/src/applog.cpp 2016-12-02 18:23:28.705313984 +0100 ++++ b/src/applog.cpp 2016-12-02 18:23:45.455313926 +0100 @@ -45,6 +45,7 @@ #include #include diff --git a/srcpkgs/commoncpp2/patches/ftbfs.patch b/srcpkgs/commoncpp2/patches/ftbfs.patch index 09e1ead1db..f586ed2932 100644 --- a/srcpkgs/commoncpp2/patches/ftbfs.patch +++ b/srcpkgs/commoncpp2/patches/ftbfs.patch @@ -1,8 +1,8 @@ C++ does not allow specifying default arguments on friend declarations. We can simply do this as getline is not otherwise publicly declared. ---- inc/cc++/string.h -+++ inc/cc++/string.h +--- a/inc/cc++/string.h ++++ b/inc/cc++/string.h @@ -731,7 +731,7 @@ public: * @param delim deliminator to use. * @param size optional size limitor. diff --git a/srcpkgs/commoncpp2/template b/srcpkgs/commoncpp2/template index ddbd6ba583..181a6a9e07 100644 --- a/srcpkgs/commoncpp2/template +++ b/srcpkgs/commoncpp2/template @@ -10,7 +10,6 @@ license="GPL-3.0-or-later" homepage='http://www.gnu.org/software/commoncpp/' distfiles="${GNU_SITE}/commoncpp/$pkgname-${version}.tar.gz" checksum="53ced4aff74e28a1d8018eb2b4974519028db3c12471ab6dff1c873578c9af4e" -patch_args=-Np0 commoncpp2-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/connman-ncurses/patches/lowercase-boolean.patch b/srcpkgs/connman-ncurses/patches/lowercase-boolean.patch index 41a91751ea..67fb30b7ab 100644 --- a/srcpkgs/connman-ncurses/patches/lowercase-boolean.patch +++ b/srcpkgs/connman-ncurses/patches/lowercase-boolean.patch @@ -1,5 +1,5 @@ ---- json_utils.c 2020-05-31 00:39:12.983378846 -0400 -+++ json_utils.c 2020-05-31 00:39:26.062122347 -0400 +--- a/json_utils.c 2020-05-31 00:39:12.983378846 -0400 ++++ b/json_utils.c 2020-05-31 00:39:26.062122347 -0400 @@ -81,7 +81,7 @@ key_is_trusted = json_object_object_get_ex(jtrusted, key, &tmp_trusted); @@ -9,8 +9,8 @@ return false; res = __json_type_dispatch(val, tmp_trusted); ---- json_regex.c 2020-05-31 00:44:07.233613212 -0400 -+++ json_regex.c 2020-05-31 00:48:33.307401463 -0400 +--- a/json_regex.c 2020-05-31 00:44:07.233613212 -0400 ++++ b/json_regex.c 2020-05-31 00:48:33.307401463 -0400 @@ -22,6 +22,7 @@ #endif diff --git a/srcpkgs/connman-ncurses/template b/srcpkgs/connman-ncurses/template index 0d2f48a12e..5fd4b33b08 100644 --- a/srcpkgs/connman-ncurses/template +++ b/srcpkgs/connman-ncurses/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/eurogiciel-oss/connman-json-client" distfiles="https://github.com/eurogiciel-oss/connman-json-client/archive/v${version}.tar.gz" checksum=724604787b51cd3bd2ba5d2291f5f2efe0558a1ec78d92d3c92ebc78f6c63219 -patch_args=-Np0 pre_configure() { mkdir -p m4 diff --git a/srcpkgs/containers.image/patches/dockerhub.patch b/srcpkgs/containers.image/patches/dockerhub.patch index c6b18a26c7..99482c3f0b 100644 --- a/srcpkgs/containers.image/patches/dockerhub.patch +++ b/srcpkgs/containers.image/patches/dockerhub.patch @@ -1,5 +1,5 @@ ---- registries.conf -+++ registries.conf +--- a/registries.conf ++++ b/registries.conf @@ -9,7 +9,7 @@ # Registries to search for images that are not fully-qualified. # i.e. foobar.com/my_image:latest vs my_image:latest diff --git a/srcpkgs/containers.image/template b/srcpkgs/containers.image/template index d292c68747..f587e0ef36 100644 --- a/srcpkgs/containers.image/template +++ b/srcpkgs/containers.image/template @@ -11,7 +11,6 @@ license="Apache-2.0" homepage="https://github.com/containers/image" distfiles="https://github.com/containers/image/archive/v${version}.tar.gz" checksum=99440d59728ed741e6171046cf3a6a820c2e3414cd9c17ee640efd289a015c3f -patch_args=-Np0 do_build() { mkdir -p build diff --git a/srcpkgs/coreboot-utils/patches/ectool-musl.patch b/srcpkgs/coreboot-utils/patches/ectool-musl.patch index 1bdbfbe551..85abc55c42 100644 --- a/srcpkgs/coreboot-utils/patches/ectool-musl.patch +++ b/srcpkgs/coreboot-utils/patches/ectool-musl.patch @@ -1,5 +1,5 @@ ---- util/ectool/Makefile 2020-05-20 15:20:52.396213112 +0200 -+++ - 2020-05-20 15:20:46.512212915 +0200 +--- a/util/ectool/Makefile 2020-05-20 15:20:52.396213112 +0200 ++++ b/util/ectool/Makefile 2020-05-20 15:20:52.396213112 +0200 @@ -15,6 +15,8 @@ LDFLAGS = -l$(shell uname -p) endif diff --git a/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch b/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch index 05d4d431b0..a27523bc97 100644 --- a/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch +++ b/srcpkgs/coreboot-utils/patches/inteltool-musl-2.patch @@ -1,5 +1,5 @@ ---- src/arch/x86/include/arch/mmio.h 2020-05-20 14:43:31.750138013 +0200 -+++ src/arch/x86/include/arch/mmio.h 2020-05-20 14:43:13.438137399 +0200 +--- a/src/arch/x86/include/arch/mmio.h 2020-05-20 14:43:31.750138013 +0200 ++++ b/src/arch/x86/include/arch/mmio.h 2020-05-20 14:43:13.438137399 +0200 @@ -4,6 +4,7 @@ #define __ARCH_MMIO_H__ diff --git a/srcpkgs/coreboot-utils/patches/inteltool-musl.patch b/srcpkgs/coreboot-utils/patches/inteltool-musl.patch index ecb9c7f696..509d2dcb60 100644 --- a/srcpkgs/coreboot-utils/patches/inteltool-musl.patch +++ b/srcpkgs/coreboot-utils/patches/inteltool-musl.patch @@ -1,5 +1,5 @@ ---- util/inteltool/inteltool.h 2018-08-27 12:35:48.049321340 +0200 -+++ util/inteltool/inteltool.h 2018-08-27 12:30:27.434969376 +0200 +--- a/util/inteltool/inteltool.h 2018-08-27 12:35:48.049321340 +0200 ++++ b/util/inteltool/inteltool.h 2018-08-27 12:30:27.434969376 +0200 @@ -21,7 +21,7 @@ #include diff --git a/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch b/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch index cd3078d10b..e6142739cf 100644 --- a/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch +++ b/srcpkgs/coreboot-utils/patches/nvramtool-musl-2.patch @@ -1,5 +1,5 @@ ---- util/nvramtool/Makefile 2020-05-20 15:19:20.652210037 +0200 -+++ - 2020-05-20 15:20:00.145211360 +0200 +--- a/util/nvramtool/Makefile 2020-05-20 15:19:20.652210037 +0200 ++++ b/util/nvramtool/Makefile 2020-05-20 15:19:20.652210037 +0200 @@ -34,6 +34,8 @@ CFLAGS += -D__GLIBC__ endif diff --git a/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch b/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch index ba152cd5cb..a3e6c7c178 100644 --- a/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch +++ b/srcpkgs/coreboot-utils/patches/nvramtool-musl.patch @@ -1,5 +1,5 @@ ---- util/nvramtool/accessors/cmos-hw-unix.c 2018-08-27 12:20:14.139599118 +0200 -+++ util/nvramtool/accessors/cmos-hw-unix.c 2018-08-27 12:19:45.558280906 +0200 +--- a/util/nvramtool/accessors/cmos-hw-unix.c 2018-08-27 12:20:14.139599118 +0200 ++++ b/util/nvramtool/accessors/cmos-hw-unix.c 2018-08-27 12:19:45.558280906 +0200 @@ -11,7 +11,7 @@ #define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); }) #define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); }) diff --git a/srcpkgs/coreboot-utils/patches/superiotool-musl.patch b/srcpkgs/coreboot-utils/patches/superiotool-musl.patch index 779ccee3c3..195660c8c6 100644 --- a/srcpkgs/coreboot-utils/patches/superiotool-musl.patch +++ b/srcpkgs/coreboot-utils/patches/superiotool-musl.patch @@ -1,5 +1,5 @@ ---- util/superiotool/Makefile 2018-05-16 21:00:17.000000000 +0200 -+++ util/superiotool/Makefile 2018-08-27 12:56:28.070741476 +0200 +--- a/util/superiotool/Makefile 2018-05-16 21:00:17.000000000 +0200 ++++ b/util/superiotool/Makefile 2018-08-27 12:56:28.070741476 +0200 @@ -25,7 +25,7 @@ VERSION := -D'SUPERIOTOOL_VERSION="$(shell git describe 2>/dev/null)"' @@ -9,8 +9,8 @@ LDFLAGS += -lz OBJS = superiotool.o serverengines.o ali.o exar.o fintek.o ite.o nsc.o \ ---- util/superiotool/superiotool.h 2018-05-16 21:00:17.000000000 +0200 -+++ util/superiotool/superiotool.h 2018-08-27 12:50:25.627387315 +0200 +--- a/util/superiotool/superiotool.h 2018-05-16 21:00:17.000000000 +0200 ++++ b/util/superiotool/superiotool.h 2018-08-27 12:50:25.627387315 +0200 @@ -25,7 +25,7 @@ #include #include diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template index 3f161fe475..4eec377ece 100644 --- a/srcpkgs/coreboot-utils/template +++ b/srcpkgs/coreboot-utils/template @@ -13,7 +13,6 @@ license="GPL-2.0-only" homepage="https://coreboot.org" distfiles="https://coreboot.org/releases/coreboot-${version}.tar.xz" checksum=4779da645a25ddebc78f1bd2bd0b740fb1e6479572648d4650042a2b9502856a -patch_args=-Np0 do_build() { for util in cbfstool cbmem ectool ifdtool inteltool intelmetool \ diff --git a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch index 0312eff046..93ec0fd84c 100644 --- a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch +++ b/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch @@ -19,8 +19,8 @@ behavior. diff --git NEWS NEWS index fdc8bf5db..653e7178b 100644 ---- NEWS -+++ NEWS +--- a/NEWS ++++ b/NEWS @@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*- * Noteworthy changes in release ?.? (????-??-??) [?] @@ -36,8 +36,8 @@ index fdc8bf5db..653e7178b 100644 diff --git src/ls.c src/ls.c index 24b983287..4acf5f44d 100644 ---- src/ls.c -+++ src/ls.c +--- a/src/ls.c ++++ b/src/ls.c @@ -49,10 +49,6 @@ # include #endif @@ -90,8 +90,8 @@ index 24b983287..4acf5f44d 100644 diff --git tests/ls/removed-directory.sh tests/ls/removed-directory.sh index e8c835dab..fe8f929a1 100755 ---- tests/ls/removed-directory.sh -+++ tests/ls/removed-directory.sh +--- a/tests/ls/removed-directory.sh ++++ b/tests/ls/removed-directory.sh @@ -26,20 +26,14 @@ case $host_triplet in *) skip_ 'non linux kernel' ;; esac diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template index fd25f8220a..b9148c8549 100644 --- a/srcpkgs/coreutils/template +++ b/srcpkgs/coreutils/template @@ -11,7 +11,6 @@ homepage="https://www.gnu.org/software/coreutils" changelog="https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob_plain;f=NEWS;hb=HEAD" distfiles="${GNU_SITE}/coreutils/coreutils-${version}.tar.xz" checksum=4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa -patch_args=-Np0 replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0" diff --git a/srcpkgs/coturn/patches/Makefile.patch b/srcpkgs/coturn/patches/Makefile.patch index ede8c802b9..c169ebf86d 100644 --- a/srcpkgs/coturn/patches/Makefile.patch +++ b/srcpkgs/coturn/patches/Makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.in.bck 2017-10-24 23:56:45.227539877 -0400 -+++ Makefile.in 2017-10-24 23:57:02.000103162 -0400 +--- a/Makefile.in.bck 2017-10-24 23:56:45.227539877 -0400 ++++ b/Makefile.in 2017-10-24 23:57:02.000103162 -0400 @@ -165,7 +165,7 @@ ${INSTALL_DATA} turndb/schema.stats.redis ${DESTDIR}${DOCSDIR} ${INSTALL_DATA} turndb/schema.stats.redis ${DESTDIR}${SCHEMADIR} diff --git a/srcpkgs/coturn/template b/srcpkgs/coturn/template index 1f662c41f1..edfb526f49 100644 --- a/srcpkgs/coturn/template +++ b/srcpkgs/coturn/template @@ -13,7 +13,6 @@ license="BSD-3-Clause" homepage="https://github.com/coturn/coturn" distfiles="https://github.com/coturn/coturn/archive/${version}.tar.gz" checksum=4ff1f8c041ac71445018d81321d4b66e5dce4f171ef73a348d858dc9a0cc1cce -patch_args=-Np0 post_patch() { # LibreSSL does not support FIPS mode diff --git a/srcpkgs/cpuburn/patches/01-variables.patch b/srcpkgs/cpuburn/patches/01-variables.patch index e855428eea..5c5de7111b 100644 --- a/srcpkgs/cpuburn/patches/01-variables.patch +++ b/srcpkgs/cpuburn/patches/01-variables.patch @@ -1,5 +1,5 @@ ---- burnK7.S -+++ burnK7.S +--- a/burnK7.S ++++ b/burnK7.S @@ -74,6 +74,7 @@ int_exit: push %eax int $0x80 @@ -8,8 +8,8 @@ .align 32,0 .fill 64 half: .long 0x7fffffff,0 ---- burnP5.S -+++ burnP5.S +--- a/burnP5.S ++++ b/burnP5.S @@ -77,6 +77,7 @@ crunch: #else int $0x80 @@ -18,8 +18,8 @@ .align 32,0 half: .long 0xffffffff,0x3fdfffff one: .long 0xffffffff,0x3fefffff ---- burnP6.S -+++ burnP6.S +--- a/burnP6.S ++++ b/burnP6.S @@ -69,6 +69,7 @@ int_exit: # error abort push %eax # *BSD syscall int $0x80 @@ -28,8 +28,8 @@ .align 32,0 half: .long 0x7fffffff,0 e: .long 0xffffffff,0x3fdfffff ---- burnK6.S -+++ burnK6.S +--- a/burnK6.S ++++ b/burnK6.S @@ -68,6 +68,7 @@ int_exit: push %eax int $0x80 diff --git a/srcpkgs/cpuburn/patches/02-m32.patch b/srcpkgs/cpuburn/patches/02-m32.patch index 44a30bc89e..6da74c20b0 100644 --- a/srcpkgs/cpuburn/patches/02-m32.patch +++ b/srcpkgs/cpuburn/patches/02-m32.patch @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -1,3 +1,3 @@ all : burnP5 burnP6 burnK6 burnK7 burnBX burnMMX .S: diff --git a/srcpkgs/cpuburn/template b/srcpkgs/cpuburn/template index 735ecbcba2..a215520fb7 100644 --- a/srcpkgs/cpuburn/template +++ b/srcpkgs/cpuburn/template @@ -9,7 +9,6 @@ license="GPL-2.0-only" homepage="https://launchpad.net/ubuntu/+source/cpuburn/" distfiles="https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname}_${version}.orig.tar.gz" checksum=eb191ce9bfbf453d30c218c3419573df102a3588f96c4a43686c84bb9da4bed6 -patch_args=-Np0 do_build() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/cpulimit/patches/musl_sysctl.patch b/srcpkgs/cpulimit/patches/musl_sysctl.patch index 8ba5cd058b..536be6cc01 100644 --- a/srcpkgs/cpulimit/patches/musl_sysctl.patch +++ b/srcpkgs/cpulimit/patches/musl_sysctl.patch @@ -1,5 +1,5 @@ ---- ./src/cpulimit.c.orig 2015-10-05 04:12:08.510651801 -0400 -+++ ./src/cpulimit.c 2015-10-05 04:13:40.562657764 -0400 +--- a/src/cpulimit.c 2015-10-05 04:12:08.510651801 -0400 ++++ b/src/cpulimit.c 2015-10-05 04:13:40.562657764 -0400 @@ -38,7 +38,9 @@ #include #include diff --git a/srcpkgs/cpulimit/template b/srcpkgs/cpulimit/template index f1a756a81a..9fbf6eccf6 100644 --- a/srcpkgs/cpulimit/template +++ b/srcpkgs/cpulimit/template @@ -9,7 +9,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/opsengine/cpulimit" distfiles="https://github.com/opsengine/${pkgname}/archive/v${version}.tar.gz" checksum=64312f9ac569ddcadb615593cd002c94b76e93a0d4625d3ce1abb49e08e2c2da -patch_args=-Np0 pre_build() { export CFLAGS="$CFLAGS $LDFLAGS" diff --git a/srcpkgs/criu/patches/capsetget.patch b/srcpkgs/criu/patches/capsetget.patch index bd6f9d5017..ef6afb46f9 100644 --- a/srcpkgs/criu/patches/capsetget.patch +++ b/srcpkgs/criu/patches/capsetget.patch @@ -1,7 +1,7 @@ diff --git a/criu/namespaces.c b/criu/namespaces.c index 05d75d5..9d9bf5a 100644 ---- criu/namespaces.c -+++ criu/namespaces.c +--- a/criu/namespaces.c ++++ b/criu/namespaces.c @@ -9,7 +9,7 @@ #include #include diff --git a/srcpkgs/criu/patches/ppc64-musl.patch b/srcpkgs/criu/patches/ppc64-musl.patch index a1a4648eb4..eaf2a813f1 100644 --- a/srcpkgs/criu/patches/ppc64-musl.patch +++ b/srcpkgs/criu/patches/ppc64-musl.patch @@ -1,7 +1,7 @@ Get rid of some header conflicts and glibc specific things. ---- compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h -+++ compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h +--- a/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h ++++ b/compel/arch/ppc64/src/lib/include/uapi/asm/infect-types.h @@ -1,6 +1,8 @@ #ifndef UAPI_COMPEL_ASM_TYPES_H__ #define UAPI_COMPEL_ASM_TYPES_H__ @@ -33,8 +33,8 @@ Get rid of some header conflicts and glibc specific things. uint64_t vsxregs[NVSXREG]; } tm; } user_fpregs_struct_t; ---- compel/arch/ppc64/src/lib/infect.c -+++ compel/arch/ppc64/src/lib/infect.c +--- a/compel/arch/ppc64/src/lib/infect.c ++++ b/compel/arch/ppc64/src/lib/infect.c @@ -1,7 +1,6 @@ #include #include @@ -62,8 +62,8 @@ Get rid of some header conflicts and glibc specific things. mc->v_regs = v_regs; } ---- criu/arch/ppc64/crtools.c -+++ criu/arch/ppc64/crtools.c +--- a/criu/arch/ppc64/crtools.c ++++ b/criu/arch/ppc64/crtools.c @@ -1,7 +1,6 @@ #include #include @@ -133,8 +133,8 @@ Get rid of some header conflicts and glibc specific things. /* vscr has been restored with the previous memcpy which copied 32 * 128bits registers + a 128bits field containing the vscr value in * the low part. ---- include/common/arch/ppc64/asm/cmpxchg.h -+++ include/common/arch/ppc64/asm/cmpxchg.h +--- a/include/common/arch/ppc64/asm/cmpxchg.h ++++ b/include/common/arch/ppc64/asm/cmpxchg.h @@ -1,6 +1,10 @@ #ifndef __CR_CMPXCHG_H__ #define __CR_CMPXCHG_H__ diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template index 2c9eda89e0..c9f68933e7 100644 --- a/srcpkgs/criu/template +++ b/srcpkgs/criu/template @@ -18,7 +18,6 @@ homepage="http://criu.org/" distfiles="https://download.openvz.org/criu/criu-${version}.tar.bz2" checksum=f63f30188b84e9a611429f732381f27e37c60cde0afc9821600f8597d21e39cb nocross="fails to run protobuf internals" -patch_args=-Np0 do_install() { make DESTDIR=${DESTDIR} PREFIX=/usr LOGROTATEDIR=/etc/logrotate.d \ diff --git a/srcpkgs/crossguid/patches/no-O3.patch b/srcpkgs/crossguid/patches/no-O3.patch index 983360a07c..4ea8a053e7 100644 --- a/srcpkgs/crossguid/patches/no-O3.patch +++ b/srcpkgs/crossguid/patches/no-O3.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.5.1) project(CrossGuid) diff --git a/srcpkgs/crossguid/template b/srcpkgs/crossguid/template index acec957535..c846590103 100644 --- a/srcpkgs/crossguid/template +++ b/srcpkgs/crossguid/template @@ -10,7 +10,6 @@ license="MIT" homepage="https://github.com/graeme-hill/crossguid" distfiles="$homepage/archive/v$version.tar.gz" checksum=48321928473c682b0cdc7e17bbd3390f79f4b98ab22fef3b81a852dda81fd195 -patch_args=-Np0 do_install() { vlicense LICENSE diff --git a/srcpkgs/crypto++/patches/musl-soname-links.patch b/srcpkgs/crypto++/patches/musl-soname-links.patch index 4d9b37e4c6..d4fdc719f6 100644 --- a/srcpkgs/crypto++/patches/musl-soname-links.patch +++ b/srcpkgs/crypto++/patches/musl-soname-links.patch @@ -1,5 +1,5 @@ ---- GNUmakefile 2019-10-20 13:33:45.272028979 +0200 -+++ - 2019-10-20 13:37:32.987528589 +0200 +--- a/GNUmakefile 2019-10-20 13:33:45.272028979 +0200 ++++ b/GNUmakefile 2019-10-20 13:33:45.272028979 +0200 @@ -1256,7 +1256,7 @@ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) ifeq ($(HAS_SOLIB_VERSION),1) @@ -9,8 +9,8 @@ endif endif ifneq ($(wildcard libcryptopp.pc),) ---- GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200 -+++ - 2019-10-20 13:38:49.796656638 +0200 +--- a/GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200 ++++ b/GNUmakefile-cross 2019-04-29 01:36:50.000000000 +0200 @@ -732,7 +732,7 @@ $(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) ifeq ($(HAS_SOLIB_VERSION),1) diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template index ecc5291e1b..b524377319 100644 --- a/srcpkgs/crypto++/template +++ b/srcpkgs/crypto++/template @@ -14,7 +14,6 @@ license="BSL-1.0" homepage="http://www.cryptopp.com/" distfiles="https://github.com/weidai11/cryptopp/archive/CRYPTOPP_${version//./_}.tar.gz" checksum=63304c6f943f435a4e385273e15abb69cff3b85a44663150bf5a6069b84abd43 -patch_args=-Np0 CXXFLAGS="-DNDEBUG -fPIC" diff --git a/srcpkgs/csound/patches/arm.patch b/srcpkgs/csound/patches/arm.patch index 122738a68d..581ecd7c8a 100644 --- a/srcpkgs/csound/patches/arm.patch +++ b/srcpkgs/csound/patches/arm.patch @@ -1,7 +1,7 @@ diff --git OOps/pffft.c OOps/pffft.c index e9696a7..3163cf8 100644 ---- OOps/pffft.c -+++ OOps/pffft.c +--- a/OOps/pffft.c ++++ b/OOps/pffft.c @@ -154,7 +154,7 @@ typedef __m128 v4sf; /* ARM NEON support macros diff --git a/srcpkgs/csound/template b/srcpkgs/csound/template index d38bf36272..f02f97bc63 100644 --- a/srcpkgs/csound/template +++ b/srcpkgs/csound/template @@ -18,7 +18,6 @@ license="LGPL-2.1-or-later" homepage="https://csound.com/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" checksum=d47ed0fb70c752cb06ee2655ee9f010d8d1e369fc73d09d2ac2bc1b3060bf724 -patch_args=-Np0 CFLAGS="-fcommon" CXXFLAGS="-Wno-error -fcommon" diff --git a/srcpkgs/csync2/patches/CVE-2019-15522.patch b/srcpkgs/csync2/patches/CVE-2019-15522.patch index 3042473d04..a37a8b453c 100644 --- a/srcpkgs/csync2/patches/CVE-2019-15522.patch +++ b/srcpkgs/csync2/patches/CVE-2019-15522.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fail HELLO command when SSL is required diff --git daemon.c daemon.c index 2d8407d..2a1a8af 100644 ---- daemon.c -+++ daemon.c +--- a/daemon.c ++++ b/daemon.c @@ -747,6 +747,7 @@ void csync_daemon_session() goto conn_without_ssl_ok; } diff --git a/srcpkgs/csync2/patches/musl-strlcpy.patch b/srcpkgs/csync2/patches/musl-strlcpy.patch index 5b9342f55c..bcd3c9a5c1 100644 --- a/srcpkgs/csync2/patches/musl-strlcpy.patch +++ b/srcpkgs/csync2/patches/musl-strlcpy.patch @@ -1,5 +1,5 @@ ---- rsync.c 2015-03-09 15:08:51.000000000 +0100 -+++ rsync.c 2015-10-06 16:44:57.988159380 +0200 +--- a/rsync.c 2015-03-09 15:08:51.000000000 +0100 ++++ b/rsync.c 2015-10-06 16:44:57.988159380 +0200 @@ -39,6 +39,7 @@ #endif diff --git a/srcpkgs/csync2/template b/srcpkgs/csync2/template index 1b16f75c10..f8738551c2 100644 --- a/srcpkgs/csync2/template +++ b/srcpkgs/csync2/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="http://oss.linbit.com/csync2/" distfiles="https://github.com/LINBIT/csync2/archive/csync2-$version.tar.gz" checksum=a1c6b0364eb9f19986a92fccd369bae29aa5aa55300e0664dadaf80d80de23ff -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch b/srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch index 821d0d1f6c..ae80d0eb8f 100644 --- a/srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch +++ b/srcpkgs/ctags/patches/0001-Strip-libiconv-dependant-tests.patch @@ -38,14 +38,14 @@ Signed-off-by: Reed Wade diff --git Tmain/input-encoding-option.d/exit-expected.txt Tmain/input-encoding-option.d/exit-expected.txt deleted file mode 100644 index 573541ac..00000000 ---- Tmain/input-encoding-option.d/exit-expected.txt +--- a/Tmain/input-encoding-option.d/exit-expected.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git Tmain/input-encoding-option.d/input.java Tmain/input-encoding-option.d/input.java deleted file mode 100644 index f1ebd5d6..00000000 ---- Tmain/input-encoding-option.d/input.java +--- a/Tmain/input-encoding-option.d/input.java +++ /dev/null @@ -1,4 +0,0 @@ -class Foo { // FooƒNƒ‰ƒX @@ -55,14 +55,14 @@ index f1ebd5d6..00000000 diff --git Tmain/input-encoding-option.d/input.js Tmain/input-encoding-option.d/input.js deleted file mode 100644 index 8bfcd659..00000000 ---- Tmain/input-encoding-option.d/input.js +--- a/Tmain/input-encoding-option.d/input.js +++ /dev/null @@ -1 +0,0 @@ -var a = 1; // ÊÑ¿ô½é´ü²½ diff --git Tmain/input-encoding-option.d/run.sh Tmain/input-encoding-option.d/run.sh deleted file mode 100644 index 16a5d21b..00000000 ---- Tmain/input-encoding-option.d/run.sh +--- a/Tmain/input-encoding-option.d/run.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh @@ -96,7 +96,7 @@ index e69de29b..00000000 diff --git Tmain/input-encoding-option.d/tags-expected.txt Tmain/input-encoding-option.d/tags-expected.txt deleted file mode 100644 index 07ddd7d6..00000000 ---- Tmain/input-encoding-option.d/tags-expected.txt +--- a/Tmain/input-encoding-option.d/tags-expected.txt +++ /dev/null @@ -1,14 +0,0 @@ -!_TAG_FILE_ENCODING UTF-8 // @@ -116,14 +116,14 @@ index 07ddd7d6..00000000 diff --git Tmain/output-encoding-option.d/exit-expected.txt Tmain/output-encoding-option.d/exit-expected.txt deleted file mode 100644 index 573541ac..00000000 ---- Tmain/output-encoding-option.d/exit-expected.txt +--- a/Tmain/output-encoding-option.d/exit-expected.txt +++ /dev/null @@ -1 +0,0 @@ -0 diff --git Tmain/output-encoding-option.d/input.java Tmain/output-encoding-option.d/input.java deleted file mode 100644 index 234c5b20..00000000 ---- Tmain/output-encoding-option.d/input.java +--- a/Tmain/output-encoding-option.d/input.java +++ /dev/null @@ -1,4 +0,0 @@ -class Foo { // Fooクラス @@ -133,14 +133,14 @@ index 234c5b20..00000000 diff --git Tmain/output-encoding-option.d/input.js Tmain/output-encoding-option.d/input.js deleted file mode 100644 index 8bfcd659..00000000 ---- Tmain/output-encoding-option.d/input.js +--- a/Tmain/output-encoding-option.d/input.js +++ /dev/null @@ -1 +0,0 @@ -var a = 1; // ÊÑ¿ô½é´ü²½ diff --git Tmain/output-encoding-option.d/run.sh Tmain/output-encoding-option.d/run.sh deleted file mode 100644 index 0687e610..00000000 ---- Tmain/output-encoding-option.d/run.sh +--- a/Tmain/output-encoding-option.d/run.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh @@ -173,7 +173,7 @@ index e69de29b..00000000 diff --git Tmain/output-encoding-option.d/tags-expected.txt Tmain/output-encoding-option.d/tags-expected.txt deleted file mode 100644 index be3eae3f..00000000 ---- Tmain/output-encoding-option.d/tags-expected.txt +--- a/Tmain/output-encoding-option.d/tags-expected.txt +++ /dev/null @@ -1,14 +0,0 @@ -!_TAG_FILE_ENCODING cp932 // diff --git a/srcpkgs/ctags/template b/srcpkgs/ctags/template index 2395dacd82..56b3c3dfdf 100644 --- a/srcpkgs/ctags/template +++ b/srcpkgs/ctags/template @@ -11,7 +11,6 @@ license="GPL-2.0-only" homepage="https://ctags.io/" distfiles="https://github.com/universal-ctags/ctags/archive/p${version}.tar.gz" checksum=26d9efe481a57e81195878cdb0baca730a3c4d234b9a7c4f6bf2c8def42bf42b -patch_args=-Np0 do_configure() { ./autogen.sh diff --git a/srcpkgs/cubieboard2-uboot/patches/uuid.patch b/srcpkgs/cubieboard2-uboot/patches/uuid.patch index 5a1cf45624..ac74fda8c8 100644 --- a/srcpkgs/cubieboard2-uboot/patches/uuid.patch +++ b/srcpkgs/cubieboard2-uboot/patches/uuid.patch @@ -1,5 +1,5 @@ ---- include/config_distro_defaults.h -+++ include/config_distro_defaults.h +--- a/include/config_distro_defaults.h ++++ b/include/config_distro_defaults.h @@ -53,4 +53,7 @@ #define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_SYS_HUSH_PARSER diff --git a/srcpkgs/cubieboard2-uboot/template b/srcpkgs/cubieboard2-uboot/template index 8861e5c7b1..23f63f574f 100644 --- a/srcpkgs/cubieboard2-uboot/template +++ b/srcpkgs/cubieboard2-uboot/template @@ -10,7 +10,6 @@ license="GPL-2" homepage="http://www.denx.de/wiki/U-Boot/WebHome" distfiles="ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2" checksum=45813e6565dcc0436abe6752624324cdbf5f3ac106570d76d32b46ec529bcdc8 -patch_args=-Np0 archs="armv7l*" diff --git a/srcpkgs/cuetools/patches/unicode.diff b/srcpkgs/cuetools/patches/unicode.diff index e5d15e2f60..22830e519d 100644 --- a/srcpkgs/cuetools/patches/unicode.diff +++ b/srcpkgs/cuetools/patches/unicode.diff @@ -1,5 +1,5 @@ ---- src/lib/cue_scan.l -+++ src/lib/cue_scan.l +--- a/src/lib/cue_scan.l ++++ b/src/lib/cue_scan.l @@ -18,6 +18,20 @@ int cue_lineno = 1; ws [ \t\r] nonws [^ \t\r\n] diff --git a/srcpkgs/cuetools/template b/srcpkgs/cuetools/template index 8eb6785e68..7e039c051c 100644 --- a/srcpkgs/cuetools/template +++ b/srcpkgs/cuetools/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/svend/cuetools" distfiles="https://github.com/svend/${pkgname}/archive/${version}.tar.gz" checksum=24a2420f100c69a6539a9feeb4130d19532f9f8a0428a8b9b289c6da761eb107 -patch_args=-Np0 pre_configure() { aclocal diff --git a/srcpkgs/cups-pdf/patches/print-to-home.patch b/srcpkgs/cups-pdf/patches/print-to-home.patch index 9d1cd4e737..9386e6d1b2 100644 --- a/srcpkgs/cups-pdf/patches/print-to-home.patch +++ b/srcpkgs/cups-pdf/patches/print-to-home.patch @@ -1,7 +1,7 @@ # reason: print to $HOME by default ---- extra/cups-pdf.conf -+++ extra/cups-pdf.conf +--- a/extra/cups-pdf.conf ++++ b/extra/cups-pdf.conf @@ -42,17 +42,17 @@ ### Key: Out (config) ## CUPS-PDF output directory diff --git a/srcpkgs/cups-pdf/template b/srcpkgs/cups-pdf/template index b8339fc1bf..897437df77 100644 --- a/srcpkgs/cups-pdf/template +++ b/srcpkgs/cups-pdf/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="https://www.cups-pdf.de/" distfiles="https://www.cups-pdf.de/src/${pkgname}_${version}.tar.gz" checksum=738669edff7f1469fe5e411202d87f93ba25b45f332a623fb607d49c59aa9531 -patch_args=-Np0 do_build() { $CC $CFLAGS -o $pkgname src/cups-pdf.c -lcups ${LDFLAGS} diff --git a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch b/srcpkgs/cups/patches/cups-no-export-ssllibs.patch index 0a5a80f043..bf618ce330 100644 --- a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch +++ b/srcpkgs/cups/patches/cups-no-export-ssllibs.patch @@ -1,5 +1,5 @@ ---- config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200 -+++ config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200 +--- a/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200 ++++ b/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200 @@ -180,7 +180,7 @@ AC_SUBST(SSLFLAGS) AC_SUBST(SSLLIBS) diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 9520c2240a..66204733fa 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -17,7 +17,6 @@ license="Apache-2.0" homepage="https://github.com/OpenPrinting/cups" distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz" checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df -patch_args=-Np0 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd" make_dirs=" diff --git a/srcpkgs/cura-engine/patches/fix-cflags.patch b/srcpkgs/cura-engine/patches/fix-cflags.patch index e48a665523..e3dda634dc 100644 --- a/srcpkgs/cura-engine/patches/fix-cflags.patch +++ b/srcpkgs/cura-engine/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -42,7 +42,7 @@ endif() if(CMAKE_BUILD_TYPE_UPPER MATCHES "DEBUG") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG_INIT}") diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template index adb5f59e0a..e138e37605 100644 --- a/srcpkgs/cura-engine/template +++ b/srcpkgs/cura-engine/template @@ -14,7 +14,6 @@ license="AGPL-3.0-or-later" homepage="https://github.com/Ultimaker/CuraEngine" distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz" checksum=7e1e408f269a604418f37575ba8ef5f69323bebc4dd7f3091c1c2e9b000ffcbf -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-create-fix.patch b/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-create-fix.patch index 5f071a38d3..b57365443e 100644 --- a/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-create-fix.patch +++ b/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-create-fix.patch @@ -1,5 +1,5 @@ ---- ftpfs.c 2013-05-12 14:31:57.000000000 +0400 -+++ ftpfs.c 2013-05-12 14:29:00.906721322 +0400 +--- a/ftpfs.c 2013-05-12 14:31:57.000000000 +0400 ++++ b/ftpfs.c 2013-05-12 14:29:00.906721322 +0400 @@ -759,13 +759,13 @@ err = -ENOTSUP; } diff --git a/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-memleak#591298.patch b/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-memleak#591298.patch index bc995aed60..cd6ace244c 100644 --- a/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-memleak#591298.patch +++ b/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-memleak#591298.patch @@ -1,5 +1,5 @@ ---- ftpfs.c -+++ ftpfs.c +--- a/ftpfs.c ++++ b/ftpfs.c @@ -615,6 +615,8 @@ static void free_ftpfs_file(struct ftpfs sem_destroy(&fh->data_need); sem_destroy(&fh->data_written); diff --git a/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-memleak-cached#591299.patch b/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-memleak-cached#591299.patch index fc7d8fcc80..c1f18f8635 100644 --- a/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-memleak-cached#591299.patch +++ b/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-memleak-cached#591299.patch @@ -1,5 +1,5 @@ ---- cache.c -+++ cache.c +--- a/cache.c ++++ b/cache.c @@ -25,7 +25,7 @@ struct cache { time_t last_cleaned; }; @@ -9,8 +9,8 @@ struct node { struct stat stat; ---- ftpfs-ls.c -+++ ftpfs-ls.c +--- a/ftpfs-ls.c ++++ b/ftpfs-ls.c @@ -25,6 +25,13 @@ #include "charset_utils.h" #include "ftpfs-ls.h" diff --git a/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-offset_64_another.patch b/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-offset_64_another.patch index 940ddb0191..b762214f1d 100644 --- a/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-offset_64_another.patch +++ b/srcpkgs/curlftpfs/patches/curlftpfs-0.9.2-offset_64_another.patch @@ -1,5 +1,5 @@ ---- ftpfs.c -+++ ftpfs.c +--- a/ftpfs.c ++++ b/ftpfs.c @@ -503,7 +503,6 @@ static void *ftpfs_write_thread(void *da curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path); diff --git a/srcpkgs/curlftpfs/patches/fix-musl.patch b/srcpkgs/curlftpfs/patches/fix-musl.patch index f853b4b299..61263e4c86 100644 --- a/srcpkgs/curlftpfs/patches/fix-musl.patch +++ b/srcpkgs/curlftpfs/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- ftpfs.c.orig 2019-03-21 19:21:55.591218591 +0100 -+++ ftpfs.c 2019-03-21 19:22:10.270696908 +0100 +--- a/ftpfs.c 2019-03-21 19:21:55.591218591 +0100 ++++ b/ftpfs.c 2019-03-21 19:22:10.270696908 +0100 @@ -687,7 +687,7 @@ static int test_exists(const char* path) return ftpfs_getattr(path, &sbuf); } diff --git a/srcpkgs/curlftpfs/template b/srcpkgs/curlftpfs/template index aaabe20184..c1f06571aa 100644 --- a/srcpkgs/curlftpfs/template +++ b/srcpkgs/curlftpfs/template @@ -11,4 +11,3 @@ homepage="http://curlftpfs.sourceforge.net/" license="GPL-2" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958 -patch_args=-Np0 diff --git a/srcpkgs/cutecom/patches/QPainterPath.patch b/srcpkgs/cutecom/patches/QPainterPath.patch index 046b62dda0..0f9fb9548b 100644 --- a/srcpkgs/cutecom/patches/QPainterPath.patch +++ b/srcpkgs/cutecom/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- ctrlcharacterspopup.cpp 2018-09-01 13:46:58.000000000 +0200 -+++ ctrlcharacterspopup.cpp 2020-08-31 18:56:06.795380165 +0200 +--- a/ctrlcharacterspopup.cpp 2018-09-01 13:46:58.000000000 +0200 ++++ b/ctrlcharacterspopup.cpp 2020-08-31 18:56:06.795380165 +0200 @@ -23,6 +23,7 @@ #include #include diff --git a/srcpkgs/cutecom/template b/srcpkgs/cutecom/template index e5cd27e3ea..4aad5728d3 100644 --- a/srcpkgs/cutecom/template +++ b/srcpkgs/cutecom/template @@ -12,4 +12,3 @@ license="GPL-3.0-only" homepage="https://gitlab.com/cutecom/cutecom/" distfiles="https://gitlab.com/cutecom/cutecom/-/archive/v${version}/cutecom-v${version}.tar.gz" checksum=4b2591daa983b31716091bd1602988b5a06a19c1a3402150826fc36233edbedd -patch_args=-Np0 diff --git a/srcpkgs/cutemarked/patches/QAction.patch b/srcpkgs/cutemarked/patches/QAction.patch index abed5ad1d4..c2fb7bef10 100644 --- a/srcpkgs/cutemarked/patches/QAction.patch +++ b/srcpkgs/cutemarked/patches/QAction.patch @@ -1,5 +1,5 @@ ---- app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200 -+++ - 2019-07-02 18:59:36.832374065 +0200 +--- a/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200 ++++ b/app/optionsdialog.cpp 2016-03-28 13:48:50.000000000 +0200 @@ -17,6 +17,7 @@ #include "optionsdialog.h" #include "ui_optionsdialog.h" diff --git a/srcpkgs/cutemarked/template b/srcpkgs/cutemarked/template index ddf409fb9a..39f15d81ea 100644 --- a/srcpkgs/cutemarked/template +++ b/srcpkgs/cutemarked/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="http://cloose.github.io/CuteMarkEd/" distfiles="https://github.com/cloose/${pkgname}/archive/v${version}.tar.gz" checksum=78a41808c2f0452375810abdff76eeaaee012f8d1368a2b8772ec6b4d2ceeec8 -patch_args=-Np0 pre_build() { lrelease app/app.pro diff --git a/srcpkgs/cvs/patches/ssh.patch b/srcpkgs/cvs/patches/ssh.patch index 21688953a5..193bbc2171 100644 --- a/srcpkgs/cvs/patches/ssh.patch +++ b/srcpkgs/cvs/patches/ssh.patch @@ -1,7 +1,7 @@ Fix for CVE-2017-12836, extracted from MirBSD repository. ---- src/rsh-client.c 2017/03/26 15:54:10 1.6 -+++ src/rsh-client.c 2017/08/11 20:41:40 1.7 +--- a/src/rsh-client.c 2017/03/26 15:54:10 1.6 ++++ b/src/rsh-client.c 2017/08/11 20:41:40 1.7 @@ -107,6 +108,9 @@ start_rsh_server (cvsroot_t *root, struc rsh_argv[i++] = argvport; } diff --git a/srcpkgs/cvs/patches/vasnprintf.diff b/srcpkgs/cvs/patches/vasnprintf.diff index f6647177a8..dd44ca3400 100644 --- a/srcpkgs/cvs/patches/vasnprintf.diff +++ b/srcpkgs/cvs/patches/vasnprintf.diff @@ -1,5 +1,5 @@ ---- lib/vasnprintf.c.orig 2015-05-16 16:57:13.712246576 +0200 -+++ lib/vasnprintf.c 2015-05-16 16:57:38.471145720 +0200 +--- a/lib/vasnprintf.c 2015-05-16 16:57:13.712246576 +0200 ++++ b/lib/vasnprintf.c 2015-05-16 16:57:38.471145720 +0200 @@ -557,13 +557,7 @@ break; } diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template index 25d4446d64..c37384b543 100644 --- a/srcpkgs/cvs/template +++ b/srcpkgs/cvs/template @@ -14,4 +14,3 @@ homepage="http://www.nongnu.org/cvs/" license="GPL-1, LGPL-2" distfiles="http://ftp.gnu.org/non-gnu/cvs/source/feature/$version/cvs-$version.tar.bz2" checksum=78853613b9a6873a30e1cc2417f738c330e75f887afdaf7b3d0800cb19ca515e -patch_args=-Np0 diff --git a/srcpkgs/cvsps2/patches/inet_addr-64bit.patch b/srcpkgs/cvsps2/patches/inet_addr-64bit.patch index c064941690..0073e33f4b 100644 --- a/srcpkgs/cvsps2/patches/inet_addr-64bit.patch +++ b/srcpkgs/cvsps2/patches/inet_addr-64bit.patch @@ -1,6 +1,6 @@ Use INADDR_NONE instead of -1 to check inet_addr() result ---- cbtcommon/tcpsocket.c.1 2013-04-14 13:21:14.848464155 +0400 -+++ cbtcommon/tcpsocket.c 2013-04-14 13:23:23.015136709 +0400 +--- a/cbtcommon/tcpsocket.c.1 2013-04-14 13:21:14.848464155 +0400 ++++ b/cbtcommon/tcpsocket.c 2013-04-14 13:23:23.015136709 +0400 @@ -198,7 +198,7 @@ memcpy(dest, &ip.s_addr, sizeof(ip.s_addr)); } diff --git a/srcpkgs/cvsps2/template b/srcpkgs/cvsps2/template index b80618d321..1bf720a777 100644 --- a/srcpkgs/cvsps2/template +++ b/srcpkgs/cvsps2/template @@ -11,7 +11,6 @@ license="GPL-2.0-only" homepage="http://cvsps.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/cvsps/cvsps-${version}.tar.gz" checksum=91d3198b33463861a581686d5fcf99a5c484e7c4d819384c04fda9cafec1075a -patch_args=-Np0 post_extract() { sed -i 's/linux/__GLIBC__/g' cbtcommon/text_util.c