From be5369a0cb2b31896cc8f42b161606674068548a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 19 Jun 2021 10:03:21 +0700 Subject: [PATCH] srcpkgs/f*: convert patches to -Np1 * fpc is kept at -Np0 ```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ``` --- srcpkgs/faad2/patches/fix-stack_usage.patch | 8 +- srcpkgs/faad2/template | 1 - srcpkgs/fake-hwclock/patches/manpage.patch | 4 +- srcpkgs/fake-hwclock/template | 1 - .../cross-dont-run-sysv-ipc-test.patch | 4 +- srcpkgs/fakeroot/patches/fakeroot-no64.patch | 4 +- .../fakeroot/patches/fakeroot-stdint.patch | 4 +- srcpkgs/fakeroot/template | 1 - srcpkgs/falkon/patches/musl-execinfo.patch | 4 +- srcpkgs/falkon/patches/qt-5.15-fix.patch | 4 +- .../patches/verticaltabsplugin-qfile.patch | 4 +- srcpkgs/falkon/template | 1 - .../patches/fix-gst-glib-gen_mak.patch | 4 +- srcpkgs/farstream/template | 1 - srcpkgs/fastd/patches/fix-segfault.patch | 4 +- srcpkgs/fastd/template | 1 - ...001-Properly-zero-terminate-filename.patch | 4 +- .../0002-Fix-write-return-value-check.patch | 4 +- srcpkgs/fastjar/patches/CVE-2010-2322.patch | 4 +- srcpkgs/fastjar/template | 1 - .../faust/patches/faust-musl-stacktrace.patch | 4 +- .../faust-voidlinux-lib_and_arch_paths.patch | 4 +- srcpkgs/faust/template | 1 - srcpkgs/fbida/patches/ida-desktop.patch | 4 +- srcpkgs/fbida/template | 1 - srcpkgs/fbreader/patches/arm.patch | 4 +- srcpkgs/fbreader/patches/cross.patch | 4 +- srcpkgs/fbreader/patches/narrowing.patch | 4 +- srcpkgs/fbreader/patches/qt5.patch | 112 +++++++++--------- srcpkgs/fbreader/template | 1 - .../fbterm/patches/fix-gcc6-narrowing.patch | 4 +- srcpkgs/fbterm/patches/fix-musl.patch | 20 ++-- srcpkgs/fbterm/template | 1 - srcpkgs/fbv/patches/giflib-5.1.patch | 4 +- srcpkgs/fbv/patches/libpng-1.5.13.patch | 4 +- srcpkgs/fbv/template | 1 - srcpkgs/fbxkb/patches/fbxkb.patch | 8 +- srcpkgs/fbxkb/template | 1 - srcpkgs/fceux/patches/isascii-musl.patch | 4 +- srcpkgs/fceux/template | 1 - srcpkgs/fcitx-anthy/patches/musl.patch | 4 +- srcpkgs/fcitx-anthy/template | 1 - srcpkgs/fcron/patches/fcron.patch | 8 +- srcpkgs/fcron/patches/force-pam.patch | 4 +- srcpkgs/fcron/template | 1 - srcpkgs/ferm/patches/mod_makefile.patch | 4 +- srcpkgs/ferm/template | 1 - ...070d9b092d3a354a6963c65197054ddf7a75.patch | 4 +- ...8cca6e51db0f19928c12d0348deaa17137b3.patch | 8 +- .../patches/armv5tel-floating-point.patch | 4 +- .../workaround-mesa-readeon-vaapi-bug.patch | 4 +- srcpkgs/ffmpeg/template | 1 - srcpkgs/fifengine/patches/swig.patch | 4 +- srcpkgs/fifengine/template | 1 - srcpkgs/fig2dev/patches/CVE-2019-19555.patch | 4 +- srcpkgs/fig2dev/template | 1 - srcpkgs/filelight/patches/musl.patch | 8 +- srcpkgs/filelight/template | 1 - srcpkgs/filezilla/patches/cross.patch | 4 +- .../patches/missing-list-include.patch | 4 +- srcpkgs/filezilla/template | 1 - .../patches/fix-udev-paths.patch | 8 +- .../patches/fix-udev-rules-groups.patch | 4 +- srcpkgs/fingerprint-gui/patches/musl.patch | 4 +- srcpkgs/fingerprint-gui/patches/time64.patch | 4 +- srcpkgs/fingerprint-gui/template | 1 - .../patches/big-endian-image-decoders.patch | 16 +-- .../patches/fix-arm-opus-include.patch | 4 +- srcpkgs/firefox-esr/patches/fix-cross.patch | 4 +- .../patches/fix-desktop-icon-path.patch | 4 +- .../patches/fix-fortify-inline.patch | 4 +- .../patches/fix-i686-ppc-musl.patch | 4 +- .../patches/fix-image-format-warning.patch | 4 +- srcpkgs/firefox-esr/patches/fix-tools.patch | 4 +- .../firefox-esr/patches/fix-wasm-arm.patch | 4 +- .../patches/fix-webrtc-glibcisms.patch | 4 +- .../firefox-esr/patches/flac-no-ffvpx.patch | 4 +- srcpkgs/firefox-esr/patches/mallinfo.patch | 4 +- .../patches/musl-rust.configure.patch | 4 +- .../firefox-esr/patches/ppc32-fix-build.patch | 4 +- .../firefox-esr/patches/rust-configure.patch | 4 +- .../firefox-esr/patches/rust-has-i128.patch | 4 +- .../firefox-esr/patches/sandbox-fork.patch | 4 +- .../patches/sandbox-largefile.patch | 4 +- srcpkgs/firefox-esr/patches/skia-sucks1.patch | 12 +- srcpkgs/firefox-esr/patches/skia-sucks2.patch | 8 +- srcpkgs/firefox-esr/patches/skia-sucks3.patch | 8 +- srcpkgs/firefox-esr/patches/sndio.patch | 12 +- srcpkgs/firefox-esr/template | 1 - .../firefox/patches/avoid-redefinition.patch | 4 +- .../patches/big-endian-image-decoders.patch | 16 +-- .../patches/fix-arm-opus-include.patch | 4 +- .../patches/fix-desktop-icon-path.patch | 4 +- .../firefox/patches/fix-i686-ppc-musl.patch | 4 +- .../patches/fix-image-format-warning.patch | 4 +- srcpkgs/firefox/patches/fix-tools.patch | 4 +- srcpkgs/firefox/patches/fix-wasm-arm.patch | 4 +- .../patches/fix-webrtc-glibcisms.patch | 4 +- srcpkgs/firefox/patches/flac-no-ffvpx.patch | 4 +- srcpkgs/firefox/patches/mallinfo.patch | 4 +- srcpkgs/firefox/patches/ppc32-fix-build.patch | 4 +- srcpkgs/firefox/patches/rust-configure.patch | 4 +- srcpkgs/firefox/patches/sandbox-fork.patch | 4 +- .../firefox/patches/sandbox-largefile.patch | 4 +- srcpkgs/firefox/patches/skia-sucks1.patch | 12 +- srcpkgs/firefox/patches/skia-sucks2.patch | 8 +- srcpkgs/firefox/patches/skia-sucks3.patch | 8 +- srcpkgs/firefox/patches/sndio.patch | 12 +- srcpkgs/firefox/template | 1 - srcpkgs/firejail/patches/musl.patch | 4 +- srcpkgs/firejail/template | 1 - .../patches/fix-temp-failure-retry.patch | 2 +- srcpkgs/flatpak-builder/template | 1 - srcpkgs/flatpak/patches/musl-macros.patch | 4 +- srcpkgs/flatpak/template | 1 - srcpkgs/flex/patches/disable-tests.patch | 4 +- srcpkgs/flex/patches/no-help2man.patch | 4 +- srcpkgs/flex/template | 1 - srcpkgs/flightgear/patches/musl-fenv.patch | 4 +- .../flightgear/patches/musl-fix_error_h.patch | 4 +- .../patches/musl-fix_feenableexcept.patch | 4 +- .../flightgear/patches/musl-fix_fpos_t.patch | 4 +- srcpkgs/flightgear/patches/time64.patch | 4 +- srcpkgs/flightgear/template | 1 - .../flowcanvas/patches/graphviz-2.30.patch | 8 +- srcpkgs/flowcanvas/template | 1 - srcpkgs/foobillard++/patches/data-dir.patch | 4 +- srcpkgs/foobillard++/template | 1 - .../patch-foomatic-getpjloptions.in.diff | 4 +- srcpkgs/foomatic-db-engine/template | 1 - .../foremost-1.4-config-location.patch | 4 +- srcpkgs/foremost/template | 1 - srcpkgs/fossil/patches/cross.patch | 4 +- srcpkgs/fossil/template | 1 - srcpkgs/fotoxx/patches/execinfo.patch | 4 +- srcpkgs/fotoxx/patches/musl_build.patch | 4 +- srcpkgs/fotoxx/template | 1 - .../patches/ftbfs-libfprint-080.patch | 4 +- srcpkgs/fprint_demo/template | 1 - .../patches/fix-gcc6-uninitialized.patch | 4 +- srcpkgs/frame/template | 1 - srcpkgs/freecad/patches/002-execinfo.patch | 4 +- .../patches/010-salomesmesh-execinfo.patch | 4 +- srcpkgs/freecad/patches/150-vtk9.patch | 52 ++++---- srcpkgs/freecad/patches/152-cmake-vtk9.patch | 4 +- srcpkgs/freecad/template | 1 - srcpkgs/freeciv/patches/QPainterPath.patch | 8 +- srcpkgs/freeciv/template | 1 - .../patches/patch-SDL_rotozoom.c.diff | 4 +- .../patches/patch-configure.ac.diff | 4 +- srcpkgs/freedroidClassic/template | 1 - .../freeimage/patches/disable_arm_neon.patch | 4 +- .../freeimage/patches/ftbfs-big-endian.patch | 8 +- srcpkgs/freeimage/template | 1 - .../patches/fix-build-musl-non-x86.patch | 4 +- .../fix-build-with-C99-compilers.patch | 8 +- srcpkgs/freeipmi/template | 1 - srcpkgs/freeorion/patches/fix-cflags.patch | 4 +- srcpkgs/freeorion/template | 1 - srcpkgs/freeplane/patches/remove_mac.patch | 4 +- srcpkgs/freeplane/template | 1 - srcpkgs/freetds/patches/fix-tsql.patch | 4 +- srcpkgs/freetds/patches/musl-fisql.patch | 4 +- srcpkgs/freetds/template | 1 - .../patches/enable-subpixel-rendering.patch | 4 +- srcpkgs/freetype/template | 1 - .../patches/addvoidpepper.patch | 4 +- .../freshplayerplugin/patches/ffmpeg4.patch | 4 +- srcpkgs/freshplayerplugin/template | 1 - srcpkgs/fs-utils/patches/fix-sysctl_h.patch | 24 ++-- srcpkgs/fs-utils/template | 1 - srcpkgs/fuse-emulator/patches/be.patch | 4 +- srcpkgs/fuse-emulator/template | 1 - srcpkgs/fuse/patches/aarch64.patch | 4 +- srcpkgs/fuse/patches/fuse-headers.patch | 4 +- srcpkgs/fuse/patches/fusermount.patch | 4 +- srcpkgs/fuse/template | 1 - 177 files changed, 403 insertions(+), 454 deletions(-) diff --git a/srcpkgs/faad2/patches/fix-stack_usage.patch b/srcpkgs/faad2/patches/fix-stack_usage.patch index 1ed6b226db1..55858f367b9 100644 --- a/srcpkgs/faad2/patches/fix-stack_usage.patch +++ b/srcpkgs/faad2/patches/fix-stack_usage.patch @@ -3,8 +3,8 @@ firefox and icecat in the function ps_decode(), this is a try to reduce the stack footprint of faad2 decoding by making the main arrays X_left[][] and X_right[][] use static __thread storage. ---- libfaad/sbr_dec.c 2009-01-26 23:32:31.000000000 +0100 -+++ libfaad/sbr_dec.c 2015-09-11 12:44:28.305989011 +0200 +--- a/libfaad/sbr_dec.c 2009-01-26 23:32:31.000000000 +0100 ++++ b/libfaad/sbr_dec.c 2015-09-11 12:44:28.305989011 +0200 @@ -602,8 +602,12 @@ uint8_t l, k; uint8_t dont_process = 0; @@ -20,8 +20,8 @@ main arrays X_left[][] and X_right[][] use static __thread storage. if (sbr == NULL) return 20; ---- libfaad/ps_dec.c 2009-01-26 23:32:31.000000000 +0100 -+++ libfaad/ps_dec.c 2015-09-11 13:02:37.898985783 +0200 +--- a/libfaad/ps_dec.c 2009-01-26 23:32:31.000000000 +0100 ++++ b/libfaad/ps_dec.c 2015-09-11 13:02:37.898985783 +0200 @@ -1039,10 +1039,10 @@ const complex_t *Phi_Fract_SubQmf; uint8_t temp_delay_ser[NO_ALLPASS_LINKS]; diff --git a/srcpkgs/faad2/template b/srcpkgs/faad2/template index e2e9b2ff124..33158709e65 100644 --- a/srcpkgs/faad2/template +++ b/srcpkgs/faad2/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://www.audiocoding.com/" distfiles="https://github.com/knik0/faad2/archive/${version//./_}.tar.gz" checksum=0c6d9636c96f95c7d736f097d418829ced8ec6dbd899cc6cc82b728480a84bfb -patch_args=-Np0 pre_configure() { autoreconf -vfi diff --git a/srcpkgs/fake-hwclock/patches/manpage.patch b/srcpkgs/fake-hwclock/patches/manpage.patch index f404d6ffc4a..082ab32dd01 100644 --- a/srcpkgs/fake-hwclock/patches/manpage.patch +++ b/srcpkgs/fake-hwclock/patches/manpage.patch @@ -1,5 +1,5 @@ ---- o.fake-hwclock.8 2019-10-03 01:19:44.542744670 -0400 -+++ fake-hwclock.8 2019-10-03 01:21:03.241032055 -0400 +--- a/o.fake-hwclock.8 2019-10-03 01:19:44.542744670 -0400 ++++ b/fake-hwclock.8 2019-10-03 01:21:03.241032055 -0400 @@ -1,4 +1,4 @@ -.TH FAKE-HWCLOCK 8 "1 October 2014" Debian +.TH FAKE-HWCLOCK 8 "4 October 2019" Linux diff --git a/srcpkgs/fake-hwclock/template b/srcpkgs/fake-hwclock/template index 0a90feae5d2..5e69b6e020e 100644 --- a/srcpkgs/fake-hwclock/template +++ b/srcpkgs/fake-hwclock/template @@ -9,7 +9,6 @@ license="GPL-2.0-only" homepage="https://tracker.debian.org/pkg/fake-hwclock" distfiles="${DEBIAN_SITE}/main/f/${pkgname}/${pkgname}_${version}.tar.xz" checksum=02a825f7460ab06b370c203250606c67b0effffa1645a4a4f7ff3928eec4957e -patch_args=-Np0 conf_files="/etc/default/fake-hwclock" diff --git a/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch b/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch index d878145e5fd..e8774f898ae 100644 --- a/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch +++ b/srcpkgs/fakeroot/patches/cross-dont-run-sysv-ipc-test.patch @@ -25,8 +25,8 @@ Signed-off-by: Matthew Weber diff --git a/configure.ac b/configure.ac index 73415d2..ddde5c9 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -25,42 +25,6 @@ AC_CACHE_CHECK([which IPC method to use], [ac_cv_use_ipc], [ac_cv_use_ipc=sysv]) diff --git a/srcpkgs/fakeroot/patches/fakeroot-no64.patch b/srcpkgs/fakeroot/patches/fakeroot-no64.patch index 03f70ef4509..ff95f96a9bf 100644 --- a/srcpkgs/fakeroot/patches/fakeroot-no64.patch +++ b/srcpkgs/fakeroot/patches/fakeroot-no64.patch @@ -1,5 +1,5 @@ ---- libfakeroot.c.orig -+++ libfakeroot.c +--- a/libfakeroot.c ++++ b/libfakeroot.c @@ -81,12 +81,14 @@ #define SEND_STAT64(a,b,c) send_stat64(a,b,c) #define SEND_GET_STAT(a,b) send_get_stat(a,b) diff --git a/srcpkgs/fakeroot/patches/fakeroot-stdint.patch b/srcpkgs/fakeroot/patches/fakeroot-stdint.patch index fa4abbd35a0..efe227d0386 100644 --- a/srcpkgs/fakeroot/patches/fakeroot-stdint.patch +++ b/srcpkgs/fakeroot/patches/fakeroot-stdint.patch @@ -1,5 +1,5 @@ ---- faked.c.orig -+++ faked.c +--- a/faked.c ++++ b/faked.c @@ -514,11 +514,11 @@ #ifdef FAKEROOT_DB_PATH diff --git a/srcpkgs/fakeroot/template b/srcpkgs/fakeroot/template index cae58c1efc5..f9d2cf9bb08 100644 --- a/srcpkgs/fakeroot/template +++ b/srcpkgs/fakeroot/template @@ -13,7 +13,6 @@ license="GPL-3.0-or-later" homepage="https://salsa.debian.org/clint/fakeroot" distfiles="${DEBIAN_SITE}/main/f/fakeroot/${pkgname}_${version}.orig.tar.gz" checksum=8e903683357f7f5bcc31b879fd743391ad47691d4be33d24a76be3b6c21e956c -patch_args=-Np0 lib32disabled=yes diff --git a/srcpkgs/falkon/patches/musl-execinfo.patch b/srcpkgs/falkon/patches/musl-execinfo.patch index 28c02657e9e..237902eae0b 100644 --- a/srcpkgs/falkon/patches/musl-execinfo.patch +++ b/srcpkgs/falkon/patches/musl-execinfo.patch @@ -1,5 +1,5 @@ ---- src/main/main.cpp 2018-03-09 14:27:10.849179401 +0100 -+++ src/main/main.cpp 2018-03-09 14:27:44.623709876 +0100 +--- a/src/main/main.cpp 2018-03-09 14:27:10.849179401 +0100 ++++ b/src/main/main.cpp 2018-03-09 14:27:44.623709876 +0100 @@ -22,7 +22,7 @@ #include // For QT_REQUIRE_VERSION #include diff --git a/srcpkgs/falkon/patches/qt-5.15-fix.patch b/srcpkgs/falkon/patches/qt-5.15-fix.patch index b9185ae63b2..19f9ac81b97 100644 --- a/srcpkgs/falkon/patches/qt-5.15-fix.patch +++ b/srcpkgs/falkon/patches/qt-5.15-fix.patch @@ -1,5 +1,5 @@ ---- src/lib/tools/qztools.cpp 2019-03-19 19:06:45.000000000 +0100 -+++ src/lib/tools/qztools.cpp 2020-06-25 09:14:08.074700925 +0200 +--- a/src/lib/tools/qztools.cpp 2019-03-19 19:06:45.000000000 +0100 ++++ b/src/lib/tools/qztools.cpp 2020-06-25 09:14:08.074700925 +0200 @@ -25,6 +25,7 @@ #include #include diff --git a/srcpkgs/falkon/patches/verticaltabsplugin-qfile.patch b/srcpkgs/falkon/patches/verticaltabsplugin-qfile.patch index f800bb85852..6b4d2813d48 100644 --- a/srcpkgs/falkon/patches/verticaltabsplugin-qfile.patch +++ b/srcpkgs/falkon/patches/verticaltabsplugin-qfile.patch @@ -1,5 +1,5 @@ ---- src/plugins/VerticalTabs/verticaltabsplugin.cpp 2019-03-19 19:06:45.000000000 +0100 -+++ src/plugins/VerticalTabs/verticaltabsplugin.cpp 2020-04-04 16:13:30.073076918 +0200 +--- a/src/plugins/VerticalTabs/verticaltabsplugin.cpp 2019-03-19 19:06:45.000000000 +0100 ++++ b/src/plugins/VerticalTabs/verticaltabsplugin.cpp 2020-04-04 16:13:30.073076918 +0200 @@ -30,6 +30,7 @@ #include "../config.h" #include "desktopfile.h" diff --git a/srcpkgs/falkon/template b/srcpkgs/falkon/template index 4727e1fb6cc..1a5eb3cd60b 100644 --- a/srcpkgs/falkon/template +++ b/srcpkgs/falkon/template @@ -16,7 +16,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/KDE/falkon" distfiles="${KDE_SITE}/falkon/${version%.*}/falkon-${version}.tar.xz" checksum=ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587 -patch_args=-Np0 LDFLAGS="-Wl,--no-fatal-warnings" diff --git a/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch b/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch index c928b013621..6a674cd9f95 100644 --- a/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch +++ b/srcpkgs/farstream/patches/fix-gst-glib-gen_mak.patch @@ -1,5 +1,5 @@ ---- common-modified/gst-glib-gen.mak 2014-09-03 04:47:25.000000000 +0200 -+++ common-modified/gst-glib-gen.mak 2020-01-27 14:47:28.704958877 +0100 +--- a/common-modified/gst-glib-gen.mak 2014-09-03 04:47:25.000000000 +0200 ++++ b/common-modified/gst-glib-gen.mak 2020-01-27 14:47:28.704958877 +0100 @@ -6,7 +6,7 @@ #glib_gen_prefix=gst_color_balance #glib_gen_basename=colorbalance diff --git a/srcpkgs/farstream/template b/srcpkgs/farstream/template index 470b3cb4f76..6162c2966a5 100644 --- a/srcpkgs/farstream/template +++ b/srcpkgs/farstream/template @@ -15,7 +15,6 @@ license="LGPL-2.1-or-later" homepage="http://www.freedesktop.org/wiki/Software/Farstream" distfiles="${FREEDESKTOP_SITE}/farstream/releases/$pkgname/$pkgname-$version.tar.gz" checksum=cb7d112433cf7c2e37a8ec918fb24f0ea5cb293cfa1002488e431de26482f47b -patch_args=-Np0 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/fastd/patches/fix-segfault.patch b/srcpkgs/fastd/patches/fix-segfault.patch index ebc1998636e..c39979831af 100644 --- a/srcpkgs/fastd/patches/fix-segfault.patch +++ b/srcpkgs/fastd/patches/fix-segfault.patch @@ -1,5 +1,5 @@ ---- src/crypto/mac/macs.c.in.orig 2015-01-29 06:41:45.000000000 +0100 -+++ src/crypto/mac/macs.c.in 2015-12-19 14:41:42.579958439 +0100 +--- a/src/crypto/mac/macs.c.in 2015-01-29 06:41:45.000000000 +0100 ++++ b/src/crypto/mac/macs.c.in 2015-12-19 14:41:42.579958439 +0100 @@ -67,7 +67,7 @@ static inline bool mac_available(const f void fastd_mac_init(void) { size_t i, j; diff --git a/srcpkgs/fastd/template b/srcpkgs/fastd/template index e03c1838342..d07de67b11d 100644 --- a/srcpkgs/fastd/template +++ b/srcpkgs/fastd/template @@ -17,7 +17,6 @@ conf_files=" /etc/fastd/fastd.conf" make_dirs="/etc/fastd/peers 755 root root" CFLAGS="-I$XBPS_CROSS_BASE/usr/include/sodium" -patch_args=-Np0 pre_configure() { # remove ssse3 requirement to support older AMD CPUs. diff --git a/srcpkgs/fastjar/patches/0001-Properly-zero-terminate-filename.patch b/srcpkgs/fastjar/patches/0001-Properly-zero-terminate-filename.patch index f1dcb7192dd..ed510b09df5 100644 --- a/srcpkgs/fastjar/patches/0001-Properly-zero-terminate-filename.patch +++ b/srcpkgs/fastjar/patches/0001-Properly-zero-terminate-filename.patch @@ -4,8 +4,8 @@ http://cvs.savannah.gnu.org/viewvc/fastjar/jartool.c?root=fastjar&r1=1.59&r2=1.6 * jartool.c (read_entries): Properly zero-terminate filename. ---- jartool.c 2009/09/06 22:16:00 1.59 -+++ jartool.c 2010/03/01 15:38:43 1.60 +--- a/jartool.c 2009/09/06 22:16:00 1.59 ++++ b/jartool.c 2010/03/01 15:38:43 1.60 @@ -790,6 +790,7 @@ progname, jarfile); return 1; diff --git a/srcpkgs/fastjar/patches/0002-Fix-write-return-value-check.patch b/srcpkgs/fastjar/patches/0002-Fix-write-return-value-check.patch index aa1607fd00a..e13f63eccad 100644 --- a/srcpkgs/fastjar/patches/0002-Fix-write-return-value-check.patch +++ b/srcpkgs/fastjar/patches/0002-Fix-write-return-value-check.patch @@ -4,8 +4,8 @@ http://cvs.savannah.gnu.org/viewvc/fastjar/jartool.c?root=fastjar&r1=1.60&r2=1.6 * jartool.c (add_file_to_jar): Fix write return value check. ---- jartool.c 2010/03/01 15:38:43 1.60 -+++ jartool.c 2010/06/10 08:46:10 1.61 +--- a/jartool.c 2010/03/01 15:38:43 1.60 ++++ b/jartool.c 2010/06/10 08:46:10 1.61 @@ -1258,7 +1258,7 @@ exit_on_error("write"); diff --git a/srcpkgs/fastjar/patches/CVE-2010-2322.patch b/srcpkgs/fastjar/patches/CVE-2010-2322.patch index a928fbfc776..d2a90329eb7 100644 --- a/srcpkgs/fastjar/patches/CVE-2010-2322.patch +++ b/srcpkgs/fastjar/patches/CVE-2010-2322.patch @@ -1,7 +1,7 @@ Index: fastjar-0.98/jartool.c =================================================================== ---- jartool.c 2010-05-19 14:54:57.367665309 +0200 -+++ jartool.c 2010-05-19 14:54:57.381665355 +0200 +--- a/jartool.c 2010-05-19 14:54:57.367665309 +0200 ++++ b/jartool.c 2010-05-19 14:54:57.381665355 +0200 @@ -1731,8 +1731,18 @@ struct stat sbuf; int depth = 0; diff --git a/srcpkgs/fastjar/template b/srcpkgs/fastjar/template index f3a6c5fb87c..6eab069f60e 100644 --- a/srcpkgs/fastjar/template +++ b/srcpkgs/fastjar/template @@ -10,4 +10,3 @@ license="GPL-2.0-or-later" homepage="http://savannah.nongnu.org/projects/fastjar" distfiles="http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${version}.tar.gz" checksum=f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145 -patch_args=-Np0 diff --git a/srcpkgs/faust/patches/faust-musl-stacktrace.patch b/srcpkgs/faust/patches/faust-musl-stacktrace.patch index efaeb8d09a2..5f976325fe5 100644 --- a/srcpkgs/faust/patches/faust-musl-stacktrace.patch +++ b/srcpkgs/faust/patches/faust-musl-stacktrace.patch @@ -1,5 +1,5 @@ ---- compiler/errors/errormsg.cpp-old 2019-12-22 19:47:17.694670614 +0100 -+++ compiler/errors/errormsg.cpp 2019-12-22 19:48:25.145673133 +0100 +--- a/compiler/errors/errormsg.cpp-old 2019-12-22 19:47:17.694670614 +0100 ++++ b/compiler/errors/errormsg.cpp 2019-12-22 19:48:25.145673133 +0100 @@ -43,9 +43,11 @@ gGlobal->printCompilationOptions(str); } diff --git a/srcpkgs/faust/patches/faust-voidlinux-lib_and_arch_paths.patch b/srcpkgs/faust/patches/faust-voidlinux-lib_and_arch_paths.patch index f1db586a2b9..761214ea0e9 100644 --- a/srcpkgs/faust/patches/faust-voidlinux-lib_and_arch_paths.patch +++ b/srcpkgs/faust/patches/faust-voidlinux-lib_and_arch_paths.patch @@ -1,5 +1,5 @@ ---- compiler/libcode.cpp-old 2019-12-22 19:50:13.663677186 +0100 -+++ compiler/libcode.cpp 2019-12-22 19:51:42.011680485 +0100 +--- a/compiler/libcode.cpp-old 2019-12-22 19:50:13.663677186 +0100 ++++ b/compiler/libcode.cpp 2019-12-22 19:51:42.011680485 +0100 @@ -733,11 +733,11 @@ } static void printArchDir() diff --git a/srcpkgs/faust/template b/srcpkgs/faust/template index bac06eafa81..03b44b2f258 100644 --- a/srcpkgs/faust/template +++ b/srcpkgs/faust/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://faust.grame.fr/" distfiles=https://github.com/grame-cncm/faust/releases/download/${version}/${pkgname}-${version}.tar.gz checksum="6cf64b8ee92c2db74d7d83d726b0ecb6f7e141deeadf4cd40c60e467893e0bfc" -patch_args=-Np0 # Android stuffs, used by the 'faust2android' script. nostrip_files="libsndfile.so " diff --git a/srcpkgs/fbida/patches/ida-desktop.patch b/srcpkgs/fbida/patches/ida-desktop.patch index 7ec234b23dd..aef1ce7bdab 100644 --- a/srcpkgs/fbida/patches/ida-desktop.patch +++ b/srcpkgs/fbida/patches/ida-desktop.patch @@ -1,5 +1,5 @@ ---- desktop/ida.desktop 2008-08-28 00:33:58.000000000 +0200 -+++ desktop/ida.desktop 2008-08-28 00:33:58.000000000 +0200 +--- a/desktop/ida.desktop 2008-08-28 00:33:58.000000000 +0200 ++++ b/desktop/ida.desktop 2008-08-28 00:33:58.000000000 +0200 @@ -1,9 +1,10 @@ [Desktop Entry] Type=Application diff --git a/srcpkgs/fbida/template b/srcpkgs/fbida/template index 46290f5cb5d..34763234373 100644 --- a/srcpkgs/fbida/template +++ b/srcpkgs/fbida/template @@ -18,7 +18,6 @@ checksum=95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438 depends="fbida-exiftran-${version}_${revision} fbida-fbi-${version}_${revision} fbida-fbpdf-${version}_${revision} $(vopt_if ida fbida-ida-${version}_${revision})" nocross="Requires cairo-gl.pc for the target which Void does not have" -patch_args=-Np0 build_options="ida" desc_option_ida="Build ida motif application (needs motif-devel)" diff --git a/srcpkgs/fbreader/patches/arm.patch b/srcpkgs/fbreader/patches/arm.patch index d2b4f8e83e4..ac0e42efacf 100644 --- a/srcpkgs/fbreader/patches/arm.patch +++ b/srcpkgs/fbreader/patches/arm.patch @@ -1,5 +1,5 @@ ---- zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp.orig 2018-03-17 07:35:31.000000000 +0000 -+++ zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2018-03-17 07:37:07.801751090 +0000 +--- a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2018-03-17 07:35:31.000000000 +0000 ++++ b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2018-03-17 07:37:07.801751090 +0000 @@ -86,7 +86,7 @@ } diff --git a/srcpkgs/fbreader/patches/cross.patch b/srcpkgs/fbreader/patches/cross.patch index ca8673883cf..737a040480f 100644 --- a/srcpkgs/fbreader/patches/cross.patch +++ b/srcpkgs/fbreader/patches/cross.patch @@ -1,7 +1,7 @@ diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk index f7f696f..e96ee33 100644 ---- makefiles/arch/desktop.mk -+++ makefiles/arch/desktop.mk +--- a/makefiles/arch/desktop.mk ++++ b/makefiles/arch/desktop.mk @@ -7,10 +7,8 @@ IMAGEDIR = $(INSTALLDIR)/share/pixmaps APPIMAGEDIR = $(INSTALLDIR)/share/pixmaps/%APPLICATION_NAME% diff --git a/srcpkgs/fbreader/patches/narrowing.patch b/srcpkgs/fbreader/patches/narrowing.patch index 51f7b9bcfe4..55aa79d64ac 100644 --- a/srcpkgs/fbreader/patches/narrowing.patch +++ b/srcpkgs/fbreader/patches/narrowing.patch @@ -1,7 +1,7 @@ diff --git a/fbreader/src/formats/doc/OleStorage.cpp b/fbreader/src/formats/doc/OleStorage.cpp index 016f9fd..a7ab81a 100644 ---- fbreader/src/formats/doc/OleStorage.cpp -+++ fbreader/src/formats/doc/OleStorage.cpp +--- a/fbreader/src/formats/doc/OleStorage.cpp ++++ b/fbreader/src/formats/doc/OleStorage.cpp @@ -59,7 +59,7 @@ bool OleStorage::init(shared_ptr stream, std::size_t streamSize) clear(); return false; diff --git a/srcpkgs/fbreader/patches/qt5.patch b/srcpkgs/fbreader/patches/qt5.patch index 91aee9bab95..76387e15937 100644 --- a/srcpkgs/fbreader/patches/qt5.patch +++ b/srcpkgs/fbreader/patches/qt5.patch @@ -1,7 +1,7 @@ diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk index 4267113..3b46102 100644 ---- makefiles/arch/desktop.mk -+++ makefiles/arch/desktop.mk +--- a/makefiles/arch/desktop.mk ++++ b/makefiles/arch/desktop.mk @@ -12,29 +12,11 @@ AR = ar rsu AR = ar rsu LD = g++ @@ -41,8 +41,8 @@ index 4267113..3b46102 100644 RM_QUIET = rm -rf diff --git a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp index 47067d3..119a5ee 100644 ---- zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp -+++ zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp +--- a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp ++++ b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp @@ -24,7 +24,9 @@ #include #include @@ -70,8 +70,8 @@ index 47067d3..119a5ee 100644 reply = const_cast(myManager).get(networkRequest); diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp index a3e5b35..ab41684 100644 ---- zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp -+++ zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp +--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp ++++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp @@ -17,14 +17,14 @@ * 02110-1301, USA. */ @@ -92,8 +92,8 @@ index a3e5b35..ab41684 100644 diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp index 472f05f..b9809c8 100644 ---- zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp -+++ zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp +--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp ++++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp @@ -17,10 +17,10 @@ * 02110-1301, USA. */ @@ -111,8 +111,8 @@ index 472f05f..b9809c8 100644 diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp index 1cddaf9..2b65cc1 100644 ---- zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp -+++ zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp +--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp ++++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp @@ -18,9 +18,9 @@ */ @@ -128,8 +128,8 @@ index 1cddaf9..2b65cc1 100644 #include diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp index 6de2c72..d942d47 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp -+++ zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp @@ -19,12 +19,12 @@ #include @@ -149,8 +149,8 @@ index 6de2c72..d942d47 100644 #include diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h index 4f09cfc..51f1545 100644 ---- zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h -+++ zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h +--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h ++++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h @@ -20,12 +20,12 @@ #ifndef __ZLQTITEMSLISTWIDGET_H__ #define __ZLQTITEMSLISTWIDGET_H__ @@ -172,8 +172,8 @@ index 4f09cfc..51f1545 100644 diff --git a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp index dfcbc0b..bd2689e 100644 ---- zlibrary/ui/src/qt4/application/LineEditParameter.cpp -+++ zlibrary/ui/src/qt4/application/LineEditParameter.cpp +--- a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp ++++ b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp @@ -17,9 +17,9 @@ * 02110-1301, USA. */ @@ -189,8 +189,8 @@ index dfcbc0b..bd2689e 100644 #include "ZLQtApplicationWindow.h" diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp index 6241514..e0b143b 100644 ---- zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp -+++ zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp +--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp ++++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp @@ -17,17 +17,17 @@ * 02110-1301, USA. */ @@ -218,8 +218,8 @@ index 6241514..e0b143b 100644 #include diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h index 3b4fd3a..42ff2c8 100644 ---- zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h -+++ zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h +--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h ++++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h @@ -22,8 +22,8 @@ #include @@ -233,8 +233,8 @@ index 3b4fd3a..42ff2c8 100644 class QDockWidget; diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp index 24eb897..c17e86c 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp -+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp @@ -17,8 +17,8 @@ * 02110-1301, USA. */ @@ -248,8 +248,8 @@ index 24eb897..c17e86c 100644 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h index 068039d..811cec8 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h -+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h @@ -20,8 +20,8 @@ #ifndef __ZLQTDIALOG_H__ #define __ZLQTDIALOG_H__ @@ -263,8 +263,8 @@ index 068039d..811cec8 100644 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp index e8ff422..352c350 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp -+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp @@ -17,10 +17,10 @@ * 02110-1301, USA. */ @@ -282,8 +282,8 @@ index e8ff422..352c350 100644 #include "ZLQtOptionView.h" diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp index d5eb4d4..2fc769b 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp -+++ zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp @@ -17,11 +17,11 @@ * 02110-1301, USA. */ @@ -302,8 +302,8 @@ index d5eb4d4..2fc769b 100644 #include "ZLQtDialog.h" diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp index ec9e73c..a50a40d 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp -+++ zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp @@ -17,7 +17,7 @@ * 02110-1301, USA. */ @@ -315,8 +315,8 @@ index ec9e73c..a50a40d 100644 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp index 48a1b8f..90d50fb 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp -+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp @@ -19,16 +19,16 @@ #include @@ -346,8 +346,8 @@ index 48a1b8f..90d50fb 100644 #include diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp index f6c36fb..7fe855a 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp -+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp @@ -17,11 +17,11 @@ * 02110-1301, USA. */ @@ -367,8 +367,8 @@ index f6c36fb..7fe855a 100644 #include diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h index e38b62a..ad26fba 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h -+++ zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h @@ -20,9 +20,9 @@ #ifndef __ZLQTOPTIONSDIALOG_H__ #define __ZLQTOPTIONSDIALOG_H__ @@ -384,8 +384,8 @@ index e38b62a..ad26fba 100644 diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp index 98e469e..5a1d574 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp -+++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp @@ -19,11 +19,11 @@ #include @@ -405,8 +405,8 @@ index 98e469e..5a1d574 100644 #include "../dialogs/ZLQtDialogManager.h" diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h index df6c73b..837bce5 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h -+++ zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h @@ -22,11 +22,11 @@ #include @@ -425,8 +425,8 @@ index df6c73b..837bce5 100644 #include diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h index 9cf7c47..03f1223 100644 ---- zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h -+++ zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h +--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h ++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h @@ -24,12 +24,12 @@ #include #include @@ -448,8 +448,8 @@ index 9cf7c47..03f1223 100644 diff --git a/zlibrary/ui/src/qt4/library/ZLQApplication.h b/zlibrary/ui/src/qt4/library/ZLQApplication.h index c08c536..a714fa9 100644 ---- zlibrary/ui/src/qt4/library/ZLQApplication.h -+++ zlibrary/ui/src/qt4/library/ZLQApplication.h +--- a/zlibrary/ui/src/qt4/library/ZLQApplication.h ++++ b/zlibrary/ui/src/qt4/library/ZLQApplication.h @@ -20,7 +20,7 @@ #ifndef __ZLQAPPLICATION_H__ #define __ZLQAPPLICATION_H__ @@ -461,8 +461,8 @@ index c08c536..a714fa9 100644 diff --git a/zlibrary/ui/src/qt4/library/ZLibrary.cpp b/zlibrary/ui/src/qt4/library/ZLibrary.cpp index 9648e95..a544031 100644 ---- zlibrary/ui/src/qt4/library/ZLibrary.cpp -+++ zlibrary/ui/src/qt4/library/ZLibrary.cpp +--- a/zlibrary/ui/src/qt4/library/ZLibrary.cpp ++++ b/zlibrary/ui/src/qt4/library/ZLibrary.cpp @@ -19,7 +19,7 @@ #include @@ -483,8 +483,8 @@ index 9648e95..a544031 100644 diff --git a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h index cdaef01..a259c65 100644 ---- zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h -+++ zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h +--- a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h ++++ b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h @@ -3,7 +3,7 @@ #include @@ -496,8 +496,8 @@ index cdaef01..a259c65 100644 class QtWaitingSpinner : public QWidget { diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h index 1b8ebcc..6f3b4e3 100644 ---- zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h -+++ zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h +--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h ++++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h @@ -20,11 +20,11 @@ #ifndef __ZLQTPREVIEWWIDGET_H__ #define __ZLQTPREVIEWWIDGET_H__ @@ -517,8 +517,8 @@ index 1b8ebcc..6f3b4e3 100644 #include diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h index f6e174c..c360965 100644 ---- zlibrary/ui/src/qt4/tree/ZLQtSearchField.h -+++ zlibrary/ui/src/qt4/tree/ZLQtSearchField.h +--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h ++++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h @@ -21,8 +21,8 @@ #define __ZLQTSEARCHFIELD_H__ @@ -532,8 +532,8 @@ index f6e174c..c360965 100644 #include "ZLQtItemsListWidget.h" diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp index 4f5d196..615050c 100644 ---- zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp -+++ zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp +--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp ++++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp @@ -19,8 +19,8 @@ #include @@ -563,8 +563,8 @@ index 4f5d196..615050c 100644 diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h index 6fabf00..ccec1e3 100644 ---- zlibrary/ui/src/qt4/view/ZLQtViewWidget.h -+++ zlibrary/ui/src/qt4/view/ZLQtViewWidget.h +--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h ++++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h @@ -20,7 +20,7 @@ #ifndef __ZLQTVIEWWIDGET_H__ #define __ZLQTVIEWWIDGET_H__ diff --git a/srcpkgs/fbreader/template b/srcpkgs/fbreader/template index 1dcbe6f1c55..0ffe6f5aeea 100644 --- a/srcpkgs/fbreader/template +++ b/srcpkgs/fbreader/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="http://www.fbreader.org/" distfiles="http://www.fbreader.org/files/desktop/${pkgname}-sources-${version}.tgz" checksum=3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9 -patch_args=-Np0 do_build() { sed -e "s:-llinebreak:-lunibreak:" -i makefiles/config.mk zlibrary/text/Makefile diff --git a/srcpkgs/fbterm/patches/fix-gcc6-narrowing.patch b/srcpkgs/fbterm/patches/fix-gcc6-narrowing.patch index 0646d6b3b13..df2f735774d 100644 --- a/srcpkgs/fbterm/patches/fix-gcc6-narrowing.patch +++ b/srcpkgs/fbterm/patches/fix-gcc6-narrowing.patch @@ -1,5 +1,5 @@ ---- src/lib/vterm_states.cpp 2015-05-09 08:36:45.000000000 +0200 -+++ src/lib/vterm_states.cpp 2016-10-26 14:21:02.409309316 +0200 +--- a/src/lib/vterm_states.cpp 2015-05-09 08:36:45.000000000 +0200 ++++ b/src/lib/vterm_states.cpp 2016-10-26 14:21:02.409309316 +0200 @@ -22,6 +22,7 @@ #include "vterm.h" diff --git a/srcpkgs/fbterm/patches/fix-musl.patch b/srcpkgs/fbterm/patches/fix-musl.patch index 982fcaa851b..9aa67fd5dc8 100644 --- a/srcpkgs/fbterm/patches/fix-musl.patch +++ b/srcpkgs/fbterm/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- src/improxy.cpp.orig 2015-09-03 21:53:02.344049550 +0200 -+++ src/improxy.cpp 2015-09-03 21:52:56.378049997 +0200 +--- a/src/improxy.cpp 2015-09-03 21:53:02.344049550 +0200 ++++ b/src/improxy.cpp 2015-09-03 21:52:56.378049997 +0200 @@ -24,6 +24,7 @@ #include #include @@ -8,8 +8,8 @@ #include "improxy.h" #include "immessage.h" #include "fbconfig.h" ---- src/signalfd.h.orig 2015-09-03 21:54:58.500040857 +0200 -+++ src/signalfd.h 2015-09-03 21:55:04.521040406 +0200 +--- a/src/signalfd.h 2015-09-03 21:54:58.500040857 +0200 ++++ b/src/signalfd.h 2015-09-03 21:55:04.521040406 +0200 @@ -20,6 +20,7 @@ #define _SYS_SIGNALFD_H 1 @@ -19,8 +19,8 @@ #include ---- src/fbterm.cpp.orig 2015-09-03 22:05:54.491985444 +0200 -+++ src/fbterm.cpp 2015-09-03 22:04:51.465990161 +0200 +--- a/src/fbterm.cpp 2015-09-03 22:05:54.491985444 +0200 ++++ b/src/fbterm.cpp 2015-09-03 22:04:51.465990161 +0200 @@ -23,6 +23,8 @@ #include #include @@ -39,8 +39,8 @@ if (pid > 0) { FbShellManager::instance()->childProcessExited(pid); } ---- src/mouse.cpp.orig 2015-09-03 22:00:12.119017385 +0200 -+++ src/mouse.cpp 2015-09-03 22:00:21.070016715 +0200 +--- a/src/mouse.cpp 2015-09-03 22:00:12.119017385 +0200 ++++ b/src/mouse.cpp 2015-09-03 22:00:21.070016715 +0200 @@ -26,6 +26,7 @@ DEFINE_INSTANCE(Mouse) #include @@ -49,8 +49,8 @@ #include #include #include ---- src/fbio.cpp.orig 2015-09-03 22:12:07.833957502 +0200 -+++ src/fbio.cpp 2015-09-03 22:11:50.633958789 +0200 +--- a/src/fbio.cpp 2015-09-03 22:12:07.833957502 +0200 ++++ b/src/fbio.cpp 2015-09-03 22:11:50.633958789 +0200 @@ -20,6 +20,7 @@ #include diff --git a/srcpkgs/fbterm/template b/srcpkgs/fbterm/template index 47a4ba3ff5b..f97ecc509dc 100644 --- a/srcpkgs/fbterm/template +++ b/srcpkgs/fbterm/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/izmntuk/fbterm" distfiles="https://github.com/izmntuk/${pkgname}/archive/v${version%.*}.tar.gz" checksum=68e9742b23d6f143d809a5930f5f22c7e55d7c14a4ab2c8a842e0b5c27b1f863 -patch_args=-Np0 post_configure() { sed -i "s,tic,& -o $DESTDIR/usr/share/terminfo," terminfo/Makefile diff --git a/srcpkgs/fbv/patches/giflib-5.1.patch b/srcpkgs/fbv/patches/giflib-5.1.patch index a7635c46495..fdb512d127e 100644 --- a/srcpkgs/fbv/patches/giflib-5.1.patch +++ b/srcpkgs/fbv/patches/giflib-5.1.patch @@ -1,6 +1,6 @@ diff -wbBur gif.c gif.c ---- gif.c 2003-08-25 00:23:02.000000000 +0400 -+++ gif.c 2014-05-29 18:39:41.337332872 +0400 +--- a/gif.c 2003-08-25 00:23:02.000000000 +0400 ++++ b/gif.c 2014-05-29 18:39:41.337332872 +0400 @@ -31,10 +31,10 @@ #include #define min(a,b) ((a) < (b) ? (a) : (b)) diff --git a/srcpkgs/fbv/patches/libpng-1.5.13.patch b/srcpkgs/fbv/patches/libpng-1.5.13.patch index b925423df88..1d0d70a1553 100644 --- a/srcpkgs/fbv/patches/libpng-1.5.13.patch +++ b/srcpkgs/fbv/patches/libpng-1.5.13.patch @@ -11,8 +11,8 @@ Subject: [PATCH 1/1] For libpng 1.5.13 the jmpbuf pointer for the png_structp diff --git png.c png.c index 2b59269..52b6797 100644 ---- png.c -+++ png.c +--- a/png.c ++++ b/png.c @@ -69,7 +69,7 @@ int fh_png_load(char *name,unsigned char *buffer, unsigned char ** alpha,int x,i fclose(fh); return(FH_ERROR_FORMAT); } diff --git a/srcpkgs/fbv/template b/srcpkgs/fbv/template index da3387dc2b6..0df248768ce 100644 --- a/srcpkgs/fbv/template +++ b/srcpkgs/fbv/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="http://www.eclis.ch/fbv/" distfiles="http://s-tech.elsat.net.pl/fbv/fbv-${version}.tar.gz" checksum=9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c -patch_args=-Np0 do_configure() { sed -i '/^CFLAGS/d' Makefile diff --git a/srcpkgs/fbxkb/patches/fbxkb.patch b/srcpkgs/fbxkb/patches/fbxkb.patch index 1f55744a163..a239097c9a7 100644 --- a/srcpkgs/fbxkb/patches/fbxkb.patch +++ b/srcpkgs/fbxkb/patches/fbxkb.patch @@ -1,8 +1,8 @@ Found on Arch User Repository, adapted for -p0 ---- fbxkb.c 2006-12-18 23:47:52.000000000 +0200 -+++ fbxkb.c 2012-01-15 22:27:30.571427088 +0200 +--- a/fbxkb.c 2006-12-18 23:47:52.000000000 +0200 ++++ b/fbxkb.c 2012-01-15 22:27:30.571427088 +0200 @@ -378,10 +378,11 @@ read_kbd_description() g_assert((no >= 0) && (no < ngroups)); if (group2info[no].sym != NULL) { @@ -18,8 +18,8 @@ Found on Arch User Repository, adapted for -p0 } XFree(sym_name); } ---- Makefile.common 2004-10-16 01:18:59.000000000 +0300 -+++ Makefile.common 2012-01-15 23:20:02.081020564 +0200 +--- a/Makefile.common 2004-10-16 01:18:59.000000000 +0300 ++++ b/Makefile.common 2012-01-15 23:20:02.081020564 +0200 @@ -16,7 +16,7 @@ endif endif diff --git a/srcpkgs/fbxkb/template b/srcpkgs/fbxkb/template index 123e36a95f2..1356d32df97 100644 --- a/srcpkgs/fbxkb/template +++ b/srcpkgs/fbxkb/template @@ -11,7 +11,6 @@ license="MIT" homepage="http://fbxkb.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tgz" checksum="fcbaf4ed9a70f58ea1316b19da74e2ca8b3fb0e2de5a73c849317589ce840ef2" -patch_args=-Np0 pre_build() { # Substitute compiler, diff --git a/srcpkgs/fceux/patches/isascii-musl.patch b/srcpkgs/fceux/patches/isascii-musl.patch index 53b9c20ebce..dd3fa823365 100644 --- a/srcpkgs/fceux/patches/isascii-musl.patch +++ b/srcpkgs/fceux/patches/isascii-musl.patch @@ -1,7 +1,7 @@ diff --git src/drivers/Qt/HexEditor.cpp src/drivers/Qt/HexEditor.cpp index 8f078ac..010b2cf 100644 ---- src/drivers/Qt/HexEditor.cpp -+++ src/drivers/Qt/HexEditor.cpp +--- a/src/drivers/Qt/HexEditor.cpp ++++ b/src/drivers/Qt/HexEditor.cpp @@ -43,6 +43,8 @@ #include "Qt/ConsoleUtilities.h" #include "Qt/ConsoleWindow.h" diff --git a/srcpkgs/fceux/template b/srcpkgs/fceux/template index 10c3b17d433..5ecaa9c7e08 100644 --- a/srcpkgs/fceux/template +++ b/srcpkgs/fceux/template @@ -12,4 +12,3 @@ license="GPL-2.0-or-later" homepage="https://fceux.com/web/home.html" distfiles="https://github.com/TASVideos/fceux/archive/fceux-${version}.tar.gz" checksum=0d3b02b3f15032f7675acb95423fd81fae286615313dfbc58cdd4de2bce17f6e -patch_args=-Np0 diff --git a/srcpkgs/fcitx-anthy/patches/musl.patch b/srcpkgs/fcitx-anthy/patches/musl.patch index 53c76bca78e..59338c4051d 100644 --- a/srcpkgs/fcitx-anthy/patches/musl.patch +++ b/srcpkgs/fcitx-anthy/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/utils.h -+++ src/utils.h +--- a/src/utils.h ++++ b/src/utils.h @@ -22,6 +22,7 @@ #define __FCITX_ANTHY_UTILS_H__ diff --git a/srcpkgs/fcitx-anthy/template b/srcpkgs/fcitx-anthy/template index 42a048057b1..02150ea5ca5 100644 --- a/srcpkgs/fcitx-anthy/template +++ b/srcpkgs/fcitx-anthy/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="https://fcitx-im.org/" distfiles="https://github.com/fcitx/fcitx-anthy/archive/${version}.tar.gz" checksum=dcb561138508757f37da8a85bdf296368b592649b15ab76e8706db47cc25402a -patch_args=-Np0 CXXFLAGS='-D_GNU_SOURCE' diff --git a/srcpkgs/fcron/patches/fcron.patch b/srcpkgs/fcron/patches/fcron.patch index 8ef79b0cbc9..f9046e4a9f8 100644 --- a/srcpkgs/fcron/patches/fcron.patch +++ b/srcpkgs/fcron/patches/fcron.patch @@ -1,5 +1,5 @@ ---- configure.in.orig -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -201,7 +201,6 @@ if test ! -x "$SENDMAIL" ; then dnl ... but it is not an executable file! @@ -8,8 +8,8 @@ else dnl ... and it is valid AC_MSG_RESULT([$SENDMAIL]) ---- script/user-group.orig -+++ script/user-group +--- a/script/user-group ++++ b/script/user-group @@ -1,4 +1,5 @@ #!/bin/sh +exit 0 diff --git a/srcpkgs/fcron/patches/force-pam.patch b/srcpkgs/fcron/patches/force-pam.patch index 95729d946c1..451be4b9970 100644 --- a/srcpkgs/fcron/patches/force-pam.patch +++ b/srcpkgs/fcron/patches/force-pam.patch @@ -9,8 +9,8 @@ Subject: [PATCH] force pam diff --git configure.in configure.in index 590d5b2..22ed5d7 100644 ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -865,6 +865,7 @@ if test "$usepam" != "0" && echo "$LIBS" | grep -- "-lpam" > /dev/null ; then else usepam=0 diff --git a/srcpkgs/fcron/template b/srcpkgs/fcron/template index ffb03fb0fce..11efd44b0bb 100644 --- a/srcpkgs/fcron/template +++ b/srcpkgs/fcron/template @@ -31,7 +31,6 @@ license="GPL-2.0-or-later" homepage="http://fcron.free.fr" distfiles="$homepage/archives/$pkgname-$version.src.tar.gz" checksum=9aead33a0926e2eec123698c502114c6d67b483fe1ec232969fae6809b0bab60 -patch_args=-Np0 alternatives=" crond:crond:/etc/sv/fcron diff --git a/srcpkgs/ferm/patches/mod_makefile.patch b/srcpkgs/ferm/patches/mod_makefile.patch index c118d94b555..de6600095cd 100644 --- a/srcpkgs/ferm/patches/mod_makefile.patch +++ b/srcpkgs/ferm/patches/mod_makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2017-08-12 17:55:29.265988875 +0200 -+++ Makefile 2017-08-12 17:56:17.492988011 +0200 +--- a/Makefile 2017-08-12 17:55:29.265988875 +0200 ++++ b/Makefile 2017-08-12 17:56:17.492988011 +0200 @@ -122,7 +122,6 @@ rm -rf $(DISTDIR) install -d -m 755 $(DISTDIR) $(DISTDIR)/src $(DISTDIR)/doc $(DISTDIR)/examples diff --git a/srcpkgs/ferm/template b/srcpkgs/ferm/template index 0183d4c4bee..3b623d0dd0c 100644 --- a/srcpkgs/ferm/template +++ b/srcpkgs/ferm/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="http://ferm.foo-projects.org/" distfiles="http://ferm.foo-projects.org/download/${version:0:3}/ferm-${version}.tar.xz" checksum=689541465e7c073cbd604c9cd18f113c31c0b41bb12614726a59b17e44058885 -patch_args=-Np0 do_install() { make install PREFIX=${DESTDIR}/usr diff --git a/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch b/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch index 621aba392fb..7a7466c6523 100644 --- a/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch +++ b/srcpkgs/ffmpeg/patches/2687070d9b092d3a354a6963c65197054ddf7a75.patch @@ -16,8 +16,8 @@ Fixes ticket #9077. diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c index 58e480dd2c..4f5382e4c1 100644 ---- libswscale/ppc/yuv2rgb_altivec.c -+++ libswscale/ppc/yuv2rgb_altivec.c +--- a/libswscale/ppc/yuv2rgb_altivec.c ++++ b/libswscale/ppc/yuv2rgb_altivec.c @@ -425,13 +425,13 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in, \ } diff --git a/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch b/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch index b50385a0c8f..86f55882f0c 100644 --- a/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch +++ b/srcpkgs/ffmpeg/patches/3e098cca6e51db0f19928c12d0348deaa17137b3.patch @@ -14,8 +14,8 @@ Fixes users who check the return value matches what they expect. diff --git a/libswscale/aarch64/swscale_unscaled.c b/libswscale/aarch64/swscale_unscaled.c index 551daad9e353..c7a2a1037df8 100644 ---- libswscale/aarch64/swscale_unscaled.c -+++ libswscale/aarch64/swscale_unscaled.c +--- a/libswscale/aarch64/swscale_unscaled.c ++++ b/libswscale/aarch64/swscale_unscaled.c @@ -42,15 +42,14 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], uint8_t *dst[], int dstStride[]) { \ const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \ @@ -63,8 +63,8 @@ index 551daad9e353..c7a2a1037df8 100644 #define DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx) \ diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S index b7446aa10511..f4b220fb608e 100644 ---- libswscale/aarch64/yuv2rgb_neon.S -+++ libswscale/aarch64/yuv2rgb_neon.S +--- a/libswscale/aarch64/yuv2rgb_neon.S ++++ b/libswscale/aarch64/yuv2rgb_neon.S @@ -142,6 +142,7 @@ .macro declare_func ifmt ofmt function ff_\ifmt\()_to_\ofmt\()_neon, export=1 diff --git a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch index 2595d764c50..9a55178c74f 100644 --- a/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch +++ b/srcpkgs/ffmpeg/patches/armv5tel-floating-point.patch @@ -1,5 +1,5 @@ ---- libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200 -+++ libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100 +--- a/libavfilter/vf_drawtext.c 2017-10-26 21:03:03.000000000 +0200 ++++ b/libavfilter/vf_drawtext.c 2017-11-21 11:06:49.602284422 +0100 @@ -39,6 +39,15 @@ #endif #include diff --git a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch index 4a6406c4317..00e3f68a415 100644 --- a/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch +++ b/srcpkgs/ffmpeg/patches/workaround-mesa-readeon-vaapi-bug.patch @@ -12,8 +12,8 @@ Corresponding kodi bug: https://github.com/xbmc/xbmc/issues/15704 diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 5854587a255..f12fdc457a4 100644 ---- libavcodec/vaapi_h264.c -+++ libavcodec/vaapi_h264.c +--- a/libavcodec/vaapi_h264.c ++++ b/libavcodec/vaapi_h264.c @@ -317,6 +317,11 @@ static int vaapi_h264_end_frame(AVCodecContext *avctx) H264SliceContext *sl = &h->slice_ctx[0]; int ret; diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 50ab8e58c2b..e6667478fe1 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -10,7 +10,6 @@ homepage="https://www.ffmpeg.org" changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog" distfiles="${homepage}/releases/ffmpeg-${version}.tar.xz" checksum=46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb -patch_args=-Np0 hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel diff --git a/srcpkgs/fifengine/patches/swig.patch b/srcpkgs/fifengine/patches/swig.patch index f2da09e7d88..6450c91f322 100644 --- a/srcpkgs/fifengine/patches/swig.patch +++ b/srcpkgs/fifengine/patches/swig.patch @@ -9,8 +9,8 @@ Subject: [PATCH] removed flags that are not supported with swig 4.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 126322ce0..25c695630 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -893,7 +893,7 @@ if(build-python) find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT) include_directories(${PYTHON_INCLUDE_PATH}) diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template index d3bf756eabe..6a2cc79a448 100644 --- a/srcpkgs/fifengine/template +++ b/srcpkgs/fifengine/template @@ -14,4 +14,3 @@ license="LGPL-2.1-or-later" homepage="https://github.com/fifengine/fifengine" distfiles="https://github.com/fifengine/fifengine/archive/${version}.tar.gz" checksum=e882b55befa36ae2f1a89ada16af0f814a1b78f7cbe6021ec5b1605604cf8ff8 -patch_args=-Np0 diff --git a/srcpkgs/fig2dev/patches/CVE-2019-19555.patch b/srcpkgs/fig2dev/patches/CVE-2019-19555.patch index 74406916d8c..a9ca1c59ff9 100644 --- a/srcpkgs/fig2dev/patches/CVE-2019-19555.patch +++ b/srcpkgs/fig2dev/patches/CVE-2019-19555.patch @@ -18,8 +18,8 @@ &t->type, &t->font, &t->size, &t->pen, &t->color, &t->depth, &t->angle, &t->flags, &t->height, &t->length, ---- fig2dev/tests/read.at -+++ fig2dev/tests/read.at +--- a/fig2dev/tests/read.at ++++ b/fig2dev/tests/read.at @@ -359,6 +359,17 @@ ], 0, ignore) AT_CLEANUP diff --git a/srcpkgs/fig2dev/template b/srcpkgs/fig2dev/template index 95003a4f225..87bdbd3d8ad 100644 --- a/srcpkgs/fig2dev/template +++ b/srcpkgs/fig2dev/template @@ -13,7 +13,6 @@ homepage="http://www.xfig.org/" distfiles="${SOURCEFORGE_SITE}/mcj/${pkgname}-${version}.tar.xz" checksum=6336ac492d0f71dfb7a1dd8f4d78eae17aa57a34f743d4e5ba9814991c2da7ae replaces="transfig>=0" -patch_args=-Np0 post_install() { sed '/^$/q' LICENSE diff --git a/srcpkgs/filelight/patches/musl.patch b/srcpkgs/filelight/patches/musl.patch index 0a9b8b2534b..e97ad3ffc1b 100644 --- a/srcpkgs/filelight/patches/musl.patch +++ b/srcpkgs/filelight/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/radialMap/sincos.h 2018-05-06 06:10:38.000000000 +0200 -+++ - 2018-05-25 01:24:06.234265312 +0200 +--- a/src/radialMap/sincos.h 2018-05-06 06:10:38.000000000 +0200 ++++ b/src/radialMap/sincos.h 2018-05-06 06:10:38.000000000 +0200 @@ -21,10 +21,10 @@ #ifndef SINCOS_H @@ -13,8 +13,8 @@ #include ---- src/radialMap/sincos.h 2018-05-25 01:30:46.775385798 +0200 -+++ - 2018-05-25 01:34:59.788609200 +0200 +--- a/src/radialMap/sincos.h 2018-05-25 01:30:46.775385798 +0200 ++++ b/src/radialMap/sincos.h 2018-05-25 01:30:46.775385798 +0200 @@ -23,23 +23,4 @@ #define SINCOS_H #define _GNU_SOURCE diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template index 197232071e8..35cd560b1f9 100644 --- a/srcpkgs/filelight/template +++ b/srcpkgs/filelight/template @@ -12,4 +12,3 @@ license="GPL-2.0-only" homepage="https://utils.kde.org/projects/filelight/" distfiles="${KDE_SITE}/release-service/${version}/src/filelight-${version}.tar.xz" checksum=618f91b9da8eebbb6b96e3d74d9e89a7c088ca08b1682ff6c4e65b53a3da5d20 -patch_args=-Np0 diff --git a/srcpkgs/filezilla/patches/cross.patch b/srcpkgs/filezilla/patches/cross.patch index 3f31ecd868c..647b65b54e5 100644 --- a/srcpkgs/filezilla/patches/cross.patch +++ b/srcpkgs/filezilla/patches/cross.patch @@ -1,5 +1,5 @@ ---- configure 2019-05-08 10:44:58.580806039 +0200 -+++ configure 2019-05-08 10:45:35.185289121 +0200 +--- a/configure 2019-05-08 10:44:58.580806039 +0200 ++++ b/configure 2019-05-08 10:45:35.185289121 +0200 @@ -17628,7 +17628,7 @@ "$ac_abs_confdir/src/fzshellext/configure" --prefix="$prefix" --exec-prefix="$exec_prefix" --host=x86_64-w64-mingw32 || exit 1 else diff --git a/srcpkgs/filezilla/patches/missing-list-include.patch b/srcpkgs/filezilla/patches/missing-list-include.patch index aafcfccff91..ac9177fba95 100644 --- a/srcpkgs/filezilla/patches/missing-list-include.patch +++ b/srcpkgs/filezilla/patches/missing-list-include.patch @@ -1,5 +1,5 @@ ---- src/interface/Mainfrm.h 2020-03-11 19:25:00.949572120 +0100 -+++ src/interface/Mainfrm.h 2020-03-11 19:25:15.536378827 +0100 +--- a/src/interface/Mainfrm.h 2020-03-11 19:25:00.949572120 +0100 ++++ b/src/interface/Mainfrm.h 2020-03-11 19:25:15.536378827 +0100 @@ -8,6 +8,8 @@ #include diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index 00f45608543..b115f782ed4 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -16,7 +16,6 @@ homepage="https://filezilla-project.org" changelog="https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?view=co" distfiles="https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2" checksum=703a199c13bb681d6eb0e3fe6e1cc9d0b690016acdd47b26bd12a2a95ff4aa6a -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" wxWidgets-gtk3-devel xdg-utils" diff --git a/srcpkgs/fingerprint-gui/patches/fix-udev-paths.patch b/srcpkgs/fingerprint-gui/patches/fix-udev-paths.patch index 7564e3abaf5..0a0791e64ce 100644 --- a/srcpkgs/fingerprint-gui/patches/fix-udev-paths.patch +++ b/srcpkgs/fingerprint-gui/patches/fix-udev-paths.patch @@ -1,5 +1,5 @@ ---- bin/fingerprint-helper/fingerprint-helper.pro 2016-11-21 15:24:35.315792087 +0300 -+++ bin/fingerprint-helper/fingerprint-helper.pro 2016-11-21 15:25:24.527899001 +0300 +--- a/bin/fingerprint-helper/fingerprint-helper.pro 2016-11-21 15:24:35.315792087 +0300 ++++ b/bin/fingerprint-helper/fingerprint-helper.pro 2016-11-21 15:25:24.527899001 +0300 @@ -22,8 +22,8 @@ QMAKE_CXXFLAGS+=-fno-strict-aliasing @@ -12,8 +12,8 @@ INSTALLS += target uinput-rules ---- fingerprint.pro 2016-11-21 15:33:45.215341967 +0300 -+++ fingerprint.pro 2016-11-21 15:36:26.077954927 +0300 +--- a/fingerprint.pro 2016-11-21 15:33:45.215341967 +0300 ++++ b/fingerprint.pro 2016-11-21 15:36:26.077954927 +0300 @@ -17,8 +17,8 @@ install -m 644 ./upek/lib/libbsapi.so.4.0 ./upek/lib/libbsapi.so.4.3 $(INSTALL_ROOT)$${LIBDIR}; \ fi; \ diff --git a/srcpkgs/fingerprint-gui/patches/fix-udev-rules-groups.patch b/srcpkgs/fingerprint-gui/patches/fix-udev-rules-groups.patch index e8a80c65f07..208ea459cdf 100644 --- a/srcpkgs/fingerprint-gui/patches/fix-udev-rules-groups.patch +++ b/srcpkgs/fingerprint-gui/patches/fix-udev-rules-groups.patch @@ -1,5 +1,5 @@ ---- upek/91-fingerprint-gui-upek.rules 2017-01-12 19:48:38.325444912 +0300 -+++ upek/91-fingerprint-gui-upek.rules 2017-01-12 19:50:35.799120728 +0300 +--- a/upek/91-fingerprint-gui-upek.rules 2017-01-12 19:48:38.325444912 +0300 ++++ b/upek/91-fingerprint-gui-upek.rules 2017-01-12 19:50:35.799120728 +0300 @@ -7,6 +7,10 @@ ATTRS{idVendor}=="147e", ATTRS{idProduct}=="100[0123]", SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev" ATTRS{idVendor}=="147e", ATTRS{idProduct}=="300[01]", SYMLINK+="input/touchchip-%k", MODE="0664", GROUP="plugdev" diff --git a/srcpkgs/fingerprint-gui/patches/musl.patch b/srcpkgs/fingerprint-gui/patches/musl.patch index 202cc69186a..ca3e01f6ad8 100644 --- a/srcpkgs/fingerprint-gui/patches/musl.patch +++ b/srcpkgs/fingerprint-gui/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/FingerprintPAM.cpp.orig 2016-04-12 05:13:32.786979623 +0200 -+++ src/FingerprintPAM.cpp 2016-04-12 05:13:58.427980946 +0200 +--- a/src/FingerprintPAM.cpp 2016-04-12 05:13:32.786979623 +0200 ++++ b/src/FingerprintPAM.cpp 2016-04-12 05:13:58.427980946 +0200 @@ -38,6 +38,7 @@ #include #include diff --git a/srcpkgs/fingerprint-gui/patches/time64.patch b/srcpkgs/fingerprint-gui/patches/time64.patch index ba8a7f45cff..8d01e4d3999 100644 --- a/srcpkgs/fingerprint-gui/patches/time64.patch +++ b/srcpkgs/fingerprint-gui/patches/time64.patch @@ -1,7 +1,7 @@ Index: src/FingerprintHelper.cpp =================================================================== ---- src/FingerprintHelper.cpp.orig -+++ src/FingerprintHelper.cpp +--- a/src/FingerprintHelper.cpp ++++ b/src/FingerprintHelper.cpp @@ -75,9 +75,12 @@ void pluginMessage(const char *msg){ // Send to uinput bool uinputSendEnter(int uinput){ diff --git a/srcpkgs/fingerprint-gui/template b/srcpkgs/fingerprint-gui/template index 52f7084d1d9..08d226569eb 100644 --- a/srcpkgs/fingerprint-gui/template +++ b/srcpkgs/fingerprint-gui/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="http://www.ullrich-online.cc/fingerprint/" distfiles="https://github.com/maksbotan/${pkgname}/archive/v${version}-qt5.tar.gz" checksum=a28d43e7e505f8ed15c8360bd91603eaf3206c225a542d0116669caafd89154c -patch_args=-Np0 # build system deals poorly with cross headers so include # them manually diff --git a/srcpkgs/firefox-esr/patches/big-endian-image-decoders.patch b/srcpkgs/firefox-esr/patches/big-endian-image-decoders.patch index ccb417b61f1..bd2f925c917 100644 --- a/srcpkgs/firefox-esr/patches/big-endian-image-decoders.patch +++ b/srcpkgs/firefox-esr/patches/big-endian-image-decoders.patch @@ -10,8 +10,8 @@ https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096 imported patch decoder_workaround.patch diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp ---- image/decoders/nsGIFDecoder2.cpp Thu Feb 27 12:57:14 2020 +0100 -+++ image/decoders/nsGIFDecoder2.cpp Fri Mar 27 13:06:18 2020 +0100 +--- a/image/decoders/nsGIFDecoder2.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ b/image/decoders/nsGIFDecoder2.cpp Fri Mar 27 13:06:18 2020 +0100 @@ -422,6 +422,9 @@ MOZ_ASSERT(mSwizzleFn); uint8_t* data = reinterpret_cast(aColormap); @@ -23,8 +23,8 @@ diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator, diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp ---- image/decoders/nsJPEGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 -+++ image/decoders/nsJPEGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 +--- a/image/decoders/nsJPEGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ b/image/decoders/nsJPEGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 @@ -263,6 +263,9 @@ case JCS_YCbCr: // By default, we will output directly to BGRA. If we need to apply @@ -44,8 +44,8 @@ diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp case JCS_CMYK: case JCS_YCCK: diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp ---- image/decoders/nsPNGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 -+++ image/decoders/nsPNGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 +--- a/image/decoders/nsPNGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ b/image/decoders/nsPNGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 @@ -361,7 +361,7 @@ IResumable* aOnResume) { MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!"); @@ -71,8 +71,8 @@ diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp LexerTransition nsPNGDecoder::ReadPNGData( diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp ---- image/decoders/nsWebPDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 -+++ image/decoders/nsWebPDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 +--- a/image/decoders/nsWebPDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ b/image/decoders/nsWebPDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 @@ -237,7 +237,12 @@ // WebP doesn't guarantee that the alpha generated matches the hint in the // header, so we always need to claim the input is BGRA. If the output is diff --git a/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch b/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch index 6e0c5875da3..b0c052f4009 100644 --- a/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch +++ b/srcpkgs/firefox-esr/patches/fix-arm-opus-include.patch @@ -1,5 +1,5 @@ ---- media/libopus/silk/arm/arm_silk_map.c.orig 2019-03-19 20:55:01.249609964 +0100 -+++ media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:25.769400255 +0100 +--- a/media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:01.249609964 +0100 ++++ b/media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:25.769400255 +0100 @@ -28,7 +28,7 @@ # include "config.h" #endif diff --git a/srcpkgs/firefox-esr/patches/fix-cross.patch b/srcpkgs/firefox-esr/patches/fix-cross.patch index 9b8a816d269..fad8f9060c4 100644 --- a/srcpkgs/firefox-esr/patches/fix-cross.patch +++ b/srcpkgs/firefox-esr/patches/fix-cross.patch @@ -3,8 +3,8 @@ overwrite HOST_* flags to get rid of -MF note: this patch was used from firefox-77 until 80, dropped with the update to 81 ---- third_party/rust/glslopt/build.rs -+++ third_party/rust/glslopt/build.rs +--- a/third_party/rust/glslopt/build.rs ++++ b/third_party/rust/glslopt/build.rs @@ -28,6 +28,8 @@ env::remove_var(format!("CXXFLAGS_{}", &target)); env::remove_var(format!("CFLAGS_{}", target.replace("-", "_"))); diff --git a/srcpkgs/firefox-esr/patches/fix-desktop-icon-path.patch b/srcpkgs/firefox-esr/patches/fix-desktop-icon-path.patch index 60af12e80b1..c4664d3da7c 100644 --- a/srcpkgs/firefox-esr/patches/fix-desktop-icon-path.patch +++ b/srcpkgs/firefox-esr/patches/fix-desktop-icon-path.patch @@ -1,5 +1,5 @@ ---- taskcluster/docker/firefox-snap/firefox.desktop.orig 2019-01-18 19:31:39.428839442 +0100 -+++ taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:32:20.689063456 +0100 +--- a/taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:31:39.428839442 +0100 ++++ b/taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:32:20.689063456 +0100 @@ -154,7 +154,7 @@ Terminal=false X-MultipleArgs=false diff --git a/srcpkgs/firefox-esr/patches/fix-fortify-inline.patch b/srcpkgs/firefox-esr/patches/fix-fortify-inline.patch index c1190197d32..2498c57fc73 100644 --- a/srcpkgs/firefox-esr/patches/fix-fortify-inline.patch +++ b/srcpkgs/firefox-esr/patches/fix-fortify-inline.patch @@ -1,5 +1,5 @@ ---- media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h -+++ media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h +--- a/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h ++++ b/media/webrtc/signaling/src/sdp/sipcc/sdp_os_defs.h @@ -27,8 +27,5 @@ typedef int16_t int16; typedef unsigned short ushort; diff --git a/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch b/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch index 6df609bbf16..717f3cd2f9c 100644 --- a/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch +++ b/srcpkgs/firefox-esr/patches/fix-i686-ppc-musl.patch @@ -1,5 +1,5 @@ ---- mozglue/misc/StackWalk.cpp 2017-04-11 04:13:21.000000000 +0200 -+++ mozglue/misc/StackWalk.cpp 2017-11-29 15:23:07.218649970 +0100 +--- a/mozglue/misc/StackWalk.cpp 2017-04-11 04:13:21.000000000 +0200 ++++ b/mozglue/misc/StackWalk.cpp 2017-11-29 15:23:07.218649970 +0100 @@ -41,7 +41,7 @@ #define MOZ_STACKWALK_SUPPORTS_MACOSX 0 #endif diff --git a/srcpkgs/firefox-esr/patches/fix-image-format-warning.patch b/srcpkgs/firefox-esr/patches/fix-image-format-warning.patch index 9b3b38d9065..7cdff60ce2f 100644 --- a/srcpkgs/firefox-esr/patches/fix-image-format-warning.patch +++ b/srcpkgs/firefox-esr/patches/fix-image-format-warning.patch @@ -6,8 +6,8 @@ # Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5 handle big-endian formats in Cairo format conversions ---- gfx/2d/HelpersCairo.h -+++ gfx/2d/HelpersCairo.h +--- a/gfx/2d/HelpersCairo.h ++++ b/gfx/2d/HelpersCairo.h @@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su case SurfaceFormat::R5G6B5_UINT16: return CAIRO_FORMAT_RGB16_565; diff --git a/srcpkgs/firefox-esr/patches/fix-tools.patch b/srcpkgs/firefox-esr/patches/fix-tools.patch index 1af39bc6118..94de423ce59 100644 --- a/srcpkgs/firefox-esr/patches/fix-tools.patch +++ b/srcpkgs/firefox-esr/patches/fix-tools.patch @@ -1,5 +1,5 @@ ---- tools/profiler/core/platform-linux-android.cpp.orig 2019-01-29 12:09:40.980448579 +0100 -+++ tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100 +--- a/tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:09:40.980448579 +0100 ++++ b/tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100 @@ -497,8 +501,10 @@ ucontext_t sSyncUContext; diff --git a/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch b/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch index e6ad61c9f44..a6035e87616 100644 --- a/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch +++ b/srcpkgs/firefox-esr/patches/fix-wasm-arm.patch @@ -1,5 +1,5 @@ ---- js/src/wasm/WasmSignalHandlers.cpp -+++ js/src/wasm/WasmSignalHandlers.cpp +--- a/js/src/wasm/WasmSignalHandlers.cpp ++++ b/js/src/wasm/WasmSignalHandlers.cpp @@ -243,9 +243,9 @@ // If you run into compile problems on a tier-3 platform, you can disable the // emulation here. diff --git a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch index cf895dd8448..70910da5861 100644 --- a/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch +++ b/srcpkgs/firefox-esr/patches/fix-webrtc-glibcisms.patch @@ -1,5 +1,5 @@ ---- media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2019-01-29 11:20:52.298793223 +0100 -+++ media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:21:48.250250850 +0100 +--- a/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:20:52.298793223 +0100 ++++ b/media/webrtc/trunk/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:21:48.250250850 +0100 @@ -14,7 +14,7 @@ #ifndef __GLIBC_PREREQ #define __GLIBC_PREREQ(a, b) 0 diff --git a/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch b/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch index e3f60e8ecf6..154aad63e33 100644 --- a/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch +++ b/srcpkgs/firefox-esr/patches/flac-no-ffvpx.patch @@ -2,8 +2,8 @@ Enable FLAC on platforms without ffvpx like powerpc* diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp index 53fc3c9937f7..b23771ab80fa 100644 ---- dom/media/flac/FlacDecoder.cpp -+++ dom/media/flac/FlacDecoder.cpp +--- a/dom/media/flac/FlacDecoder.cpp ++++ b/dom/media/flac/FlacDecoder.cpp @@ -7,6 +7,7 @@ #include "FlacDecoder.h" #include "MediaContainerType.h" diff --git a/srcpkgs/firefox-esr/patches/mallinfo.patch b/srcpkgs/firefox-esr/patches/mallinfo.patch index afea86c0a2c..0d704301f39 100644 --- a/srcpkgs/firefox-esr/patches/mallinfo.patch +++ b/srcpkgs/firefox-esr/patches/mallinfo.patch @@ -1,5 +1,5 @@ ---- xpcom/base/nsMemoryReporterManager.cpp.orig 2019-03-19 17:12:20.844810044 +0100 -+++ xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100 +--- a/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:12:20.844810044 +0100 ++++ b/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100 @@ -123,6 +123,7 @@ return GetProcSelfSmapsPrivate(aN); } diff --git a/srcpkgs/firefox-esr/patches/musl-rust.configure.patch b/srcpkgs/firefox-esr/patches/musl-rust.configure.patch index d8f387136e0..0b2f7dee1d3 100644 --- a/srcpkgs/firefox-esr/patches/musl-rust.configure.patch +++ b/srcpkgs/firefox-esr/patches/musl-rust.configure.patch @@ -1,5 +1,5 @@ ---- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700 -+++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700 +--- a/build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700 ++++ b/build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700 @@ -297,11 +297,20 @@ suffix = 'hf' else: diff --git a/srcpkgs/firefox-esr/patches/ppc32-fix-build.patch b/srcpkgs/firefox-esr/patches/ppc32-fix-build.patch index c1a8f422d0a..b26a46cfe83 100644 --- a/srcpkgs/firefox-esr/patches/ppc32-fix-build.patch +++ b/srcpkgs/firefox-esr/patches/ppc32-fix-build.patch @@ -7,8 +7,8 @@ Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60 Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp ---- xpcom/reflect/xptcall/xptcall.h -+++ xpcom/reflect/xptcall/xptcall.h +--- a/xpcom/reflect/xptcall/xptcall.h ++++ b/xpcom/reflect/xptcall/xptcall.h @@ -71,6 +71,11 @@ struct nsXPTCVariant { ExtendedVal ext; }; diff --git a/srcpkgs/firefox-esr/patches/rust-configure.patch b/srcpkgs/firefox-esr/patches/rust-configure.patch index 887c102bc55..07b98d6c7ca 100644 --- a/srcpkgs/firefox-esr/patches/rust-configure.patch +++ b/srcpkgs/firefox-esr/patches/rust-configure.patch @@ -1,8 +1,8 @@ Mozilla rustc check does not support crossbuild: let's remove it Remove calls to unwrap_rustup, they fail if rustup isn't present ---- build/moz.configure/rust.configure.orig 2019-10-17 04:19:59.000000000 +0700 -+++ build/moz.configure/rust.configure 2019-10-22 11:48:55.616022140 +0700 +--- a/build/moz.configure/rust.configure 2019-10-17 04:19:59.000000000 +0700 ++++ b/build/moz.configure/rust.configure 2019-10-22 11:48:55.616022140 +0700 @@ -78,9 +78,6 @@ return unwrap diff --git a/srcpkgs/firefox-esr/patches/rust-has-i128.patch b/srcpkgs/firefox-esr/patches/rust-has-i128.patch index 4c90cd3d106..c25a185c1c1 100644 --- a/srcpkgs/firefox-esr/patches/rust-has-i128.patch +++ b/srcpkgs/firefox-esr/patches/rust-has-i128.patch @@ -1,8 +1,8 @@ The configure check fails for cross builds. i128 is supported since rust-1.26, so it is safe for us to assume it is always present ---- third_party/rust/num-traits/build.rs.orig 2020-02-14 23:57:25.985355610 +0100 -+++ third_party/rust/num-traits/build.rs 2020-02-14 23:58:36.255710188 +0100 +--- a/third_party/rust/num-traits/build.rs 2020-02-14 23:57:25.985355610 +0100 ++++ b/third_party/rust/num-traits/build.rs 2020-02-14 23:58:36.255710188 +0100 @@ -1,14 +1,5 @@ -extern crate autocfg; - diff --git a/srcpkgs/firefox-esr/patches/sandbox-fork.patch b/srcpkgs/firefox-esr/patches/sandbox-fork.patch index 72640cb7f70..328943cb001 100644 --- a/srcpkgs/firefox-esr/patches/sandbox-fork.patch +++ b/srcpkgs/firefox-esr/patches/sandbox-fork.patch @@ -1,7 +1,7 @@ make SYS_fork non-fatal, musl uses it for fork(2) ---- security/sandbox/linux/SandboxFilter.cpp -+++ security/sandbox/linux/SandboxFilter.cpp +--- a/security/sandbox/linux/SandboxFilter.cpp ++++ b/security/sandbox/linux/SandboxFilter.cpp @@ -1253,6 +1253,8 @@ // usually do something reasonable on error. case __NR_clone: diff --git a/srcpkgs/firefox-esr/patches/sandbox-largefile.patch b/srcpkgs/firefox-esr/patches/sandbox-largefile.patch index 494ca82df5a..6ee7f3a8215 100644 --- a/srcpkgs/firefox-esr/patches/sandbox-largefile.patch +++ b/srcpkgs/firefox-esr/patches/sandbox-largefile.patch @@ -1,5 +1,5 @@ ---- security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:41:14.556378950 +0100 -+++ security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:40:23.595806444 +0100 +--- a/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:41:14.556378950 +0100 ++++ b/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:40:23.595806444 +0100 @@ -68,7 +68,13 @@ // The headers define O_LARGEFILE as 0 on x86_64, but we need the diff --git a/srcpkgs/firefox-esr/patches/skia-sucks1.patch b/srcpkgs/firefox-esr/patches/skia-sucks1.patch index 05ad34a3fc3..cd9eecccf61 100644 --- a/srcpkgs/firefox-esr/patches/skia-sucks1.patch +++ b/srcpkgs/firefox-esr/patches/skia-sucks1.patch @@ -1,8 +1,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5 https://bugzilla.mozilla.org/attachment.cgi?id=9028600 ---- gfx/skia/skia/third_party/skcms/skcms.cc -+++ gfx/skia/skia/third_party/skcms/skcms.cc +--- a/gfx/skia/skia/third_party/skcms/skcms.cc ++++ b/gfx/skia/skia/third_party/skcms/skcms.cc @@ -30,6 +30,8 @@ #include #include @@ -45,8 +45,8 @@ https://bugzilla.mozilla.org/attachment.cgi?id=9028600 #endif } ---- gfx/2d/DrawTargetSkia.cpp -+++ gfx/2d/DrawTargetSkia.cpp +--- a/gfx/2d/DrawTargetSkia.cpp ++++ b/gfx/2d/DrawTargetSkia.cpp @@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a return surfaceBounds.Intersect(bounds); } @@ -57,8 +57,8 @@ https://bugzilla.mozilla.org/attachment.cgi?id=9028600 static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize, const int32_t aStride, SurfaceFormat aFormat) { ---- gfx/2d/Types.h -+++ gfx/2d/Types.h +--- a/gfx/2d/Types.h ++++ b/gfx/2d/Types.h @@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t { // The following values are endian-independent synonyms. The _UINT32 suffix // indicates that the name reflects the layout when viewed as a uint32_t diff --git a/srcpkgs/firefox-esr/patches/skia-sucks2.patch b/srcpkgs/firefox-esr/patches/skia-sucks2.patch index 207b3cf6733..1a498f8711d 100644 --- a/srcpkgs/firefox-esr/patches/skia-sucks2.patch +++ b/srcpkgs/firefox-esr/patches/skia-sucks2.patch @@ -4,8 +4,8 @@ For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h ---- gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 -+++ gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 +--- a/gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 ++++ b/gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 @@ -238,7 +238,18 @@ AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; } AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; } @@ -26,8 +26,8 @@ diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); } diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h ---- gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 -+++ gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 +--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 ++++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 @@ -203,7 +203,13 @@ // ~~~> // a = 1*aa + d(1-1*aa) = aa + d(1-aa) diff --git a/srcpkgs/firefox-esr/patches/skia-sucks3.patch b/srcpkgs/firefox-esr/patches/skia-sucks3.patch index f4e890f0536..908311cdb6d 100644 --- a/srcpkgs/firefox-esr/patches/skia-sucks3.patch +++ b/srcpkgs/firefox-esr/patches/skia-sucks3.patch @@ -13,8 +13,8 @@ Solution: This is not a real solution, but a hack. The real solution would have Side-effects: I have not yet found an unwanted side-effect. diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp ---- gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 -+++ gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 +--- a/gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 ++++ b/gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 @@ -1861,6 +1861,14 @@ SkCanvas::kPreserveLCDText_SaveLayerFlag | (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0)); @@ -30,8 +30,8 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp mCanvas->saveLayer(saveRec); SetPermitSubpixelAA(aOpaque); ---- gfx/layers/composite/CompositableHost.cpp -+++ gfx/layers/composite/CompositableHost.cpp +--- a/gfx/layers/composite/CompositableHost.cpp ++++ b/gfx/layers/composite/CompositableHost.cpp @@ -13,6 +13,7 @@ #include "ImageHost.h" // for ImageHostBuffered, etc #include "Layers.h" diff --git a/srcpkgs/firefox-esr/patches/sndio.patch b/srcpkgs/firefox-esr/patches/sndio.patch index c5e5c486dd1..959fc1ec913 100644 --- a/srcpkgs/firefox-esr/patches/sndio.patch +++ b/srcpkgs/firefox-esr/patches/sndio.patch @@ -1,5 +1,5 @@ ---- old-configure.in.orig -+++ old-configure.in +--- a/old-configure.in ++++ b/old-configure.in @@ -2818,6 +2818,22 @@ _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES" fi @@ -23,8 +23,8 @@ dnl ======================================================== dnl = dnl = Maintainer debug option (no --enable equivalent) ---- media/libcubeb/src/moz.build.orig -+++ media/libcubeb/src/moz.build +--- a/media/libcubeb/src/moz.build ++++ b/media/libcubeb/src/moz.build @@ -44,11 +44,13 @@ ] DEFINES['USE_JACK'] = True @@ -40,8 +40,8 @@ DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True if CONFIG['OS_TARGET'] == 'Darwin': ---- build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 -+++ - 2020-06-30 12:18:26.027756310 +0200 +--- a/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 ++++ b/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 @@ -210,6 +210,7 @@ @old_configure_options( '--cache-file', diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template index 38251ae0a73..e4ea57638c2 100644 --- a/srcpkgs/firefox-esr/template +++ b/srcpkgs/firefox-esr/template @@ -25,7 +25,6 @@ distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${versi checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40 lib32disabled=yes conflicts="firefox>=0" -patch_args=-Np0 build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland" build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland" diff --git a/srcpkgs/firefox/patches/avoid-redefinition.patch b/srcpkgs/firefox/patches/avoid-redefinition.patch index 22eb8baa1b5..867d37c62a9 100644 --- a/srcpkgs/firefox/patches/avoid-redefinition.patch +++ b/srcpkgs/firefox/patches/avoid-redefinition.patch @@ -3,8 +3,8 @@ Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones (linux/if.h), leading to redefinitions. We need to include net/if.h before linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt Upstream: No ---- dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c.orig 2020-07-28 19:24:32.359751046 +0200 -+++ dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c 2020-07-28 19:24:37.856343751 +0200 +--- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c 2020-07-28 19:24:32.359751046 +0200 ++++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c 2020-07-28 19:24:37.856343751 +0200 @@ -31,6 +31,7 @@ */ diff --git a/srcpkgs/firefox/patches/big-endian-image-decoders.patch b/srcpkgs/firefox/patches/big-endian-image-decoders.patch index ccb417b61f1..bd2f925c917 100644 --- a/srcpkgs/firefox/patches/big-endian-image-decoders.patch +++ b/srcpkgs/firefox/patches/big-endian-image-decoders.patch @@ -10,8 +10,8 @@ https://bug1626236.bmoattachments.org/attachment.cgi?id=9137096 imported patch decoder_workaround.patch diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp ---- image/decoders/nsGIFDecoder2.cpp Thu Feb 27 12:57:14 2020 +0100 -+++ image/decoders/nsGIFDecoder2.cpp Fri Mar 27 13:06:18 2020 +0100 +--- a/image/decoders/nsGIFDecoder2.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ b/image/decoders/nsGIFDecoder2.cpp Fri Mar 27 13:06:18 2020 +0100 @@ -422,6 +422,9 @@ MOZ_ASSERT(mSwizzleFn); uint8_t* data = reinterpret_cast(aColormap); @@ -23,8 +23,8 @@ diff -r 9cd90914846f image/decoders/nsGIFDecoder2.cpp LexerResult nsGIFDecoder2::DoDecode(SourceBufferIterator& aIterator, diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp ---- image/decoders/nsJPEGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 -+++ image/decoders/nsJPEGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 +--- a/image/decoders/nsJPEGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ b/image/decoders/nsJPEGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 @@ -263,6 +263,9 @@ case JCS_YCbCr: // By default, we will output directly to BGRA. If we need to apply @@ -44,8 +44,8 @@ diff -r 9cd90914846f image/decoders/nsJPEGDecoder.cpp case JCS_CMYK: case JCS_YCCK: diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp ---- image/decoders/nsPNGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 -+++ image/decoders/nsPNGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 +--- a/image/decoders/nsPNGDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ b/image/decoders/nsPNGDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 @@ -361,7 +361,7 @@ IResumable* aOnResume) { MOZ_ASSERT(!HasError(), "Shouldn't call DoDecode after error!"); @@ -71,8 +71,8 @@ diff -r 9cd90914846f image/decoders/nsPNGDecoder.cpp LexerTransition nsPNGDecoder::ReadPNGData( diff -r 9cd90914846f image/decoders/nsWebPDecoder.cpp ---- image/decoders/nsWebPDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 -+++ image/decoders/nsWebPDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 +--- a/image/decoders/nsWebPDecoder.cpp Thu Feb 27 12:57:14 2020 +0100 ++++ b/image/decoders/nsWebPDecoder.cpp Fri Mar 27 13:06:18 2020 +0100 @@ -237,7 +237,12 @@ // WebP doesn't guarantee that the alpha generated matches the hint in the // header, so we always need to claim the input is BGRA. If the output is diff --git a/srcpkgs/firefox/patches/fix-arm-opus-include.patch b/srcpkgs/firefox/patches/fix-arm-opus-include.patch index 6e0c5875da3..b0c052f4009 100644 --- a/srcpkgs/firefox/patches/fix-arm-opus-include.patch +++ b/srcpkgs/firefox/patches/fix-arm-opus-include.patch @@ -1,5 +1,5 @@ ---- media/libopus/silk/arm/arm_silk_map.c.orig 2019-03-19 20:55:01.249609964 +0100 -+++ media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:25.769400255 +0100 +--- a/media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:01.249609964 +0100 ++++ b/media/libopus/silk/arm/arm_silk_map.c 2019-03-19 20:55:25.769400255 +0100 @@ -28,7 +28,7 @@ # include "config.h" #endif diff --git a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch b/srcpkgs/firefox/patches/fix-desktop-icon-path.patch index 60af12e80b1..c4664d3da7c 100644 --- a/srcpkgs/firefox/patches/fix-desktop-icon-path.patch +++ b/srcpkgs/firefox/patches/fix-desktop-icon-path.patch @@ -1,5 +1,5 @@ ---- taskcluster/docker/firefox-snap/firefox.desktop.orig 2019-01-18 19:31:39.428839442 +0100 -+++ taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:32:20.689063456 +0100 +--- a/taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:31:39.428839442 +0100 ++++ b/taskcluster/docker/firefox-snap/firefox.desktop 2019-01-18 19:32:20.689063456 +0100 @@ -154,7 +154,7 @@ Terminal=false X-MultipleArgs=false diff --git a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch index 6df609bbf16..717f3cd2f9c 100644 --- a/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch +++ b/srcpkgs/firefox/patches/fix-i686-ppc-musl.patch @@ -1,5 +1,5 @@ ---- mozglue/misc/StackWalk.cpp 2017-04-11 04:13:21.000000000 +0200 -+++ mozglue/misc/StackWalk.cpp 2017-11-29 15:23:07.218649970 +0100 +--- a/mozglue/misc/StackWalk.cpp 2017-04-11 04:13:21.000000000 +0200 ++++ b/mozglue/misc/StackWalk.cpp 2017-11-29 15:23:07.218649970 +0100 @@ -41,7 +41,7 @@ #define MOZ_STACKWALK_SUPPORTS_MACOSX 0 #endif diff --git a/srcpkgs/firefox/patches/fix-image-format-warning.patch b/srcpkgs/firefox/patches/fix-image-format-warning.patch index 9b3b38d9065..7cdff60ce2f 100644 --- a/srcpkgs/firefox/patches/fix-image-format-warning.patch +++ b/srcpkgs/firefox/patches/fix-image-format-warning.patch @@ -6,8 +6,8 @@ # Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5 handle big-endian formats in Cairo format conversions ---- gfx/2d/HelpersCairo.h -+++ gfx/2d/HelpersCairo.h +--- a/gfx/2d/HelpersCairo.h ++++ b/gfx/2d/HelpersCairo.h @@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su case SurfaceFormat::R5G6B5_UINT16: return CAIRO_FORMAT_RGB16_565; diff --git a/srcpkgs/firefox/patches/fix-tools.patch b/srcpkgs/firefox/patches/fix-tools.patch index 1af39bc6118..94de423ce59 100644 --- a/srcpkgs/firefox/patches/fix-tools.patch +++ b/srcpkgs/firefox/patches/fix-tools.patch @@ -1,5 +1,5 @@ ---- tools/profiler/core/platform-linux-android.cpp.orig 2019-01-29 12:09:40.980448579 +0100 -+++ tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100 +--- a/tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:09:40.980448579 +0100 ++++ b/tools/profiler/core/platform-linux-android.cpp 2019-01-29 12:11:09.689590967 +0100 @@ -497,8 +501,10 @@ ucontext_t sSyncUContext; diff --git a/srcpkgs/firefox/patches/fix-wasm-arm.patch b/srcpkgs/firefox/patches/fix-wasm-arm.patch index e6ad61c9f44..a6035e87616 100644 --- a/srcpkgs/firefox/patches/fix-wasm-arm.patch +++ b/srcpkgs/firefox/patches/fix-wasm-arm.patch @@ -1,5 +1,5 @@ ---- js/src/wasm/WasmSignalHandlers.cpp -+++ js/src/wasm/WasmSignalHandlers.cpp +--- a/js/src/wasm/WasmSignalHandlers.cpp ++++ b/js/src/wasm/WasmSignalHandlers.cpp @@ -243,9 +243,9 @@ // If you run into compile problems on a tier-3 platform, you can disable the // emulation here. diff --git a/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch b/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch index e38d1b9dd8f..5d17021a99f 100644 --- a/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch +++ b/srcpkgs/firefox/patches/fix-webrtc-glibcisms.patch @@ -1,5 +1,5 @@ ---- third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c.orig 2019-01-29 11:20:52.298793223 +0100 -+++ third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:21:48.250250850 +0100 +--- a/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:20:52.298793223 +0100 ++++ b/third_party/libwebrtc/webrtc/system_wrappers/source/cpu_features_linux.c 2019-01-29 11:21:48.250250850 +0100 @@ -14,7 +14,7 @@ #ifndef __GLIBC_PREREQ #define __GLIBC_PREREQ(a, b) 0 diff --git a/srcpkgs/firefox/patches/flac-no-ffvpx.patch b/srcpkgs/firefox/patches/flac-no-ffvpx.patch index 740f5614456..ebf48deb972 100644 --- a/srcpkgs/firefox/patches/flac-no-ffvpx.patch +++ b/srcpkgs/firefox/patches/flac-no-ffvpx.patch @@ -2,8 +2,8 @@ Enable FLAC on platforms without ffvpx like powerpc* diff --git dom/media/flac/FlacDecoder.cpp dom/media/flac/FlacDecoder.cpp index 53fc3c9937f7..b23771ab80fa 100644 ---- dom/media/flac/FlacDecoder.cpp -+++ dom/media/flac/FlacDecoder.cpp +--- a/dom/media/flac/FlacDecoder.cpp ++++ b/dom/media/flac/FlacDecoder.cpp @@ -7,6 +7,7 @@ #include "FlacDecoder.h" #include "MediaContainerType.h" diff --git a/srcpkgs/firefox/patches/mallinfo.patch b/srcpkgs/firefox/patches/mallinfo.patch index afea86c0a2c..0d704301f39 100644 --- a/srcpkgs/firefox/patches/mallinfo.patch +++ b/srcpkgs/firefox/patches/mallinfo.patch @@ -1,5 +1,5 @@ ---- xpcom/base/nsMemoryReporterManager.cpp.orig 2019-03-19 17:12:20.844810044 +0100 -+++ xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100 +--- a/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:12:20.844810044 +0100 ++++ b/xpcom/base/nsMemoryReporterManager.cpp 2019-03-19 17:13:32.505133615 +0100 @@ -123,6 +123,7 @@ return GetProcSelfSmapsPrivate(aN); } diff --git a/srcpkgs/firefox/patches/ppc32-fix-build.patch b/srcpkgs/firefox/patches/ppc32-fix-build.patch index c1a8f422d0a..b26a46cfe83 100644 --- a/srcpkgs/firefox/patches/ppc32-fix-build.patch +++ b/srcpkgs/firefox/patches/ppc32-fix-build.patch @@ -7,8 +7,8 @@ Ref: https://hg.mozilla.org/mozilla-central/rev/d16fcad6aa60 Ref: https://hg.mozilla.org/mozilla-central/rev/ab87611d012e Ref: https://hg.mozilla.org/mozilla-central/file/tip/xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp ---- xpcom/reflect/xptcall/xptcall.h -+++ xpcom/reflect/xptcall/xptcall.h +--- a/xpcom/reflect/xptcall/xptcall.h ++++ b/xpcom/reflect/xptcall/xptcall.h @@ -71,6 +71,11 @@ struct nsXPTCVariant { ExtendedVal ext; }; diff --git a/srcpkgs/firefox/patches/rust-configure.patch b/srcpkgs/firefox/patches/rust-configure.patch index 78857179f4d..61fb2ba891d 100644 --- a/srcpkgs/firefox/patches/rust-configure.patch +++ b/srcpkgs/firefox/patches/rust-configure.patch @@ -6,8 +6,8 @@ instead use what is set in RUST_TARGET Skip extra checks on cross builds (broken for arm*) ---- build/moz.configure/rust.configure 2020-12-12 01:35:33.000000000 +0100 -+++ build/moz.configure/rust.configure 2020-12-15 19:45:16.467750787 +0100 +--- a/build/moz.configure/rust.configure 2020-12-12 01:35:33.000000000 +0100 ++++ b/build/moz.configure/rust.configure 2020-12-15 19:45:16.467750787 +0100 @@ -91,9 +91,6 @@ return unwrap diff --git a/srcpkgs/firefox/patches/sandbox-fork.patch b/srcpkgs/firefox/patches/sandbox-fork.patch index 8f7c9ab8201..d4584e74b91 100644 --- a/srcpkgs/firefox/patches/sandbox-fork.patch +++ b/srcpkgs/firefox/patches/sandbox-fork.patch @@ -1,7 +1,7 @@ make SYS_fork non-fatal, musl uses it for fork(2) ---- security/sandbox/linux/SandboxFilter.cpp -+++ security/sandbox/linux/SandboxFilter.cpp +--- a/security/sandbox/linux/SandboxFilter.cpp ++++ b/security/sandbox/linux/SandboxFilter.cpp @@ -1420,6 +1420,10 @@ // usually do something reasonable on error. case __NR_clone: diff --git a/srcpkgs/firefox/patches/sandbox-largefile.patch b/srcpkgs/firefox/patches/sandbox-largefile.patch index 494ca82df5a..6ee7f3a8215 100644 --- a/srcpkgs/firefox/patches/sandbox-largefile.patch +++ b/srcpkgs/firefox/patches/sandbox-largefile.patch @@ -1,5 +1,5 @@ ---- security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:41:14.556378950 +0100 -+++ security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:40:23.595806444 +0100 +--- a/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:41:14.556378950 +0100 ++++ b/security/sandbox/linux/SandboxFilter.cpp 2020-11-23 22:40:23.595806444 +0100 @@ -68,7 +68,13 @@ // The headers define O_LARGEFILE as 0 on x86_64, but we need the diff --git a/srcpkgs/firefox/patches/skia-sucks1.patch b/srcpkgs/firefox/patches/skia-sucks1.patch index 05ad34a3fc3..cd9eecccf61 100644 --- a/srcpkgs/firefox/patches/skia-sucks1.patch +++ b/srcpkgs/firefox/patches/skia-sucks1.patch @@ -1,8 +1,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5 https://bugzilla.mozilla.org/attachment.cgi?id=9028600 ---- gfx/skia/skia/third_party/skcms/skcms.cc -+++ gfx/skia/skia/third_party/skcms/skcms.cc +--- a/gfx/skia/skia/third_party/skcms/skcms.cc ++++ b/gfx/skia/skia/third_party/skcms/skcms.cc @@ -30,6 +30,8 @@ #include #include @@ -45,8 +45,8 @@ https://bugzilla.mozilla.org/attachment.cgi?id=9028600 #endif } ---- gfx/2d/DrawTargetSkia.cpp -+++ gfx/2d/DrawTargetSkia.cpp +--- a/gfx/2d/DrawTargetSkia.cpp ++++ b/gfx/2d/DrawTargetSkia.cpp @@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a return surfaceBounds.Intersect(bounds); } @@ -57,8 +57,8 @@ https://bugzilla.mozilla.org/attachment.cgi?id=9028600 static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize, const int32_t aStride, SurfaceFormat aFormat) { ---- gfx/2d/Types.h -+++ gfx/2d/Types.h +--- a/gfx/2d/Types.h ++++ b/gfx/2d/Types.h @@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t { // The following values are endian-independent synonyms. The _UINT32 suffix // indicates that the name reflects the layout when viewed as a uint32_t diff --git a/srcpkgs/firefox/patches/skia-sucks2.patch b/srcpkgs/firefox/patches/skia-sucks2.patch index 207b3cf6733..1a498f8711d 100644 --- a/srcpkgs/firefox/patches/skia-sucks2.patch +++ b/srcpkgs/firefox/patches/skia-sucks2.patch @@ -4,8 +4,8 @@ For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white). diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h ---- gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 -+++ gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 +--- a/gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200 ++++ b/gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200 @@ -238,7 +238,18 @@ AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; } AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; } @@ -26,8 +26,8 @@ diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); } diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h ---- gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 -+++ gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 +--- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200 ++++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200 @@ -203,7 +203,13 @@ // ~~~> // a = 1*aa + d(1-1*aa) = aa + d(1-aa) diff --git a/srcpkgs/firefox/patches/skia-sucks3.patch b/srcpkgs/firefox/patches/skia-sucks3.patch index f4e890f0536..908311cdb6d 100644 --- a/srcpkgs/firefox/patches/skia-sucks3.patch +++ b/srcpkgs/firefox/patches/skia-sucks3.patch @@ -13,8 +13,8 @@ Solution: This is not a real solution, but a hack. The real solution would have Side-effects: I have not yet found an unwanted side-effect. diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp ---- gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 -+++ gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 +--- a/gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200 ++++ b/gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100 @@ -1861,6 +1861,14 @@ SkCanvas::kPreserveLCDText_SaveLayerFlag | (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0)); @@ -30,8 +30,8 @@ diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp mCanvas->saveLayer(saveRec); SetPermitSubpixelAA(aOpaque); ---- gfx/layers/composite/CompositableHost.cpp -+++ gfx/layers/composite/CompositableHost.cpp +--- a/gfx/layers/composite/CompositableHost.cpp ++++ b/gfx/layers/composite/CompositableHost.cpp @@ -13,6 +13,7 @@ #include "ImageHost.h" // for ImageHostBuffered, etc #include "Layers.h" diff --git a/srcpkgs/firefox/patches/sndio.patch b/srcpkgs/firefox/patches/sndio.patch index 41c97e6e006..68628bea8d8 100644 --- a/srcpkgs/firefox/patches/sndio.patch +++ b/srcpkgs/firefox/patches/sndio.patch @@ -1,5 +1,5 @@ ---- old-configure.in.orig -+++ old-configure.in +--- a/old-configure.in ++++ b/old-configure.in @@ -2818,6 +2818,22 @@ _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_COOKIES" fi @@ -23,8 +23,8 @@ dnl ======================================================== dnl = dnl = Maintainer debug option (no --enable equivalent) ---- media/libcubeb/src/moz.build.orig -+++ media/libcubeb/src/moz.build +--- a/media/libcubeb/src/moz.build ++++ b/media/libcubeb/src/moz.build @@ -44,11 +44,13 @@ ] DEFINES['USE_JACK'] = True @@ -40,8 +40,8 @@ DEFINES['DISABLE_LIBSNDIO_DLOPEN'] = True if CONFIG['OS_TARGET'] == 'Darwin': ---- build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 -+++ - 2020-06-30 12:18:26.027756310 +0200 +--- a/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 ++++ b/build/moz.configure/old.configure 2020-06-30 12:17:04.087609070 +0200 @@ -88,6 +88,7 @@ @old_configure_options( "--cache-file", diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 01dfcc17657..3ce8a92ecbb 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -12,7 +12,6 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.mozilla.org/firefox/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" checksum=db43d7d5796455051a5b847f6daa3423393803c9288c8b6d7f1186f5e2e0a90a -patch_args=-Np0 lib32disabled=yes diff --git a/srcpkgs/firejail/patches/musl.patch b/srcpkgs/firejail/patches/musl.patch index a33fdeccda2..151491cf7e1 100644 --- a/srcpkgs/firejail/patches/musl.patch +++ b/srcpkgs/firejail/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/firejail/main.c.orig -+++ src/firejail/main.c +--- a/src/firejail/main.c ++++ b/src/firejail/main.c @@ -31,7 +31,7 @@ #include #include diff --git a/srcpkgs/firejail/template b/srcpkgs/firejail/template index ab0544ef2e0..6b6a27403ec 100644 --- a/srcpkgs/firejail/template +++ b/srcpkgs/firejail/template @@ -14,6 +14,5 @@ changelog="https://github.com/netblue30/firejail/raw/master/RELNOTES" distfiles="https://github.com/netblue30/firejail/archive/${version}.tar.gz" checksum=17a20c4c9f114aa8fdab467cecb60309f599ad08b4bbb3e751c992d98a95ac18 conf_files="/etc/firejail/* /etc/apparmor.d/local/firejail-default" -patch_args=-Np0 nocross=yes diff --git a/srcpkgs/flatpak-builder/patches/fix-temp-failure-retry.patch b/srcpkgs/flatpak-builder/patches/fix-temp-failure-retry.patch index 1df25807713..99527594638 100644 --- a/srcpkgs/flatpak-builder/patches/fix-temp-failure-retry.patch +++ b/srcpkgs/flatpak-builder/patches/fix-temp-failure-retry.patch @@ -1,6 +1,6 @@ index 0000000..878bd82 --- /dev/null -+++ libglnx/config.h ++++ b/libglnx/config.h @@ -0,0 +1,9 @@ +/* taken from glibc unistd.h and fixes musl */ +#ifndef TEMP_FAILURE_RETRY diff --git a/srcpkgs/flatpak-builder/template b/srcpkgs/flatpak-builder/template index 6435f58c3f6..208481c58b2 100644 --- a/srcpkgs/flatpak-builder/template +++ b/srcpkgs/flatpak-builder/template @@ -14,7 +14,6 @@ distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz checksum=4780c1b8e0838ffb64e9639bd7801417964fd818c7c6d5e9afca4d5511ded2c8 # Tests expects a Debian derivate hosts to build a flatpak container from. make_check=no -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" flatpak-devel" diff --git a/srcpkgs/flatpak/patches/musl-macros.patch b/srcpkgs/flatpak/patches/musl-macros.patch index a810d49d334..569744ce545 100644 --- a/srcpkgs/flatpak/patches/musl-macros.patch +++ b/srcpkgs/flatpak/patches/musl-macros.patch @@ -1,5 +1,5 @@ ---- config.h.in.orig -+++ config.h.in +--- a/config.h.in ++++ b/config.h.in @@ -151,3 +151,12 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index d3bfe457845..da8807535ee 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -23,7 +23,6 @@ homepage="https://flatpak.org/" changelog="https://github.com/flatpak/flatpak/raw/master/NEWS" distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz" checksum=db152739d072f8ff299e4e888d8963a1b4538da7b10e0b86525be438f2e1dde4 -patch_args=-Np0 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/flex/patches/disable-tests.patch b/srcpkgs/flex/patches/disable-tests.patch index 96dd18690f0..e3f6819b085 100644 --- a/srcpkgs/flex/patches/disable-tests.patch +++ b/srcpkgs/flex/patches/disable-tests.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2015-11-18 07:34:53.757836866 +0100 -+++ Makefile.in 2015-11-18 07:35:01.197909320 +0100 +--- a/Makefile.in 2015-11-18 07:34:53.757836866 +0100 ++++ b/Makefile.in 2015-11-18 07:35:01.197909320 +0100 @@ -450,7 +450,6 @@ SUBDIRS = \ doc \ examples \ diff --git a/srcpkgs/flex/patches/no-help2man.patch b/srcpkgs/flex/patches/no-help2man.patch index 5bcca3990da..b74c95a4117 100644 --- a/srcpkgs/flex/patches/no-help2man.patch +++ b/srcpkgs/flex/patches/no-help2man.patch @@ -1,5 +1,5 @@ ---- doc/Makefile.in.orig 2017-05-17 09:26:34.592412829 +0200 -+++ doc/Makefile.in 2017-05-17 09:27:07.176392146 +0200 +--- a/doc/Makefile.in 2017-05-17 09:26:34.592412829 +0200 ++++ b/doc/Makefile.in 2017-05-17 09:27:07.176392146 +0200 @@ -241,7 +241,6 @@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_V GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ diff --git a/srcpkgs/flex/template b/srcpkgs/flex/template index 60b111758bd..f07dee0ee48 100644 --- a/srcpkgs/flex/template +++ b/srcpkgs/flex/template @@ -13,7 +13,6 @@ license="custom:flex" homepage="https://github.com/westes/flex" distfiles="https://github.com/westes/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz" checksum=e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995 -patch_args=-Np0 # Required to enable the definition of reallocarray() in stdlib.h CFLAGS="-D_GNU_SOURCE" diff --git a/srcpkgs/flightgear/patches/musl-fenv.patch b/srcpkgs/flightgear/patches/musl-fenv.patch index 2192fb9a7d7..8a0922f57d8 100644 --- a/srcpkgs/flightgear/patches/musl-fenv.patch +++ b/srcpkgs/flightgear/patches/musl-fenv.patch @@ -2,8 +2,8 @@ Simply disabling the code which enables floating point exceptions is probably wrong, but I don't have a replacement for the non-posix functions fegetexcept(3) and feenableexcept(3). ---- src/Main/bootstrap.cxx 2015-02-18 21:10:05.000000000 +0100 -+++ src/Main/bootstrap.cxx 2015-11-01 01:25:56.665212195 +0100 +--- a/src/Main/bootstrap.cxx 2015-02-18 21:10:05.000000000 +0100 ++++ b/src/Main/bootstrap.cxx 2015-11-01 01:25:56.665212195 +0100 @@ -96,8 +96,12 @@ initFPE (bool fpeAbort) { diff --git a/srcpkgs/flightgear/patches/musl-fix_error_h.patch b/srcpkgs/flightgear/patches/musl-fix_error_h.patch index 1e3b04e9362..587ee1f530b 100644 --- a/srcpkgs/flightgear/patches/musl-fix_error_h.patch +++ b/srcpkgs/flightgear/patches/musl-fix_error_h.patch @@ -1,8 +1,8 @@ There is no in musl libc, thus enable the include only if __GLIB__ is defined. ---- 3rdparty/iaxclient/lib/libiax2/src/iax.c 2015-02-18 21:10:05.000000000 +0100 -+++ 3rdparty/iaxclient/lib/libiax2/src/iax.c 2015-10-31 17:14:55.477461723 +0100 +--- a/3rdparty/iaxclient/lib/libiax2/src/iax.c 2015-02-18 21:10:05.000000000 +0100 ++++ b/3rdparty/iaxclient/lib/libiax2/src/iax.c 2015-10-31 17:14:55.477461723 +0100 @@ -75,7 +75,7 @@ // FlightGear: Modified to include FreeBSD #if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) diff --git a/srcpkgs/flightgear/patches/musl-fix_feenableexcept.patch b/srcpkgs/flightgear/patches/musl-fix_feenableexcept.patch index 2b967478e4b..9d456a2d281 100644 --- a/srcpkgs/flightgear/patches/musl-fix_feenableexcept.patch +++ b/srcpkgs/flightgear/patches/musl-fix_feenableexcept.patch @@ -1,5 +1,5 @@ ---- src/FDM/JSBSim/JSBSim.cpp 2017-03-01 21:06:31.000000000 +0100 -+++ src/FDM/JSBSim/JSBSim.cpp 2017-03-17 09:49:13.115544107 +0100 +--- a/src/FDM/JSBSim/JSBSim.cpp 2017-03-01 21:06:31.000000000 +0100 ++++ b/src/FDM/JSBSim/JSBSim.cpp 2017-03-17 09:49:13.115544107 +0100 @@ -287,7 +287,7 @@ _clearfp(); _controlfp(_controlfp(0, 0) & ~(_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW), diff --git a/srcpkgs/flightgear/patches/musl-fix_fpos_t.patch b/srcpkgs/flightgear/patches/musl-fix_fpos_t.patch index 2cf9e559b3a..c3f709b0644 100644 --- a/srcpkgs/flightgear/patches/musl-fix_fpos_t.patch +++ b/srcpkgs/flightgear/patches/musl-fix_fpos_t.patch @@ -1,8 +1,8 @@ For musl libc return the file position using ftell(3) because fpos_t is opaque. ---- 3rdparty/hts_engine_API/lib/HTS_misc.c 2015-02-18 21:10:05.000000000 +0100 -+++ 3rdparty/hts_engine_API/lib/HTS_misc.c 2015-10-31 17:33:53.946349145 +0100 +--- a/3rdparty/hts_engine_API/lib/HTS_misc.c 2015-02-18 21:10:05.000000000 +0100 ++++ b/3rdparty/hts_engine_API/lib/HTS_misc.c 2015-10-31 17:33:53.946349145 +0100 @@ -247,8 +247,10 @@ fgetpos((FILE *) fp->pointer, &pos); #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__FreeBSD__) diff --git a/srcpkgs/flightgear/patches/time64.patch b/srcpkgs/flightgear/patches/time64.patch index c0f7db15695..367f884452a 100644 --- a/srcpkgs/flightgear/patches/time64.patch +++ b/srcpkgs/flightgear/patches/time64.patch @@ -1,5 +1,5 @@ ---- src/Input/FGLinuxEventInput.cxx 2020-06-26 00:08:15.000000000 +0200 -+++ src/Input/FGLinuxEventInput.cxx 2020-12-07 07:51:45.332825252 +0100 +--- a/src/Input/FGLinuxEventInput.cxx 2020-06-26 00:08:15.000000000 +0200 ++++ b/src/Input/FGLinuxEventInput.cxx 2020-12-07 07:51:45.332825252 +0100 @@ -415,8 +415,8 @@ evt.type=typeCode.type; evt.code = typeCode.code; diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template index ac8cb4c9032..e5528205b9e 100644 --- a/srcpkgs/flightgear/template +++ b/srcpkgs/flightgear/template @@ -22,7 +22,6 @@ checksum=" 1f07e8ef2c558dae3b9738e313b57e711d38e569f85d49fc2c5ae647e3949a17 2196f4ffcdeaae3a8b0a2b6ebf62a456bfd0198abb6c0619f763204d89804a03" python_version=2 -patch_args=-Np0 nocross=https://build.voidlinux.org/builders/armv7l-musl_builder/builds/4773/steps/shell_3/logs/stdio diff --git a/srcpkgs/flowcanvas/patches/graphviz-2.30.patch b/srcpkgs/flowcanvas/patches/graphviz-2.30.patch index 1338a683286..d84331e215b 100644 --- a/srcpkgs/flowcanvas/patches/graphviz-2.30.patch +++ b/srcpkgs/flowcanvas/patches/graphviz-2.30.patch @@ -1,5 +1,5 @@ ---- src/Canvas.cpp.orig 2011-01-10 00:19:58.000000000 +0100 -+++ src/Canvas.cpp 2013-03-16 13:45:17.797462753 +0100 +--- a/src/Canvas.cpp 2011-01-10 00:19:58.000000000 +0100 ++++ b/src/Canvas.cpp 2013-03-16 13:45:17.797462753 +0100 @@ -1253,21 +1253,21 @@ */ @@ -44,8 +44,8 @@ } } ---- wscript.orig 2011-01-12 00:09:31.000000000 +0100 -+++ wscript 2013-03-16 14:19:43.577462602 +0100 +--- a/wscript 2011-01-12 00:09:31.000000000 +0100 ++++ b/wscript 2013-03-16 14:19:43.577462602 +0100 @@ -41,6 +41,7 @@ conf.check_tool('compiler_cxx') autowaf.check_pkg(conf, 'libgvc', uselib_store='AGRAPH', diff --git a/srcpkgs/flowcanvas/template b/srcpkgs/flowcanvas/template index 10fd327e1c9..4b61be70106 100644 --- a/srcpkgs/flowcanvas/template +++ b/srcpkgs/flowcanvas/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://drobilla.net/software/flowcanvas/" distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" checksum=047928d858fd1e9296a9984de7468c86bbe23fc42e286691b8f273541402c596 -patch_args=-Np0 CXXFLAGS="-std=c++11" diff --git a/srcpkgs/foobillard++/patches/data-dir.patch b/srcpkgs/foobillard++/patches/data-dir.patch index 986b1e14a34..c7c7c85764e 100644 --- a/srcpkgs/foobillard++/patches/data-dir.patch +++ b/srcpkgs/foobillard++/patches/data-dir.patch @@ -1,7 +1,7 @@ diff --git src/sys_stuff.c src/sys_stuff.c index 8f65f6b..7b905cf 100644 ---- src/sys_stuff.c -+++ src/sys_stuff.c +--- a/src/sys_stuff.c ++++ b/src/sys_stuff.c @@ -756,37 +756,18 @@ void sys_main_loop(void) { * Find the program's "data" directory and chdir into it * ***********************************************************************/ diff --git a/srcpkgs/foobillard++/template b/srcpkgs/foobillard++/template index 185f4f62b16..d92355a8cab 100644 --- a/srcpkgs/foobillard++/template +++ b/srcpkgs/foobillard++/template @@ -19,7 +19,6 @@ CFLAGS="-fgnu89-inline" # flags from freetype-config and sdl-config CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/freetype2" CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/SDL -D_GNU_SOURCE=1" -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/foomatic-db-engine/patches/patch-foomatic-getpjloptions.in.diff b/srcpkgs/foomatic-db-engine/patches/patch-foomatic-getpjloptions.in.diff index 437fb9694e4..cc312861060 100644 --- a/srcpkgs/foomatic-db-engine/patches/patch-foomatic-getpjloptions.in.diff +++ b/srcpkgs/foomatic-db-engine/patches/patch-foomatic-getpjloptions.in.diff @@ -1,5 +1,5 @@ ---- foomatic-getpjloptions.in 2015-02-14 07:21:56.000000000 -0500 -+++ foomatic-getpjloptions.in 2015-02-15 07:36:23.000000000 -0500 +--- a/foomatic-getpjloptions.in 2015-02-14 07:21:56.000000000 -0500 ++++ b/foomatic-getpjloptions.in 2015-02-15 07:36:23.000000000 -0500 @@ -1,3 +1,3 @@ -#!@SH@ +#!/bin/sh diff --git a/srcpkgs/foomatic-db-engine/template b/srcpkgs/foomatic-db-engine/template index 909ca2605b9..dc1a21716e5 100644 --- a/srcpkgs/foomatic-db-engine/template +++ b/srcpkgs/foomatic-db-engine/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://www.openprinting.org/" distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz" checksum=b5c89027aa26967d2e6db62e2af7db0c4039d2480d4fbf2476a6ddcf609a5faf -patch_args=-Np0 post_configure() { # Compiling and linking in one step requires $(LDFLAGS) diff --git a/srcpkgs/foremost/patches/foremost-1.4-config-location.patch b/srcpkgs/foremost/patches/foremost-1.4-config-location.patch index 6e67a21cdbf..73a4190aa97 100644 --- a/srcpkgs/foremost/patches/foremost-1.4-config-location.patch +++ b/srcpkgs/foremost/patches/foremost-1.4-config-location.patch @@ -1,5 +1,5 @@ ---- config.c 2006-08-31 17:50:47.000000000 +0100 -+++ config.c 2006-08-31 17:51:09.000000000 +0100 +--- a/config.c 2006-08-31 17:50:47.000000000 +0100 ++++ b/config.c 2006-08-31 17:51:09.000000000 +0100 @@ -288,7 +288,7 @@ #ifdef __WIN32 set_config_file(s, "/Program Files/foremost/foremost.conf"); diff --git a/srcpkgs/foremost/template b/srcpkgs/foremost/template index 91e33666702..cb463049d37 100644 --- a/srcpkgs/foremost/template +++ b/srcpkgs/foremost/template @@ -9,7 +9,6 @@ license="Public Domain" homepage="http://foremost.sourceforge.net/" distfiles="http://foremost.sourceforge.net/pkg/foremost-${version}.tar.gz" checksum=502054ef212e3d90b292e99c7f7ac91f89f024720cd5a7e7680c3d1901ef5f34 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/fossil/patches/cross.patch b/srcpkgs/fossil/patches/cross.patch index fe85752d2b7..79ce61fcdcd 100644 --- a/srcpkgs/fossil/patches/cross.patch +++ b/srcpkgs/fossil/patches/cross.patch @@ -1,7 +1,7 @@ diff --git a/src/main.mk b/src/main.mk index 9818cbd..1c248b8 100644 ---- src/main.mk -+++ src/main.mk +--- a/src/main.mk ++++ b/src/main.mk @@ -10,7 +10,7 @@ # This file is included by primary Makefile. # diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template index 6773f5d8544..0e8afbbdadf 100644 --- a/srcpkgs/fossil/template +++ b/srcpkgs/fossil/template @@ -13,7 +13,6 @@ homepage="https://www.fossil-scm.org" changelog="https://www.fossil-scm.org/home/doc/trunk/www/changes.wiki" distfiles="https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" checksum=80d27923c663b2a2c710f8ae8cd549862e04f8c04285706274c34ae3c8ca17d1 -patch_args=-Np0 post_extract() { vsed -i 's/test_system_sqlite$/# &/' auto.def # failing on cross diff --git a/srcpkgs/fotoxx/patches/execinfo.patch b/srcpkgs/fotoxx/patches/execinfo.patch index 073c7aef1b2..c228f35af22 100644 --- a/srcpkgs/fotoxx/patches/execinfo.patch +++ b/srcpkgs/fotoxx/patches/execinfo.patch @@ -1,7 +1,7 @@ diff --git Makefile Makefile index 218aa2d..77ec75e 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -47,4 +47,4 @@ CFLAGS = $(CXXFLAGS) $(CPPFLAGS) -c \ -I/usr/include/libchamplain-0.12/ diff --git a/srcpkgs/fotoxx/patches/musl_build.patch b/srcpkgs/fotoxx/patches/musl_build.patch index b6d9fb95b7a..f42dda8d82f 100644 --- a/srcpkgs/fotoxx/patches/musl_build.patch +++ b/srcpkgs/fotoxx/patches/musl_build.patch @@ -1,7 +1,7 @@ diff --git f.file.cc f.file.cc index 7c4f083..f2c9c07 100644 ---- f.file.cc -+++ f.file.cc +--- a/f.file.cc ++++ b/f.file.cc @@ -3493,6 +3493,7 @@ int find_imagefiles(cchar *folder, int flags, char **&flist, int &NF, int Finit) +#ifdef GLOB_ONLYDIR if (Fdirs && ! Fimages && ! Fthumbs) diff --git a/srcpkgs/fotoxx/template b/srcpkgs/fotoxx/template index d954ae81449..a3c968fcdef 100644 --- a/srcpkgs/fotoxx/template +++ b/srcpkgs/fotoxx/template @@ -14,7 +14,6 @@ license="GPL-3.0-or-later" homepage="https://www.kornelix.net/fotoxx/fotoxx.html" distfiles="https://www.kornelix.net/downloads/downloads/fotoxx-${version}.tar.gz" checksum=0c16597053ce8e186fb8163839f4f4ed44548bf00e43e88951f4346a9dbbb620 -patch_args=-Np0 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/champlain-0.12" diff --git a/srcpkgs/fprint_demo/patches/ftbfs-libfprint-080.patch b/srcpkgs/fprint_demo/patches/ftbfs-libfprint-080.patch index 69bc00c7732..3bc6e81aa17 100644 --- a/srcpkgs/fprint_demo/patches/ftbfs-libfprint-080.patch +++ b/srcpkgs/fprint_demo/patches/ftbfs-libfprint-080.patch @@ -10,8 +10,8 @@ With API to be added to libfprint 0.8.3 diff --git a/src/verify.c b/src/verify.c index d3777bc..4f7f8e9 100644 ---- src/verify.c -+++ src/verify.c +--- a/src/verify.c ++++ b/src/verify.c @@ -236,7 +236,11 @@ static void plot_minutiae(unsigned char *rgbdata, int width, int height, for (i = 0; i < nr_minutiae; i++) { diff --git a/srcpkgs/fprint_demo/template b/srcpkgs/fprint_demo/template index 8e08614dbf4..723fa68f3f7 100644 --- a/srcpkgs/fprint_demo/template +++ b/srcpkgs/fprint_demo/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="http://www.freedesktop.org/wiki/Software/fprint/fprint_demo/" distfiles="https://github.com/dsd/${pkgname}/archive/v${version}.tar.gz" checksum=6f54f43e0a015cd83504a2c726a59154c5aee83e229e8494d54e592624ee3ad5 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/frame/patches/fix-gcc6-uninitialized.patch b/srcpkgs/frame/patches/fix-gcc6-uninitialized.patch index fa16612a142..ccb56d27f57 100644 --- a/srcpkgs/frame/patches/fix-gcc6-uninitialized.patch +++ b/srcpkgs/frame/patches/fix-gcc6-uninitialized.patch @@ -1,8 +1,8 @@ Initialize variables which gcc6 for musl libc complains may be unitialized when returned. ---- src/touch.cpp 2013-02-08 20:05:24.000000000 +0100 -+++ src/touch.cpp 2016-10-04 10:57:05.683000000 +0200 +--- a/src/touch.cpp 2013-02-08 20:05:24.000000000 +0100 ++++ b/src/touch.cpp 2016-10-04 10:57:05.683000000 +0200 @@ -195,7 +195,7 @@ } diff --git a/srcpkgs/frame/template b/srcpkgs/frame/template index d43faff47cc..faf98cc4493 100644 --- a/srcpkgs/frame/template +++ b/srcpkgs/frame/template @@ -12,7 +12,6 @@ license="LGPL-3.0-only" homepage="https://launchpad.net/frame" distfiles="https://launchpad.net/${pkgname}/trunk/v${version}/+download/${pkgname}-${version}.tar.gz" checksum=cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f -patch_args=-Np0 frame-devel_package() { depends="frame>=${version}_${revision}" diff --git a/srcpkgs/freecad/patches/002-execinfo.patch b/srcpkgs/freecad/patches/002-execinfo.patch index 471e06e6453..bcdca77a72a 100644 --- a/srcpkgs/freecad/patches/002-execinfo.patch +++ b/srcpkgs/freecad/patches/002-execinfo.patch @@ -1,5 +1,5 @@ ---- src/App/Application.cpp.ORIG 2020-01-22 23:27:42.709273087 +0100 -+++ src/App/Application.cpp 2020-01-22 23:50:53.915075955 +0100 +--- a/src/App/Application.cpp 2020-01-22 23:27:42.709273087 +0100 ++++ b/src/App/Application.cpp 2020-01-22 23:50:53.915075955 +0100 @@ -1485,7 +1485,9 @@ #endif diff --git a/srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch b/srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch index 2b46616ad7a..cc6bdc9ff48 100644 --- a/srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch +++ b/srcpkgs/freecad/patches/010-salomesmesh-execinfo.patch @@ -1,5 +1,5 @@ ---- src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp -+++ src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp +--- a/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp ++++ b/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp @@ -29,7 +29,9 @@ #ifndef WIN32 #include diff --git a/srcpkgs/freecad/patches/150-vtk9.patch b/srcpkgs/freecad/patches/150-vtk9.patch index 3c00ff784e4..92673e7c9b9 100644 --- a/srcpkgs/freecad/patches/150-vtk9.patch +++ b/srcpkgs/freecad/patches/150-vtk9.patch @@ -3,8 +3,8 @@ but removed patch on file src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp : alread diff --git src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx b/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx index 14a6d9a763f..0e9b9e6c905 100644 ---- src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx -+++ src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx +--- a/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx ++++ b/src/3rdParty/salomesmesh/inc/SMDS_MeshElement.hxx @@ -40,11 +40,16 @@ #include @@ -34,8 +34,8 @@ index 14a6d9a763f..0e9b9e6c905 100644 //! SubShape and SubMesh identification in SMESHDS diff --git src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx index 9e4a23eddfb..77465814541 100644 ---- src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx -+++ src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx +--- a/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx ++++ b/src/3rdParty/salomesmesh/inc/SMDS_UnstructuredGrid.hxx @@ -95,7 +95,11 @@ public: std::map >& nodeQuadDomains); vtkCellLinks* GetLinks() @@ -50,8 +50,8 @@ index 9e4a23eddfb..77465814541 100644 { diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp index 299093c94f6..2680c217305 100644 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp -+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_BallElement.cpp @@ -67,10 +67,16 @@ void SMDS_BallElement::SetDiameter(double diameter) bool SMDS_BallElement::ChangeNode (const SMDS_MeshNode * node) { @@ -81,8 +81,8 @@ index 299093c94f6..2680c217305 100644 } diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp index d6049c0bd19..a41f5c18e78 100644 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp -+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Downward.cpp @@ -303,7 +303,7 @@ int SMDS_Down1D::getNodeSet(int cellId, int* nodeSet) void SMDS_Down1D::setNodes(int cellId, int vtkId) { @@ -283,8 +283,8 @@ index d6049c0bd19..a41f5c18e78 100644 // --- create all the ordered list of node id's for each face diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp index 61c8e751d94..1eac2907d3d 100644 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp -+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh.cpp @@ -4768,7 +4768,11 @@ void SMDS_Mesh::dumpGrid(string ficdump) ficcon << endl; } @@ -300,8 +300,8 @@ index 61c8e751d94..1eac2907d3d 100644 int ncells = links->GetNcells(i); diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp index 95438eab064..0df32e3b97c 100644 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp -+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_Mesh0DElement.cpp @@ -146,6 +146,17 @@ bool SMDS_Mesh0DElement::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbN if ( nbNodes == 1 ) { @@ -330,8 +330,8 @@ index 95438eab064..0df32e3b97c 100644 return true; diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp index f647a5f1b8f..5b903c8fb55 100644 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp -+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_MeshNode.cpp @@ -191,7 +191,7 @@ class SMDS_MeshNode_MyInvIterator: public SMDS_ElemIterator SMDS_ElemIteratorPtr SMDS_MeshNode:: GetInverseElementIterator(SMDSAbs_ElementType type) const @@ -379,8 +379,8 @@ index f647a5f1b8f..5b903c8fb55 100644 return l.ncells; diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp index fbd903b1e74..ff2b81e9694 100644 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp @@ -139,8 +139,8 @@ int SMDS_UnstructuredGrid::InsertNextLinkedCell(int type, int npts, vtkIdType *p for (; it != setOfNodes.end(); ++it) { @@ -460,8 +460,8 @@ index fbd903b1e74..ff2b81e9694 100644 /*! Create a volume (prism or hexahedron) by duplication of a face. diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp index deb05985f00..63b6eabb704 100644 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp -+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkCellIterator.cpp @@ -33,7 +33,8 @@ SMDS_VtkCellIterator::SMDS_VtkCellIterator(SMDS_Mesh* mesh, int vtkCellId, SMDSA } else @@ -492,8 +492,8 @@ index deb05985f00..63b6eabb704 100644 _nbNodesInFaces = 0; diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp index 9786abf9aae..6d772a3cd4a 100644 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp -+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkEdge.cpp @@ -67,6 +67,19 @@ bool SMDS_VtkEdge::ChangeNodes(const SMDS_MeshNode * node1, const SMDS_MeshNode bool SMDS_VtkEdge::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) { @@ -543,8 +543,8 @@ index 9786abf9aae..6d772a3cd4a 100644 } diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp index 1389e0d3585..cb981bfb18e 100644 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp -+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkFace.cpp @@ -101,6 +101,19 @@ void SMDS_VtkFace::initQuadPoly(const std::vector& nodeIds, SMDS_Mesh bool SMDS_VtkFace::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) { @@ -623,8 +623,8 @@ index 1389e0d3585..cb981bfb18e 100644 } diff --git src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp index 015edf75fd2..19ebd0746c8 100644 ---- src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp -+++ src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp +--- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp ++++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_VtkVolume.cpp @@ -133,6 +133,19 @@ void SMDS_VtkVolume::initPoly(const std::vector& nodeIds, bool SMDS_VtkVolume::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbNodes) { @@ -756,8 +756,8 @@ index 015edf75fd2..19ebd0746c8 100644 for (int rank = 0; rank < npts; rank++) diff --git src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp index fcd044b00f2..f54c24f8618 100644 ---- src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp -+++ src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp +--- a/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp ++++ b/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp @@ -11348,7 +11348,7 @@ bool SMESH_MeshEditor::DoubleNodesOnGroupBoundaries( const std::vector #include diff --git a/srcpkgs/freeciv/template b/srcpkgs/freeciv/template index 2dbb80c62a5..cb643452944 100644 --- a/srcpkgs/freeciv/template +++ b/srcpkgs/freeciv/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="http://freeciv.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=6181ef3d3c76264383aabbe0eaf1550d8a65ca42639e6c17cc2938165e176c8f -patch_args=-Np0 subpackages="freeciv-gtk2 freeciv-gtk3 freeciv-sdl freeciv-xaw" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/freedroidClassic/patches/patch-SDL_rotozoom.c.diff b/srcpkgs/freedroidClassic/patches/patch-SDL_rotozoom.c.diff index 10f176536d5..957baf008a4 100644 --- a/srcpkgs/freedroidClassic/patches/patch-SDL_rotozoom.c.diff +++ b/srcpkgs/freedroidClassic/patches/patch-SDL_rotozoom.c.diff @@ -1,5 +1,5 @@ ---- src/SDL_rotozoom.c.orig 2003-08-07 19:01:16.000000000 +0200 -+++ src/SDL_rotozoom.c 2018-01-17 21:30:09.576536782 +0100 +--- a/src/SDL_rotozoom.c 2003-08-07 19:01:16.000000000 +0200 ++++ b/src/SDL_rotozoom.c 2018-01-17 21:30:09.576536782 +0100 @@ -11,6 +11,7 @@ #endif diff --git a/srcpkgs/freedroidClassic/patches/patch-configure.ac.diff b/srcpkgs/freedroidClassic/patches/patch-configure.ac.diff index 80045c5ec7f..5e5061db434 100644 --- a/srcpkgs/freedroidClassic/patches/patch-configure.ac.diff +++ b/srcpkgs/freedroidClassic/patches/patch-configure.ac.diff @@ -1,5 +1,5 @@ ---- configure.ac.orig 2003-08-09 19:04:33.000000000 +0200 -+++ configure.ac 2018-01-17 20:56:10.468995248 +0100 +--- a/configure.ac 2003-08-09 19:04:33.000000000 +0200 ++++ b/configure.ac 2018-01-17 20:56:10.468995248 +0100 @@ -82,7 +82,7 @@ --> compiling without sound support --------------------------------------------------])) diff --git a/srcpkgs/freedroidClassic/template b/srcpkgs/freedroidClassic/template index a386f4e0ae0..fe8b987c8ac 100644 --- a/srcpkgs/freedroidClassic/template +++ b/srcpkgs/freedroidClassic/template @@ -13,7 +13,6 @@ license="GPL-2" homepage="http://freedroid.org" distfiles="http://sourceforge.net/projects/freedroid/files/${pkgname}/FreedroidClassic-${version}/freedroid-${version}.tar.gz" checksum=0934bd29fb2ad0367ea3bdfdce47537179f9af6aa960cbcc897c40da2e1a0ee3 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/freeimage/patches/disable_arm_neon.patch b/srcpkgs/freeimage/patches/disable_arm_neon.patch index 7130c4e41a1..c3ed1eb64dd 100644 --- a/srcpkgs/freeimage/patches/disable_arm_neon.patch +++ b/srcpkgs/freeimage/patches/disable_arm_neon.patch @@ -1,5 +1,5 @@ ---- Source/LibPNG/pngpriv.h.orig 2018-07-16 11:58:00.000000000 +0200 -+++ Source/LibPNG/pngpriv.h 2018-08-07 10:15:53.827327997 +0200 +--- a/Source/LibPNG/pngpriv.h 2018-07-16 11:58:00.000000000 +0200 ++++ b/Source/LibPNG/pngpriv.h 2018-08-07 10:15:53.827327997 +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/freeimage/patches/ftbfs-big-endian.patch b/srcpkgs/freeimage/patches/ftbfs-big-endian.patch index fb748f9f631..0bf9aa72729 100644 --- a/srcpkgs/freeimage/patches/ftbfs-big-endian.patch +++ b/srcpkgs/freeimage/patches/ftbfs-big-endian.patch @@ -1,7 +1,7 @@ Fixes BE build failure. ---- Source/FreeImage/PluginDDS.cpp -+++ Source/FreeImage/PluginDDS.cpp +--- a/Source/FreeImage/PluginDDS.cpp ++++ b/Source/FreeImage/PluginDDS.cpp @@ -356,14 +356,14 @@ SwapHeader(DDSHEADER *header) { for(int i=0; i<11; i++) { SwapLong(&header->surfaceDesc.dwReserved1[i]); @@ -25,8 +25,8 @@ Fixes BE build failure. SwapLong(&header->surfaceDesc.ddsCaps.dwCaps1); SwapLong(&header->surfaceDesc.ddsCaps.dwCaps2); SwapLong(&header->surfaceDesc.ddsCaps.dwReserved[0]); ---- Source/FreeImage/PluginBMP.cpp -+++ Source/FreeImage/PluginBMP.cpp +--- a/Source/FreeImage/PluginBMP.cpp ++++ b/Source/FreeImage/PluginBMP.cpp @@ -1419,7 +1419,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_handle handle, int page, int flags, void free(buffer); diff --git a/srcpkgs/freeimage/template b/srcpkgs/freeimage/template index 49167a73638..c45052a67b1 100644 --- a/srcpkgs/freeimage/template +++ b/srcpkgs/freeimage/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later, FreeImage" homepage="http://freeimage.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/freeimage/Source%20Distribution/FreeImage${version//./}.zip" checksum=f41379682f9ada94ea7b34fe86bf9ee00935a3147be41b6569c9605a53e438fd -patch_args=-Np0 CFLAGS="-fPIC -DPIC -fexceptions -fvisibility=hidden -DPNG_POWERPC_VSX_OPT=0" CXXFLAGS="${CFLAGS} -Wno-ctor-dtor-privacy" diff --git a/srcpkgs/freeipmi/patches/fix-build-musl-non-x86.patch b/srcpkgs/freeipmi/patches/fix-build-musl-non-x86.patch index 0389182dada..02a558773e2 100644 --- a/srcpkgs/freeipmi/patches/fix-build-musl-non-x86.patch +++ b/srcpkgs/freeipmi/patches/fix-build-musl-non-x86.patch @@ -1,8 +1,8 @@ Musl, unlike glibc, provides inb/outb but only on x86. Additionally, the iopl call is generally useless outside x86. ---- libfreeipmi/driver/ipmi-kcs-driver.c -+++ libfreeipmi/driver/ipmi-kcs-driver.c +--- a/libfreeipmi/driver/ipmi-kcs-driver.c ++++ b/libfreeipmi/driver/ipmi-kcs-driver.c @@ -162,7 +162,7 @@ #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) # define _INB(port) inb (port) diff --git a/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch b/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch index c88a00f4f4d..7581c229f48 100644 --- a/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch +++ b/srcpkgs/freeipmi/patches/fix-build-with-C99-compilers.patch @@ -4,8 +4,8 @@ Source: http://lists.busybox.net/pipermail/buildroot/2016-September/172879.html changes into account and allows to build the bundled argp and therefore [freeipmi] with non-C89-compilers." ---- common/portability/freeipmi-argp-fmtstream.c.orig 2017-08-16 20:28:19.000000000 +0200 -+++ common/portability/freeipmi-argp-fmtstream.c 2017-10-19 15:53:41.419508328 +0200 +--- a/common/portability/freeipmi-argp-fmtstream.c 2017-08-16 20:28:19.000000000 +0200 ++++ b/common/portability/freeipmi-argp-fmtstream.c 2017-10-19 15:53:41.419508328 +0200 @@ -389,6 +389,7 @@ weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf) #endif @@ -21,8 +21,8 @@ changes into account and allows to build the bundled argp and therefore +#endif /* __STDC_VERSION__ - 199900L < 1 */ #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */ ---- common/portability/freeipmi-argp-fmtstream.h.orig 2017-08-16 20:28:19.000000000 +0200 -+++ common/portability/freeipmi-argp-fmtstream.h 2017-10-19 15:58:36.245170810 +0200 +--- a/common/portability/freeipmi-argp-fmtstream.h 2017-08-16 20:28:19.000000000 +0200 ++++ b/common/portability/freeipmi-argp-fmtstream.h 2017-10-19 15:58:36.245170810 +0200 @@ -145,6 +145,7 @@ __const char *__fmt, ...) PRINTF_STYLE(2,3); diff --git a/srcpkgs/freeipmi/template b/srcpkgs/freeipmi/template index 0a0b1477442..e6818b20f15 100644 --- a/srcpkgs/freeipmi/template +++ b/srcpkgs/freeipmi/template @@ -13,7 +13,6 @@ license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/freeipmi/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=cfa30179b44c582e73cf92c2ad0e54fe49f9fd87f7a0889be9dc2db5802e6aab -patch_args=-Np0 conf_files="/etc/freeipmi/*.conf" make_dirs="/var/cache/ipmiseld 0755 root root" diff --git a/srcpkgs/freeorion/patches/fix-cflags.patch b/srcpkgs/freeorion/patches/fix-cflags.patch index c66d5459955..07b5302dab0 100644 --- a/srcpkgs/freeorion/patches/fix-cflags.patch +++ b/srcpkgs/freeorion/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -432,13 +432,6 @@ if(MSVC) ) endif() diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template index 32ccda48339..37bfc09176c 100644 --- a/srcpkgs/freeorion/template +++ b/srcpkgs/freeorion/template @@ -16,7 +16,6 @@ homepage="https://freeorion.org/index.php/Main_Page" changelog="https://raw.githubusercontent.com/freeorion/freeorion/master/ChangeLog.md" distfiles="https://github.com/freeorion/freeorion/releases/download/v${version}/FreeOrion_v${_release}_Source.tar.gz" checksum=e72ab42cba1ee8842507340931ef389e64011e040a4adc74add5f4997bbcba8b -patch_args=-Np0 post_extract() { _build_no=${_release/*_/} diff --git a/srcpkgs/freeplane/patches/remove_mac.patch b/srcpkgs/freeplane/patches/remove_mac.patch index 72df0db4a30..21f32c6ed1b 100644 --- a/srcpkgs/freeplane/patches/remove_mac.patch +++ b/srcpkgs/freeplane/patches/remove_mac.patch @@ -1,5 +1,5 @@ ---- freeplane_debughelper/build.gradle 2020-06-29 17:33:42.544000000 +1000 -+++ freeplane_debughelper/build.gradle 2020-06-29 17:33:48.627000000 +1000 +--- a/freeplane_debughelper/build.gradle 2020-06-29 17:33:42.544000000 +1000 ++++ b/freeplane_debughelper/build.gradle 2020-06-29 17:33:48.627000000 +1000 @@ -7,9 +7,7 @@ dependencies { diff --git a/srcpkgs/freeplane/template b/srcpkgs/freeplane/template index 2d92e1536f5..52a4365845f 100644 --- a/srcpkgs/freeplane/template +++ b/srcpkgs/freeplane/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="http://freeplane.sourceforge.net/" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname%20stable/${pkgname}_src-$version.tar.gz" checksum=7cb3abeda6a073262b63603852d3f3fe2cdb34e917435e9648209efa9c3b1e21 -patch_args=-Np0 make_dirs=" /usr/share/freeplane/fwdir/condperm/ 755 root root diff --git a/srcpkgs/freetds/patches/fix-tsql.patch b/srcpkgs/freetds/patches/fix-tsql.patch index ef5570e0dd4..85a1ec6861e 100644 --- a/srcpkgs/freetds/patches/fix-tsql.patch +++ b/srcpkgs/freetds/patches/fix-tsql.patch @@ -1,5 +1,5 @@ ---- src/apps/tsql.c.orig 2015-08-04 22:10:02.270430495 -0300 -+++ src/apps/tsql.c 2015-08-04 22:10:31.454429193 -0300 +--- a/src/apps/tsql.c.orig 2015-08-04 22:10:02.270430495 -0300 ++++ b/src/apps/tsql.c 2015-08-04 22:10:31.454429193 -0300 @@ -22,6 +22,7 @@ #include diff --git a/srcpkgs/freetds/patches/musl-fisql.patch b/srcpkgs/freetds/patches/musl-fisql.patch index d137b76d4e9..28d114f3f15 100644 --- a/srcpkgs/freetds/patches/musl-fisql.patch +++ b/srcpkgs/freetds/patches/musl-fisql.patch @@ -1,5 +1,5 @@ ---- src/apps/fisql/fisql.c 2016-05-18 22:02:15.000000000 +0200 -+++ src/apps/fisql/fisql.c 2016-06-24 14:20:09.520352354 +0200 +--- a/src/apps/fisql/fisql.c 2016-05-18 22:02:15.000000000 +0200 ++++ b/src/apps/fisql/fisql.c 2016-06-24 14:20:09.520352354 +0200 @@ -25,6 +25,7 @@ #include #include diff --git a/srcpkgs/freetds/template b/srcpkgs/freetds/template index bc88622a836..c1e2b541a6b 100644 --- a/srcpkgs/freetds/template +++ b/srcpkgs/freetds/template @@ -13,7 +13,6 @@ license="LGPL-2.0-or-later" homepage="https://www.freetds.org/" distfiles="https://www.freetds.org/files/stable/freetds-${version}.tar.gz" checksum=a2134ff1852003c0aeed82bd5f7842233ff287c3a14252b84d2653983aff7da1 -patch_args=-Np0 conf_files="/etc/freetds/freetds.conf /etc/freetds/locales.conf diff --git a/srcpkgs/freetype/patches/enable-subpixel-rendering.patch b/srcpkgs/freetype/patches/enable-subpixel-rendering.patch index 5cba955ca2c..4d516983ff1 100644 --- a/srcpkgs/freetype/patches/enable-subpixel-rendering.patch +++ b/srcpkgs/freetype/patches/enable-subpixel-rendering.patch @@ -1,5 +1,5 @@ ---- include/freetype/config/ftoption.h -+++ include/freetype/config/ftoption.h +--- a/include/freetype/config/ftoption.h ++++ b/include/freetype/config/ftoption.h @@ -126,7 +126,7 @@ * macro is not defined, FreeType offers alternative LCD rendering * technology that produces excellent output without LCD filtering. diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template index b41edae73a6..ba4c6ad900c 100644 --- a/srcpkgs/freetype/template +++ b/srcpkgs/freetype/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later, FTL" homepage="https://www.freetype.org/" distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784 -patch_args=-Np0 post_patch() { vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in diff --git a/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch b/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch index fd85fe594c7..8dacb257078 100644 --- a/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch +++ b/srcpkgs/freshplayerplugin/patches/addvoidpepper.patch @@ -1,5 +1,5 @@ ---- src/config_pepperflash.c.orig -+++ src/config_pepperflash.c +--- a/src/config_pepperflash.c ++++ b/src/config_pepperflash.c @@ -80,6 +80,9 @@ // Chrome component update "~/.config/google-chrome/PepperFlash/*/libpepflashplayer.so", diff --git a/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch b/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch index 5c4c99cee6a..53fd1a31acd 100644 --- a/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch +++ b/srcpkgs/freshplayerplugin/patches/ffmpeg4.patch @@ -1,5 +1,5 @@ ---- src/ppb_video_decoder.c.orig 2018-05-03 22:08:33.026677145 +0200 -+++ src/ppb_video_decoder.c 2018-05-03 22:09:26.176206079 +0200 +--- a/src/ppb_video_decoder.c.orig 2018-05-03 22:08:33.026677145 +0200 ++++ b/src/ppb_video_decoder.c 2018-05-03 22:09:26.176206079 +0200 @@ -542,9 +542,9 @@ goto err; } diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template index 7730d4954be..a6205c0ba98 100644 --- a/srcpkgs/freshplayerplugin/template +++ b/srcpkgs/freshplayerplugin/template @@ -13,7 +13,6 @@ homepage="https://github.com/i-rinat/freshplayerplugin" changelog="https://raw.githubusercontent.com/i-rinat/freshplayerplugin/master/ChangeLog" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=4fa4fe07e812f6e10784ff984e1389b9b444ca44b84101999c6fad8f55db59d9 -patch_args=-Np0 do_install() { vinstall build/libfreshwrapper-flashplayer.so 755 usr/lib/mozilla/plugins diff --git a/srcpkgs/fs-utils/patches/fix-sysctl_h.patch b/srcpkgs/fs-utils/patches/fix-sysctl_h.patch index 32c4dc88fe4..9ae60b46a6d 100644 --- a/srcpkgs/fs-utils/patches/fix-sysctl_h.patch +++ b/srcpkgs/fs-utils/patches/fix-sysctl_h.patch @@ -1,5 +1,5 @@ ---- lib/smb/ctx.c 2013-12-13 21:29:42.000000000 +0100 -+++ lib/smb/ctx.c 2021-01-16 10:26:44.803835850 +0100 +--- a/lib/smb/ctx.c 2013-12-13 21:29:42.000000000 +0100 ++++ b/lib/smb/ctx.c 2021-01-16 10:26:44.803835850 +0100 @@ -34,7 +34,7 @@ @@ -9,8 +9,8 @@ #include #include #include ---- lib/smb/file.c 2013-12-13 21:29:42.000000000 +0100 -+++ lib/smb/file.c 2021-01-16 10:26:41.672690378 +0100 +--- a/lib/smb/file.c 2013-12-13 21:29:42.000000000 +0100 ++++ b/lib/smb/file.c 2021-01-16 10:26:41.672690378 +0100 @@ -33,7 +33,7 @@ */ @@ -20,8 +20,8 @@ #include #include #include ---- lib/smb/kiconv.c 2013-12-13 21:29:42.000000000 +0100 -+++ lib/smb/kiconv.c 2021-01-16 10:26:38.368536869 +0100 +--- a/lib/smb/kiconv.c 2013-12-13 21:29:42.000000000 +0100 ++++ b/lib/smb/kiconv.c 2021-01-16 10:26:38.368536869 +0100 @@ -34,7 +34,7 @@ #include @@ -31,8 +31,8 @@ #include #include #include ---- lib/smb/nls.c 2013-12-13 21:29:42.000000000 +0100 -+++ lib/smb/nls.c 2021-01-16 10:26:35.772416254 +0100 +--- a/lib/smb/nls.c 2013-12-13 21:29:42.000000000 +0100 ++++ b/lib/smb/nls.c 2021-01-16 10:26:35.772416254 +0100 @@ -34,7 +34,7 @@ #include @@ -42,8 +42,8 @@ #include #ifndef APPLE #include ---- lib/smb/print.c 2013-12-13 21:29:42.000000000 +0100 -+++ lib/smb/print.c 2021-01-16 10:26:32.593268552 +0100 +--- a/lib/smb/print.c 2013-12-13 21:29:42.000000000 +0100 ++++ b/lib/smb/print.c 2021-01-16 10:26:32.593268552 +0100 @@ -33,7 +33,7 @@ */ @@ -53,8 +53,8 @@ #include #include #include ---- lib/smb/subr.c 2013-12-13 21:29:42.000000000 +0100 -+++ lib/smb/subr.c 2021-01-16 10:26:30.153155186 +0100 +--- a/lib/smb/subr.c 2013-12-13 21:29:42.000000000 +0100 ++++ b/lib/smb/subr.c 2021-01-16 10:26:30.153155186 +0100 @@ -35,7 +35,7 @@ #include #include diff --git a/srcpkgs/fs-utils/template b/srcpkgs/fs-utils/template index cc8fe606ab0..91a0d1dcc0d 100644 --- a/srcpkgs/fs-utils/template +++ b/srcpkgs/fs-utils/template @@ -15,7 +15,6 @@ distfiles="$homepage/archive/v$version.tar.gz checksum="0f63aa92f673f290d4bca9009ca6f213e70ac70519c5cdac3fa64acf5afa5bae 228892fd0f669ee3051aee19f8660e4719bee9bd70c1b02adcaee518d4155866" skip_extraction="LICENSE" -patch_args=-Np0 post_install() { vlicense ${XBPS_SRCDISTDIR}/${pkgname}-${version}/LICENSE diff --git a/srcpkgs/fuse-emulator/patches/be.patch b/srcpkgs/fuse-emulator/patches/be.patch index 8aae5ea3de8..c71a79cb732 100644 --- a/srcpkgs/fuse-emulator/patches/be.patch +++ b/srcpkgs/fuse-emulator/patches/be.patch @@ -13,8 +13,8 @@ separate code for big and little endian has incorrect results. diff --git ui/gtk/gtkdisplay.c ui/gtk/gtkdisplay.c index b0bf588..fa0dba2 100644 ---- ui/gtk/gtkdisplay.c -+++ ui/gtk/gtkdisplay.c +--- a/ui/gtk/gtkdisplay.c ++++ b/ui/gtk/gtkdisplay.c @@ -148,7 +148,7 @@ init_colours( colour_format_t format ) /* Addition of 0.5 is to avoid rounding errors */ grey = ( 0.299 * red + 0.587 * green + 0.114 * blue ) + 0.5; diff --git a/srcpkgs/fuse-emulator/template b/srcpkgs/fuse-emulator/template index 957c8796eb0..e1159f25870 100644 --- a/srcpkgs/fuse-emulator/template +++ b/srcpkgs/fuse-emulator/template @@ -14,4 +14,3 @@ license="GPL-2.0-or-later" homepage="http://fuse-emulator.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/fuse-emulator/fuse-${version}.tar.gz" checksum=f0e2583f2642cdc3b2a737910d24e289d46e4f7e151805e3b0827024b2b45e4d -patch_args=-Np0 diff --git a/srcpkgs/fuse/patches/aarch64.patch b/srcpkgs/fuse/patches/aarch64.patch index 53972b138c7..a9868ab8af6 100644 --- a/srcpkgs/fuse/patches/aarch64.patch +++ b/srcpkgs/fuse/patches/aarch64.patch @@ -1,7 +1,7 @@ http://patchwork.openembedded.org/patch/43069/ ---- include/fuse_kernel.h -+++ include/fuse_kernel.h +--- a/include/fuse_kernel.h ++++ b/include/fuse_kernel.h @@ -88,12 +88,7 @@ #ifndef _LINUX_FUSE_H #define _LINUX_FUSE_H diff --git a/srcpkgs/fuse/patches/fuse-headers.patch b/srcpkgs/fuse/patches/fuse-headers.patch index 53c791d557f..ccd919f3386 100644 --- a/srcpkgs/fuse/patches/fuse-headers.patch +++ b/srcpkgs/fuse/patches/fuse-headers.patch @@ -1,5 +1,5 @@ ---- include/fuse_common.h -+++ include/fuse_common.h +--- a/include/fuse_common.h ++++ b/include/fuse_common.h @@ -28,8 +28,8 @@ #define FUSE_MAKE_VERSION(maj, min) ((maj) * 10 + (min)) #define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION) diff --git a/srcpkgs/fuse/patches/fusermount.patch b/srcpkgs/fuse/patches/fusermount.patch index 17977f1f73c..d7e883a86eb 100644 --- a/srcpkgs/fuse/patches/fusermount.patch +++ b/srcpkgs/fuse/patches/fusermount.patch @@ -1,7 +1,7 @@ CLONE_NEWNS is only defined for __USE_GNU. ---- util/fusermount.c.orig 2011-06-27 17:41:08.845498441 +0200 -+++ util/fusermount.c 2011-06-27 17:42:31.236498493 +0200 +--- a/util/fusermount.c 2011-06-27 17:41:08.845498441 +0200 ++++ b/util/fusermount.c 2011-06-27 17:42:31.236498493 +0200 @@ -26,6 +26,7 @@ #include #include diff --git a/srcpkgs/fuse/template b/srcpkgs/fuse/template index 812f9dfc16d..10061307b41 100644 --- a/srcpkgs/fuse/template +++ b/srcpkgs/fuse/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://github.com/libfuse/libfuse" distfiles="${homepage}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz" checksum=d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5 -patch_args=-Np0 post_install() { # remove obsolete rules file provided by udev.