diff --git a/srcpkgs/mDNSResponder/patches/Clients-dns-sd.c.patch b/srcpkgs/mDNSResponder/patches/Clients-dns-sd.c.patch index 54a373644e5..9d3d7f6ac8b 100644 --- a/srcpkgs/mDNSResponder/patches/Clients-dns-sd.c.patch +++ b/srcpkgs/mDNSResponder/patches/Clients-dns-sd.c.patch @@ -1,5 +1,5 @@ ---- Clients/dns-sd.c.orig 2021-01-26 20:47:47 UTC -+++ Clients/dns-sd.c +--- a/Clients/dns-sd.c 2021-01-26 20:47:47 UTC ++++ b/Clients/dns-sd.c @@ -58,11 +58,13 @@ //#define TEST_NEW_CLIENTSTUB 1 diff --git a/srcpkgs/mDNSResponder/patches/musl.patch b/srcpkgs/mDNSResponder/patches/musl.patch index 87781fc275a..20c72728132 100644 --- a/srcpkgs/mDNSResponder/patches/musl.patch +++ b/srcpkgs/mDNSResponder/patches/musl.patch @@ -1,5 +1,5 @@ ---- ./mDNSPosix/nss_mdns.c -+++ ./mDNSPosix/nss_mdns.c +--- a/mDNSPosix/nss_mdns.c ++++ b/mDNSPosix/nss_mdns.c @@ -379,7 +379,19 @@ #define ENTNAME hostent #define DATABASE "hosts" diff --git a/srcpkgs/mDNSResponder/template b/srcpkgs/mDNSResponder/template index 9af08f79dff..c0425e7b34e 100644 --- a/srcpkgs/mDNSResponder/template +++ b/srcpkgs/mDNSResponder/template @@ -9,7 +9,6 @@ license="Apache-2.0, BSD-3-Clause" homepage="https://opensource.apple.com/" distfiles="https://opensource.apple.com/tarballs/${pkgname}/${pkgname}-${version}.tar.gz" checksum=097662447e1535573484697861d9f50eceaf2c52ec2742e451ee6ffe9bbf3e75 -patch_args=-Np0 conf_files="/etc/nss_mdns.conf" conflicts="nss-mdns>=0" diff --git a/srcpkgs/macchanger/patches/fix-caddr_t.patch b/srcpkgs/macchanger/patches/fix-caddr_t.patch index c5fe5f6e16c..0bcffcc67a7 100644 --- a/srcpkgs/macchanger/patches/fix-caddr_t.patch +++ b/srcpkgs/macchanger/patches/fix-caddr_t.patch @@ -1,7 +1,7 @@ https://github.com/alobbs/macchanger/issues/14 ---- ./src/netinfo.c.orig -+++ ./src/netinfo.c +--- a/src/netinfo.c ++++ b/src/netinfo.c @@ -113,7 +113,7 @@ epa->size = IFHWADDRLEN; diff --git a/srcpkgs/macchanger/template b/srcpkgs/macchanger/template index 3d4402e208b..9af205a0d0f 100644 --- a/srcpkgs/macchanger/template +++ b/srcpkgs/macchanger/template @@ -11,4 +11,3 @@ license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/macchanger" distfiles="https://github.com/alobbs/macchanger/archive/${version}.tar.gz" checksum=1d75c07a626321e07b48a5fe2dbefbdb98c3038bb8230923ba8d32bda5726e4f -patch_args=-Np0 diff --git a/srcpkgs/mairix/patches/issue5.patch b/srcpkgs/mairix/patches/issue5.patch index 6d80bfd2e8a..0ca10e2810f 100644 --- a/srcpkgs/mairix/patches/issue5.patch +++ b/srcpkgs/mairix/patches/issue5.patch @@ -7,8 +7,8 @@ If we get two terminators in a row, don't carry out last_action twice. Fixes vandry/mairix#5 ---- nvp.c -+++ nvp.c +--- a/nvp.c ++++ b/nvp.c @@ -307,6 +307,9 @@ struct nvp *make_nvp(struct msg_src *src, char *s, const char *pfx)/*{{{*/ default: break; diff --git a/srcpkgs/mairix/template b/srcpkgs/mairix/template index f0e7fdcce13..49f73671bcb 100644 --- a/srcpkgs/mairix/template +++ b/srcpkgs/mairix/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="https://github.com/vandry/mairix" distfiles="https://github.com/vandry/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" checksum=a0702e079c768b6fbe25687ebcbabe7965eb493d269a105998c7c1c2caef4a57 -patch_args=-Np0 pre_build() { make -C dfasyn CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" diff --git a/srcpkgs/makedumpfile/patches/ppc32.patch b/srcpkgs/makedumpfile/patches/ppc32.patch index f8ade55b029..ed51e37cd16 100644 --- a/srcpkgs/makedumpfile/patches/ppc32.patch +++ b/srcpkgs/makedumpfile/patches/ppc32.patch @@ -10,8 +10,8 @@ Subject: [PATCH] Fix definitions for ppc32 diff --git arch/ppc.c arch/ppc.c index 37c6a3b..4130c2d 100644 ---- arch/ppc.c -+++ arch/ppc.c +--- a/arch/ppc.c ++++ b/arch/ppc.c @@ -19,7 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -23,8 +23,8 @@ index 37c6a3b..4130c2d 100644 #include "../elf_info.h" diff --git makedumpfile.h makedumpfile.h index 24b2f69..d802833 100644 ---- makedumpfile.h -+++ makedumpfile.h +--- a/makedumpfile.h ++++ b/makedumpfile.h @@ -765,7 +765,7 @@ unsigned long get_kvbase_arm64(void); #endif diff --git a/srcpkgs/makedumpfile/template b/srcpkgs/makedumpfile/template index cef2f4d14da..d23444187c9 100644 --- a/srcpkgs/makedumpfile/template +++ b/srcpkgs/makedumpfile/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/makedumpfile/makedumpfile" distfiles="${homepage}/archive/refs/tags/${version}.tar.gz" checksum=393ea8f22393c059ad21de9b1c3f45d9d0d8dbeb0ccb1417815b835d03f7c350 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/makeself/patches/header.patch b/srcpkgs/makeself/patches/header.patch index 75c8cc8cd4e..a11442697df 100644 --- a/srcpkgs/makeself/patches/header.patch +++ b/srcpkgs/makeself/patches/header.patch @@ -1,5 +1,5 @@ ---- makeself.sh.orig 2019-06-13 07:22:52.406415309 +0000 -+++ makeself.sh 2019-06-13 07:23:10.116346635 +0000 +--- a/makeself.sh 2019-06-13 07:22:52.406415309 +0000 ++++ b/makeself.sh 2019-06-13 07:23:10.116346635 +0000 @@ -185,7 +185,7 @@ TAR_EXTRA="" GPG_EXTRA="" diff --git a/srcpkgs/makeself/template b/srcpkgs/makeself/template index 68b71aa77a5..4c498dce773 100644 --- a/srcpkgs/makeself/template +++ b/srcpkgs/makeself/template @@ -9,7 +9,6 @@ license="GPL-2.0-or-later" homepage="http://makeself.io" distfiles="https://github.com/megastep/makeself/archive/release-$version.tar.gz" checksum=8789312db5e93fc471a1e4fb88ec13227ef63a9c7aad297f3bbf35f9511f8d62 -patch_args=-Np0 do_install() { vmkdir usr/share/man/man1 diff --git a/srcpkgs/mame/patches/musl-netlist.patch b/srcpkgs/mame/patches/musl-netlist.patch index d1094773418..d87a967f806 100644 --- a/srcpkgs/mame/patches/musl-netlist.patch +++ b/srcpkgs/mame/patches/musl-netlist.patch @@ -1,5 +1,5 @@ ---- src/lib/netlist/plib/pexception.cpp 2017-01-24 23:44:30.000000000 +0100 -+++ src/lib/netlist/plib/pexception.cpp 2017-01-25 06:48:09.658604647 +0100 +--- a/src/lib/netlist/plib/pexception.cpp 2017-01-24 23:44:30.000000000 +0100 ++++ b/src/lib/netlist/plib/pexception.cpp 2017-01-25 06:48:09.658604647 +0100 @@ -10,7 +10,7 @@ #include "pexception.h" #include "pfmtlog.h" diff --git a/srcpkgs/mame/patches/musl-time_t.patch b/srcpkgs/mame/patches/musl-time_t.patch index 02c11cf0dd9..0066c7366aa 100644 --- a/srcpkgs/mame/patches/musl-time_t.patch +++ b/srcpkgs/mame/patches/musl-time_t.patch @@ -1,5 +1,5 @@ ---- 3rdparty/bx/include/bx/bx.h 2017-12-27 02:45:37.000000000 +0100 -+++ 3rdparty/bx/include/bx/bx.h 2017-12-28 10:58:30.254932880 +0100 +--- a/3rdparty/bx/include/bx/bx.h 2017-12-27 02:45:37.000000000 +0100 ++++ b/3rdparty/bx/include/bx/bx.h 2017-12-28 10:58:30.254932880 +0100 @@ -11,6 +11,7 @@ #include // uint32_t #include // size_t diff --git a/srcpkgs/mame/patches/pagesize-name-clash.patch b/srcpkgs/mame/patches/pagesize-name-clash.patch index de9af61451e..08b5939f11c 100644 --- a/srcpkgs/mame/patches/pagesize-name-clash.patch +++ b/srcpkgs/mame/patches/pagesize-name-clash.patch @@ -1,5 +1,5 @@ ---- src/lib/netlist/plib/palloc.h 2020-06-26 07:55:07.000000000 +0200 -+++ src/lib/netlist/plib/palloc.h 2020-06-27 17:37:11.920172697 +0200 +--- a/src/lib/netlist/plib/palloc.h 2020-06-26 07:55:07.000000000 +0200 ++++ b/src/lib/netlist/plib/palloc.h 2020-06-27 17:37:11.920172697 +0200 @@ -16,6 +16,7 @@ #include diff --git a/srcpkgs/mame/template b/srcpkgs/mame/template index 6317423767e..b13571dd4cd 100644 --- a/srcpkgs/mame/template +++ b/srcpkgs/mame/template @@ -16,7 +16,6 @@ distfiles="https://github.com/mamedev/mame/archive/mame${version}.tar.gz" checksum=414921771ada0804a8c7f3540e33338e8495e16a3bca78a5a2b355abafa51e6a nodebug=yes replaces="sdlmame>=0 sdlmess>=0" -patch_args=-Np0 CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/lua5.3 -I${XBPS_CROSS_BASE}/usr/include/libutf8proc" CXXFLAGS="$CFLAGS" diff --git a/srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch b/srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch index cf48ab174ea..8687d550b0b 100644 --- a/srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch +++ b/srcpkgs/man-db/patches/add-missing-stdlib_h-include.patch @@ -1,5 +1,5 @@ ---- libdb/db_btree.c -+++ libdb/db_btree.c +--- a/libdb/db_btree.c ++++ b/libdb/db_btree.c @@ -29,6 +29,7 @@ #ifdef BTREE diff --git a/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch b/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch index bbf7b26ff11..8e47da8a219 100644 --- a/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch +++ b/srcpkgs/man-db/patches/guard-glibc-iconv-ext.patch @@ -5,8 +5,8 @@ diff --git src/manconv.c src/manconv.c index b9ac8d3a..8f5bdaee 100644 ---- src/manconv.c -+++ src/manconv.c +--- a/src/manconv.c ++++ b/src/manconv.c @@ -111,9 +111,14 @@ static int try_iconv (pipeline *p, const char *try_from_code, const char *to, iconv_t cd_utf8, cd = NULL; bool to_utf8 = STREQ (try_to_code, "UTF-8") || @@ -25,8 +25,8 @@ index b9ac8d3a..8f5bdaee 100644 diff --git src/manconv_client.c src/manconv_client.c index 0c41bec6..2a7f1398 100644 ---- src/manconv_client.c -+++ src/manconv_client.c +--- a/src/manconv_client.c ++++ b/src/manconv_client.c @@ -102,7 +102,11 @@ void add_manconv (pipeline *p, const char *source, const char *target) gl_list_add_last (codes->from, xstrdup (source)); name = appendstr (name, "UTF-8:", source, (void *) 0); @@ -41,8 +41,8 @@ index 0c41bec6..2a7f1398 100644 if (quiet >= 2) diff --git src/whatis.c src/whatis.c index d2559169..ec80c117 100644 ---- src/whatis.c -+++ src/whatis.c +--- a/src/whatis.c ++++ b/src/whatis.c @@ -945,9 +945,13 @@ int main (int argc, char *argv[]) display_seen = new_string_set (GL_HASH_SET); diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template index 80bfd7964ff..c8b873771d2 100644 --- a/srcpkgs/man-db/template +++ b/srcpkgs/man-db/template @@ -26,7 +26,6 @@ lib32disabled=yes system_accounts="_man" _man_homedir="/var/cache/man" make_dirs="/var/cache/man 0755 _man _man" -patch_args=-Np0 # among others, requires the _man user to be available in the masterdir make_check=no diff --git a/srcpkgs/marble5/patches/soversion.diff b/srcpkgs/marble5/patches/soversion.diff index 84cec617b0d..378a1283116 100644 --- a/srcpkgs/marble5/patches/soversion.diff +++ b/srcpkgs/marble5/patches/soversion.diff @@ -1,5 +1,5 @@ ---- src/lib/astro/CMakeLists.txt 2018-01-10 08:43:24.000000000 +0100 -+++ src/lib/astro/CMakeLists.txt 2018-02-10 15:08:03.545093856 +0100 +--- a/src/lib/astro/CMakeLists.txt 2018-01-10 08:43:24.000000000 +0100 ++++ b/src/lib/astro/CMakeLists.txt 2018-02-10 15:08:03.545093856 +0100 @@ -6,7 +6,7 @@ ) @@ -9,8 +9,8 @@ ADD_DEFINITIONS(-O3) ---- src/lib/marble/declarative/CMakeLists.txt 2018-01-10 08:43:24.000000000 +0100 -+++ src/lib/marble/declarative/CMakeLists.txt 2018-02-10 15:08:55.007096153 +0100 +--- a/src/lib/marble/declarative/CMakeLists.txt 2018-01-10 08:43:24.000000000 +0100 ++++ b/src/lib/marble/declarative/CMakeLists.txt 2018-02-10 15:08:55.007096153 +0100 @@ -30,6 +30,10 @@ RouteRelationModel.cpp ) diff --git a/srcpkgs/marble5/template b/srcpkgs/marble5/template index 5baadb8e354..3efa3591ea5 100644 --- a/srcpkgs/marble5/template +++ b/srcpkgs/marble5/template @@ -16,7 +16,6 @@ license="LGPL-2.1-or-later, GFDL-1.2-only" homepage="https://marble.kde.org" distfiles="${KDE_SITE}/release-service/${version}/src/marble-${version}.tar.xz" checksum=66e1fe73e248ba18245e2a1e234eecf49d531569b5080e19a4ca9dddbbbd0545 -patch_args=-Np0 pre_configure() { vsed -i CMakeLists.txt -e 's/-Wcast-align//' diff --git a/srcpkgs/marco/patches/musl.patch b/srcpkgs/marco/patches/musl.patch index 019d457d7ca..14faf13e94e 100644 --- a/srcpkgs/marco/patches/musl.patch +++ b/srcpkgs/marco/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/ui/theme.c.orig 2015-05-13 18:52:13.340057387 +0200 -+++ src/ui/theme.c 2015-05-13 18:55:30.469306867 +0200 +--- a/src/ui/theme.c 2015-05-13 18:52:13.340057387 +0200 ++++ b/src/ui/theme.c 2015-05-13 18:55:30.469306867 +0200 @@ -60,7 +60,8 @@ #include #include diff --git a/srcpkgs/marco/template b/srcpkgs/marco/template index 3b36a8befad..5abb62b91fe 100644 --- a/srcpkgs/marco/template +++ b/srcpkgs/marco/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" checksum=498350cb12fc4d9c7c4a0355102c17b50043fbab258d11ad41b7d698b4f042a7 -patch_args=-Np0 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/mariadb/patches/atomic-fix.patch b/srcpkgs/mariadb/patches/atomic-fix.patch index 4ad06786f15..6e7f48af45d 100644 --- a/srcpkgs/mariadb/patches/atomic-fix.patch +++ b/srcpkgs/mariadb/patches/atomic-fix.patch @@ -18,8 +18,8 @@ Date: Fri Dec 21 19:14:04 2018 +0200 James Cowgill Jessica Clarke ---- configure.cmake -+++ configure.cmake +--- a/configure.cmake ++++ b/configure.cmake @@ -862,7 +862,25 @@ int main() long long int *ptr= &var; return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); @@ -47,8 +47,8 @@ Date: Fri Dec 21 19:14:04 2018 +0200 IF(WITH_VALGRIND) SET(HAVE_valgrind 1) ---- mysys/CMakeLists.txt -+++ mysys/CMakeLists.txt +--- a/mysys/CMakeLists.txt ++++ b/mysys/CMakeLists.txt @@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO}) DTRACE_INSTRUMENT(mysys) @@ -60,8 +60,8 @@ Date: Fri Dec 21 19:14:04 2018 +0200 IF(HAVE_BFD_H) TARGET_LINK_LIBRARIES(mysys bfd) ENDIF(HAVE_BFD_H) ---- sql/CMakeLists.txt -+++ sql/CMakeLists.txt +--- a/sql/CMakeLists.txt ++++ b/sql/CMakeLists.txt @@ -318,6 +318,10 @@ IF(WITH_MYSQLD_LDFLAGS) "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}") ENDIF() @@ -92,8 +92,8 @@ Signed-off-by: Mingli Yu diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake index d7895b0..3bcd52a 100644 ---- storage/rocksdb/build_rocksdb.cmake -+++ storage/rocksdb/build_rocksdb.cmake +--- a/storage/rocksdb/build_rocksdb.cmake ++++ b/storage/rocksdb/build_rocksdb.cmake @@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc) ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) diff --git a/srcpkgs/mariadb/patches/revert-isb-assembly-instruction.patch b/srcpkgs/mariadb/patches/revert-isb-assembly-instruction.patch index ce5d809c3d5..9910e14a2f5 100644 --- a/srcpkgs/mariadb/patches/revert-isb-assembly-instruction.patch +++ b/srcpkgs/mariadb/patches/revert-isb-assembly-instruction.patch @@ -7,8 +7,8 @@ Description: https://github.com/MariaDB/server/commit/76d2846a71a155ee2861fd52e6635e35490a9dd1 is likely to fix it and make armhf build again. ---- include/my_cpu.h -+++ include/my_cpu.h +--- a/include/my_cpu.h ++++ b/include/my_cpu.h @@ -84,7 +84,7 @@ static inline void MY_RELAX_CPU(void) __ppc_get_timebase(); #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__) diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 5682c0078b7..a6176b43963 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -35,7 +35,6 @@ system_accounts="mysql" mysql_homedir="/var/lib/mysql" make_dirs="/var/lib/mysql 0700 mysql mysql /usr/lib/mysql/plugin/auth_pam_tool_dir 0700 mysql root" -patch_args=-Np0 post_patch() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/masterpassword-cli/patches/fix-cflags.patch b/srcpkgs/masterpassword-cli/patches/fix-cflags.patch index a303f695454..90df7d0a836 100644 --- a/srcpkgs/masterpassword-cli/patches/fix-cflags.patch +++ b/srcpkgs/masterpassword-cli/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: platform-independent/cli-c/CMakeLists.txt =================================================================== ---- platform-independent/cli-c/CMakeLists.txt.orig -+++ platform-independent/cli-c/CMakeLists.txt +--- a/platform-independent/cli-c/CMakeLists.txt ++++ b/platform-independent/cli-c/CMakeLists.txt @@ -15,8 +15,6 @@ option( BUILD_MPW_BENCH "C CLI M option( BUILD_MPW_TESTS "C Master Password algorithm test suite (needs: mpw_sodium, mpw_xml)." OFF ) diff --git a/srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch b/srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch index fe4a33b628d..47374b613ef 100644 --- a/srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch +++ b/srcpkgs/masterpassword-cli/patches/lowercase-boolean.patch @@ -1,5 +1,5 @@ ---- core/c/mpw-marshal-util.c 2017-09-25 02:59:09.000000000 -0400 -+++ core/c/mpw-marshal-util.c 2020-05-31 11:32:02.362438198 -0400 +--- a/core/c/mpw-marshal-util.c 2017-09-25 02:59:09.000000000 -0400 ++++ b/core/c/mpw-marshal-util.c 2020-05-31 11:32:02.362438198 -0400 @@ -112,7 +112,7 @@ if (!json_value) return defaultValue; diff --git a/srcpkgs/masterpassword-cli/template b/srcpkgs/masterpassword-cli/template index 8ce664513e5..8732491bfc5 100644 --- a/srcpkgs/masterpassword-cli/template +++ b/srcpkgs/masterpassword-cli/template @@ -16,7 +16,6 @@ distfiles="https://github.com/Lyndir/MasterPassword/archive/${version}-cli-3.tar checksum=35dc64bc74c04b534824c21da96e4a10fc7978da376fcc036d7ec08fd800ab7a # Apache-1.0 is incompatible with GPL-3+ restricted=yes -patch_args=-Np0 pre_configure() { echo "${version}-cli" > ${wrksrc}/${build_wrksrc}/VERSION diff --git a/srcpkgs/mate-power-manager/patches/musl.patch b/srcpkgs/mate-power-manager/patches/musl.patch index c9c03e548f9..827698b4c9f 100644 --- a/srcpkgs/mate-power-manager/patches/musl.patch +++ b/srcpkgs/mate-power-manager/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/egg-debug.c.orig 2015-11-07 07:50:36.623167156 +0100 -+++ src/egg-debug.c 2015-11-07 07:51:46.719072134 +0100 +--- a/src/egg-debug.c 2015-11-07 07:50:36.623167156 +0100 ++++ b/src/egg-debug.c 2015-11-07 07:51:46.719072134 +0100 @@ -39,7 +39,9 @@ #include #include @@ -26,8 +26,8 @@ } /** ---- applets/brightness/egg-debug.c.orig 2015-11-07 07:52:33.320008962 +0100 -+++ applets/brightness/egg-debug.c 2015-11-07 07:53:09.302960183 +0100 +--- a/applets/brightness/egg-debug.c 2015-11-07 07:52:33.320008962 +0100 ++++ b/applets/brightness/egg-debug.c 2015-11-07 07:53:09.302960183 +0100 @@ -39,7 +39,9 @@ #include #include @@ -54,8 +54,8 @@ } /** ---- applets/inhibit/egg-debug.c.orig 2015-11-07 07:53:32.815928309 +0100 -+++ applets/inhibit/egg-debug.c 2015-11-07 07:53:55.503897553 +0100 +--- a/applets/inhibit/egg-debug.c 2015-11-07 07:53:32.815928309 +0100 ++++ b/applets/inhibit/egg-debug.c 2015-11-07 07:53:55.503897553 +0100 @@ -39,7 +39,9 @@ #include #include diff --git a/srcpkgs/mate-power-manager/template b/srcpkgs/mate-power-manager/template index c1afcc458a4..4f2f7d77c8f 100644 --- a/srcpkgs/mate-power-manager/template +++ b/srcpkgs/mate-power-manager/template @@ -15,4 +15,3 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" checksum=d24b9fce23b086817d5494f7e65e58f18367af6eb5d0d4ade45de5396e20d13a -patch_args=-Np0 diff --git a/srcpkgs/mate-utils/patches/cross-strftime.patch b/srcpkgs/mate-utils/patches/cross-strftime.patch index a8d9a305369..971af91c61e 100644 --- a/srcpkgs/mate-utils/patches/cross-strftime.patch +++ b/srcpkgs/mate-utils/patches/cross-strftime.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2015-09-01 15:56:57.000000000 +0200 -+++ configure.ac 2015-10-23 15:09:25.486599085 +0200 +--- a/configure.ac 2015-09-01 15:56:57.000000000 +0200 ++++ b/configure.ac 2015-10-23 15:09:25.486599085 +0200 @@ -277,24 +277,32 @@ AS_IF([test "x$have_ipv6" = "xyes"], ] ) diff --git a/srcpkgs/mate-utils/template b/srcpkgs/mate-utils/template index ed900b59441..855db8054d4 100644 --- a/srcpkgs/mate-utils/template +++ b/srcpkgs/mate-utils/template @@ -16,7 +16,6 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" checksum=219673047fe2a14eb9c8bc23a5fb7c99d45e7acad4c05b4bf59a3d244cb026ac -patch_args=-Np0 pre_configure() { NOCONFIGURE=1 ./autogen.sh diff --git a/srcpkgs/matio/patches/CVE-2019-20020.patch b/srcpkgs/matio/patches/CVE-2019-20020.patch index f86cee5ec1a..abcedd6fed2 100644 --- a/srcpkgs/matio/patches/CVE-2019-20020.patch +++ b/srcpkgs/matio/patches/CVE-2019-20020.patch @@ -10,8 +10,8 @@ Signed-off-by: Nathan Owens diff --git a/src/mat5.c b/src/mat5.c index abdb351..776f233 100644 ---- src/mat5.c -+++ src/mat5.c +--- a/src/mat5.c ++++ b/src/mat5.c @@ -980,10 +980,26 @@ ReadNextCell( mat_t *mat, matvar_t *matvar ) /* Rank and Dimension */ if ( uncomp_buf[0] == MAT_T_INT32 ) { diff --git a/srcpkgs/matio/template b/srcpkgs/matio/template index 58930bee51e..d22e883530b 100644 --- a/srcpkgs/matio/template +++ b/srcpkgs/matio/template @@ -12,7 +12,6 @@ license="BSD-2-Clause" homepage="https://github.com/tbeu/matio" distfiles="https://github.com/tbeu/matio/releases/download/v${version}/${pkgname}-${version}.tar.gz" checksum=5e455527d370ab297c4abe5a2ab4d599c93ac7c1a0c85d841cc5c22f8221c400 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args+=" ac_cv_va_copy=C99" diff --git a/srcpkgs/maturin/patches/add-ppc-tier3.patch b/srcpkgs/maturin/patches/add-ppc-tier3.patch index 14dcb825849..634abd46027 100644 --- a/srcpkgs/maturin/patches/add-ppc-tier3.patch +++ b/srcpkgs/maturin/patches/add-ppc-tier3.patch @@ -1,6 +1,6 @@ diff -ur setup.py setup.py ---- setup.py -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -69,7 +69,7 @@ "--message-format=json", ] @@ -11,8 +11,8 @@ diff -ur setup.py setup.py ["--no-default-features", "--features=upload,log,human-panic"] ) diff -ur src/target.rs src/target.rs ---- src/target.rs -+++ src/target.rs +--- a/src/target.rs ++++ b/src/target.rs @@ -40,6 +40,8 @@ Armv7L, Powerpc64Le, diff --git a/srcpkgs/maturin/patches/target-lexicon-ppcle.patch b/srcpkgs/maturin/patches/target-lexicon-ppcle.patch index 4e8fbc02bfe..a646b432972 100644 --- a/srcpkgs/maturin/patches/target-lexicon-ppcle.patch +++ b/srcpkgs/maturin/patches/target-lexicon-ppcle.patch @@ -1,5 +1,5 @@ ---- target-lexicon/src/targets.rs -+++ target-lexicon/src/targets.rs +--- a/target-lexicon/src/targets.rs ++++ b/target-lexicon/src/targets.rs @@ -26,6 +26,7 @@ Msp430, Nvptx64, diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index 9cae482efdf..7ce8d5bd64c 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -18,7 +18,6 @@ distfiles="${homepage}/archive/v${version}.tar.gz https://github.com/bytecodealliance/target-lexicon/archive/v0.12.0.tar.gz" checksum="e6a9a67cc62ffe248654e60e7ec211bf23319c4c936ad87022f7a1fd0997430d 18fead54e5dfa2cb0fa8af3db3c2765ca1c003b20cd4eca7be0553b30ce229de" -patch_args=-Np0 post_extract() { mv ../target-lexicon* target-lexicon diff --git a/srcpkgs/mc/patches/mc-mksh-subshell-v2.patch b/srcpkgs/mc/patches/mc-mksh-subshell-v2.patch index 8ddea90fbcf..76c8470804a 100644 --- a/srcpkgs/mc/patches/mc-mksh-subshell-v2.patch +++ b/srcpkgs/mc/patches/mc-mksh-subshell-v2.patch @@ -1,5 +1,5 @@ ---- lib/shell.c 2016-09-22 18:24:12.000000000 +0000 -+++ lib/shell.c 2017-02-16 13:47:34.933939000 +0000 +--- a/lib/shell.c 2016-09-22 18:24:12.000000000 +0000 ++++ b/lib/shell.c 2017-02-16 13:47:34.933939000 +0000 @@ -66,6 +66,10 @@ /* 3rd choice: look for existing shells supported as MC subshells. */ if (access ("/bin/bash", X_OK) == 0) @@ -25,8 +25,8 @@ || strstr (mc_shell->real_path, "/tcsh") != NULL) { diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h ---- lib/shell.h 2016-03-12 15:45:47.000000000 +0000 -+++ lib/shell.h 2017-02-15 21:57:39.000000000 +0000 +--- a/lib/shell.h 2016-03-12 15:45:47.000000000 +0000 ++++ b/lib/shell.h 2017-02-15 21:57:39.000000000 +0000 @@ -12,6 +12,7 @@ typedef enum { @@ -36,8 +36,8 @@ diff -Naur mc-4.8.18.orig/lib/shell.h mc-4.8.18/lib/shell.h SHELL_BASH, SHELL_ASH_BUSYBOX, /* BusyBox default shell (ash) */ diff -Naur mc-4.8.18.orig/src/subshell/common.c mc-4.8.18/src/subshell/common.c ---- src/subshell/common.c 2016-09-22 18:24:12.000000000 +0000 -+++ src/subshell/common.c 2017-02-20 18:48:22.681514000 +0000 +--- a/src/subshell/common.c 2016-09-22 18:24:12.000000000 +0000 ++++ b/src/subshell/common.c 2017-02-20 18:48:22.681514000 +0000 @@ -320,6 +320,12 @@ break; diff --git a/srcpkgs/mc/patches/xbps.patch b/srcpkgs/mc/patches/xbps.patch index 5ad22eef415..17481e693e0 100644 --- a/srcpkgs/mc/patches/xbps.patch +++ b/srcpkgs/mc/patches/xbps.patch @@ -1,5 +1,5 @@ ---- misc/mc.ext.in 2017-08-21 19:28:49.638411103 +0200 -+++ misc/mc.ext.in 2017-08-21 19:38:05.633602005 +0200 +--- a/misc/mc.ext.in 2017-08-21 19:28:49.638411103 +0200 ++++ b/misc/mc.ext.in 2017-08-21 19:38:05.633602005 +0200 @@ -145,8 +145,8 @@ Open=%cd %p/utar:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view tar.lz4 diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template index bea3ca89dd5..ebf5141eb48 100644 --- a/srcpkgs/mc/template +++ b/srcpkgs/mc/template @@ -14,7 +14,6 @@ distfiles="https://www.midnight-commander.org/downloads/mc-${version}.tar.xz" #distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz" checksum=c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27 python_version=2 -patch_args=-Np0 conf_files=" /etc/mc/filehighlight.ini diff --git a/srcpkgs/mcomix/patches/image_tools.py.patch b/srcpkgs/mcomix/patches/image_tools.py.patch index 9928ed8228d..91b02146f87 100644 --- a/srcpkgs/mcomix/patches/image_tools.py.patch +++ b/srcpkgs/mcomix/patches/image_tools.py.patch @@ -1,6 +1,6 @@ Grabbed from https://github.com/mat813/freebsd-ports/tree/d9a5e385afb3dab755ebe5138b09cf7351f992d9/graphics/py-mcomix/files ---- mcomix/image_tools.py.orig 2016-02-12 18:51:58 UTC -+++ mcomix/image_tools.py +--- a/mcomix/image_tools.py 2016-02-12 18:51:58 UTC ++++ b/mcomix/image_tools.py @@ -9,7 +9,6 @@ import gtk from PIL import Image from PIL import ImageEnhance diff --git a/srcpkgs/mcomix/patches/run.py.patch b/srcpkgs/mcomix/patches/run.py.patch index 09f952775ca..97f1b7ad59f 100644 --- a/srcpkgs/mcomix/patches/run.py.patch +++ b/srcpkgs/mcomix/patches/run.py.patch @@ -1,6 +1,6 @@ Grabbed from https://github.com/mat813/freebsd-ports/tree/d9a5e385afb3dab755ebe5138b09cf7351f992d9/graphics/py-mcomix/files ---- mcomix/run.py.orig 2016-02-12 18:52:12 UTC -+++ mcomix/run.py +--- a/mcomix/run.py 2016-02-12 18:52:12 UTC ++++ b/mcomix/run.py @@ -203,7 +203,11 @@ def run(): try: diff --git a/srcpkgs/mcomix/template b/srcpkgs/mcomix/template index 5557136c1ac..c413e5e0028 100644 --- a/srcpkgs/mcomix/template +++ b/srcpkgs/mcomix/template @@ -11,4 +11,3 @@ license="GPL-2.0-only" homepage="http://sourceforge.net/projects/mcomix/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/MComix-${version}/${pkgname}-${version}.tar.bz2" checksum=7e43159dc585bc9bc31970a44bd2b4e42c303660c4c8cf7f0eda413a6f72fa3b -patch_args=-Np0 diff --git a/srcpkgs/mcpp/patches/mbchar.patch b/srcpkgs/mcpp/patches/mbchar.patch index 1929e3d7f0d..b88acb06143 100644 --- a/srcpkgs/mcpp/patches/mbchar.patch +++ b/srcpkgs/mcpp/patches/mbchar.patch @@ -1,8 +1,8 @@ Fix set_encoding() to understand C.UTF-8 and other locale names with != 5 characters before . ---- src/mbchar.c 2008-03-08 11:06:13.000000000 -0200 -+++ src/mbchar.c 2020-01-13 10:02:20.800174591 -0300 +--- a/src/mbchar.c 2008-03-08 11:06:13.000000000 -0200 ++++ b/src/mbchar.c 2020-01-13 10:02:20.800174591 -0300 @@ -366,6 +366,7 @@ = "Too long encoding name: %s%.0ld%.0s"; /* _E_ */ const char * loc = ""; diff --git a/srcpkgs/mcpp/template b/srcpkgs/mcpp/template index edccf45fe0b..7a358883d06 100644 --- a/srcpkgs/mcpp/template +++ b/srcpkgs/mcpp/template @@ -10,7 +10,6 @@ license="BSD-2-Clause" homepage="http://mcpp.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/mcpp/mcpp-${version}.tar.gz" checksum=3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/mdadm/patches/sysmacros_h.patch b/srcpkgs/mdadm/patches/sysmacros_h.patch index 583510b98a3..928f9a05502 100644 --- a/srcpkgs/mdadm/patches/sysmacros_h.patch +++ b/srcpkgs/mdadm/patches/sysmacros_h.patch @@ -1,5 +1,5 @@ ---- mdadm.h 2018-10-01 20:26:06.000000000 +0200 -+++ mdadm.h 2019-12-27 07:24:26.224920452 +0100 +--- a/mdadm.h 2018-10-01 20:26:06.000000000 +0200 ++++ b/mdadm.h 2019-12-27 07:24:26.224920452 +0100 @@ -45,10 +45,7 @@ #include #include diff --git a/srcpkgs/mdadm/patches/time64.patch b/srcpkgs/mdadm/patches/time64.patch index 1ee4b23f41a..f40d940026a 100644 --- a/srcpkgs/mdadm/patches/time64.patch +++ b/srcpkgs/mdadm/patches/time64.patch @@ -1,7 +1,7 @@ diff --git monitor.c monitor.c index 81537ed..08027ac 100644 ---- monitor.c -+++ monitor.c +--- a/monitor.c ++++ b/monitor.c @@ -447,9 +447,9 @@ static int read_and_act(struct active_array *a, fd_set *fds) } diff --git a/srcpkgs/mdadm/patches/use-after-free.patch b/srcpkgs/mdadm/patches/use-after-free.patch index 69b6ee4aeae..2bb151b1e20 100644 --- a/srcpkgs/mdadm/patches/use-after-free.patch +++ b/srcpkgs/mdadm/patches/use-after-free.patch @@ -2,8 +2,8 @@ From Rich Felker, over IRC diff --git a/policy.c b/policy.c index c0d18a7e..78ad34cd 100644 ---- policy.c -+++ policy.c +--- a/policy.c ++++ b/policy.c @@ -214,8 +214,9 @@ static char *disk_path(struct mdinfo *disk) continue; if (stb.st_rdev != makedev(disk->disk.major, disk->disk.minor)) diff --git a/srcpkgs/mdadm/template b/srcpkgs/mdadm/template index 30aeed30ee9..f776b6dc9d3 100644 --- a/srcpkgs/mdadm/template +++ b/srcpkgs/mdadm/template @@ -10,7 +10,6 @@ license="GPL-2" homepage="https://git.kernel.org/cgit/utils/mdadm/mdadm.git/log/" distfiles="${KERNEL_SITE}/utils/raid/${pkgname}/${pkgname}-${version}.tar.xz" checksum=ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a -patch_args=-Np0 pre_configure() { sed -i 's,^install : mdadm mdmon,install: ,g' Makefile diff --git a/srcpkgs/mdocml/patches/cross.patch b/srcpkgs/mdocml/patches/cross.patch index 54dedea481e..172d5bd9a23 100644 --- a/srcpkgs/mdocml/patches/cross.patch +++ b/srcpkgs/mdocml/patches/cross.patch @@ -1,5 +1,5 @@ ---- configure.orig -+++ configure +--- a/configure ++++ b/configure @@ -168,14 +168,6 @@ if ${COMP} -o "test-${1}" "${SOURCEDIR}/test-${1}.c" ${3} ${4} 1>&3 2>&3 then diff --git a/srcpkgs/mdocml/patches/fix-tbl-NULL-pointer-dereference.patch b/srcpkgs/mdocml/patches/fix-tbl-NULL-pointer-dereference.patch index 0ef1f36216b..8a3b5891f87 100644 --- a/srcpkgs/mdocml/patches/fix-tbl-NULL-pointer-dereference.patch +++ b/srcpkgs/mdocml/patches/fix-tbl-NULL-pointer-dereference.patch @@ -3,8 +3,8 @@ RCS file: /vhosts/mdocml.bsd.lv/cvs/mdocml/tbl_term.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 ---- tbl_term.c 2019/03/16 21:35:48 1.69 -+++ tbl_term.c 2019/03/18 08:00:34 1.70 +--- a/tbl_term.c 2019/03/16 21:35:48 1.69 ++++ b/tbl_term.c 2019/03/18 08:00:34 1.70 @@ -629,7 +629,8 @@ tbl_hrule(struct termp *tp, const struct tbl_span *spp lw = cpp == NULL || cpn == NULL || diff --git a/srcpkgs/mdocml/patches/fix-tbl-crash.patch b/srcpkgs/mdocml/patches/fix-tbl-crash.patch index 62f6ca48e3d..fdb538b3d35 100644 --- a/srcpkgs/mdocml/patches/fix-tbl-crash.patch +++ b/srcpkgs/mdocml/patches/fix-tbl-crash.patch @@ -3,8 +3,8 @@ RCS file: /vhosts/mdocml.bsd.lv/cvs/mdocml/out.c,v retrieving revision 1.77 retrieving revision 1.78 diff -u -p -r1.77 -r1.78 ---- out.c 2018/12/13 11:55:47 1.77 -+++ out.c 2019/03/29 21:27:06 1.78 +--- a/out.c 2018/12/13 11:55:47 1.77 ++++ b/out.c 2019/03/29 21:27:06 1.78 @@ -149,7 +149,7 @@ tblcalc(struct rofftbl *tbl, const struct tbl_span *sp gp = &first_group; for (dp = sp->first; dp != NULL; dp = dp->next) { diff --git a/srcpkgs/mdocml/patches/fix.9868-1.patch b/srcpkgs/mdocml/patches/fix.9868-1.patch index 83b87df3987..913e9646416 100644 --- a/srcpkgs/mdocml/patches/fix.9868-1.patch +++ b/srcpkgs/mdocml/patches/fix.9868-1.patch @@ -27,8 +27,8 @@ RCS file: /home/cvs/mandoc/mandoc/mansearch.c,v retrieving revision 1.80 retrieving revision 1.81 diff -Lmansearch.c -Lmansearch.c -u -p -r1.80 -r1.81 ---- mansearch.c -+++ mansearch.c +--- a/mansearch.c ++++ b/mansearch.c @@ -199,6 +199,7 @@ mansearch(const struct mansearch *search } mpage->names = buildnames(page); @@ -65,8 +65,8 @@ RCS file: /home/cvs/mandoc/mandoc/mansearch.h,v retrieving revision 1.29 retrieving revision 1.30 diff -Lmansearch.h -Lmansearch.h -u -p -r1.29 -r1.30 ---- mansearch.h -+++ mansearch.h +--- a/mansearch.h ++++ b/mansearch.h @@ -92,6 +92,7 @@ struct manpage { char *file; /* to be prefixed by manpath */ char *names; /* a list of names with sections */ @@ -81,8 +81,8 @@ RCS file: /home/cvs/mandoc/mandoc/main.c,v retrieving revision 1.322 retrieving revision 1.323 diff -Lmain.c -Lmain.c -u -p -r1.322 -r1.323 ---- main.c -+++ main.c +--- a/main.c ++++ b/main.c @@ -411,6 +411,7 @@ main(int argc, char *argv[]) res[sz].file = mandoc_strdup(argv[c]); res[sz].names = NULL; diff --git a/srcpkgs/mdocml/patches/fix.9868-2.patch b/srcpkgs/mdocml/patches/fix.9868-2.patch index e031c3394e3..4e6e890c8c8 100644 --- a/srcpkgs/mdocml/patches/fix.9868-2.patch +++ b/srcpkgs/mdocml/patches/fix.9868-2.patch @@ -28,8 +28,8 @@ RCS file: /home/cvs/mandoc/mandoc/main.c,v retrieving revision 1.324 retrieving revision 1.325 diff -Lmain.c -Lmain.c -u -p -r1.324 -r1.325 ---- main.c -+++ main.c +--- a/main.c ++++ b/main.c @@ -125,7 +125,7 @@ main(int argc, char *argv[]) char *conf_file, *defpaths, *auxpaths; char *oarg, *tagarg; diff --git a/srcpkgs/mdocml/patches/fix.9868-3.patch b/srcpkgs/mdocml/patches/fix.9868-3.patch index 914f1ff9eaa..80e554adf28 100644 --- a/srcpkgs/mdocml/patches/fix.9868-3.patch +++ b/srcpkgs/mdocml/patches/fix.9868-3.patch @@ -21,8 +21,8 @@ RCS file: /home/cvs/mandoc/mandoc/mandocdb.c,v retrieving revision 1.262 retrieving revision 1.263 diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.262 -r1.263 ---- mandocdb.c -+++ mandocdb.c +--- a/mandocdb.c ++++ b/mandocdb.c @@ -1,7 +1,7 @@ /* $Id$ */ /* diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template index d19966633ba..2332eb13dfc 100644 --- a/srcpkgs/mdocml/template +++ b/srcpkgs/mdocml/template @@ -17,7 +17,6 @@ homepage="http://mandoc.bsd.lv" distfiles="http://mandoc.bsd.lv/snapshots/mandoc-${version}.tar.gz" checksum=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7 provides="man-0_1" -patch_args=-Np0 alternatives=" man:man:/usr/bin/mandoc diff --git a/srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch b/srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch index 126edc57513..3f78b4f94e7 100644 --- a/srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch +++ b/srcpkgs/mednafen/patches/ppc64-snes-libco-elfv2.patch @@ -23,8 +23,8 @@ targets. diff --git a/libco/libco.c b/libco/libco.c index de11fbe9..f5ee5d0a 100755 ---- src/snes/src/lib/libco/libco.c -+++ src/snes/src/lib/libco/libco.c +--- a/src/snes/src/lib/libco/libco.c ++++ b/src/snes/src/lib/libco/libco.c @@ -9,6 +9,8 @@ #include "amd64.c" #elif defined(__arm__) @@ -38,7 +38,7 @@ diff --git a/libco/ppc64v2.c b/libco/ppc64v2.c new file mode 100644 index 00000000..8f733de2 --- /dev/null -+++ src/snes/src/lib/libco/ppc64v2.c ++++ b/src/snes/src/lib/libco/ppc64v2.c @@ -0,0 +1,283 @@ +/** + * libco implementation for ppc64 elfv2. diff --git a/srcpkgs/mednafen/template b/srcpkgs/mednafen/template index aed46822a2b..e56addb3501 100644 --- a/srcpkgs/mednafen/template +++ b/srcpkgs/mednafen/template @@ -15,7 +15,6 @@ homepage="https://mednafen.github.io/" distfiles="https://mednafen.github.io/releases/files/mednafen-${version}.tar.xz" checksum=842907c25c4292c9ba497c9cb9229c7d10e04e22cb4740d154ab690e6587fdf4 nopie=yes -patch_args=-Np0 build_options="altivec" desc_option_altivec="Enable AltiVec support on PowerPC" diff --git a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch b/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch index e261d7b4b0e..d998fc5a418 100644 --- a/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch +++ b/srcpkgs/memtest86+/patches/00.memtest86+-5.01-no-scp.patch @@ -1,5 +1,5 @@ ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -21,7 +21,6 @@ OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ diff --git a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch b/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch index fe76ad57611..d6453654a2b 100644 --- a/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch +++ b/srcpkgs/memtest86+/patches/01.memtest86+-5.01-no-optimization.patch @@ -5,8 +5,8 @@ http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-o Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ ---- Makefile~ 2014-01-08 01:30:11.355900076 +0000 -+++ Makefile 2014-01-08 01:31:19.387555469 +0000 +--- a/Makefile~ 2014-01-08 01:30:11.355900076 +0000 ++++ b/Makefile 2014-01-08 01:31:19.387555469 +0000 @@ -12,7 +12,7 @@ AS=as -32 CC=gcc diff --git a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch b/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch index aa1e2d7c101..348d5b152d2 100644 --- a/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch +++ b/srcpkgs/memtest86+/patches/02.memtest86+-5.01-compile-fix.patch @@ -5,8 +5,8 @@ http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-o Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ ---- io.h~ 2013-08-10 02:01:58.000000000 +0000 -+++ io.h 2014-01-08 01:29:12.404465515 +0000 +--- a/io.h~ 2013-08-10 02:01:58.000000000 +0000 ++++ b/io.h 2014-01-08 01:29:12.404465515 +0000 @@ -31,7 +31,7 @@ */ diff --git a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch b/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch index ed0a10c0de5..56f40d7bcfa 100644 --- a/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch +++ b/srcpkgs/memtest86+/patches/03.memtest86+-5.01-crash-fix.patch @@ -5,8 +5,8 @@ http://forum.canardpc.com/threads/83443-Memtest86-V5.01-crashes-with-gcc-4.7.2-o Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ ---- controller.c.orig -+++ controller.c +--- a/controller.c ++++ b/controller.c @@ -2,6 +2,8 @@ * MemTest86+ V5 Specific code (GPL V2.0) * By Samuel DEMEULEMEESTER, sdemeule@memtest.org @@ -59,8 +59,8 @@ Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ ptr2=(long*)(dev6+0x68); /* Read the MMR Base Address & Define the pointer */ ---- init.c.orig -+++ init.c +--- a/init.c ++++ b/init.c @@ -7,6 +7,8 @@ * * Released under version 2 of the Gnu Public License. @@ -78,8 +78,8 @@ Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ } } ---- main.c.orig -+++ main.c +--- a/main.c ++++ b/main.c @@ -422,7 +422,7 @@ void test_start(void) //initialise_cpus(); btrace(my_cpu_num, __LINE__, "BeforeInit", 1, 0, 0); diff --git a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch b/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch index d91d8d72940..d044e72094c 100644 --- a/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch +++ b/srcpkgs/memtest86+/patches/04.memtest86+-5.01-fgnu89-inline.patch @@ -2,8 +2,8 @@ Patch source: http://pkgs.fedoraproject.org/cgit/rpms/memtest86+.git/ ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -13,7 +13,7 @@ AS=as -32 CC=gcc diff --git a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch b/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch index acd46c0a464..ddb3d596868 100644 --- a/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch +++ b/srcpkgs/memtest86+/patches/05.memtest86+-5.01-fno-stack-protector.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2019-03-29 16:41:29.629879497 +0100 -+++ Makefile 2019-03-29 16:41:55.351031244 +0100 +--- a/Makefile 2019-03-29 16:41:29.629879497 +0100 ++++ b/Makefile 2019-03-29 16:41:55.351031244 +0100 @@ -53,7 +53,7 @@ $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template index 04792c5dc08..c4850769d62 100644 --- a/srcpkgs/memtest86+/template +++ b/srcpkgs/memtest86+/template @@ -9,7 +9,6 @@ license="GPL-2.0-or-later" homepage="http://www.memtest.org" distfiles="http://www.memtest.org/download/${version}/${pkgname}-${version}.tar.gz" checksum=142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 -patch_args=-Np0 nostrip=yes noverifyrdeps=yes diff --git a/srcpkgs/mergerfs/patches/0001-install_fix.patch b/srcpkgs/mergerfs/patches/0001-install_fix.patch index a8de8865b05..d4fe34e116d 100644 --- a/srcpkgs/mergerfs/patches/0001-install_fix.patch +++ b/srcpkgs/mergerfs/patches/0001-install_fix.patch @@ -9,8 +9,8 @@ Subject: [PATCH] install_fix diff --git libfuse/Makefile libfuse/Makefile index 61a1a11..99ccf9f 100644 ---- libfuse/Makefile -+++ libfuse/Makefile +--- a/libfuse/Makefile ++++ b/libfuse/Makefile @@ -106,13 +106,8 @@ strip: strip --strip-all build/mount.mergerfs strip --strip-all build/mergerfs-fusermount diff --git a/srcpkgs/mergerfs/template b/srcpkgs/mergerfs/template index d7226ee6103..db4399c448e 100644 --- a/srcpkgs/mergerfs/template +++ b/srcpkgs/mergerfs/template @@ -12,7 +12,6 @@ license="ISC" homepage="https://github.com/trapexit/mergerfs" distfiles="${homepage}/archive/${version}.tar.gz" checksum=8857d2058c38251bff539c77b6c90472ab139bda96265ce09485c3689d11a4ac -patch_args=-Np0 pre_build() { # we build from source, spoof release tarball diff --git a/srcpkgs/merkaartor/patches/QPainterPath.patch b/srcpkgs/merkaartor/patches/QPainterPath.patch index e9c9273ebe1..535d8340fa5 100644 --- a/srcpkgs/merkaartor/patches/QPainterPath.patch +++ b/srcpkgs/merkaartor/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- interfaces/IFeature.h 2019-11-12 15:09:05.000000000 +0100 -+++ interfaces/IFeature.h 2020-09-01 19:40:43.284975549 +0200 +--- a/interfaces/IFeature.h 2019-11-12 15:09:05.000000000 +0100 ++++ b/interfaces/IFeature.h 2020-09-01 19:40:43.284975549 +0200 @@ -4,10 +4,11 @@ #include #include @@ -13,8 +13,8 @@ class IFeature { ---- src/Features/Feature.h 2019-11-12 15:09:05.000000000 +0100 -+++ src/Features/Feature.h 2020-09-01 19:40:16.524974169 +0200 +--- a/src/Features/Feature.h 2019-11-12 15:09:05.000000000 +0100 ++++ b/src/Features/Feature.h 2020-09-01 19:40:16.524974169 +0200 @@ -10,6 +10,8 @@ #include @@ -24,8 +24,8 @@ #define CAST_FEATURE(x) (dynamic_cast(x)) #define CAST_NODE(x) (dynamic_cast(x)) ---- src/Features/Relation.h 2019-11-12 15:09:05.000000000 +0100 -+++ src/Features/Relation.h 2020-09-01 19:40:02.889973465 +0200 +--- a/src/Features/Relation.h 2019-11-12 15:09:05.000000000 +0100 ++++ b/src/Features/Relation.h 2020-09-01 19:40:02.889973465 +0200 @@ -4,6 +4,9 @@ #include "Document.h" #include "Feature.h" @@ -36,8 +36,8 @@ class MainWindow; class RelationPrivate; class QAbstractTableModel; ---- src/Features/Way.h 2019-11-12 15:09:05.000000000 +0100 -+++ src/Features/Way.h 2020-09-01 19:40:30.309974880 +0200 +--- a/src/Features/Way.h 2019-11-12 15:09:05.000000000 +0100 ++++ b/src/Features/Way.h 2020-09-01 19:40:30.309974880 +0200 @@ -2,6 +2,8 @@ #define MERKAARTOR_ROAD_H_ @@ -47,8 +47,8 @@ #include "Document.h" #include "Feature.h" ---- src/PaintStyle/FeaturePainter.h 2019-11-12 15:09:05.000000000 +0100 -+++ src/PaintStyle/FeaturePainter.h 2020-09-01 19:39:41.450972359 +0200 +--- a/src/PaintStyle/FeaturePainter.h 2019-11-12 15:09:05.000000000 +0100 ++++ b/src/PaintStyle/FeaturePainter.h 2020-09-01 19:39:41.450972359 +0200 @@ -6,6 +6,8 @@ #include @@ -67,8 +67,8 @@ class QFont; class QDomElement; ---- src/PaintStyle/PrimitivePainter.h 2019-11-12 15:09:05.000000000 +0100 -+++ src/PaintStyle/PrimitivePainter.h 2020-09-01 19:39:24.565971488 +0200 +--- a/src/PaintStyle/PrimitivePainter.h 2019-11-12 15:09:05.000000000 +0100 ++++ b/src/PaintStyle/PrimitivePainter.h 2020-09-01 19:39:24.565971488 +0200 @@ -8,6 +8,8 @@ #include #include @@ -87,8 +87,8 @@ class QFont; class QDomElement; ---- src/common/Painting.h 2019-11-12 15:09:05.000000000 +0100 -+++ src/common/Painting.h 2020-09-01 19:38:48.379969621 +0200 +--- a/src/common/Painting.h 2019-11-12 15:09:05.000000000 +0100 ++++ b/src/common/Painting.h 2020-09-01 19:38:48.379969621 +0200 @@ -8,10 +8,10 @@ class Way; class Way; diff --git a/srcpkgs/merkaartor/template b/srcpkgs/merkaartor/template index d917aef6ad9..17c8d5dc361 100644 --- a/srcpkgs/merkaartor/template +++ b/srcpkgs/merkaartor/template @@ -13,6 +13,5 @@ license="GPL-2.0-or-later" homepage="http://merkaartor.be" distfiles="https://github.com/openstreetmap/merkaartor/archive/${version}.tar.gz" checksum=16e790507a5bb54e4b3c09ea063ebb095a4b014ce8ba937b771706d4c940976a -patch_args=-Np0 CXXFLAGS="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" diff --git a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch index 47e138d57a3..ea1080a0d2e 100644 --- a/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch +++ b/srcpkgs/mesa/patches/0001-radeonsi-On-Aarch64-force-persistent-buffers-to-GTT.patch @@ -20,8 +20,8 @@ Signed-off-by: Jon Nettleton diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c index 6b58aebee2d..c9e983367a0 100644 ---- src/gallium/drivers/radeonsi/si_buffer.c -+++ src/gallium/drivers/radeonsi/si_buffer.c +--- a/src/gallium/drivers/radeonsi/si_buffer.c ++++ b/src/gallium/drivers/radeonsi/si_buffer.c @@ -151,6 +151,11 @@ void si_init_resource_fields(struct si_screen *sscreen, struct si_resource *res, */ if (!sscreen->info.kernel_flushes_hdp_before_ib || !sscreen->info.is_amdgpu) diff --git a/srcpkgs/mesa/patches/add-use-elf-tls.patch b/srcpkgs/mesa/patches/add-use-elf-tls.patch index e10fdfa225b..c9bbceb45f3 100644 --- a/srcpkgs/mesa/patches/add-use-elf-tls.patch +++ b/srcpkgs/mesa/patches/add-use-elf-tls.patch @@ -3,8 +3,8 @@ Status: Not fixed upstream diff --git meson.build meson.build index 932eb13..1d1a4be 100644 ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -448,7 +448,8 @@ endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. @@ -17,8 +17,8 @@ index 932eb13..1d1a4be 100644 endif diff --git meson_options.txt meson_options.txt index fc73f6e..2d9e4a2 100644 ---- meson_options.txt -+++ meson_options.txt +--- a/meson_options.txt ++++ b/meson_options.txt @@ -445,6 +445,12 @@ option( value : 25, description : 'Android Platform SDK version. Default: Nougat version.' diff --git a/srcpkgs/mesa/patches/d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea.patch b/srcpkgs/mesa/patches/d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea.patch index 0b1e5fdc043..04bdacdb346 100644 --- a/srcpkgs/mesa/patches/d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea.patch +++ b/srcpkgs/mesa/patches/d1eab2b1eb1dec10197db7d25e27d97f6ca1a2ea.patch @@ -27,8 +27,8 @@ Part-of: diff --git a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp index 78eb8c982a8..d537819f292 100644 ---- src/gallium/frontends/clover/llvm/compat.hpp -+++ src/gallium/frontends/clover/llvm/compat.hpp +--- a/src/gallium/frontends/clover/llvm/compat.hpp ++++ b/src/gallium/frontends/clover/llvm/compat.hpp @@ -38,14 +38,14 @@ #include @@ -71,8 +71,8 @@ index 78eb8c982a8..d537819f292 100644 } diff --git a/src/gallium/frontends/clover/llvm/invocation.cpp b/src/gallium/frontends/clover/llvm/invocation.cpp index 536e952b100..30592e4343b 100644 ---- src/gallium/frontends/clover/llvm/invocation.cpp -+++ src/gallium/frontends/clover/llvm/invocation.cpp +--- a/src/gallium/frontends/clover/llvm/invocation.cpp ++++ b/src/gallium/frontends/clover/llvm/invocation.cpp @@ -247,9 +247,8 @@ namespace { // http://www.llvm.org/bugs/show_bug.cgi?id=19735 c->getDiagnosticOpts().ShowCarets = false; diff --git a/srcpkgs/mesa/patches/f0dccd957879ff642cfd921dda6e8b04dd35fec4.patch b/srcpkgs/mesa/patches/f0dccd957879ff642cfd921dda6e8b04dd35fec4.patch index 84b0f9e018c..04dbd861d42 100644 --- a/srcpkgs/mesa/patches/f0dccd957879ff642cfd921dda6e8b04dd35fec4.patch +++ b/srcpkgs/mesa/patches/f0dccd957879ff642cfd921dda6e8b04dd35fec4.patch @@ -13,8 +13,8 @@ Part-of: diff --git a/src/gallium/frontends/clover/llvm/compat.hpp b/src/gallium/frontends/clover/llvm/compat.hpp index d537819f292..380d16a8346 100644 ---- src/gallium/frontends/clover/llvm/compat.hpp -+++ src/gallium/frontends/clover/llvm/compat.hpp +--- a/src/gallium/frontends/clover/llvm/compat.hpp ++++ b/src/gallium/frontends/clover/llvm/compat.hpp @@ -49,6 +49,7 @@ #include diff --git a/srcpkgs/mesa/patches/musl-endian.patch b/srcpkgs/mesa/patches/musl-endian.patch index a4fa5ae76b0..57b3cc3d09f 100644 --- a/srcpkgs/mesa/patches/musl-endian.patch +++ b/srcpkgs/mesa/patches/musl-endian.patch @@ -1,5 +1,5 @@ ---- src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100 -+++ src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100 +--- a/src/util/u_endian.h 2017-12-21 18:31:22.000000000 +0100 ++++ b/src/util/u_endian.h 2017-12-26 09:22:52.597199480 +0100 @@ -68,6 +68,16 @@ #define PIPE_ARCH_LITTLE_ENDIAN diff --git a/srcpkgs/mesa/patches/musl-stacksize.patch b/srcpkgs/mesa/patches/musl-stacksize.patch index a8fb6735517..be2f5d454f5 100644 --- a/srcpkgs/mesa/patches/musl-stacksize.patch +++ b/srcpkgs/mesa/patches/musl-stacksize.patch @@ -1,7 +1,7 @@ diff --git ./include/c11/threads_posix.h ./include/c11/threads_posix.h index 45cb6075e6..1a2ea1a450 100644 ---- ./include/c11/threads_posix.h -+++ ./include/c11/threads_posix.h +--- a/include/c11/threads_posix.h ++++ b/include/c11/threads_posix.h @@ -281,15 +281,29 @@ static inline int thrd_create(thrd_t *thr, thrd_start_t func, void *arg) { diff --git a/srcpkgs/mesa/patches/musl.patch b/srcpkgs/mesa/patches/musl.patch index f00f0f78c99..46db8d74737 100644 --- a/srcpkgs/mesa/patches/musl.patch +++ b/srcpkgs/mesa/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/gallium/winsys/svga/drm/vmw_screen.h.orig 2015-05-07 14:02:28.033079796 +0200 -+++ src/gallium/winsys/svga/drm/vmw_screen.h 2015-05-07 14:02:48.832054666 +0200 +--- a/src/gallium/winsys/svga/drm/vmw_screen.h 2015-05-07 14:02:28.033079796 +0200 ++++ b/src/gallium/winsys/svga/drm/vmw_screen.h 2015-05-07 14:02:48.832054666 +0200 @@ -35,6 +35,8 @@ #define VMW_SCREEN_H_ @@ -9,8 +9,8 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- src/gallium/frontends/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 -+++ src/gallium/frontends/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 +--- a/src/gallium/frontends/nine/threadpool.h 2015-05-07 14:10:53.443337212 +0200 ++++ b/src/gallium/frontends/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 @@ -24,6 +24,8 @@ #ifndef _THREADPOOL_H_ #define _THREADPOOL_H_ @@ -20,8 +20,8 @@ #define MAXTHREADS 1 struct threadpool { ---- src/util/rand_xor.c.orig 2020-10-03 12:27:48.489024729 +0200 -+++ src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200 +--- a/src/util/rand_xor.c 2020-10-03 12:27:48.489024729 +0200 ++++ b/src/util/rand_xor.c 2020-10-03 12:31:05.927113521 +0200 @@ -28,6 +28,7 @@ #if defined(HAVE_GETRANDOM) #include @@ -30,8 +30,8 @@ #include #include #endif ---- src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h -+++ src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h ++++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -28,6 +28,8 @@ #ifndef RADV_AMDGPU_WINSYS_H #define RADV_AMDGPU_WINSYS_H @@ -41,8 +41,8 @@ #include "radv_radeon_winsys.h" #include "ac_gpu_info.h" #include "addrlib/addrinterface.h" ---- src/gallium/frontends/nine/nine_debug.c.orig 2020-03-06 07:46:48.278918421 +0100 -+++ src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100 +--- a/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:46:48.278918421 +0100 ++++ b/src/gallium/frontends/nine/nine_debug.c 2020-03-06 07:51:32.919964119 +0100 @@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag, { static boolean first = TRUE; diff --git a/srcpkgs/mesa/patches/no-unlink-megadrivers.patch b/srcpkgs/mesa/patches/no-unlink-megadrivers.patch index 3f904abe802..acad4dd6390 100644 --- a/srcpkgs/mesa/patches/no-unlink-megadrivers.patch +++ b/srcpkgs/mesa/patches/no-unlink-megadrivers.patch @@ -2,8 +2,8 @@ This patch is needed to retain the master .so, so that only that filename is stripped while the related hard links are excluded. diff --git bin/install_megadrivers.py bin/install_megadrivers.py index 470137e..7d56def 100644 ---- bin/install_megadrivers.py -+++ bin/install_megadrivers.py +--- a/bin/install_megadrivers.py ++++ b/bin/install_megadrivers.py @@ -71,7 +71,7 @@ def main(): os.chdir(ret) diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 1d5391040f4..414c918c7ba 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -24,7 +24,6 @@ homepage="https://www.mesa3d.org/" changelog="https://docs.mesa3d.org/relnotes/${version}.html" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" checksum=565c6f4bd2d5747b919454fc1d439963024fc78ca56fd05158c3b2cde2f6912b -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then configure_args+=" -Duse-elf-tls=false" diff --git a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch index 27253a71bc7..3eefcff8e11 100644 --- a/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch +++ b/srcpkgs/meson/patches/dont-use-native-pkgconfig-for-gir.patch @@ -1,5 +1,5 @@ ---- mesonbuild/modules/gnome.py 2020-06-29 19:00:15.000000000 +0200 -+++ - 2020-07-13 12:48:58.087313471 +0200 +--- a/mesonbuild/modules/gnome.py 2020-06-29 19:00:15.000000000 +0200 ++++ b/mesonbuild/modules/gnome.py 2020-06-29 19:00:15.000000000 +0200 @@ -403,7 +403,7 @@ def _get_gir_dep(self, state): diff --git a/srcpkgs/meson/patches/fix-unittest.patch b/srcpkgs/meson/patches/fix-unittest.patch index 746de056ed7..8f73249b9f8 100644 --- a/srcpkgs/meson/patches/fix-unittest.patch +++ b/srcpkgs/meson/patches/fix-unittest.patch @@ -22,8 +22,8 @@ Date: Mon Feb 1 00:26:49 2021 -0300 diff --git test cases/common/37 has function/meson.build test cases/common/37 has function/meson.build index 26f13d6fa..a59480c2d 100644 ---- test cases/common/39 has function/meson.build -+++ test cases/common/39 has function/meson.build +--- a/test cases/common/39 has function/meson.build ++++ b/test cases/common/39 has function/meson.build @@ -44,11 +44,13 @@ foreach cc : compilers error('Found non-existent function "hfkerhisadf".') endif diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index 4561095b907..ee2cab625cb 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -16,7 +16,6 @@ homepage="https://mesonbuild.com" changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz" checksum=3cb8bdb91383f7f8da642f916e4c44066a29262caa499341e2880f010edb87f4 -patch_args=-Np0 # XXX: sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then diff --git a/srcpkgs/mftrace/patches/gf2pbm.1.patch b/srcpkgs/mftrace/patches/gf2pbm.1.patch index 0619ff9a2fb..407a27dc752 100644 --- a/srcpkgs/mftrace/patches/gf2pbm.1.patch +++ b/srcpkgs/mftrace/patches/gf2pbm.1.patch @@ -1,5 +1,5 @@ ---- GNUmakefile.in -+++ GNUmakefile.in +--- a/GNUmakefile.in ++++ b/GNUmakefile.in @@ -14,7 +14,7 @@ CFLAGS += -I. srcdir=@srcdir@ VPATH=$(srcdir) diff --git a/srcpkgs/mftrace/template b/srcpkgs/mftrace/template index 09ee52a11a3..10f2c1ecfdc 100644 --- a/srcpkgs/mftrace/template +++ b/srcpkgs/mftrace/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="http://lilypond.org/mftrace" distfiles="http://lilypond.org/downloads/sources/${pkgname}/${pkgname}-${version}.tar.gz" checksum=626b7a9945a768c086195ba392632a68d6af5ea24ef525dcd0a4a8b199ea5f6f -patch_args=-Np0 diff --git a/srcpkgs/mg/patches/pkg-config-ncurses.patch b/srcpkgs/mg/patches/pkg-config-ncurses.patch index 11f3b9e4496..2ec68c1ebdc 100644 --- a/srcpkgs/mg/patches/pkg-config-ncurses.patch +++ b/srcpkgs/mg/patches/pkg-config-ncurses.patch @@ -1,5 +1,5 @@ ---- GNUmakefile.orig 2016-09-05 13:51:19.133051791 +0200 -+++ GNUmakefile 2016-09-05 13:51:29.519052327 +0200 +--- a/GNUmakefile 2016-09-05 13:51:19.133051791 +0200 ++++ b/GNUmakefile 2016-09-05 13:51:29.519052327 +0200 @@ -13,7 +13,7 @@ includedir= $(prefix)/include mandir= $(prefix)/man diff --git a/srcpkgs/mg/template b/srcpkgs/mg/template index 3414fa23e10..8bb7fd00185 100644 --- a/srcpkgs/mg/template +++ b/srcpkgs/mg/template @@ -10,7 +10,6 @@ license="Public Domain" homepage="https://github.com/hboetes/mg" distfiles="https://github.com/hboetes/mg/archive/${version}.tar.gz" checksum=6820e76a0e27d9a744624d421b3b30b0030140c2a817df1310b25c3abe397106 -patch_args=-Np0 CFLAGS="-DTCSASOFT=0" diff --git a/srcpkgs/mhddfs/patches/fix-build.patch b/srcpkgs/mhddfs/patches/fix-build.patch index 3036128beab..b3013c5510a 100644 --- a/srcpkgs/mhddfs/patches/fix-build.patch +++ b/srcpkgs/mhddfs/patches/fix-build.patch @@ -6,8 +6,8 @@ Date: Wed Jan 1 22:42:38 2020 +0100 diff --git src/main.c src/main.c index 6dc3230..1dfb3ef 100644 ---- src/main.c -+++ src/main.c +--- a/src/main.c ++++ b/src/main.c @@ -34,7 +34,7 @@ #include @@ -19,8 +19,8 @@ index 6dc3230..1dfb3ef 100644 #include "parse_options.h" diff --git src/tools.c src/tools.c index c427b82..69747a8 100644 ---- src/tools.c -+++ src/tools.c +--- a/src/tools.c ++++ b/src/tools.c @@ -32,7 +32,7 @@ #include diff --git a/srcpkgs/mhddfs/template b/srcpkgs/mhddfs/template index 5dfe2cc2c7f..b60fcb06a7b 100644 --- a/srcpkgs/mhddfs/template +++ b/srcpkgs/mhddfs/template @@ -11,7 +11,6 @@ license="GPL-3" homepage="http://mhddfs.uvw.ru/" distfiles="http://mhddfs.uvw.ru/downloads/${pkgname}_${version}.tar.gz" checksum=702fc5486460c1828898426b1935179ce60bc1ed16fc8bc575c9ec1d12acef91 -patch_args=-Np0 pre_build() { sed -i 's|^CFLAGS[[:blank:]]*=|override CFLAGS +=|g' Makefile diff --git a/srcpkgs/milkytracker/patches/fix-jack-library-call.patch b/srcpkgs/milkytracker/patches/fix-jack-library-call.patch index c297c38e47f..ae31447510e 100644 --- a/srcpkgs/milkytracker/patches/fix-jack-library-call.patch +++ b/srcpkgs/milkytracker/patches/fix-jack-library-call.patch @@ -1,5 +1,5 @@ ---- ./src/milkyplay/drivers/jack/AudioDriver_JACK.cpp.orig -+++ ./src/milkyplay/drivers/jack/AudioDriver_JACK.cpp +--- a/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp ++++ b/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp @@ -92,7 +92,7 @@ mp_sint32 AudioDriver_JACK::initDevice(mp_sint32 bufferSizeInWords, mp_uint32 mixFrequency, MasterMixer* mixer) { diff --git a/srcpkgs/milkytracker/template b/srcpkgs/milkytracker/template index 767cc259066..9f5cffd6130 100644 --- a/srcpkgs/milkytracker/template +++ b/srcpkgs/milkytracker/template @@ -13,7 +13,6 @@ license="GPL-3.0-only" homepage="http://milkytracker.titandemo.org/" distfiles="https://github.com/milkytracker/MilkyTracker/archive/v${version}.tar.gz" checksum=6bcb6e74ee333e831137435a25c0f2f3da6e1462864deec9e693ef7d23a16023 -patch_args=-Np0 post_install() { vinstall resources/milkytracker.desktop 644 usr/share/applications diff --git a/srcpkgs/mimic/patches/musl.patch b/srcpkgs/mimic/patches/musl.patch index bbf7702a88c..e381f5db442 100644 --- a/srcpkgs/mimic/patches/musl.patch +++ b/srcpkgs/mimic/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/hts/hts_engine_API/lib/HTS_misc.c.orig 2020-05-06 08:48:23.207180474 -0400 -+++ src/hts/hts_engine_API/lib/HTS_misc.c 2020-05-06 08:49:38.850713440 -0400 +--- a/src/hts/hts_engine_API/lib/HTS_misc.c 2020-05-06 08:48:23.207180474 -0400 ++++ b/src/hts/hts_engine_API/lib/HTS_misc.c 2020-05-06 08:49:38.850713440 -0400 @@ -247,6 +247,8 @@ fgetpos((FILE *) fp->pointer, &pos); #if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) diff --git a/srcpkgs/mimic/template b/srcpkgs/mimic/template index 3424c48ed87..ed11690e5bd 100644 --- a/srcpkgs/mimic/template +++ b/srcpkgs/mimic/template @@ -14,7 +14,6 @@ homepage="https://github.com/MycroftAI/mimic" changelog="https://github.com/MycroftAI/mimic1/releases" distfiles="https://github.com/MycroftAI/mimic/archive/${version}.tar.gz" checksum=9041f5c7d3720899c90c890ada179c92c3b542b90bb655c247e4a4835df79249 -patch_args=-Np0 pre_configure() { ./autogen.sh diff --git a/srcpkgs/minicom/patches/Add-ARRAY_SIZE-macro.patch b/srcpkgs/minicom/patches/Add-ARRAY_SIZE-macro.patch index cf3784e1e85..2ad6cdcc809 100644 --- a/srcpkgs/minicom/patches/Add-ARRAY_SIZE-macro.patch +++ b/srcpkgs/minicom/patches/Add-ARRAY_SIZE-macro.patch @@ -6,8 +6,8 @@ Add ARRAY_SIZE macro diff -r 3cb4335d5819 -r 4eff7b4cde33 src/minicom.h ---- src/minicom.h Mon Jun 29 21:16:14 2015 +0200 -+++ src/minicom.h Sun Aug 23 23:16:40 2015 +0200 +--- a/src/minicom.h Mon Jun 29 21:16:14 2015 +0200 ++++ b/src/minicom.h Sun Aug 23 23:16:40 2015 +0200 @@ -302,6 +302,7 @@ int lockfile_create(int no_msgs); void lockfile_remove(void); diff --git a/srcpkgs/minicom/patches/CVE-2017-7467.patch b/srcpkgs/minicom/patches/CVE-2017-7467.patch index c3c3edf8c30..0b704e7d1d2 100644 --- a/srcpkgs/minicom/patches/CVE-2017-7467.patch +++ b/srcpkgs/minicom/patches/CVE-2017-7467.patch @@ -19,8 +19,8 @@ Openwall would like to thank the Virtuozzo company for funding the effort. diff -r c72edf0e43bc -r c33d24938f3e src/vt100.c ---- src/vt100.c Sat Sep 17 02:17:37 2016 +0200 -+++ src/vt100.c Tue Apr 18 12:20:34 2017 +0200 +--- a/src/vt100.c Sat Sep 17 02:17:37 2016 +0200 ++++ b/src/vt100.c Tue Apr 18 12:20:34 2017 +0200 @@ -427,7 +427,7 @@ } /* Separation between numbers ? */ diff --git a/srcpkgs/minicom/patches/musl-sys_param_h.patch b/srcpkgs/minicom/patches/musl-sys_param_h.patch index e59d67954c3..be395faa80d 100644 --- a/srcpkgs/minicom/patches/musl-sys_param_h.patch +++ b/srcpkgs/minicom/patches/musl-sys_param_h.patch @@ -1,7 +1,7 @@ MAXNAMLEN is defined in sys/param.h ---- src/getsdir.c 2011-02-14 11:07:00.000000000 +0100 -+++ src/getsdir.c 2015-06-22 02:47:36.263541750 +0200 +--- a/src/getsdir.c 2011-02-14 11:07:00.000000000 +0100 ++++ b/src/getsdir.c 2015-06-22 02:47:36.263541750 +0200 @@ -28,6 +28,7 @@ #include #include diff --git a/srcpkgs/minicom/patches/musl-vc_music.patch b/srcpkgs/minicom/patches/musl-vc_music.patch index 11caa9dced9..59bc022bb15 100644 --- a/srcpkgs/minicom/patches/musl-vc_music.patch +++ b/srcpkgs/minicom/patches/musl-vc_music.patch @@ -2,8 +2,8 @@ In musl libc __GLIBC__ is not defined, while it has the same required header files for VC_MUSIC to work. Just disable the additional __GLIBC__ shield. ---- src/dial.c 2013-05-09 20:32:02.000000000 +0200 -+++ src/dial.c 2015-06-22 02:44:34.768551564 +0200 +--- a/src/dial.c 2013-05-09 20:32:02.000000000 +0200 ++++ b/src/dial.c 2015-06-22 02:44:34.768551564 +0200 @@ -39,11 +39,9 @@ #include "intl.h" diff --git a/srcpkgs/minicom/template b/srcpkgs/minicom/template index 49a229db257..8671f508256 100644 --- a/srcpkgs/minicom/template +++ b/srcpkgs/minicom/template @@ -10,6 +10,5 @@ license="GPL-2.0-or-later" homepage="https://tracker.debian.org/pkg/minicom" distfiles="https://deb.debian.org/debian/pool/main/m/minicom/minicom_${version}.orig.tar.gz" checksum=532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/minidlna/patches/config.patch b/srcpkgs/minidlna/patches/config.patch index ef3f2a538e5..414daa69d72 100644 --- a/srcpkgs/minidlna/patches/config.patch +++ b/srcpkgs/minidlna/patches/config.patch @@ -1,7 +1,7 @@ diff --git minidlna.conf minidlna.conf index 7e00e89..33a7c51 100644 ---- minidlna.conf -+++ minidlna.conf +--- a/minidlna.conf ++++ b/minidlna.conf @@ -5,7 +5,7 @@ port=8200 #network_interface=eth0 diff --git a/srcpkgs/minidlna/template b/srcpkgs/minidlna/template index aeb1f2f1b54..b112fb56efc 100644 --- a/srcpkgs/minidlna/template +++ b/srcpkgs/minidlna/template @@ -21,7 +21,6 @@ homepage="https://minidlna.sourceforge.net/" changelog="https://sourceforge.net/projects/minidlna/files/minidlna/${version}/README/view" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63 -patch_args=-Np0 system_accounts="minidlna" minidlna_homedir="/var/lib/minidlna" diff --git a/srcpkgs/minijail/patches/ppc.patch b/srcpkgs/minijail/patches/ppc.patch index 4265de4187f..720185589e5 100644 --- a/srcpkgs/minijail/patches/ppc.patch +++ b/srcpkgs/minijail/patches/ppc.patch @@ -3,8 +3,8 @@ that are in headers which are not included. Additionally, ELF_GREG_TYPE refers to a typedef, which is not a constant value. So undef them, just like some others are already undef'd for other platforms above that. ---- gen_constants-inl.h -+++ gen_constants-inl.h +--- a/gen_constants-inl.h ++++ b/gen_constants-inl.h @@ -24,3 +24,8 @@ // build errors on such broken systems. #undef BLKTRACESETUP diff --git a/srcpkgs/minijail/template b/srcpkgs/minijail/template index d0ac4d9d5ac..e3debe82a66 100644 --- a/srcpkgs/minijail/template +++ b/srcpkgs/minijail/template @@ -11,7 +11,6 @@ license="BSD-3-Clause" homepage="https://android.googlesource.com/platform/external/minijail" distfiles="https://github.com/google/minijail/archive/linux-v${version}.tar.gz" checksum=1efb6224465cf8a5bb7a69659b35482e69786fce572f29125201e9a0e793bdd6 -patch_args=-Np0 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then broken="bpf.h:110:2: error: #error Unsupported endianness" diff --git a/srcpkgs/minisat/patches/friend.patch b/srcpkgs/minisat/patches/friend.patch index 2aaf4acf318..69563f1fec9 100644 --- a/srcpkgs/minisat/patches/friend.patch +++ b/srcpkgs/minisat/patches/friend.patch @@ -1,5 +1,5 @@ ---- core/SolverTypes.h 2010-07-10 18:07:36.000000000 +0200 -+++ core/SolverTypes.h 2020-05-27 14:12:09.005969769 +0200 +--- a/core/SolverTypes.h 2010-07-10 18:07:36.000000000 +0200 ++++ b/core/SolverTypes.h 2020-05-27 14:12:09.005969769 +0200 @@ -46,8 +46,8 @@ struct Lit { int x; diff --git a/srcpkgs/minisat/template b/srcpkgs/minisat/template index 29246f9a7a0..e462c8ba34a 100644 --- a/srcpkgs/minisat/template +++ b/srcpkgs/minisat/template @@ -14,7 +14,6 @@ license="MIT" homepage="http://minisat.se/MiniSat.html" distfiles="http://minisat.se/downloads/minisat-2.2.0.tar.gz" checksum=92957d851cdc3baddfe07b5fc80ed5a0237c489d0c52ae72f62844b3b46d7808 -patch_args=-Np0 do_install() { vbin minisat_release minisat diff --git a/srcpkgs/minissdpd/patches/foreground.patch b/srcpkgs/minissdpd/patches/foreground.patch index 561adf85440..61165de49c8 100644 --- a/srcpkgs/minissdpd/patches/foreground.patch +++ b/srcpkgs/minissdpd/patches/foreground.patch @@ -1,7 +1,7 @@ diff --git minissdpd.c minissdpd.c index 6295af9..39dddb6 100644 ---- minissdpd.c -+++ minissdpd.c +--- a/minissdpd.c ++++ b/minissdpd.c @@ -1066,6 +1066,7 @@ int main(int argc, char * * argv) const char * sockpath = "/var/run/minissdpd.sock"; const char * pidfilename = "/var/run/minissdpd.pid"; diff --git a/srcpkgs/minissdpd/template b/srcpkgs/minissdpd/template index f5d497d014d..b0d56f0058d 100644 --- a/srcpkgs/minissdpd/template +++ b/srcpkgs/minissdpd/template @@ -10,7 +10,6 @@ license="3-clause-BSD" homepage="http://miniupnp.free.fr/minissdpd.html" distfiles="http://miniupnp.free.fr/files/minissdpd-${version}.tar.gz" checksum=dfd637b185731e1acb412a86faa9718eb93c04ca08280541a6d22d14d1fb890f -patch_args=-Np0 CFLAGS="-D_GNU_SOURCE" diff --git a/srcpkgs/mit-krb5/patches/libressl.patch b/srcpkgs/mit-krb5/patches/libressl.patch index 1c0c5cab095..6eb0dbfcaf3 100644 --- a/srcpkgs/mit-krb5/patches/libressl.patch +++ b/srcpkgs/mit-krb5/patches/libressl.patch @@ -1,5 +1,5 @@ ---- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100 -+++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200 +--- a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-01-08 17:02:37.000000000 +0100 ++++ b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-11 16:29:37.001458084 +0200 @@ -189,7 +189,7 @@ (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si) #endif diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index deabac5065f..fa18e58b733 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -14,7 +14,6 @@ license="MIT" homepage="http://web.mit.edu/kerberos" distfiles="${homepage}/dist/krb5/${version%.*}/krb5-${version}.tar.gz" checksum=e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719 -patch_args=-Np0 post_patch() { vsed -e "/LDFLAGS=/d" -i src/build-tools/krb5-config.in diff --git a/srcpkgs/mit-scheme-c/patches/host_os-is-linux.patch b/srcpkgs/mit-scheme-c/patches/host_os-is-linux.patch index 66616f5e2df..005e093679e 100644 --- a/srcpkgs/mit-scheme-c/patches/host_os-is-linux.patch +++ b/srcpkgs/mit-scheme-c/patches/host_os-is-linux.patch @@ -1,7 +1,7 @@ Index: src/microcode/configure =================================================================== ---- src/microcode/configure.orig -+++ src/microcode/configure +--- a/src/microcode/configure ++++ b/src/microcode/configure @@ -5441,7 +5441,7 @@ EXE_NAME=mit-scheme-${mit_scheme_native_ DO_GCC_TESTS=no GNU_LD=no diff --git a/srcpkgs/mit-scheme-c/template b/srcpkgs/mit-scheme-c/template index e2a461e18e8..92f3b637912 100644 --- a/srcpkgs/mit-scheme-c/template +++ b/srcpkgs/mit-scheme-c/template @@ -14,7 +14,6 @@ alternatives=" scheme:scheme.1:/usr/share/man/man1/mit-scheme.1 " nocross="Tries to build parts of the package with itself" -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/mlocate/patches/musl_paths-h.patch b/srcpkgs/mlocate/patches/musl_paths-h.patch index 92e82c4a1d3..6a54f8fe728 100644 --- a/srcpkgs/mlocate/patches/musl_paths-h.patch +++ b/srcpkgs/mlocate/patches/musl_paths-h.patch @@ -1,5 +1,5 @@ ---- ./src/updatedb.c.orig 2015-11-15 17:52:09.470706519 -0500 -+++ ./src/updatedb.c 2015-11-15 17:52:31.754706775 -0500 +--- a/src/updatedb.c 2015-11-15 17:52:09.470706519 -0500 ++++ b/src/updatedb.c 2015-11-15 17:52:31.754706775 -0500 @@ -35,6 +35,7 @@ #include #include diff --git a/srcpkgs/mlocate/template b/srcpkgs/mlocate/template index 310ecb315e1..9571f8c387d 100644 --- a/srcpkgs/mlocate/template +++ b/srcpkgs/mlocate/template @@ -14,7 +14,6 @@ homepage="https://pagure.io/mlocate" distfiles="https://releases.pagure.org/mlocate/${pkgname}-${version}.tar.xz" checksum=3063df79fe198fb9618e180c54baf3105b33d88fe602ff2d8570aaf944f1263e system_accounts="_mlocate" -patch_args=-Np0 alternatives=" locate:locate:/usr/bin/mlocate diff --git a/srcpkgs/mmv/patches/mmv_1.01b-15.patch b/srcpkgs/mmv/patches/mmv_1.01b-15.patch index 329131ca720..bb39768d0d0 100644 --- a/srcpkgs/mmv/patches/mmv_1.01b-15.patch +++ b/srcpkgs/mmv/patches/mmv_1.01b-15.patch @@ -1,7 +1,7 @@ Patch derived from mmv_1.01b-15.diff.gz ---- mmv.1 -+++ mmv.1 +--- a/mmv.1 ++++ b/mmv.1 @@ -2,7 +2,7 @@ .\" To print the MS-DOS version, use option -rO2. .\" Under System V, take out the '.\" ' from the next line. @@ -354,8 +354,8 @@ Patch derived from mmv_1.01b-15.diff.gz .PP .I Mmvpatch also determines the best way to uniquely identify directories. ---- mmv.c -+++ mmv.c +--- a/mmv.c ++++ b/mmv.c @@ -62,7 +62,8 @@ %s [-m|x%s|c|o|a|z] [-h] [-d|p] [-g|t] [-v|n] [from to]\n\ \n\ @@ -692,8 +692,8 @@ Patch derived from mmv_1.01b-15.diff.gz #endif utimes(fullrep, tim) ) ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -1,10 +1,10 @@ # Possible defines in CONF: # IS_MSDOS IS_SYSV IS_V7 IS_BSD HAS_DIRENT HAS_RENAME MV_DIR diff --git a/srcpkgs/mmv/template b/srcpkgs/mmv/template index 4269d4aa9e4..1afd253685d 100644 --- a/srcpkgs/mmv/template +++ b/srcpkgs/mmv/template @@ -10,7 +10,6 @@ license="GPL-2.0-only" homepage="https://packages.debian.org/unstable/utils/mmv" distfiles="http://mirrors.kernel.org/gentoo/distfiles/${pkgname}_${version}.orig.tar.gz" checksum=0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef -patch_args=-Np0 do_install() { local l diff --git a/srcpkgs/moc/patches/ffmpeg4.patch b/srcpkgs/moc/patches/ffmpeg4.patch index 0606a52ab91..9beff381983 100644 --- a/srcpkgs/moc/patches/ffmpeg4.patch +++ b/srcpkgs/moc/patches/ffmpeg4.patch @@ -1,5 +1,5 @@ ---- decoder_plugins/ffmpeg/ffmpeg.c.orig 2018-05-11 12:48:29.897671514 +0200 -+++ decoder_plugins/ffmpeg/ffmpeg.c 2018-05-11 12:50:09.133692416 +0200 +--- a/decoder_plugins/ffmpeg/ffmpeg.c.orig 2018-05-11 12:48:29.897671514 +0200 ++++ b/decoder_plugins/ffmpeg/ffmpeg.c 2018-05-11 12:50:09.133692416 +0200 @@ -984,7 +984,7 @@ * FFmpeg/LibAV in use. For some versions this will be caught in * *_find_stream_info() above and misreported as an unfound codec diff --git a/srcpkgs/moc/patches/move-pcm-buffer-to-heap.patch b/srcpkgs/moc/patches/move-pcm-buffer-to-heap.patch index d131b1b172d..0b14e7f4d3b 100644 --- a/srcpkgs/moc/patches/move-pcm-buffer-to-heap.patch +++ b/srcpkgs/moc/patches/move-pcm-buffer-to-heap.patch @@ -1,5 +1,5 @@ ---- player.c 2018-02-10 23:53:38.627091352 +0100 -+++ player.c 2018-02-10 23:54:46.672519217 +0100 +--- a/player.c 2018-02-10 23:53:38.627091352 +0100 ++++ b/player.c 2018-02-10 23:54:46.672519217 +0100 @@ -444,7 +444,7 @@ { bool eof = false; diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template index 824b1aaccaa..c42be650a1d 100644 --- a/srcpkgs/moc/template +++ b/srcpkgs/moc/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later" homepage="http://moc.daper.net" distfiles="http://ftp.daper.net/pub/soft/${pkgname}/stable/${pkgname}-${version}.tar.bz2" checksum=f3a68115602a4788b7cfa9bbe9397a9d5e24c68cb61a57695d1c2c3ecf49db08 -patch_args=-Np0 pre_configure() { sed -i -e "s|^ac_cpp='\$CPP |&-P |g" configure diff --git a/srcpkgs/mod_wsgi/patches/cross-python.patch b/srcpkgs/mod_wsgi/patches/cross-python.patch index 2821c1c4656..eea650fcb15 100644 --- a/srcpkgs/mod_wsgi/patches/cross-python.patch +++ b/srcpkgs/mod_wsgi/patches/cross-python.patch @@ -1,7 +1,7 @@ diff --git configure.ac configure.ac index 63d1bbc..543ecc0 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -100,26 +100,25 @@ fi AC_SUBST(PYTHON) diff --git a/srcpkgs/mod_wsgi/template b/srcpkgs/mod_wsgi/template index 1ee69220f24..28872edf8d5 100644 --- a/srcpkgs/mod_wsgi/template +++ b/srcpkgs/mod_wsgi/template @@ -13,7 +13,6 @@ changelog="https://modwsgi.readthedocs.io/en/latest/release-notes/version-${vers distfiles="https://github.com/GrahamDumpleton/${pkgname}/archive/${version}.tar.gz" checksum=2674e506719afe60fbc0547c832e8948d6caa2e054d40d336309993e6e867d35 lib32disabled=yes -patch_args=-Np0 pre_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/mog/patches/makefile.patch b/srcpkgs/mog/patches/makefile.patch index 369443397fe..6f3b17b8f20 100644 --- a/srcpkgs/mog/patches/makefile.patch +++ b/srcpkgs/mog/patches/makefile.patch @@ -1,5 +1,5 @@ ---- build/linux/Makefile 2009-03-13 14:20:17.000000000 +0100 -+++ build/linux/Makefile 2015-11-18 18:51:17.614646183 +0100 +--- a/build/linux/Makefile 2009-03-13 14:20:17.000000000 +0100 ++++ b/build/linux/Makefile 2015-11-18 18:51:17.614646183 +0100 @@ -3,11 +3,12 @@ PREFIX = /usr EXTRADIR = ./build/linux diff --git a/srcpkgs/mog/patches/name_max.patch b/srcpkgs/mog/patches/name_max.patch index f91bc2627b9..afc3bb30267 100644 --- a/srcpkgs/mog/patches/name_max.patch +++ b/srcpkgs/mog/patches/name_max.patch @@ -1,5 +1,5 @@ ---- sources/path.cpp 2008-09-13 21:31:49.000000000 +0200 -+++ sources/path.cpp 2015-11-18 19:02:00.715596008 +0100 +--- a/sources/path.cpp 2008-09-13 21:31:49.000000000 +0200 ++++ b/sources/path.cpp 2015-11-18 19:02:00.715596008 +0100 @@ -10,7 +10,9 @@ #include #include diff --git a/srcpkgs/mog/template b/srcpkgs/mog/template index 83afd02b478..88421ccef31 100644 --- a/srcpkgs/mog/template +++ b/srcpkgs/mog/template @@ -14,7 +14,6 @@ homepage="http://www.braingames.getput.com/mog/" distfiles="http://urchlay.naptime.net/~urchlay/src/mog.src_${version}-${_build}.tgz" checksum=707bbc1b167a55989916f803dbe55c288652fb54df6194be029c41be99e9ec3a broken="ELF in /usr/share" -patch_args=-Np0 CFLAGS="-g3 -O3 -Wno-write-strings -I${XBPS_CROSS_BASE}/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT" diff --git a/srcpkgs/mon/patches/fix-long_long.patch b/srcpkgs/mon/patches/fix-long_long.patch index 78b541f23b8..c6d518f9773 100644 --- a/srcpkgs/mon/patches/fix-long_long.patch +++ b/srcpkgs/mon/patches/fix-long_long.patch @@ -1,7 +1,7 @@ Size of long may be 32-bit and thus can't hold MS_YEAR. ---- deps/ms.c 2013-12-01 18:34:08.000000000 +0100 -+++ deps/ms.c 2015-09-09 22:47:16.476393763 +0200 +--- a/deps/ms.c 2013-12-01 18:34:08.000000000 +0100 ++++ b/deps/ms.c 2015-09-09 22:47:16.476393763 +0200 @@ -91,7 +91,7 @@ milliseconds_to_string(long long ms) { char *str = malloc(MS_MAX); diff --git a/srcpkgs/mon/patches/fix-unused_result.patch b/srcpkgs/mon/patches/fix-unused_result.patch index 043ada8e5be..a562c42f9a1 100644 --- a/srcpkgs/mon/patches/fix-unused_result.patch +++ b/srcpkgs/mon/patches/fix-unused_result.patch @@ -1,7 +1,7 @@ Fix a minor warning about ignoring the result of write(2). ---- src/mon.c 2013-12-01 18:34:08.000000000 +0100 -+++ src/mon.c 2015-09-09 22:42:21.241394637 +0200 +--- a/src/mon.c 2013-12-01 18:34:08.000000000 +0100 ++++ b/src/mon.c 2015-09-09 22:42:21.241394637 +0200 @@ -112,7 +112,8 @@ snprintf(buf, 32, "%d", pid); int fd = open(file, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); diff --git a/srcpkgs/mon/template b/srcpkgs/mon/template index 9cb300f5a44..4ab9fc3bd8e 100644 --- a/srcpkgs/mon/template +++ b/srcpkgs/mon/template @@ -9,7 +9,6 @@ license="MIT" homepage="https://github.com/tj/mon" distfiles="https://github.com/tj/mon/archive/${version}.tar.gz" checksum=978711a1d37ede3fc5a05c778a2365ee234b196a44b6c0c69078a6c459e686ac -patch_args=-Np0 CFLAGS="-Ideps -std=c99 -D_GNU_SOURCE" diff --git a/srcpkgs/monero/patches/easylogging.patch b/srcpkgs/monero/patches/easylogging.patch index 51f66bc2f8e..5e611672aa7 100644 --- a/srcpkgs/monero/patches/easylogging.patch +++ b/srcpkgs/monero/patches/easylogging.patch @@ -1,5 +1,5 @@ ---- external/easylogging++/easylogging++.h.orig 2020-05-23 09:03:47.678880438 +0200 -+++ external/easylogging++/easylogging++.h 2020-05-23 09:04:31.757371549 +0200 +--- a/external/easylogging++/easylogging++.h 2020-05-23 09:03:47.678880438 +0200 ++++ b/external/easylogging++/easylogging++.h 2020-05-23 09:04:31.757371549 +0200 @@ -221,7 +221,7 @@ # define ELPP_INTERNAL_INFO(lvl, msg) #endif // (defined(ELPP_DEBUG_INFO)) diff --git a/srcpkgs/monero/patches/march_cross.patch b/srcpkgs/monero/patches/march_cross.patch index a1276013b00..20c3ae90c47 100644 --- a/srcpkgs/monero/patches/march_cross.patch +++ b/srcpkgs/monero/patches/march_cross.patch @@ -1,7 +1,7 @@ diff --git CMakeLists.txt CMakeLists.txt index 953707657..394e8cb32 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -581,7 +581,7 @@ else() set_default_arch() endif() diff --git a/srcpkgs/monero/patches/system-miniupnpc.patch b/srcpkgs/monero/patches/system-miniupnpc.patch index 607162d8a54..3d9c8bb08bb 100644 --- a/srcpkgs/monero/patches/system-miniupnpc.patch +++ b/srcpkgs/monero/patches/system-miniupnpc.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -527,5 +527,13 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations") add_subdirectory(external) @@ -16,8 +16,8 @@ link_directories(${UNBOUND_LIBRARY_DIRS}) diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl index 9b21705e..76340a22 100644 ---- src/p2p/net_node.inl -+++ src/p2p/net_node.inl +--- a/src/p2p/net_node.inl ++++ b/src/p2p/net_node.inl @@ -61,9 +61,16 @@ #include "storages/levin_abstract_invoke2.h" #include "cryptonote_core/cryptonote_core.h" #include "net/parse.h" @@ -41,8 +41,8 @@ index 9b21705e..76340a22 100644 -- 2.17.0 ---- external/CMakeLists.txt 2018-10-10 13:13:55.759414180 +0200 -+++ external/CMakeLists.txt 2018-10-10 13:19:33.363411827 +0200 +--- a/external/CMakeLists.txt 2018-10-10 13:13:55.759414180 +0200 ++++ b/external/CMakeLists.txt 2018-10-10 13:19:33.363411827 +0200 @@ -34,22 +34,46 @@ # We always compile if we are building statically to reduce static dependency issues... # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template index 5cfbb8da882..3617a446f09 100644 --- a/srcpkgs/monero/template +++ b/srcpkgs/monero/template @@ -29,7 +29,6 @@ checksum="5e9bd2e565a57b4ae9f0d851704725b2e0b18c4a94051e56d5deae4e74727496 b973b9d8269ec4d97c3c3443f0dad96d09f72b1b30e616e0947557adbdbb03f7" skip_extraction="v${_randomx_version}.tar.gz ${_rapidjson_gitrev}.tar.gz ${_supercop_gitrev}.tar.gz" system_accounts="monero" -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args+=" -DTHREADS_PTHREAD_ARG=OFF" diff --git a/srcpkgs/mongoose/patches/add-makefile.patch b/srcpkgs/mongoose/patches/add-makefile.patch index 26d85cfa8d2..fd0b2109547 100644 --- a/srcpkgs/mongoose/patches/add-makefile.patch +++ b/srcpkgs/mongoose/patches/add-makefile.patch @@ -1,5 +1,5 @@ --- /dev/null -+++ Makefile ++++ b/Makefile @@ -0,0 +1,47 @@ +PROG = mongoose +LIB = lib$(PROG).so.0 diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template index 46fe4d3f99e..eddadc64733 100644 --- a/srcpkgs/mongoose/template +++ b/srcpkgs/mongoose/template @@ -11,7 +11,6 @@ license="GPL-2.0-only" homepage="https://cesanta.com/" distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz" checksum=f5c10346abc9c72f7cac7885d853ca064fb09aad57580433941a8fd7a3543769 -patch_args=-Np0 mongoose-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/monit/patches/musl-fix.patch b/srcpkgs/monit/patches/musl-fix.patch index 92bf9079410..bcf38022d8a 100644 --- a/srcpkgs/monit/patches/musl-fix.patch +++ b/srcpkgs/monit/patches/musl-fix.patch @@ -1,5 +1,5 @@ ---- src/process/sysdep_LINUX.c.orig -+++ src/process/sysdep_LINUX.c +--- a/src/process/sysdep_LINUX.c ++++ b/src/process/sysdep_LINUX.c @@ -71,6 +71,10 @@ #include #endif diff --git a/srcpkgs/monit/template b/srcpkgs/monit/template index 4062b351f9f..e401ff3d873 100644 --- a/srcpkgs/monit/template +++ b/srcpkgs/monit/template @@ -17,7 +17,6 @@ homepage="https://mmonit.com/monit/" changelog="https://mmonit.com/monit/changes/" distfiles="https://mmonit.com/monit/dist/${pkgname}-${version}.tar.gz" checksum=9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c -patch_args=-Np0 pre_configure() { ./bootstrap diff --git a/srcpkgs/mono/patches/fix-heapviz-import.patch b/srcpkgs/mono/patches/fix-heapviz-import.patch index 1ab78851687..ce314fc295b 100644 --- a/srcpkgs/mono/patches/fix-heapviz-import.patch +++ b/srcpkgs/mono/patches/fix-heapviz-import.patch @@ -1,5 +1,5 @@ ---- scripts/mono-heapviz.orig -+++ scripts/mono-heapviz +--- a/scripts/mono-heapviz ++++ b/scripts/mono-heapviz @@ -7,7 +7,7 @@ from __future__ import print_function diff --git a/srcpkgs/mono/patches/musl-ppc.patch b/srcpkgs/mono/patches/musl-ppc.patch index c3e82bfe1c9..f3d97616264 100644 --- a/srcpkgs/mono/patches/musl-ppc.patch +++ b/srcpkgs/mono/patches/musl-ppc.patch @@ -2,8 +2,8 @@ Musl does not include kernel headers. Also, fix context handling for ppc32/musl. ---- mono/utils/mono-sigcontext.h -+++ mono/utils/mono-sigcontext.h +--- a/mono/utils/mono-sigcontext.h ++++ b/mono/utils/mono-sigcontext.h @@ -321,6 +321,8 @@ typedef struct ucontext { #elif defined(__mono_ppc__) diff --git a/srcpkgs/mono/patches/musl.patch b/srcpkgs/mono/patches/musl.patch index 193fb28860b..955807f0fd0 100644 --- a/srcpkgs/mono/patches/musl.patch +++ b/srcpkgs/mono/patches/musl.patch @@ -1,5 +1,5 @@ ---- mono/utils/mono-os-mutex.h 2019-12-11 22:05:32.992353279 +0100 -+++ mono/utils/mono-os-mutex.h 2019-12-11 22:05:50.267114788 +0100 +--- a/mono/utils/mono-os-mutex.h 2019-12-11 22:05:32.992353279 +0100 ++++ b/mono/utils/mono-os-mutex.h 2019-12-11 22:05:50.267114788 +0100 @@ -57,7 +57,7 @@ if (G_UNLIKELY (res != 0)) g_error ("%s: pthread_mutexattr_settype failed with \"%s\" (%d)", __func__, g_strerror (res), res); diff --git a/srcpkgs/mono/template b/srcpkgs/mono/template index 599fabf094a..3846d0a93e1 100644 --- a/srcpkgs/mono/template +++ b/srcpkgs/mono/template @@ -15,7 +15,6 @@ distfiles="https://download.mono-project.com/sources/mono/${pkgname}-${version}. checksum=29c277660fc5e7513107aee1cbf8c5057c9370a4cdfeda2fc781be6986d89d23 lib32disabled=yes python_version="3" -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" --disable-boehm --without-sigaltstack" ;; diff --git a/srcpkgs/moon-buggy/patches/Makefile.in.patch b/srcpkgs/moon-buggy/patches/Makefile.in.patch index 9f7ae71687b..129311c51fc 100644 --- a/srcpkgs/moon-buggy/patches/Makefile.in.patch +++ b/srcpkgs/moon-buggy/patches/Makefile.in.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2006-03-19 20:24:50.000000000 +0100 -+++ Makefile.in 2012-01-08 18:00:29.000000000 +0100 +--- a/Makefile.in 2006-03-19 20:24:50.000000000 +0100 ++++ b/Makefile.in 2012-01-08 18:00:29.000000000 +0100 @@ -863,3 +863,3 @@ fi - $(DESTDIR)$(bindir)/moon-buggy -c diff --git a/srcpkgs/moon-buggy/template b/srcpkgs/moon-buggy/template index 1a8017da031..1ebb56ce31f 100644 --- a/srcpkgs/moon-buggy/template +++ b/srcpkgs/moon-buggy/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="http://www.seehuhn.de/pages/moon-buggy" distfiles="http://m.seehuhn.de/programs/$pkgname-$version.tar.gz" checksum=352dc16ccae4c66f1e87ab071e6a4ebeb94ff4e4f744ce1b12a769d02fe5d23f -patch_args=-Np0 post_extract() { sed -i 's/key_name/Key_Name/g' keyboard.c diff --git a/srcpkgs/moosefs/patches/fix-musl.patch b/srcpkgs/moosefs/patches/fix-musl.patch index 83cbbba6992..02e51bedb2e 100644 --- a/srcpkgs/moosefs/patches/fix-musl.patch +++ b/srcpkgs/moosefs/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- mfsclient/nbdmain.c.orig 2020-06-08 08:19:08.422379805 +0200 -+++ mfsclient/nbdmain.c 2020-06-08 08:18:55.079380447 +0200 +--- a/mfsclient/nbdmain.c 2020-06-08 08:19:08.422379805 +0200 ++++ b/mfsclient/nbdmain.c 2020-06-08 08:18:55.079380447 +0200 @@ -39,6 +39,7 @@ #include #include diff --git a/srcpkgs/moosefs/template b/srcpkgs/moosefs/template index fbf55ca74ac..adc8125a13e 100644 --- a/srcpkgs/moosefs/template +++ b/srcpkgs/moosefs/template @@ -15,7 +15,6 @@ distfiles="http://ppa.moosefs.com/src/moosefs-${version}-1.tar.gz" checksum=f88cc0142b5fe8a6a4c3fcb2ae58053fcb98787848cf09286a57718a982093a9 python_version=2 #unverified system_accounts="_mfs" -patch_args=-Np0 pre_configure() { sed -i 's,AC_RUN_IFELSE,AC_LINK_IFELSE,g' configure.ac diff --git a/srcpkgs/mosh/patches/fix-memory-blowup-on-large-paste.patch b/srcpkgs/mosh/patches/fix-memory-blowup-on-large-paste.patch index 6233c4eb655..efe3fd80696 100644 --- a/srcpkgs/mosh/patches/fix-memory-blowup-on-large-paste.patch +++ b/srcpkgs/mosh/patches/fix-memory-blowup-on-large-paste.patch @@ -11,8 +11,8 @@ about copying pastes through, though. diff --git src/frontend/stmclient.cc src/frontend/stmclient.cc index 7eff0af3..450d068a 100644 ---- src/frontend/stmclient.cc -+++ src/frontend/stmclient.cc +--- a/src/frontend/stmclient.cc ++++ b/src/frontend/stmclient.cc @@ -318,10 +318,18 @@ bool STMClient::process_user_input( int fd ) if ( !network->shutdown_in_progress() ) { overlays.get_prediction_engine().set_local_frame_sent( network->get_sent_state_last() ); diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index a9030ce5cb5..a4641f66bb3 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="https://mosh.org/" distfiles="https://mosh.org/mosh-${version}.tar.gz" checksum=da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216 -patch_args=-Np0 pre_configure() { # make local.test always succeed. It fails due to missing X server in chroot. diff --git a/srcpkgs/mosquitto/patches/fix-musl.patch b/srcpkgs/mosquitto/patches/fix-musl.patch index fbb38903f81..8d4097fab11 100644 --- a/srcpkgs/mosquitto/patches/fix-musl.patch +++ b/srcpkgs/mosquitto/patches/fix-musl.patch @@ -1,7 +1,7 @@ diff --git client/client_shared.h client/client_shared.h index 18686cd..f0711f8 100644 ---- client/client_shared.h -+++ client/client_shared.h +--- a/client/client_shared.h ++++ b/client/client_shared.h @@ -18,6 +18,7 @@ Contributors: #define CLIENT_CONFIG_H diff --git a/srcpkgs/mosquitto/template b/srcpkgs/mosquitto/template index 16723f0ce55..53ab96eca22 100644 --- a/srcpkgs/mosquitto/template +++ b/srcpkgs/mosquitto/template @@ -16,7 +16,6 @@ distfiles="${homepage}/files/source/${pkgname}-${version}.tar.gz" checksum=1b8553ef64a1cf5e4f4cfbe098330ae612adccd3d37f35b2db6f6fab501b01d4 # CUnit dependency is missing make_check=no -patch_args=-Np0 system_accounts="_mosquitto" _mosquitto_homedir="/var/lib/mosquitto" diff --git a/srcpkgs/mozc/patches/abseil.patch b/srcpkgs/mozc/patches/abseil.patch index 22510299dc9..b077fe3cc14 100644 --- a/srcpkgs/mozc/patches/abseil.patch +++ b/srcpkgs/mozc/patches/abseil.patch @@ -8,8 +8,8 @@ An all-in-one patch that fixes several issues: 3) powerpc stacktrace implementation has ppc64 assumptions (fixed) 4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) ---- mozc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h -+++ mozc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h +--- a/mozc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h ++++ b/mozc/src/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h @@ -46,7 +46,7 @@ // The following platforms have an implementation of a hardware counter. @@ -19,8 +19,8 @@ An all-in-one patch that fixes several issues: defined(_M_IX86) || defined(_M_X64) #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 #else ---- mozc/src/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc -+++ mozc/src/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc +--- a/mozc/src/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc ++++ b/mozc/src/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc @@ -27,6 +27,10 @@ #include #include @@ -44,8 +44,8 @@ An all-in-one patch that fixes several issues: #elif defined(__riscv) return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); #elif defined(__s390__) && !defined(__s390x__) ---- mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h -+++ mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h +--- a/mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h ++++ b/mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h @@ -64,7 +64,7 @@ #elif defined(__i386__) || defined(__x86_64__) #define ABSL_STACKTRACE_INL_HEADER \ @@ -55,8 +55,8 @@ An all-in-one patch that fixes several issues: #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_powerpc-inl.inc" #elif defined(__aarch64__) ---- mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc -+++ mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc +--- a/mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc ++++ b/mozc/src/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc @@ -130,8 +130,13 @@ StacktracePowerPCGetLR(new_sp) == kernel_sigtramp_rt64_address) { const ucontext_t* signal_context = diff --git a/srcpkgs/mozc/patches/cross.patch b/srcpkgs/mozc/patches/cross.patch index d73c5f82b43..2c94b1f9140 100644 --- a/srcpkgs/mozc/patches/cross.patch +++ b/srcpkgs/mozc/patches/cross.patch @@ -1,7 +1,7 @@ Index: mozc/src/gyp/common.gypi =================================================================== ---- mozc/src/gyp/common.gypi.orig -+++ mozc/src/gyp/common.gypi +--- a/mozc/src/gyp/common.gypi ++++ b/mozc/src/gyp/common.gypi @@ -409,12 +409,12 @@ 'conditions': [ ['target_platform=="Linux"', { diff --git a/srcpkgs/mozc/patches/cxx-stdlib.patch b/srcpkgs/mozc/patches/cxx-stdlib.patch index 0bccaf8ddc4..08f0ac764ae 100644 --- a/srcpkgs/mozc/patches/cxx-stdlib.patch +++ b/srcpkgs/mozc/patches/cxx-stdlib.patch @@ -1,7 +1,7 @@ Index: mozc/src/gyp/common.gypi =================================================================== ---- mozc/src/gyp/common.gypi -+++ mozc/src/gyp/common.gypi +--- a/mozc/src/gyp/common.gypi ++++ b/mozc/src/gyp/common.gypi @@ -105,7 +105,7 @@ ], # Libraries for GNU/Linux environment. diff --git a/srcpkgs/mozc/patches/fcitx.patch b/srcpkgs/mozc/patches/fcitx.patch index 1ed6d01516f..e8b2ab414c8 100644 --- a/srcpkgs/mozc/patches/fcitx.patch +++ b/srcpkgs/mozc/patches/fcitx.patch @@ -1,7 +1,7 @@ Index: mozc/src/unix/fcitx/fcitx.gyp =================================================================== ---- mozc/src/unix/fcitx/fcitx.gyp.orig -+++ mozc/src/unix/fcitx/fcitx.gyp +--- a/mozc/src/unix/fcitx/fcitx.gyp ++++ b/mozc/src/unix/fcitx/fcitx.gyp @@ -96,7 +96,7 @@ '<@(fcitx_dep_include_dirs)', ], diff --git a/srcpkgs/mozc/patches/latomic.patch b/srcpkgs/mozc/patches/latomic.patch index 2a30432a821..f212a1fa7f3 100644 --- a/srcpkgs/mozc/patches/latomic.patch +++ b/srcpkgs/mozc/patches/latomic.patch @@ -1,7 +1,7 @@ Index: mozc/src/gui/gui.gyp =================================================================== ---- mozc/src/gui/gui.gyp.orig -+++ mozc/src/gui/gui.gyp +--- a/mozc/src/gui/gui.gyp ++++ b/mozc/src/gui/gui.gyp @@ -790,6 +790,13 @@ 'tool/mozc_tool_main_noqt.cc', ], @@ -18,8 +18,8 @@ Index: mozc/src/gui/gui.gyp 'product_name': '<(tool_product_name_win)', Index: mozc/src/gyp/defines.gypi =================================================================== ---- mozc/src/gyp/defines.gypi.orig -+++ mozc/src/gyp/defines.gypi +--- a/mozc/src/gyp/defines.gypi ++++ b/mozc/src/gyp/defines.gypi @@ -68,6 +68,9 @@ # use_libibus represents if ibus library is used or not. # This option is only for Linux. @@ -32,8 +32,8 @@ Index: mozc/src/gyp/defines.gypi 'defines': [ Index: mozc/src/renderer/renderer.gyp =================================================================== ---- mozc/src/renderer/renderer.gyp.orig -+++ mozc/src/renderer/renderer.gyp +--- a/mozc/src/renderer/renderer.gyp ++++ b/mozc/src/renderer/renderer.gyp @@ -592,6 +592,15 @@ '../base/base.gyp:crash_report_handler', 'mozc_renderer_lib', @@ -52,8 +52,8 @@ Index: mozc/src/renderer/renderer.gyp 'target_name': 'gtk_renderer_test', Index: mozc/src/server/server.gyp =================================================================== ---- mozc/src/server/server.gyp.orig -+++ mozc/src/server/server.gyp +--- a/mozc/src/server/server.gyp ++++ b/mozc/src/server/server.gyp @@ -55,6 +55,13 @@ 'mozc_server_lib', ], @@ -70,8 +70,8 @@ Index: mozc/src/server/server.gyp 'sources': [ Index: mozc/src/unix/emacs/emacs.gyp =================================================================== ---- mozc/src/unix/emacs/emacs.gyp.orig -+++ mozc/src/unix/emacs/emacs.gyp +--- a/mozc/src/unix/emacs/emacs.gyp ++++ b/mozc/src/unix/emacs/emacs.gyp @@ -46,6 +46,15 @@ '../../protocol/protocol.gyp:config_proto', 'mozc_emacs_helper_lib', @@ -90,8 +90,8 @@ Index: mozc/src/unix/emacs/emacs.gyp 'target_name': 'mozc_emacs_helper_lib', Index: mozc/src/unix/fcitx/fcitx.gyp =================================================================== ---- mozc/src/unix/fcitx/fcitx.gyp.orig -+++ mozc/src/unix/fcitx/fcitx.gyp +--- a/mozc/src/unix/fcitx/fcitx.gyp ++++ b/mozc/src/unix/fcitx/fcitx.gyp @@ -98,6 +98,15 @@ 'defines': [ 'LOCALEDIR="/usr/share/locale/"', @@ -110,8 +110,8 @@ Index: mozc/src/unix/fcitx/fcitx.gyp }, { Index: mozc/src/unix/fcitx5/fcitx5.gyp =================================================================== ---- mozc/src/unix/fcitx5/fcitx5.gyp.orig -+++ mozc/src/unix/fcitx5/fcitx5.gyp +--- a/mozc/src/unix/fcitx5/fcitx5.gyp ++++ b/mozc/src/unix/fcitx5/fcitx5.gyp @@ -105,6 +105,15 @@ 'defines': [ 'FCITX_GETTEXT_DOMAIN="fcitx5-mozc"', @@ -130,8 +130,8 @@ Index: mozc/src/unix/fcitx5/fcitx5.gyp }, { Index: mozc/src/unix/ibus/ibus.gyp =================================================================== ---- mozc/src/unix/ibus/ibus.gyp.orig -+++ mozc/src/unix/ibus/ibus.gyp +--- a/mozc/src/unix/ibus/ibus.gyp ++++ b/mozc/src/unix/ibus/ibus.gyp @@ -239,6 +239,15 @@ 'ibus_mozc_lib', 'ibus_mozc_metadata', diff --git a/srcpkgs/mozc/patches/no-parallel.patch b/srcpkgs/mozc/patches/no-parallel.patch index 5952cbc6a04..fce9217169a 100644 --- a/srcpkgs/mozc/patches/no-parallel.patch +++ b/srcpkgs/mozc/patches/no-parallel.patch @@ -1,7 +1,7 @@ Index: mozc/src/build_mozc.py =================================================================== ---- mozc/src/build_mozc.py.orig -+++ mozc/src/build_mozc.py +--- a/mozc/src/build_mozc.py ++++ b/mozc/src/build_mozc.py @@ -496,6 +496,7 @@ def GypMain(options, unused_args): gyp_options.extend(['--generator-output=.']) short_basename = GetBuildShortBaseName(target_platform) diff --git a/srcpkgs/mozc/patches/unsigned-int.patch b/srcpkgs/mozc/patches/unsigned-int.patch index 823db9f2199..5010ea285e3 100644 --- a/srcpkgs/mozc/patches/unsigned-int.patch +++ b/srcpkgs/mozc/patches/unsigned-int.patch @@ -1,7 +1,7 @@ Index: mozc/src/gui/word_register_dialog/word_register_dialog.cc =================================================================== ---- mozc/src/gui/word_register_dialog/word_register_dialog.cc -+++ mozc/src/gui/word_register_dialog/word_register_dialog.cc +--- a/mozc/src/gui/word_register_dialog/word_register_dialog.cc ++++ b/mozc/src/gui/word_register_dialog/word_register_dialog.cc @@ -94,7 +94,7 @@ QString GetEnv(const char *envname) { return QString::fromUtf16(reinterpret_cast(buffer.get())); } else { @@ -13,8 +13,8 @@ Index: mozc/src/gui/word_register_dialog/word_register_dialog.cc return QLatin1String(""); Index: mozc/src/unix/fcitx/surrounding_text_util.cc =================================================================== ---- mozc/src/unix/fcitx/surrounding_text_util.cc -+++ mozc/src/unix/fcitx/surrounding_text_util.cc +--- a/mozc/src/unix/fcitx/surrounding_text_util.cc ++++ b/mozc/src/unix/fcitx/surrounding_text_util.cc @@ -41,10 +41,10 @@ namespace mozc { namespace fcitx { @@ -91,8 +91,8 @@ Index: mozc/src/unix/fcitx/surrounding_text_util.cc surrounding_text, primary_text, Index: mozc/src/unix/fcitx/surrounding_text_util.h =================================================================== ---- mozc/src/unix/fcitx/surrounding_text_util.h -+++ mozc/src/unix/fcitx/surrounding_text_util.h +--- a/mozc/src/unix/fcitx/surrounding_text_util.h ++++ b/mozc/src/unix/fcitx/surrounding_text_util.h @@ -55,7 +55,7 @@ class SurroundingTextUtil { // Returns true when neither |abs(delta)| nor |-delta| does not cause // integer overflow, that is, |delta| is in a safe range. @@ -115,8 +115,8 @@ Index: mozc/src/unix/fcitx/surrounding_text_util.h DISALLOW_IMPLICIT_CONSTRUCTORS(SurroundingTextUtil); Index: mozc/src/unix/fcitx5/surrounding_text_util.cc =================================================================== ---- mozc/src/unix/fcitx5/surrounding_text_util.cc -+++ mozc/src/unix/fcitx5/surrounding_text_util.cc +--- a/mozc/src/unix/fcitx5/surrounding_text_util.cc ++++ b/mozc/src/unix/fcitx5/surrounding_text_util.cc @@ -43,10 +43,10 @@ namespace fcitx { using namespace mozc; @@ -188,8 +188,8 @@ Index: mozc/src/unix/fcitx5/surrounding_text_util.cc anchor_pos = new_anchor_pos; Index: mozc/src/unix/fcitx5/surrounding_text_util.h =================================================================== ---- mozc/src/unix/fcitx5/surrounding_text_util.h -+++ mozc/src/unix/fcitx5/surrounding_text_util.h +--- a/mozc/src/unix/fcitx5/surrounding_text_util.h ++++ b/mozc/src/unix/fcitx5/surrounding_text_util.h @@ -56,7 +56,7 @@ class SurroundingTextUtil { // Returns true when neither |abs(delta)| nor |-delta| does not cause // integer overflow, that is, |delta| is in a safe range. diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template index 4adafb211d0..075a0b1bf9b 100644 --- a/srcpkgs/mozc/template +++ b/srcpkgs/mozc/template @@ -26,7 +26,6 @@ checksum="69cb26e1f9c03e20715356ef568b583f2baf996df5fd8536aca2ed8e7bd9444f 0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1" CXXFLAGS="-D_GNU_SOURCE" -patch_args=-Np0 lib32disabled=yes if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/mp3check/patches/placement-new.patch b/srcpkgs/mp3check/patches/placement-new.patch index 783130f064e..1a165db8e94 100644 --- a/srcpkgs/mp3check/patches/placement-new.patch +++ b/srcpkgs/mp3check/patches/placement-new.patch @@ -1,5 +1,5 @@ ---- tstring.h -+++ tstring.h +--- a/tstring.h ++++ b/tstring.h @@ -75,6 +75,9 @@ return ::operator new (size + tmem + 1);} static void operator delete (void *p, size_t) { diff --git a/srcpkgs/mp3check/template b/srcpkgs/mp3check/template index 09d6a945c80..6d25f52387f 100644 --- a/srcpkgs/mp3check/template +++ b/srcpkgs/mp3check/template @@ -8,7 +8,6 @@ license="GPL-2.0-only" homepage="https://code.google.com/p/mp3check/" distfiles="${DEBIAN_SITE}/main/m/${pkgname}/${pkgname}_${version}.orig.tar.gz" checksum=27d976ad8495671e9b9ce3c02e70cb834d962b6fdf1a7d437bb0e85454acdd0e -patch_args=-Np0 do_build() { make ${makejobs} CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/srcpkgs/mp3val/patches/fix-open-mode.patch b/srcpkgs/mp3val/patches/fix-open-mode.patch index 8944d1ad459..a3ba947c8b8 100644 --- a/srcpkgs/mp3val/patches/fix-open-mode.patch +++ b/srcpkgs/mp3val/patches/fix-open-mode.patch @@ -1,5 +1,5 @@ ---- crossapi.cpp 2009-06-25 22:14:03.000000000 +0200 -+++ crossapi.cpp 2021-01-16 12:20:29.220265744 +0100 +--- a/crossapi.cpp 2009-06-25 22:14:03.000000000 +0200 ++++ b/crossapi.cpp 2021-01-16 12:20:29.220265744 +0100 @@ -241,7 +241,7 @@ //Moving failed due to different logical drives of source and destination. Let's copy: id=open(szOldName,O_RDONLY); diff --git a/srcpkgs/mp3val/template b/srcpkgs/mp3val/template index 14e61a3c6fb..31c307f1ebb 100644 --- a/srcpkgs/mp3val/template +++ b/srcpkgs/mp3val/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://mp3val.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/mp3val/mp3val-${version}-src.tar.gz" checksum=95a16efe3c352bb31d23d68ee5cb8bb8ebd9868d3dcf0d84c96864f80c31c39f -patch_args=-Np0 do_install() { vbin mp3val diff --git a/srcpkgs/mpg123/patches/arm_fpu.diff b/srcpkgs/mpg123/patches/arm_fpu.diff index a4a769dd497..24e98ac44e2 100644 --- a/srcpkgs/mpg123/patches/arm_fpu.diff +++ b/srcpkgs/mpg123/patches/arm_fpu.diff @@ -1,5 +1,5 @@ ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -17170,7 +17170,7 @@ ;; arm_fpu) diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template index 4278b201e60..a08cb80f096 100644 --- a/srcpkgs/mpg123/template +++ b/srcpkgs/mpg123/template @@ -14,7 +14,6 @@ license="LGPL-2.1-only" homepage="https://www.mpg123.org/" distfiles="${SOURCEFORGE_SITE}/mpg123/mpg123-${version}.tar.bz2" checksum=e49466853685026da5d113dc7ff026b1b2ad0b57d78df693a446add9db88a7d5 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in # No LFS required with musl diff --git a/srcpkgs/mplayer/patches/altivec-gcc83.patch b/srcpkgs/mplayer/patches/altivec-gcc83.patch index 06cf65cd13a..dae88f3bc8a 100644 --- a/srcpkgs/mplayer/patches/altivec-gcc83.patch +++ b/srcpkgs/mplayer/patches/altivec-gcc83.patch @@ -1,5 +1,5 @@ ---- ffmpeg/libavutil/ppc/util_altivec.h -+++ ffmpeg/libavutil/ppc/util_altivec.h +--- a/ffmpeg/libavutil/ppc/util_altivec.h ++++ b/ffmpeg/libavutil/ppc/util_altivec.h @@ -54,6 +54,15 @@ #if HAVE_ALTIVEC #include diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template index 981c9732880..6bf5f3d1b08 100644 --- a/srcpkgs/mplayer/template +++ b/srcpkgs/mplayer/template @@ -22,7 +22,6 @@ license="GPL-2.0-or-later" homepage="http://www.mplayerhq.hu/" distfiles="http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-${version}.tar.xz" checksum=82596ed558478d28248c7bc3828eb09e6948c099bbd76bb7ee745a0e3275b548 -patch_args=-Np0 nocross=yes diff --git a/srcpkgs/mrxvt/patches/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch b/srcpkgs/mrxvt/patches/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch index a52a10269bc..dbbbdd510ca 100644 --- a/srcpkgs/mrxvt/patches/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch +++ b/srcpkgs/mrxvt/patches/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch @@ -1,7 +1,7 @@ Index: src/tabbar.c =================================================================== ---- src/tabbar.c (revision 337) -+++ src/tabbar.c (working copy) +--- a/src/tabbar.c (revision 337) ++++ b/src/tabbar.c (working copy) @@ -1327,7 +1327,7 @@ if( p.we_wordc > 1) rxvt_msg( DBG_ERROR, DBG_TABBAR, diff --git a/srcpkgs/mrxvt/template b/srcpkgs/mrxvt/template index eb206d20ab9..5d82c85d31f 100644 --- a/srcpkgs/mrxvt/template +++ b/srcpkgs/mrxvt/template @@ -12,6 +12,5 @@ license="GPL-2.0-or-later" homepage="http://materm.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/materm/mrxvt-${version}.tar.gz" checksum=f403ad5a908fcd38a55ed0a7e1b85584cb77be8781199653a39b8af1a9ad10d7 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/msg2/patches/fix-cflags.patch b/srcpkgs/msg2/patches/fix-cflags.patch index 64404bf44fc..aae17066aa0 100644 --- a/srcpkgs/msg2/patches/fix-cflags.patch +++ b/srcpkgs/msg2/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(msg2) # Flags diff --git a/srcpkgs/msg2/template b/srcpkgs/msg2/template index 624f86b14c3..473b3c4ec4d 100644 --- a/srcpkgs/msg2/template +++ b/srcpkgs/msg2/template @@ -9,7 +9,6 @@ license="GPL-3.0-or-later" homepage="https://roboticoverlords.org/msg2/" distfiles="https://roboticoverlords.org/msg2/msg2-${version}.tar.xz" checksum=4834104465f62f0ecec7615e75ca2e50a5e42218854da8f6b022a120937702ac -patch_args=-Np0 post_install() { vman msg2.1 diff --git a/srcpkgs/msp430-toolchain/patches/gcc7.patch b/srcpkgs/msp430-toolchain/patches/gcc7.patch index 67a4843b8f8..f664b41db09 100644 --- a/srcpkgs/msp430-toolchain/patches/gcc7.patch +++ b/srcpkgs/msp430-toolchain/patches/gcc7.patch @@ -1,5 +1,5 @@ ---- sources/tools/gcc/config/msp430/msp430.c.orig -+++ sources/tools/gcc/config/msp430/msp430.c +--- a/sources/tools/gcc/config/msp430/msp430.c ++++ b/sources/tools/gcc/config/msp430/msp430.c @@ -2209,7 +2209,7 @@ } const_shift_helpers[] = diff --git a/srcpkgs/msp430-toolchain/template b/srcpkgs/msp430-toolchain/template index acfabb65b16..10f8d6b7fe4 100644 --- a/srcpkgs/msp430-toolchain/template +++ b/srcpkgs/msp430-toolchain/template @@ -16,7 +16,6 @@ checksum="d2110ec64e8a055ff89b7eef8217b3c233c30e370e2cb43e1ad835dad5907d1c 1e2a0903e6b02d5e8aac2a7297ec0685e95a980b13b937b5c7f24f4cf6015407" nocross=yes nostrip=yes -patch_args=-Np0 _prefix=/usr/msp430 _target=msp430-none-elf diff --git a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch index 1c1f5010c82..cfeaf9bf8c5 100644 --- a/srcpkgs/mumble/patches/link-overlay-against-libGL.patch +++ b/srcpkgs/mumble/patches/link-overlay-against-libGL.patch @@ -1,5 +1,5 @@ ---- overlay_gl/overlay_gl.pro -+++ overlay_gl/overlay_gl.pro +--- a/overlay_gl/overlay_gl.pro ++++ b/overlay_gl/overlay_gl.pro @@ -22,7 +22,7 @@ unix:!macx { DEFINES += TARGET_UNIX diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 7cb13105213..d578a511d47 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -20,7 +20,6 @@ license="BSD-3-Clause" homepage="http://mumble.sourceforge.net/" distfiles="https://github.com/mumble-voip/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.gz" checksum=615f4ebfc3385d945163f369efd3e910c8b6d0f025797a7eed541515fccb6093 -patch_args=-Np0 build_options="jack portaudio" build_options_default="jack portaudio" diff --git a/srcpkgs/mupen64plus/patches/ui-console-pic.patch b/srcpkgs/mupen64plus/patches/ui-console-pic.patch index c448ac2f03c..62a14850a50 100644 --- a/srcpkgs/mupen64plus/patches/ui-console-pic.patch +++ b/srcpkgs/mupen64plus/patches/ui-console-pic.patch @@ -1,7 +1,7 @@ diff --git a/source/mupen64plus-ui-console/projects/unix/Makefile b/source/mupen64plus-ui-console/projects/unix/Makefile index a4a05e3..199f27f 100755 ---- source/mupen64plus-ui-console/projects/unix/Makefile -+++ source/mupen64plus-ui-console/projects/unix/Makefile +--- a/source/mupen64plus-ui-console/projects/unix/Makefile ++++ b/source/mupen64plus-ui-console/projects/unix/Makefile @@ -90,6 +90,7 @@ endif # set special flags per-system diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template index 747fd4d9953..4984a7f4a77 100644 --- a/srcpkgs/mupen64plus/template +++ b/srcpkgs/mupen64plus/template @@ -15,7 +15,6 @@ distfiles="https://github.com/mupen64plus/mupen64plus-core/releases/download/${v checksum=d5243ddc00388ee2e538b3826a78a719dec2bd5da54ac6f3344fed861fb141a8 nopie=yes nocross=yes -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/musikcube/patches/fix-install-locations.patch b/srcpkgs/musikcube/patches/fix-install-locations.patch index cf1dce80f00..63537349f45 100644 --- a/srcpkgs/musikcube/patches/fix-install-locations.patch +++ b/srcpkgs/musikcube/patches/fix-install-locations.patch @@ -3,8 +3,8 @@ This patch moves all those files to their normal locations and fixes the code to diff --git CMakeLists.txt CMakeLists.txt index d685695f..5ac43f1f 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -208,7 +208,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") install(FILES ${plugins} DESTINATION share/musikcube/plugins) else () @@ -53,8 +53,8 @@ index d685695f..5ac43f1f 100644 OWNER_EXECUTE OWNER_READ OWNER_WRITE diff --git src/musikcore/support/Common.cpp src/musikcore/support/Common.cpp index 58bc4d2f..1670c2f7 100644 ---- src/musikcore/support/Common.cpp -+++ src/musikcore/support/Common.cpp +--- a/src/musikcore/support/Common.cpp ++++ b/src/musikcore/support/Common.cpp @@ -90,65 +90,11 @@ namespace musik { namespace core { } diff --git a/srcpkgs/musikcube/patches/ppc-musl.patch b/srcpkgs/musikcube/patches/ppc-musl.patch index 9e63566a8ba..fc5d21c7a97 100644 --- a/srcpkgs/musikcube/patches/ppc-musl.patch +++ b/srcpkgs/musikcube/patches/ppc-musl.patch @@ -1,7 +1,7 @@ Taken from libgme patches. ---- src/plugins/gmedecoder/gme/blargg_endian.h -+++ src/plugins/gmedecoder/gme/blargg_endian.h +--- a/src/plugins/gmedecoder/gme/blargg_endian.h ++++ b/src/plugins/gmedecoder/gme/blargg_endian.h @@ -36,7 +36,7 @@ #endif diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template index 9ee39183a36..c786f86bef3 100644 --- a/srcpkgs/musikcube/template +++ b/srcpkgs/musikcube/template @@ -17,7 +17,6 @@ license="BSD-3-Clause" homepage="https://musikcube.com/" distfiles="https://github.com/clangen/musikcube/archive/${version}.tar.gz" checksum=81922ec6e86c06061dc009be3ec7c4bc8e8fd5ed3bb92231dabede8bbccaf723 -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/mutter/patches/fixudev.patch b/srcpkgs/mutter/patches/fixudev.patch index c9bd1b8c6ce..93753ae0dbf 100644 --- a/srcpkgs/mutter/patches/fixudev.patch +++ b/srcpkgs/mutter/patches/fixudev.patch @@ -3,8 +3,8 @@ just fine with our version of eudev. diff --git meson.build meson.build index dc210e6..6e080ca 100644 ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -168,7 +168,7 @@ endif have_libgudev = get_option('udev') diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 49595b486e5..fb42f099faa 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,6 +1,5 @@ # Template file for 'mutter' reverts="40.2_1" -patch_args=-Np0 pkgname=mutter version=40.1 diff --git a/srcpkgs/mysql++/patches/01-fix-cross.patch b/srcpkgs/mysql++/patches/01-fix-cross.patch index 4f1202fc072..135a9588882 100644 --- a/srcpkgs/mysql++/patches/01-fix-cross.patch +++ b/srcpkgs/mysql++/patches/01-fix-cross.patch @@ -1,7 +1,7 @@ Index: lib/datetime.cpp ================================================================== ---- lib/datetime.cpp -+++ lib/datetime.cpp +--- a/lib/datetime.cpp ++++ b/lib/datetime.cpp @@ -30,10 +30,11 @@ #include "datetime.h" diff --git a/srcpkgs/mysql++/template b/srcpkgs/mysql++/template index 278fd00b049..6dc18a42103 100644 --- a/srcpkgs/mysql++/template +++ b/srcpkgs/mysql++/template @@ -11,7 +11,6 @@ license="LGPL-2.1-or-later" homepage="https://tangentsoft.net/mysqlpp" distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz" checksum=b780beeb3a9cd9ce6a9043028527484df8e822c58c5274d4d67ec5ba2fc0a778 -patch_args=-Np0 if [ -n "$CROSS_BUILD" ]; then configure_args="--exec_prefix=${XBPS_CROSS_BASE} --with-mysql-include=${XBPS_CROSS_BASE}/usr/include/mysql"