From 103ab731ab3048adf044017c5f3cfd93eccff5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 19 Jun 2021 10:03:21 +0700 Subject: [PATCH] srcpkgs/r*: convert patches to -Np1 * runit is kept at -Np0 ```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.-][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ``` --- srcpkgs/rabbitmq-c/patches/test.patch | 20 ++++++------- srcpkgs/rabbitmq-c/template | 1 - srcpkgs/racket/patches/musl-fixes.patch | 4 +-- srcpkgs/racket/template | 1 - srcpkgs/radare2/patches/try.patch | 4 +-- srcpkgs/radare2/template | 1 - srcpkgs/rakarrack/patches/fltk_include.patch | 8 +++--- srcpkgs/rakarrack/template | 1 - ...ve-march-native-from-CMAKE_CXX_FLAGS.patch | 4 +-- srcpkgs/rapidjson/patches/fallthrough.patch | 4 +-- srcpkgs/rapidjson/template | 1 - srcpkgs/raptor/patches/CVE-2017-18926.patch | 4 +-- srcpkgs/raptor/patches/out-of-bounds.patch | 4 +-- srcpkgs/raptor/template | 1 - srcpkgs/rdedup/patches/bindgen-cross.patch | 4 +-- srcpkgs/rdedup/template | 1 - srcpkgs/rdis-git/patches/luajit_version.patch | 20 ++++++------- srcpkgs/rdis-git/template | 1 - srcpkgs/re/patches/bsdnet.diff | 12 ++++---- srcpkgs/re/patches/musl.patch | 4 +-- srcpkgs/re/patches/resolver.diff | 4 +-- srcpkgs/re/template | 1 - srcpkgs/recoll/patches/musl.patch | 8 +++--- srcpkgs/recoll/template | 1 - .../patches/sane-theora-defaults.patch | 8 +++--- .../patches/shmstr-to-shmproto.patch | 8 +++--- srcpkgs/recordmydesktop/template | 1 - .../redis/patches/use-system-jemalloc.patch | 4 +-- srcpkgs/redis/template | 1 - srcpkgs/redo/patches/musl.patch | 4 +-- srcpkgs/redo/template | 1 - .../patches/add-cross-compile-support.patch | 4 +-- .../refind/patches/force-inline-musl.patch | 12 ++++---- srcpkgs/refind/template | 1 - .../patches/musl-__compar_fn_t.patch | 4 +-- .../reiserfsprogs/patches/musl-loff_t.patch | 4 +-- .../patches/musl-long_long_min_max.patch | 4 +-- .../reiserfsprogs/patches/musl-prints.patch | 4 +-- .../patches/reiserfsprogs-3.6.27-loff_t.patch | 4 +-- srcpkgs/reiserfsprogs/template | 1 - .../renderdoc/patches/add-x86-family.patch | 8 +++--- srcpkgs/renderdoc/patches/atomic.patch | 8 +++--- .../patches/build-type-none-is-release.patch | 4 +-- .../patches/compressonator-only-x86.patch | 8 +++--- srcpkgs/renderdoc/patches/dostringise.patch | 4 +-- .../renderdoc/patches/ptrace-only-x86.patch | 4 +-- .../renderdoc/patches/qmake-no-rpath.patch | 4 +-- .../renderdoc/patches/unvendor-zstd-lz4.patch | 4 +-- srcpkgs/renderdoc/template | 1 - .../residualvm/patches/fluidsynth-2.1.patch | 4 +-- srcpkgs/residualvm/template | 1 - srcpkgs/resvg/patches/QPainterPath.patch | 8 +++--- srcpkgs/resvg/template | 1 - .../retroshare/patches/mhd_result_enum.patch | 8 +++--- srcpkgs/retroshare/patches/qt5.15.patch | 8 +++--- srcpkgs/retroshare/template | 1 - .../rhythmbox/patches/fix-missing-icons.patch | 12 ++++---- srcpkgs/rhythmbox/template | 1 - srcpkgs/rinse/patches/fix-tests.patch | 28 +++++++++---------- srcpkgs/rinse/patches/sbin.patch | 4 +-- srcpkgs/rinse/template | 1 - srcpkgs/rix/patches/fixes.patch | 8 +++--- srcpkgs/rix/patches/makefile.patch | 4 +-- srcpkgs/rix/patches/overflow.patch | 4 +-- srcpkgs/rix/template | 1 - srcpkgs/rmilter/patches/de-vendor.patch | 4 +-- srcpkgs/rmilter/patches/fix-cflags.patch | 4 +-- srcpkgs/rmilter/template | 1 - srcpkgs/rmlint/patches/faccessat.patch | 18 ++++++------ srcpkgs/rmlint/template | 1 - .../rofs-filtered/patches/fix-cflags.patch | 4 +-- srcpkgs/rofs-filtered/template | 1 - srcpkgs/rpcbind/patches/musl-sunrpc.patch | 4 +-- srcpkgs/rpcbind/patches/rpcbind-sunrpc.patch | 4 +-- srcpkgs/rpcbind/template | 1 - .../patches/disable-telemetry.patch | 4 +-- srcpkgs/rpi-imager/template | 1 - srcpkgs/rpm/patches/fix-musl.patch | 8 +++--- srcpkgs/rpm/template | 1 - srcpkgs/rspamd/patches/vsx.patch | 12 ++++---- srcpkgs/rspamd/template | 1 - srcpkgs/rsstail/patches/fix-1779.patch | 4 +-- srcpkgs/rsstail/template | 1 - ...0001-Check-for-group_member-in-cmake.patch | 12 ++++---- ...heck-for-backtrace-function-in-cmake.patch | 12 ++++---- ...ude-unistd.h-instead-of-sys-unistd.h.patch | 4 +-- .../0004-unbundle-pandoc-mathjax.patch | 4 +-- .../0005-don-t-install-mathjax-pandoc.patch | 4 +-- .../patches/0006-Fix-rstudio-exec-path.patch | 4 +-- .../patches/0006-use-system-node.patch | 4 +-- srcpkgs/rstudio/patches/boost173.patch | 16 +++++------ srcpkgs/rstudio/patches/boost176.patch | 8 +++--- srcpkgs/rstudio/template | 1 - srcpkgs/rsyslog/patches/musl-glob.patch | 4 +-- srcpkgs/rsyslog/patches/musl.patch | 4 +-- srcpkgs/rsyslog/template | 1 - ...0001-void-arch-generic-plumbing-bits.patch | 4 +-- srcpkgs/rtl8812au-dkms/template | 1 - ...0001-void-arch-generic-plumbing-bits.patch | 4 +-- srcpkgs/rtl8822bu-dkms/template | 1 - srcpkgs/rtmpdump/patches/fix-chunk-size.patch | 4 +-- srcpkgs/rtmpdump/template | 1 - .../patches/fix-sysroot-handling.patch | 4 +-- .../patches/no_xmlrpc_c_compile.patch | 4 +-- srcpkgs/rtorrent/template | 1 - srcpkgs/rubberband/patches/fix-armv5tel.patch | 4 +-- srcpkgs/rubberband/template | 1 - .../patches/musl-fix-get_main_stack.patch | 4 +-- .../patch-ext_openssl_extconf_rb.patch | 4 +-- .../patch-ext_openssl_openssl_missing_h.patch | 4 +-- .../test_insns-lower-recursion-depth.patch | 4 +-- srcpkgs/ruby/template | 1 - .../ruler/patches/fix-invalid-pointer.patch | 4 +-- srcpkgs/ruler/template | 1 - srcpkgs/run-mailcap/patches/manpages.patch | 8 +++--- srcpkgs/run-mailcap/patches/tempfile.patch | 4 +-- srcpkgs/run-mailcap/template | 1 - .../rustup/patches/dont-copy-rustup-bin.patch | 4 +-- srcpkgs/rustup/template | 1 - .../rxvt-unicode/patches/font-width-fix.patch | 4 +-- .../patches/line-spacing-fix.patch | 4 +-- srcpkgs/rxvt-unicode/template | 1 - 122 files changed, 253 insertions(+), 295 deletions(-) diff --git a/srcpkgs/rabbitmq-c/patches/test.patch b/srcpkgs/rabbitmq-c/patches/test.patch index 5f87d166798..0f10d821090 100644 --- a/srcpkgs/rabbitmq-c/patches/test.patch +++ b/srcpkgs/rabbitmq-c/patches/test.patch @@ -19,8 +19,8 @@ to ensure the library is built correctly. diff --git .travis.yml .travis.yml index 52a66b9c..5f56cb03 100644 ---- .travis.yml -+++ .travis.yml +--- a/.travis.yml ++++ b/.travis.yml @@ -19,7 +19,7 @@ addons: name: "alanxz/rabbitmq-c" description: "C AMQP client for RabbitMQ" @@ -32,8 +32,8 @@ index 52a66b9c..5f56cb03 100644 diff --git CMakeLists.txt CMakeLists.txt index f620ddc8..a39645f4 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -266,6 +266,7 @@ option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND}) option(BUILD_TOOLS_DOCS "Build man pages for Tools (requires xmlto)" ${DO_DOCS}) option(BUILD_TESTS "Build tests (run tests with make test)" ON) @@ -44,8 +44,8 @@ index f620ddc8..a39645f4 100644 message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build") diff --git README.md README.md index b7776c65..31347b15 100644 ---- README.md -+++ README.md +--- a/README.md ++++ b/README.md @@ -84,6 +84,8 @@ Other interesting flags that can be passed to CMake: default this is ON if the OpenSSL headers and library can be found. * `BUILD_API_DOCS=ON/OFF` - toggles building the Doxygen API documentation, by @@ -57,8 +57,8 @@ index b7776c65..31347b15 100644 diff --git appveyor.yml appveyor.yml index 7e41c099..af315227 100644 ---- appveyor.yml -+++ appveyor.yml +--- a/appveyor.yml ++++ b/appveyor.yml @@ -30,7 +30,7 @@ install: - "Win%BITS%OpenSSL-%OPENSSL_VER%.exe /SP- /SILENT /SUPPRESSMSGBOXES /NORESTART" @@ -70,8 +70,8 @@ index 7e41c099..af315227 100644 project: ALL_BUILD.vcxproj diff --git tests/CMakeLists.txt tests/CMakeLists.txt index cf042b04..320a73d7 100644 ---- tests/CMakeLists.txt -+++ tests/CMakeLists.txt +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt @@ -33,9 +33,11 @@ add_executable(test_basic test_basic.c) target_link_libraries(test_basic rabbitmq-static) diff --git a/srcpkgs/rabbitmq-c/template b/srcpkgs/rabbitmq-c/template index ea3f0aaa3f5..95ad7a33343 100644 --- a/srcpkgs/rabbitmq-c/template +++ b/srcpkgs/rabbitmq-c/template @@ -12,7 +12,6 @@ license="MIT" homepage="https://github.com/alanxz/rabbitmq-c" distfiles="https://github.com/alanxz/${pkgname}/archive/v${version}.tar.gz" checksum=6455efbaebad8891c59f274a852b75b5cc51f4d669dfc78d2ae7e6cc97fcd8c0 -patch_args=-Np0 post_install() { vlicense LICENSE-MIT LICENSE diff --git a/srcpkgs/racket/patches/musl-fixes.patch b/srcpkgs/racket/patches/musl-fixes.patch index e0cb4f7acb3..32eaad0c54c 100644 --- a/srcpkgs/racket/patches/musl-fixes.patch +++ b/srcpkgs/racket/patches/musl-fixes.patch @@ -14,8 +14,8 @@ Resources: * https://github.com/NixOS/nixpkgs/pull/31017 * https://github.com/racket/racket/pull/1886 ---- collects/compiler/private/xform.rkt ---- collects/compiler/private/xform.rkt +--- a/collects/compiler/private/xform.rkt +--- a/collects/compiler/private/xform.rkt @@ -924,6 +924,7 @@ |GetStdHandle| |__CFStringMakeConstantString| _vswprintf_c diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template index 0e0a4335986..1fee0a65e39 100644 --- a/srcpkgs/racket/template +++ b/srcpkgs/racket/template @@ -16,7 +16,6 @@ distfiles="http://mirror.racket-lang.org/installers/${version}/${pkgname}-${vers checksum=5578942066a9405fdbcad9522d08685356693f4ddd5dbe92b5273557a112b73e nostrip=yes nocross=yes -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args+=" --enable-racket=/usr/bin/racket" diff --git a/srcpkgs/radare2/patches/try.patch b/srcpkgs/radare2/patches/try.patch index 32ecdb33973..332d9e08319 100644 --- a/srcpkgs/radare2/patches/try.patch +++ b/srcpkgs/radare2/patches/try.patch @@ -1,5 +1,5 @@ ---- shlr/Makefile 2020-12-21 09:39:46.000000000 +0100 -+++ shlr/Makefile 2021-01-04 22:13:43.513442861 +0100 +--- a/shlr/Makefile 2020-12-21 09:39:46.000000000 +0100 ++++ b/shlr/Makefile 2021-01-04 22:13:43.513442861 +0100 @@ -122,7 +122,7 @@ SDB_LIBA=sdb/src/libsdb.a diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template index fc79ad2b3c1..39818e99e7f 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -13,7 +13,6 @@ license="LGPL-3.0-only" homepage="http://www.radare.org" distfiles="https://github.com/radareorg/radare2/archive/${version}.tar.gz" checksum=517dd80ebd0569f31498887338eacb92e8cf054bc4625eef8ffe9ea174c1adae -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in mips*) CFLAGS="-Os";; diff --git a/srcpkgs/rakarrack/patches/fltk_include.patch b/srcpkgs/rakarrack/patches/fltk_include.patch index c787cb13479..de4ea47acb5 100644 --- a/srcpkgs/rakarrack/patches/fltk_include.patch +++ b/srcpkgs/rakarrack/patches/fltk_include.patch @@ -1,6 +1,6 @@ diff -baur src/global.h src/global.h ---- src/global.h 2011-07-12 05:13:31.367583829 +0800 -+++ src/global.h 2011-07-12 05:15:20.670325018 +0800 +--- a/src/global.h 2011-07-12 05:13:31.367583829 +0800 ++++ b/src/global.h 2011-07-12 05:15:20.670325018 +0800 @@ -99,7 +99,7 @@ #include #include @@ -11,8 +11,8 @@ diff -baur src/global.h src/global.h #include "Reverb.h" #include "Chorus.h" diff -baur src/process.C src/process.C ---- src/process.C 2011-07-12 05:13:31.367583829 +0800 -+++ src/process.C 2011-07-12 05:15:31.293600800 +0800 +--- a/src/process.C 2011-07-12 05:13:31.367583829 +0800 ++++ b/src/process.C 2011-07-12 05:15:31.293600800 +0800 @@ -28,7 +28,7 @@ #include #include diff --git a/srcpkgs/rakarrack/template b/srcpkgs/rakarrack/template index 9c94f004ff2..0d4dcc83496 100644 --- a/srcpkgs/rakarrack/template +++ b/srcpkgs/rakarrack/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://rakarrack.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" checksum=7696d27a4814b140fe651d137612ddfa1f167858eccc119e278c14dbee30eee6 -patch_args=-Np0 pre_configure() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/rapidjson/patches/0001-remove-march-native-from-CMAKE_CXX_FLAGS.patch b/srcpkgs/rapidjson/patches/0001-remove-march-native-from-CMAKE_CXX_FLAGS.patch index cc17cbb6ca2..eb0b76b21e8 100644 --- a/srcpkgs/rapidjson/patches/0001-remove-march-native-from-CMAKE_CXX_FLAGS.patch +++ b/srcpkgs/rapidjson/patches/0001-remove-march-native-from-CMAKE_CXX_FLAGS.patch @@ -1,7 +1,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index ceda71b1..9fc52736 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -50,7 +50,7 @@ if(CCACHE_FOUND) endif(CCACHE_FOUND) diff --git a/srcpkgs/rapidjson/patches/fallthrough.patch b/srcpkgs/rapidjson/patches/fallthrough.patch index 55061ba64d6..18e5c7100ea 100644 --- a/srcpkgs/rapidjson/patches/fallthrough.patch +++ b/srcpkgs/rapidjson/patches/fallthrough.patch @@ -1,5 +1,5 @@ ---- include/rapidjson/internal/regex.h.orig 2016-08-25 09:59:05.000000000 +0200 -+++ include/rapidjson/internal/regex.h 2018-01-13 21:51:33.959472047 +0100 +--- a/include/rapidjson/internal/regex.h 2016-08-25 09:59:05.000000000 +0200 ++++ b/include/rapidjson/internal/regex.h 2018-01-13 21:51:33.959472047 +0100 @@ -300,7 +300,7 @@ case '\\': // Escape character if (!CharacterEscape(ds, &codepoint)) diff --git a/srcpkgs/rapidjson/template b/srcpkgs/rapidjson/template index 2591e261b37..99d92702cc9 100644 --- a/srcpkgs/rapidjson/template +++ b/srcpkgs/rapidjson/template @@ -9,7 +9,6 @@ license="BSD-3-Clause, MIT" homepage="https://github.com/miloyip/rapidjson" distfiles="https://github.com/miloyip/${pkgname}/archive/v${version}.tar.gz" checksum=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e -patch_args=-Np0 # class-memaccess is required by https://github.com/Tencent/rapidjson/issues/1700 CXXFLAGS="-Wno-type-limits -Wno-error=class-memaccess -DNDEBUG" diff --git a/srcpkgs/raptor/patches/CVE-2017-18926.patch b/srcpkgs/raptor/patches/CVE-2017-18926.patch index 64b051418b7..6f31e508ffc 100644 --- a/srcpkgs/raptor/patches/CVE-2017-18926.patch +++ b/srcpkgs/raptor/patches/CVE-2017-18926.patch @@ -14,8 +14,8 @@ and #0000618 http://bugs.librdf.org/mantis/view.php?id=618 diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c index 693b9468..0d3a36a5 100644 ---- src/raptor_xml_writer.c -+++ src/raptor_xml_writer.c +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c @@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, size_t nspace_declarations_count = 0; unsigned int i; diff --git a/srcpkgs/raptor/patches/out-of-bounds.patch b/srcpkgs/raptor/patches/out-of-bounds.patch index 08b1b0d37be..54801e5b659 100644 --- a/srcpkgs/raptor/patches/out-of-bounds.patch +++ b/srcpkgs/raptor/patches/out-of-bounds.patch @@ -2,8 +2,8 @@ Patch from https://bugs.librdf.org/mantis/view.php?id=650 diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c index 56993dc3..163f34d5 100644 ---- src/raptor_xml_writer.c -+++ src/raptor_xml_writer.c +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c @@ -216,6 +216,9 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, if(nstack && element->attributes) { diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template index 7f0b9ad13f8..5408f6b745f 100644 --- a/srcpkgs/raptor/template +++ b/srcpkgs/raptor/template @@ -13,7 +13,6 @@ license="LGPL-2.1" homepage="http://librdf.org/raptor" distfiles="http://librdf.org/dist/source/raptor2-${version}.tar.gz" checksum=ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed -patch_args=-Np0 libraptor_package() { short_desc+=" - Runtime libraries" diff --git a/srcpkgs/rdedup/patches/bindgen-cross.patch b/srcpkgs/rdedup/patches/bindgen-cross.patch index dd07d48b99c..7eab10fd3d5 100644 --- a/srcpkgs/rdedup/patches/bindgen-cross.patch +++ b/srcpkgs/rdedup/patches/bindgen-cross.patch @@ -1,8 +1,8 @@ patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds https://github.com/jnbr/rust-bindgen/tree/0.37.4-clang_args ---- Cargo.toml.orig 2019-06-15 13:18:05.509893680 +0200 -+++ Cargo.toml 2019-06-15 13:19:48.854887006 +0200 +--- a/Cargo.toml 2019-06-15 13:18:05.509893680 +0200 ++++ b/Cargo.toml 2019-06-15 13:19:48.854887006 +0200 @@ -53,3 +53,6 @@ slog-term = "2" slog-async = "2" diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template index f7b9d6760a0..c392e3c0e2f 100644 --- a/srcpkgs/rdedup/template +++ b/srcpkgs/rdedup/template @@ -12,7 +12,6 @@ license="MPL-2.0" homepage="https://github.com/dpc/rdedup" distfiles="https://github.com/dpc/rdedup/archive/rdedup-v${version}.tar.gz" checksum=5e7c09c40897cd2f2635e8c213c2ff0f5c4d7ceccbd22980cd4cb0a16f3dfc28 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then export HOST_CC="$BUILD_CC" diff --git a/srcpkgs/rdis-git/patches/luajit_version.patch b/srcpkgs/rdis-git/patches/luajit_version.patch index aa42c0a0e3e..218d07272c9 100644 --- a/srcpkgs/rdis-git/patches/luajit_version.patch +++ b/srcpkgs/rdis-git/patches/luajit_version.patch @@ -1,6 +1,6 @@ fix luajit version checks (for 2.1 support) ---- src/Makefile -+++ src/Makefile +--- a/src/Makefile ++++ b/src/Makefile @@ -1,7 +1,7 @@ OBJS=object.o rdg.o rdg_node.o rdis.o serialize.o settings.o util.o wqueue.o @@ -10,8 +10,8 @@ fix luajit version checks (for 2.1 support) -iquotecontainer/ -iquoteloader/ -iquote./ -iquotescript/ -iquotegui/ -iquoteredis/ LIB=`pkg-config --libs gtk+-3.0 cairo` -ludis86 -lm -lfontconfig -lpthread \ -ljansson -lluajit-5.1 -lcrypto ---- src/gui/Makefile -+++ src/gui/Makefile +--- a/src/gui/Makefile ++++ b/src/gui/Makefile @@ -2,7 +2,7 @@ OBJS = hexwindow.o funcwindow.o main.o refwindow.o rdgwindow.o \ rdiswindow.o gui.o @@ -21,8 +21,8 @@ fix luajit version checks (for 2.1 support) -iquote../ -iquote../container -iquote../loader -iquote../script all : $(OBJS) ---- src/loader/Makefile -+++ src/loader/Makefile +--- a/src/loader/Makefile ++++ b/src/loader/Makefile @@ -1,7 +1,7 @@ OBJS=elf32.o elf64.o x86.o x8664.o loader.o pe.o lua.o dummy.o @@ -32,8 +32,8 @@ fix luajit version checks (for 2.1 support) -iquote../container -iquote../ -iquote../script -iquote./ all : $(OBJS) ---- src/script/Makefile -+++ src/script/Makefile +--- a/src/script/Makefile ++++ b/src/script/Makefile @@ -1,7 +1,7 @@ OBJS=rdis_lua.o rl_redis_x86.o @@ -43,8 +43,8 @@ fix luajit version checks (for 2.1 support) -iquote../ -iquote../container -iquote../loader -iquote./ -iquote../redis -iquote../gui all : $(OBJS) ---- src/script/rdis_lua.h -+++ src/script/rdis_lua.h +--- a/src/script/rdis_lua.h ++++ b/src/script/rdis_lua.h @@ -1,9 +1,9 @@ #ifndef rdis_lua_HEADER #define rdis_lua_HEADER diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template index 4d754dd4962..5aaa5d669b7 100644 --- a/srcpkgs/rdis-git/template +++ b/srcpkgs/rdis-git/template @@ -8,7 +8,6 @@ short_desc="A binary analysis tool for Linux" maintainer="Orphaned " license="GPL-3" homepage="https://github.com/endeav0r/rdis" -patch_args=-Np0 do_fetch() { git clone git://github.com/endeav0r/rdis.git $wrksrc diff --git a/srcpkgs/re/patches/bsdnet.diff b/srcpkgs/re/patches/bsdnet.diff index 2fcef234749..46a4329808e 100644 --- a/srcpkgs/re/patches/bsdnet.diff +++ b/srcpkgs/re/patches/bsdnet.diff @@ -1,5 +1,5 @@ ---- src/net/posix/pif.c.orig 2016-12-03 15:21:22.000000000 +0100 -+++ src/net/posix/pif.c 2016-12-03 15:21:39.000000000 +0100 +--- a/src/net/posix/pif.c 2016-12-03 15:21:22.000000000 +0100 ++++ b/src/net/posix/pif.c 2016-12-03 15:21:39.000000000 +0100 @@ -3,6 +3,7 @@ * * Copyright (C) 2010 Creytiv.com @@ -8,8 +8,8 @@ #include #include #include ---- src/net/ifaddrs.c.orig 2016-12-03 15:24:22.000000000 +0100 -+++ src/net/ifaddrs.c 2016-12-03 15:24:39.000000000 +0100 +--- a/src/net/ifaddrs.c 2016-12-03 15:24:22.000000000 +0100 ++++ b/src/net/ifaddrs.c 2016-12-03 15:24:39.000000000 +0100 @@ -3,6 +3,7 @@ * * Copyright (C) 2010 Creytiv.com @@ -18,8 +18,8 @@ #include #include #define __USE_MISC 1 /**< Use MISC code */ ---- src/tcp/tcp.c.orig 2016-12-03 15:30:06.000000000 +0100 -+++ src/tcp/tcp.c 2016-12-03 15:29:46.000000000 +0100 +--- a/src/tcp/tcp.c 2016-12-03 15:30:06.000000000 +0100 ++++ b/src/tcp/tcp.c 2016-12-03 15:29:46.000000000 +0100 @@ -3,6 +3,7 @@ * * Copyright (C) 2010 Creytiv.com diff --git a/srcpkgs/re/patches/musl.patch b/srcpkgs/re/patches/musl.patch index eb5156b8091..3ae7636e450 100644 --- a/srcpkgs/re/patches/musl.patch +++ b/srcpkgs/re/patches/musl.patch @@ -1,5 +1,5 @@ ---- re_types.h 2018-01-14 21:33:25.561341291 +0100 -+++ include/re_types.h 2018-01-14 21:34:45.444384148 +0100 +--- a/re_types.h 2018-01-14 21:33:25.561341291 +0100 ++++ b/include/re_types.h 2018-01-14 21:34:45.444384148 +0100 @@ -37,20 +37,25 @@ typedef signed long long int int64_t; diff --git a/srcpkgs/re/patches/resolver.diff b/srcpkgs/re/patches/resolver.diff index 1365b70ff59..a32763c2bda 100644 --- a/srcpkgs/re/patches/resolver.diff +++ b/srcpkgs/re/patches/resolver.diff @@ -1,5 +1,5 @@ ---- src/dns/res.c.orig 2016-12-03 15:17:53.000000000 +0100 -+++ src/dns/res.c 2016-12-03 15:18:30.000000000 +0100 +--- a/src/dns/res.c 2016-12-03 15:17:53.000000000 +0100 ++++ b/src/dns/res.c 2016-12-03 15:18:30.000000000 +0100 @@ -25,13 +25,9 @@ int get_resolv_dns(char *domain, size_t uint32_t i; int ret, err; diff --git a/srcpkgs/re/template b/srcpkgs/re/template index a1dd9a76a8f..726ba036074 100644 --- a/srcpkgs/re/template +++ b/srcpkgs/re/template @@ -16,7 +16,6 @@ homepage="https://github.com/baresip/re/" distfiles="https://github.com/baresip/re/archive/v${version}.tar.gz" checksum=43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed shlib_provides="libre.so" -patch_args=-Np0 case $XBPS_TARGET_MACHINE in i686*) arch="i686";; diff --git a/srcpkgs/recoll/patches/musl.patch b/srcpkgs/recoll/patches/musl.patch index c57aca4a565..c83d0f553c8 100644 --- a/srcpkgs/recoll/patches/musl.patch +++ b/srcpkgs/recoll/patches/musl.patch @@ -1,7 +1,7 @@ Index: utils/fstreewalk.cpp =================================================================== ---- utils/fstreewalk.cpp.orig -+++ utils/fstreewalk.cpp +--- a/utils/fstreewalk.cpp ++++ b/utils/fstreewalk.cpp @@ -17,6 +17,7 @@ #include "autoconfig.h" @@ -12,8 +12,8 @@ Index: utils/fstreewalk.cpp #include Index: utils/pxattr.cpp =================================================================== ---- utils/pxattr.cpp 2017-07-03 14:14:46.000000000 +0200 -+++ utils/pxattr.cpp 2017-12-17 14:34:29.955674837 +0100 +--- a/utils/pxattr.cpp 2017-07-03 14:14:46.000000000 +0200 ++++ b/utils/pxattr.cpp 2017-12-17 14:34:29.955674837 +0100 @@ -44,7 +44,7 @@ // just let the methods return errors (like they would on a non-xattr // fs on e.g. linux) diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template index 1f83b2715db..8c5de6966a4 100644 --- a/srcpkgs/recoll/template +++ b/srcpkgs/recoll/template @@ -16,4 +16,3 @@ license="GPL-2.0-or-later" homepage="https://www.lesbonscomptes.com/recoll/" distfiles="https://www.lesbonscomptes.com/${pkgname}/${pkgname}-${version}.tar.gz" checksum=17a8e684a8d5560dc7b44cd4b2962cb46476a75bdc107f622051235076d11885 -patch_args=-Np0 diff --git a/srcpkgs/recordmydesktop/patches/sane-theora-defaults.patch b/srcpkgs/recordmydesktop/patches/sane-theora-defaults.patch index 2ad85796d6e..91af4328cbe 100644 --- a/srcpkgs/recordmydesktop/patches/sane-theora-defaults.patch +++ b/srcpkgs/recordmydesktop/patches/sane-theora-defaults.patch @@ -1,8 +1,8 @@ # Use sane theora defaults # https://bugzilla.redhat.com/show_bug.cgi?id=525155 ---- src/rmd_initialize_data.c 2009-11-25 10:05:58.708779029 -0500 -+++ src/rmd_initialize_data.c 2009-11-25 09:28:07.629507987 -0500 +--- a/src/rmd_initialize_data.c 2009-11-25 10:05:58.708779029 -0500 ++++ b/src/rmd_initialize_data.c 2009-11-25 09:28:07.629507987 -0500 @@ -224,7 +224,7 @@ args->channels = 1; args->frequency = 22050; @@ -12,8 +12,8 @@ args->v_quality = 63; args->s_quality = 10; ---- src/rmd_parseargs.c 2009-11-25 10:06:07.409777969 -0500 -+++ src/rmd_parseargs.c 2009-11-25 09:39:32.786757292 -0500 +--- a/src/rmd_parseargs.c 2009-11-25 10:06:07.409777969 -0500 ++++ b/src/rmd_parseargs.c 2009-11-25 09:39:32.786757292 -0500 @@ -104,10 +104,10 @@ "Encoding Options\n" "\t--on-the-fly-encoding\tEncode the audio-video data, while recording.\n" diff --git a/srcpkgs/recordmydesktop/patches/shmstr-to-shmproto.patch b/srcpkgs/recordmydesktop/patches/shmstr-to-shmproto.patch index 88ea7e468d3..942575b744a 100644 --- a/srcpkgs/recordmydesktop/patches/shmstr-to-shmproto.patch +++ b/srcpkgs/recordmydesktop/patches/shmstr-to-shmproto.patch @@ -2,8 +2,8 @@ # 2010-01-15: Bug with proposed fix already upstream: # http://sourceforge.net/tracker/?func=detail&aid=2889699&group_id=172357&atid=861428 ---- src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100 -+++ src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100 +--- a/src/rmd_getzpixmap.c 2008-12-13 17:04:10.000000000 +0100 ++++ b/src/rmd_getzpixmap.c 2009-11-11 11:30:18.000000000 +0100 @@ -32,7 +32,7 @@ #include @@ -13,8 +13,8 @@ #include ---- src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100 -+++ src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100 +--- a/src/rmd_update_image.c 2008-12-13 17:20:49.000000000 +0100 ++++ b/src/rmd_update_image.c 2009-11-11 11:30:34.000000000 +0100 @@ -32,7 +32,7 @@ #include "rmd_types.h" diff --git a/srcpkgs/recordmydesktop/template b/srcpkgs/recordmydesktop/template index b460f1355e4..eb509e5efd4 100644 --- a/srcpkgs/recordmydesktop/template +++ b/srcpkgs/recordmydesktop/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="http://recordmydesktop.sourceforge.net/about.php" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=33a2e208186ae78e2db2a27b0f5047b50fb7819c47fe15483b0765200b9d738c -patch_args=-Np0 diff --git a/srcpkgs/redis/patches/use-system-jemalloc.patch b/srcpkgs/redis/patches/use-system-jemalloc.patch index 9f75299b336..c32bcdd0925 100644 --- a/srcpkgs/redis/patches/use-system-jemalloc.patch +++ b/srcpkgs/redis/patches/use-system-jemalloc.patch @@ -1,5 +1,5 @@ ---- src/Makefile 2018-11-23 20:32:03.881081556 +0200 -+++ src/Makefile 2018-11-23 23:55:55.800219510 +0200 +--- a/src/Makefile 2018-11-23 20:32:03.881081556 +0200 ++++ b/src/Makefile 2018-11-23 23:55:55.800219510 +0200 @@ -134,9 +134,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) endif diff --git a/srcpkgs/redis/template b/srcpkgs/redis/template index 27d4568d1a7..974305ff1f0 100644 --- a/srcpkgs/redis/template +++ b/srcpkgs/redis/template @@ -11,7 +11,6 @@ homepage="https://redis.io" changelog="https://raw.githubusercontent.com/antirez/redis/5.0/00-RELEASENOTES" distfiles="http://download.redis.io/releases/${pkgname}-${version}.tar.gz" checksum=dc2bdcf81c620e9f09cfd12e85d3bc631c897b2db7a55218fd8a65eaa37f86dd -patch_args=-Np0 system_accounts="redis" redis_homedir="/var/lib/redis" diff --git a/srcpkgs/redo/patches/musl.patch b/srcpkgs/redo/patches/musl.patch index eab67b6aa63..0cf4347320a 100644 --- a/srcpkgs/redo/patches/musl.patch +++ b/srcpkgs/redo/patches/musl.patch @@ -1,5 +1,5 @@ ---- source/lockfile.cpp.orig -+++ source/lockfile.cpp +--- a/source/lockfile.cpp ++++ b/source/lockfile.cpp @@ -5,6 +5,7 @@ #include diff --git a/srcpkgs/redo/template b/srcpkgs/redo/template index e3e8315d91f..b8af94ccc10 100644 --- a/srcpkgs/redo/template +++ b/srcpkgs/redo/template @@ -10,7 +10,6 @@ license="ISC" homepage="http://jdebp.info/Softwares/redo/" distfiles="http://jdebp.info/Repository/freebsd/redo-${version}.tar.gz" checksum=5ff21779993418cf16f5632c593e30d9a2780bfc38cef9de9ab9427154736d36 -patch_args=-Np0 do_configure() { ./package/prepare diff --git a/srcpkgs/refind/patches/add-cross-compile-support.patch b/srcpkgs/refind/patches/add-cross-compile-support.patch index 0141798bc13..ec59031bb6c 100644 --- a/srcpkgs/refind/patches/add-cross-compile-support.patch +++ b/srcpkgs/refind/patches/add-cross-compile-support.patch @@ -1,7 +1,7 @@ diff --git a/Make.common b/Make.common index 3f0b919..562a03e 100644 ---- Make.common -+++ Make.common +--- a/Make.common ++++ b/Make.common @@ -34,21 +34,13 @@ ARCH ?= $(HOSTARCH) # Note: TIANOBASE is defined in master Makefile and exported GENFW = $(TIANOBASE)/BaseTools/Source/C/bin/GenFw diff --git a/srcpkgs/refind/patches/force-inline-musl.patch b/srcpkgs/refind/patches/force-inline-musl.patch index 98b985fc3a2..4126d7fef22 100644 --- a/srcpkgs/refind/patches/force-inline-musl.patch +++ b/srcpkgs/refind/patches/force-inline-musl.patch @@ -1,5 +1,5 @@ ---- filesystems/zstd/fse_decompress.c.orig 2019-11-11 17:00:57.423347660 +0700 -+++ filesystems/zstd/fse_decompress.c 2019-11-11 17:01:52.654692140 +0700 +--- a/filesystems/zstd/fse_decompress.c 2019-11-11 17:00:57.423347660 +0700 ++++ b/filesystems/zstd/fse_decompress.c 2019-11-11 17:01:52.654692140 +0700 @@ -40,7 +40,7 @@ /* ************************************************************** * Compiler specifics @@ -9,8 +9,8 @@ /* ************************************************************** * Includes ---- filesystems/zstd/zstd_internal.h.orig 2019-11-11 15:56:42.258217148 +0700 -+++ filesystems/zstd/zstd_internal.h 2019-11-11 16:04:09.433867777 +0700 +--- a/filesystems/zstd/zstd_internal.h 2019-11-11 15:56:42.258217148 +0700 ++++ b/filesystems/zstd/zstd_internal.h 2019-11-11 16:04:09.433867777 +0700 @@ -20,7 +20,7 @@ /*-******************************************************* * Compiler specifics @@ -20,8 +20,8 @@ #define FORCE_NOINLINE static /*noinline*/ /*-************************************* ---- filesystems/zstd/huf_decompress.c.orig 2019-11-11 17:00:46.487280468 +0700 -+++ filesystems/zstd/huf_decompress.c 2019-11-11 17:01:20.095488026 +0700 +--- a/filesystems/zstd/huf_decompress.c 2019-11-11 17:00:46.487280468 +0700 ++++ b/filesystems/zstd/huf_decompress.c 2019-11-11 17:01:20.095488026 +0700 @@ -40,7 +40,7 @@ /* ************************************************************** * Compiler specifics diff --git a/srcpkgs/refind/template b/srcpkgs/refind/template index 7115017b088..49d46290752 100644 --- a/srcpkgs/refind/template +++ b/srcpkgs/refind/template @@ -13,7 +13,6 @@ distfiles="${SOURCEFORGE_SITE}/refind/refind-src-${version}.tar.gz" checksum=dd58944854a42df5a2a943f15e5dcfd995808f28580df96ad39d68fb1e48c970 python_version=2 conf_files="/etc/default/refind-kernel-hook.conf" -patch_args=-Np0 post_extract() { vsed -e 's|RefindDir=\"\$ThisDir/refind\"|RefindDir="/usr/share/refind"|g' \ diff --git a/srcpkgs/reiserfsprogs/patches/musl-__compar_fn_t.patch b/srcpkgs/reiserfsprogs/patches/musl-__compar_fn_t.patch index dc68a2c6b66..d4c13dc53cd 100644 --- a/srcpkgs/reiserfsprogs/patches/musl-__compar_fn_t.patch +++ b/srcpkgs/reiserfsprogs/patches/musl-__compar_fn_t.patch @@ -2,8 +2,8 @@ Define _GNU_SOURCE for the declaration of loff_t in fcntl.h Add missing typedefs for __compar_fn_t and compare_fn_t for non __GLIBC__ case. ---- include/misc.h -+++ include/misc.h +--- a/include/misc.h ++++ b/include/misc.h @@ -35,6 +35,11 @@ #define INVAL_PTR (void *)-1 diff --git a/srcpkgs/reiserfsprogs/patches/musl-loff_t.patch b/srcpkgs/reiserfsprogs/patches/musl-loff_t.patch index ba3887a5686..ea08575165c 100644 --- a/srcpkgs/reiserfsprogs/patches/musl-loff_t.patch +++ b/srcpkgs/reiserfsprogs/patches/musl-loff_t.patch @@ -1,6 +1,6 @@ See https://www.openwall.com/lists/musl/2013/01/23/6 ---- include/reiserfs_lib.h -+++ include/reiserfs_lib.h +--- a/include/reiserfs_lib.h ++++ b/include/reiserfs_lib.h @@ -3,6 +3,10 @@ * reiserfsprogs/README */ diff --git a/srcpkgs/reiserfsprogs/patches/musl-long_long_min_max.patch b/srcpkgs/reiserfsprogs/patches/musl-long_long_min_max.patch index 4ee90ad9597..d3c483538e1 100644 --- a/srcpkgs/reiserfsprogs/patches/musl-long_long_min_max.patch +++ b/srcpkgs/reiserfsprogs/patches/musl-long_long_min_max.patch @@ -1,8 +1,8 @@ Add definitions for LONG_LONG_MIN and _MAX derived from the values for int64_t. ---- resize_reiserfs/resize_reiserfs.c -+++ resize_reiserfs/resize_reiserfs.c +--- a/resize_reiserfs/resize_reiserfs.c ++++ b/resize_reiserfs/resize_reiserfs.c @@ -15,6 +15,13 @@ #include "resize.h" #include diff --git a/srcpkgs/reiserfsprogs/patches/musl-prints.patch b/srcpkgs/reiserfsprogs/patches/musl-prints.patch index d6c3666a137..71b44273586 100644 --- a/srcpkgs/reiserfsprogs/patches/musl-prints.patch +++ b/srcpkgs/reiserfsprogs/patches/musl-prints.patch @@ -1,5 +1,5 @@ ---- reiserfscore/prints.c -+++ reiserfscore/prints.c +--- a/reiserfscore/prints.c ++++ b/reiserfscore/prints.c @@ -7,8 +7,11 @@ #include "includes.h" diff --git a/srcpkgs/reiserfsprogs/patches/reiserfsprogs-3.6.27-loff_t.patch b/srcpkgs/reiserfsprogs/patches/reiserfsprogs-3.6.27-loff_t.patch index 058271c79ef..9ab8519e77f 100644 --- a/srcpkgs/reiserfsprogs/patches/reiserfsprogs-3.6.27-loff_t.patch +++ b/srcpkgs/reiserfsprogs/patches/reiserfsprogs-3.6.27-loff_t.patch @@ -7,8 +7,8 @@ This caused build failure: Re-enable extensions to pull loff_t back. https://bugs.gentoo.org/663930 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -23,2 +23,4 @@ AC_PROG_MAKE_SET AC_PROG_LIBTOOL +dnl pull in loff_t from glibc diff --git a/srcpkgs/reiserfsprogs/template b/srcpkgs/reiserfsprogs/template index 9350966ac54..d98433876b4 100644 --- a/srcpkgs/reiserfsprogs/template +++ b/srcpkgs/reiserfsprogs/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/" distfiles="${KERNEL_SITE}/kernel/people/jeffm/${pkgname}/v${version}/${pkgname}-${version}.tar.xz" checksum=0e95b67fa7746a3c2d59145e9b9c2feb4a6be52853e83b497b182eae508e62e3 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) diff --git a/srcpkgs/renderdoc/patches/add-x86-family.patch b/srcpkgs/renderdoc/patches/add-x86-family.patch index 93bcba34e79..80e24cd9b7e 100644 --- a/srcpkgs/renderdoc/patches/add-x86-family.patch +++ b/srcpkgs/renderdoc/patches/add-x86-family.patch @@ -16,8 +16,8 @@ Signed-off-by: Jordan Justen diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ee30d4..d2edf3d 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -89,6 +89,14 @@ set(RENDERDOC_APK_PATH "" CACHE STRING "Path to RenderDoc .apk files after insta set(LIB_SUFFIX "" CACHE STRING "Suffix for 'lib' folder in target directory structure. E.g. set to '64' to use /usr/local/lib64 instead of /usr/local/lib.") set(LIB_SUBFOLDER "" CACHE STRING "Subfolder under the 'lib' folder in target directory structure. E.g. set to 'renderdoc' to use /usr/local/lib/renderdoc instead of /usr/local/lib.") @@ -35,8 +35,8 @@ index 7ee30d4..d2edf3d 100644 endif() diff --git a/renderdoc/common/globalconfig.h b/renderdoc/common/globalconfig.h index d266166..d21da15 100644 ---- renderdoc/common/globalconfig.h -+++ renderdoc/common/globalconfig.h +--- a/renderdoc/common/globalconfig.h ++++ b/renderdoc/common/globalconfig.h @@ -125,6 +125,16 @@ #endif diff --git a/srcpkgs/renderdoc/patches/atomic.patch b/srcpkgs/renderdoc/patches/atomic.patch index 0d806c95e98..ce74d2a301c 100644 --- a/srcpkgs/renderdoc/patches/atomic.patch +++ b/srcpkgs/renderdoc/patches/atomic.patch @@ -1,8 +1,8 @@ @q66: replace old __sync stuff with equivalent modern ones, so we can use libatomic on targets without atomic8 support ---- renderdoc/CMakeLists.txt -+++ renderdoc/CMakeLists.txt +--- a/renderdoc/CMakeLists.txt ++++ b/renderdoc/CMakeLists.txt @@ -55,6 +55,8 @@ elseif(UNIX) PRIVATE -ldl PRIVATE -lrt) @@ -12,8 +12,8 @@ so we can use libatomic on targets without atomic8 support if(ENABLE_XLIB) find_package(X11 REQUIRED) ---- renderdoc/os/posix/posix_threading.cpp -+++ renderdoc/os/posix/posix_threading.cpp +--- a/renderdoc/os/posix/posix_threading.cpp ++++ b/renderdoc/os/posix/posix_threading.cpp @@ -43,32 +43,33 @@ namespace Atomic { int32_t Inc32(int32_t *i) diff --git a/srcpkgs/renderdoc/patches/build-type-none-is-release.patch b/srcpkgs/renderdoc/patches/build-type-none-is-release.patch index f16b944bc12..556ec9d1386 100644 --- a/srcpkgs/renderdoc/patches/build-type-none-is-release.patch +++ b/srcpkgs/renderdoc/patches/build-type-none-is-release.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -315,6 +315,7 @@ set(RELEASE_MODE 0) if(cmake_build_type_lower STREQUAL "release" OR diff --git a/srcpkgs/renderdoc/patches/compressonator-only-x86.patch b/srcpkgs/renderdoc/patches/compressonator-only-x86.patch index b0ca9cde910..9554123ddf9 100644 --- a/srcpkgs/renderdoc/patches/compressonator-only-x86.patch +++ b/srcpkgs/renderdoc/patches/compressonator-only-x86.patch @@ -10,8 +10,8 @@ Signed-off-by: Jordan Justen diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt index e3e8c28..59c8937 100644 ---- renderdoc/CMakeLists.txt -+++ renderdoc/CMakeLists.txt +--- a/renderdoc/CMakeLists.txt ++++ b/renderdoc/CMakeLists.txt @@ -342,7 +342,7 @@ elseif(UNIX) os/posix/posix_specific.h) endif() @@ -23,8 +23,8 @@ index e3e8c28..59c8937 100644 3rdparty/compressonator/BC2_Encode_kernel.cpp diff --git a/renderdoc/replay/replay_driver.cpp b/renderdoc/replay/replay_driver.cpp index a704726..7f3387f 100644 ---- renderdoc/replay/replay_driver.cpp -+++ renderdoc/replay/replay_driver.cpp +--- a/renderdoc/replay/replay_driver.cpp ++++ b/renderdoc/replay/replay_driver.cpp @@ -1430,8 +1430,8 @@ bytebuf GetDiscardPattern(DiscardType type, const ResourceFormat &fmt, uint32_t fmt.type == ResourceFormatType::BC5 || fmt.type == ResourceFormatType::BC6 || fmt.type == ResourceFormatType::BC7) diff --git a/srcpkgs/renderdoc/patches/dostringise.patch b/srcpkgs/renderdoc/patches/dostringise.patch index 4fd0b11ef37..637bd2e47c1 100644 --- a/srcpkgs/renderdoc/patches/dostringise.patch +++ b/srcpkgs/renderdoc/patches/dostringise.patch @@ -14,8 +14,8 @@ Signed-off-by: Jordan Justen diff --git a/renderdoc/serialise/serialiser.cpp b/renderdoc/serialise/serialiser.cpp index 460a310..9e53fb1 100644 ---- renderdoc/serialise/serialiser.cpp -+++ renderdoc/serialise/serialiser.cpp +--- a/renderdoc/serialise/serialiser.cpp ++++ b/renderdoc/serialise/serialiser.cpp @@ -937,6 +937,14 @@ rdcstr DoStringise(const int16_t &el) return StringFormat::Fmt("%hd", el); } diff --git a/srcpkgs/renderdoc/patches/ptrace-only-x86.patch b/srcpkgs/renderdoc/patches/ptrace-only-x86.patch index 93098c1d8b2..dce7ef7c730 100644 --- a/srcpkgs/renderdoc/patches/ptrace-only-x86.patch +++ b/srcpkgs/renderdoc/patches/ptrace-only-x86.patch @@ -16,8 +16,8 @@ Signed-off-by: Jordan Justen diff --git a/renderdoc/os/posix/linux/linux_process.cpp b/renderdoc/os/posix/linux/linux_process.cpp index 7db273f..491268d 100644 ---- renderdoc/os/posix/linux/linux_process.cpp -+++ renderdoc/os/posix/linux/linux_process.cpp +--- a/renderdoc/os/posix/linux/linux_process.cpp ++++ b/renderdoc/os/posix/linux/linux_process.cpp @@ -50,6 +50,8 @@ extern char **environ; #define INITIAL_WAIT_TIME 1 #define MAX_WAIT_TIME 0xfffff diff --git a/srcpkgs/renderdoc/patches/qmake-no-rpath.patch b/srcpkgs/renderdoc/patches/qmake-no-rpath.patch index 6e6325c5355..a80df310b1a 100644 --- a/srcpkgs/renderdoc/patches/qmake-no-rpath.patch +++ b/srcpkgs/renderdoc/patches/qmake-no-rpath.patch @@ -1,7 +1,7 @@ Index: qrenderdoc/CMakeLists.txt =================================================================== ---- qrenderdoc/CMakeLists.txt.orig -+++ qrenderdoc/CMakeLists.txt +--- a/qrenderdoc/CMakeLists.txt ++++ b/qrenderdoc/CMakeLists.txt @@ -144,7 +144,7 @@ endif() # and finding dependencies from the cmake build file(WRITE diff --git a/srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch b/srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch index d4003ded916..2c6d41cd604 100644 --- a/srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch +++ b/srcpkgs/renderdoc/patches/unvendor-zstd-lz4.patch @@ -1,7 +1,7 @@ Index: renderdoc/CMakeLists.txt =================================================================== ---- renderdoc/CMakeLists.txt.orig -+++ renderdoc/CMakeLists.txt +--- a/renderdoc/CMakeLists.txt ++++ b/renderdoc/CMakeLists.txt @@ -213,54 +213,10 @@ set(sources 3rdparty/pugixml/pugixml.cpp 3rdparty/pugixml/pugixml.hpp diff --git a/srcpkgs/renderdoc/template b/srcpkgs/renderdoc/template index 6fe21f63ea2..4615d45c52c 100644 --- a/srcpkgs/renderdoc/template +++ b/srcpkgs/renderdoc/template @@ -16,7 +16,6 @@ license="MIT" homepage="https://github.com/baldurk/renderdoc" distfiles="https://github.com/baldurk/${pkgname}/archive/v${version}.tar.gz" checksum=4dece1b4cb859a76533b28fcd50e17321acfaa81c3435500a006c4a5ba15fddb -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" libexecinfo-devel" diff --git a/srcpkgs/residualvm/patches/fluidsynth-2.1.patch b/srcpkgs/residualvm/patches/fluidsynth-2.1.patch index a319352f38d..4302d8cfac0 100644 --- a/srcpkgs/residualvm/patches/fluidsynth-2.1.patch +++ b/srcpkgs/residualvm/patches/fluidsynth-2.1.patch @@ -1,5 +1,5 @@ ---- audio/softsynth/fluidsynth.cpp 2019-10-04 21:41:29.000000000 +0000 -+++ audio/softsynth/fluidsynth.cpp 2020-01-03 08:45:52.431870573 +0000 +--- a/audio/softsynth/fluidsynth.cpp 2019-10-04 21:41:29.000000000 +0000 ++++ b/audio/softsynth/fluidsynth.cpp 2020-01-03 08:45:52.431870573 +0000 @@ -20,10 +20,16 @@ * */ diff --git a/srcpkgs/residualvm/template b/srcpkgs/residualvm/template index 621b40a2752..b0abb4052a9 100644 --- a/srcpkgs/residualvm/template +++ b/srcpkgs/residualvm/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later, BSD-3-Clause, IS homepage="https://www.residualvm.org/" distfiles="https://www.residualvm.org/downloads/release/${version}/residualvm-${version}-sources.tar.bz2" checksum=f50c83bbc55a8121eefc279e83982b6ec590e608e145b7f750006619dd0bf9e9 -patch_args=-Np0 build_options="sndio" build_options_default="sndio" diff --git a/srcpkgs/resvg/patches/QPainterPath.patch b/srcpkgs/resvg/patches/QPainterPath.patch index c18a7aa8e11..870a1be3080 100644 --- a/srcpkgs/resvg/patches/QPainterPath.patch +++ b/srcpkgs/resvg/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- capi/include/ResvgQt.h 2019-03-21 21:50:09.719296805 +0100 -+++ capi/include/ResvgQt.h 2020-09-01 01:20:43.903570695 +0200 +--- a/capi/include/ResvgQt.h 2019-03-21 21:50:09.719296805 +0100 ++++ b/capi/include/ResvgQt.h 2020-09-01 01:20:43.903570695 +0200 @@ -23,6 +23,7 @@ #include #include @@ -8,8 +8,8 @@ #include #include #include ---- resvg-qt/cpp/qt_capi.cpp 2019-03-21 21:50:09.719296805 +0100 -+++ resvg-qt/cpp/qt_capi.cpp 2020-09-01 01:23:19.594578727 +0200 +--- a/resvg-qt/cpp/qt_capi.cpp 2019-03-21 21:50:09.719296805 +0100 ++++ b/resvg-qt/cpp/qt_capi.cpp 2020-09-01 01:23:19.594578727 +0200 @@ -1,6 +1,7 @@ #include #include diff --git a/srcpkgs/resvg/template b/srcpkgs/resvg/template index 5befcd0e4c3..c48e52ae2f2 100644 --- a/srcpkgs/resvg/template +++ b/srcpkgs/resvg/template @@ -11,7 +11,6 @@ license="MPL-2.0" homepage="https://github.com/RazrFalcon/resvg" distfiles="https://github.com/RazrFalcon/resvg/releases/download/v${version}/resvg-${version}.tar.xz" checksum=7206f79f67b4c8610353134c375ed3ff9c5eb63b16fae267b94730c23ebe4ee1 -patch_args=-Np0 do_build() { for dir in capi tools/{render,u}svg; do diff --git a/srcpkgs/retroshare/patches/mhd_result_enum.patch b/srcpkgs/retroshare/patches/mhd_result_enum.patch index 0da034802b7..dbcd974a7f8 100644 --- a/srcpkgs/retroshare/patches/mhd_result_enum.patch +++ b/srcpkgs/retroshare/patches/mhd_result_enum.patch @@ -1,5 +1,5 @@ ---- libresapi/src/api/ApiServerMHD.cpp.orig 2021-05-04 08:25:21.960601037 -0700 -+++ libresapi/src/api/ApiServerMHD.cpp 2021-05-04 08:26:27.071424663 -0700 +--- a/libresapi/src/api/ApiServerMHD.cpp 2021-05-04 08:25:21.960601037 -0700 ++++ b/libresapi/src/api/ApiServerMHD.cpp 2021-05-04 08:26:27.071424663 -0700 @@ -113,7 +113,7 @@ // return MHD_NO to terminate connection // return MHD_YES otherwise @@ -76,8 +76,8 @@ const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) ---- libresapi/src/api/ApiServerMHD.h.orig 2021-05-04 08:25:24.368594515 -0700 -+++ libresapi/src/api/ApiServerMHD.h 2021-05-04 08:25:25.942590251 -0700 +--- a/libresapi/src/api/ApiServerMHD.h 2021-05-04 08:25:24.368594515 -0700 ++++ b/libresapi/src/api/ApiServerMHD.h 2021-05-04 08:25:25.942590251 -0700 @@ -58,11 +58,11 @@ private: diff --git a/srcpkgs/retroshare/patches/qt5.15.patch b/srcpkgs/retroshare/patches/qt5.15.patch index 22253642c44..988e1190411 100644 --- a/srcpkgs/retroshare/patches/qt5.15.patch +++ b/srcpkgs/retroshare/patches/qt5.15.patch @@ -1,5 +1,5 @@ ---- retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp 2019-02-11 15:16:57.000000000 +0100 -+++ - 2020-07-05 00:47:16.416125978 +0200 +--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp 2019-02-11 15:16:57.000000000 +0100 ++++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp 2019-02-11 15:16:57.000000000 +0100 @@ -24,6 +24,7 @@ #include #include @@ -8,8 +8,8 @@ #include #include ---- retroshare-gui/src/gui/gxs/GxsIdDetails.cpp 2019-02-11 15:16:57.000000000 +0100 -+++ - 2020-07-05 00:47:57.366966204 +0200 +--- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp 2019-02-11 15:16:57.000000000 +0100 ++++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp 2019-02-11 15:16:57.000000000 +0100 @@ -30,6 +30,7 @@ #include diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index 3c0685fc053..e65594a4b16 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -16,7 +16,6 @@ license="GPL-2.0-or-later, AGPL-3.0-or-later" homepage="https://retroshare.cc" distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz" checksum=901a1d1f282e04118fbe0e24190355b4a8f355a806cc5448738b1d691b46f5d5 -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/rhythmbox/patches/fix-missing-icons.patch b/srcpkgs/rhythmbox/patches/fix-missing-icons.patch index f86a1b6b2c4..21cb1cf248d 100644 --- a/srcpkgs/rhythmbox/patches/fix-missing-icons.patch +++ b/srcpkgs/rhythmbox/patches/fix-missing-icons.patch @@ -10,8 +10,8 @@ Fixes: #1775 diff --git lib/rb-stock-icons.c lib/rb-stock-icons.c index cf52c7a38..cbc221a7d 100644 ---- lib/rb-stock-icons.c -+++ lib/rb-stock-icons.c +--- a/lib/rb-stock-icons.c ++++ b/lib/rb-stock-icons.c @@ -37,7 +37,7 @@ #include "rb-file-helpers.h" #include "rb-stock-icons.h" @@ -37,8 +37,8 @@ Subject: [PATCH 2/2] use RB_APP_ICON instead of hardcoding icon names diff --git shell/main.c shell/main.c index 5060f6545..7170f29d5 100644 ---- shell/main.c -+++ shell/main.c +--- a/shell/main.c ++++ b/shell/main.c @@ -45,6 +45,7 @@ #include "rb-util.h" #include "rb-debug.h" @@ -58,8 +58,8 @@ index 5060f6545..7170f29d5 100644 g_irepository_prepend_search_path (SHARE_UNINSTALLED_BUILDDIR "/../bindings/gi"); diff --git shell/rb-application.c shell/rb-application.c index 37afb36fb..8492bb03b 100644 ---- shell/rb-application.c -+++ shell/rb-application.c +--- a/shell/rb-application.c ++++ b/shell/rb-application.c @@ -205,7 +205,7 @@ about_action_cb (GSimpleAction *action, GVariant *parameters, gpointer user_data "authors", (const char **) authors, "documenters", (const char **) documenters, diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index eb666718af6..1d229ee9428 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -22,7 +22,6 @@ license="GPL-2.0-or-later" homepage="http://www.rhythmbox.org" distfiles="${GNOME_SITE}/${pkgname}/${version::3}/${pkgname}-${version}.tar.xz" checksum=ee0eb0d7d7bdf696ac9471b19ff3bea3240d63b6cb8a134bf632054af8665d90 -patch_args=-Np0 python_version=3 pycompile_dirs="/usr/lib/rhythmbox/plugins /usr/lib/rhythmbox/sample-plugins" diff --git a/srcpkgs/rinse/patches/fix-tests.patch b/srcpkgs/rinse/patches/fix-tests.patch index 7a4ff0e63c8..041421b6364 100644 --- a/srcpkgs/rinse/patches/fix-tests.patch +++ b/srcpkgs/rinse/patches/fix-tests.patch @@ -2,8 +2,8 @@ Source: maxice8 Upstream: no (feel free to) Reason: fixes test for tab chars ---- scripts/opensuse-11.1/post-install.sh -+++ scripts/opensuse-11.1/post-install.sh +--- a/scripts/opensuse-11.1/post-install.sh ++++ b/scripts/opensuse-11.1/post-install.sh @@ -42,8 +42,8 @@ gpgcheck=1 EOF @@ -15,8 +15,8 @@ Reason: fixes test for tab chars fi ---- scripts/opensuse-11.2/post-install.sh -+++ scripts/opensuse-11.2/post-install.sh +--- a/scripts/opensuse-11.2/post-install.sh ++++ b/scripts/opensuse-11.2/post-install.sh @@ -60,8 +60,8 @@ gpgcheck=1 EOF @@ -28,8 +28,8 @@ Reason: fixes test for tab chars fi ---- scripts/opensuse-11.3/post-install.sh -+++ scripts/opensuse-11.3/post-install.sh +--- a/scripts/opensuse-11.3/post-install.sh ++++ b/scripts/opensuse-11.3/post-install.sh @@ -39,8 +39,8 @@ gpgcheck=1 EOF @@ -41,8 +41,8 @@ Reason: fixes test for tab chars fi ---- scripts/opensuse-12.3/post-install.sh -+++ scripts/opensuse-12.3/post-install.sh +--- a/scripts/opensuse-12.3/post-install.sh ++++ b/scripts/opensuse-12.3/post-install.sh @@ -38,8 +38,8 @@ gpgcheck=1 EOF @@ -54,8 +54,8 @@ Reason: fixes test for tab chars fi ---- scripts/opensuse-13.1/post-install.sh -+++ scripts/opensuse-13.1/post-install.sh +--- a/scripts/opensuse-13.1/post-install.sh ++++ b/scripts/opensuse-13.1/post-install.sh @@ -38,8 +38,8 @@ gpgcheck=1 EOF @@ -67,8 +67,8 @@ Reason: fixes test for tab chars fi ---- scripts/centos-7/post-install.sh -+++ scripts/centos-7/post-install.sh +--- a/scripts/centos-7/post-install.sh ++++ b/scripts/centos-7/post-install.sh @@ -39,8 +39,8 @@ install -m 600 /dev/null $prefix/var/log/tallylog cd $prefix/var/log @@ -80,8 +80,8 @@ Reason: fixes test for tab chars done cd / touch $prefix/var/log/lastlog ---- scripts/opensuse-42.2/post-install.sh -+++ scripts/opensuse-42.2/post-install.sh +--- a/scripts/opensuse-42.2/post-install.sh ++++ b/scripts/opensuse-42.2/post-install.sh @@ -38,8 +38,8 @@ gpgcheck=1 EOF diff --git a/srcpkgs/rinse/patches/sbin.patch b/srcpkgs/rinse/patches/sbin.patch index 112e9320425..724f7280ddc 100644 --- a/srcpkgs/rinse/patches/sbin.patch +++ b/srcpkgs/rinse/patches/sbin.patch @@ -1,5 +1,5 @@ ---- Makefile 2014-06-17 21:16:29.000000000 +0700 -+++ Makefile 2015-10-19 11:45:52.398805700 +0600 +--- a/Makefile 2014-06-17 21:16:29.000000000 +0700 ++++ b/Makefile 2015-10-19 11:45:52.398805700 +0600 @@ -52,15 +52,15 @@ install: fixupperms mkdir -p ${PREFIX}/etc/bash_completion.d diff --git a/srcpkgs/rinse/template b/srcpkgs/rinse/template index 54d42aaa68c..27d6d0acd2f 100644 --- a/srcpkgs/rinse/template +++ b/srcpkgs/rinse/template @@ -15,7 +15,6 @@ homepage="https://salsa.debian.org/debian/rinse" changelog="https://salsa.debian.org/debian/rinse/raw/master/debian/changelog" distfiles="https://salsa.debian.org/debian/rinse/-/archive/${version}/rinse-${version}.tar.gz" checksum=ebe2384f2aa4565c5f29882b177f7afd4c7cdbca9de9525618c6040e63a76d23 -patch_args=-Np0 conf_files="/etc/rinse/rinse.conf" diff --git a/srcpkgs/rix/patches/fixes.patch b/srcpkgs/rix/patches/fixes.patch index f9622fb7de1..29d89f503f8 100644 --- a/srcpkgs/rix/patches/fixes.patch +++ b/srcpkgs/rix/patches/fixes.patch @@ -1,5 +1,5 @@ ---- rixc.h.orig -+++ rixc.h +--- a/rixc.h ++++ b/rixc.h @@ -15,6 +15,7 @@ void defineRSLSymbols(Object *); @@ -8,8 +8,8 @@ Object *findByName(char *name); Object *findFunctionByFullName(char *name); ---- rix.l.orig -+++ rix.l +--- a/rix.l ++++ b/rix.l @@ -5,7 +5,7 @@ #include "ObjectTree.h" #include "rix.tab.h" /* Generated by bison. */ diff --git a/srcpkgs/rix/patches/makefile.patch b/srcpkgs/rix/patches/makefile.patch index 7dbb2006431..8f1bb39eb79 100644 --- a/srcpkgs/rix/patches/makefile.patch +++ b/srcpkgs/rix/patches/makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -7,7 +7,7 @@ flex rix.l diff --git a/srcpkgs/rix/patches/overflow.patch b/srcpkgs/rix/patches/overflow.patch index d57b727150f..d9ff4c03d0d 100644 --- a/srcpkgs/rix/patches/overflow.patch +++ b/srcpkgs/rix/patches/overflow.patch @@ -1,5 +1,5 @@ ---- rixc.c.orig -+++ rixc.c +--- a/rixc.c ++++ b/rixc.c @@ -1563,7 +1563,7 @@ Object *objectfloat(float f) { diff --git a/srcpkgs/rix/template b/srcpkgs/rix/template index 9c1f78cbbe0..23d16e5e2da 100644 --- a/srcpkgs/rix/template +++ b/srcpkgs/rix/template @@ -10,7 +10,6 @@ license="GPL-3" homepage="https://github.com/riolet/rix" distfiles="https://github.com/riolet/rix/archive/v${version}.tar.gz" checksum=8727fee17cbbecec3ca8083fac80db3a2ed234c8128ec8df5cc56293e1dbb09c -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/rmilter/patches/de-vendor.patch b/srcpkgs/rmilter/patches/de-vendor.patch index 078b15d4e66..ac1d09f0b35 100644 --- a/srcpkgs/rmilter/patches/de-vendor.patch +++ b/srcpkgs/rmilter/patches/de-vendor.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -240,10 +240,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR} "${CMAKE_BINARY_DIR}/src" "${CMAKE_BINARY_DIR}/" diff --git a/srcpkgs/rmilter/patches/fix-cflags.patch b/srcpkgs/rmilter/patches/fix-cflags.patch index 7983764ecf9..df213a65dd7 100644 --- a/srcpkgs/rmilter/patches/fix-cflags.patch +++ b/srcpkgs/rmilter/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -296,18 +296,7 @@ IF(SUPPORT_STD_FLAG) ENDIF(SUPPORT_STD_FLAG) diff --git a/srcpkgs/rmilter/template b/srcpkgs/rmilter/template index cf0ebd53e35..0c2e00b5169 100644 --- a/srcpkgs/rmilter/template +++ b/srcpkgs/rmilter/template @@ -17,7 +17,6 @@ checksum=ea80563fa7636afed0b5fd9a29aa2300f15793ed85788e4ce69c187d341a7d54 system_accounts="rmilter" rmilter_pgroup="_rmilter" rmilter_homedir="/var/lib/rmilter" -patch_args=-Np0 post_install() { vdoc rmilter.conf.sample diff --git a/srcpkgs/rmlint/patches/faccessat.patch b/srcpkgs/rmlint/patches/faccessat.patch index 6655670dfaf..accdefb8d2f 100644 --- a/srcpkgs/rmlint/patches/faccessat.patch +++ b/srcpkgs/rmlint/patches/faccessat.patch @@ -14,8 +14,8 @@ Subject: [PATCH] remove faccessat() (fixes #438) diff --git a/SConstruct b/SConstruct index 5c905eee..53455ab6 100755 ---- SConstruct -+++ SConstruct +--- a/SConstruct ++++ b/SConstruct @@ -264,29 +264,6 @@ def check_posix_fadvise(context): return rc @@ -64,8 +64,8 @@ index 5c905eee..53455ab6 100755 conf.check_uname() diff --git a/lib/SConscript b/lib/SConscript index 04f5da91..e00231dd 100644 ---- lib/SConscript -+++ lib/SConscript +--- a/lib/SConscript ++++ b/lib/SConscript @@ -37,7 +37,6 @@ def build_config_template(target, source, env): HAVE_BTRFS_H=env['HAVE_BTRFS_H'], HAVE_MM_CRC32_U64=env['HAVE_MM_CRC32_U64'], @@ -76,8 +76,8 @@ index 04f5da91..e00231dd 100644 VERSION_MAJOR=VERSION_MAJOR, diff --git a/lib/cfg.c b/lib/cfg.c index 92b02136..114ea780 100644 ---- lib/cfg.c -+++ lib/cfg.c +--- a/lib/cfg.c ++++ b/lib/cfg.c @@ -106,18 +106,28 @@ void rm_cfg_set_default(RmCfg *cfg) { } @@ -119,8 +119,8 @@ index 92b02136..114ea780 100644 bool realpath_worked = true; diff --git a/lib/config.h.in b/lib/config.h.in index a12fa65a..30025171 100644 ---- lib/config.h.in -+++ lib/config.h.in +--- a/lib/config.h.in ++++ b/lib/config.h.in @@ -20,7 +20,6 @@ #define HAVE_POSIX_FADVISE ({HAVE_POSIX_FADVISE}) #define HAVE_BTRFS_H ({HAVE_BTRFS_H}) @@ -133,7 +133,7 @@ diff --git a/tests/test_robustness/test_badlinks_as_args.py b/tests/test_robustn new file mode 100644 index 00000000..981e1a00 --- /dev/null -+++ tests/test_robustness/test_badlinks_as_args.py ++++ b/tests/test_robustness/test_badlinks_as_args.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python3 +# encoding: utf-8 diff --git a/srcpkgs/rmlint/template b/srcpkgs/rmlint/template index 5cd23e3659e..52b0a13cfad 100644 --- a/srcpkgs/rmlint/template +++ b/srcpkgs/rmlint/template @@ -12,7 +12,6 @@ homepage="http://rmlint.rtfd.org/" changelog="https://raw.githubusercontent.com/sahib/rmlint/master/CHANGELOG.md" distfiles="https://github.com/sahib/${pkgname}/archive/v${version}.tar.gz" checksum=10e72ba4dd9672d1b6519c0c94eae647c5069c7d11f1409a46e7011dd0c6b883 -patch_args=-Np0 do_install() { scons install --prefix=${DESTDIR}/usr diff --git a/srcpkgs/rofs-filtered/patches/fix-cflags.patch b/srcpkgs/rofs-filtered/patches/fix-cflags.patch index b77600f6678..b9ce0053154 100644 --- a/srcpkgs/rofs-filtered/patches/fix-cflags.patch +++ b/srcpkgs/rofs-filtered/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PA "${CMAKE_CURRENT_SOURCE_DIR}/cmake") diff --git a/srcpkgs/rofs-filtered/template b/srcpkgs/rofs-filtered/template index 3ad1be74b36..2bb8a230431 100644 --- a/srcpkgs/rofs-filtered/template +++ b/srcpkgs/rofs-filtered/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="https://github.com/gburca/rofs-filtered" distfiles="https://github.com/gburca/rofs-filtered/archive/rel-${version}.tar.gz" checksum=d66066dfd0274a2fb7b71dd929445377dd23100b9fa43e3888dbe3fc7e8228e8 -patch_args=-Np0 diff --git a/srcpkgs/rpcbind/patches/musl-sunrpc.patch b/srcpkgs/rpcbind/patches/musl-sunrpc.patch index 03b9e84c438..d8a2e27e244 100644 --- a/srcpkgs/rpcbind/patches/musl-sunrpc.patch +++ b/srcpkgs/rpcbind/patches/musl-sunrpc.patch @@ -3,8 +3,8 @@ aliases. As a workaround we use "sunprc" instead of "portmapper" diff --git a/src/rpcbind.c b/src/rpcbind.c index 83dbe93..9404df7 100644 ---- src/rpcbind.c -+++ src/rpcbind.c +--- a/src/rpcbind.c ++++ b/src/rpcbind.c @@ -416,7 +416,7 @@ init_transport(struct netconfig *nconf) if ((aicode = getaddrinfo(hosts[nhostsbak], servname, &hints, &res)) != 0) { diff --git a/srcpkgs/rpcbind/patches/rpcbind-sunrpc.patch b/srcpkgs/rpcbind/patches/rpcbind-sunrpc.patch index 518095c4ec4..9724a302770 100644 --- a/srcpkgs/rpcbind/patches/rpcbind-sunrpc.patch +++ b/srcpkgs/rpcbind/patches/rpcbind-sunrpc.patch @@ -1,5 +1,5 @@ ---- src/rpcbind.c 2015-04-27 16:07:43.000000000 +0200 -+++ src/rpcbind.c 2015-04-27 19:48:44.518124944 +0200 +--- a/src/rpcbind.c 2015-04-27 16:07:43.000000000 +0200 ++++ b/src/rpcbind.c 2015-04-27 19:48:44.518124944 +0200 @@ -132,7 +132,7 @@ char *udp_uaddr; /* Universal UDP address */ char *tcp_uaddr; /* Universal TCP address */ diff --git a/srcpkgs/rpcbind/template b/srcpkgs/rpcbind/template index 48adb776b70..2909a0827fb 100644 --- a/srcpkgs/rpcbind/template +++ b/srcpkgs/rpcbind/template @@ -14,7 +14,6 @@ homepage="https://rpcbind.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de system_accounts="rpc" -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/rpi-imager/patches/disable-telemetry.patch b/srcpkgs/rpi-imager/patches/disable-telemetry.patch index 87dce16a58c..6bf6205ee23 100644 --- a/srcpkgs/rpi-imager/patches/disable-telemetry.patch +++ b/srcpkgs/rpi-imager/patches/disable-telemetry.patch @@ -1,5 +1,5 @@ ---- config.h.orig 2021-03-16 12:22:48.315849306 -0500 -+++ config.h 2021-03-16 12:23:00.273828304 -0500 +--- a/config.h 2021-03-16 12:22:48.315849306 -0500 ++++ b/config.h 2021-03-16 12:23:00.273828304 -0500 @@ -15,7 +15,7 @@ /* Phone home the name of images downloaded for image popularity ranking */ diff --git a/srcpkgs/rpi-imager/template b/srcpkgs/rpi-imager/template index 133b762f6e8..e48f0312e16 100644 --- a/srcpkgs/rpi-imager/template +++ b/srcpkgs/rpi-imager/template @@ -13,7 +13,6 @@ license="Apache-2.0" homepage="https://github.com/raspberrypi/rpi-imager" distfiles="https://github.com/raspberrypi/rpi-imager/archive/${version}.tar.gz" checksum="166d4926ab5a21f9a83096eff67a9a72f1a7f55702a36cb448cccf5f3b075509" -patch_args=-Np0 pre_configure() { ln -sf /bin/true $XBPS_WRAPPERDIR/lsblk diff --git a/srcpkgs/rpm/patches/fix-musl.patch b/srcpkgs/rpm/patches/fix-musl.patch index b4f6f7b5ba4..3bf351392d8 100644 --- a/srcpkgs/rpm/patches/fix-musl.patch +++ b/srcpkgs/rpm/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -229,6 +229,7 @@ AC_SEARCH_LIBS(dlopen, [dl]) # Check for libelf library. Prefer external, otherwise none. WITH_LIBELF_LIB= @@ -19,8 +19,8 @@ WITH_LIBDWARF=yes diff --git rpmio/digest_nss.c rpmio/digest_nss.c index 992d9ac..5f43b57 100644 ---- rpmio/digest_nss.c -+++ rpmio/digest_nss.c +--- a/rpmio/digest_nss.c ++++ b/rpmio/digest_nss.c @@ -6,6 +6,7 @@ #include #include diff --git a/srcpkgs/rpm/template b/srcpkgs/rpm/template index dc410169878..9f6f522b9a3 100644 --- a/srcpkgs/rpm/template +++ b/srcpkgs/rpm/template @@ -18,7 +18,6 @@ distfiles="http://ftp.rpm.org/releases/rpm-4.16.x/rpm-${version}.tar.bz2" checksum=513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d python_version=3 conflicts="rpmextract>=0" # Both provide rpm2cpio -patch_args=-Np0 CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/nss" diff --git a/srcpkgs/rspamd/patches/vsx.patch b/srcpkgs/rspamd/patches/vsx.patch index 3d36de79cd2..ebcead9bdb9 100644 --- a/srcpkgs/rspamd/patches/vsx.patch +++ b/srcpkgs/rspamd/patches/vsx.patch @@ -6,8 +6,8 @@ Date: Mon Jan 6 00:48:43 2020 +0100 diff --git contrib/lua-torch/torch7/lib/TH/THVector.c contrib/lua-torch/torch7/lib/TH/THVector.c index 4410578..c972b13 100644 ---- contrib/lua-torch/torch7/lib/TH/THVector.c -+++ contrib/lua-torch/torch7/lib/TH/THVector.c +--- a/contrib/lua-torch/torch7/lib/TH/THVector.c ++++ b/contrib/lua-torch/torch7/lib/TH/THVector.c @@ -6,7 +6,7 @@ #include "vector/NEON.c" #endif @@ -19,8 +19,8 @@ index 4410578..c972b13 100644 diff --git contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c index 5b88852..8ab4f67 100644 ---- contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c -+++ contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c +--- a/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c ++++ b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c @@ -20,7 +20,7 @@ static FunctionDescription THVector_(fill_DISPATCHTABLE)[] = { #endif #endif @@ -50,8 +50,8 @@ index 5b88852..8ab4f67 100644 #endif diff --git contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h index 83c4c56..0919f73 100644 ---- contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h -+++ contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h +--- a/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h ++++ b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h @@ -43,7 +43,7 @@ enum SIMDExtensions { #if defined(__NEON__) diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template index dca49ec662f..7398b753622 100644 --- a/srcpkgs/rspamd/template +++ b/srcpkgs/rspamd/template @@ -19,7 +19,6 @@ checksum=e4720c1f45defd07dd17b9563d0ddc480c70beadbc1a833235c077960092e030 system_accounts="rspamd" rspamd_homedir=/var/lib/rspamd conf_files="/etc/rspamd/*.conf /etc/rspamd/*.inc /etc/rspamd/modules.d/*.conf" -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in aarch64*|arm*) configure_args+=" -DHAS_C11_ATOMICS_EXITCODE=0 diff --git a/srcpkgs/rsstail/patches/fix-1779.patch b/srcpkgs/rsstail/patches/fix-1779.patch index 5792a9df41a..ff9bd851c12 100644 --- a/srcpkgs/rsstail/patches/fix-1779.patch +++ b/srcpkgs/rsstail/patches/fix-1779.patch @@ -1,5 +1,5 @@ ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -2,8 +2,7 @@ -DEBUG=-g diff --git a/srcpkgs/rsstail/template b/srcpkgs/rsstail/template index 1cfc4cdff30..40a3d84ed70 100644 --- a/srcpkgs/rsstail/template +++ b/srcpkgs/rsstail/template @@ -11,7 +11,6 @@ license="GPL-2.0-only" homepage="http://www.vanheusden.com/rsstail/" distfiles="http://www.vanheusden.com/${pkgname}/${pkgname}-${version}.tgz" checksum=42cb452178b21c15c470bafbe5b8b5339a7fb5b980bf8d93d36af89864776e71 -patch_args=-Np0 do_install() { vmkdir usr/bin diff --git a/srcpkgs/rstudio/patches/0001-Check-for-group_member-in-cmake.patch b/srcpkgs/rstudio/patches/0001-Check-for-group_member-in-cmake.patch index fa127ee137b..55283d48780 100644 --- a/srcpkgs/rstudio/patches/0001-Check-for-group_member-in-cmake.patch +++ b/srcpkgs/rstudio/patches/0001-Check-for-group_member-in-cmake.patch @@ -14,8 +14,8 @@ is a nonstandard GNU extension diff --git src/cpp/core/CMakeLists.txt src/cpp/core/CMakeLists.txt index 7395ff24ee..8cd1080ae8 100644 ---- src/cpp/core/CMakeLists.txt -+++ src/cpp/core/CMakeLists.txt +--- a/src/cpp/core/CMakeLists.txt ++++ b/src/cpp/core/CMakeLists.txt @@ -155,6 +155,7 @@ if (UNIX) check_function_exists(inotify_init1 HAVE_INOTIFY_INIT1) check_function_exists(getpeereid HAVE_GETPEEREID) @@ -26,8 +26,8 @@ index 7395ff24ee..8cd1080ae8 100644 endif() diff --git src/cpp/core/config.h.in src/cpp/core/config.h.in index fbf5e6ffa3..cb4ef42be0 100644 ---- src/cpp/core/config.h.in -+++ src/cpp/core/config.h.in +--- a/src/cpp/core/config.h.in ++++ b/src/cpp/core/config.h.in @@ -24,4 +24,5 @@ #cmakedefine HAVE_PROCSELF #cmakedefine HAVE_SETRESUID @@ -36,8 +36,8 @@ index fbf5e6ffa3..cb4ef42be0 100644 #cmakedefine RSTUDIO_SERVER diff --git src/cpp/core/r_util/RSessionContext.cpp src/cpp/core/r_util/RSessionContext.cpp index a973b8b816..e36d661fd8 100644 ---- src/cpp/core/r_util/RSessionContext.cpp -+++ src/cpp/core/r_util/RSessionContext.cpp +--- a/src/cpp/core/r_util/RSessionContext.cpp ++++ b/src/cpp/core/r_util/RSessionContext.cpp @@ -182,7 +182,7 @@ bool isSharedPath(const std::string& projectPath, if (st.st_gid == user.getGroupId()) return false; diff --git a/srcpkgs/rstudio/patches/0002-Check-for-backtrace-function-in-cmake.patch b/srcpkgs/rstudio/patches/0002-Check-for-backtrace-function-in-cmake.patch index 1dc74100ec9..b214df88a7b 100644 --- a/srcpkgs/rstudio/patches/0002-Check-for-backtrace-function-in-cmake.patch +++ b/srcpkgs/rstudio/patches/0002-Check-for-backtrace-function-in-cmake.patch @@ -11,8 +11,8 @@ Subject: [PATCH 2/3] Check for backtrace function in cmake diff --git src/cpp/core/Backtrace.cpp src/cpp/core/Backtrace.cpp index a345648371..def1189eb0 100644 ---- src/cpp/core/Backtrace.cpp -+++ src/cpp/core/Backtrace.cpp +--- a/src/cpp/core/Backtrace.cpp ++++ b/src/cpp/core/Backtrace.cpp @@ -16,7 +16,9 @@ #include #include @@ -44,8 +44,8 @@ index a345648371..def1189eb0 100644 diff --git src/cpp/core/CMakeLists.txt src/cpp/core/CMakeLists.txt index 8cd1080ae8..9a18bcae77 100644 ---- src/cpp/core/CMakeLists.txt -+++ src/cpp/core/CMakeLists.txt +--- a/src/cpp/core/CMakeLists.txt ++++ b/src/cpp/core/CMakeLists.txt @@ -156,6 +156,7 @@ if (UNIX) check_function_exists(getpeereid HAVE_GETPEEREID) check_function_exists(setresuid HAVE_SETRESUID) @@ -56,8 +56,8 @@ index 8cd1080ae8..9a18bcae77 100644 endif() diff --git src/cpp/core/config.h.in src/cpp/core/config.h.in index cb4ef42be0..a2ec47c51f 100644 ---- src/cpp/core/config.h.in -+++ src/cpp/core/config.h.in +--- a/src/cpp/core/config.h.in ++++ b/src/cpp/core/config.h.in @@ -25,4 +25,5 @@ #cmakedefine HAVE_SETRESUID #cmakedefine HAVE_SCANDIR_POSIX diff --git a/srcpkgs/rstudio/patches/0003-Include-unistd.h-instead-of-sys-unistd.h.patch b/srcpkgs/rstudio/patches/0003-Include-unistd.h-instead-of-sys-unistd.h.patch index 4c73b0fb19d..a6940d83789 100644 --- a/srcpkgs/rstudio/patches/0003-Include-unistd.h-instead-of-sys-unistd.h.patch +++ b/srcpkgs/rstudio/patches/0003-Include-unistd.h-instead-of-sys-unistd.h.patch @@ -1,5 +1,5 @@ ---- src/cpp/shared_core/FilePath.cpp 2021-02-11 00:26:02.000000000 +0100 -+++ - 2021-05-30 14:54:08.125365587 +0200 +--- a/src/cpp/shared_core/FilePath.cpp 2021-02-11 00:26:02.000000000 +0100 ++++ b/src/cpp/shared_core/FilePath.cpp 2021-02-11 00:26:02.000000000 +0100 @@ -36,7 +36,7 @@ #include #else diff --git a/srcpkgs/rstudio/patches/0004-unbundle-pandoc-mathjax.patch b/srcpkgs/rstudio/patches/0004-unbundle-pandoc-mathjax.patch index 466d06353ef..4d7608ad8fa 100644 --- a/srcpkgs/rstudio/patches/0004-unbundle-pandoc-mathjax.patch +++ b/srcpkgs/rstudio/patches/0004-unbundle-pandoc-mathjax.patch @@ -12,8 +12,8 @@ instead. diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt index cb45b35ecc..d0b41b13d2 100644 ---- src/cpp/session/CMakeLists.txt -+++ src/cpp/session/CMakeLists.txt +--- a/src/cpp/session/CMakeLists.txt ++++ b/src/cpp/session/CMakeLists.txt @@ -22,13 +22,13 @@ add_subdirectory(workers) if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries") message(FATAL_ERROR "Dictionaries not found (re-run install-dependencies script to install)") diff --git a/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch b/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch index 9a08176db4c..2532a3ca8db 100644 --- a/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch +++ b/srcpkgs/rstudio/patches/0005-don-t-install-mathjax-pandoc.patch @@ -11,8 +11,8 @@ the files. diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt index d0b41b13d2..69d6cb2b2b 100644 ---- src/cpp/session/CMakeLists.txt -+++ src/cpp/session/CMakeLists.txt +--- a/src/cpp/session/CMakeLists.txt ++++ b/src/cpp/session/CMakeLists.txt @@ -534,10 +534,6 @@ if (NOT RSTUDIO_SESSION_WIN32) install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries" DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") diff --git a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch b/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch index 406c6d602f1..d1ce2c20f97 100644 --- a/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch +++ b/srcpkgs/rstudio/patches/0006-Fix-rstudio-exec-path.patch @@ -10,8 +10,8 @@ Fix the path to the rstudio executable in the rstudio.desktop file. diff --git a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in index ddd96ad34b..99b207ba7c 100644 ---- src/cpp/desktop/resources/freedesktop/rstudio.desktop.in -+++ src/cpp/desktop/resources/freedesktop/rstudio.desktop.in +--- a/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in ++++ b/src/cpp/desktop/resources/freedesktop/rstudio.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=${CMAKE_INSTALL_PREFIX}/${RSTUDIO_INSTALL_BIN}/rstudio %F diff --git a/srcpkgs/rstudio/patches/0006-use-system-node.patch b/srcpkgs/rstudio/patches/0006-use-system-node.patch index 00c2927320c..aa3c42c8dfd 100644 --- a/srcpkgs/rstudio/patches/0006-use-system-node.patch +++ b/srcpkgs/rstudio/patches/0006-use-system-node.patch @@ -9,8 +9,8 @@ Subject: [PATCH 7/8] use system node diff --git a/src/gwt/build.xml b/src/gwt/build.xml index 899ae7fecd..ac90566667 100644 ---- src/gwt/build.xml -+++ src/gwt/build.xml +--- a/src/gwt/build.xml ++++ b/src/gwt/build.xml @@ -82,19 +82,7 @@ diff --git a/srcpkgs/rstudio/patches/boost173.patch b/srcpkgs/rstudio/patches/boost173.patch index ab3f301d806..24ae1dff66d 100644 --- a/srcpkgs/rstudio/patches/boost173.patch +++ b/srcpkgs/rstudio/patches/boost173.patch @@ -1,5 +1,5 @@ ---- src/cpp/core/system/PosixChildProcessTracker.cpp 2020-04-01 18:16:24.000000000 +0200 -+++ - 2020-05-01 18:29:14.359052359 +0200 +--- a/src/cpp/core/system/PosixChildProcessTracker.cpp 2020-04-01 18:16:24.000000000 +0200 ++++ b/src/cpp/core/system/PosixChildProcessTracker.cpp 2020-04-01 18:16:24.000000000 +0200 @@ -60,7 +60,7 @@ std::for_each(processes.begin(), processes.end(), @@ -9,8 +9,8 @@ } void ChildProcessTracker::attemptToReapProcess( ---- src/cpp/core/system/PosixOutputCapture.cpp 2021-02-11 00:26:02.000000000 +0100 -+++ - 2021-05-30 14:55:58.926536572 +0200 +--- a/src/cpp/core/system/PosixOutputCapture.cpp 2021-02-11 00:26:02.000000000 +0100 ++++ b/src/cpp/core/system/PosixOutputCapture.cpp 2021-02-11 00:26:02.000000000 +0100 @@ -104,13 +104,13 @@ if (dupStdoutFd != -1) { @@ -27,8 +27,8 @@ } try ---- src/cpp/core/HtmlUtils.cpp 2021-05-30 15:23:37.948407527 +0200 -+++ - 2021-05-30 15:28:55.005591660 +0200 +--- a/src/cpp/core/HtmlUtils.cpp 2021-05-30 15:23:37.948407527 +0200 ++++ b/src/cpp/core/HtmlUtils.cpp 2021-05-30 15:23:37.948407527 +0200 @@ -56,7 +56,7 @@ : boost::iostreams::regex_filter( boost::regex( @@ -47,8 +47,8 @@ basePath_(basePath) { } ---- src/cpp/r/session/RStdCallbacks.cpp 2021-02-11 00:26:02.000000000 +0100 -+++ - 2021-05-30 15:38:43.302067745 +0200 +--- a/src/cpp/r/session/RStdCallbacks.cpp 2021-02-11 00:26:02.000000000 +0100 ++++ b/src/cpp/r/session/RStdCallbacks.cpp 2021-02-11 00:26:02.000000000 +0100 @@ -577,7 +577,7 @@ try { diff --git a/srcpkgs/rstudio/patches/boost176.patch b/srcpkgs/rstudio/patches/boost176.patch index 13d2384d645..ea161d34fe3 100644 --- a/srcpkgs/rstudio/patches/boost176.patch +++ b/srcpkgs/rstudio/patches/boost176.patch @@ -1,5 +1,5 @@ ---- src/cpp/core/HtmlUtils.cpp 2021-02-11 00:26:02.000000000 +0100 -+++ - 2021-05-30 15:22:51.562342921 +0200 +--- a/src/cpp/core/HtmlUtils.cpp 2021-02-11 00:26:02.000000000 +0100 ++++ b/src/cpp/core/HtmlUtils.cpp 2021-02-11 00:26:02.000000000 +0100 @@ -17,6 +17,7 @@ #include @@ -8,8 +8,8 @@ #include #include ---- src/cpp/core/file_lock/FileLock.cpp 2021-02-11 00:26:02.000000000 +0100 -+++ - 2021-05-30 15:31:26.292309685 +0200 +--- a/src/cpp/core/file_lock/FileLock.cpp 2021-02-11 00:26:02.000000000 +0100 ++++ b/src/cpp/core/file_lock/FileLock.cpp 2021-02-11 00:26:02.000000000 +0100 @@ -26,6 +26,7 @@ #include #include diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index f7ac44c86ec..dcd1f125531 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -28,7 +28,6 @@ checksum="ac84f77529501ea13f0708f0e8726b0bdfb592cd9217e869a0099031f9a888b8 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7" skip_extraction="core-dictionaries.zip" -patch_args=-Np0 LDFLAGS="-Wl,-z,stack-size=2097152" diff --git a/srcpkgs/rsyslog/patches/musl-glob.patch b/srcpkgs/rsyslog/patches/musl-glob.patch index fa3eb23753d..697d186199b 100644 --- a/srcpkgs/rsyslog/patches/musl-glob.patch +++ b/srcpkgs/rsyslog/patches/musl-glob.patch @@ -1,5 +1,5 @@ ---- plugins/imfile/imfile.c.orig 2016-11-15 17:31:37.446892834 +0000 -+++ plugins/imfile/imfile.c 2016-11-15 17:34:49.629902749 +0000 +--- a/plugins/imfile/imfile.c 2016-11-15 17:31:37.446892834 +0000 ++++ b/plugins/imfile/imfile.c 2016-11-15 17:34:49.629902749 +0000 @@ -34,6 +34,9 @@ #include #include diff --git a/srcpkgs/rsyslog/patches/musl.patch b/srcpkgs/rsyslog/patches/musl.patch index ced83984bae..5fe416aaad3 100644 --- a/srcpkgs/rsyslog/patches/musl.patch +++ b/srcpkgs/rsyslog/patches/musl.patch @@ -1,5 +1,5 @@ ---- tools/omfile.c.orig 2015-05-23 03:55:37.960658341 +0200 -+++ tools/omfile.c 2015-05-23 03:55:53.471816125 +0200 +--- a/tools/omfile.c 2015-05-23 03:55:37.960658341 +0200 ++++ b/tools/omfile.c 2015-05-23 03:55:53.471816125 +0200 @@ -47,6 +47,7 @@ #include #include diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 8c5b041d218..33c55076e9b 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -23,7 +23,6 @@ conf_files="/etc/rsyslog.conf" make_dirs="/etc/rsyslog.d 0755 root root" lib32disabled=yes disable_parallel_build=yes -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/rtl8812au-dkms/patches/0001-void-arch-generic-plumbing-bits.patch b/srcpkgs/rtl8812au-dkms/patches/0001-void-arch-generic-plumbing-bits.patch index 48a7314e8c4..d8f85aa33b4 100644 --- a/srcpkgs/rtl8812au-dkms/patches/0001-void-arch-generic-plumbing-bits.patch +++ b/srcpkgs/rtl8812au-dkms/patches/0001-void-arch-generic-plumbing-bits.patch @@ -9,8 +9,8 @@ Subject: [PATCH] void arch-generic plumbing bits diff --git Makefile Makefile index c7d11ed..4529ac8 100755 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -111,7 +111,8 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y ###################### MP HW TX MODE FOR VHT ####################### CONFIG_MP_VHT_HW_TX_MODE = n diff --git a/srcpkgs/rtl8812au-dkms/template b/srcpkgs/rtl8812au-dkms/template index 062aa1bebe2..0dedc560b81 100644 --- a/srcpkgs/rtl8812au-dkms/template +++ b/srcpkgs/rtl8812au-dkms/template @@ -13,7 +13,6 @@ homepage="http://www.dlink.com" distfiles="https://github.com/gordboy/rtl8812au-${_modver}/archive/${_gitrev}.tar.gz" checksum=72b04bb7e1ef01eae653222d6f75f71163f7442fa142198605ed495f30341bd9 dkms_modules="rtl8812au ${_modver}" -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in x86_64*) _karch="x86_64";; diff --git a/srcpkgs/rtl8822bu-dkms/patches/0001-void-arch-generic-plumbing-bits.patch b/srcpkgs/rtl8822bu-dkms/patches/0001-void-arch-generic-plumbing-bits.patch index 9cf2b84d760..5d11ea074fd 100644 --- a/srcpkgs/rtl8822bu-dkms/patches/0001-void-arch-generic-plumbing-bits.patch +++ b/srcpkgs/rtl8822bu-dkms/patches/0001-void-arch-generic-plumbing-bits.patch @@ -9,8 +9,8 @@ Subject: [PATCH] void arch-generic plumbing bits diff --git Makefile Makefile index 29da0bf..d58bc95 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -97,7 +97,8 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y ###################### MP HW TX MODE FOR VHT ####################### CONFIG_MP_VHT_HW_TX_MODE = n diff --git a/srcpkgs/rtl8822bu-dkms/template b/srcpkgs/rtl8822bu-dkms/template index d994f402b2d..548d0b6299c 100644 --- a/srcpkgs/rtl8822bu-dkms/template +++ b/srcpkgs/rtl8822bu-dkms/template @@ -12,7 +12,6 @@ homepage="https://www.tp-link.com" distfiles="https://github.com/EntropicEffect/rtl8822bu/archive/${_gitrev}.tar.gz" checksum=fb2dbcd0385d558af6c74571aaac9020d7cbb9e56cc4780299bd420559f29bb1 dkms_modules="88x2bu ${version}" -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in x86_64*) _karch="x86_64";; diff --git a/srcpkgs/rtmpdump/patches/fix-chunk-size.patch b/srcpkgs/rtmpdump/patches/fix-chunk-size.patch index 880c9af156e..b0db892ff31 100644 --- a/srcpkgs/rtmpdump/patches/fix-chunk-size.patch +++ b/srcpkgs/rtmpdump/patches/fix-chunk-size.patch @@ -1,5 +1,5 @@ ---- librtmp/rtmp.c -+++ librtmp/rtmp.c +--- a/librtmp/rtmp.c ++++ b/librtmp/rtmp.c @@ -2077,6 +2077,29 @@ RTMP_SendClientBW(RTMP *r) } diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template index aa3efa2397c..911122cc807 100644 --- a/srcpkgs/rtmpdump/template +++ b/srcpkgs/rtmpdump/template @@ -11,7 +11,6 @@ license="GPL-2, LGPL-2.1" homepage="http://rtmpdump.mplayerhq.hu/" distfiles="https://alpha.de.repo.voidlinux.org/distfiles/${pkgname}-${version%.*}_p${_patchlevel}.tar.gz" checksum=d6da3b683f1045f02d94a81b0c583318dba021f69bdab970c5d5d73e8c38860f -patch_args=-Np0 CFLAGS="-Wno-unused-const-variable -Wno-unused-but-set-variable" case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch b/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch index b22379dad29..10b526fe45e 100644 --- a/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch +++ b/srcpkgs/rtorrent/patches/fix-sysroot-handling.patch @@ -1,7 +1,7 @@ --sysroot should be enough. ---- scripts/common.m4.orig 2014-02-02 11:58:17.361448885 +0100 -+++ scripts/common.m4 2014-02-02 11:59:13.048185911 +0100 +--- a/scripts/common.m4 2014-02-02 11:58:17.361448885 +0100 ++++ b/scripts/common.m4 2014-02-02 11:59:13.048185911 +0100 @@ -63,8 +63,7 @@ AC_DEFUN([TORRENT_WITH_SYSROOT], [ else AC_MSG_RESULT($withval) diff --git a/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch b/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch index 2aa2e99b852..a62596a82c7 100644 --- a/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch +++ b/srcpkgs/rtorrent/patches/no_xmlrpc_c_compile.patch @@ -1,5 +1,5 @@ ---- scripts/checks.m4 2015-07-02 00:32:45.000000000 +0200 -+++ scripts/checks.m4 2015-07-14 15:39:07.334398349 +0200 +--- a/scripts/checks.m4 2015-07-02 00:32:45.000000000 +0200 ++++ b/scripts/checks.m4 2015-07-14 15:39:07.334398349 +0200 @@ -463,19 +463,9 @@ fi diff --git a/srcpkgs/rtorrent/template b/srcpkgs/rtorrent/template index c3278dc2104..7d44897de23 100644 --- a/srcpkgs/rtorrent/template +++ b/srcpkgs/rtorrent/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/rakshasa/rtorrent" distfiles="https://github.com/rakshasa/${pkgname}/archive/v${version}.tar.gz" checksum=bc889ce1dde475ec56aa72ae996912ff58723226a4f4256fef4f1f8636d991d4 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/rubberband/patches/fix-armv5tel.patch b/srcpkgs/rubberband/patches/fix-armv5tel.patch index d8099130f42..5ce52e2b846 100644 --- a/srcpkgs/rubberband/patches/fix-armv5tel.patch +++ b/srcpkgs/rubberband/patches/fix-armv5tel.patch @@ -1,5 +1,5 @@ ---- src/system/sysutils.cpp 2020-09-10 15:30:36.000000000 +0200 -+++ src/system/sysutils.cpp 2020-10-03 19:35:03.241898331 +0200 +--- a/src/system/sysutils.cpp 2020-09-10 15:30:36.000000000 +0200 ++++ b/src/system/sysutils.cpp 2020-10-03 19:35:03.241898331 +0200 @@ -189,7 +189,7 @@ fesetenv(FE_DFL_DISABLE_DENORMS_ENV); #endif diff --git a/srcpkgs/rubberband/template b/srcpkgs/rubberband/template index fabb288f308..0c1f15270aa 100644 --- a/srcpkgs/rubberband/template +++ b/srcpkgs/rubberband/template @@ -13,7 +13,6 @@ homepage="https://breakfastquay.com/rubberband/" changelog="https://breakfastquay.com/news.html" distfiles="https://breakfastquay.com/files/releases/rubberband-${version}.tar.bz2" checksum=4f5b9509364ea876b4052fc390c079a3ad4ab63a2683aad09662fb905c2dc026 -patch_args=-Np0 librubberband_package() { short_desc+=" - Runtime libraries" diff --git a/srcpkgs/ruby/patches/musl-fix-get_main_stack.patch b/srcpkgs/ruby/patches/musl-fix-get_main_stack.patch index e5edbbe2ad4..f3be5abf590 100644 --- a/srcpkgs/ruby/patches/musl-fix-get_main_stack.patch +++ b/srcpkgs/ruby/patches/musl-fix-get_main_stack.patch @@ -4,8 +4,8 @@ Fixes crashes on some musl platforms. diff --git a/thread_pthread.c b/thread_pthread.c index 951885ffa0..cf90321d1d 100644 ---- thread_pthread.c -+++ thread_pthread.c +--- a/thread_pthread.c ++++ b/thread_pthread.c @@ -552,9 +552,6 @@ hpux_attr_getstackaddr(const pthread_attr_t *attr, void **addr) # define MAINSTACKADDR_AVAILABLE 0 # endif diff --git a/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch b/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch index d70ba513de5..0d1f0db9786 100644 --- a/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch +++ b/srcpkgs/ruby/patches/patch-ext_openssl_extconf_rb.patch @@ -1,8 +1,8 @@ $OpenBSD: patch-ext_openssl_extconf_rb,v 1.1 2018/02/23 09:54:25 sthen Exp $ Index: ext/openssl/extconf.rb ---- ext/openssl/extconf.rb.orig -+++ ext/openssl/extconf.rb +--- a/ext/openssl/extconf.rb ++++ b/ext/openssl/extconf.rb @@ -134,6 +134,7 @@ have_func("HMAC_CTX_free") OpenSSL.check_func("RAND_pseudo_bytes", "openssl/rand.h") # deprecated have_func("X509_STORE_get_ex_data") diff --git a/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch b/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch index a06760c4186..98d356aedaa 100644 --- a/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch +++ b/srcpkgs/ruby/patches/patch-ext_openssl_openssl_missing_h.patch @@ -1,8 +1,8 @@ $OpenBSD: patch-ext_openssl_openssl_missing_h,v 1.4 2018/02/23 09:54:25 sthen Exp $ Index: ext/openssl/openssl_missing.h ---- ext/openssl/openssl_missing.h.orig -+++ ext/openssl/openssl_missing.h +--- a/ext/openssl/openssl_missing.h ++++ b/ext/openssl/openssl_missing.h @@ -72,6 +72,9 @@ void ossl_HMAC_CTX_free(HMAC_CTX *); #if !defined(HAVE_X509_STORE_SET_EX_DATA) # define X509_STORE_set_ex_data(x, idx, data) \ diff --git a/srcpkgs/ruby/patches/test_insns-lower-recursion-depth.patch b/srcpkgs/ruby/patches/test_insns-lower-recursion-depth.patch index db9d8bf04ad..ee391182837 100644 --- a/srcpkgs/ruby/patches/test_insns-lower-recursion-depth.patch +++ b/srcpkgs/ruby/patches/test_insns-lower-recursion-depth.patch @@ -36,8 +36,8 @@ so we hit SystemStackError sooner than on other platforms. FAIL 1/1197 tests failed Make: *** [uncommon.mk:666: yes-btest-ruby] Error 1 ---- bootstraptest/test_insns.rb -+++ bootstraptest/test_insns.rb +--- a/bootstraptest/test_insns.rb ++++ b/bootstraptest/test_insns.rb @@ -248,7 +248,7 @@ end }/ox diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index ad72d57520c..29c1c2eac3c 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -1,6 +1,5 @@ # Template file for 'ruby' _ruby_abiver=2.7.0 -patch_args=-Np0 pkgname=ruby version=2.7.3 diff --git a/srcpkgs/ruler/patches/fix-invalid-pointer.patch b/srcpkgs/ruler/patches/fix-invalid-pointer.patch index e5d10cba9ed..f07dc40246e 100644 --- a/srcpkgs/ruler/patches/fix-invalid-pointer.patch +++ b/srcpkgs/ruler/patches/fix-invalid-pointer.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Fixed invalid pointer error diff --git a/ruler.c b/ruler.c index aa1eef1..06b3256 100644 ---- ruler.c -+++ ruler.c +--- a/ruler.c ++++ b/ruler.c @@ -901,7 +901,6 @@ reload_config(void) if (parse_file(xdg_cfg_path) == 1 && no_of_configs == 0) errx(1, "couldn't open config file '%s' (%s). No other config files supplied, exiting", xdg_cfg_path, strerror(errno)); diff --git a/srcpkgs/ruler/template b/srcpkgs/ruler/template index 7cac86683e0..0884fc46578 100644 --- a/srcpkgs/ruler/template +++ b/srcpkgs/ruler/template @@ -11,7 +11,6 @@ license="ISC" homepage="https://github.com/tudurom/ruler" distfiles="https://github.com/tudurom/ruler/archive/v${version}.tar.gz" checksum=5355e19530bb158b504cca6ba18cc402585e9bdb488e01a2ee76492bc70923c7 -patch_args=-Np0 LDFLAGS="-lxcb -lxcb-ewmh -lxcb-icccm -lwm" diff --git a/srcpkgs/run-mailcap/patches/manpages.patch b/srcpkgs/run-mailcap/patches/manpages.patch index 6a8f1fe8dc0..9931d484f24 100644 --- a/srcpkgs/run-mailcap/patches/manpages.patch +++ b/srcpkgs/run-mailcap/patches/manpages.patch @@ -7,8 +7,8 @@ It won't be installed as it is specific to Debian packages. Remove mention of the "mailcap.order" file from the manpages. It won't be installed as it is specific to Debian packages. ---- run-mailcap.man.orig 2015-11-07 11:28:57.466018942 +0100 -+++ run-mailcap.man 2015-11-07 11:37:38.102042173 +0100 +--- a/run-mailcap.man 2015-11-07 11:28:57.466018942 +0100 ++++ b/run-mailcap.man 2015-11-07 11:37:38.102042173 +0100 @@ -4,7 +4,7 @@ .\" .TH RUN-MAILCAP 1 "1st Jan 2008" "Debian Project" "Run Mailcap Programs" @@ -28,8 +28,8 @@ It won't be installed as it is specific to Debian packages. .B run-mailcap (and its aliases) was written by Brian White . ---- mailcap.man.orig 2015-11-07 11:43:49.604058749 +0100 -+++ mailcap.man 2015-11-07 11:46:29.410065880 +0100 +--- a/mailcap.man 2015-11-07 11:43:49.604058749 +0100 ++++ b/mailcap.man 2015-11-07 11:46:29.410065880 +0100 @@ -53,8 +53,6 @@ $HOME/.mailcap:/etc/mailcap:/usr/share/etc/mailcap:/usr/local/etc/mailcap -- default path for mailcap files. .SH SEE ALSO diff --git a/srcpkgs/run-mailcap/patches/tempfile.patch b/srcpkgs/run-mailcap/patches/tempfile.patch index d8fca4e83aa..435074a43dd 100644 --- a/srcpkgs/run-mailcap/patches/tempfile.patch +++ b/srcpkgs/run-mailcap/patches/tempfile.patch @@ -1,7 +1,7 @@ Replace unknown "tempfile" tool with "mktemp" from coreutils ---- run-mailcap.orig 2017-02-21 20:26:27.367144678 +0100 -+++ run-mailcap 2017-02-21 20:25:51.576143081 +0100 +--- a/run-mailcap 2017-02-21 20:26:27.367144678 +0100 ++++ b/run-mailcap 2017-02-21 20:25:51.576143081 +0100 @@ -141,9 +141,9 @@ # $tmpfile = POSIX::tmpnam($name); # unlink($tmpfile); diff --git a/srcpkgs/run-mailcap/template b/srcpkgs/run-mailcap/template index 5a88b519ead..8eb80e3b58e 100644 --- a/srcpkgs/run-mailcap/template +++ b/srcpkgs/run-mailcap/template @@ -10,7 +10,6 @@ license="custom:ad-hoc, custom:Bellcore" homepage="http://packages.ubuntu.com/disco/mime-support" distfiles="${UBUNTU_SITE}/main/m/mime-support/mime-support_${version}ubuntu1.tar.xz" checksum=5007d2ebc25935bfca6d4bdac0efdfc089a38c1be49d19f0422559f666e4f2c4 -patch_args=-Np0 do_install() { local _aliases="see edit compose print" diff --git a/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch b/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch index bf35ebe6875..d8289b90d69 100644 --- a/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch +++ b/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch @@ -1,8 +1,8 @@ Upstream: No, not upstreamable like this Reason: We want the rustup binary in $CARGO_HOME/bin to be of the same version as the one we distribute in this rustup package. ---- src/cli/self_update.rs.orig 2019-05-27 16:17:21.432715136 +0200 -+++ src/cli/self_update.rs 2019-05-27 16:18:56.537718683 +0200 +--- a/src/cli/self_update.rs 2019-05-27 16:17:21.432715136 +0200 ++++ b/src/cli/self_update.rs 2019-05-27 16:18:56.537718683 +0200 @@ -619,8 +619,7 @@ if rustup_path.exists() { utils::remove_file("rustup-bin", &rustup_path)?; diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template index f13beb18e2d..294f5b020a0 100644 --- a/srcpkgs/rustup/template +++ b/srcpkgs/rustup/template @@ -16,7 +16,6 @@ license="Apache-2.0, MIT" homepage="https://www.rustup.rs" distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz" checksum=e69bce5a4b1abe05489b19d2906c258b27f70ff8b13f59e5932527ae6b77c6a6 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in x86_64*|i686*|arm*|aarch64*) diff --git a/srcpkgs/rxvt-unicode/patches/font-width-fix.patch b/srcpkgs/rxvt-unicode/patches/font-width-fix.patch index 811d9e615ab..b632281c034 100644 --- a/srcpkgs/rxvt-unicode/patches/font-width-fix.patch +++ b/srcpkgs/rxvt-unicode/patches/font-width-fix.patch @@ -1,5 +1,5 @@ ---- src/rxvtfont.C.bukind 2007-11-30 14:36:33.000000000 +0600 -+++ src/rxvtfont.C 2007-11-30 14:39:29.000000000 +0600 +--- a/src/rxvtfont.C.bukind 2007-11-30 14:36:33.000000000 +0600 ++++ b/src/rxvtfont.C 2007-11-30 14:39:29.000000000 +0600 @@ -1171,12 +1171,21 @@ XGlyphInfo g; XftTextExtents16 (disp, f, &ch, 1, &g); diff --git a/srcpkgs/rxvt-unicode/patches/line-spacing-fix.patch b/srcpkgs/rxvt-unicode/patches/line-spacing-fix.patch index 8431c4fa0cb..641468b2227 100644 --- a/srcpkgs/rxvt-unicode/patches/line-spacing-fix.patch +++ b/srcpkgs/rxvt-unicode/patches/line-spacing-fix.patch @@ -1,5 +1,5 @@ ---- src/rxvtfont.C.orig 2011-07-20 22:19:29.878012201 -0300 -+++ src/rxvtfont.C 2011-07-20 22:19:33.634671723 -0300 +--- a/src/rxvtfont.C 2011-07-20 22:19:29.878012201 -0300 ++++ b/src/rxvtfont.C 2011-07-20 22:19:33.634671723 -0300 @@ -1237,11 +1237,22 @@ FT_Face face = XftLockFace (f); diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template index 8ae30a72963..c89633c12de 100644 --- a/srcpkgs/rxvt-unicode/template +++ b/srcpkgs/rxvt-unicode/template @@ -26,7 +26,6 @@ license="GPL-3.0-or-later" homepage="http://software.schmorp.de/pkg/rxvt-unicode.html" distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=643116b9a25d29ad29f4890131796d42e6d2d21312282a613ef66c80c5b8c98b -patch_args=-Np0 # Package build options build_options="gdk_pixbuf perl startup_notification unicode3"