diff --git a/srcpkgs/taskd/patches/musl.patch b/srcpkgs/taskd/patches/musl.patch index 70f3fd315e5..2e976f6395f 100644 --- a/srcpkgs/taskd/patches/musl.patch +++ b/srcpkgs/taskd/patches/musl.patch @@ -1,5 +1,5 @@ ---- ./src/Directory.cpp.orig 2015-10-23 19:01:36.570860470 -0400 -+++ ./src/Directory.cpp 2015-10-23 19:02:12.097860878 -0400 +--- a/src/Directory.cpp 2015-10-23 19:01:36.570860470 -0400 ++++ b/src/Directory.cpp 2015-10-23 19:02:12.097860878 -0400 @@ -29,6 +29,7 @@ #include #include diff --git a/srcpkgs/taskd/template b/srcpkgs/taskd/template index 8ab72bc17ef..41450116671 100644 --- a/srcpkgs/taskd/template +++ b/srcpkgs/taskd/template @@ -11,7 +11,6 @@ license="MIT" homepage="http://taskwarrior.org" distfiles="http://taskwarrior.org/download/${pkgname}-${version}.tar.gz" checksum=7b8488e687971ae56729ff4e2e5209ff8806cf8cd57718bfd7e521be130621b4 -patch_args=-Np0 system_accounts="taskd" taskd_homedir="/var/lib/taskd" diff --git a/srcpkgs/tbb/patches/hostname-usage.patch b/srcpkgs/tbb/patches/hostname-usage.patch index c056bc5b452..4aefeff192b 100644 --- a/srcpkgs/tbb/patches/hostname-usage.patch +++ b/srcpkgs/tbb/patches/hostname-usage.patch @@ -1,5 +1,5 @@ ---- build/version_info_linux.sh.ORIG -+++ build/version_info_linux.sh +--- a/build/version_info_linux.sh ++++ b/build/version_info_linux.sh @@ -20,7 +20,7 @@ # Script used to generate version info string diff --git a/srcpkgs/tbb/patches/musl.patch b/srcpkgs/tbb/patches/musl.patch index 0a3aa7d4f34..a8867eb5379 100644 --- a/srcpkgs/tbb/patches/musl.patch +++ b/srcpkgs/tbb/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/tbbmalloc/proxy.cpp.orig 2018-10-17 14:05:31.311723013 +0200 -+++ src/tbbmalloc/proxy.cpp 2018-10-17 14:06:32.972726194 +0200 +--- a/src/tbbmalloc/proxy.cpp 2018-10-17 14:05:31.311723013 +0200 ++++ b/src/tbbmalloc/proxy.cpp 2018-10-17 14:06:32.972726194 +0200 @@ -28,6 +28,7 @@ // of aligned_alloc as required by new C++ standard, this makes it hard to // redefine aligned_alloc here. However, running on systems with new libc diff --git a/srcpkgs/tbb/template b/srcpkgs/tbb/template index 17fad3bc5e3..aeef6ebdd06 100644 --- a/srcpkgs/tbb/template +++ b/srcpkgs/tbb/template @@ -13,7 +13,6 @@ license="Apache-2.0" homepage="https://www.threadingbuildingblocks.org" distfiles="https://github.com/oneapi-src/oneTBB/archive/${_ver}.tar.gz" checksum=2103cc6238c935664f87680618f6684d57501d4a2fa8ea8f6c97ad6ff7dc722a -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in x86_64*) diff --git a/srcpkgs/tc-play/patches/sysmacros.patch b/srcpkgs/tc-play/patches/sysmacros.patch index fedfdd6b70a..d72ca692cc2 100644 --- a/srcpkgs/tc-play/patches/sysmacros.patch +++ b/srcpkgs/tc-play/patches/sysmacros.patch @@ -1,5 +1,5 @@ ---- tcplay.c 2020-01-02 03:32:31.615390563 +0100 -+++ tcplay.c 2020-01-02 03:32:45.237882108 +0100 +--- a/tcplay.c 2020-01-02 03:32:31.615390563 +0100 ++++ b/tcplay.c 2020-01-02 03:32:45.237882108 +0100 @@ -30,6 +30,7 @@ #define _BSD_SOURCE #include diff --git a/srcpkgs/tc-play/template b/srcpkgs/tc-play/template index 85cd91f5d7d..0f49755ebaf 100644 --- a/srcpkgs/tc-play/template +++ b/srcpkgs/tc-play/template @@ -14,7 +14,6 @@ license="BSD-2-clause" homepage="https://github.com/bwalex/tc-play" distfiles="https://github.com/bwalex/${pkgname}/archive/v${version}.tar.gz" checksum=ad53cd814a23b4f61a1b2b6dc2539624ffb550504c400c45cbd8cd1da4c7d90a -patch_args=-Np0 pre_build() { sed -i Makefile.classic -e"s; -o tcplay; ${LDFLAGS}&;" diff --git a/srcpkgs/tcl/patches/tcl-stat64.patch b/srcpkgs/tcl/patches/tcl-stat64.patch index 66c5086edea..b0133ec40cb 100644 --- a/srcpkgs/tcl/patches/tcl-stat64.patch +++ b/srcpkgs/tcl/patches/tcl-stat64.patch @@ -1,5 +1,5 @@ ---- generic/tcl.h -+++ generic/tcl.h +--- a/generic/tcl.h ++++ b/generic/tcl.h @@ -17,6 +17,8 @@ #ifndef _TCL #define _TCL diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template index e2027342836..d36663d8b1f 100644 --- a/srcpkgs/tcl/template +++ b/srcpkgs/tcl/template @@ -16,7 +16,6 @@ license="TCL" homepage="http://www.tcl.tk" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}${version}-src.tar.gz" checksum=8c0486668586672c5693d7d95817cb05a18c5ecca2f40e2836b9578064088258 -patch_args=-Np0 shlib_provides="libtcl${version%.*}.so" diff --git a/srcpkgs/tcpdump/patches/tcpdump_duplicate_executable.patch b/srcpkgs/tcpdump/patches/tcpdump_duplicate_executable.patch index 90b33f0ac28..db02c7bd944 100644 --- a/srcpkgs/tcpdump/patches/tcpdump_duplicate_executable.patch +++ b/srcpkgs/tcpdump/patches/tcpdump_duplicate_executable.patch @@ -1,5 +1,5 @@ ---- Makefile.in -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -420,7 +420,6 @@ [ -d $(DESTDIR)$(bindir) ] || \ (mkdir -p $(DESTDIR)$(bindir); chmod 755 $(DESTDIR)$(bindir)) diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template index 724a066b8a2..1956a1ce16b 100644 --- a/srcpkgs/tcpdump/template +++ b/srcpkgs/tcpdump/template @@ -12,7 +12,6 @@ homepage="https://www.tcpdump.org" changelog="https://www.tcpdump.org/tcpdump-changes.txt" distfiles="https://www.tcpdump.org/release/${pkgname}-${version}.tar.gz" checksum=79b36985fb2703146618d87c4acde3e068b91c553fb93f021a337f175fd10ebe -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/teensy_loader_cli/patches/ldflags.patch b/srcpkgs/teensy_loader_cli/patches/ldflags.patch index 4e6ffe6348e..4f7be524e4f 100644 --- a/srcpkgs/teensy_loader_cli/patches/ldflags.patch +++ b/srcpkgs/teensy_loader_cli/patches/ldflags.patch @@ -1,7 +1,7 @@ diff --git Makefile Makefile index 8bbf28f..f9d6b9d 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -12,7 +12,7 @@ ifeq ($(OS), LINUX) # also works on FreeBSD CC ?= gcc CFLAGS ?= -O2 -Wall diff --git a/srcpkgs/teensy_loader_cli/template b/srcpkgs/teensy_loader_cli/template index a02e5ea78fe..267415fa156 100644 --- a/srcpkgs/teensy_loader_cli/template +++ b/srcpkgs/teensy_loader_cli/template @@ -11,7 +11,6 @@ license="GPL-3" homepage="http://www.pjrc.com/teensy/loader_cli.html" distfiles="https://github.com/PaulStoffregen/teensy_loader_cli/archive/${version}.tar.gz" checksum=5c36fe45b9a3a71ac38848b076cd692bf7ca8826a69941c249daac3a1d95e388 -patch_args=-Np0 do_install() { vbin teensy_loader_cli diff --git a/srcpkgs/teeworlds/patches/portability.patch b/srcpkgs/teeworlds/patches/portability.patch index 3e1cbdfe3ea..2ebd431ce24 100644 --- a/srcpkgs/teeworlds/patches/portability.patch +++ b/srcpkgs/teeworlds/patches/portability.patch @@ -9,8 +9,8 @@ Hopefully this prevents FTBFS on non-supported architectures. diff --git a/bam.lua b/bam.lua index f511fac..b23d501 100644 ---- bam.lua -+++ bam.lua +--- a/bam.lua ++++ b/bam.lua @@ -191,9 +191,6 @@ function GenerateLinuxSettings(settings, conf, arch, compiler) settings.link.flags:Add("-m64") elseif arch == "armv7l" then diff --git a/srcpkgs/teeworlds/patches/zlib-cross.patch b/srcpkgs/teeworlds/patches/zlib-cross.patch index db7d02e7259..14168572890 100644 --- a/srcpkgs/teeworlds/patches/zlib-cross.patch +++ b/srcpkgs/teeworlds/patches/zlib-cross.patch @@ -1,8 +1,8 @@ Bam doesn't respect cflags when searching for libs/includes like this, so just assume we have zlib for the target (which we do) and link it. Other libs use pkg-config, so there is no problem for those. ---- bam.lua -+++ bam.lua +--- a/bam.lua ++++ b/bam.lua @@ -10,7 +10,6 @@ config:Add(OptCCompiler("compiler")) config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all")) config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.7 -isysroot /Developer/SDKs/MacOSX10.7.sdk")) diff --git a/srcpkgs/teeworlds/template b/srcpkgs/teeworlds/template index 69c907e600c..268c85e43ac 100644 --- a/srcpkgs/teeworlds/template +++ b/srcpkgs/teeworlds/template @@ -10,7 +10,6 @@ license="custom" homepage="https://www.teeworlds.com" distfiles="https://github.com/teeworlds/teeworlds/archive/${version}.tar.gz" checksum=6e67846b38750d2a372d7835fa3775db016458a20a85aa52f1c758102ddd4abe -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in i686) _ARCH=x86;; diff --git a/srcpkgs/telegram-desktop/patches/0001-musl.patch b/srcpkgs/telegram-desktop/patches/0001-musl.patch index 35b7c90b955..53fa970f05c 100644 --- a/srcpkgs/telegram-desktop/patches/0001-musl.patch +++ b/srcpkgs/telegram-desktop/patches/0001-musl.patch @@ -1,5 +1,5 @@ ---- Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-11-21 11:09:51.647955733 +0100 -+++ - 2020-11-21 11:09:50.935306092 +0100 +--- a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-11-21 11:09:51.647955733 +0100 ++++ b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp 2020-11-21 11:09:51.647955733 +0100 @@ -12,11 +12,6 @@ #include #include diff --git a/srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch b/srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch index dfb0d743d8f..1431f341e3e 100644 --- a/srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch +++ b/srcpkgs/telegram-desktop/patches/0002-use-vendored-gsl.patch @@ -1,5 +1,5 @@ ---- cmake/external/gsl/CMakeLists.txt 2021-03-17 10:33:50.000000000 +0100 -+++ - 2021-03-21 21:08:36.925095597 +0100 +--- a/cmake/external/gsl/CMakeLists.txt 2021-03-17 10:33:50.000000000 +0100 ++++ b/cmake/external/gsl/CMakeLists.txt 2021-03-17 10:33:50.000000000 +0100 @@ -8,7 +8,7 @@ add_library(desktop-app::external_gsl ALIAS external_gsl) diff --git a/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch b/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch index c97df09382e..87c82f074d1 100644 --- a/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch +++ b/srcpkgs/telegram-desktop/patches/0003-gdk-include.patch @@ -1,5 +1,5 @@ ---- Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h 2021-04-26 18:33:58.641158572 +0200 -+++ - 2021-04-26 18:46:55.642218961 +0200 +--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h 2021-04-26 18:33:58.641158572 +0200 ++++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h 2021-04-26 18:33:58.641158572 +0200 @@ -12,6 +12,7 @@ #undef signals #include diff --git a/srcpkgs/telegram-desktop/patches/rlottie.patch b/srcpkgs/telegram-desktop/patches/rlottie.patch index 0bf968499fb..226c8dc803b 100644 --- a/srcpkgs/telegram-desktop/patches/rlottie.patch +++ b/srcpkgs/telegram-desktop/patches/rlottie.patch @@ -1,5 +1,5 @@ ---- cmake/external/rlottie/CMakeLists.txt 2020-08-11 15:21:17.000000000 +0200 -+++ - 2020-08-16 21:24:45.680173438 +0200 +--- a/cmake/external/rlottie/CMakeLists.txt 2020-08-11 15:21:17.000000000 +0200 ++++ b/cmake/external/rlottie/CMakeLists.txt 2020-08-11 15:21:17.000000000 +0200 @@ -8,7 +8,6 @@ add_library(desktop-app::external_rlottie ALIAS external_rlottie) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index f0026056b7d..30a1d2ec6ee 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -26,7 +26,6 @@ homepage="https://desktop.telegram.org/" changelog="https://github.com/telegramdesktop/tdesktop/blob/v${version}/changelog.txt" distfiles="https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz" checksum=97526f0b4adf04cf86b605ae84f3efaacf58eb8f828bab8f4fe752a4fac62fb2 -patch_args=-Np0 build_options="spellcheck" build_options_default="spellcheck" diff --git a/srcpkgs/telepathy-haze/patches/purple-2.0.12.patch b/srcpkgs/telepathy-haze/patches/purple-2.0.12.patch index a9e42937324..3558e53abdb 100644 --- a/srcpkgs/telepathy-haze/patches/purple-2.0.12.patch +++ b/srcpkgs/telepathy-haze/patches/purple-2.0.12.patch @@ -12,8 +12,8 @@ Origin: vendor, FreeBSD, https://lists.freebsd.org/pipermail/svn-ports-head/2016 diff --git a/src/media-stream.c b/src/media-stream.c index 7b4f29f..da088d1 100644 ---- src/media-stream.c -+++ src/media-stream.c +--- a/src/media-stream.c ++++ b/src/media-stream.c @@ -1076,7 +1076,7 @@ haze_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface, if (proto == TP_MEDIA_STREAM_BASE_PROTO_UDP) protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP; diff --git a/srcpkgs/telepathy-haze/template b/srcpkgs/telepathy-haze/template index 36f0c56c702..60b65b83ece 100644 --- a/srcpkgs/telepathy-haze/template +++ b/srcpkgs/telepathy-haze/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="http://telepathy.freedesktop.org" distfiles="${homepage}/releases/$pkgname/$pkgname-$version.tar.gz" checksum=3e76049c05f2cd5900c5c0c1cfebdf7ae79eec987a599f1090946673c5b8f9c9 -patch_args=-Np0 diff --git a/srcpkgs/telepathy-mission-control/patches/account-Fix-property-name.patch b/srcpkgs/telepathy-mission-control/patches/account-Fix-property-name.patch index f32752fd1d9..051ffaad3a6 100644 --- a/srcpkgs/telepathy-mission-control/patches/account-Fix-property-name.patch +++ b/srcpkgs/telepathy-mission-control/patches/account-Fix-property-name.patch @@ -12,8 +12,8 @@ space with '-', but now tightened up the validation. diff --git src/mcd-account.c src/mcd-account.c index 8009110e..de5c61cf 100644 ---- src/mcd-account.c -+++ src/mcd-account.c +--- a/src/mcd-account.c ++++ b/src/mcd-account.c @@ -3442,7 +3442,7 @@ mcd_account_class_init (McdAccountClass * klass) g_object_class_install_property diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template index a2c3275fcf6..f539aa07f1c 100644 --- a/srcpkgs/telepathy-mission-control/template +++ b/srcpkgs/telepathy-mission-control/template @@ -15,7 +15,6 @@ license="LGPL-2.1-or-later" homepage="http://telepathy.freedesktop.org" distfiles="${homepage}/releases/${pkgname}/${pkgname}-${version}.tar.gz" checksum=4c6b433b8b9079fd7df3e29aefcad6755a2081a9a634ffb6b33936c7d0d8bd03 -patch_args=-Np0 telepathy-mission-control-devel_package() { depends="telepathy-glib-devel>=0.22 ${sourcepkg}>=${version}" diff --git a/srcpkgs/tellico/patches/musl.patch b/srcpkgs/tellico/patches/musl.patch index 6732128cd16..92b93328650 100644 --- a/srcpkgs/tellico/patches/musl.patch +++ b/srcpkgs/tellico/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/3rdparty/btparse/lex_auxiliary.c 2018-12-19 01:27:45.874263697 +0000 -+++ - 2019-01-16 22:24:15.104327218 +0000 +--- a/src/3rdparty/btparse/lex_auxiliary.c 2018-12-19 01:27:45.874263697 +0000 ++++ b/src/3rdparty/btparse/lex_auxiliary.c 2018-12-19 01:27:45.874263697 +0000 @@ -32,6 +32,7 @@ #include "bt_debug.h" #include @@ -8,8 +8,8 @@ #include #include #include ---- src/3rdparty/btparse/sym.c 2018-12-19 02:27:45.878263787 +0100 -+++ - 2019-01-17 07:59:32.484113315 +0100 +--- a/src/3rdparty/btparse/sym.c 2018-12-19 02:27:45.878263787 +0100 ++++ b/src/3rdparty/btparse/sym.c 2018-12-19 02:27:45.878263787 +0100 @@ -110,6 +110,7 @@ /*#include "bt_config.h"*/ #include diff --git a/srcpkgs/tellico/template b/srcpkgs/tellico/template index aaf6a88cb14..d20e33769d9 100644 --- a/srcpkgs/tellico/template +++ b/srcpkgs/tellico/template @@ -27,4 +27,3 @@ desc_option_xmp="Support for reading PDF/XMP metadata" desc_option_yaz="Support for searching z39.50 databases" desc_option_cddb="Support for CDDB searches" desc_option_scanner="Support for adding scanned images to a collection" -patch_args=-Np0 diff --git a/srcpkgs/tepl/patches/no-gir.patch b/srcpkgs/tepl/patches/no-gir.patch index e340027b7f1..89009560285 100644 --- a/srcpkgs/tepl/patches/no-gir.patch +++ b/srcpkgs/tepl/patches/no-gir.patch @@ -10,8 +10,8 @@ Subject: [PATCH] Allow disabling gir diff --git meson_options.txt meson_options.txt index cad97dd..5e99084 100644 ---- meson_options.txt -+++ meson_options.txt +--- a/meson_options.txt ++++ b/meson_options.txt @@ -3,3 +3,8 @@ option( type: 'boolean', value: false, description: 'Build API reference (requires gtk-doc)' @@ -23,8 +23,8 @@ index cad97dd..5e99084 100644 +) diff --git tepl/meson.build tepl/meson.build index 226d913..b35dd3a 100644 ---- tepl/meson.build -+++ tepl/meson.build +--- a/tepl/meson.build ++++ b/tepl/meson.build @@ -164,6 +164,8 @@ PKG_CONFIG.generate(tepl_lib, libraries: TEPL_PUBLIC_DEPS, ) diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template index ec5879500ca..2213a79cc0f 100644 --- a/srcpkgs/tepl/template +++ b/srcpkgs/tepl/template @@ -14,7 +14,6 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/Tepl" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63 -patch_args=-Np0 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/terminal_markdown_viewer/patches/unichr.patch b/srcpkgs/terminal_markdown_viewer/patches/unichr.patch index 996e27b2aa7..235e44e1290 100644 --- a/srcpkgs/terminal_markdown_viewer/patches/unichr.patch +++ b/srcpkgs/terminal_markdown_viewer/patches/unichr.patch @@ -1,5 +1,5 @@ ---- mdv/markdownviewer.py.orig -+++ mdv/markdownviewer.py +--- a/mdv/markdownviewer.py ++++ b/mdv/markdownviewer.py @@ -129,6 +129,9 @@ import io import os diff --git a/srcpkgs/terminal_markdown_viewer/template b/srcpkgs/terminal_markdown_viewer/template index 0093b049b9a..b13f8ac93fb 100644 --- a/srcpkgs/terminal_markdown_viewer/template +++ b/srcpkgs/terminal_markdown_viewer/template @@ -12,7 +12,6 @@ license="BSD-3-Clause" homepage="https://github.com/axiros/terminal_markdown_viewer" distfiles="${homepage}/archive/${version}.tar.gz" checksum=58dbdf8c051a2d7f8c00e4dc13c655c335cbc2bc96851dd0388d73a21c4507b6 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/tesseract-ocr/patches/musl-sys-time.patch b/srcpkgs/tesseract-ocr/patches/musl-sys-time.patch index 5226c72a08d..9c6337d1886 100644 --- a/srcpkgs/tesseract-ocr/patches/musl-sys-time.patch +++ b/srcpkgs/tesseract-ocr/patches/musl-sys-time.patch @@ -1,5 +1,5 @@ ---- src/ccutil/ocrclass.h 2019-07-07 14:34:08.000000000 +0200 -+++ src/ccutil/ocrclass.h 2019-07-08 10:47:15.347415888 +0200 +--- a/src/ccutil/ocrclass.h 2019-07-07 14:34:08.000000000 +0200 ++++ b/src/ccutil/ocrclass.h 2019-07-08 10:47:15.347415888 +0200 @@ -31,6 +31,9 @@ #ifdef _WIN32 #include // for timeval diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template index c6c574f4c48..7ed37c53c84 100644 --- a/srcpkgs/tesseract-ocr/template +++ b/srcpkgs/tesseract-ocr/template @@ -18,7 +18,6 @@ distfiles=" https://github.com/tesseract-ocr/tessdata/archive/${_tessdataver}.tar.gz>tessdata-${_tessdataver}.tar.gz" checksum="2a66ff0d8595bff8f04032165e6c936389b1e5727c3ce5a27b3e059d218db1cb 38c637d3a1763f6c3d32e8f1d979f045668676ec5feb8ee1869ee77cedd31b08" -patch_args=-Np0 build_options="openmp" build_options_default="openmp" diff --git a/srcpkgs/tesseract/patches/gamma.patch b/srcpkgs/tesseract/patches/gamma.patch index a0440b81e6b..c63b55733bb 100644 --- a/srcpkgs/tesseract/patches/gamma.patch +++ b/srcpkgs/tesseract/patches/gamma.patch @@ -1,7 +1,7 @@ This is backported from upstream as redefining the name like that breaks compilation on various modern toolchains. Remove if/when a new release is made. ---- src/engine/main.cpp -+++ src/engine/main.cpp +--- a/src/engine/main.cpp ++++ b/src/engine/main.cpp @@ -508,10 +508,10 @@ static void setgamma(int val) } @@ -16,8 +16,8 @@ compilation on various modern toolchains. Remove if/when a new release is made. setgamma(curgamma); }); ---- src/shared/cube.h -+++ src/shared/cube.h +--- a/src/shared/cube.h ++++ b/src/shared/cube.h @@ -3,19 +3,11 @@ #define _FILE_OFFSET_BITS 64 diff --git a/srcpkgs/tesseract/template b/srcpkgs/tesseract/template index e073eee8879..5eca40635fd 100644 --- a/srcpkgs/tesseract/template +++ b/srcpkgs/tesseract/template @@ -12,7 +12,6 @@ license="zlib" homepage="http://tesseract.gg/" distfiles="http://download.tuxfamily.org/tesseract/tesseract_2014_05_12_first_edition_linux.tar.xz" checksum=8d6e07dd154a40a3f593e52289335c036f06cf90a0ebc400c4650adb3395a0f4 -patch_args=-Np0 pre_build() { for dim in 16 32 48 64 128 256 512; do diff --git a/srcpkgs/tevent/patches/fix-public-headers.patch b/srcpkgs/tevent/patches/fix-public-headers.patch index 7c39fd8fc51..1710226d458 100644 --- a/srcpkgs/tevent/patches/fix-public-headers.patch +++ b/srcpkgs/tevent/patches/fix-public-headers.patch @@ -1,7 +1,7 @@ tevent.h needs sys/types.h for pid_t ---- tevent.h 2018-07-12 05:51:30.000000000 +0000 -+++ tevent.h 2018-07-19 10:13:15.360128807 +0000 +--- a/tevent.h 2018-07-12 05:51:30.000000000 +0000 ++++ b/tevent.h 2018-07-19 10:13:15.360128807 +0000 @@ -31,6 +31,7 @@ #include #include diff --git a/srcpkgs/tevent/template b/srcpkgs/tevent/template index 86bbe45ef74..731d707efaa 100644 --- a/srcpkgs/tevent/template +++ b/srcpkgs/tevent/template @@ -16,7 +16,6 @@ license="GPL-3.0-or-later" homepage="https://tevent.samba.org" distfiles="https://ftp.samba.org/pub/tevent/tevent-${version}.tar.gz" checksum=f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696 -patch_args=-Np0 export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" diff --git a/srcpkgs/texi2mdoc/patches/musl.patch b/srcpkgs/texi2mdoc/patches/musl.patch index ef680595b96..7ed19267c59 100644 --- a/srcpkgs/texi2mdoc/patches/musl.patch +++ b/srcpkgs/texi2mdoc/patches/musl.patch @@ -1,7 +1,7 @@ Needed for __BEGIN_DECLS/__END_DECLS. ---- extern.h -+++ extern.h +--- a/extern.h ++++ b/extern.h @@ -17,6 +17,8 @@ #ifndef EXTERN_H #define EXTERN_H diff --git a/srcpkgs/texi2mdoc/template b/srcpkgs/texi2mdoc/template index d6b6bd659a8..1d3eceaee50 100644 --- a/srcpkgs/texi2mdoc/template +++ b/srcpkgs/texi2mdoc/template @@ -9,7 +9,6 @@ license="ISC" homepage="http://mdocml.bsd.lv/texi2mdoc" distfiles="http://mdocml.bsd.lv/texi2mdoc/snapshots/${pkgname}-${version}.tgz" checksum=7a45fd87c27cc8970a18db9ddddb2f09f18b8dd5152bf0ca377c3a5e7d304bfe -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/texlab/patches/jsonrpc.patch b/srcpkgs/texlab/patches/jsonrpc.patch index 9bd17f0dcd2..d0fef876bac 100644 --- a/srcpkgs/texlab/patches/jsonrpc.patch +++ b/srcpkgs/texlab/patches/jsonrpc.patch @@ -6,8 +6,8 @@ Date: Wed Mar 10 22:52:10 2021 +0100 diff --git crates/jsonrpc/src/client.rs crates/jsonrpc/src/client.rs index 7d71428..3245e24 100644 ---- crates/jsonrpc/src/client.rs -+++ crates/jsonrpc/src/client.rs +--- a/crates/jsonrpc/src/client.rs ++++ b/crates/jsonrpc/src/client.rs @@ -7,7 +7,7 @@ use futures::{ }; use serde::Serialize; @@ -37,8 +37,8 @@ index 7d71428..3245e24 100644 } diff --git crates/jsonrpc/src/types.rs crates/jsonrpc/src/types.rs index 30036d1..c1a2dce 100644 ---- crates/jsonrpc/src/types.rs -+++ crates/jsonrpc/src/types.rs +--- a/crates/jsonrpc/src/types.rs ++++ b/crates/jsonrpc/src/types.rs @@ -6,7 +6,7 @@ pub const PROTOCOL_VERSION: &str = "2.0"; #[derive(Debug, Eq, Hash, PartialEq, Clone, Deserialize, Serialize)] #[serde(untagged)] diff --git a/srcpkgs/texlab/patches/salsa.patch b/srcpkgs/texlab/patches/salsa.patch index cfa526ac8f0..2162599940f 100644 --- a/srcpkgs/texlab/patches/salsa.patch +++ b/srcpkgs/texlab/patches/salsa.patch @@ -8,8 +8,8 @@ Date: Wed Mar 10 22:31:07 2021 +0100 diff --git salsa/src/revision.rs salsa/src/revision.rs index ca7bb10..a18b581 100644 ---- salsa/src/revision.rs -+++ salsa/src/revision.rs +--- a/salsa/src/revision.rs ++++ b/salsa/src/revision.rs @@ -1,9 +1,9 @@ -use std::num::NonZeroU64; -use std::sync::atomic::{AtomicU64, Ordering}; @@ -89,8 +89,8 @@ index ca7bb10..a18b581 100644 } diff --git salsa/src/runtime.rs salsa/src/runtime.rs index 181a5ea..ada5fec 100644 ---- salsa/src/runtime.rs -+++ salsa/src/runtime.rs +--- a/salsa/src/runtime.rs ++++ b/salsa/src/runtime.rs @@ -10,7 +10,7 @@ use parking_lot::{Mutex, RwLock}; use rustc_hash::{FxHashMap, FxHasher}; use smallvec::SmallVec; @@ -137,8 +137,8 @@ index 181a5ea..ada5fec 100644 #[derive(Clone, Debug)] diff --git Cargo.toml Cargo.toml index 0847f06..7c4bb9a 100644 ---- Cargo.toml -+++ Cargo.toml +--- a/Cargo.toml ++++ b/Cargo.toml @@ -106,6 +106,9 @@ lalrpop = { version = "0.18", optional = true } [profile.release] lto = true diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template index 33cffac2c27..c61ac718f0a 100644 --- a/srcpkgs/texlab/template +++ b/srcpkgs/texlab/template @@ -11,7 +11,6 @@ distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz https://github.com/salsa-rs/salsa/archive/v0.13.2.tar.gz" checksum="04978b118b455607b5debd0a886f0728ca6c498289d2a0c60d8f83b316dc5ebc 2e33e20d22692f6bcd4d638392b9c2cfb716bcd28998e809db0dd88be4f70a31" -patch_args=-Np0 post_extract() { mv ../salsa-* salsa diff --git a/srcpkgs/texlive/patches/cross-luajit.patch b/srcpkgs/texlive/patches/cross-luajit.patch index 9655d7683db..79afc24bc42 100644 --- a/srcpkgs/texlive/patches/cross-luajit.patch +++ b/srcpkgs/texlive/patches/cross-luajit.patch @@ -1,5 +1,5 @@ ---- libs/luajit/native/Makefile.in 2018-09-07 06:40:04.000000000 +1000 -+++ libs/luajit/native/Makefile.in.new 2020-06-07 16:10:40.445000000 +1000 +--- a/libs/luajit/native/Makefile.in 2018-09-07 06:40:04.000000000 +1000 ++++ b/libs/luajit/native/Makefile.in.new 2020-06-07 16:10:40.445000000 +1000 @@ -154,6 +154,8 @@ am__v_CC_1 = CCLD = $(CC) diff --git a/srcpkgs/texlive/patches/freetype2-config.patch b/srcpkgs/texlive/patches/freetype2-config.patch index cef6d7532ba..8c22eecba69 100644 --- a/srcpkgs/texlive/patches/freetype2-config.patch +++ b/srcpkgs/texlive/patches/freetype2-config.patch @@ -2,8 +2,8 @@ Disables the use of freetype2-config. Does some weird stuff on i686, armv5tel, ppc*, etc. No harm caused by disabling it everywhere. ---- texk/dvipng/configure 2020-06-08 10:00:42.953000000 +1000 -+++ texk/dvipng/configure 2020-06-08 10:00:57.069000000 +1000 +--- a/texk/dvipng/configure 2020-06-08 10:00:42.953000000 +1000 ++++ b/texk/dvipng/configure 2020-06-08 10:00:57.069000000 +1000 @@ -16432,10 +16432,7 @@ else PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" @@ -16,8 +16,8 @@ everywhere. FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then ---- configure 2020-06-08 10:03:04.785000000 +1000 -+++ configure 2020-06-08 10:01:47.902000000 +1000 +--- a/configure 2020-06-08 10:03:04.785000000 +1000 ++++ b/configure 2020-06-08 10:01:47.902000000 +1000 @@ -21471,10 +21471,7 @@ else PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" @@ -30,8 +30,8 @@ everywhere. FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then ---- libs/gd/configure 2019-03-26 04:27:50.000000000 +1100 -+++ libs/gd/configure 2020-06-08 10:06:28.481000000 +1000 +--- a/libs/gd/configure 2019-03-26 04:27:50.000000000 +1100 ++++ b/libs/gd/configure 2020-06-08 10:06:28.481000000 +1000 @@ -5933,10 +5933,7 @@ else PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" @@ -44,8 +44,8 @@ everywhere. FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then ---- texk/dvisvgm/configure 2020-03-22 09:04:56.000000000 +1100 -+++ texk/dvisvgm/configure 2020-06-08 10:08:15.384000000 +1000 +--- a/texk/dvisvgm/configure 2020-03-22 09:04:56.000000000 +1100 ++++ b/texk/dvisvgm/configure 2020-06-08 10:08:15.384000000 +1000 @@ -21794,10 +21794,7 @@ else PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" @@ -58,8 +58,8 @@ everywhere. FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then ---- texk/xdvik/configure 2020-03-02 06:07:53.000000000 +1100 -+++ texk/xdvik/configure 2020-06-08 10:08:15.731000000 +1000 +--- a/texk/xdvik/configure 2020-03-02 06:07:53.000000000 +1100 ++++ b/texk/xdvik/configure 2020-06-08 10:08:15.731000000 +1000 @@ -19055,10 +19055,7 @@ else PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" @@ -72,8 +72,8 @@ everywhere. FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then ---- texk/web2c/configure 2020-01-17 09:02:50.000000000 +1100 -+++ texk/web2c/configure 2020-06-08 10:08:15.533000000 +1000 +--- a/texk/web2c/configure 2020-01-17 09:02:50.000000000 +1100 ++++ b/texk/web2c/configure 2020-06-08 10:08:15.533000000 +1000 @@ -25346,10 +25346,7 @@ else PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" @@ -86,8 +86,8 @@ everywhere. FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then ---- texk/ttf2pk2/configure 2019-03-26 04:27:50.000000000 +1100 -+++ texk/ttf2pk2/configure 2020-06-08 10:08:15.656000000 +1000 +--- a/texk/ttf2pk2/configure 2019-03-26 04:27:50.000000000 +1100 ++++ b/texk/ttf2pk2/configure 2020-06-08 10:08:15.656000000 +1000 @@ -15265,10 +15265,7 @@ else PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" diff --git a/srcpkgs/texlive/patches/kpsewhich-default-progname.patch b/srcpkgs/texlive/patches/kpsewhich-default-progname.patch index eecdf544f48..d89eb09d045 100644 --- a/srcpkgs/texlive/patches/kpsewhich-default-progname.patch +++ b/srcpkgs/texlive/patches/kpsewhich-default-progname.patch @@ -1,8 +1,8 @@ The default progname really should be kpsewhich, and makes a test pass which otherwise fails. ---- texk/kpathsea/kpsewhich.c 2020-07-01 19:07:23.592000000 +1000 -+++ texk/kpathsea/kpsewhich.c 2020-07-01 19:07:33.999000000 +1000 +--- a/texk/kpathsea/kpsewhich.c 2020-07-01 19:07:23.592000000 +1000 ++++ b/texk/kpathsea/kpsewhich.c 2020-07-01 19:07:33.999000000 +1000 @@ -60,7 +60,7 @@ boolean must_exist = false; diff --git a/srcpkgs/texlive/patches/luajit-arch-fixes.patch b/srcpkgs/texlive/patches/luajit-arch-fixes.patch index 658c0a90aa2..daf56db0fc7 100644 --- a/srcpkgs/texlive/patches/luajit-arch-fixes.patch +++ b/srcpkgs/texlive/patches/luajit-arch-fixes.patch @@ -7,8 +7,8 @@ that segfaults). Author: q66 ---- libs/luajit/configure -+++ libs/luajit/configure +--- a/libs/luajit/configure ++++ b/libs/luajit/configure @@ -14243,7 +14243,7 @@ else fi if grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1; then : @@ -28,8 +28,8 @@ Author: q66 fi if grep 'LJ_ARCH_PPC64 ' conftest.i >/dev/null 2>&1; then : DASM_ARCH=ppc64 ---- libs/luajit/m4/lj-system.m4 -+++ libs/luajit/m4/lj-system.m4 +--- a/libs/luajit/m4/lj-system.m4 ++++ b/libs/luajit/m4/lj-system.m4 @@ -52,7 +52,7 @@ AS_IF([grep 'LJ_LE' conftest.i >/dev/null 2>&1], [echo '-D ENDIAN_BE' >>dynasm_flags]) AS_IF([grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1], diff --git a/srcpkgs/texlive/patches/tlmgr.patch b/srcpkgs/texlive/patches/tlmgr.patch index 0dc69247f41..ef3ae26e736 100644 --- a/srcpkgs/texlive/patches/tlmgr.patch +++ b/srcpkgs/texlive/patches/tlmgr.patch @@ -9,8 +9,8 @@ Modifications: Modified by fosslinux. ---- texk/texlive/linked_scripts/texlive/tlmgr.pl -+++ texk/texlive/linked_scripts/texlive/tlmgr.pl +--- a/texk/texlive/linked_scripts/texlive/tlmgr.pl ++++ b/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -21,7 +21,7 @@ $tlmgrversion = "$tlmgrrevision ($datrev)"; diff --git a/srcpkgs/texlive/patches/updmap.patch b/srcpkgs/texlive/patches/updmap.patch index 5eb47be4d8c..948ed78eae1 100644 --- a/srcpkgs/texlive/patches/updmap.patch +++ b/srcpkgs/texlive/patches/updmap.patch @@ -1,7 +1,7 @@ kpsewhich TEXMFROOT is not the correct value to use in our setup. ---- texk/texlive/linked_scripts/texlive/updmap.pl 2021-01-21 11:15:02.314074252 +1100 -+++ texk/texlive/linked_scripts/texlive/updmap.pl 2021-01-21 11:15:53.365456336 +1100 +--- a/texk/texlive/linked_scripts/texlive/updmap.pl 2021-01-21 11:15:02.314074252 +1100 ++++ b/texk/texlive/linked_scripts/texlive/updmap.pl 2021-01-21 11:15:53.365456336 +1100 @@ -19,7 +19,7 @@ my $TEXMFROOT; BEGIN { diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template index bbbf04254bf..b9a19c12a34 100644 --- a/srcpkgs/texlive/template +++ b/srcpkgs/texlive/template @@ -81,7 +81,6 @@ checksum=e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078 python_version=3 # Virtual package cares only about year part of version provides="tex-${version%${version#????}}_1" -patch_args=-Np0 if [ "$CROSS_BUILD" ] ; then # Tangle is required for cross compile diff --git a/srcpkgs/texmaker/patches/singleapp.patch b/srcpkgs/texmaker/patches/singleapp.patch index de9cd61e932..4f221862316 100644 --- a/srcpkgs/texmaker/patches/singleapp.patch +++ b/srcpkgs/texmaker/patches/singleapp.patch @@ -1,7 +1,7 @@ diff --git singleapp/qtlocalpeer.cpp singleapp/qtlocalpeer.cpp index 332b064..c7ce527 100644 ---- singleapp/qtlocalpeer.cpp -+++ singleapp/qtlocalpeer.cpp +--- a/singleapp/qtlocalpeer.cpp ++++ b/singleapp/qtlocalpeer.cpp @@ -41,6 +41,7 @@ #include "qtlocalpeer.h" diff --git a/srcpkgs/texmaker/template b/srcpkgs/texmaker/template index 91035c31d4b..bd07f0b84ce 100644 --- a/srcpkgs/texmaker/template +++ b/srcpkgs/texmaker/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="http://www.xm1math.net/texmaker/index.html" distfiles="http://www.xm1math.net/$pkgname/$pkgname-$version.tar.bz2" checksum=1de3ab3f6d6bee37a7d0b528ca1cbb7ce8e7aef5ec6a4405aff2caf9d12bd0e2 -patch_args=-Np0 diff --git a/srcpkgs/texstudio/patches/30-disable-auto-update.patch b/srcpkgs/texstudio/patches/30-disable-auto-update.patch index b8df055e5de..78ad6e8896f 100644 --- a/srcpkgs/texstudio/patches/30-disable-auto-update.patch +++ b/srcpkgs/texstudio/patches/30-disable-auto-update.patch @@ -1,7 +1,7 @@ #initially based on debian's patch: https://sources.debian.net/patches/texstudio/2.11.2+debian-1/ #modification: in Settings menu: disable whole groupBox instead of all single elements ---- src/configdialog.ui -+++ src/configdialog.ui +--- a/src/configdialog.ui ++++ b/src/configdialog.ui @@ -485,6 +485,9 @@ @@ -13,8 +13,8 @@ Update ---- src/configmanager.cpp -+++ src/configmanager.cpp +--- a/src/configmanager.cpp ++++ b/src/configmanager.cpp @@ -477,7 +477,7 @@ registerOption("Thesaurus/Database", &thesaurus_database, "", &pseudoDialog->comboBoxThesaurusFileName); diff --git a/srcpkgs/texstudio/patches/31-fix-desktop.patch b/srcpkgs/texstudio/patches/31-fix-desktop.patch index 815d0034f29..31a449ab277 100644 --- a/srcpkgs/texstudio/patches/31-fix-desktop.patch +++ b/srcpkgs/texstudio/patches/31-fix-desktop.patch @@ -3,8 +3,8 @@ # Patches texstudio.desktop to add important keywords. It also removes the # useless categories and no longer needed encoding entry. ---- utilities/texstudio.desktop -+++ utilities/texstudio.desktop +--- a/utilities/texstudio.desktop ++++ b/utilities/texstudio.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Categories=Office;Publishing;Qt;X-SuSE-Core-Office;X-Mandriva-Office-Publishing;X-Misc; diff --git a/srcpkgs/texstudio/patches/40-phonon-cross.patch b/srcpkgs/texstudio/patches/40-phonon-cross.patch index 0f6f031a485..cb749715f77 100644 --- a/srcpkgs/texstudio/patches/40-phonon-cross.patch +++ b/srcpkgs/texstudio/patches/40-phonon-cross.patch @@ -1,5 +1,5 @@ ---- texstudio.pro -+++ texstudio.pro +--- a/texstudio.pro ++++ b/texstudio.pro @@ -79,8 +79,8 @@ uitools diff --git a/srcpkgs/texstudio/template b/srcpkgs/texstudio/template index b6462e01917..9ae4a1805c9 100644 --- a/srcpkgs/texstudio/template +++ b/srcpkgs/texstudio/template @@ -18,7 +18,6 @@ homepage="https://texstudio.org/" changelog="https://raw.githubusercontent.com/texstudio-org/texstudio/master/utilities/manual/CHANGELOG.txt" distfiles="https://github.com/texstudio-org/texstudio/archive/${version}.tar.gz" checksum=7251f8e6f2b17395c428e9ff13bfc2c58e5f07ec09aae1036ab912dcf89f6fad -patch_args=-Np0 build_options="phonon poppler" desc_option_phonon="build with phonon (=media support for pdf preview)" diff --git a/srcpkgs/textosaurus/patches/qt5-5.15.0.patch b/srcpkgs/textosaurus/patches/qt5-5.15.0.patch index 88af81be94b..57fceaf17ae 100644 --- a/srcpkgs/textosaurus/patches/qt5-5.15.0.patch +++ b/srcpkgs/textosaurus/patches/qt5-5.15.0.patch @@ -1,5 +1,5 @@ ---- src/libtextosaurus/saurus/miscellaneous/textapplication.h 2018-11-27 07:50:39.000000000 +0100 -+++ src/libtextosaurus/saurus/miscellaneous/textapplication.h 2020-07-27 12:33:06.612447044 +0200 +--- a/src/libtextosaurus/saurus/miscellaneous/textapplication.h 2018-11-27 07:50:39.000000000 +0100 ++++ b/src/libtextosaurus/saurus/miscellaneous/textapplication.h 2020-07-27 12:33:06.612447044 +0200 @@ -8,6 +8,7 @@ #include "definitions/definitions.h" #include "saurus/miscellaneous/textapplicationsettings.h" diff --git a/srcpkgs/textosaurus/template b/srcpkgs/textosaurus/template index bc317d47955..5223d1f5566 100644 --- a/srcpkgs/textosaurus/template +++ b/srcpkgs/textosaurus/template @@ -16,7 +16,6 @@ distfiles="${homepage}/archive/${version}.tar.gz https://github.com/martinrotter/scintilla/archive/${_scommit}.tar.gz" checksum="82093b6c8725d104498ce4a66e4cf5a3aa1f057b34600bd5d67413dce9bff2cf fad739e3493dea0f7435114ac936dc255d3b1471bd61c7e7349845ab626b95d9" -patch_args=-Np0 post_extract() { cp -Trp ${XBPS_BUILDDIR}/scintilla-${_scommit} ${wrksrc}/src/libtextosaurus/3rd-party/scintilla diff --git a/srcpkgs/texworks/patches/cross.patch b/srcpkgs/texworks/patches/cross.patch index 552d2907bea..af924d58da8 100644 --- a/srcpkgs/texworks/patches/cross.patch +++ b/srcpkgs/texworks/patches/cross.patch @@ -1,5 +1,5 @@ ---- modules/QtPDF/CMake/Modules/FindPoppler.cmake.orig 2017-04-29 18:23:51.000000000 +0200 -+++ modules/QtPDF/CMake/Modules/FindPoppler.cmake 2018-08-29 09:13:02.788284947 +0200 +--- a/modules/QtPDF/CMake/Modules/FindPoppler.cmake 2017-04-29 18:23:51.000000000 +0200 ++++ b/modules/QtPDF/CMake/Modules/FindPoppler.cmake 2018-08-29 09:13:02.788284947 +0200 @@ -69,15 +69,7 @@ MESSAGE(STATUS "Could not find libpoppler." ) ENDIF () @@ -17,8 +17,8 @@ FIND_PATH(POPPLER_QT_INCLUDE_DIR NAMES poppler-qt${QT_VERSION_MAJOR}.h poppler-link.h ---- CMakeLists.txt.orig 2017-04-29 18:23:51.000000000 +0200 -+++ CMakeLists.txt 2018-08-29 10:49:36.290088209 +0200 +--- a/CMakeLists.txt 2017-04-29 18:23:51.000000000 +0200 ++++ b/CMakeLists.txt 2018-08-29 10:49:36.290088209 +0200 @@ -91,7 +91,6 @@ SET(TeXworks_VERSION ${TeXworks_VER_MAJOR}.${TeXworks_VER_MINOR}.${TeXworks_VER_PATCH}) diff --git a/srcpkgs/texworks/patches/qt515.patch b/srcpkgs/texworks/patches/qt515.patch index 444e0e765e6..9c77c157e46 100644 --- a/srcpkgs/texworks/patches/qt515.patch +++ b/srcpkgs/texworks/patches/qt515.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Fix compilation with Qt 5.15 diff --git a/modules/QtPDF/src/PDFBackend.cpp b/modules/QtPDF/src/PDFBackend.cpp index 0305d87a..500d20aa 100644 ---- modules/QtPDF/src/PDFBackend.cpp -+++ modules/QtPDF/src/PDFBackend.cpp +--- a/modules/QtPDF/src/PDFBackend.cpp ++++ b/modules/QtPDF/src/PDFBackend.cpp @@ -14,6 +14,7 @@ #include diff --git a/srcpkgs/texworks/template b/srcpkgs/texworks/template index 92402d6d98e..87ca8404934 100644 --- a/srcpkgs/texworks/template +++ b/srcpkgs/texworks/template @@ -16,7 +16,6 @@ license="GPL-2.0-or-later" homepage="https://www.tug.org/texworks" distfiles="https://github.com/texworks/texworks/archive/release-${version}.tar.gz" checksum=b4695539b9666935d2c467cc618c7d79c174e2ec728e31f72df8534862a5c290 -patch_args=-Np0 do_check() { : # requires xserver diff --git a/srcpkgs/tgt/patches/musl-__wordsize.patch b/srcpkgs/tgt/patches/musl-__wordsize.patch index ba3c8b7e5bb..f08ca5910fd 100644 --- a/srcpkgs/tgt/patches/musl-__wordsize.patch +++ b/srcpkgs/tgt/patches/musl-__wordsize.patch @@ -1,7 +1,7 @@ The definition of __WORDSIZE is found in ---- usr/iscsi/iscsid.h 2015-11-03 04:58:36.000000000 +0100 -+++ usr/iscsi/iscsid.h 2015-11-04 16:23:25.029877334 +0100 +--- a/usr/iscsi/iscsid.h 2015-11-03 04:58:36.000000000 +0100 ++++ b/usr/iscsi/iscsid.h 2015-11-04 16:23:25.029877334 +0100 @@ -22,6 +22,9 @@ #include #include @@ -12,8 +12,8 @@ The definition of __WORDSIZE is found in #include "transport.h" #include "list.h" ---- usr/tgtd.h 2015-11-04 16:25:05.435884573 +0100 -+++ usr/tgtd.h 2015-11-04 16:25:52.415887960 +0100 +--- a/usr/tgtd.h 2015-11-04 16:25:05.435884573 +0100 ++++ b/usr/tgtd.h 2015-11-04 16:25:52.415887960 +0100 @@ -2,6 +2,9 @@ #ifndef __TARGET_DAEMON_H #define __TARGET_DAEMON_H @@ -24,8 +24,8 @@ The definition of __WORDSIZE is found in #include "log.h" #include "scsi_cmnd.h" #include "tgtadm_error.h" ---- usr/util.h 2015-11-04 16:26:22.262890112 +0100 -+++ usr/util.h 2015-11-04 16:27:01.364892931 +0100 +--- a/usr/util.h 2015-11-04 16:26:22.262890112 +0100 ++++ b/usr/util.h 2015-11-04 16:27:01.364892931 +0100 @@ -16,6 +16,9 @@ #include #include diff --git a/srcpkgs/tgt/template b/srcpkgs/tgt/template index 90a37ec9d1a..c5a638e6e3a 100644 --- a/srcpkgs/tgt/template +++ b/srcpkgs/tgt/template @@ -14,7 +14,6 @@ license="GPL-2.0-only" homepage="http://stgt.sourceforge.net/" distfiles="https://github.com/fujita/tgt/archive/v${version}.tar.gz" checksum=e2255482f1a2797c115a6d545c37428b10a4ba6276a2af787da5378fa4e34e75 -patch_args=-Np0 post_extract() { sed -i 's/CFLAGS/MYCFLAGS/; s/\$(MYCFLAGS)/& $(CFLAGS) -Wno-error=stringop-truncation/g' usr/Makefile diff --git a/srcpkgs/thingylaunch/patches/fix-cmake-flags-override.patch b/srcpkgs/thingylaunch/patches/fix-cmake-flags-override.patch index 023f2b2c00a..55741280d9f 100644 --- a/srcpkgs/thingylaunch/patches/fix-cmake-flags-override.patch +++ b/srcpkgs/thingylaunch/patches/fix-cmake-flags-override.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -5,8 +5,6 @@ SET (TL_PROJECT_VERS 2.0.3) PROJECT (${TL_PROJECT_NAME} CXX C) diff --git a/srcpkgs/thingylaunch/template b/srcpkgs/thingylaunch/template index 6db8f5ef127..5e862376125 100644 --- a/srcpkgs/thingylaunch/template +++ b/srcpkgs/thingylaunch/template @@ -12,7 +12,6 @@ license="BSD" homepage="https://gahr.ch/thingylaunch/" distfiles="https://github.com/gahr/${pkgname}/archive/${version}.tar.gz" checksum=4d9cc6b826bddb3d02836f721316bfc24c2b31f75c9c2d5077ae162eb3d60b60 -patch_args=-Np0 post_install() { vlicense COPYRIGHT diff --git a/srcpkgs/thunderbird/patches/big-endian-image-decoders.patch b/srcpkgs/thunderbird/patches/big-endian-image-decoders.patch index ccb417b61f1..bd2f925c917 100644 --- a/srcpkgs/thunderbird/patches/big-endian-image-decoders.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/fix-arm-opus-include.patch b/srcpkgs/thunderbird/patches/fix-arm-opus-include.patch index 6e0c5875da3..b0c052f4009 100644 --- a/srcpkgs/thunderbird/patches/fix-arm-opus-include.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/fix-cross.patch b/srcpkgs/thunderbird/patches/fix-cross.patch index 9b8a816d269..fad8f9060c4 100644 --- a/srcpkgs/thunderbird/patches/fix-cross.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/fix-desktop-icon-path.patch b/srcpkgs/thunderbird/patches/fix-desktop-icon-path.patch index 60af12e80b1..c4664d3da7c 100644 --- a/srcpkgs/thunderbird/patches/fix-desktop-icon-path.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/fix-fortify-inline.patch b/srcpkgs/thunderbird/patches/fix-fortify-inline.patch index c1190197d32..2498c57fc73 100644 --- a/srcpkgs/thunderbird/patches/fix-fortify-inline.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/fix-i686-ppc-musl.patch b/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch index 6df609bbf16..717f3cd2f9c 100644 --- a/srcpkgs/thunderbird/patches/fix-i686-ppc-musl.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/fix-image-format-warning.patch b/srcpkgs/thunderbird/patches/fix-image-format-warning.patch index 9b3b38d9065..7cdff60ce2f 100644 --- a/srcpkgs/thunderbird/patches/fix-image-format-warning.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/fix-tools.patch b/srcpkgs/thunderbird/patches/fix-tools.patch index 1af39bc6118..94de423ce59 100644 --- a/srcpkgs/thunderbird/patches/fix-tools.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/fix-wasm-arm.patch b/srcpkgs/thunderbird/patches/fix-wasm-arm.patch index e6ad61c9f44..a6035e87616 100644 --- a/srcpkgs/thunderbird/patches/fix-wasm-arm.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/fix-webrtc-glibcisms.patch b/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch index cf895dd8448..70910da5861 100644 --- a/srcpkgs/thunderbird/patches/fix-webrtc-glibcisms.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/flac-no-ffvpx.patch b/srcpkgs/thunderbird/patches/flac-no-ffvpx.patch index e3f60e8ecf6..154aad63e33 100644 --- a/srcpkgs/thunderbird/patches/flac-no-ffvpx.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/mallinfo.patch b/srcpkgs/thunderbird/patches/mallinfo.patch index afea86c0a2c..0d704301f39 100644 --- a/srcpkgs/thunderbird/patches/mallinfo.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/musl-rust.configure.patch b/srcpkgs/thunderbird/patches/musl-rust.configure.patch index d8f387136e0..0b2f7dee1d3 100644 --- a/srcpkgs/thunderbird/patches/musl-rust.configure.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/ppc32-fix-build.patch b/srcpkgs/thunderbird/patches/ppc32-fix-build.patch index c1a8f422d0a..b26a46cfe83 100644 --- a/srcpkgs/thunderbird/patches/ppc32-fix-build.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/rust-configure.patch b/srcpkgs/thunderbird/patches/rust-configure.patch index 887c102bc55..07b98d6c7ca 100644 --- a/srcpkgs/thunderbird/patches/rust-configure.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/rust-has-i128.patch b/srcpkgs/thunderbird/patches/rust-has-i128.patch index 4c90cd3d106..c25a185c1c1 100644 --- a/srcpkgs/thunderbird/patches/rust-has-i128.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/sandbox-fork.patch b/srcpkgs/thunderbird/patches/sandbox-fork.patch index 72640cb7f70..328943cb001 100644 --- a/srcpkgs/thunderbird/patches/sandbox-fork.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/sandbox-largefile.patch b/srcpkgs/thunderbird/patches/sandbox-largefile.patch index 494ca82df5a..6ee7f3a8215 100644 --- a/srcpkgs/thunderbird/patches/sandbox-largefile.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/skia-sucks1.patch b/srcpkgs/thunderbird/patches/skia-sucks1.patch index 05ad34a3fc3..cd9eecccf61 100644 --- a/srcpkgs/thunderbird/patches/skia-sucks1.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/skia-sucks2.patch b/srcpkgs/thunderbird/patches/skia-sucks2.patch index 207b3cf6733..1a498f8711d 100644 --- a/srcpkgs/thunderbird/patches/skia-sucks2.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/skia-sucks3.patch b/srcpkgs/thunderbird/patches/skia-sucks3.patch index f4e890f0536..908311cdb6d 100644 --- a/srcpkgs/thunderbird/patches/skia-sucks3.patch +++ b/srcpkgs/thunderbird/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/thunderbird/patches/sndio.patch b/srcpkgs/thunderbird/patches/sndio.patch index c5e5c486dd1..959fc1ec913 100644 --- a/srcpkgs/thunderbird/patches/sndio.patch +++ b/srcpkgs/thunderbird/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/thunderbird/template b/srcpkgs/thunderbird/template index 4d152829f94..72155ef786e 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -12,7 +12,6 @@ license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.thunderbird.net/" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz" checksum=ad070eb27ed5087819b62495e8f96ec0c8d8827598c415648c69ef989c634676 -patch_args=-Np0 lib32disabled=yes diff --git a/srcpkgs/tickr/patches/musl-fix-unknown-fd_set.patch b/srcpkgs/tickr/patches/musl-fix-unknown-fd_set.patch index 0c3263f08d9..aaf316860f2 100644 --- a/srcpkgs/tickr/patches/musl-fix-unknown-fd_set.patch +++ b/srcpkgs/tickr/patches/musl-fix-unknown-fd_set.patch @@ -1,5 +1,5 @@ ---- src/libetm-0.5.0/tcp_socket.c 2020-01-09 10:49:20.000000000 +0100 -+++ src/libetm-0.5.0/tcp_socket.c.new 2020-06-04 08:57:53.532982208 +0200 +--- a/src/libetm-0.5.0/tcp_socket.c 2020-01-09 10:49:20.000000000 +0100 ++++ b/src/libetm-0.5.0/tcp_socket.c.new 2020-06-04 08:57:53.532982208 +0200 @@ -24,6 +24,7 @@ #include #include diff --git a/srcpkgs/tickr/template b/srcpkgs/tickr/template index 5bd58b02022..285e2419fcc 100644 --- a/srcpkgs/tickr/template +++ b/srcpkgs/tickr/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="https://www.open-tickr.net/" distfiles="https://www.open-tickr.net/src/${pkgname}-${version}.tar.gz" checksum=37dd2d970cd9bf9b0ebc5e6cbf6605ea460008f577a43a7500e506e9dffcd802 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in arm*|ppc64|ppc) configure_args+=" LIBS=-lm" ;; diff --git a/srcpkgs/tidy5/patches/allow-cross.patch b/srcpkgs/tidy5/patches/allow-cross.patch index 038fbecc757..b17e95c3fde 100644 --- a/srcpkgs/tidy5/patches/allow-cross.patch +++ b/srcpkgs/tidy5/patches/allow-cross.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2015-11-23 16:07:04.000000000 +0100 -+++ CMakeLists.txt 2015-11-25 09:59:50.944941514 +0100 +--- a/CMakeLists.txt 2015-11-23 16:07:04.000000000 +0100 ++++ b/CMakeLists.txt 2015-11-25 09:59:50.944941514 +0100 @@ -238,7 +238,7 @@ # run built EXE to generate xml output add_custom_command( diff --git a/srcpkgs/tidy5/template b/srcpkgs/tidy5/template index eecaf052f7d..616b746d8cd 100644 --- a/srcpkgs/tidy5/template +++ b/srcpkgs/tidy5/template @@ -14,7 +14,6 @@ license="W3C" homepage="http://www.htacg.org/${_reponame}/" distfiles="https://github.com/htacg/${_reponame}/archive/${version}.tar.gz" checksum=5caa2c769204f506e24ea4986a45abe23f71d14f0fe968314f20065f342ffdba -patch_args=-Np0 provides="tidy-${version}_${revision}" replaces="tidy>0" diff --git a/srcpkgs/tilp2/patches/no-kde.patch b/srcpkgs/tilp2/patches/no-kde.patch index ea1cb05eafe..cf179de0782 100644 --- a/srcpkgs/tilp2/patches/no-kde.patch +++ b/srcpkgs/tilp2/patches/no-kde.patch @@ -1,5 +1,5 @@ ---- src/Makefile.am.orig -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -9,16 +9,16 @@ tilp_CPPFLAGS = -I$(top_srcdir)/intl \ @TICABLES_CFLAGS@ @TIFILES_CFLAGS@ @TICALCS_CFLAGS@ @TICONV_CFLAGS@ \ @@ -21,8 +21,8 @@ tilp_SOURCES = *.h \ tilp_calcs.c tilp_cmdline.c tilp_config.c tilp_error.c \ tilp_files.c tilp_gif.c tilp_main.c \ ---- configure.ac.orig -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -118,22 +118,23 @@ CFLAGS="$CFLAGS $ARCH" diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template index a8c9e0851d4..276c85e6e74 100644 --- a/srcpkgs/tilp2/template +++ b/srcpkgs/tilp2/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later" homepage="https://www.ticalc.org" distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${version}.tar.bz2" checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47 -patch_args=-Np0 pre_configure() { mkdir -p m4 diff --git a/srcpkgs/tinyxml/patches/entity.patch b/srcpkgs/tinyxml/patches/entity.patch index e4814ed4522..2226f34fa55 100644 --- a/srcpkgs/tinyxml/patches/entity.patch +++ b/srcpkgs/tinyxml/patches/entity.patch @@ -3,8 +3,8 @@ Index: tinyxml.cpp RCS file: /cvsroot/tinyxml/tinyxml/tinyxml.cpp,v retrieving revision 1.105 diff -u -r1.105 tinyxml.cpp ---- tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105 -+++ tinyxml.cpp 19 Jul 2010 21:24:16 -0000 +--- a/tinyxml.cpp 5 Jun 2010 19:06:57 -0000 1.105 ++++ b/tinyxml.cpp 19 Jul 2010 21:24:16 -0000 @@ -57,30 +57,7 @@ { unsigned char c = (unsigned char) str[i]; @@ -42,8 +42,8 @@ Index: xmltest.cpp RCS file: /cvsroot/tinyxml/tinyxml/xmltest.cpp,v retrieving revision 1.89 diff -u -r1.89 xmltest.cpp ---- xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89 -+++ xmltest.cpp 19 Jul 2010 21:24:16 -0000 +--- a/xmltest.cpp 5 Jun 2010 17:41:52 -0000 1.89 ++++ b/xmltest.cpp 19 Jul 2010 21:24:16 -0000 @@ -1340,6 +1340,16 @@ }*/ } diff --git a/srcpkgs/tinyxml/patches/tinyxml-2.5.3-stl.patch b/srcpkgs/tinyxml/patches/tinyxml-2.5.3-stl.patch index 2e03569dbb7..8288e7dc948 100644 --- a/srcpkgs/tinyxml/patches/tinyxml-2.5.3-stl.patch +++ b/srcpkgs/tinyxml/patches/tinyxml-2.5.3-stl.patch @@ -1,5 +1,5 @@ ---- tinyxml.h~ 2007-11-30 22:39:36.000000000 +0100 -+++ tinyxml.h 2007-11-30 22:39:36.000000000 +0100 +--- a/tinyxml.h~ 2007-11-30 22:39:36.000000000 +0100 ++++ b/tinyxml.h 2007-11-30 22:39:36.000000000 +0100 @@ -26,6 +26,8 @@ distribution. #ifndef TINYXML_INCLUDED #define TINYXML_INCLUDED diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template index 291c14f84dd..29c19bb162d 100644 --- a/srcpkgs/tinyxml/template +++ b/srcpkgs/tinyxml/template @@ -9,7 +9,6 @@ homepage="http://www.grinninglizard.com/tinyxml/" license="zlib" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_2_6_2.tar.gz" checksum=15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593 -patch_args=-Np0 do_build() { # Fix Makefile diff --git a/srcpkgs/tlsh/patches/fix-cflags.patch b/srcpkgs/tlsh/patches/fix-cflags.patch index 8715563715c..b6a513a3d1b 100644 --- a/srcpkgs/tlsh/patches/fix-cflags.patch +++ b/srcpkgs/tlsh/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -125,7 +125,7 @@ if (CMAKE_BUILD_TYPE STREQUAL Debug) endif() else(CMAKE_BUILD_TYPE STREQUAL Debug) diff --git a/srcpkgs/tlsh/template b/srcpkgs/tlsh/template index a173f36f822..4ee1ccdc728 100644 --- a/srcpkgs/tlsh/template +++ b/srcpkgs/tlsh/template @@ -11,7 +11,6 @@ license="Apache-2.0, BSD-3-Clause" homepage="https://github.com/trendmicro/tlsh" distfiles="https://github.com/trendmicro/tlsh/archive/${version}.tar.gz" checksum=a8a7972d8bafb5fd66bd597b72037356dd9882e71a7e9b5f37281751a99ce686 -patch_args=-Np0 pre_configure() { vsed -i src/CMakeLists.txt -e 's/set(TLSH_SHARED_LIBRARY 0)/set(TLSH_SHARED_LIBRARY 1)/' diff --git a/srcpkgs/tmfs/patches/S_IFDIR.patch b/srcpkgs/tmfs/patches/S_IFDIR.patch index 94035ed1c08..797927e36a8 100644 --- a/srcpkgs/tmfs/patches/S_IFDIR.patch +++ b/srcpkgs/tmfs/patches/S_IFDIR.patch @@ -1,7 +1,7 @@ diff --git src/readdir.cc src/readdir.cc index 9b31232..94000bc 100644 ---- src/readdir.cc -+++ src/readdir.cc +--- a/src/readdir.cc ++++ b/src/readdir.cc @@ -13,7 +13,7 @@ int tmfs_readdir(const char * path, void * buf, fuse_fill_dir_t filler_cb, off_t struct stat stbuf; diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template index 65c541ebb04..1dbed3e0eb7 100644 --- a/srcpkgs/tmfs/template +++ b/srcpkgs/tmfs/template @@ -14,4 +14,3 @@ checksum="897ad09e21ddd8e912dc1baba4466d8a65a09b3abdeb31e4640c2d770915f2f4" post_install() { vlicense LICENSE } -patch_args=-Np0 diff --git a/srcpkgs/tmines/patches/cmake.patch b/srcpkgs/tmines/patches/cmake.patch index 9bb8069abbb..cba74ad8e08 100644 --- a/srcpkgs/tmines/patches/cmake.patch +++ b/srcpkgs/tmines/patches/cmake.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -58,6 +58,28 @@ add_library(iodevice_simulation src/iodevice_simulation.cpp) find_package(Curses REQUIRED) include_directories(${CURSES_INCLUDE_DIRS}) diff --git a/srcpkgs/tmines/template b/srcpkgs/tmines/template index 8a8a4f4a12a..7669477aea9 100644 --- a/srcpkgs/tmines/template +++ b/srcpkgs/tmines/template @@ -10,7 +10,6 @@ license="MIT" homepage="https://github.com/tropf/tmines" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=7b5037c7cedd6c744ec63d10fa59b415e5e3654e52b0cfda561ac545af8576cf -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone";; diff --git a/srcpkgs/tnftp/patches/cross.patch b/srcpkgs/tnftp/patches/cross.patch index fdf2d8830c9..7e193b17eca 100644 --- a/srcpkgs/tnftp/patches/cross.patch +++ b/srcpkgs/tnftp/patches/cross.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -403,7 +403,7 @@ [$accheck_includes])]) diff --git a/srcpkgs/tnftp/template b/srcpkgs/tnftp/template index 362abdd4718..c0b75c164f2 100644 --- a/srcpkgs/tnftp/template +++ b/srcpkgs/tnftp/template @@ -11,7 +11,6 @@ license="BSD" homepage="http://netbsd.gw.com/cgi-bin/man-cgi?ftp" distfiles="ftp://ftp.netbsd.org/pub/NetBSD/misc/${pkgname}/${pkgname}-${version}.tar.gz" checksum=ba4a92b693d04179664524eef0801c8eed4447941c9855f377f98f119f221c03 -patch_args=-Np0 alternatives=" ftp:ftp:/usr/bin/${pkgname} diff --git a/srcpkgs/tomahawk/patches/musl.patch b/srcpkgs/tomahawk/patches/musl.patch index 1f967ef46f6..7c3cd4c60b6 100644 --- a/srcpkgs/tomahawk/patches/musl.patch +++ b/srcpkgs/tomahawk/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/libtomahawk/accounts/ResolverAccount.cpp.orig -+++ src/libtomahawk/accounts/ResolverAccount.cpp +--- a/src/libtomahawk/accounts/ResolverAccount.cpp ++++ b/src/libtomahawk/accounts/ResolverAccount.cpp @@ -44,6 +44,17 @@ #include #include diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template index 23cdba671dd..0edbacc5f8a 100644 --- a/srcpkgs/tomahawk/template +++ b/srcpkgs/tomahawk/template @@ -31,7 +31,6 @@ desc_option_hatchet="Enable support for http://hatchet.is" desc_option_kde="Enable support for KDE" desc_option_xmpp="Enable support for XMPP" build_options_default="xmpp upower" -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" diff --git a/srcpkgs/tor/patches/ppc.patch b/srcpkgs/tor/patches/ppc.patch index 86b3ba1ce97..d93bd2e6a0b 100644 --- a/srcpkgs/tor/patches/ppc.patch +++ b/srcpkgs/tor/patches/ppc.patch @@ -1,5 +1,5 @@ ---- src/lib/sandbox/sandbox.c -+++ src/lib/sandbox/sandbox.c +--- a/src/lib/sandbox/sandbox.c ++++ b/src/lib/sandbox/sandbox.c @@ -115,6 +115,16 @@ #define REG_SYSCALL 8 #define M_SYSCALL regs[REG_SYSCALL] diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template index eb10de66fa9..42370ea8ba2 100644 --- a/srcpkgs/tor/template +++ b/srcpkgs/tor/template @@ -15,7 +15,6 @@ homepage="https://www.torproject.org/" changelog="https://gitweb.torproject.org/tor.git/plain/ReleaseNotes" distfiles="https://dist.torproject.org/tor-${version}.tar.gz" checksum=57ded091e8bcdcebb0013fe7ef4a4439827cb169358c7874fd05fa00d813e227 -patch_args=-Np0 conf_files="/etc/tor/torrc" system_accounts="tor" diff --git a/srcpkgs/torbrowser-launcher/patches/python-3.8.patch b/srcpkgs/torbrowser-launcher/patches/python-3.8.patch index 6003bd751cd..6462b81dd21 100644 --- a/srcpkgs/torbrowser-launcher/patches/python-3.8.patch +++ b/srcpkgs/torbrowser-launcher/patches/python-3.8.patch @@ -1,5 +1,5 @@ ---- setup.py.orig -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -35,7 +35,7 @@ SHARE = 'share' diff --git a/srcpkgs/torbrowser-launcher/template b/srcpkgs/torbrowser-launcher/template index 9634f108bb0..2d8ce5bf282 100644 --- a/srcpkgs/torbrowser-launcher/template +++ b/srcpkgs/torbrowser-launcher/template @@ -14,7 +14,6 @@ homepage="https://github.com/micahflee/torbrowser-launcher" changelog="https://raw.githubusercontent.com/micahflee/torbrowser-launcher/master/CHANGELOG.md" distfiles="https://github.com/micahflee/torbrowser-launcher/archive/v${version}.tar.gz" checksum=58b17bd5a9a6f35fe78d83e69fdf77919ffa8c2492b1add1d47aed6237794f93 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/touchegg/patches/musl.patch b/srcpkgs/touchegg/patches/musl.patch index 62e9e0fbbbb..8504cfa2f8c 100644 --- a/srcpkgs/touchegg/patches/musl.patch +++ b/srcpkgs/touchegg/patches/musl.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Fix missing header for musl diff --git a/src/utils/client-lock.cpp b/src/utils/client-lock.cpp index fb1e67b..27c6c6a 100644 ---- src/utils/client-lock.cpp -+++ src/utils/client-lock.cpp +--- a/src/utils/client-lock.cpp ++++ b/src/utils/client-lock.cpp @@ -19,6 +19,7 @@ #include diff --git a/srcpkgs/touchegg/patches/no-systemd.patch b/srcpkgs/touchegg/patches/no-systemd.patch index 7b194cca886..efd2ca83347 100644 --- a/srcpkgs/touchegg/patches/no-systemd.patch +++ b/srcpkgs/touchegg/patches/no-systemd.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Fix CMake failing because of missing Systemd service dir diff --git a/CMakeLists.txt b/CMakeLists.txt index dee220d..13b773f 100755 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -76,11 +76,6 @@ include(GNUInstallDirs) set(SYSTEM_CONFIG_FILE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/touchegg/touchegg.conf") target_compile_definitions(touchegg PUBLIC SYSTEM_CONFIG_FILE_PATH=\"${SYSTEM_CONFIG_FILE_PATH}\") diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template index a09ec963748..538277a2c68 100644 --- a/srcpkgs/touchegg/template +++ b/srcpkgs/touchegg/template @@ -13,7 +13,6 @@ homepage="https://github.com/JoseExposito/touchegg" distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz" checksum=efff0f2011078cea15f2f130d1501714f8e3f82b7e883e81eccf956ac7966d0e system_accounts="_touchegg" -patch_args=-Np0 post_install() { # we don't want the package being installed to mean it should be autostarted diff --git a/srcpkgs/trace-cmd/patches/fix-program-name.patch b/srcpkgs/trace-cmd/patches/fix-program-name.patch index 53d63ca3ec7..97012224611 100644 --- a/srcpkgs/trace-cmd/patches/fix-program-name.patch +++ b/srcpkgs/trace-cmd/patches/fix-program-name.patch @@ -1,5 +1,5 @@ ---- kernel-shark/src/kernelshark.cpp 2019-07-05 18:23:00.000000000 +0200 -+++ kernel-shark/src/kernelshark.cpp 2019-07-08 17:52:19.081010524 +0200 +--- a/kernel-shark/src/kernelshark.cpp 2019-07-05 18:23:00.000000000 +0200 ++++ b/kernel-shark/src/kernelshark.cpp 2019-07-08 17:52:19.081010524 +0200 @@ -35,6 +35,11 @@ { QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); diff --git a/srcpkgs/trace-cmd/patches/musl-__bswap64.patch b/srcpkgs/trace-cmd/patches/musl-__bswap64.patch index 46713c4880b..21b2c5a6965 100644 --- a/srcpkgs/trace-cmd/patches/musl-__bswap64.patch +++ b/srcpkgs/trace-cmd/patches/musl-__bswap64.patch @@ -1,5 +1,5 @@ ---- lib/trace-cmd/include/trace-cmd-local.h 2020-07-17 17:14:20.000000000 +0200 -+++ lib/trace-cmd/include/trace-cmd-local.h 2020-07-18 16:31:32.060682767 +0200 +--- a/lib/trace-cmd/include/trace-cmd-local.h 2020-07-17 17:14:20.000000000 +0200 ++++ b/lib/trace-cmd/include/trace-cmd-local.h 2020-07-18 16:31:32.060682767 +0200 @@ -18,8 +18,13 @@ #ifndef htonll diff --git a/srcpkgs/trace-cmd/patches/musl-limits_h.patch b/srcpkgs/trace-cmd/patches/musl-limits_h.patch index df85bfa5038..83e278c8ab9 100644 --- a/srcpkgs/trace-cmd/patches/musl-limits_h.patch +++ b/srcpkgs/trace-cmd/patches/musl-limits_h.patch @@ -1,5 +1,5 @@ ---- include/tracefs/tracefs.h 2020-07-17 17:14:20.000000000 +0200 -+++ include/tracefs/tracefs.h 2020-07-18 16:27:27.559697340 +0200 +--- a/include/tracefs/tracefs.h 2020-07-17 17:14:20.000000000 +0200 ++++ b/include/tracefs/tracefs.h 2020-07-18 16:27:27.559697340 +0200 @@ -6,6 +6,7 @@ #ifndef _TRACE_FS_H #define _TRACE_FS_H @@ -8,8 +8,8 @@ #include "traceevent/event-parse.h" char *tracefs_get_tracing_file(const char *name); ---- lib/trace-cmd/trace-plugin.c 2020-07-17 17:14:20.000000000 +0200 -+++ lib/trace-cmd/trace-plugin.c 2020-07-18 16:33:40.323675122 +0200 +--- a/lib/trace-cmd/trace-plugin.c 2020-07-17 17:14:20.000000000 +0200 ++++ b/lib/trace-cmd/trace-plugin.c 2020-07-18 16:33:40.323675122 +0200 @@ -6,6 +6,7 @@ #include #include @@ -18,8 +18,8 @@ #include #include #include "trace-cmd.h" ---- tracecmd/trace-agent.c 2020-07-17 17:14:20.000000000 +0200 -+++ tracecmd/trace-agent.c 2020-07-18 16:35:53.882667161 +0200 +--- a/tracecmd/trace-agent.c 2020-07-17 17:14:20.000000000 +0200 ++++ b/tracecmd/trace-agent.c 2020-07-18 16:35:53.882667161 +0200 @@ -14,6 +14,7 @@ #include #include @@ -28,8 +28,8 @@ #include #include #include ---- tracecmd/trace-setup-guest.c 2020-07-17 17:14:20.000000000 +0200 -+++ tracecmd/trace-setup-guest.c 2020-07-18 16:37:29.463661464 +0200 +--- a/tracecmd/trace-setup-guest.c 2020-07-17 17:14:20.000000000 +0200 ++++ b/tracecmd/trace-setup-guest.c 2020-07-18 16:37:29.463661464 +0200 @@ -13,6 +13,7 @@ #include #include diff --git a/srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch b/srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch index 58fa2de6243..5203d3335c2 100644 --- a/srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch +++ b/srcpkgs/trace-cmd/patches/musl-no_pthread_attr_setaffinity_np.patch @@ -1,5 +1,5 @@ ---- tracecmd/trace-tsync.c 2020-07-17 17:14:20.000000000 +0200 -+++ tracecmd/trace-tsync.c 2020-07-18 16:41:53.175645746 +0200 +--- a/tracecmd/trace-tsync.c 2020-07-17 17:14:20.000000000 +0200 ++++ b/tracecmd/trace-tsync.c 2020-07-18 16:41:53.175645746 +0200 @@ -104,8 +104,10 @@ pthread_attr_init(&attrib); diff --git a/srcpkgs/trace-cmd/patches/musl-pthread_h.patch b/srcpkgs/trace-cmd/patches/musl-pthread_h.patch index e3a08d753a4..36758839184 100644 --- a/srcpkgs/trace-cmd/patches/musl-pthread_h.patch +++ b/srcpkgs/trace-cmd/patches/musl-pthread_h.patch @@ -1,5 +1,5 @@ ---- include/trace-cmd/trace-cmd.h 2020-07-17 17:14:20.000000000 +0200 -+++ include/trace-cmd/trace-cmd.h 2020-07-18 16:23:27.984711620 +0200 +--- a/include/trace-cmd/trace-cmd.h 2020-07-17 17:14:20.000000000 +0200 ++++ b/include/trace-cmd/trace-cmd.h 2020-07-18 16:23:27.984711620 +0200 @@ -6,6 +6,7 @@ #ifndef _TRACE_CMD_H #define _TRACE_CMD_H diff --git a/srcpkgs/trace-cmd/template b/srcpkgs/trace-cmd/template index 4410e51bca9..34f9bcb40d4 100644 --- a/srcpkgs/trace-cmd/template +++ b/srcpkgs/trace-cmd/template @@ -16,7 +16,6 @@ homepage="http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git/" distfiles="http://git.kernel.org/cgit/linux/kernel/git/rostedt/${pkgname}.git/snapshot/${pkgname}-v${version}.tar.gz" checksum=9404fc3cf540ea795304608068c9db6cdb38b90584c7f3c43249785913d54b38 disable_parallel_build=yes -patch_args=-Np0 post_install() { vmkdir usr/share/bash-completion/completions diff --git a/srcpkgs/traceroute/patches/musl.patch b/srcpkgs/traceroute/patches/musl.patch index db961ef5652..617a1936c9e 100644 --- a/srcpkgs/traceroute/patches/musl.patch +++ b/srcpkgs/traceroute/patches/musl.patch @@ -1,5 +1,5 @@ ---- traceroute/mod-tcp.c 2013-03-27 15:01:15.000000000 +0100 -+++ traceroute/mod-tcp.c 2014-12-28 06:35:44.165642089 +0100 +--- a/traceroute/mod-tcp.c 2013-03-27 15:01:15.000000000 +0100 ++++ b/traceroute/mod-tcp.c 2014-12-28 06:35:44.165642089 +0100 @@ -26,6 +26,37 @@ #define IP_MTU 14 #endif diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template index 4a65dc7fb2e..f92c929c300 100644 --- a/srcpkgs/traceroute/template +++ b/srcpkgs/traceroute/template @@ -8,7 +8,6 @@ license="GPL-2" homepage="http://traceroute.sourceforge.net" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz" checksum=3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6 -patch_args=-Np0 alternatives=" traceroute:traceroute:/usr/bin/linux-traceroute diff --git a/srcpkgs/trackballs/patches/respect-our-cpp.patch b/srcpkgs/trackballs/patches/respect-our-cpp.patch index c53441705d8..5ef1431215d 100644 --- a/srcpkgs/trackballs/patches/respect-our-cpp.patch +++ b/srcpkgs/trackballs/patches/respect-our-cpp.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -66,7 +66,7 @@ endforeach() # cpp is the c++ preprocessor diff --git a/srcpkgs/trackballs/template b/srcpkgs/trackballs/template index 8f52f522c4c..4fe2df36d95 100644 --- a/srcpkgs/trackballs/template +++ b/srcpkgs/trackballs/template @@ -12,4 +12,3 @@ license="GPL-2.0-or-later" homepage="https://trackballs.github.io/" distfiles="https://github.com/trackballs/trackballs/archive/v${version}.tar.gz" checksum=fd4c3e4860db8ca6e8e7ad870a5973d51323a77ed8d7b40d859d9b277c53fc02 -patch_args=-Np0 diff --git a/srcpkgs/tracker/patches/failing-test-musl.patch b/srcpkgs/tracker/patches/failing-test-musl.patch index ff18f06de9b..4407fe86e9e 100644 --- a/srcpkgs/tracker/patches/failing-test-musl.patch +++ b/srcpkgs/tracker/patches/failing-test-musl.patch @@ -9,8 +9,8 @@ Subject: [PATCH] drop test that fails on musl diff --git tests/libtracker-common/meson.build tests/libtracker-common/meson.build index 55b7ada..69688e0 100644 ---- tests/libtracker-common/meson.build -+++ tests/libtracker-common/meson.build +--- a/tests/libtracker-common/meson.build ++++ b/tests/libtracker-common/meson.build @@ -2,7 +2,6 @@ libtracker_common_tests = [ 'date-time', 'dbus', diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index c99b997dd55..810675677fe 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -18,7 +18,6 @@ license="GPL-2.0-or-later" homepage="https://live.gnome.org/Tracker" distfiles="${GNOME_SITE}/tracker/${version%.*}/tracker-${version}.tar.xz" checksum=bd1eb4122135296fa7b57b1c3fa0ed602cf7d06c0b8e534d0bd17ff5f97feef2 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" dbus" diff --git a/srcpkgs/tracker3-miners/patches/build.patch b/srcpkgs/tracker3-miners/patches/build.patch index d58a0d8c0f8..9fd55b1d632 100644 --- a/srcpkgs/tracker3-miners/patches/build.patch +++ b/srcpkgs/tracker3-miners/patches/build.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fix build diff --git src/libtracker-miner/meson.build src/libtracker-miner/meson.build index a226623..9eacee3 100644 ---- src/libtracker-miner/meson.build -+++ src/libtracker-miner/meson.build +--- a/src/libtracker-miner/meson.build ++++ b/src/libtracker-miner/meson.build @@ -40,7 +40,7 @@ endif libtracker_miner = library( diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template index 47a75439b42..6ea8e49a1a5 100644 --- a/srcpkgs/tracker3-miners/template +++ b/srcpkgs/tracker3-miners/template @@ -27,7 +27,6 @@ license="GPL-2.0-or-later" homepage="https://developer.gnome.org/libtracker-miner/stable" distfiles="${GNOME_SITE}/tracker-miners/${version%.*}/tracker-miners-${version}.tar.xz" checksum=c9be14871b1398e6e656a354a8f8f59e69e93169017f2b28308ef439324fd12b -patch_args=-Np0 # relies on unsupported ops in chroot do_check() { diff --git a/srcpkgs/transcode/patches/musl.patch b/srcpkgs/transcode/patches/musl.patch index f731fda93d3..875627e4503 100644 --- a/srcpkgs/transcode/patches/musl.patch +++ b/srcpkgs/transcode/patches/musl.patch @@ -1,5 +1,5 @@ ---- avilib/avidump.c.orig -+++ avilib/avidump.c +--- a/avilib/avidump.c ++++ b/avilib/avidump.c @@ -320,7 +320,7 @@ { uint32_t i,j,val32; diff --git a/srcpkgs/transcode/patches/transcode-configure_in.patch b/srcpkgs/transcode/patches/transcode-configure_in.patch index ee76928fb73..907fbb3b64d 100644 --- a/srcpkgs/transcode/patches/transcode-configure_in.patch +++ b/srcpkgs/transcode/patches/transcode-configure_in.patch @@ -1,5 +1,5 @@ ---- configure.in.orig 2018-06-22 20:57:08.925033685 +0200 -+++ configure.in 2018-06-22 20:58:19.544037328 +0200 +--- a/configure.in 2018-06-22 20:57:08.925033685 +0200 ++++ b/configure.in 2018-06-22 20:58:19.544037328 +0200 @@ -776,42 +776,6 @@ LAME_CFLAGS="$lame_ii" fi diff --git a/srcpkgs/transcode/patches/transcode-ffmpeg3.patch b/srcpkgs/transcode/patches/transcode-ffmpeg3.patch index 570038d5d76..869a9eb63cb 100644 --- a/srcpkgs/transcode/patches/transcode-ffmpeg3.patch +++ b/srcpkgs/transcode/patches/transcode-ffmpeg3.patch @@ -5,8 +5,8 @@ Upstream Status: Unknown Origin: Gentoo and Debian Description: Fixes building against FFmpeg version >= 3.0.0 ---- encode/encode_lavc.c 2011-11-19 17:50:27.000000000 +0100 -+++ encode/encode_lavc.c 2016-02-15 16:08:37.914488116 +0100 +--- a/encode/encode_lavc.c 2011-11-19 17:50:27.000000000 +0100 ++++ b/encode/encode_lavc.c 2016-02-15 16:08:37.914488116 +0100 @@ -74,6 +74,9 @@ int lmin; int lmax; @@ -363,8 +363,8 @@ Description: Fixes building against FFmpeg version >= 3.0.0 if (outframe->video_len < 0) { tc_log_warn(MOD_NAME, "encoder error: size (%i)", ---- export/aud_aux.c 2011-11-19 17:50:27.000000000 +0100 -+++ export/aud_aux.c 2016-02-15 16:08:37.914488116 +0100 +--- a/export/aud_aux.c 2011-11-19 17:50:27.000000000 +0100 ++++ b/export/aud_aux.c 2016-02-15 16:08:37.914488116 +0100 @@ -326,10 +326,10 @@ switch (o_codec) { @@ -463,8 +463,8 @@ Description: Fixes building against FFmpeg version >= 3.0.0 //-- hold rest of bytes in mpa-buffer -- //-------------------------------------- if (in_size > 0) { ---- export/export_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 -+++ export/export_ffmpeg.c 2016-02-15 16:08:37.915488139 +0100 +--- a/export/export_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 ++++ b/export/export_ffmpeg.c 2016-02-15 16:08:37.915488139 +0100 @@ -122,6 +122,7 @@ static AVFrame *lavc_convert_frame = NULL; @@ -763,8 +763,8 @@ Description: Fixes building against FFmpeg version >= 3.0.0 if (out_size < 0) { tc_log_warn(MOD_NAME, "encoder error: size (%d)", out_size); return TC_EXPORT_ERROR; ---- export/ffmpeg_cfg.c 2011-11-19 17:50:27.000000000 +0100 -+++ export/ffmpeg_cfg.c 2016-02-15 16:08:37.916488161 +0100 +--- a/export/ffmpeg_cfg.c 2011-11-19 17:50:27.000000000 +0100 ++++ b/export/ffmpeg_cfg.c 2016-02-15 16:08:37.916488161 +0100 @@ -34,8 +34,6 @@ //int lavc_param_vqscale = 0; //int lavc_param_vqmin = 2; @@ -847,8 +847,8 @@ Description: Fixes building against FFmpeg version >= 3.0.0 {"trunc", &lavc_param_trunc, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_TRUNCATED}, {"closedgop", &lavc_param_closedgop, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP}, {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, ---- export/ffmpeg_cfg.h 2011-11-19 17:50:27.000000000 +0100 -+++ export/ffmpeg_cfg.h 2016-02-15 16:08:37.916488161 +0100 +--- a/export/ffmpeg_cfg.h 2011-11-19 17:50:27.000000000 +0100 ++++ b/export/ffmpeg_cfg.h 2016-02-15 16:08:37.916488161 +0100 @@ -13,8 +13,6 @@ //extern int lavc_param_vqscale; //extern int lavc_param_vqmin; @@ -858,8 +858,8 @@ Description: Fixes building against FFmpeg version >= 3.0.0 extern int lavc_param_lmin; extern int lavc_param_lmax; extern int lavc_param_vqdiff; ---- filter/filter_pp.c 2011-11-19 17:50:27.000000000 +0100 -+++ filter/filter_pp.c 2016-02-15 16:08:37.916488161 +0100 +--- a/filter/filter_pp.c 2011-11-19 17:50:27.000000000 +0100 ++++ b/filter/filter_pp.c 2016-02-15 16:08:37.916488161 +0100 @@ -38,8 +38,8 @@ /* FIXME: these use the filter ID as an index--the ID can grow @@ -871,8 +871,8 @@ Description: Fixes building against FFmpeg version >= 3.0.0 static int width[100], height[100]; static int pre[100]; ---- import/decode_lavc.c 2011-11-19 17:50:27.000000000 +0100 -+++ import/decode_lavc.c 2016-02-15 16:09:00.252988897 +0100 +--- a/import/decode_lavc.c 2011-11-19 17:50:27.000000000 +0100 ++++ b/import/decode_lavc.c 2016-02-15 16:09:00.252988897 +0100 @@ -58,37 +58,37 @@ // fourCC to ID mapping taken from MPlayer's codecs.conf @@ -993,8 +993,8 @@ Description: Fixes building against FFmpeg version >= 3.0.0 if (picture.linesize[0] != lavc_dec_context->width) { int y; for (y = 0; y < lavc_dec_context->height; y++) { ---- import/import_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 -+++ import/import_ffmpeg.c 2016-02-15 16:08:48.269720627 +0100 +--- a/import/import_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 ++++ b/import/import_ffmpeg.c 2016-02-15 16:08:48.269720627 +0100 @@ -59,51 +59,51 @@ // fourCC to ID mapping taken from MPlayer's codecs.conf @@ -1195,8 +1195,8 @@ Description: Fixes building against FFmpeg version >= 3.0.0 src_fmt = IMG_YUV444P; YUV_INIT_PLANES(src_planes, frame, src_fmt, lavc_dec_context->width, lavc_dec_context->height); ---- import/probe_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 -+++ import/probe_ffmpeg.c 2016-02-15 16:08:37.917488184 +0100 +--- a/import/probe_ffmpeg.c 2011-11-19 17:50:27.000000000 +0100 ++++ b/import/probe_ffmpeg.c 2016-02-15 16:08:37.917488184 +0100 @@ -99,8 +99,8 @@ TC_INIT_LIBAVCODEC; @@ -1229,8 +1229,8 @@ Description: Fixes building against FFmpeg version >= 3.0.0 return; } ---- libtc/tcavcodec.h 2011-11-19 17:50:27.000000000 +0100 -+++ libtc/tcavcodec.h 2016-02-15 16:08:37.917488184 +0100 +--- a/libtc/tcavcodec.h 2011-11-19 17:50:27.000000000 +0100 ++++ b/libtc/tcavcodec.h 2016-02-15 16:08:37.917488184 +0100 @@ -53,7 +53,6 @@ #define TC_INIT_LIBAVCODEC do { \ diff --git a/srcpkgs/transcode/patches/transcode-ffmpeg4.patch b/srcpkgs/transcode/patches/transcode-ffmpeg4.patch index 76cebbc0f04..c25913a2100 100644 --- a/srcpkgs/transcode/patches/transcode-ffmpeg4.patch +++ b/srcpkgs/transcode/patches/transcode-ffmpeg4.patch @@ -1,7 +1,7 @@ source: https://git.archlinux.org/svntogit/community.git/tree/trunk/transcode-ffmpeg4.patch?h=packages/transcode ---- encode/encode_lavc.c -+++ encode/encode_lavc.c +--- a/encode/encode_lavc.c ++++ b/encode/encode_lavc.c @@ -77,6 +77,13 @@ struct tclavcconfigdata_ { int luma_elim_threshold; int chroma_elim_threshold; @@ -240,8 +240,8 @@ source: https://git.archlinux.org/svntogit/community.git/tree/trunk/transcode-ff // { "turbo", PAUX(turbo_setup), TCCONF_TYPE_FLAG, 0, 0, 1 }, // not yet supported /* End of the config file */ ---- export/export_ffmpeg.c -+++ export/export_ffmpeg.c +--- a/export/export_ffmpeg.c ++++ b/export/export_ffmpeg.c @@ -831,14 +831,11 @@ MOD_init lavc_venc_context->bit_rate = vob->divxbitrate * 1000; @@ -370,8 +370,8 @@ source: https://git.archlinux.org/svntogit/community.git/tree/trunk/transcode-ff /* FIXME: transcode itself contains "broken ffmpeg default settings", thus we need to override them! */ if (lavc_param_video_preset && strcmp(lavc_param_video_preset, "none")) { ---- export/ffmpeg_cfg.c -+++ export/ffmpeg_cfg.c +--- a/export/ffmpeg_cfg.c ++++ b/export/ffmpeg_cfg.c @@ -93,8 +93,8 @@ int lavc_param_last_pred= 0; int lavc_param_pre_me= 1; int lavc_param_me_subpel_quality= 8; @@ -451,8 +451,8 @@ source: https://git.archlinux.org/svntogit/community.git/tree/trunk/transcode-ff {"intra_dc_precision", &lavc_param_intra_dc_precision, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 16}, {"skip_top", &lavc_param_skip_top, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, {"skip_bottom", &lavc_param_skip_bottom, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000}, ---- import/import_ffmpeg.c -+++ import/import_ffmpeg.c +--- a/import/import_ffmpeg.c ++++ b/import/import_ffmpeg.c @@ -310,7 +310,7 @@ do_avi: lavc_dec_context->width = x_dim; lavc_dec_context->height = y_dim; @@ -462,8 +462,8 @@ source: https://git.archlinux.org/svntogit/community.git/tree/trunk/transcode-ff #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) lavc_dec_context->error_resilience = 2; #else ---- filter/filter_resample.c -+++ filter/filter_resample.c +--- a/filter/filter_resample.c ++++ b/filter/filter_resample.c @@ -37,6 +37,7 @@ #include "libtc/optstr.h" #include "libtc/tcavcodec.h" @@ -481,8 +481,8 @@ source: https://git.archlinux.org/svntogit/community.git/tree/trunk/transcode-ff } ResamplePrivateData; static const char resample_help[] = "" ---- import/probe_ffmpeg.c -+++ import/probe_ffmpeg.c +--- a/import/probe_ffmpeg.c ++++ b/import/probe_ffmpeg.c @@ -51,8 +51,8 @@ static void translate_info(const AVFormatContext *ctx, ProbeInfo *info) info->bitrate = st->codec->bit_rate / 1000; info->width = st->codec->width; diff --git a/srcpkgs/transcode/template b/srcpkgs/transcode/template index 518a9c20c1a..775cd09fc4e 100644 --- a/srcpkgs/transcode/template +++ b/srcpkgs/transcode/template @@ -15,7 +15,6 @@ license="GPL-3.0-or-later" homepage="https://bitbucket.org/mojaves/transcode-tcforge" distfiles="https://bitbucket.org/mojaves/transcode-tcforge/get/release-1_1_7.tar.bz2" checksum=4693e3f4226f48fb37c8ae9609601724e8a276ca09f8686ddb43f8a255d994fe -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/transmission/patches/add-missing-files.patch b/srcpkgs/transmission/patches/add-missing-files.patch index c955e7a8abf..4ea49c702ed 100644 --- a/srcpkgs/transmission/patches/add-missing-files.patch +++ b/srcpkgs/transmission/patches/add-missing-files.patch @@ -2,7 +2,7 @@ diff --git libtransmission/subprocess-test.cmd libtransmission/subprocess-test.c new file mode 100644 index 0000000..4d08d06 --- /dev/null -+++ libtransmission/subprocess-test.cmd ++++ b/libtransmission/subprocess-test.cmd @@ -0,0 +1,48 @@ +@echo off +setlocal EnableExtensions EnableDelayedExpansion @@ -56,7 +56,7 @@ diff --git po/pt_PT.po po/pt_PT.po new file mode 100644 index 0000000..d9346f8 --- /dev/null -+++ po/pt_PT.po ++++ b/po/pt_PT.po @@ -0,0 +1,2402 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER diff --git a/srcpkgs/transmission/patches/fix-makefiles.patch b/srcpkgs/transmission/patches/fix-makefiles.patch index 002e221c541..37f994ef007 100644 --- a/srcpkgs/transmission/patches/fix-makefiles.patch +++ b/srcpkgs/transmission/patches/fix-makefiles.patch @@ -13,8 +13,8 @@ Fixes: #1246 diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am index 0885fab0d..d9a61c12f 100644 ---- libtransmission/Makefile.am -+++ libtransmission/Makefile.am +--- a/libtransmission/Makefile.am ++++ b/libtransmission/Makefile.am @@ -316,3 +316,6 @@ watchdir_generic_test_CPPFLAGS = -DWATCHDIR_TEST_FORCE_GENERIC $(AM_CPPFLAGS) rename_test_SOURCES = rename-test.c $(TEST_SOURCES) rename_test_LDADD = ${apps_ldadd} @@ -24,8 +24,8 @@ index 0885fab0d..d9a61c12f 100644 + subprocess-test.cmd diff --git a/macosx/Makefile.am b/macosx/Makefile.am index 27abb77b6..5a6fec9ef 100644 ---- macosx/Makefile.am -+++ macosx/Makefile.am +--- a/macosx/Makefile.am ++++ b/macosx/Makefile.am @@ -95,6 +95,8 @@ EXTRA_DIST = \ InfoTabButtonBack.m \ InfoTabButtonCell.h \ @@ -37,8 +37,8 @@ index 27abb77b6..5a6fec9ef 100644 InfoActivityViewController.h \ diff --git a/po/LINGUAS b/po/LINGUAS index 08629cd1b..6b3145a37 100644 ---- po/LINGUAS -+++ po/LINGUAS +--- a/po/LINGUAS ++++ b/po/LINGUAS @@ -68,6 +68,7 @@ pa pl pt @@ -49,8 +49,8 @@ index 08629cd1b..6b3145a37 100644 si diff --git a/third-party/Makefile.am b/third-party/Makefile.am index 9f66878d9..33df96d42 100644 ---- third-party/Makefile.am -+++ third-party/Makefile.am +--- a/third-party/Makefile.am ++++ b/third-party/Makefile.am @@ -22,5 +22,8 @@ SUBDIRS = \ $(UTP_DIR) diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index 794d5c49fff..5a61a0a2bdd 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -14,7 +14,6 @@ license="MIT, GPL-2.0-or-later" homepage="https://www.transmissionbt.com" distfiles="https://github.com/transmission/transmission-releases/raw/master/${pkgname}-${version}.tar.xz" checksum=9144652fe742f7f7dd6657716e378da60b751aaeda8bef8344b3eefc4db255f2 -patch_args=-Np0 # Create transmission system user/group system_accounts="transmission" diff --git a/srcpkgs/treesheets/patches/fix-musl-glob-tilde.patch b/srcpkgs/treesheets/patches/fix-musl-glob-tilde.patch index 8aad847c138..f17a41c0cd9 100644 --- a/srcpkgs/treesheets/patches/fix-musl-glob-tilde.patch +++ b/srcpkgs/treesheets/patches/fix-musl-glob-tilde.patch @@ -2,8 +2,8 @@ musl doesn't GLOB_TILDE, so simply don't use it here. diff --git a/lobster/src/platform.cpp b/lobster/src/platform.cpp index ceaec49..68e2443 100644 ---- lobster/src/platform.cpp -+++ lobster/src/platform.cpp +--- a/lobster/src/platform.cpp ++++ b/lobster/src/platform.cpp @@ -50,6 +50,10 @@ #include "sdlincludes.h" // FIXME #endif diff --git a/srcpkgs/treesheets/template b/srcpkgs/treesheets/template index fa39eb3426d..4cd41afbd93 100644 --- a/srcpkgs/treesheets/template +++ b/srcpkgs/treesheets/template @@ -11,7 +11,6 @@ license="Zlib" homepage="http://strlen.com/treesheets/" distfiles="https://github.com/aardappel/treesheets/archive/v${version}.tar.gz" checksum=84eb82f122bc7be3ded399d2511536128911477a4a69c51b26b856de2160405f -patch_args=-Np0 do_install() { vmkdir usr/lib/${pkgname} diff --git a/srcpkgs/tremc/patches/fix-python3.9.patch b/srcpkgs/tremc/patches/fix-python3.9.patch index bb489fd7e96..114db8acad9 100644 --- a/srcpkgs/tremc/patches/fix-python3.9.patch +++ b/srcpkgs/tremc/patches/fix-python3.9.patch @@ -1,6 +1,6 @@ # upstream: yes ---- tremc -+++ tremc +--- a/tremc ++++ b/tremc @@ -438,7 +438,7 @@ class Transmission(object): # TAG_TORRENT_DETAILS, but just passing seems to help.(?) try: diff --git a/srcpkgs/tremc/template b/srcpkgs/tremc/template index ca00423bc7b..227ca61dc2c 100644 --- a/srcpkgs/tremc/template +++ b/srcpkgs/tremc/template @@ -10,4 +10,3 @@ license="GPL-3.0-only" homepage="https://github.com/tremc/tremc" distfiles="https://github.com/tremc/tremc/archive/${version}.tar.gz" checksum=ea31ff593c64bbf2c471f6c45ef09129e1e9cb55e8f8bd90e2916976a7053c61 -patch_args=-Np0 diff --git a/srcpkgs/trinity/patches/arch.h.patch b/srcpkgs/trinity/patches/arch.h.patch index e063da71c5f..9e9f75a9451 100644 --- a/srcpkgs/trinity/patches/arch.h.patch +++ b/srcpkgs/trinity/patches/arch.h.patch @@ -1,5 +1,5 @@ ---- include/arch.h 2015-10-02 13:44:46.653183687 -0300 -+++ include/arch.h.new 2015-10-02 13:44:38.297184059 -0300 +--- a/include/arch.h 2015-10-02 13:44:46.653183687 -0300 ++++ b/include/arch.h.new 2015-10-02 13:44:38.297184059 -0300 @@ -1,3 +1,4 @@ +#include #pragma once diff --git a/srcpkgs/trinity/patches/stdint_h.patch b/srcpkgs/trinity/patches/stdint_h.patch index e3903954ae1..a96f3b37b08 100644 --- a/srcpkgs/trinity/patches/stdint_h.patch +++ b/srcpkgs/trinity/patches/stdint_h.patch @@ -1,5 +1,5 @@ ---- syscalls/x86/modify_ldt.c -+++ syscalls/x86/modify_ldt.c +--- a/syscalls/x86/modify_ldt.c ++++ b/syscalls/x86/modify_ldt.c @@ -5,8 +5,15 @@ * asmlinkage int sys_modify_ldt(int func, void __user *ptr, unsigned long bytecount) */ diff --git a/srcpkgs/trinity/template b/srcpkgs/trinity/template index 77017a15a95..a7a561e89cb 100644 --- a/srcpkgs/trinity/template +++ b/srcpkgs/trinity/template @@ -10,7 +10,6 @@ homepage="https://github.com/kernelslacker/trinity" distfiles="https://github.com/kernelslacker/trinity/archive/v${version}.tar.gz" checksum=9abd6cea3f6bd3b36794e038317d5ed6001dc52ad3b1cd7071f6cc7c5baecd3c nocross="Mis-use of memfd_create declaration" -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/trojita/patches/39772585033c1c0aff96f297e93de7be53f9b114.patch b/srcpkgs/trojita/patches/39772585033c1c0aff96f297e93de7be53f9b114.patch index 837ca488f87..aea4ce18c7b 100644 --- a/srcpkgs/trojita/patches/39772585033c1c0aff96f297e93de7be53f9b114.patch +++ b/srcpkgs/trojita/patches/39772585033c1c0aff96f297e93de7be53f9b114.patch @@ -14,8 +14,8 @@ Change-Id: I015800e49cf8d0e87f3541642406396f150d0eeb diff --git a/tests/Imap/test_Imap_BodyParts.cpp b/tests/Imap/test_Imap_BodyParts.cpp index f1c577fa..b6e0421d 100644 ---- tests/Imap/test_Imap_BodyParts.cpp -+++ tests/Imap/test_Imap_BodyParts.cpp +--- a/tests/Imap/test_Imap_BodyParts.cpp ++++ b/tests/Imap/test_Imap_BodyParts.cpp @@ -51,6 +51,7 @@ struct Data { Q_DECLARE_METATYPE(QList) diff --git a/srcpkgs/trojita/patches/QPainterPath.patch b/srcpkgs/trojita/patches/QPainterPath.patch index 03879e3a3c0..858dc0aee4d 100644 --- a/srcpkgs/trojita/patches/QPainterPath.patch +++ b/srcpkgs/trojita/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- src/Gui/Spinner.cpp 2016-06-15 09:17:23.000000000 +0200 -+++ src/Gui/Spinner.cpp 2020-09-02 13:51:52.962353077 +0200 +--- a/src/Gui/Spinner.cpp 2016-06-15 09:17:23.000000000 +0200 ++++ b/src/Gui/Spinner.cpp 2020-09-02 13:51:52.962353077 +0200 @@ -26,6 +26,7 @@ #include @@ -8,8 +8,8 @@ #include #include #include ---- src/Gui/Window.cpp 2016-06-15 09:17:23.000000000 +0200 -+++ src/Gui/Window.cpp 2020-09-02 13:52:19.050354423 +0200 +--- a/src/Gui/Window.cpp 2016-06-15 09:17:23.000000000 +0200 ++++ b/src/Gui/Window.cpp 2020-09-02 13:52:19.050354423 +0200 @@ -32,6 +32,7 @@ #include #include diff --git a/srcpkgs/trojita/template b/srcpkgs/trojita/template index e12ea174966..8a291182b51 100644 --- a/srcpkgs/trojita/template +++ b/srcpkgs/trojita/template @@ -14,7 +14,6 @@ license="GPL-2,GPL-3" homepage="http://trojita.flaska.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/trousers/patches/musl-getpwent_r.patch b/srcpkgs/trousers/patches/musl-getpwent_r.patch index 894adbb111e..2aa730a506d 100644 --- a/srcpkgs/trousers/patches/musl-getpwent_r.patch +++ b/srcpkgs/trousers/patches/musl-getpwent_r.patch @@ -1,5 +1,5 @@ ---- src/tspi/ps/tspps.c.orig 2015-11-18 12:45:47.585113542 +0100 -+++ src/tspi/ps/tspps.c 2015-11-18 12:46:37.605577956 +0100 +--- a/src/tspi/ps/tspps.c 2015-11-18 12:45:47.585113542 +0100 ++++ b/src/tspi/ps/tspps.c 2015-11-18 12:46:37.605577956 +0100 @@ -45,7 +45,7 @@ static int user_ps_fd = -1; diff --git a/srcpkgs/trousers/template b/srcpkgs/trousers/template index 2f8044e52f4..5d962adec91 100644 --- a/srcpkgs/trousers/template +++ b/srcpkgs/trousers/template @@ -15,7 +15,6 @@ homepage="http://trousers.sourceforge.net/" # distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="https://sources.voidlinux.org/trousers-${version}/trousers-${version}.tar.gz" checksum=ce50713a261d14b735ec9ccd97609f0ad5ce69540af560e8c3ce9eb5f2d28f47 -patch_args=-Np0 make_dirs="/var/lib/tpm 0700 tss tss" diff --git a/srcpkgs/tsocks/patches/fix-musl.patch b/srcpkgs/tsocks/patches/fix-musl.patch index 2037027f219..8124ab089aa 100644 --- a/srcpkgs/tsocks/patches/fix-musl.patch +++ b/srcpkgs/tsocks/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- configure.in.orig 2015-08-21 23:38:47.726879936 +0200 -+++ configure.in 2015-08-21 23:39:13.031879310 +0200 +--- a/configure.in 2015-08-21 23:38:47.726879936 +0200 ++++ b/configure.in 2015-08-21 23:39:13.031879310 +0200 @@ -68,7 +68,7 @@ dnl Check for the fcntl header AC_CHECK_HEADER(fcntl.h,,AC_MSG_ERROR("fcntl.h not found")) @@ -18,8 +18,8 @@ int poll($testproto); ],,[PROTO="$testproto";],) fi ---- tsocks.c.orig 2015-08-21 23:39:34.644878775 +0200 -+++ tsocks.c 2015-08-21 23:39:49.338878412 +0200 +--- a/tsocks.c 2015-08-21 23:39:34.644878775 +0200 ++++ b/tsocks.c 2015-08-21 23:39:49.338878412 +0200 @@ -41,7 +41,7 @@ char *progname = "libtsocks"; #include #include diff --git a/srcpkgs/tsocks/template b/srcpkgs/tsocks/template index e24ac3e4832..e1a8ff7ff7c 100644 --- a/srcpkgs/tsocks/template +++ b/srcpkgs/tsocks/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="http://tsocks.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/tsocks/tsocks-$version.tar.gz" checksum=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/ttfautohint/patches/musl_bool.patch b/srcpkgs/ttfautohint/patches/musl_bool.patch index 4455203bc9e..a6ace135faa 100644 --- a/srcpkgs/ttfautohint/patches/musl_bool.patch +++ b/srcpkgs/ttfautohint/patches/musl_bool.patch @@ -1,5 +1,5 @@ ---- lib/llrb.h.orig 2018-01-13 08:59:09.826617752 -0800 -+++ lib/llrb.h 2018-01-13 09:19:04.165564680 -0800 +--- a/lib/llrb.h 2018-01-13 08:59:09.826617752 -0800 ++++ b/lib/llrb.h 2018-01-13 09:19:04.165564680 -0800 @@ -52,6 +52,11 @@ #ifndef LLRB_H #define LLRB_H diff --git a/srcpkgs/ttfautohint/template b/srcpkgs/ttfautohint/template index ee71bc04a03..6096ec06eb4 100644 --- a/srcpkgs/ttfautohint/template +++ b/srcpkgs/ttfautohint/template @@ -12,4 +12,3 @@ license="GPL-2.0-only" homepage="https://www.freetype.org/ttfautohint/" distfiles="http://download.savannah.gnu.org/releases/freetype/ttfautohint-${version}.tar.gz" checksum=87bb4932571ad57536a7cc20b31fd15bc68cb5429977eb43d903fa61617cf87e -patch_args=-Np0 diff --git a/srcpkgs/ttyrec/patches/musl.patch b/srcpkgs/ttyrec/patches/musl.patch index 5fae347cf4b..e096633716d 100644 --- a/srcpkgs/ttyrec/patches/musl.patch +++ b/srcpkgs/ttyrec/patches/musl.patch @@ -1,5 +1,5 @@ ---- ttyrec.c.orig 2016-05-25 18:34:49.722785147 +0200 -+++ ttyrec.c 2016-05-25 18:34:57.793776896 +0200 +--- a/ttyrec.c 2016-05-25 18:34:49.722785147 +0200 ++++ b/ttyrec.c 2016-05-25 18:34:57.793776896 +0200 @@ -205,11 +205,7 @@ doinput() void finish() diff --git a/srcpkgs/ttyrec/patches/tty.diff b/srcpkgs/ttyrec/patches/tty.diff index be1df7740de..44b81729a62 100644 --- a/srcpkgs/ttyrec/patches/tty.diff +++ b/srcpkgs/ttyrec/patches/tty.diff @@ -1,6 +1,6 @@ diff -upr ttyplay.c ttyplay.c ---- ttyplay.c 2006-06-11 17:52:50.000000000 +0200 -+++ ttyplay.c 2014-04-11 13:17:47.870307005 +0200 +--- a/ttyplay.c 2006-06-11 17:52:50.000000000 +0200 ++++ b/ttyplay.c 2014-04-11 13:17:47.870307005 +0200 @@ -132,6 +132,26 @@ ttywait (struct timeval prev, struct tim return speed; } @@ -67,8 +67,8 @@ diff -upr ttyplay.c ttyplay.c process = ttypeek; break; diff -upr ttyrec-1.0.8/ttyrec.c ttyrec-1.0.8.new/ttyrec.c ---- ttyrec.c 2006-06-11 17:52:50.000000000 +0200 -+++ ttyrec.c 2014-04-11 13:10:07.403341468 +0200 +--- a/ttyrec.c 2006-06-11 17:52:50.000000000 +0200 ++++ b/ttyrec.c 2014-04-11 13:10:07.403341468 +0200 @@ -71,7 +71,9 @@ #define _(FOO) FOO diff --git a/srcpkgs/ttyrec/template b/srcpkgs/ttyrec/template index 144b33595d6..cff70746cc5 100644 --- a/srcpkgs/ttyrec/template +++ b/srcpkgs/ttyrec/template @@ -8,7 +8,6 @@ license="BSD-4-Clause-UC" homepage="http://0xcc.net/ttyrec" distfiles="http://0xcc.net/ttyrec/${pkgname}-${version}.tar.gz" checksum=ef5e9bf276b65bb831f9c2554cd8784bd5b4ee65353808f82b7e2aef851587ec -patch_args=-Np0 do_build() { sed -i 's/\$(CFLAGS)/$(LDFLAGS)/' Makefile diff --git a/srcpkgs/tup/patches/mips.patch b/srcpkgs/tup/patches/mips.patch index 9d09e0dd03a..1c5e4e9b921 100644 --- a/srcpkgs/tup/patches/mips.patch +++ b/srcpkgs/tup/patches/mips.patch @@ -1,5 +1,5 @@ ---- src/tup/platform.c 2018-09-27 22:18:09.000000000 +0200 -+++ src/tup/platform.c 2020-04-17 18:15:04.968819165 +0200 +--- a/src/tup/platform.c 2018-09-27 22:18:09.000000000 +0200 ++++ b/src/tup/platform.c 2020-04-17 18:15:04.968819165 +0200 @@ -56,6 +56,8 @@ const char *tup_arch = "arm"; #elif __aarch64__ @@ -9,8 +9,8 @@ #else #error Unsupported cpu architecture. Please add support in tup/platform.c #endif ---- tup.1 2018-09-27 22:18:09.000000000 +0200 -+++ tup.1 2020-04-17 18:16:08.702822453 +0200 +--- a/tup.1 2018-09-27 22:18:09.000000000 +0200 ++++ b/tup.1 2020-04-17 18:16:08.702822453 +0200 @@ -755,7 +755,7 @@ TUP_PLATFORM is a special @-variable. If CONFIG_TUP_PLATFORM is not set in the tup.config file, it has a default value according to the platform that tup itself was compiled in. Currently the default value is one of "linux", "solaris", "macosx", "win32", or "freebsd". .TP diff --git a/srcpkgs/tup/template b/srcpkgs/tup/template index afd6a942f1b..bb07b10f582 100644 --- a/srcpkgs/tup/template +++ b/srcpkgs/tup/template @@ -10,7 +10,6 @@ license="GPL-2.0-only" homepage="http://gittup.org/tup/index.html" distfiles="https://github.com/gittup/${pkgname}/archive/v${version}.tar.gz" checksum=9b0951afaa749186eb55d88860405b2f6b3d88632d1b5df1ec4a0bf973d8d326 -patch_args=-Np0 do_configure() { sed -i "s/git describe/echo ${version}/" src/tup/link.sh diff --git a/srcpkgs/turbovnc/patches/musl-asm_page.patch b/srcpkgs/turbovnc/patches/musl-asm_page.patch index 695e8371f3a..a1360275e83 100644 --- a/srcpkgs/turbovnc/patches/musl-asm_page.patch +++ b/srcpkgs/turbovnc/patches/musl-asm_page.patch @@ -1,7 +1,7 @@ Try to include only if __GLIBC__ is defined also. ---- unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2014-07-20 02:45:59.000000000 +0200 -+++ unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2015-09-01 10:28:30.171432632 +0200 +--- a/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2014-07-20 02:45:59.000000000 +0200 ++++ b/unix/Xvnc/programs/Xserver/Xext/xf86bigfont.c 2015-09-01 10:28:30.171432632 +0200 @@ -40,7 +40,7 @@ #include diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template index 77a81c1d8c1..8bb508ee94a 100644 --- a/srcpkgs/turbovnc/template +++ b/srcpkgs/turbovnc/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later" homepage="https://turbovnc.org" distfiles="${SOURCEFORGE_SITE}/turbovnc/${pkgname}-${version}.tar.gz" checksum=71ff553dbad24f8339e168fe90e09bc2b13c21e453f28276d0e5c9c408bd9de2 -patch_args=-Np0 conf_files="/etc/*.conf" archs="i686* x86_64* ppc64*" diff --git a/srcpkgs/tworld/patches/destdir.patch b/srcpkgs/tworld/patches/destdir.patch index b6b697055e6..3e5556d6f74 100644 --- a/srcpkgs/tworld/patches/destdir.patch +++ b/srcpkgs/tworld/patches/destdir.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2020-05-04 11:25:41.650521047 -0400 -+++ Makefile.in 2020-05-04 11:29:37.834294399 -0400 +--- a/Makefile.in 2020-05-04 11:25:41.650521047 -0400 ++++ b/Makefile.in 2020-05-04 11:29:37.834294399 -0400 @@ -91,19 +91,19 @@ # diff --git a/srcpkgs/tworld/template b/srcpkgs/tworld/template index 53238ac4dcd..bc9f0faeb8f 100644 --- a/srcpkgs/tworld/template +++ b/srcpkgs/tworld/template @@ -10,4 +10,3 @@ license="GPL-2.0-only" homepage="http://www.muppetlabs.com/~breadbox/software/tworld/" distfiles="http://www.muppetlabs.com/~breadbox/pub/software/${pkgname}/${pkgname}-${version}.tar.gz" checksum=472fce08de124d965cccb20070b0be2b8b4c5ad717fc5ece32828baacd46d861 -patch_args=-Np0 diff --git a/srcpkgs/txr/patches/musl-fd_set.patch b/srcpkgs/txr/patches/musl-fd_set.patch index 57cd60c4618..b47cf6dba3c 100644 --- a/srcpkgs/txr/patches/musl-fd_set.patch +++ b/srcpkgs/txr/patches/musl-fd_set.patch @@ -1,5 +1,5 @@ ---- socket.c.orig 2016-03-21 10:54:59.650592629 +0100 -+++ socket.c 2016-03-21 10:55:14.760403731 +0100 +--- a/socket.c 2016-03-21 10:54:59.650592629 +0100 ++++ b/socket.c 2016-03-21 10:55:14.760403731 +0100 @@ -24,6 +24,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ diff --git a/srcpkgs/txr/template b/srcpkgs/txr/template index 5ebfdb697eb..bcbe6d85b0d 100644 --- a/srcpkgs/txr/template +++ b/srcpkgs/txr/template @@ -15,7 +15,6 @@ changelog="http://www.kylheku.com/cgit/txr/tree/RELNOTES" distfiles="http://www.kylheku.com/cgit/txr/snapshot/${pkgname}-${version}.tar.bz2" checksum=58e3e19bb7f3f9a440761f046fdacbc4d619b11c494a4ed9f8ad25c7a2974ddc nopie=yes -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" txr" diff --git a/srcpkgs/typespeed/patches/time.patch b/srcpkgs/typespeed/patches/time.patch index 2d5d36ee921..4b49aba2fed 100644 --- a/srcpkgs/typespeed/patches/time.patch +++ b/srcpkgs/typespeed/patches/time.patch @@ -1,5 +1,5 @@ ---- src/typespeed.h.orig 2016-12-13 18:24:16.347222016 +0100 -+++ src/typespeed.h 2016-12-13 19:40:56.049362425 +0100 +--- a/src/typespeed.h 2016-12-13 18:24:16.347222016 +0100 ++++ b/src/typespeed.h 2016-12-13 19:40:56.049362425 +0100 @@ -27,6 +27,7 @@ #include diff --git a/srcpkgs/typespeed/template b/srcpkgs/typespeed/template index a2570048b47..52d5bf5291a 100644 --- a/srcpkgs/typespeed/template +++ b/srcpkgs/typespeed/template @@ -12,7 +12,6 @@ homepage="http://typespeed.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum="5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961" mutable_files="/var/games/typespeed.score" -patch_args=-Np0 CFLAGS="-fcommon"