diff --git a/srcpkgs/s3cmd/patches/python-3.9-compatibility.patch b/srcpkgs/s3cmd/patches/python-3.9-compatibility.patch index fe7f0fb904f..beec572e788 100644 --- a/srcpkgs/s3cmd/patches/python-3.9-compatibility.patch +++ b/srcpkgs/s3cmd/patches/python-3.9-compatibility.patch @@ -16,8 +16,8 @@ https://docs.python.org/3.9/whatsnew/3.9.html#removed S3/Utils.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---- S3/Exceptions.py -+++ S3/Exceptions.py +--- a/S3/Exceptions.py ++++ b/S3/Exceptions.py @@ -127,7 +127,7 @@ def parse_error_xml(tree): if not error_node.tag == "Error": error_node = tree.find(".//Error") @@ -27,8 +27,8 @@ https://docs.python.org/3.9/whatsnew/3.9.html#removed if child.text != "": debug("ErrorXML: " + child.tag + ": " + repr(child.text)) info[child.tag] = child.text ---- S3/Utils.py -+++ S3/Utils.py +--- a/S3/Utils.py ++++ b/S3/Utils.py @@ -65,9 +65,9 @@ def parseNodes(nodes): retval = [] for node in nodes: diff --git a/srcpkgs/s3cmd/template b/srcpkgs/s3cmd/template index 3571621f48c..40cd669dc97 100644 --- a/srcpkgs/s3cmd/template +++ b/srcpkgs/s3cmd/template @@ -12,7 +12,6 @@ changelog="https://github.com/s3tools/s3cmd/raw/master/NEWS" homepage="http://s3tools.org/s3cmd" distfiles="https://github.com/s3tools/${pkgname}/archive/v${version}.tar.gz" checksum=2293f775fde77201bf8e489f20516fd594168c77897168f129e5c1a2b33b7e37 -patch_args=-Np0 pre_install() { export S3CMD_INSTPATH_DOC="share/doc" diff --git a/srcpkgs/samba/patches/add_missing___compar_fn_t.patch b/srcpkgs/samba/patches/add_missing___compar_fn_t.patch index 657c72add4d..96b65e6c582 100644 --- a/srcpkgs/samba/patches/add_missing___compar_fn_t.patch +++ b/srcpkgs/samba/patches/add_missing___compar_fn_t.patch @@ -1,5 +1,5 @@ ---- source4/dsdb/samdb/ldb_modules/count_attrs.c -+++ source4/dsdb/samdb/ldb_modules/count_attrs.c +--- a/source4/dsdb/samdb/ldb_modules/count_attrs.c ++++ b/source4/dsdb/samdb/ldb_modules/count_attrs.c @@ -38,6 +38,11 @@ #define NULL_REQ_PSEUDO_N -2LL; #define STAR_REQ_PSEUDO_N -4LL; diff --git a/srcpkgs/samba/patches/getpwent_r.patch b/srcpkgs/samba/patches/getpwent_r.patch index 56e286c502d..4904cdd5e4a 100644 --- a/srcpkgs/samba/patches/getpwent_r.patch +++ b/srcpkgs/samba/patches/getpwent_r.patch @@ -1,7 +1,7 @@ diff --git source4/torture/local/nss_tests.c source4/torture/local/nss_tests.c index 2cd6122..04f13c6 100644 ---- source4/torture/local/nss_tests.c -+++ source4/torture/local/nss_tests.c +--- a/source4/torture/local/nss_tests.c ++++ b/source4/torture/local/nss_tests.c @@ -333,6 +333,7 @@ static bool test_enum_passwd(struct torture_context *tctx, return true; } diff --git a/srcpkgs/samba/patches/missing-headers.patch b/srcpkgs/samba/patches/missing-headers.patch index a91db73b758..820d7ecd903 100644 --- a/srcpkgs/samba/patches/missing-headers.patch +++ b/srcpkgs/samba/patches/missing-headers.patch @@ -1,7 +1,7 @@ diff --git lib/param/loadparm.h lib/param/loadparm.h index b5d79b9..3f4eae0 100644 ---- lib/param/loadparm.h -+++ lib/param/loadparm.h +--- a/lib/param/loadparm.h ++++ b/lib/param/loadparm.h @@ -31,6 +31,7 @@ #define _LOADPARM_H @@ -12,8 +12,8 @@ index b5d79b9..3f4eae0 100644 struct parmlist_entry *prev, *next; diff --git source3/lib/system_smbd.c source3/lib/system_smbd.c index 3b1ac9c..4044d75 100644 ---- source3/lib/system_smbd.c -+++ source3/lib/system_smbd.c +--- a/source3/lib/system_smbd.c ++++ b/source3/lib/system_smbd.c @@ -27,6 +27,8 @@ #include "system/passwd.h" #include "nsswitch/winbind_client.h" @@ -25,8 +25,8 @@ index 3b1ac9c..4044d75 100644 diff --git source4/torture/local/nss_tests.c source4/torture/local/nss_tests.c index 2cd6122..0c84ec2 100644 ---- source4/torture/local/nss_tests.c -+++ source4/torture/local/nss_tests.c +--- a/source4/torture/local/nss_tests.c ++++ b/source4/torture/local/nss_tests.c @@ -20,6 +20,8 @@ */ @@ -39,8 +39,8 @@ index 2cd6122..0c84ec2 100644 diff --git ctdb/tests/src/protocol_util_test.c ctdb/tests/src/protocol_util_test.c index edd2a34..48ce96e 100644 ---- ctdb/tests/src/protocol_util_test.c -+++ ctdb/tests/src/protocol_util_test.c +--- a/ctdb/tests/src/protocol_util_test.c ++++ b/ctdb/tests/src/protocol_util_test.c @@ -20,6 +20,7 @@ #include "replace.h" #include "system/network.h" diff --git a/srcpkgs/samba/patches/musl_rm_unistd_incl.patch b/srcpkgs/samba/patches/musl_rm_unistd_incl.patch index 1fafa741e11..1f4aae2683b 100644 --- a/srcpkgs/samba/patches/musl_rm_unistd_incl.patch +++ b/srcpkgs/samba/patches/musl_rm_unistd_incl.patch @@ -1,5 +1,5 @@ ---- lib/replace/replace.h -+++ lib/replace/replace.h +--- a/lib/replace/replace.h ++++ b/lib/replace/replace.h @@ -168,10 +168,6 @@ #include #endif @@ -11,8 +11,8 @@ #ifdef HAVE_STRING_H #include #endif ---- lib/replace/system/network.h -+++ lib/replace/system/network.h +--- a/lib/replace/system/network.h ++++ b/lib/replace/system/network.h @@ -31,10 +31,6 @@ #error "AC_LIBREPLACE_NETWORK_CHECKS missing in configure" #endif @@ -24,8 +24,8 @@ #ifdef HAVE_SYS_SOCKET_H #include #endif ---- source3/rpc_server/mdssvc/mdssvc.c -+++ source3/rpc_server/mdssvc/mdssvc.c +--- a/source3/rpc_server/mdssvc/mdssvc.c ++++ b/source3/rpc_server/mdssvc/mdssvc.c @@ -18,6 +18,8 @@ along with this program. If not, see . */ diff --git a/srcpkgs/samba/patches/musl_uintptr.patch b/srcpkgs/samba/patches/musl_uintptr.patch index 4c09c54d4eb..cbf606708ed 100644 --- a/srcpkgs/samba/patches/musl_uintptr.patch +++ b/srcpkgs/samba/patches/musl_uintptr.patch @@ -13,8 +13,8 @@ Date: Wed Mar 29 15:22:38 2017 -0300 diff --git third_party/cmocka/cmocka.h third_party/cmocka/cmocka.h index 303d0ae..a2bfc40 100644 ---- third_party/cmocka/cmocka.h -+++ third_party/cmocka/cmocka.h +--- a/third_party/cmocka/cmocka.h ++++ b/third_party/cmocka/cmocka.h @@ -111,7 +111,7 @@ ((LargestIntegralType)(value)) diff --git a/srcpkgs/samba/patches/netdb-defines.patch b/srcpkgs/samba/patches/netdb-defines.patch index 5d7caa6208b..15f79eebfb6 100644 --- a/srcpkgs/samba/patches/netdb-defines.patch +++ b/srcpkgs/samba/patches/netdb-defines.patch @@ -1,7 +1,7 @@ diff --git nsswitch/wins.c nsswitch/wins.c index dccb6dd..bb24acb 100644 ---- nsswitch/wins.c -+++ nsswitch/wins.c +--- a/nsswitch/wins.c ++++ b/nsswitch/wins.c @@ -39,6 +39,14 @@ static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER; #define INADDRSZ 4 #endif diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 8195f38fbf0..90be22e5705 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -32,7 +32,6 @@ lib32disabled=yes conf_files="/etc/pam.d/samba /etc/samba/smb.conf" make_dirs="/etc/samba/private 0750 root root" subpackages="smbclient samba-ctdb samba-cups samba-devel samba-libs samba-python3" -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/sandboxfs/patches/32bit.patch b/srcpkgs/sandboxfs/patches/32bit.patch index 5951ffd3818..0eeb76dd7ac 100644 --- a/srcpkgs/sandboxfs/patches/32bit.patch +++ b/srcpkgs/sandboxfs/patches/32bit.patch @@ -1,5 +1,5 @@ ---- src/nodes/mod.rs.orig -+++ src/nodes/mod.rs +--- a/src/nodes/mod.rs ++++ b/src/nodes/mod.rs @@ -173,11 +173,11 @@ } let size = size.unwrap(); @@ -15,8 +15,8 @@ }; if result.is_ok() { attr.size = size; ---- src/nodes/conv.rs.orig -+++ src/nodes/conv.rs +--- a/src/nodes/conv.rs ++++ b/src/nodes/conv.rs @@ -69,7 +69,7 @@ } else { val.tv_usec() as i32 diff --git a/srcpkgs/sandboxfs/template b/srcpkgs/sandboxfs/template index 979a457e105..9ab7a626b20 100644 --- a/srcpkgs/sandboxfs/template +++ b/srcpkgs/sandboxfs/template @@ -12,7 +12,6 @@ license="Apache-2.0" homepage="https://github.com/bazelbuild/sandboxfs" distfiles="https://github.com/bazelbuild/sandboxfs/archive/sandboxfs-${version}.tar.gz" checksum=bff68e7d33ae56a3f34a79a74b2576599f5ccc381a237bbc10b5a3c3ea106b60 -patch_args=-Np0 post_install() { vman man/sandboxfs.1 diff --git a/srcpkgs/sane/patches/sane-desc-cross.patch b/srcpkgs/sane/patches/sane-desc-cross.patch index 605c85b0a88..6acee77c0e7 100644 --- a/srcpkgs/sane/patches/sane-desc-cross.patch +++ b/srcpkgs/sane/patches/sane-desc-cross.patch @@ -1,5 +1,5 @@ ---- tools/Makefile.in -+++ tools/Makefile.in +--- a/tools/Makefile.in ++++ b/tools/Makefile.in @@ -586,7 +586,7 @@ gamma4scanimage$(EXEEXT): $(gamma4scanimage_OBJECTS) $(gamma4scanimage_DEPENDENC sane-desc$(EXEEXT): $(sane_desc_OBJECTS) $(sane_desc_DEPENDENCIES) $(EXTRA_sane_desc_DEPENDENCIES) diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template index 8a68e3b65a1..35dac1cc846 100644 --- a/srcpkgs/sane/template +++ b/srcpkgs/sane/template @@ -21,7 +21,6 @@ homepage="http://www.sane-project.org/" distfiles="https://gitlab.com/sane-project/backends/uploads/${_gitlab_release_hash}/sane-backends-${version}.tar.gz" checksum=4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa noshlibprovides="avoid false detection of device drivers" -patch_args=-Np0 build_options="snmp" diff --git a/srcpkgs/sasm/patches/dont-install-vendores-binaries.patch b/srcpkgs/sasm/patches/dont-install-vendores-binaries.patch index 62797d99456..dc442fe57e8 100644 --- a/srcpkgs/sasm/patches/dont-install-vendores-binaries.patch +++ b/srcpkgs/sasm/patches/dont-install-vendores-binaries.patch @@ -1,7 +1,7 @@ reason: Linux/bin/ vendors {listing,fasm} binaries, statically linked for i386 ---- SASM.pro -+++ SASM.pro +--- a/SASM.pro ++++ b/SASM.pro @@ -31,7 +31,6 @@ docfiles.path = $$DATADIR/doc/sasm/ } else { diff --git a/srcpkgs/sasm/template b/srcpkgs/sasm/template index a3a705648cd..3c624065b5d 100644 --- a/srcpkgs/sasm/template +++ b/srcpkgs/sasm/template @@ -12,4 +12,3 @@ license="GPL-3.0-or-later" homepage="http://dman95.github.io/SASM/" distfiles="https://github.com/Dman95/SASM/archive/v${version}.tar.gz" checksum=2c551d4a04f2e11f000eb1716885a646110305f8f2892d1a7761c0d4670d19a0 -patch_args=-Np0 diff --git a/srcpkgs/sauerbraten/patches/flags.patch b/srcpkgs/sauerbraten/patches/flags.patch index be7bb4bd295..6cd7c3c3ba4 100644 --- a/srcpkgs/sauerbraten/patches/flags.patch +++ b/srcpkgs/sauerbraten/patches/flags.patch @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2017-01-12 21:54:08.156276696 -0600 -+++ src/Makefile 2017-01-12 21:56:06.889752748 -0600 +--- a/src/Makefile 2017-01-12 21:54:08.156276696 -0600 ++++ b/src/Makefile 2017-01-12 21:56:06.889752748 -0600 @@ -1,4 +1,4 @@ -CXXFLAGS= -O3 -fomit-frame-pointer +CXXFLAGS= -O3 -fomit-frame-pointer $(CFLAGS) diff --git a/srcpkgs/sauerbraten/template b/srcpkgs/sauerbraten/template index 102bb584421..587cc3da590 100644 --- a/srcpkgs/sauerbraten/template +++ b/srcpkgs/sauerbraten/template @@ -13,7 +13,6 @@ license="Zlib" homepage="http://sauerbraten.org" distfiles="${SOURCEFORGE_SITE}/sauerbraten/sauerbraten_${version//./_}_collect_edition_linux.tar.bz2" checksum=45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e -patch_args=-Np0 restricted="Very large - not worth storing on current Void infrastructure" diff --git a/srcpkgs/sbcl/patches/ppc-musl.patch b/srcpkgs/sbcl/patches/ppc-musl.patch index 63478d43ab4..2da4c1706b3 100644 --- a/srcpkgs/sbcl/patches/ppc-musl.patch +++ b/srcpkgs/sbcl/patches/ppc-musl.patch @@ -1,5 +1,5 @@ ---- src/runtime/ppc-linux-os.c -+++ src/runtime/ppc-linux-os.c +--- a/src/runtime/ppc-linux-os.c ++++ b/src/runtime/ppc-linux-os.c @@ -33,6 +33,7 @@ #include #include diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 8e52f31ee67..4fc8a569b50 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -15,7 +15,6 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" checksum=965807ecd65a9590d68a0ed408b544e7e49a1f6e337ebd2b25e34788bcc8a8c5 nocross=yes nopie=yes -patch_args=-Np0 _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/sc3-plugins/patches/cstdio.patch b/srcpkgs/sc3-plugins/patches/cstdio.patch index b2020affe8b..9ffb2d2bac0 100644 --- a/srcpkgs/sc3-plugins/patches/cstdio.patch +++ b/srcpkgs/sc3-plugins/patches/cstdio.patch @@ -1,5 +1,5 @@ ---- source/NHUGens/NHHall.cpp 2018-11-18 23:18:46.000000000 +0100 -+++ source/NHUGens/NHHall.cpp 2020-09-13 07:57:48.084435095 +0200 +--- a/source/NHUGens/NHHall.cpp 2018-11-18 23:18:46.000000000 +0100 ++++ b/source/NHUGens/NHHall.cpp 2020-09-13 07:57:48.084435095 +0200 @@ -25,6 +25,7 @@ For more information, please refer to */ diff --git a/srcpkgs/sc3-plugins/template b/srcpkgs/sc3-plugins/template index a26e459fc3a..8511caea26e 100644 --- a/srcpkgs/sc3-plugins/template +++ b/srcpkgs/sc3-plugins/template @@ -19,7 +19,6 @@ distfiles="https://github.com/supercollider/sc3-plugins/archive/Version-${versio checksum="b8144231ea1bfc1c9d8aa6780c7e963dfb642868794abbfd8ccab418ffbbdfbe 9b2035a3a7942c61cbe89b00c35c7e16ac281c06786fe1c30dfd333194be499a df9f280daaad56fdadb5fa75d492ee6a06762a41d7346aa473aa49c1ac9ec9c8" -patch_args=-Np0 post_extract() { rm -rf external_libraries/nova-simd diff --git a/srcpkgs/scanmem/patches/fix-musl.patch b/srcpkgs/scanmem/patches/fix-musl.patch index bc109407b8e..2253cb78585 100644 --- a/srcpkgs/scanmem/patches/fix-musl.patch +++ b/srcpkgs/scanmem/patches/fix-musl.patch @@ -1,7 +1,7 @@ diff --git a/scanroutines.c b/scanroutines.c index 2c5f33a..edc7c29 100644 ---- scanroutines.c -+++ scanroutines.c +--- a/scanroutines.c ++++ b/scanroutines.c @@ -20,6 +20,8 @@ along with this library. If not, see . */ @@ -13,8 +13,8 @@ index 2c5f33a..edc7c29 100644 diff --git a/targetmem.h b/targetmem.h index b62a4f2..25b5c9c 100644 ---- targetmem.h -+++ targetmem.h +--- a/targetmem.h ++++ b/targetmem.h @@ -24,6 +24,9 @@ #ifndef TARGETMEM_H #define TARGETMEM_H diff --git a/srcpkgs/scanmem/template b/srcpkgs/scanmem/template index 5e715569c8a..d694f33d372 100644 --- a/srcpkgs/scanmem/template +++ b/srcpkgs/scanmem/template @@ -13,7 +13,6 @@ homepage="https://github.com/scanmem/scanmem" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" checksum=f02054b91322cf41517506158fcb74554e9fc6644e696f8aa25e5acf162d374b CFLAGS="-D__NEED_pid_t" -patch_args=-Np0 nocross="checking for /proc/self/maps... configure: error" diff --git a/srcpkgs/schroot/patches/getent.patch b/srcpkgs/schroot/patches/getent.patch index 373b5b24061..b89e63c1d49 100644 --- a/srcpkgs/schroot/patches/getent.patch +++ b/srcpkgs/schroot/patches/getent.patch @@ -9,8 +9,8 @@ Subject: [PATCH] getent diff --git etc/setup.d/20nssdatabases etc/setup.d/20nssdatabases index 6f14c81..697bb1e 100755 ---- etc/setup.d/20nssdatabases -+++ etc/setup.d/20nssdatabases +--- a/etc/setup.d/20nssdatabases ++++ b/etc/setup.d/20nssdatabases @@ -29,7 +29,7 @@ set -e dup_nss() { diff --git a/srcpkgs/schroot/patches/getmntent.patch b/srcpkgs/schroot/patches/getmntent.patch index 12e65519ee4..8453bfb3a30 100644 --- a/srcpkgs/schroot/patches/getmntent.patch +++ b/srcpkgs/schroot/patches/getmntent.patch @@ -10,8 +10,8 @@ Subject: [PATCH] getmntent fix diff --git sbuild/sbuild-mntstream.cc sbuild/sbuild-mntstream.cc index d376fe5..d7324e7 100644 ---- sbuild/sbuild-mntstream.cc -+++ sbuild/sbuild-mntstream.cc +--- a/sbuild/sbuild-mntstream.cc ++++ b/sbuild/sbuild-mntstream.cc @@ -37,9 +37,7 @@ namespace emap init_errors[] = { @@ -43,8 +43,8 @@ index d376fe5..d7324e7 100644 this->data.push_back(newentry); // push onto the end of the list diff --git sbuild/sbuild-mntstream.h sbuild/sbuild-mntstream.h index ea3d179..fffcdf4 100644 ---- sbuild/sbuild-mntstream.h -+++ sbuild/sbuild-mntstream.h +--- a/sbuild/sbuild-mntstream.h ++++ b/sbuild/sbuild-mntstream.h @@ -49,8 +49,7 @@ namespace sbuild /// Error codes. enum error_code diff --git a/srcpkgs/schroot/patches/musl.patch b/srcpkgs/schroot/patches/musl.patch index 83a6dfa6b30..a8b3d56fd2d 100644 --- a/srcpkgs/schroot/patches/musl.patch +++ b/srcpkgs/schroot/patches/musl.patch @@ -9,8 +9,8 @@ Subject: [PATCH] musl diff --git sbuild/sbuild-feature.cc sbuild/sbuild-feature.cc index 5ac4725..9902db3 100644 ---- sbuild/sbuild-feature.cc -+++ sbuild/sbuild-feature.cc +--- a/sbuild/sbuild-feature.cc ++++ b/sbuild/sbuild-feature.cc @@ -20,6 +20,8 @@ #include diff --git a/srcpkgs/schroot/patches/remove-networks.patch b/srcpkgs/schroot/patches/remove-networks.patch index 1008899902f..75066693480 100644 --- a/srcpkgs/schroot/patches/remove-networks.patch +++ b/srcpkgs/schroot/patches/remove-networks.patch @@ -11,8 +11,8 @@ Subject: [PATCH] remove networks diff --git etc/profile-templates/buildd/all/copyfiles etc/profile-templates/buildd/all/copyfiles index fe18fb3..2469d3e 100644 ---- etc/profile-templates/buildd/all/copyfiles -+++ etc/profile-templates/buildd/all/copyfiles +--- a/etc/profile-templates/buildd/all/copyfiles ++++ b/etc/profile-templates/buildd/all/copyfiles @@ -3,4 +3,3 @@ # /etc/hosts @@ -20,8 +20,8 @@ index fe18fb3..2469d3e 100644 -/etc/networks diff --git etc/profile-templates/default/all/nssdatabases etc/profile-templates/default/all/nssdatabases index a9f1319..22efe1b 100644 ---- etc/profile-templates/default/all/nssdatabases -+++ etc/profile-templates/default/all/nssdatabases +--- a/etc/profile-templates/default/all/nssdatabases ++++ b/etc/profile-templates/default/all/nssdatabases @@ -1,4 +1,3 @@ services protocols @@ -29,8 +29,8 @@ index a9f1319..22efe1b 100644 hosts diff --git etc/profile-templates/desktop/all/nssdatabases etc/profile-templates/desktop/all/nssdatabases index a9f1319..22efe1b 100644 ---- etc/profile-templates/desktop/all/nssdatabases -+++ etc/profile-templates/desktop/all/nssdatabases +--- a/etc/profile-templates/desktop/all/nssdatabases ++++ b/etc/profile-templates/desktop/all/nssdatabases @@ -1,4 +1,3 @@ services protocols diff --git a/srcpkgs/schroot/patches/schroot-cppunit.patch b/srcpkgs/schroot/patches/schroot-cppunit.patch index f7f4fd6b459..3e11c73fd40 100644 --- a/srcpkgs/schroot/patches/schroot-cppunit.patch +++ b/srcpkgs/schroot/patches/schroot-cppunit.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2017-05-20 09:50:30.146864516 +0000 -+++ configure.ac 2017-05-20 09:51:26.216792794 +0000 +--- a/configure.ac 2017-05-20 09:50:30.146864516 +0000 ++++ b/configure.ac 2017-05-20 09:51:26.216792794 +0000 @@ -336,7 +336,7 @@ [HAVE_UUID=yes], [HAVE_UUID=no]) diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template index d30517ec641..85416dee5e9 100644 --- a/srcpkgs/schroot/template +++ b/srcpkgs/schroot/template @@ -55,7 +55,6 @@ checksum=" 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b 56bc82fc8ae7f6ca7eef506ccc1dca1211b2c84d83efc50d24670b8bdb9ea8bb" nocross=yes -patch_args=-Np0 pre_configure() { cat ../debian/patches/series | while read p; do diff --git a/srcpkgs/screen/patches/cve-2021-26937.patch b/srcpkgs/screen/patches/cve-2021-26937.patch index 707e513e747..8878a7968fb 100644 --- a/srcpkgs/screen/patches/cve-2021-26937.patch +++ b/srcpkgs/screen/patches/cve-2021-26937.patch @@ -6,8 +6,8 @@ Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html ---- encoding.c.orig -+++ encoding.c +--- a/encoding.c ++++ b/encoding.c @@ -43,7 +43,7 @@ # ifdef UTF8 static int recode_char __P((int, int, int)); diff --git a/srcpkgs/screen/patches/screen-cross_compile_fix.patch b/srcpkgs/screen/patches/screen-cross_compile_fix.patch index fe5f5e969a2..480f1f6d6e6 100644 --- a/srcpkgs/screen/patches/screen-cross_compile_fix.patch +++ b/srcpkgs/screen/patches/screen-cross_compile_fix.patch @@ -1,5 +1,5 @@ ---- configure.orig 2014-08-12 23:28:34.867815037 +0200 -+++ configure 2014-08-12 23:31:35.647817252 +0200 +--- a/configure 2014-08-12 23:28:34.867815037 +0200 ++++ b/configure 2014-08-12 23:31:35.647817252 +0200 @@ -305,6 +305,7 @@ # Exit the shell with STATUS, even in a "trap 0" or "set -e" context. as_fn_exit () diff --git a/srcpkgs/screen/patches/utf8_nfd.patch b/srcpkgs/screen/patches/utf8_nfd.patch index 6760abb9414..00a070de582 100644 --- a/srcpkgs/screen/patches/utf8_nfd.patch +++ b/srcpkgs/screen/patches/utf8_nfd.patch @@ -13,8 +13,8 @@ Bugs-Debian: https://bugs.debian.org/677512 diff --git a/ansi.c b/ansi.c index 2a52edd..83b266d 100644 ---- ansi.c.orig -+++ ansi.c +--- a/ansi.c ++++ b/ansi.c @@ -692,10 +692,6 @@ register int len; } curr->w_rend.font = 0; diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template index f6288cc075b..613696d9f37 100644 --- a/srcpkgs/screen/template +++ b/srcpkgs/screen/template @@ -14,7 +14,6 @@ license="GPL-3.0-or-later" homepage="http://www.gnu.org/s/screen/" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1 -patch_args=-Np0 post_install() { vinstall etc/etcscreenrc 0644 etc screenrc diff --git a/srcpkgs/scribus/patches/cmake-build-type-none.patch b/srcpkgs/scribus/patches/cmake-build-type-none.patch index a27b4c75781..b5011c92823 100644 --- a/srcpkgs/scribus/patches/cmake-build-type-none.patch +++ b/srcpkgs/scribus/patches/cmake-build-type-none.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -75,11 +75,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/srcpkgs/scribus/patches/export-symbols-for-plugins.patch b/srcpkgs/scribus/patches/export-symbols-for-plugins.patch index beefa78bda0..83895c141aa 100644 --- a/srcpkgs/scribus/patches/export-symbols-for-plugins.patch +++ b/srcpkgs/scribus/patches/export-symbols-for-plugins.patch @@ -1,5 +1,5 @@ ---- scribus/CMakeLists.txt.ORIG 2021-04-25 22:24:52.000000000 +0200 -+++ scribus/CMakeLists.txt 2021-06-12 16:23:22.884229251 +0200 +--- a/scribus/CMakeLists.txt 2021-04-25 22:24:52.000000000 +0200 ++++ b/scribus/CMakeLists.txt 2021-06-12 16:23:22.884229251 +0200 @@ -757,7 +757,7 @@ # Should fix bug 6897 . set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E) diff --git a/srcpkgs/scribus/patches/fix-musl.patch b/srcpkgs/scribus/patches/fix-musl.patch index 36bb71e62a9..1b47170b972 100644 --- a/srcpkgs/scribus/patches/fix-musl.patch +++ b/srcpkgs/scribus/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- scribus/util.cpp 2019-07-31 00:35:04.000000000 +0200 -+++ - 2019-09-17 22:29:18.301884583 +0200 +--- a/scribus/util.cpp 2019-07-31 00:35:04.000000000 +0200 ++++ b/scribus/util.cpp 2019-07-31 00:35:04.000000000 +0200 @@ -40,7 +40,7 @@ #include @@ -9,8 +9,8 @@ #include #include #endif ---- scribus/util_debug.cpp 2019-07-31 00:35:07.000000000 +0200 -+++ - 2019-09-17 22:30:10.159216480 +0200 +--- a/scribus/util_debug.cpp 2019-07-31 00:35:07.000000000 +0200 ++++ b/scribus/util_debug.cpp 2019-07-31 00:35:07.000000000 +0200 @@ -24,7 +24,7 @@ #include #include diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index 00685dfba6a..0898252efc4 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -19,4 +19,3 @@ homepage="https://scribus.net" distfiles="$SOURCEFORGE_SITE/scribus/scribus-devel/${version}/scribus-${version}.tar.xz" checksum=318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce python_version=3 -patch_args=-Np0 diff --git a/srcpkgs/scrotty/patches/fish-completion-vendor.patch b/srcpkgs/scrotty/patches/fish-completion-vendor.patch index 9d232716184..8fe571744e7 100644 --- a/srcpkgs/scrotty/patches/fish-completion-vendor.patch +++ b/srcpkgs/scrotty/patches/fish-completion-vendor.patch @@ -1,7 +1,7 @@ #reason: fish-shell requires 3rd-party completion files to be installed to vendor_completions.d ---- mk/shell.mk -+++ mk/shell.mk +--- a/mk/shell.mk ++++ b/mk/shell.mk @@ -189,12 +189,12 @@ .PHONY: install-fish install-fish: $(foreach F,$(_AUTO_COMPLETE),bin/$(F).fish-completion) diff --git a/srcpkgs/scrotty/template b/srcpkgs/scrotty/template index 69270af50e2..13b03a1d156 100644 --- a/srcpkgs/scrotty/template +++ b/srcpkgs/scrotty/template @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/maandree/scrotty" distfiles="https://github.com/maandree/scrotty/archive/${version}.tar.gz" checksum=466528d6ecf0138f57c40541258389686e22771c28d40f28c00825faaeaab1a3 -patch_args=-Np0 pre_configure() { export EXTRA_CFLAGS="$CFLAGS" diff --git a/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff b/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff index c771107514e..c7c9b50d488 100644 --- a/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff +++ b/srcpkgs/scummvm/patches/fluidsynth-2.2.0.diff @@ -1,5 +1,5 @@ ---- audio/softsynth/fluidsynth.cpp -+++ audio/softsynth/fluidsynth.cpp +--- a/audio/softsynth/fluidsynth.cpp ++++ b/audio/softsynth/fluidsynth.cpp @@ -144,11 +144,11 @@ return p; } diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template index aa52ba65d1e..0cec3ab176d 100644 --- a/srcpkgs/scummvm/template +++ b/srcpkgs/scummvm/template @@ -16,7 +16,6 @@ license="GPL-2.0-or-later" homepage="https://www.scummvm.org/" distfiles="https://downloads.scummvm.org/frs/${pkgname}/${version}/${pkgname}-${version}.tar.xz" checksum=1469657e593bd8acbcfac0b839b086f640ebf120633e93f116cab652b5b27387 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*);; diff --git a/srcpkgs/sddm/patches/remove-consolekit-detection.patch b/srcpkgs/sddm/patches/remove-consolekit-detection.patch index 62ce5712fc9..935e3a2e076 100644 --- a/srcpkgs/sddm/patches/remove-consolekit-detection.patch +++ b/srcpkgs/sddm/patches/remove-consolekit-detection.patch @@ -2,8 +2,8 @@ Source: Hoshpak Upstream: https://github.com/sddm/sddm/issues/903 and https://github.com/sddm/sddm/pull/923 Reason: removes detection for the ConsoleKit interface because the ConsoleKit2 code path is currently broken and would cause sddm to fail to start with ConsoleKit2 present ---- src/daemon/LogindDBusTypes.cpp 2018-10-07 17:40:49.944625726 +0200 -+++ src/daemon/LogindDBusTypes.cpp 2018-10-07 17:41:01.590479575 +0200 +--- a/src/daemon/LogindDBusTypes.cpp 2018-10-07 17:40:49.944625726 +0200 ++++ b/src/daemon/LogindDBusTypes.cpp 2018-10-07 17:41:01.590479575 +0200 @@ -58,17 +58,6 @@ return; } diff --git a/srcpkgs/sddm/template b/srcpkgs/sddm/template index 6d58d2e52e0..2a87381c8e8 100644 --- a/srcpkgs/sddm/template +++ b/srcpkgs/sddm/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later, CC-BY-3.0" homepage="http://github.com/sddm/sddm" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" checksum=e76da1f13d5ad5e0179e3fec57543126044339405ef19c397e105e0807bd4e41 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" sddm qt5-host-tools qt5-qmake qt5-tools" diff --git a/srcpkgs/seafile-client-qt/patches/qt5.15-QPainterPath.patch b/srcpkgs/seafile-client-qt/patches/qt5.15-QPainterPath.patch index fbe24f688d2..66f5f728b5b 100644 --- a/srcpkgs/seafile-client-qt/patches/qt5.15-QPainterPath.patch +++ b/srcpkgs/seafile-client-qt/patches/qt5.15-QPainterPath.patch @@ -1,15 +1,15 @@ source: upstream pull request https://github.com/haiwen/seafile-client/pull/1297 ---- src/ui/events-list-view.cpp.orig -+++ src/ui/events-list-view.cpp +--- a/src/ui/events-list-view.cpp ++++ b/src/ui/events-list-view.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include ---- src/ui/private-share-dialog.cpp.orig -+++ src/ui/private-share-dialog.cpp +--- a/src/ui/private-share-dialog.cpp ++++ b/src/ui/private-share-dialog.cpp @@ -2,6 +2,7 @@ #include #include diff --git a/srcpkgs/seafile-client-qt/template b/srcpkgs/seafile-client-qt/template index 1f9b122cce2..76b9a41fe45 100644 --- a/srcpkgs/seafile-client-qt/template +++ b/srcpkgs/seafile-client-qt/template @@ -15,7 +15,6 @@ license="Apache-2.0" homepage="https://seafile.com" distfiles="https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz" checksum=a6be7e55236cd4fb6028259ab5f35163ce044811f45b6008f280d42f5cee9f8d -patch_args=-Np0 build_options="shibboleth" desc_option_shibboleth="Build with Shibboleth support" diff --git a/srcpkgs/seahorse-nautilus/patches/locale.patch b/srcpkgs/seahorse-nautilus/patches/locale.patch index 1b63a313012..bae173b0614 100644 --- a/srcpkgs/seahorse-nautilus/patches/locale.patch +++ b/srcpkgs/seahorse-nautilus/patches/locale.patch @@ -1,7 +1,7 @@ Index: configure =================================================================== ---- configure.orig -+++ configure +--- a/configure ++++ b/configure @@ -14606,8 +14606,8 @@ fi DATADIRNAME=share ;; diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template index c468cc13836..04424cc4acd 100644 --- a/srcpkgs/seahorse-nautilus/template +++ b/srcpkgs/seahorse-nautilus/template @@ -15,4 +15,3 @@ homepage="http://www.gnome.org/projects/seahorse/" distfiles="${GNOME_SITE}/seahorse-nautilus/${version%.*}/seahorse-nautilus-${version}.tar.xz" checksum=eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a lib32disabled=yes -patch_args=-Np0 diff --git a/srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch b/srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch index 94bb1f37db7..00efb4fc930 100644 --- a/srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch +++ b/srcpkgs/seexpr-krita/patches/cmake-build-type-none.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -42,14 +42,6 @@ endif() ## Choose build options diff --git a/srcpkgs/seexpr-krita/template b/srcpkgs/seexpr-krita/template index 0aaba237573..efb21e6f650 100644 --- a/srcpkgs/seexpr-krita/template +++ b/srcpkgs/seexpr-krita/template @@ -14,7 +14,6 @@ license="GPL-3.0-or-later" homepage="https://krita.org" distfiles="${KDE_SITE}/kseexpr/${version%.*}/kseexpr-${version}.tar.gz" checksum=13b8455883001668f5d79c5734821c1ad2a0fbc91d019af085bb7e31cf6ce926 -patch_args=-Np0 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DBUILD_TESTS=ON" diff --git a/srcpkgs/seq2gif/patches/ifdef.patch b/srcpkgs/seq2gif/patches/ifdef.patch index ce4de51b785..9f8c291a0a1 100644 --- a/srcpkgs/seq2gif/patches/ifdef.patch +++ b/srcpkgs/seq2gif/patches/ifdef.patch @@ -1,7 +1,7 @@ diff --git dcs.c dcs.c index e0f5f97..b1e7919 100644 ---- dcs.c -+++ dcs.c +--- a/dcs.c ++++ b/dcs.c @@ -28,13 +28,13 @@ #include "dcs.h" @@ -21,8 +21,8 @@ index e0f5f97..b1e7919 100644 diff --git function.c function.c index fb2066d..efbd4b4 100644 ---- function.c -+++ function.c +--- a/function.c ++++ b/function.c @@ -23,7 +23,7 @@ #include "function.h" @@ -34,8 +34,8 @@ index fb2066d..efbd4b4 100644 diff --git gifsave89.c gifsave89.c index 1eeb1ad..3af3384 100644 ---- gifsave89.c -+++ gifsave89.c +--- a/gifsave89.c ++++ b/gifsave89.c @@ -25,10 +25,10 @@ standard headers... #include #include @@ -51,8 +51,8 @@ index 1eeb1ad..3af3384 100644 #if defined(GSTESTDRIVE) diff --git main.c main.c index 894e493..18cd178 100644 ---- main.c -+++ main.c +--- a/main.c ++++ b/main.c @@ -28,22 +28,22 @@ #include @@ -125,8 +125,8 @@ index 894e493..18cd178 100644 #endif /* HAVE_ERRNO_H */ diff --git malloc_stub.c malloc_stub.c index c5e881a..e858069 100644 ---- malloc_stub.c -+++ malloc_stub.c +--- a/malloc_stub.c ++++ b/malloc_stub.c @@ -17,17 +17,17 @@ #include "config.h" @@ -159,8 +159,8 @@ index c5e881a..e858069 100644 rpl_realloc(void *p, size_t n) diff --git malloc_stub.h malloc_stub.h index 676b1b6..3ae5a50 100644 ---- malloc_stub.h -+++ malloc_stub.h +--- a/malloc_stub.h ++++ b/malloc_stub.h @@ -18,15 +18,15 @@ #ifndef MALLOC_STUB_H #define MALLOC_STUB_H @@ -182,8 +182,8 @@ index 676b1b6..3ae5a50 100644 diff --git parse.c parse.c index 65b00ab..aec3692 100644 ---- parse.c -+++ parse.c +--- a/parse.c ++++ b/parse.c @@ -24,10 +24,10 @@ #include "dcs.h" @@ -199,8 +199,8 @@ index 65b00ab..aec3692 100644 diff --git pseudo.c pseudo.c index 89de986..2560b11 100644 ---- pseudo.c -+++ pseudo.c +--- a/pseudo.c ++++ b/pseudo.c @@ -21,7 +21,7 @@ #include "util.h" #include "pseudo.h" @@ -212,8 +212,8 @@ index 89de986..2560b11 100644 diff --git terminal.c terminal.c index 6d1a0be..26ce2aa 100644 ---- terminal.c -+++ terminal.c +--- a/terminal.c ++++ b/terminal.c @@ -23,10 +23,10 @@ #include "wcwidth.h" @@ -229,8 +229,8 @@ index 6d1a0be..26ce2aa 100644 diff --git util.c util.c index ce3cfe8..6aa0439 100644 ---- util.c -+++ util.c +--- a/util.c ++++ b/util.c @@ -19,19 +19,19 @@ #include "config.h" @@ -296,8 +296,8 @@ index ce3cfe8..6aa0439 100644 return 0; diff --git wcwidth.h wcwidth.h index 5a2041f..e1da9e5 100644 ---- wcwidth.h -+++ wcwidth.h +--- a/wcwidth.h ++++ b/wcwidth.h @@ -16,7 +16,7 @@ * along with this program. If not, see . */ @@ -309,8 +309,8 @@ index 5a2041f..e1da9e5 100644 diff --git yaft.h yaft.h index 9ecdfd6..4fc3644 100644 ---- yaft.h -+++ yaft.h +--- a/yaft.h ++++ b/yaft.h @@ -19,7 +19,7 @@ #include "config.h" #include diff --git a/srcpkgs/seq2gif/template b/srcpkgs/seq2gif/template index 63ba990a96c..8146d539a28 100644 --- a/srcpkgs/seq2gif/template +++ b/srcpkgs/seq2gif/template @@ -9,4 +9,3 @@ license="GPL-3.0-or-later" homepage="http://saitoha.github.io/seq2gif/" distfiles="https://github.com/saitoha/seq2gif/archive/v${version}.tar.gz" checksum=738805bf8eb7ee5171ded7f43326cca7caecb77031283720f97253c234261f29 -patch_args=-Np0 diff --git a/srcpkgs/serf/patches/0001-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch b/srcpkgs/serf/patches/0001-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch index acbe755f538..3d2634cf27e 100644 --- a/srcpkgs/serf/patches/0001-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch +++ b/srcpkgs/serf/patches/0001-Follow-up-to-r1811083-fix-building-with-scons-3.0.0-.patch @@ -15,8 +15,8 @@ git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1814604 13f79535-47bb-03 diff --git SConstruct SConstruct index 4358a23..1766870 100644 ---- SConstruct -+++ SConstruct +--- a/SConstruct ++++ b/SConstruct @@ -166,7 +166,7 @@ env.Append(BUILDERS = { match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' 'SERF_MINOR_VERSION ([0-9]+).*' diff --git a/srcpkgs/serf/patches/0002-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch b/srcpkgs/serf/patches/0002-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch index cd9b5e3b01a..8d478be6d1c 100644 --- a/srcpkgs/serf/patches/0002-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch +++ b/srcpkgs/serf/patches/0002-Fix-syntax-of-a-print-in-the-scons-file-to-unbreak-b.patch @@ -15,8 +15,8 @@ git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1811083 13f79535-47bb-03 diff --git SConstruct SConstruct index 1766870..a7e18da 100644 ---- SConstruct -+++ SConstruct +--- a/SConstruct ++++ b/SConstruct @@ -183,7 +183,7 @@ CALLOUT_OKAY = not (env.GetOption('clean') or env.GetOption('help')) unknown = opts.UnknownVariables() diff --git a/srcpkgs/serf/patches/0003-Make-the-tests-run-with-Python-3.x.patch b/srcpkgs/serf/patches/0003-Make-the-tests-run-with-Python-3.x.patch index 3f5cc84e51c..b82111d2bb9 100644 --- a/srcpkgs/serf/patches/0003-Make-the-tests-run-with-Python-3.x.patch +++ b/srcpkgs/serf/patches/0003-Make-the-tests-run-with-Python-3.x.patch @@ -13,8 +13,8 @@ git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1833223 13f79535-47bb-03 diff --git build/check.py build/check.py index 2dacb4c..341bb3b 100755 ---- build/check.py -+++ build/check.py +--- a/build/check.py ++++ b/build/check.py @@ -52,16 +52,16 @@ if __name__ == '__main__': # Find test responses and run them one by one diff --git a/srcpkgs/serf/patches/libressl.patch b/srcpkgs/serf/patches/libressl.patch index 8b0ad22ced4..3ec8119ff02 100644 --- a/srcpkgs/serf/patches/libressl.patch +++ b/srcpkgs/serf/patches/libressl.patch @@ -1,5 +1,5 @@ ---- buckets/ssl_buckets.c.orig -+++ buckets/ssl_buckets.c +--- a/buckets/ssl_buckets.c ++++ b/buckets/ssl_buckets.c @@ -52,7 +52,7 @@ #define APR_ARRAY_PUSH(ary,type) (*((type *)apr_array_push(ary))) #endif diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template index b27fd1e4b00..a9ac8a6d35e 100644 --- a/srcpkgs/serf/template +++ b/srcpkgs/serf/template @@ -12,7 +12,6 @@ license="Apache-2.0" homepage="http://serf.apache.org" distfiles="https://archive.apache.org/dist/serf/serf-${version}.tar.bz2" checksum=549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then make_build_args+=" APR=${XBPS_WRAPPERDIR}/apr-1-config" diff --git a/srcpkgs/sgfutils/patches/Makefile.patch b/srcpkgs/sgfutils/patches/Makefile.patch index 0ae172ec145..26aaba63c82 100644 --- a/srcpkgs/sgfutils/patches/Makefile.patch +++ b/srcpkgs/sgfutils/patches/Makefile.patch @@ -1,7 +1,7 @@ diff --git Makefile Makefile index d624f49..4355fc7 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -3,6 +3,7 @@ TPROGS=sgf sgfsplit sgfvarsplit sgfstrip sgfinfo sgfmerge sgftf \ ngf2sgf nip2sgf nk2sgf gib2sgf diff --git a/srcpkgs/sgfutils/template b/srcpkgs/sgfutils/template index 1ad41f0ea17..67980c8d32f 100644 --- a/srcpkgs/sgfutils/template +++ b/srcpkgs/sgfutils/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="https://www.cwi.nl/~aeb/go/sgfutils/html/" distfiles="https://homepages.cwi.nl/~aeb/go/${pkgname}/${pkgname}.tgz" checksum=4b26b321fbe255722f1d7e57233614da89a4da5bab031ae4ef7118ae3c7436a2 -patch_args=-Np0 diff --git a/srcpkgs/shaderc/patches/fix-glslang-link-order.patch b/srcpkgs/shaderc/patches/fix-glslang-link-order.patch index 8d56668a569..691719c0d9c 100644 --- a/srcpkgs/shaderc/patches/fix-glslang-link-order.patch +++ b/srcpkgs/shaderc/patches/fix-glslang-link-order.patch @@ -16,8 +16,8 @@ Additionally, libshaderc_util also depends on SPIRV-Tools libshaderc_util/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---- glslc/CMakeLists.txt -+++ glslc/CMakeLists.txt +--- a/glslc/CMakeLists.txt ++++ b/glslc/CMakeLists.txt @@ -18,7 +18,7 @@ add_library(glslc STATIC shaderc_default_compile_options(glslc) target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR}) @@ -27,8 +27,8 @@ Additionally, libshaderc_util also depends on SPIRV-Tools target_link_libraries(glslc PRIVATE shaderc_util shaderc) add_executable(glslc_exe src/main.cc) ---- libshaderc_util/CMakeLists.txt -+++ libshaderc_util/CMakeLists.txt +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt @@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL) find_package(Threads) diff --git a/srcpkgs/shaderc/template b/srcpkgs/shaderc/template index d0d810161d2..7382d081551 100644 --- a/srcpkgs/shaderc/template +++ b/srcpkgs/shaderc/template @@ -12,7 +12,6 @@ license="Apache-2.0" homepage="https://github.com/google/shaderc" distfiles="https://github.com/google/shaderc/archive/v${version}.tar.gz" checksum=e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec -patch_args=-Np0 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/glslang" diff --git a/srcpkgs/shadow/patches/shadow-strncpy-usage.patch b/srcpkgs/shadow/patches/shadow-strncpy-usage.patch index 1996621cb63..c5564fffdc3 100644 --- a/srcpkgs/shadow/patches/shadow-strncpy-usage.patch +++ b/srcpkgs/shadow/patches/shadow-strncpy-usage.patch @@ -1,5 +1,5 @@ ---- src/usermod.c.orig 2012-02-13 08:19:43.792146449 -0500 -+++ src/usermod.c 2012-02-13 08:21:19.375114500 -0500 +--- a/src/usermod.c 2012-02-13 08:19:43.792146449 -0500 ++++ b/src/usermod.c 2012-02-13 08:21:19.375114500 -0500 @@ -182,7 +182,7 @@ struct tm *tp; @@ -9,8 +9,8 @@ } else { time_t t = (time_t) date; tp = gmtime (&t); ---- src/login.c.orig 2012-02-13 08:19:50.951994454 -0500 -+++ src/login.c 2012-02-13 08:21:04.490430937 -0500 +--- a/src/login.c 2012-02-13 08:19:50.951994454 -0500 ++++ b/src/login.c 2012-02-13 08:21:04.490430937 -0500 @@ -752,7 +752,8 @@ _("%s login: "), hostn); } else { diff --git a/srcpkgs/shadow/patches/xstrdup.patch b/srcpkgs/shadow/patches/xstrdup.patch index 93bbcf0434b..562febcf416 100644 --- a/srcpkgs/shadow/patches/xstrdup.patch +++ b/srcpkgs/shadow/patches/xstrdup.patch @@ -1,5 +1,5 @@ ---- libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500 -+++ libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500 +--- a/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500 ++++ b/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500 @@ -61,5 +61,6 @@ char *xstrdup (const char *str) diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template index 556e2ce263f..f01181a49bd 100644 --- a/srcpkgs/shadow/template +++ b/srcpkgs/shadow/template @@ -17,7 +17,6 @@ homepage="https://github.com/shadow-maint/shadow" distfiles="${homepage}/releases/download/${version}/shadow-${version}.tar.xz" checksum=a3ad4630bdc41372f02a647278a8c3514844295d36eefe68ece6c3a641c1ae62 conf_files="/etc/pam.d/* /etc/default/* /etc/login.defs" -patch_args=-Np0 pre_configure() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/shapelib/patches/libdir.patch b/srcpkgs/shapelib/patches/libdir.patch index 4701bb8d970..d506ad9edc3 100644 --- a/srcpkgs/shapelib/patches/libdir.patch +++ b/srcpkgs/shapelib/patches/libdir.patch @@ -1,7 +1,7 @@ diff --git CMakeLists.txt CMakeLists.txt index c3ef935..4b0e65c 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -53,11 +53,11 @@ set( CACHE PATH "install location for user executables" ) diff --git a/srcpkgs/shapelib/template b/srcpkgs/shapelib/template index 230bf6980f7..67a6f9c0dc7 100644 --- a/srcpkgs/shapelib/template +++ b/srcpkgs/shapelib/template @@ -9,7 +9,6 @@ license="LGPL-2.0-only" homepage="http://shapelib.maptools.org/" distfiles="http://download.osgeo.org/shapelib/shapelib-${version}.tar.gz" checksum=1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1 -patch_args=-Np0 shapelib-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch index f8724b96bfb..af4d03e5621 100644 --- a/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch +++ b/srcpkgs/shiboken2/patches/clang-options-via-environment-variables.patch @@ -1,8 +1,8 @@ Add ability to pass additional options to clang via environnement variable. With help from https://github.com/void-linux/void-packages/pull/26962 ---- sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp -+++ sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp +--- a/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp ++++ b/sources/shiboken2/ApiExtractor/clangparser/compilersupport.cpp @@ -305,6 +305,15 @@ QByteArrayList emulatedCompilerOptions() { diff --git a/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch b/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch index 1346a921302..02baa6896f7 100644 --- a/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch +++ b/srcpkgs/shiboken2/patches/no-python-arch-suffix.patch @@ -3,8 +3,8 @@ remove intermediate suffix like ".cpython-36m-x86_64-linux-gnu". Avoid overwriting the "real" cmake file with the generic wrapper's one (same name in such a case) ---- sources/shiboken2/CMakeLists.txt.ORIG -+++ sources/shiboken2/CMakeLists.txt +--- a/sources/shiboken2/CMakeLists.txt ++++ b/sources/shiboken2/CMakeLists.txt @@ -98,6 +98,11 @@ "PYTHON_CONFIG_SUFFIX is empty. It should never be empty. Please file a bug report.") endif() @@ -17,8 +17,8 @@ name in such a case) message(STATUS "PYTHON_EXTENSION_SUFFIX: ${PYTHON_EXTENSION_SUFFIX}") message(STATUS "PYTHON_CONFIG_SUFFIX: ${PYTHON_CONFIG_SUFFIX}") message(STATUS "PYTHON_SHARED_LIBRARY_SUFFIX: ${PYTHON_SHARED_LIBRARY_SUFFIX}") ---- sources/shiboken2/data/CMakeLists.txt.ORIG -+++ sources/shiboken2/data/CMakeLists.txt +--- a/sources/shiboken2/data/CMakeLists.txt ++++ b/sources/shiboken2/data/CMakeLists.txt @@ -37,16 +37,11 @@ PATH_VARS SHIBOKEN_PYTHON_MODULE_DIR SHIBOKEN_SHARED_LIBRARY_DIR ) diff --git a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch index 24054690b09..9a434c1d9af 100644 --- a/srcpkgs/shiboken2/patches/tests-need-python-modules.patch +++ b/srcpkgs/shiboken2/patches/tests-need-python-modules.patch @@ -1,8 +1,8 @@ tests need python modules that are not installed yet: so point the built ones. Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1429 ---- sources/shiboken2/tests/CMakeLists.txt.ORIG 2020-09-09 14:45:42.000000000 +0200 -+++ sources/shiboken2/tests/CMakeLists.txt 2020-11-12 14:16:46.577206385 +0100 +--- a/sources/shiboken2/tests/CMakeLists.txt 2020-09-09 14:45:42.000000000 +0200 ++++ b/sources/shiboken2/tests/CMakeLists.txt 2020-11-12 14:16:46.577206385 +0100 @@ -53,6 +53,6 @@ list(FIND test_blacklist ${test_name} expect_fail) add_test(${test_name} ${PYTHON_EXECUTABLE} ${test_file}) diff --git a/srcpkgs/shiboken2/patches/tests-python-syntax.patch b/srcpkgs/shiboken2/patches/tests-python-syntax.patch index 5151c3cc71a..32743a6295c 100644 --- a/srcpkgs/shiboken2/patches/tests-python-syntax.patch +++ b/srcpkgs/shiboken2/patches/tests-python-syntax.patch @@ -31,8 +31,8 @@ Reviewed-by: Friedemann Kleint diff --git build_history/blacklist.txt build_history/blacklist.txt index 9b63f9784..2a2a5d4c4 100644 ---- build_history/blacklist.txt -+++ build_history/blacklist.txt +--- a/build_history/blacklist.txt ++++ b/build_history/blacklist.txt @@ -18,9 +18,6 @@ darwin py3 [QtCore::qfileread_test] @@ -45,8 +45,8 @@ index 9b63f9784..2a2a5d4c4 100644 darwin diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py index 08a7c55b1..e1e989c1e 100644 ---- sources/pyside2/tests/QtCore/qflags_test.py -+++ sources/pyside2/tests/QtCore/qflags_test.py +--- a/sources/pyside2/tests/QtCore/qflags_test.py ++++ b/sources/pyside2/tests/QtCore/qflags_test.py @@ -30,6 +30,7 @@ '''Test cases for QFlags''' @@ -76,8 +76,8 @@ index 08a7c55b1..e1e989c1e 100644 unittest.main() diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp index ff44db955..87ddd73a5 100644 ---- sources/shiboken2/generator/shiboken2/cppgenerator.cpp -+++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp +--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp ++++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName() << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n"; diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template index 5cdf26b8842..ed06a780e1a 100644 --- a/srcpkgs/shiboken2/template +++ b/srcpkgs/shiboken2/template @@ -16,7 +16,6 @@ license="GPL-3.0-or-later" homepage="https://wiki.qt.io/Qt_for_Python/Shiboken" distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz" checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 -patch_args=-Np0 python_version=3 export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr diff --git a/srcpkgs/shmux/patches/time.patch b/srcpkgs/shmux/patches/time.patch index b7f3e2309ec..072180ce851 100644 --- a/srcpkgs/shmux/patches/time.patch +++ b/srcpkgs/shmux/patches/time.patch @@ -1,5 +1,5 @@ ---- src/os.h.orig -+++ src/os.h +--- a/src/os.h ++++ b/src/os.h @@ -22,6 +22,7 @@ #include #include diff --git a/srcpkgs/shmux/template b/srcpkgs/shmux/template index d3c039b4f12..3f353a0df33 100644 --- a/srcpkgs/shmux/template +++ b/srcpkgs/shmux/template @@ -10,7 +10,6 @@ license="BSD-3-Clause" homepage="https://github.com/shmux/shmux" distfiles="https://github.com/shmux/shmux/archive/v${version}.tar.gz" checksum=c9f8863e2550e23e633cf5fc7a9c4c52d287059f424ef78aba6ecd98390fb9ab -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/shotwell/patches/fix-unused-method.patch b/srcpkgs/shotwell/patches/fix-unused-method.patch index c6db36d2c70..99686e76ac2 100644 --- a/srcpkgs/shotwell/patches/fix-unused-method.patch +++ b/srcpkgs/shotwell/patches/fix-unused-method.patch @@ -1,5 +1,5 @@ ---- vapi/libgdata.vapi.orig 2019-08-12 11:01:50.347941770 +0200 -+++ vapi/libgdata.vapi 2019-08-12 11:02:02.993946056 +0200 +--- a/vapi/libgdata.vapi 2019-08-12 11:01:50.347941770 +0200 ++++ b/vapi/libgdata.vapi 2019-08-12 11:02:02.993946056 +0200 @@ -1916,7 +1916,6 @@ namespace GData { public abstract bool is_authorized_for_domain (GData.AuthorizationDomain domain); public abstract void process_request (GData.AuthorizationDomain? domain, Soup.Message message); diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index 1076b974de7..b0c1878e31b 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -17,7 +17,6 @@ homepage="https://wiki.gnome.org/Apps/Shotwell" distfiles="${GNOME_SITE}/shotwell/${version%.*}/shotwell-${version}.tar.xz" checksum=8de36f20488f4fb7d090194c8af46cd3661bcc81a3d65f980cb17667ed826af2 lib32disabled=yes -patch_args=-Np0 post_extract() { # because shotwell intelligently forces fatal warnings even for diff --git a/srcpkgs/sidplayfp/patches/musl-PATH_MAX.patch b/srcpkgs/sidplayfp/patches/musl-PATH_MAX.patch index de44962dda7..72afab9ff7b 100644 --- a/srcpkgs/sidplayfp/patches/musl-PATH_MAX.patch +++ b/srcpkgs/sidplayfp/patches/musl-PATH_MAX.patch @@ -1,5 +1,5 @@ ---- src/IniConfig.cpp 2019-06-23 16:35:20.000000000 +0800 -+++ src/IniConfig.cpp 2020-04-03 22:46:45.585216398 +0800 +--- a/src/IniConfig.cpp 2019-06-23 16:35:20.000000000 +0800 ++++ b/src/IniConfig.cpp 2020-04-03 22:46:45.585216398 +0800 @@ -36,6 +36,7 @@ # include # include /* mkdir */ diff --git a/srcpkgs/sidplayfp/template b/srcpkgs/sidplayfp/template index f63c893694a..c98648586c9 100644 --- a/srcpkgs/sidplayfp/template +++ b/srcpkgs/sidplayfp/template @@ -12,4 +12,3 @@ license="GPL-2.0-or-later" homepage="https://sourceforge.net/projects/sidplay-residfp/" distfiles="${SOURCEFORGE_SITE}/sidplay-residfp/${pkgname}/${version%.*}/${pkgname}-${version}.tar.gz" checksum=1c9dd519c39f7c811c33a7b8f516f33c36b36d29af6075316a7ec7320f9d9155 -patch_args=-Np0 diff --git a/srcpkgs/signond/patches/cross.patch b/srcpkgs/signond/patches/cross.patch index 0de8c02233b..dfb1dd97b59 100644 --- a/srcpkgs/signond/patches/cross.patch +++ b/srcpkgs/signond/patches/cross.patch @@ -1,5 +1,5 @@ ---- lib/SignOn/SignOnQt5Config.cmake.in 2018-09-17 18:28:27.000000000 +0200 -+++ - 2020-04-27 00:51:57.131405714 +0200 +--- a/lib/SignOn/SignOnQt5Config.cmake.in 2018-09-17 18:28:27.000000000 +0200 ++++ b/lib/SignOn/SignOnQt5Config.cmake.in 2018-09-17 18:28:27.000000000 +0200 @@ -2,6 +2,21 @@ # SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt # SIGNONQT_LIBRARIES_STATIC - The static version of libsignon-qt diff --git a/srcpkgs/signond/template b/srcpkgs/signond/template index 585a4f7e28b..183c3b9481e 100644 --- a/srcpkgs/signond/template +++ b/srcpkgs/signond/template @@ -14,7 +14,6 @@ license="LGPL-2.1-only" homepage="https://gitlab.com/accounts-sso/signond" distfiles="https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=VERSION_${version}>signond-${version}.tar.gz" checksum=a9cd90cf3e8b1a8bdbe5acf46c797a817092e77946c69fc3ed3a76930f3a76aa -patch_args=-Np0 pre_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/sile/patches/lua.patch b/srcpkgs/sile/patches/lua.patch index 3ce28fc6b9b..12ddc52ddba 100644 --- a/srcpkgs/sile/patches/lua.patch +++ b/srcpkgs/sile/patches/lua.patch @@ -1,5 +1,5 @@ ---- sile.in 2019-01-07 09:48:08.943943000 +0100 -+++ - 2019-01-07 23:26:28.635815999 +0100 +--- a/sile.in 2019-01-07 09:48:08.943943000 +0100 ++++ b/sile.in 2019-01-07 09:48:08.943943000 +0100 @@ -1,4 +1,4 @@ -#!@LUA@ +#!@LUA@@LUA_VERSION@ diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template index fb99e1fcd88..8e9f28786b9 100644 --- a/srcpkgs/sile/template +++ b/srcpkgs/sile/template @@ -14,7 +14,6 @@ license="MIT" homepage="http://www.sile-typesetter.org/" distfiles="https://github.com/simoncozens/sile/releases/download/v${version}/sile-${version}.tar.bz2" checksum=60cdcc4509971973feab352dfc1a86217cc1fdb12d56823f04d863afef92003a -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" lua51 lua51-devel lua51-lpeg luaexpat lua51-zlib luafilesystem diff --git a/srcpkgs/silly/patches/png_longjmp.patch b/srcpkgs/silly/patches/png_longjmp.patch index 4861527cb9d..9bd330d8fce 100644 --- a/srcpkgs/silly/patches/png_longjmp.patch +++ b/srcpkgs/silly/patches/png_longjmp.patch @@ -1,5 +1,5 @@ ---- src/loaders/SILLYPNGImageLoader.cpp 2006-06-19 00:42:12.000000000 +0200 -+++ src/loaders/SILLYPNGImageLoader.cpp 2015-08-03 15:39:36.102606369 +0200 +--- a/src/loaders/SILLYPNGImageLoader.cpp 2006-06-19 00:42:12.000000000 +0200 ++++ b/src/loaders/SILLYPNGImageLoader.cpp 2015-08-03 15:39:36.102606369 +0200 @@ -64,10 +64,8 @@ png_const_charp error) { diff --git a/srcpkgs/silly/template b/srcpkgs/silly/template index 8fa0632c361..432cefdabc9 100644 --- a/srcpkgs/silly/template +++ b/srcpkgs/silly/template @@ -12,7 +12,6 @@ license="MIT" homepage="http://sourceforge.net/projects/crayzedsgui/" distfiles="${SOURCEFORGE_SITE}/project/crayzedsgui/${pkgname^^}/${version}/${pkgname^^}-${version}.tar.gz" checksum=afa064f70433008ec9837fb601c8d73e73db07856e4566f8bee010758c5304ac -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/simgear/patches/musl-strerror_r.patch b/srcpkgs/simgear/patches/musl-strerror_r.patch index 7a6d10a8e77..9c2208ac100 100644 --- a/srcpkgs/simgear/patches/musl-strerror_r.patch +++ b/srcpkgs/simgear/patches/musl-strerror_r.patch @@ -1,5 +1,5 @@ ---- simgear/misc/strutils.cxx 2020-06-26 00:07:33.000000000 +0200 -+++ simgear/misc/strutils.cxx 2020-08-22 19:50:07.043076612 +0200 +--- a/simgear/misc/strutils.cxx 2020-06-26 00:07:33.000000000 +0200 ++++ b/simgear/misc/strutils.cxx 2020-08-22 19:50:07.043076612 +0200 @@ -1137,7 +1137,13 @@ // Always makes the string in 'buf' null-terminated retcode = strerror_s(buf, sizeof(buf), errnum); diff --git a/srcpkgs/simgear/patches/musl-u_types.patch b/srcpkgs/simgear/patches/musl-u_types.patch index 0050bab6d34..65f38492008 100644 --- a/srcpkgs/simgear/patches/musl-u_types.patch +++ b/srcpkgs/simgear/patches/musl-u_types.patch @@ -1,5 +1,5 @@ ---- simgear/package/md5.h 2016-05-17 10:36:36.000000000 +0200 -+++ simgear/package/md5.h 2016-06-18 14:38:16.524925475 +0200 +--- a/simgear/package/md5.h 2016-05-17 10:36:36.000000000 +0200 ++++ b/simgear/package/md5.h 2016-06-18 14:38:16.524925475 +0200 @@ -19,27 +19,23 @@ extern "C" { #endif @@ -35,8 +35,8 @@ #ifdef __cplusplus } // of extern C ---- simgear/package/md5.c 2016-05-17 10:36:36.000000000 +0200 -+++ simgear/package/md5.c 2016-06-18 14:38:25.150680387 +0200 +--- a/simgear/package/md5.c 2016-05-17 10:36:36.000000000 +0200 ++++ b/simgear/package/md5.c 2016-06-18 14:38:25.150680387 +0200 @@ -39,7 +39,7 @@ (cp)[1] = (value) >> 8; \ (cp)[0] = (value); } while (0) diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template index 58f19d499e5..4a15e27896e 100644 --- a/srcpkgs/simgear/template +++ b/srcpkgs/simgear/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="http://www.flightgear.org/" distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2" checksum=66da2c4f68058f6854206f2dd9c03c9223851ade24a50216e88b4e50598c13d1 -patch_args=-Np0 # Suppress warnings regarding auto_ptr CXXFLAGS="-Wno-deprecated-declarations" diff --git a/srcpkgs/simutron/patches/remove-bitbang-from-firmware-c.patch b/srcpkgs/simutron/patches/remove-bitbang-from-firmware-c.patch index c2e7cafaf99..7640a0a7444 100644 --- a/srcpkgs/simutron/patches/remove-bitbang-from-firmware-c.patch +++ b/srcpkgs/simutron/patches/remove-bitbang-from-firmware-c.patch @@ -1,5 +1,5 @@ ---- plugins/avrmcu/plugin/firmware.c -+++ plugins/avrmcu/plugin/firmware.c +--- a/plugins/avrmcu/plugin/firmware.c ++++ b/plugins/avrmcu/plugin/firmware.c @@ -118,10 +118,6 @@ case AVR_MMCU_TAG_SIMAVR_CONSOLE: { firmware->console_register_addr = src[0] | (src[1] << 8); diff --git a/srcpkgs/simutron/template b/srcpkgs/simutron/template index 15a6accf201..cdcf68c2a43 100644 --- a/srcpkgs/simutron/template +++ b/srcpkgs/simutron/template @@ -13,7 +13,6 @@ maintainer="Artur Sinila " license="GPL-3.0-only" homepage="https://sourceforge.net/projects/simutron/" nostrip_files="LCD20x4Test.elf" -patch_args=-Np0 do_fetch() { svn checkout "https://svn.code.sf.net/p/${pkgname}/code/branches/RB-${_version}-${_rev}" "$wrksrc" diff --git a/srcpkgs/sisl/patches/maxdouble.patch b/srcpkgs/sisl/patches/maxdouble.patch index e1506e6ffa9..baa6225e231 100644 --- a/srcpkgs/sisl/patches/maxdouble.patch +++ b/srcpkgs/sisl/patches/maxdouble.patch @@ -1,5 +1,5 @@ ---- include/sislP.h.orig -+++ include/sislP.h +--- a/include/sislP.h ++++ b/include/sislP.h @@ -362,7 +362,7 @@ enum #if defined(SISL_INTERNAL) diff --git a/srcpkgs/sisl/template b/srcpkgs/sisl/template index 0457d6e17fe..1fdf40b02db 100644 --- a/srcpkgs/sisl/template +++ b/srcpkgs/sisl/template @@ -10,7 +10,6 @@ license="AGPL-3.0-only" homepage="https://github.com/SINTEF-Geometry/SISL" distfiles="$homepage/archive/SISL-$version.tar.gz" checksum=b207fe6b4b20775e3064168633256fddd475ff98573408f6f5088a938c086f86 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/skroll/patches/fix-makefile.patch b/srcpkgs/skroll/patches/fix-makefile.patch index dccab88544a..12dfde9ca38 100644 --- a/srcpkgs/skroll/patches/fix-makefile.patch +++ b/srcpkgs/skroll/patches/fix-makefile.patch @@ -1,7 +1,7 @@ Enable configurable CC and LD. ---- Makefile 2015-03-16 11:50:36.000000000 +0100 -+++ Makefile 2015-10-25 23:55:25.205767890 +0100 +--- a/Makefile 2015-03-16 11:50:36.000000000 +0100 ++++ b/Makefile 2015-10-25 23:55:25.205767890 +0100 @@ -1,8 +1,8 @@ PREFIX:=/usr MANPREFIX:=${PREFIX}/share/man diff --git a/srcpkgs/skroll/template b/srcpkgs/skroll/template index 9263b38cd5c..e01de5aa064 100644 --- a/srcpkgs/skroll/template +++ b/srcpkgs/skroll/template @@ -10,7 +10,6 @@ license="WTFPL" homepage="http://git.z3bra.org/skroll/log.html" distfiles="http://dl.z3bra.org/releases/${pkgname}-${version}.tar.bz2" checksum=32221fef51f6814a7bf3cf4207b8a2466624544a2fd1e5b110ee2af3580d2959 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/slcp/patches/libgit-initializion.patch b/srcpkgs/slcp/patches/libgit-initializion.patch index f703fd0a010..c274620b82f 100644 --- a/srcpkgs/slcp/patches/libgit-initializion.patch +++ b/srcpkgs/slcp/patches/libgit-initializion.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fix libgit initialization diff --git slcp.c slcp.c index 2e9f9f4..7f12b08 100644 ---- slcp.c -+++ slcp.c +--- a/slcp.c ++++ b/slcp.c @@ -100,6 +100,7 @@ int main(int argc, char* argv[]) if(argc > 1) termwidth = atoi(argv[1]); diff --git a/srcpkgs/slcp/patches/libgit2-0.28.patch b/srcpkgs/slcp/patches/libgit2-0.28.patch index 54f5008456c..2fb454e59f2 100644 --- a/srcpkgs/slcp/patches/libgit2-0.28.patch +++ b/srcpkgs/slcp/patches/libgit2-0.28.patch @@ -1,7 +1,7 @@ diff --git a/slcp.c b/slcp.c index 7f12b08..e93c1fd 100644 ---- slcp.c -+++ slcp.c +--- a/slcp.c ++++ b/slcp.c @@ -106,7 +106,7 @@ int main(int argc, char* argv[]) { git_repo = NULL; diff --git a/srcpkgs/slcp/template b/srcpkgs/slcp/template index 614c5844ad1..1873bcc6f23 100644 --- a/srcpkgs/slcp/template +++ b/srcpkgs/slcp/template @@ -10,7 +10,6 @@ license="Beerware" homepage="https://github.com/schachmat/slcp" distfiles="https://github.com/schachmat/slcp/archive/${version}.tar.gz" checksum=a26e56832e37dbf1c7b776ddb137e422c987c19330575708a5945697e08e7cfe -patch_args=-Np0 pre_build() { sed -i 's|^CFLAGS =|override CFLAGS +=|g' config.mk diff --git a/srcpkgs/sleuthkit/patches/fix-libewf-v2-API.patch b/srcpkgs/sleuthkit/patches/fix-libewf-v2-API.patch index 266ab340fc8..2c70e0e4e81 100644 --- a/srcpkgs/sleuthkit/patches/fix-libewf-v2-API.patch +++ b/srcpkgs/sleuthkit/patches/fix-libewf-v2-API.patch @@ -1,5 +1,5 @@ ---- tsk/img/ewf.cpp -+++ tsk/img/ewf.cpp +--- a/tsk/img/ewf.cpp ++++ b/tsk/img/ewf.cpp @@ -64,7 +64,7 @@ ewf_image_read(TSK_IMG_INFO * img_info, TSK_OFF_T offset, char *buf, tsk_take_lock(&(ewf_info->read_lock)); @@ -9,8 +9,8 @@ buf, len, offset, &ewf_error); if (cnt < 0) { char *errmsg = NULL; ---- tsk/img/ewf.h -+++ tsk/img/ewf.h +--- a/tsk/img/ewf.h ++++ b/tsk/img/ewf.h @@ -20,9 +20,9 @@ #include diff --git a/srcpkgs/sleuthkit/template b/srcpkgs/sleuthkit/template index c61696b3527..f7d3ebf142f 100644 --- a/srcpkgs/sleuthkit/template +++ b/srcpkgs/sleuthkit/template @@ -15,7 +15,6 @@ homepage="https://www.sleuthkit.org/" changelog="https://github.com/sleuthkit/sleuthkit/releases" distfiles="https://github.com/sleuthkit/sleuthkit/archive/sleuthkit-${version}.tar.gz" checksum=da9a336c37e03b78bd912acf243953254a3215f0b3646f9d2c526f4b502e6f11 -patch_args=-Np0 post_extract() { sed -i 's:sys/fcntl.h:fcntl.h:g' tsk/fs/tsk_fs_i.h diff --git a/srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch b/srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch index 8a1cef84b59..f6abf0bc72a 100644 --- a/srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch +++ b/srcpkgs/slim/patches/slim-1.3.6-add-sessiondir.patch @@ -7,8 +7,8 @@ Signed-off-by: Nobuhiro Iwamatsu --- diff --git a/slim.conf b/slim.conf index a8e2e1c..c5f1d38 100644 ---- slim.conf -+++ slim.conf +--- a/slim.conf ++++ b/slim.conf @@ -47,11 +47,9 @@ login_cmd exec /bin/bash -login ~/.xinitrc %session # options "-d" and "-nodaemon" # daemon yes diff --git a/srcpkgs/slim/patches/slim-1.3.6-fix-libslim-libraries.patch b/srcpkgs/slim/patches/slim-1.3.6-fix-libslim-libraries.patch index 471f31f7c67..f5d70e5d96c 100644 --- a/srcpkgs/slim/patches/slim-1.3.6-fix-libslim-libraries.patch +++ b/srcpkgs/slim/patches/slim-1.3.6-fix-libslim-libraries.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300 -+++ CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300 +--- a/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300 ++++ b/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300 @@ -119,6 +119,7 @@ if(USE_PAM) if(PAM_FOUND) message("\tPAM Found") diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template index 43d025a1e9b..b7382cac308 100644 --- a/srcpkgs/slim/template +++ b/srcpkgs/slim/template @@ -15,7 +15,6 @@ homepage="http://sourceforge.net/projects/slim.berlios/" distfiles="${SOURCEFORGE_SITE}/slim.berlios/slim-${version}.tar.gz" checksum=21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df lib32disabled=yes -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) CXXFLAGS="-DNEEDS_BASENAME";; diff --git a/srcpkgs/sloccount/patches/fix-c-and-ldflags.patch b/srcpkgs/sloccount/patches/fix-c-and-ldflags.patch index 0939e975eb4..85e2f6aa0e4 100644 --- a/srcpkgs/sloccount/patches/fix-c-and-ldflags.patch +++ b/srcpkgs/sloccount/patches/fix-c-and-ldflags.patch @@ -1,5 +1,5 @@ ---- makefile.orig 2016-05-24 14:50:13.551844062 +0200 -+++ makefile 2016-05-24 14:50:22.173843417 +0200 +--- a/makefile 2016-05-24 14:50:13.551844062 +0200 ++++ b/makefile 2016-05-24 14:50:22.173843417 +0200 @@ -128,28 +128,28 @@ MYDOCS=sloccount.html README TODO Change all: $(COMPILED_EXECUTABLES) diff --git a/srcpkgs/sloccount/template b/srcpkgs/sloccount/template index 861d5883cb8..f33b58e0aea 100644 --- a/srcpkgs/sloccount/template +++ b/srcpkgs/sloccount/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="https://dwheeler.com/sloccount/" distfiles="https://dwheeler.com/sloccount/sloccount-${version}.tar.gz" checksum=fa7fa2bbf2f627dd2d0fdb958bd8ec4527231254c120a8b4322405d8a4e3d12b -patch_args=-Np0 do_install() { vmkdir usr/bin diff --git a/srcpkgs/slurm-wlm/patches/musl-cpu_set_t.patch b/srcpkgs/slurm-wlm/patches/musl-cpu_set_t.patch index 0208d5c7030..3eb2783e2a5 100644 --- a/srcpkgs/slurm-wlm/patches/musl-cpu_set_t.patch +++ b/srcpkgs/slurm-wlm/patches/musl-cpu_set_t.patch @@ -2,8 +2,8 @@ Source: @pullmoll Upstream: no Reason: Need _GNU_SOURCE defined to define cpu_set_t in sched.h ---- src/slurmd/slurmd/req.c 2019-12-20 21:43:45.000000000 +0100 -+++ src/slurmd/slurmd/req.c 2020-02-23 13:07:29.257513065 +0100 +--- a/src/slurmd/slurmd/req.c 2019-12-20 21:43:45.000000000 +0100 ++++ b/src/slurmd/slurmd/req.c 2020-02-23 13:07:29.257513065 +0100 @@ -49,6 +49,7 @@ #include #endif diff --git a/srcpkgs/slurm-wlm/patches/musl-getgrent.patch b/srcpkgs/slurm-wlm/patches/musl-getgrent.patch index 8467eb7de69..b1c53875846 100644 --- a/srcpkgs/slurm-wlm/patches/musl-getgrent.patch +++ b/srcpkgs/slurm-wlm/patches/musl-getgrent.patch @@ -2,8 +2,8 @@ Source: @pullmoll Upstream: no Reason: Musl libc does not have getgrent_r(3) ---- src/slurmctld/groups.c 2019-12-20 21:43:45.000000000 +0100 -+++ src/slurmctld/groups.c 2020-02-23 12:23:19.570618716 +0100 +--- a/src/slurmctld/groups.c 2019-12-20 21:43:45.000000000 +0100 ++++ b/src/slurmctld/groups.c 2020-02-23 12:23:19.570618716 +0100 @@ -155,7 +155,7 @@ * databases), the rest of this function essentially does * nothing. */ diff --git a/srcpkgs/slurm-wlm/patches/musl-getpwent.patch b/srcpkgs/slurm-wlm/patches/musl-getpwent.patch index ff926b9f8c2..32b12db1d59 100644 --- a/srcpkgs/slurm-wlm/patches/musl-getpwent.patch +++ b/srcpkgs/slurm-wlm/patches/musl-getpwent.patch @@ -2,8 +2,8 @@ Source: @pullmoll Upstream: no Reason: Musl libc does not have getpwent_r(3) ---- src/slurmctld/groups.c 2020-02-23 12:46:32.011563195 +0100 -+++ src/slurmctld/groups.c 2020-02-23 12:48:19.259558919 +0100 +--- a/src/slurmctld/groups.c 2020-02-23 12:46:32.011563195 +0100 ++++ b/src/slurmctld/groups.c 2020-02-23 12:48:19.259558919 +0100 @@ -206,7 +206,7 @@ } endgrent(); diff --git a/srcpkgs/slurm-wlm/patches/musl-nsap_addr.patch b/srcpkgs/slurm-wlm/patches/musl-nsap_addr.patch index 7590b52cfc2..96598d094ec 100644 --- a/srcpkgs/slurm-wlm/patches/musl-nsap_addr.patch +++ b/srcpkgs/slurm-wlm/patches/musl-nsap_addr.patch @@ -2,8 +2,8 @@ Source: @pullmoll Upstream: no Reason: Musl libc does not have inet_nsap_addr(3) [undocumented] ---- src/common/callerid.c 2019-12-20 21:43:45.000000000 +0100 -+++ src/common/callerid.c 2020-02-23 12:45:25.878565832 +0100 +--- a/src/common/callerid.c 2019-12-20 21:43:45.000000000 +0100 ++++ b/src/common/callerid.c 2020-02-23 12:45:25.878565832 +0100 @@ -81,6 +81,68 @@ #define PATH_PROCNET_TCP6 "/proc/net/tcp6" #endif diff --git a/srcpkgs/slurm-wlm/template b/srcpkgs/slurm-wlm/template index 420663fbb7e..e01f3912697 100644 --- a/srcpkgs/slurm-wlm/template +++ b/srcpkgs/slurm-wlm/template @@ -17,7 +17,6 @@ license="GPL-2.0-or-later" homepage="http://slurm.schedmd.com/slurm.html" distfiles="https://github.com/SchedMD/slurm/archive/slurm-${_distver}.tar.gz" checksum=e53e67bd0bb4c37a9c481998764a746467a96bc41d6527569080514f36452c07 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/smbnetfs/patches/musl.patch b/srcpkgs/smbnetfs/patches/musl.patch index e31dda6186c..27f8380ebfc 100644 --- a/srcpkgs/smbnetfs/patches/musl.patch +++ b/srcpkgs/smbnetfs/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/common.c -+++ src/common.c +--- a/src/common.c ++++ b/src/common.c @@ -4,7 +4,9 @@ #include #include diff --git a/srcpkgs/smbnetfs/template b/srcpkgs/smbnetfs/template index bc89fbc198b..12806eaaa37 100644 --- a/srcpkgs/smbnetfs/template +++ b/srcpkgs/smbnetfs/template @@ -11,4 +11,3 @@ license="GPL-2.0-only" homepage="http://smbnetfs.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" checksum=eac37b9769fbe9c3f4baf3eb64c61a6b59ad4f2aa05dfddcba5a1ac4adf4d560 -patch_args=-Np0 diff --git a/srcpkgs/smpeg/patches/fix-gcc6-narrowing.patch b/srcpkgs/smpeg/patches/fix-gcc6-narrowing.patch index ef9a76185b5..d306d3c324b 100644 --- a/srcpkgs/smpeg/patches/fix-gcc6-narrowing.patch +++ b/srcpkgs/smpeg/patches/fix-gcc6-narrowing.patch @@ -1,8 +1,8 @@ Here gcc6 complains about narrowing int -1 to unsigned int, thus apply static_cast to all unsigned int constants. ---- audio/hufftable.cpp 2010-12-25 07:37:52.000000000 +0100 -+++ audio/hufftable.cpp 2016-09-15 14:26:04.931857000 +0200 +--- a/audio/hufftable.cpp 2010-12-25 07:37:52.000000000 +0100 ++++ b/audio/hufftable.cpp 2016-09-15 14:26:04.931857000 +0200 @@ -548,40 +548,41 @@ { 4, 1},{ 2, 1},{ 0, 12},{ 0, 13},{ 2, 1},{ 0, 14}, { 0, 15}}; diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template index e8dfe2e4452..9a958bd1bba 100644 --- a/srcpkgs/smpeg/template +++ b/srcpkgs/smpeg/template @@ -12,7 +12,6 @@ license="LGPL-2.1-only" homepage="https://icculus.org/smpeg/" distfiles="ftp://slackware.oregonstate.edu/.1/vectorlinux/VL64-7.0/source/sourceVL/smpeg/${version}/src/smpeg-${version}.tar.gz" checksum=1839c12e88d5dbbc767a7b94eeab2aa3efe4f0eebb7eb7c7240270ba93689a2b -patch_args=-Np0 post_install() { # Remove unused stuff diff --git a/srcpkgs/smpeg2/patches/fix-gcc6-narrowing.patch b/srcpkgs/smpeg2/patches/fix-gcc6-narrowing.patch index bb37b073fa6..8b9f8566ae0 100644 --- a/srcpkgs/smpeg2/patches/fix-gcc6-narrowing.patch +++ b/srcpkgs/smpeg2/patches/fix-gcc6-narrowing.patch @@ -1,8 +1,8 @@ Here gcc6 complains about narrowing int -1 to unsigned int, thus apply static_cast to all unsigned int constants. ---- audio/hufftable.cpp 2013-06-01 17:19:04.000000000 +0200 -+++ audio/hufftable.cpp 2016-09-22 12:03:44.562916914 +0200 +--- a/audio/hufftable.cpp 2013-06-01 17:19:04.000000000 +0200 ++++ b/audio/hufftable.cpp 2016-09-22 12:03:44.562916914 +0200 @@ -548,40 +548,41 @@ { 4, 1},{ 2, 1},{ 0, 12},{ 0, 13},{ 2, 1},{ 0, 14}, { 0, 15}}; diff --git a/srcpkgs/smpeg2/template b/srcpkgs/smpeg2/template index 5afde1920c5..5c87e4416da 100644 --- a/srcpkgs/smpeg2/template +++ b/srcpkgs/smpeg2/template @@ -10,7 +10,6 @@ license="LGPL-2.1-or-later" homepage="https://icculus.org/smpeg/" distfiles="https://www.libsdl.org/projects/smpeg/release/smpeg2-${version}.tar.gz" checksum=979a65b211744a44fa641a9b6e4d64e64a12ff703ae776bafe3c4c4cd85494b3 -patch_args=-Np0 # Package build options build_options="rpi" diff --git a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch index 834ffdeffcb..f39d90ec944 100644 --- a/srcpkgs/snapper/patches/0001-disable-locale-tests.patch +++ b/srcpkgs/snapper/patches/0001-disable-locale-tests.patch @@ -1,7 +1,7 @@ diff --git testsuite/Makefile.am testsuite/Makefile.am index ccb84d3..9774a9c 100644 ---- testsuite/Makefile.am -+++ testsuite/Makefile.am +--- a/testsuite/Makefile.am ++++ b/testsuite/Makefile.am @@ -7,9 +7,9 @@ AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) LDADD = ../snapper/libsnapper.la ../dbus/libdbus.la -lboost_unit_test_framework diff --git a/srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch b/srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch index 41eb8053a62..1bd5fc5492e 100644 --- a/srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch +++ b/srcpkgs/snapper/patches/0002-fix-32bit-musl-build.patch @@ -1,7 +1,7 @@ diff --git client/cleanup.cc client/cleanup.cc index 801c0f5..e57a0a8 100644 ---- client/cleanup.cc -+++ client/cleanup.cc +--- a/client/cleanup.cc ++++ b/client/cleanup.cc @@ -51,7 +51,7 @@ struct Parameters MinFreeLimit free_limit; diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index a2dd275709e..bd58ab951c2 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -19,7 +19,6 @@ homepage="http://snapper.io" distfiles="https://github.com/openSUSE/snapper/archive/v${version}.tar.gz" checksum=ca7b17d0213aa5281ff08d968b4e029b78bb3870eb79fd7bc7f879b17f5c969e lib32disabled=yes -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = musl ] then diff --git a/srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch b/srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch index ba3d91c35ef..8f4dfdfd9a7 100644 --- a/srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch +++ b/srcpkgs/snappy/patches/cmakelists_no_3rdparty.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2021-05-05 02:53:34.000000000 +0400 -+++ CMakeLists.txt 2021-05-24 13:49:21.551706280 +0400 +--- a/CMakeLists.txt 2021-05-05 02:53:34.000000000 +0400 ++++ b/CMakeLists.txt 2021-05-24 13:49:21.551706280 +0400 @@ -287,17 +286,0 @@ if(SNAPPY_BUILD_TESTS) - # Prevent overriding the parent project's compiler/linker settings on Windows. - set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) diff --git a/srcpkgs/snappy/patches/inline.patch b/srcpkgs/snappy/patches/inline.patch index 17f05206ef2..a69dfecaf48 100644 --- a/srcpkgs/snappy/patches/inline.patch +++ b/srcpkgs/snappy/patches/inline.patch @@ -4,8 +4,8 @@ Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to fix: ../snappy.cc:1017:8: error: inlining failed in call to 'always_inline' 'size_t snappy::AdvanceToNextTag(const uint8_t**, size_t*)': function body can be overwritten at link time ---- snappy.cc 2021-05-05 02:53:34.000000000 +0400 -+++ snappy.cc 2021-05-24 01:24:59.124654893 +0400 +--- a/snappy.cc 2021-05-05 02:53:34.000000000 +0400 ++++ b/snappy.cc 2021-05-24 01:24:59.124654893 +0400 @@ -1017 +1017 @@ SNAPPY_ATTRIBUTE_ALWAYS_INLINE -size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { +inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) { diff --git a/srcpkgs/snappy/template b/srcpkgs/snappy/template index 36d572f0da9..7e9e5214fb7 100644 --- a/srcpkgs/snappy/template +++ b/srcpkgs/snappy/template @@ -11,7 +11,6 @@ license="BSD-3-Clause" homepage="https://google.github.io/snappy" distfiles="https://github.com/google/snappy/archive/${version}.tar.gz" checksum=75c1fbb3d618dd3a0483bff0e26d0a92b495bbe5059c8b4f1c962b478b6e06e7 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/socat/patches/errqueue.patch b/srcpkgs/socat/patches/errqueue.patch index aaa2d80b0af..5e11199bfae 100644 --- a/srcpkgs/socat/patches/errqueue.patch +++ b/srcpkgs/socat/patches/errqueue.patch @@ -1,5 +1,5 @@ ---- xio-ip.c -+++ xio-ip.c +--- a/xio-ip.c ++++ b/xio-ip.c @@ -42,6 +42,7 @@ const struct optdesc opt_ip_hdrincl = { "ip-hdrincl", "hdrincl", OPT_IP_HDRINCL, GROUP_SOCK_IP, PH_PASTSOCKET, TYPE_INT, OFUNC_SOCKOPT, SOL_IP, IP_HDRINCL }; #endif diff --git a/srcpkgs/socat/patches/patch-99-musl.patch b/srcpkgs/socat/patches/patch-99-musl.patch index fba8722cde2..0b8fced99fa 100644 --- a/srcpkgs/socat/patches/patch-99-musl.patch +++ b/srcpkgs/socat/patches/patch-99-musl.patch @@ -1,5 +1,5 @@ ---- xiosysincludes.h.orig 2015-06-18 07:36:06.652289362 +0200 -+++ xiosysincludes.h 2015-06-18 07:36:23.364469683 +0200 +--- a/xiosysincludes.h 2015-06-18 07:36:06.652289362 +0200 ++++ b/xiosysincludes.h 2015-06-18 07:36:23.364469683 +0200 @@ -10,4 +10,8 @@ #include "sysincludes.h" diff --git a/srcpkgs/socat/patches/patch-doc_xio_help.diff b/srcpkgs/socat/patches/patch-doc_xio_help.diff index 5a664d294fb..47caa127b34 100644 --- a/srcpkgs/socat/patches/patch-doc_xio_help.diff +++ b/srcpkgs/socat/patches/patch-doc_xio_help.diff @@ -1,6 +1,6 @@ $OpenBSD: patch-doc_xio_help,v 1.1 2014/04/24 15:17:08 sthen Exp $ ---- doc/xio.help.orig Sun Jun 23 07:16:48 2013 -+++ doc/xio.help Sat Apr 19 15:47:37 2014 +--- a/doc/xio.help Sun Jun 23 07:16:48 2013 ++++ b/doc/xio.help Sat Apr 19 15:47:37 2014 @@ -4566,19 +4566,6 @@ must contain certificates in PEM format and their hash documentation) diff --git a/srcpkgs/socat/patches/patch-xio-openssl_c.diff b/srcpkgs/socat/patches/patch-xio-openssl_c.diff index c1fa3f1928e..9a25301aa13 100644 --- a/srcpkgs/socat/patches/patch-xio-openssl_c.diff +++ b/srcpkgs/socat/patches/patch-xio-openssl_c.diff @@ -1,5 +1,5 @@ ---- xio-openssl.c.orig -+++ xio-openssl.c +--- a/xio-openssl.c ++++ b/xio-openssl.c @@ -108,7 +108,9 @@ const struct optdesc opt_openssl_dhparam = { "openssl-dhparam", "dh", OPT_OPENSSL_DHPARAM, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; const struct optdesc opt_openssl_cafile = { "openssl-cafile", "cafile", OPT_OPENSSL_CAFILE, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; diff --git a/srcpkgs/socat/patches/patch-xioopts_c.diff b/srcpkgs/socat/patches/patch-xioopts_c.diff index 088f67c67ce..5393b264f71 100644 --- a/srcpkgs/socat/patches/patch-xioopts_c.diff +++ b/srcpkgs/socat/patches/patch-xioopts_c.diff @@ -1,5 +1,5 @@ ---- xioopts.c.orig -+++ xioopts.c +--- a/xioopts.c ++++ b/xioopts.c @@ -413,7 +413,6 @@ #ifdef ECHOPRT IF_TERMIOS("echoprt", &opt_echoprt) diff --git a/srcpkgs/socat/patches/patch-xioopts_h.diff b/srcpkgs/socat/patches/patch-xioopts_h.diff index 07aea73a143..2489ad90682 100644 --- a/srcpkgs/socat/patches/patch-xioopts_h.diff +++ b/srcpkgs/socat/patches/patch-xioopts_h.diff @@ -1,6 +1,6 @@ $OpenBSD: patch-xioopts_h,v 1.1 2014/04/24 15:17:08 sthen Exp $ ---- xioopts.h.orig Sun Jun 23 07:16:48 2013 -+++ xioopts.h Sat Apr 19 15:55:57 2014 +--- a/xioopts.h Sun Jun 23 07:16:48 2013 ++++ b/xioopts.h Sat Apr 19 15:55:57 2014 @@ -477,7 +477,6 @@ enum e_optcode { OPT_OPENSSL_COMPRESS, #endif diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template index bbbe7dccb42..d4e0f0a9bbd 100644 --- a/srcpkgs/socat/template +++ b/srcpkgs/socat/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="http://www.dest-unreach.org/socat/" distfiles="http://www.dest-unreach.org/socat/download/socat-${version}.tar.bz2" checksum=3faca25614e89123dff5045680549ecef519d02e331aaf3c4f5a8f6837c675e9 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS="-D_LINUX_IF_ETHER_H";; diff --git a/srcpkgs/socklog/patches/cross.patch b/srcpkgs/socklog/patches/cross.patch index 41275cc560e..99e4d493812 100644 --- a/srcpkgs/socklog/patches/cross.patch +++ b/srcpkgs/socklog/patches/cross.patch @@ -1,7 +1,7 @@ chskshsgr must be built for the host. ---- src/Makefile.orig 2014-07-18 18:38:30.305068171 +0200 -+++ src/Makefile 2014-07-18 18:40:28.028069614 +0200 +--- a/src/Makefile 2014-07-18 18:38:30.305068171 +0200 ++++ b/src/Makefile 2014-07-18 18:40:28.028069614 +0200 @@ -117,11 +117,11 @@ byte_zero.o: byte.h byte_zero.c compile ./compile byte_zero.c diff --git a/srcpkgs/socklog/template b/srcpkgs/socklog/template index 0d77880ebb0..3df32c8ebeb 100644 --- a/srcpkgs/socklog/template +++ b/srcpkgs/socklog/template @@ -9,7 +9,6 @@ license="custom" homepage="http://smarden.org/socklog/" distfiles="http://smarden.org/socklog/socklog-${version}.tar.gz" checksum=aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455 -patch_args=-Np0 build_options="static" diff --git a/srcpkgs/solvespace/patches/char_width.patch b/srcpkgs/solvespace/patches/char_width.patch index c754e1d8da5..2a52a9feb53 100644 --- a/srcpkgs/solvespace/patches/char_width.patch +++ b/srcpkgs/solvespace/patches/char_width.patch @@ -1,5 +1,5 @@ ---- src/textwin.cpp 2017-04-16 04:00:21.000000000 -0500 -+++ src/textwin.cpp 2019-02-01 00:47:55.270922800 -0600 +--- a/src/textwin.cpp 2017-04-16 04:00:21.000000000 -0500 ++++ b/src/textwin.cpp 2019-02-01 00:47:55.270922800 -0600 @@ -85,7 +85,7 @@ editControl.halfRow = halfRow; editControl.col = col; @@ -67,8 +67,8 @@ int hh = (LINE_HEIGHT)/2; y += scrollPos*hh; int r; ---- src/toolbar.cpp 2017-04-16 03:56:19.000000000 -0500 -+++ src/toolbar.cpp 2019-02-01 00:47:55.270922800 -0600 +--- a/src/toolbar.cpp 2017-04-16 03:56:19.000000000 -0500 ++++ b/src/toolbar.cpp 2019-02-01 00:47:55.270922800 -0600 @@ -218,7 +218,7 @@ } } @@ -78,8 +78,8 @@ th = SS.TW.LINE_HEIGHT + 2; double ox = toolbarMouseX + 3, oy = toolbarMouseY + 3; ---- src/ui.h 2017-04-16 04:00:07.000000000 -0500 -+++ src/ui.h 2019-02-01 00:47:55.270922800 -0600 +--- a/src/ui.h 2017-04-16 04:00:07.000000000 -0500 ++++ b/src/ui.h 2019-02-01 00:47:55.270922800 -0600 @@ -27,7 +27,7 @@ float fgColorTable[256*3]; diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template index c191a028aed..377c0e4cbd1 100644 --- a/srcpkgs/solvespace/template +++ b/srcpkgs/solvespace/template @@ -13,4 +13,3 @@ homepage="https://solvespace.com/index.pl" distfiles="https://github.com/solvespace/solvespace/releases/download/v${version}/solvespace-source.tar.gz" checksum=0be0b2100c0b01eddded2a4dc60455d61cf67816189905af0e73082bfef96000 nocross="https://travis-ci.org/bobertlo/void-packages/jobs/487251265" -patch_args=-Np0 diff --git a/srcpkgs/sombok/patches/cross.patch b/srcpkgs/sombok/patches/cross.patch index 0d7b4e444d5..8240cf53e34 100644 --- a/srcpkgs/sombok/patches/cross.patch +++ b/srcpkgs/sombok/patches/cross.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2015-06-21 03:57:51.000000000 +0200 -+++ configure.ac 2017-09-11 16:41:33.565358208 +0200 +--- a/configure.ac 2015-06-21 03:57:51.000000000 +0200 ++++ b/configure.ac 2017-09-11 16:41:33.565358208 +0200 @@ -120,9 +120,11 @@ AC_HELP_STRING(--with-unicode-version=VERSION, [version of Unicode Standard @<:@default=current version@:>@]), diff --git a/srcpkgs/sombok/template b/srcpkgs/sombok/template index 3c6fcaff53d..622a1e6fc96 100644 --- a/srcpkgs/sombok/template +++ b/srcpkgs/sombok/template @@ -12,7 +12,6 @@ license="Artistic, GPL-1" homepage="https://github.com/hatukanezumi/sombok" distfiles="https://github.com/hatukanezumi/${pkgname}/archive/${pkgname}-${version}.tar.gz" checksum=14d9dcd3621bf9d591a7158aeac99b4d4a60296558173be51d57b54b8f9d70a2 -patch_args=-Np0 pre_configure() { autoreconf -i diff --git a/srcpkgs/sonata/patches/fix-gi_require_version.patch b/srcpkgs/sonata/patches/fix-gi_require_version.patch index 9994dcd5d1f..b7009ead71e 100644 --- a/srcpkgs/sonata/patches/fix-gi_require_version.patch +++ b/srcpkgs/sonata/patches/fix-gi_require_version.patch @@ -1,5 +1,5 @@ ---- sonata/about.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/about.py 2017-01-02 23:41:16.245799994 +0100 +--- a/sonata/about.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/about.py 2017-01-02 23:41:16.245799994 +0100 @@ -20,6 +20,8 @@ import gettext import os @@ -9,8 +9,8 @@ from gi.repository import Gtk, GdkPixbuf from sonata import misc, ui ---- sonata/artwork.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/artwork.py 2017-01-02 23:41:37.584805301 +0100 +--- a/sonata/artwork.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/artwork.py 2017-01-02 23:41:37.584805301 +0100 @@ -23,6 +23,8 @@ import shutil import threading # artwork_update starts a thread _artwork_update @@ -20,8 +20,8 @@ from gi.repository import Gtk, Gdk, GdkPixbuf, GLib, GObject from sonata import img, ui, misc, consts, mpdhelper as mpdh ---- sonata/breadcrumbs.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/breadcrumbs.py 2017-01-02 23:42:21.093816289 +0100 +--- a/sonata/breadcrumbs.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/breadcrumbs.py 2017-01-02 23:42:21.093816289 +0100 @@ -17,6 +17,8 @@ # You should have received a copy of the GNU General Public License # along with Sonata. If not, see . @@ -31,8 +31,8 @@ from gi.repository import Gtk, Gdk, Pango ---- sonata/current.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/current.py 2017-01-02 23:41:03.040796737 +0100 +--- a/sonata/current.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/current.py 2017-01-02 23:41:03.040796737 +0100 @@ -22,6 +22,8 @@ import re import urllib.parse, urllib.request @@ -42,8 +42,8 @@ from gi.repository import Gtk, Gdk, Pango, GLib from sonata import ui, misc, formatting ---- sonata/img.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/img.py 2017-01-02 23:41:34.596804555 +0100 +--- a/sonata/img.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/img.py 2017-01-02 23:41:34.596804555 +0100 @@ -19,6 +19,8 @@ import itertools import os @@ -53,8 +53,8 @@ from gi.repository import Gtk, Gdk, GdkPixbuf, GLib from sonata import consts ---- sonata/info.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/info.py 2017-01-02 23:40:47.879793023 +0100 +--- a/sonata/info.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/info.py 2017-01-02 23:40:47.879793023 +0100 @@ -22,6 +22,8 @@ import logging import threading @@ -64,8 +64,8 @@ from gi.repository import Gtk, Pango, Gdk, GdkPixbuf, GLib from sonata import ui, misc, consts, mpdhelper as mpdh, img ---- sonata/launcher.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/launcher.py 2017-01-02 23:42:10.253813530 +0100 +--- a/sonata/launcher.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/launcher.py 2017-01-02 23:42:10.253813530 +0100 @@ -155,6 +155,8 @@ ## Deal with GTK: @@ -75,8 +75,8 @@ # importing gtk does sys.setdefaultencoding("utf-8"), sets locale etc. from gi.repository import Gtk, Gdk else: ---- sonata/library.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/library.py 2017-01-02 23:40:59.564795883 +0100 +--- a/sonata/library.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/library.py 2017-01-02 23:40:59.564795883 +0100 @@ -23,6 +23,8 @@ import threading # libsearchfilter_toggle starts thread libsearchfilter_loop import operator @@ -86,8 +86,8 @@ from gi.repository import Gtk, Gdk, GdkPixbuf, GObject, GLib, Pango from sonata import ui, misc, consts, formatting, breadcrumbs, mpdhelper as mpdh ---- sonata/main.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/main.py 2017-01-02 23:41:54.461809537 +0100 +--- a/sonata/main.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/main.py 2017-01-02 23:41:54.461809537 +0100 @@ -33,6 +33,8 @@ import tempfile import threading @@ -97,8 +97,8 @@ from gi.repository import Gtk, Gdk, GdkPixbuf, Gio, GLib, Pango import pkg_resources ---- sonata/misc.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/misc.py 2017-01-02 23:41:12.333799027 +0100 +--- a/sonata/misc.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/misc.py 2017-01-02 23:41:12.333799027 +0100 @@ -23,6 +23,8 @@ import logging import sys @@ -108,8 +108,8 @@ from gi.repository import GLib ---- sonata/mpdhelper.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/mpdhelper.py 2017-01-02 23:42:24.485817154 +0100 +--- a/sonata/mpdhelper.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/mpdhelper.py 2017-01-02 23:42:24.485817154 +0100 @@ -22,6 +22,8 @@ import os import socket @@ -119,8 +119,8 @@ from gi.repository import GObject import mpd ---- sonata/playlists.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/playlists.py 2017-01-02 23:41:07.749797896 +0100 +--- a/sonata/playlists.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/playlists.py 2017-01-02 23:41:07.749797896 +0100 @@ -33,6 +33,8 @@ import os @@ -130,8 +130,8 @@ from gi.repository import Gtk, Pango, Gdk from sonata import ui, misc, mpdhelper as mpdh ---- sonata/plugins/localmpd.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/plugins/localmpd.py 2017-01-02 23:41:48.333807996 +0100 +--- a/sonata/plugins/localmpd.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/plugins/localmpd.py 2017-01-02 23:41:48.333807996 +0100 @@ -18,6 +18,8 @@ import subprocess, locale, os from pwd import getpwuid @@ -141,8 +141,8 @@ from gi.repository import GLib, Gtk from sonata.misc import escape_html ---- sonata/plugins/test.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/plugins/test.py 2017-01-02 23:41:51.388808763 +0100 +--- a/sonata/plugins/test.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/plugins/test.py 2017-01-02 23:41:51.388808763 +0100 @@ -20,6 +20,8 @@ # nothing magical from here on @@ -152,8 +152,8 @@ from gi.repository import Gtk, Gdk, GdkPixbuf, GObject, Pango from sonata.misc import escape_html ---- sonata/preferences.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/preferences.py 2017-01-02 23:41:44.464807024 +0100 +--- a/sonata/preferences.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/preferences.py 2017-01-02 23:41:44.464807024 +0100 @@ -29,6 +29,8 @@ import gettext, hashlib @@ -163,8 +163,8 @@ from gi.repository import Gtk, Gdk, GdkPixbuf from sonata.config import Config ---- sonata/streams.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/streams.py 2017-01-02 23:41:21.405801273 +0100 +--- a/sonata/streams.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/streams.py 2017-01-02 23:41:21.405801273 +0100 @@ -32,6 +32,8 @@ import logging import os @@ -174,8 +174,8 @@ from gi.repository import Gtk, Gdk, Pango from sonata import misc, ui ---- sonata/tagedit.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/tagedit.py 2017-01-02 23:40:55.678794930 +0100 +--- a/sonata/tagedit.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/tagedit.py 2017-01-02 23:40:55.678794930 +0100 @@ -29,6 +29,8 @@ import os import re @@ -185,8 +185,8 @@ from gi.repository import Gtk, GLib tagpy = None # module loaded when needed ---- sonata/tray.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/tray.py 2017-01-02 23:41:28.637803070 +0100 +--- a/sonata/tray.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/tray.py 2017-01-02 23:41:28.637803070 +0100 @@ -18,6 +18,8 @@ import os @@ -196,8 +196,8 @@ from gi.repository import Gtk, GLib from sonata import ui, img ---- sonata/ui.py 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/ui.py 2017-01-02 23:41:25.068802182 +0100 +--- a/sonata/ui.py 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/ui.py 2017-01-02 23:41:25.068802182 +0100 @@ -21,6 +21,8 @@ import pkg_resources import sys diff --git a/srcpkgs/sonata/patches/fix-sonata_css_px.patch b/srcpkgs/sonata/patches/fix-sonata_css_px.patch index 5ed713d513e..806a06631e5 100644 --- a/srcpkgs/sonata/patches/fix-sonata_css_px.patch +++ b/srcpkgs/sonata/patches/fix-sonata_css_px.patch @@ -1,5 +1,5 @@ ---- sonata/ui/sonata.css 2016-01-31 15:36:20.000000000 +0100 -+++ sonata/ui(sonata.css 2017-01-02 23:47:57.875908636 +0100 +--- a/sonata/ui/sonata.css 2016-01-31 15:36:20.000000000 +0100 ++++ b/sonata/ui(sonata.css 2017-01-02 23:47:57.875908636 +0100 @@ -4,11 +4,11 @@ } diff --git a/srcpkgs/sonata/template b/srcpkgs/sonata/template index ea07e0620a6..f4456abd175 100644 --- a/srcpkgs/sonata/template +++ b/srcpkgs/sonata/template @@ -11,4 +11,3 @@ license="GPL-3.0-or-later" homepage="http://www.nongnu.org/sonata/" distfiles="https://github.com/multani/sonata/archive/v${version}.tar.gz" checksum=401f6b796ca3cc176813b9f1639741a3fd226499c7ab25bbc740778ebb15f81d -patch_args=-Np0 diff --git a/srcpkgs/sonic-visualiser/patches/config.patch b/srcpkgs/sonic-visualiser/patches/config.patch index 98fb5281d49..024f2f6491c 100644 --- a/srcpkgs/sonic-visualiser/patches/config.patch +++ b/srcpkgs/sonic-visualiser/patches/config.patch @@ -1,12 +1,12 @@ ---- checker/checker.pri.orig 2017-05-25 10:26:10.000000000 +0200 -+++ checker/checker.pri 2017-08-15 10:32:05.033468727 +0200 +--- a/checker/checker.pri 2017-05-25 10:26:10.000000000 +0200 ++++ b/checker/checker.pri 2017-08-15 10:32:05.033468727 +0200 @@ -1,3 +1,4 @@ +include(../config.pri) CONFIG += qt stl c++11 exceptions console warn_on QT -= xml network gui widgets ---- checker/helper.pro.orig 2017-05-25 10:26:10.000000000 +0200 -+++ checker/helper.pro 2017-08-15 10:32:44.558652327 +0200 +--- a/checker/helper.pro 2017-05-25 10:26:10.000000000 +0200 ++++ b/checker/helper.pro 2017-08-15 10:32:44.558652327 +0200 @@ -1,3 +1,4 @@ +include(../config.pri) diff --git a/srcpkgs/sonic-visualiser/patches/musl-timeval-fix.patch b/srcpkgs/sonic-visualiser/patches/musl-timeval-fix.patch index dd681b9c0ff..3df1909f9c9 100644 --- a/srcpkgs/sonic-visualiser/patches/musl-timeval-fix.patch +++ b/srcpkgs/sonic-visualiser/patches/musl-timeval-fix.patch @@ -1,5 +1,5 @@ ---- svcore/base/test/TestVampRealTime.h.orig 2017-08-13 18:03:48.667779610 +0200 -+++ svcore/base/test/TestVampRealTime.h 2017-08-13 18:03:40.378733419 +0200 +--- a/svcore/base/test/TestVampRealTime.h 2017-08-13 18:03:48.667779610 +0200 ++++ b/svcore/base/test/TestVampRealTime.h 2017-08-13 18:03:40.378733419 +0200 @@ -19,6 +19,7 @@ #include diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template index 583e5d4d3fe..4daa56060ee 100644 --- a/srcpkgs/sonic-visualiser/template +++ b/srcpkgs/sonic-visualiser/template @@ -16,7 +16,6 @@ homepage="https://www.sonicvisualiser.org/" changelog="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG" distfiles="https://code.soundsoftware.ac.uk/attachments/download/2755/${pkgname}-${version}.tar.gz" checksum=38e91a4035962ad177905a9f1249136fe88d4b596fd9b8f40c82b60dadca5bf3 -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/sopwith/patches/enable_cross_compilation.patch b/srcpkgs/sopwith/patches/enable_cross_compilation.patch index 5e4c0d2aa10..8dff50ad6bd 100644 --- a/srcpkgs/sopwith/patches/enable_cross_compilation.patch +++ b/srcpkgs/sopwith/patches/enable_cross_compilation.patch @@ -1,5 +1,5 @@ ---- configure.in.orig -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -1,4 +1,4 @@ -AC_INIT(src/swmain.c) +AC_INIT([sopwith], [1.8.4]) @@ -16,8 +16,8 @@ AM_CONFIG_HEADER(config.h:config.hin) ---- src/Makefile.am.orig -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -6,7 +6,7 @@ bin_PROGRAMS = @SOPWITH_BINS@ EXTRA_PROGRAMS = sopwith gtksopwith psopwith @@ -27,8 +27,8 @@ COMMON_SRC = \ video.h swcollsn.c swgames.h swmain.h swutil.h \ ---- src/sdl/Makefile.am.orig -+++ src/sdl/Makefile.am +--- a/src/sdl/Makefile.am ++++ b/src/sdl/Makefile.am @@ -1,4 +1,4 @@ -CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I.. +AM_CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I.. diff --git a/srcpkgs/sopwith/template b/srcpkgs/sopwith/template index 2c0b91f10be..aa160fdbb87 100644 --- a/srcpkgs/sopwith/template +++ b/srcpkgs/sopwith/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://sdl-sopwith.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/sdl-sopwith/sdl_sopwith/${version}/sopwith-${version}.tar.gz" checksum=a5ecb795a7aeff6be3ebfb99f1c6218054b73048786809f8468a92c952c17bd0 -patch_args=-Np0 pre_configure() { mv configure.{in,ac} diff --git a/srcpkgs/soundmodem/patches/0001-Search-replace-of-extern-inline-static-inline.patch b/srcpkgs/soundmodem/patches/0001-Search-replace-of-extern-inline-static-inline.patch index 53668db3a1d..a8373b79563 100644 --- a/srcpkgs/soundmodem/patches/0001-Search-replace-of-extern-inline-static-inline.patch +++ b/srcpkgs/soundmodem/patches/0001-Search-replace-of-extern-inline-static-inline.patch @@ -28,8 +28,8 @@ during compile. diff --git a/newqpsk/complex.h b/newqpsk/complex.h index 2353865..586572c 100644 ---- newqpsk/complex.h -+++ newqpsk/complex.h +--- a/newqpsk/complex.h ++++ b/newqpsk/complex.h @@ -13,7 +13,7 @@ typedef struct { /* * Complex multiplication. @@ -95,8 +95,8 @@ index 2353865..586572c 100644 } diff --git a/newqpsk/fec.h b/newqpsk/fec.h index 109ad51..409daf1 100644 ---- newqpsk/fec.h -+++ newqpsk/fec.h +--- a/newqpsk/fec.h ++++ b/newqpsk/fec.h @@ -13,7 +13,7 @@ struct fecstate { /* --------------------------------------------------------------------- */ @@ -117,8 +117,8 @@ index 109ad51..409daf1 100644 diff --git a/newqpsk/filter-i386.h b/newqpsk/filter-i386.h index 01b3f5d..d881b2c 100644 ---- newqpsk/filter-i386.h -+++ newqpsk/filter-i386.h +--- a/newqpsk/filter-i386.h ++++ b/newqpsk/filter-i386.h @@ -1,7 +1,7 @@ #ifndef _FILTER_I386_H #define _FILTER_I386_H @@ -130,8 +130,8 @@ index 01b3f5d..d881b2c 100644 asm volatile ( diff --git a/newqpsk/filter.h b/newqpsk/filter.h index ae789fc..754811e 100644 ---- newqpsk/filter.h -+++ newqpsk/filter.h +--- a/newqpsk/filter.h ++++ b/newqpsk/filter.h @@ -12,7 +12,7 @@ /* ---------------------------------------------------------------------- */ @@ -143,8 +143,8 @@ index ae789fc..754811e 100644 unsigned int i; diff --git a/newqpsk/genfilt.c b/newqpsk/genfilt.c index a2eb077..5aec7bf 100644 ---- newqpsk/genfilt.c -+++ newqpsk/genfilt.c +--- a/newqpsk/genfilt.c ++++ b/newqpsk/genfilt.c @@ -18,7 +18,7 @@ int main(int argc, char **argv) puts("#define _FILTER_I386_H"); puts("#define __HAVE_ARCH_MAC"); @@ -156,8 +156,8 @@ index a2eb077..5aec7bf 100644 puts("\tasm volatile ("); diff --git a/newqpsk/misc.h b/newqpsk/misc.h index aa3dfc5..e80301d 100644 ---- newqpsk/misc.h -+++ newqpsk/misc.h +--- a/newqpsk/misc.h ++++ b/newqpsk/misc.h @@ -10,7 +10,7 @@ /* * Hamming weight (number of bits that are ones). @@ -238,8 +238,8 @@ index aa3dfc5..e80301d 100644 float min = M_PI; diff --git a/p3dmodem/genp3dtbl.c b/p3dmodem/genp3dtbl.c index 4d8fbd5..2360995 100644 ---- p3dmodem/genp3dtbl.c -+++ p3dmodem/genp3dtbl.c +--- a/p3dmodem/genp3dtbl.c ++++ b/p3dmodem/genp3dtbl.c @@ -41,7 +41,7 @@ /* ---------------------------------------------------------------------- */ @@ -251,8 +251,8 @@ index 4d8fbd5..2360995 100644 res = (res & 0x33333333) + ((res >> 2) & 0x33333333); diff --git a/pammodem/genpamtbl.c b/pammodem/genpamtbl.c index a466f4d..2b00253 100644 ---- pammodem/genpamtbl.c -+++ pammodem/genpamtbl.c +--- a/pammodem/genpamtbl.c ++++ b/pammodem/genpamtbl.c @@ -104,7 +104,7 @@ /* ---------------------------------------------------------------------- */ @@ -264,8 +264,8 @@ index a466f4d..2b00253 100644 res = (res & 0x33333333) + ((res >> 2) & 0x33333333); diff --git a/pammodem/meas.c b/pammodem/meas.c index 5c2b61a..609e681 100644 ---- pammodem/meas.c -+++ pammodem/meas.c +--- a/pammodem/meas.c ++++ b/pammodem/meas.c @@ -240,7 +240,7 @@ int sound_init(int sample_rate, int *sr) /* ---------------------------------------------------------------------- */ @@ -277,8 +277,8 @@ index 5c2b61a..609e681 100644 res = (res & 0x33333333) + ((res >> 2) & 0x33333333); diff --git a/pammodem/pammodem.c b/pammodem/pammodem.c index 92077a3..c4afc40 100644 ---- pammodem/pammodem.c -+++ pammodem/pammodem.c +--- a/pammodem/pammodem.c ++++ b/pammodem/pammodem.c @@ -160,7 +160,7 @@ struct rxstate { unsigned int rxptr; }; @@ -299,8 +299,8 @@ index 92077a3..c4afc40 100644 unsigned int i; diff --git a/pskmodem/genpsktbl.c b/pskmodem/genpsktbl.c index 9612bc9..e8dd07d 100644 ---- pskmodem/genpsktbl.c -+++ pskmodem/genpsktbl.c +--- a/pskmodem/genpsktbl.c ++++ b/pskmodem/genpsktbl.c @@ -106,7 +106,7 @@ /* ---------------------------------------------------------------------- */ @@ -312,8 +312,8 @@ index 9612bc9..e8dd07d 100644 res = (res & 0x33333333) + ((res >> 2) & 0x33333333); diff --git a/pskmodem/measpsk.c b/pskmodem/measpsk.c index 88e0e36..d0a23de 100644 ---- pskmodem/measpsk.c -+++ pskmodem/measpsk.c +--- a/pskmodem/measpsk.c ++++ b/pskmodem/measpsk.c @@ -271,7 +271,7 @@ int sound_init(int sample_rate, int *sr) /* ---------------------------------------------------------------------- */ @@ -325,8 +325,8 @@ index 88e0e36..d0a23de 100644 res = (res & 0x33333333) + ((res >> 2) & 0x33333333); diff --git a/pskmodem/pskmlse.c b/pskmodem/pskmlse.c index 6fd1561..1649467 100644 ---- pskmodem/pskmlse.c -+++ pskmodem/pskmlse.c +--- a/pskmodem/pskmlse.c ++++ b/pskmodem/pskmlse.c @@ -493,7 +493,7 @@ static void simdtrellis(unsigned int *nodemetric1, unsigned int *nodemetric2, un #else @@ -347,8 +347,8 @@ index 6fd1561..1649467 100644 diff --git a/pskmodem/pskmodem.c b/pskmodem/pskmodem.c index ffb1668..4161bc2 100644 ---- pskmodem/pskmodem.c -+++ pskmodem/pskmodem.c +--- a/pskmodem/pskmodem.c ++++ b/pskmodem/pskmodem.c @@ -262,7 +262,7 @@ static void rxrotate(cplxshort_t *ptr, unsigned int nr, unsigned int carphase, u } } @@ -360,8 +360,8 @@ index ffb1668..4161bc2 100644 unsigned int i; diff --git a/soundcard/modem.h b/soundcard/modem.h index b8c3a5f..375d07d 100644 ---- soundcard/modem.h -+++ soundcard/modem.h +--- a/soundcard/modem.h ++++ b/soundcard/modem.h @@ -103,7 +103,7 @@ extern void logvprintf(unsigned int level, const char *fmt, va_list args); extern void logprintf(unsigned int level, const char *fmt, ...); extern void logerr(unsigned int level, const char *st); @@ -373,8 +373,8 @@ index b8c3a5f..375d07d 100644 } diff --git a/soundcard/simd.h b/soundcard/simd.h index 6b6ab3b..e49bdd7 100644 ---- soundcard/simd.h -+++ soundcard/simd.h +--- a/soundcard/simd.h ++++ b/soundcard/simd.h @@ -54,16 +54,16 @@ #if !defined(USEMMX) && !defined(USEVIS) diff --git a/srcpkgs/soundmodem/patches/cross.patch b/srcpkgs/soundmodem/patches/cross.patch index 8ded40e6f67..735e36d2aae 100644 --- a/srcpkgs/soundmodem/patches/cross.patch +++ b/srcpkgs/soundmodem/patches/cross.patch @@ -1,5 +1,5 @@ ---- configure.in.orig 2016-01-15 07:06:06.724289188 +0100 -+++ configure.in 2016-01-15 07:06:46.395656258 +0100 +--- a/configure.in 2016-01-15 07:06:06.724289188 +0100 ++++ b/configure.in 2016-01-15 07:06:46.395656258 +0100 @@ -31,19 +31,6 @@ AC_MINGW32 AC_EXEEXT AC_OBJEXT diff --git a/srcpkgs/soundmodem/patches/fix-missing-return-type.patch b/srcpkgs/soundmodem/patches/fix-missing-return-type.patch index a98ff0e8c3b..ba57ed7218a 100644 --- a/srcpkgs/soundmodem/patches/fix-missing-return-type.patch +++ b/srcpkgs/soundmodem/patches/fix-missing-return-type.patch @@ -1,5 +1,5 @@ ---- matlib/mat.hh.orig 2018-01-17 09:37:50.871239713 +0100 -+++ matlib/mat.hh 2018-01-17 09:37:59.927203590 +0100 +--- a/matlib/mat.hh 2018-01-17 09:37:50.871239713 +0100 ++++ b/matlib/mat.hh 2018-01-17 09:37:59.927203590 +0100 @@ -91,7 +91,7 @@ template void mmul(T *c, con memcpy(c, r, d1 * d3 * sizeof(c[0])); } diff --git a/srcpkgs/soundmodem/template b/srcpkgs/soundmodem/template index f38d83b2f88..91ae349d3c1 100644 --- a/srcpkgs/soundmodem/template +++ b/srcpkgs/soundmodem/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://soundmodem.vk4msl.yi.org/" distfiles="http://soundmodem.vk4msl.yi.org/soundmodem-${version}.tar.gz" checksum=f033c1716df1378cda646dbb1c48ea9fb9a068772c6686f2ca411bfa64245c1c -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/spacefm/patches/sysmacros.patch b/srcpkgs/spacefm/patches/sysmacros.patch index 0f5d04d18cb..4af1c313377 100644 --- a/srcpkgs/spacefm/patches/sysmacros.patch +++ b/srcpkgs/spacefm/patches/sysmacros.patch @@ -1,7 +1,7 @@ Need this for major/minor. ---- src/main.c -+++ src/main.c +--- a/src/main.c ++++ b/src/main.c @@ -30,6 +30,8 @@ #include diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template index cb2b3b59b9d..f89a4cd5ad5 100644 --- a/srcpkgs/spacefm/template +++ b/srcpkgs/spacefm/template @@ -15,7 +15,6 @@ homepage="http://ignorantguru.github.io/spacefm/" distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz" checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9 conf_files="/etc/spacefm/spacefm.conf" -patch_args=-Np0 build_options="gtk3" build_options_default="gtk3" diff --git a/srcpkgs/spamassassin/patches/configure.patch b/srcpkgs/spamassassin/patches/configure.patch index 4729e0b936d..cf0d41f0e61 100644 --- a/srcpkgs/spamassassin/patches/configure.patch +++ b/srcpkgs/spamassassin/patches/configure.patch @@ -1,7 +1,7 @@ diff --git spamc/configure spamc/configure index d8e5dcf..3db5772 100755 ---- spamc/configure -+++ spamc/configure +--- a/spamc/configure ++++ b/spamc/configure @@ -1737,10 +1737,10 @@ if test "$cross_compiling" != yes; then { { echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. diff --git a/srcpkgs/spamassassin/template b/srcpkgs/spamassassin/template index f36e91661fa..d778f76ba3e 100644 --- a/srcpkgs/spamassassin/template +++ b/srcpkgs/spamassassin/template @@ -25,7 +25,6 @@ conf_files=" /etc/mail/spamassassin/v320.pre /etc/mail/spamassassin/init.pre /etc/mail/spamassassin/local.cf" -patch_args=-Np0 post_install() { vinstall $FILESDIR/sa-update 755 /etc/cron.weekly diff --git a/srcpkgs/spampd/patches/perl-5.18-fixes.patch b/srcpkgs/spampd/patches/perl-5.18-fixes.patch index 41b71409a4c..9b4637b0083 100644 --- a/srcpkgs/spampd/patches/perl-5.18-fixes.patch +++ b/srcpkgs/spampd/patches/perl-5.18-fixes.patch @@ -1,7 +1,7 @@ diff --git a/spampd b/spampd index 7b1f234..2798d50 100644 ---- spampd -+++ spampd +--- a/spampd ++++ b/spampd @@ -937,6 +937,10 @@ if ( !$options{logsock} ) { }; } diff --git a/srcpkgs/spampd/template b/srcpkgs/spampd/template index f64c6dccde7..4380aae4f8b 100644 --- a/srcpkgs/spampd/template +++ b/srcpkgs/spampd/template @@ -13,7 +13,6 @@ distfiles="https://github.com/downloads/mpaperno/$pkgname/$pkgname-$version.tar. checksum=c980e55f46c7757fd45294e5268766253123490d0158d2ee36ad5700ddf823bb system_accounts="_spampd" _spampd_homedir="/var/lib/spampd" -patch_args=-Np0 pre_install() { sed -i '/INSTALL.* \(spampd.default\|spampd-init.sh\) /d' Makefile diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template index 313bbf19e40..b0283ed4019 100644 --- a/srcpkgs/speech-dispatcher/template +++ b/srcpkgs/speech-dispatcher/template @@ -20,7 +20,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later, GFDL-1.2-or-later" homepage="http://devel.freebsoft.org/speechd" distfiles="https://github.com/brailcom/speechd/archive/${version}.tar.gz" checksum=056efb80186f2bfc3f6ef468ab9905ca2d652cc2180b13514b752a9d616a6930 -patch_args=-Np0 conf_files=" /etc/speech-dispatcher/clients/*.conf diff --git a/srcpkgs/speed-dreams/patches/cmake-3.20.patch b/srcpkgs/speed-dreams/patches/cmake-3.20.patch index 5e2334117d3..6162f4a1d80 100644 --- a/srcpkgs/speed-dreams/patches/cmake-3.20.patch +++ b/srcpkgs/speed-dreams/patches/cmake-3.20.patch @@ -1,7 +1,7 @@ Index: cmake/robot.cmake =================================================================== ---- cmake/robot.cmake.orig -+++ cmake/robot.cmake +--- a/cmake/robot.cmake ++++ b/cmake/robot.cmake @@ -229,7 +229,7 @@ ENDMACRO(ROBOT_MODULE) # MACRO(ROBOT_DATA) @@ -21,8 +21,8 @@ Index: cmake/robot.cmake ENDMACRO(ROBOT) Index: data/drivers/dandroid_36GP/CMakeLists.txt =================================================================== ---- data/drivers/dandroid_36GP/CMakeLists.txt.orig -+++ data/drivers/dandroid_36GP/CMakeLists.txt +--- a/data/drivers/dandroid_36GP/CMakeLists.txt ++++ b/data/drivers/dandroid_36GP/CMakeLists.txt @@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 36gp-tridenti-6c34 36gp-tridenti-v8ri tracks) @@ -33,8 +33,8 @@ Index: data/drivers/dandroid_36GP/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv) Index: data/drivers/dandroid_ls1/CMakeLists.txt =================================================================== ---- data/drivers/dandroid_ls1/CMakeLists.txt.orig -+++ data/drivers/dandroid_ls1/CMakeLists.txt +--- a/data/drivers/dandroid_ls1/CMakeLists.txt ++++ b/data/drivers/dandroid_ls1/CMakeLists.txt @@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 ls1-taipan-ltsr ls1-marisatech-gt4r tracks) @@ -45,8 +45,8 @@ Index: data/drivers/dandroid_ls1/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv) Index: data/drivers/dandroid_ls2/CMakeLists.txt =================================================================== ---- data/drivers/dandroid_ls2/CMakeLists.txt.orig -+++ data/drivers/dandroid_ls2/CMakeLists.txt +--- a/data/drivers/dandroid_ls2/CMakeLists.txt ++++ b/data/drivers/dandroid_ls2/CMakeLists.txt @@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 ls2-cavallo-360r ls2-morley-r900 ls2-vulture-v6rs2 tracks) @@ -57,8 +57,8 @@ Index: data/drivers/dandroid_ls2/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv) Index: data/drivers/dandroid_mpa1/CMakeLists.txt =================================================================== ---- data/drivers/dandroid_mpa1/CMakeLists.txt.orig -+++ data/drivers/dandroid_mpa1/CMakeLists.txt +--- a/data/drivers/dandroid_mpa1/CMakeLists.txt ++++ b/data/drivers/dandroid_mpa1/CMakeLists.txt @@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 mpa1-team-lynx mpa1-ffr tracks) @@ -69,8 +69,8 @@ Index: data/drivers/dandroid_mpa1/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv) Index: data/drivers/dandroid_rs/CMakeLists.txt =================================================================== ---- data/drivers/dandroid_rs/CMakeLists.txt.orig -+++ data/drivers/dandroid_rs/CMakeLists.txt +--- a/data/drivers/dandroid_rs/CMakeLists.txt ++++ b/data/drivers/dandroid_rs/CMakeLists.txt @@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 rs2-fai-dot rs2-lion-2m tracks) @@ -81,8 +81,8 @@ Index: data/drivers/dandroid_rs/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv) Index: data/drivers/dandroid_sc/CMakeLists.txt =================================================================== ---- data/drivers/dandroid_sc/CMakeLists.txt.orig -+++ data/drivers/dandroid_sc/CMakeLists.txt +--- a/data/drivers/dandroid_sc/CMakeLists.txt ++++ b/data/drivers/dandroid_sc/CMakeLists.txt @@ -5,6 +5,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 sc-lynx-220 sc-murasama-nsx sc-kanagawa-z35gts sc-kongei-kk8s tracks) @@ -93,8 +93,8 @@ Index: data/drivers/dandroid_sc/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv) Index: data/drivers/dandroid_srw/CMakeLists.txt =================================================================== ---- data/drivers/dandroid_srw/CMakeLists.txt.orig -+++ data/drivers/dandroid_srw/CMakeLists.txt +--- a/data/drivers/dandroid_srw/CMakeLists.txt ++++ b/data/drivers/dandroid_srw/CMakeLists.txt @@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 srw-kanagawa-gtr tracks) @@ -105,8 +105,8 @@ Index: data/drivers/dandroid_srw/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/dandroid_trb1/CMakeLists.txt =================================================================== ---- data/drivers/dandroid_trb1/CMakeLists.txt.orig -+++ data/drivers/dandroid_trb1/CMakeLists.txt +--- a/data/drivers/dandroid_trb1/CMakeLists.txt ++++ b/data/drivers/dandroid_trb1/CMakeLists.txt @@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 trb1-zaxxon-rb trb1-vieringe-5rb tracks) @@ -117,8 +117,8 @@ Index: data/drivers/dandroid_trb1/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg *.csv) Index: data/drivers/human/CMakeLists.txt =================================================================== ---- data/drivers/human/CMakeLists.txt.orig -+++ data/drivers/human/CMakeLists.txt +--- a/data/drivers/human/CMakeLists.txt ++++ b/data/drivers/human/CMakeLists.txt @@ -2,10 +2,10 @@ INCLUDE(../../../cmake/macros.cmake) SET(ROBOT_NAME "human") @@ -134,8 +134,8 @@ Index: data/drivers/human/CMakeLists.txt USER) Index: data/drivers/networkhuman/CMakeLists.txt =================================================================== ---- data/drivers/networkhuman/CMakeLists.txt.orig -+++ data/drivers/networkhuman/CMakeLists.txt +--- a/data/drivers/networkhuman/CMakeLists.txt ++++ b/data/drivers/networkhuman/CMakeLists.txt @@ -2,10 +2,10 @@ INCLUDE(../../../cmake/macros.cmake) SET(ROBOT_NAME "networkhuman") @@ -151,8 +151,8 @@ Index: data/drivers/networkhuman/CMakeLists.txt USER) Index: data/drivers/shadow_sc/CMakeLists.txt =================================================================== ---- data/drivers/shadow_sc/CMakeLists.txt.orig -+++ data/drivers/shadow_sc/CMakeLists.txt +--- a/data/drivers/shadow_sc/CMakeLists.txt ++++ b/data/drivers/shadow_sc/CMakeLists.txt @@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 sc-lynx-220 sc-murasama-nsx sc-spirit-300 tracks) @@ -163,8 +163,8 @@ Index: data/drivers/shadow_sc/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/simplix/CMakeLists.txt =================================================================== ---- data/drivers/simplix/CMakeLists.txt.orig -+++ data/drivers/simplix/CMakeLists.txt +--- a/data/drivers/simplix/CMakeLists.txt ++++ b/data/drivers/simplix/CMakeLists.txt @@ -10,6 +10,6 @@ SET(ROBOT_SUBDIRS trb1-cavallo-360rb tracks 0) @@ -175,8 +175,8 @@ Index: data/drivers/simplix/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml *.rgb) Index: data/drivers/simplix_36GP/CMakeLists.txt =================================================================== ---- data/drivers/simplix_36GP/CMakeLists.txt.orig -+++ data/drivers/simplix_36GP/CMakeLists.txt +--- a/data/drivers/simplix_36GP/CMakeLists.txt ++++ b/data/drivers/simplix_36GP/CMakeLists.txt @@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 36gp-tridenti-6c34 36gp-tridenti-v8ri tracks) @@ -187,8 +187,8 @@ Index: data/drivers/simplix_36GP/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/simplix_ls1/CMakeLists.txt =================================================================== ---- data/drivers/simplix_ls1/CMakeLists.txt.orig -+++ data/drivers/simplix_ls1/CMakeLists.txt +--- a/data/drivers/simplix_ls1/CMakeLists.txt ++++ b/data/drivers/simplix_ls1/CMakeLists.txt @@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 ls1-taipan-ltsr tracks) @@ -199,8 +199,8 @@ Index: data/drivers/simplix_ls1/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/simplix_ls2/CMakeLists.txt =================================================================== ---- data/drivers/simplix_ls2/CMakeLists.txt.orig -+++ data/drivers/simplix_ls2/CMakeLists.txt +--- a/data/drivers/simplix_ls2/CMakeLists.txt ++++ b/data/drivers/simplix_ls2/CMakeLists.txt @@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 ls2-bavaria-g3gtr tracks) @@ -211,8 +211,8 @@ Index: data/drivers/simplix_ls2/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/simplix_mp5/CMakeLists.txt =================================================================== ---- data/drivers/simplix_mp5/CMakeLists.txt.orig -+++ data/drivers/simplix_mp5/CMakeLists.txt +--- a/data/drivers/simplix_mp5/CMakeLists.txt ++++ b/data/drivers/simplix_mp5/CMakeLists.txt @@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 mp5-fmc mp5-fmc-drift mp5-fmc-speedy tracks) @@ -223,8 +223,8 @@ Index: data/drivers/simplix_mp5/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/simplix_mpa1/CMakeLists.txt =================================================================== ---- data/drivers/simplix_mpa1/CMakeLists.txt.orig -+++ data/drivers/simplix_mpa1/CMakeLists.txt +--- a/data/drivers/simplix_mpa1/CMakeLists.txt ++++ b/data/drivers/simplix_mpa1/CMakeLists.txt @@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 mpa1-team-lynx mpa1-ffr tracks) @@ -235,8 +235,8 @@ Index: data/drivers/simplix_mpa1/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/simplix_sc/CMakeLists.txt =================================================================== ---- data/drivers/simplix_sc/CMakeLists.txt.orig -+++ data/drivers/simplix_sc/CMakeLists.txt +--- a/data/drivers/simplix_sc/CMakeLists.txt ++++ b/data/drivers/simplix_sc/CMakeLists.txt @@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 sc-lynx-220 sc-murasama-nsx tracks) @@ -247,8 +247,8 @@ Index: data/drivers/simplix_sc/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/simplix_srw/CMakeLists.txt =================================================================== ---- data/drivers/simplix_srw/CMakeLists.txt.orig -+++ data/drivers/simplix_srw/CMakeLists.txt +--- a/data/drivers/simplix_srw/CMakeLists.txt ++++ b/data/drivers/simplix_srw/CMakeLists.txt @@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 srw-kanagawa-gtr tracks) @@ -259,8 +259,8 @@ Index: data/drivers/simplix_srw/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/simplix_trb1/CMakeLists.txt =================================================================== ---- data/drivers/simplix_trb1/CMakeLists.txt.orig -+++ data/drivers/simplix_trb1/CMakeLists.txt +--- a/data/drivers/simplix_trb1/CMakeLists.txt ++++ b/data/drivers/simplix_trb1/CMakeLists.txt @@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 trb1-zaxxon-rb trb1-vieringe-5rb tracks) @@ -271,8 +271,8 @@ Index: data/drivers/simplix_trb1/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/usr_36GP/CMakeLists.txt =================================================================== ---- data/drivers/usr_36GP/CMakeLists.txt.orig -+++ data/drivers/usr_36GP/CMakeLists.txt +--- a/data/drivers/usr_36GP/CMakeLists.txt ++++ b/data/drivers/usr_36GP/CMakeLists.txt @@ -8,7 +8,7 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1 36gp-tridenti-v8ri tracks) @@ -284,8 +284,8 @@ Index: data/drivers/usr_36GP/CMakeLists.txt Index: data/drivers/usr_ls1/CMakeLists.txt =================================================================== ---- data/drivers/usr_ls1/CMakeLists.txt.orig -+++ data/drivers/usr_ls1/CMakeLists.txt +--- a/data/drivers/usr_ls1/CMakeLists.txt ++++ b/data/drivers/usr_ls1/CMakeLists.txt @@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1 ls1-taipan-ltsr ls1-toro-rgt tracks) @@ -296,8 +296,8 @@ Index: data/drivers/usr_ls1/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/usr_ls2/CMakeLists.txt =================================================================== ---- data/drivers/usr_ls2/CMakeLists.txt.orig -+++ data/drivers/usr_ls2/CMakeLists.txt +--- a/data/drivers/usr_ls2/CMakeLists.txt ++++ b/data/drivers/usr_ls2/CMakeLists.txt @@ -9,6 +9,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 ls2-vortex-gt ls2-lynx-xkr ) @@ -308,8 +308,8 @@ Index: data/drivers/usr_ls2/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/usr_mpa1/CMakeLists.txt =================================================================== ---- data/drivers/usr_mpa1/CMakeLists.txt.orig -+++ data/drivers/usr_mpa1/CMakeLists.txt +--- a/data/drivers/usr_mpa1/CMakeLists.txt ++++ b/data/drivers/usr_mpa1/CMakeLists.txt @@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 #9 10 mpa1-ffr mpa1-furia mpa1-hartbill-2002 mpa1-murasama mpa1-team-lynx) @@ -320,8 +320,8 @@ Index: data/drivers/usr_mpa1/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/usr_rs/CMakeLists.txt =================================================================== ---- data/drivers/usr_rs/CMakeLists.txt.orig -+++ data/drivers/usr_rs/CMakeLists.txt +--- a/data/drivers/usr_rs/CMakeLists.txt ++++ b/data/drivers/usr_rs/CMakeLists.txt @@ -6,6 +6,6 @@ SET(ROBOT_SUBDIRS 1 rs1-kenji-08 ) @@ -332,8 +332,8 @@ Index: data/drivers/usr_rs/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/usr_sc/CMakeLists.txt =================================================================== ---- data/drivers/usr_sc/CMakeLists.txt.orig -+++ data/drivers/usr_sc/CMakeLists.txt +--- a/data/drivers/usr_sc/CMakeLists.txt ++++ b/data/drivers/usr_sc/CMakeLists.txt @@ -7,6 +7,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1 sc-lynx-220 sc-murasama-nsx sc-spirit-300 tracks) @@ -344,8 +344,8 @@ Index: data/drivers/usr_sc/CMakeLists.txt SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png *.jpg) Index: data/drivers/usr_trb1/CMakeLists.txt =================================================================== ---- data/drivers/usr_trb1/CMakeLists.txt.orig -+++ data/drivers/usr_trb1/CMakeLists.txt +--- a/data/drivers/usr_trb1/CMakeLists.txt ++++ b/data/drivers/usr_trb1/CMakeLists.txt @@ -8,6 +8,6 @@ SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 1 trb1-zaxxon-rb tracks) diff --git a/srcpkgs/speed-dreams/patches/ppc64le.patch b/srcpkgs/speed-dreams/patches/ppc64le.patch index 6b7703ea545..fc52d65830a 100644 --- a/srcpkgs/speed-dreams/patches/ppc64le.patch +++ b/srcpkgs/speed-dreams/patches/ppc64le.patch @@ -1,7 +1,7 @@ Index: src/modules/graphic/osggraph/Utils/OsgAtomic.h =================================================================== ---- src/modules/graphic/osggraph/Utils/OsgAtomic.h (revision 6789) -+++ src/modules/graphic/osggraph/Utils/OsgAtomic.h (working copy) +--- a/src/modules/graphic/osggraph/Utils/OsgAtomic.h (revision 6789) ++++ b/src/modules/graphic/osggraph/Utils/OsgAtomic.h (working copy) @@ -20,7 +20,7 @@ #ifndef OsgAtomic_H #define OsgAtomic_H diff --git a/srcpkgs/speed-dreams/template b/srcpkgs/speed-dreams/template index 47786d859bb..fadabc891c8 100644 --- a/srcpkgs/speed-dreams/template +++ b/srcpkgs/speed-dreams/template @@ -29,7 +29,6 @@ replaces="speed-dreams-data>=0" CFLAGS=-fpermissive CXXFLAGS=-fpermissive lib32disabled=yes -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = musl ]; then broken="Segmentation fault" diff --git a/srcpkgs/spice-gtk/patches/fix-version.patch b/srcpkgs/spice-gtk/patches/fix-version.patch index 1d11986f689..2d51c28bcde 100644 --- a/srcpkgs/spice-gtk/patches/fix-version.patch +++ b/srcpkgs/spice-gtk/patches/fix-version.patch @@ -1,5 +1,5 @@ ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -2,7 +2,7 @@ # project definition # diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template index 613328430c2..7218e837891 100644 --- a/srcpkgs/spice-gtk/template +++ b/srcpkgs/spice-gtk/template @@ -22,7 +22,6 @@ license="LGPL-2.1-or-later" homepage="https://spice-space.org" distfiles="https://spice-space.org/download/gtk/${pkgname}-${version}.tar.xz" checksum=23acbee197eaaec9bce6e6bfd885bd8f79708332639243ff04833020865713cd -patch_args=-Np0 CFLAGS="-Wno-error -Wno-error=unused-but-set-variable" diff --git a/srcpkgs/spim/patches/flex-2.6-compat.patch b/srcpkgs/spim/patches/flex-2.6-compat.patch index da6e3494692..42d8eccfa9d 100644 --- a/srcpkgs/spim/patches/flex-2.6-compat.patch +++ b/srcpkgs/spim/patches/flex-2.6-compat.patch @@ -6,8 +6,8 @@ Last-Update: 2017-04-20 Index: spim-8.0+dfsg/CPU/scanner.l =================================================================== ---- ./CPU/scanner.l -+++ ./CPU/scanner.l +--- a/CPU/scanner.l ++++ b/CPU/scanner.l @@ -316,7 +316,8 @@ initialize_scanner (FILE *in_file) yyin = in_file; #ifdef FLEX_SCANNER diff --git a/srcpkgs/spim/template b/srcpkgs/spim/template index aada991a2d5..347ff447611 100644 --- a/srcpkgs/spim/template +++ b/srcpkgs/spim/template @@ -13,7 +13,6 @@ license="BSD-3-Clause" homepage="http://spimsimulator.sourceforge.net/" distfiles="http://pages.cs.wisc.edu/~larus/SPIM/spim-${version}.tar.gz" checksum="6f205776cb9fa112729507008843b289012190ed3131cbd426c610a58387ee4b" -patch_args=-Np0 pre_configure() { sed '/Copyright (c) 1990-2010, James R. Larus./,+26!d' README > LICENSE diff --git a/srcpkgs/splix/patches/crosscompile.patch b/srcpkgs/splix/patches/crosscompile.patch index a7652710ef9..ae0e0ec4cbb 100644 --- a/srcpkgs/splix/patches/crosscompile.patch +++ b/srcpkgs/splix/patches/crosscompile.patch @@ -1,5 +1,5 @@ ---- rules.mk 2015-04-25 03:13:58.762185962 +0200 -+++ rules.mk 2015-04-25 03:40:23.891254518 +0200 +--- a/rules.mk 2015-04-25 03:13:58.762185962 +0200 ++++ b/rules.mk 2015-04-25 03:40:23.891254518 +0200 @@ -6,12 +6,12 @@ $(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ) diff --git a/srcpkgs/splix/patches/fix-alignment-problem-on-armel.patch b/srcpkgs/splix/patches/fix-alignment-problem-on-armel.patch index 5398783a7b3..bb74b4e3e52 100644 --- a/srcpkgs/splix/patches/fix-alignment-problem-on-armel.patch +++ b/srcpkgs/splix/patches/fix-alignment-problem-on-armel.patch @@ -8,8 +8,8 @@ Subject: Fix alignment problem on armel diff --git src/qpdl.cpp src/qpdl.cpp index 994e1c8..a95f361 100644 ---- src/qpdl.cpp -+++ src/qpdl.cpp +--- a/src/qpdl.cpp ++++ b/src/qpdl.cpp @@ -132,7 +132,7 @@ static bool _renderBand(const Request& request, const Band* band, bool mono) { unsigned long version, subVersion, size, dataSize, checkSum; diff --git a/srcpkgs/splix/patches/splix-deviceID.patch b/srcpkgs/splix/patches/splix-deviceID.patch index fcdae393d52..a2b46ee7305 100644 --- a/srcpkgs/splix/patches/splix-deviceID.patch +++ b/srcpkgs/splix/patches/splix-deviceID.patch @@ -1,6 +1,6 @@ diff -up ppd/samsung.drv.in.deviceID ppd/samsung.drv.in ---- ppd/samsung.drv.in.deviceID 2013-08-26 21:45:31.000000000 +0200 -+++ ppd/samsung.drv.in 2013-09-02 13:56:57.002669362 +0200 +--- a/ppd/samsung.drv.in.deviceID 2013-08-26 21:45:31.000000000 +0200 ++++ b/ppd/samsung.drv.in 2013-09-02 13:56:57.002669362 +0200 @@ -39,6 +39,7 @@ Manufacturer "Samsung" Resolution k 1 0 0 0 "300dpi/300 DPI" @@ -69,8 +69,8 @@ diff -up ppd/samsung.drv.in.deviceID ppd/samsung.drv.in }{ Attribute General CMSFile "CLP-315" diff -up splix/ppd/xerox.drv.in.deviceID splix/ppd/xerox.drv.in ---- ppd/xerox.drv.in.deviceID 2013-08-26 17:22:00.000000000 +0200 -+++ ppd/xerox.drv.in 2013-09-02 13:55:22.634957854 +0200 +--- a/ppd/xerox.drv.in.deviceID 2013-08-26 17:22:00.000000000 +0200 ++++ b/ppd/xerox.drv.in 2013-09-02 13:55:22.634957854 +0200 @@ -66,6 +66,7 @@ Manufacturer "Xerox" } { #import "manualduplex.defs" diff --git a/srcpkgs/splix/template b/srcpkgs/splix/template index 47c4ef17335..366aab114bc 100644 --- a/srcpkgs/splix/template +++ b/srcpkgs/splix/template @@ -11,7 +11,6 @@ homepage="http://splix.ap2c.org" distfiles="${DEBIAN_SITE}/main/s/$pkgname/${pkgname}_$version.orig.tar.gz" checksum="578a81bd5b1b97756a539c3bb6339fd109d54419887a73e705941da8aa7fac52" CXXFLAGS="-fno-strict-aliasing" -patch_args=-Np0 do_build() { vsed -i rules.mk \ diff --git a/srcpkgs/spreed-webrtc/patches/config.patch b/srcpkgs/spreed-webrtc/patches/config.patch index 4855e299f73..23bad59cebf 100644 --- a/srcpkgs/spreed-webrtc/patches/config.patch +++ b/srcpkgs/spreed-webrtc/patches/config.patch @@ -1,5 +1,5 @@ ---- server.conf.in.orig 2017-10-24 17:32:49.929715267 -0400 -+++ server.conf.in 2017-10-24 17:52:14.557079287 -0400 +--- a/server.conf.in 2017-10-24 17:32:49.929715267 -0400 ++++ b/server.conf.in 2017-10-24 17:52:14.557079287 -0400 @@ -70,13 +70,13 @@ ; Session secret to use for session id generator. 32 or 64 bytes of random data ; are recommented (hex encoded). A warning will be logged if hex decode fails. diff --git a/srcpkgs/spreed-webrtc/patches/fix-uuid-newv4.patch b/srcpkgs/spreed-webrtc/patches/fix-uuid-newv4.patch index 43ae60c772b..a765164f7e9 100644 --- a/srcpkgs/spreed-webrtc/patches/fix-uuid-newv4.patch +++ b/srcpkgs/spreed-webrtc/patches/fix-uuid-newv4.patch @@ -1,5 +1,5 @@ ---- ./go/channelling/server/users.go.orig 2018-01-15 14:20:19.997694620 +0100 -+++ ./go/channelling/server/users.go 2018-01-15 14:20:41.151902026 +0100 +--- a/go/channelling/server/users.go 2018-01-15 14:20:19.997694620 +0100 ++++ b/go/channelling/server/users.go 2018-01-15 14:20:41.151902026 +0100 @@ -456,7 +456,7 @@ func (users *Users) Post(request *http.R } diff --git a/srcpkgs/spreed-webrtc/patches/sbin.patch b/srcpkgs/spreed-webrtc/patches/sbin.patch index 315d4af8d71..28d66e04943 100644 --- a/srcpkgs/spreed-webrtc/patches/sbin.patch +++ b/srcpkgs/spreed-webrtc/patches/sbin.patch @@ -1,5 +1,5 @@ ---- Makefile.am.bck 2017-10-21 16:58:49.133926179 -0400 -+++ Makefile.am 2017-10-21 16:59:15.308887970 -0400 +--- a/Makefile.am.bck 2017-10-21 16:58:49.133926179 -0400 ++++ b/Makefile.am 2017-10-21 16:59:15.308887970 -0400 @@ -33,7 +33,7 @@ GOTESTFLAGS ?= SYSTEM_GOPATH = /usr/share/gocode/src/ diff --git a/srcpkgs/spreed-webrtc/template b/srcpkgs/spreed-webrtc/template index 4480b5dabec..7baa339cc7e 100644 --- a/srcpkgs/spreed-webrtc/template +++ b/srcpkgs/spreed-webrtc/template @@ -13,7 +13,6 @@ license="AGPL-3.0-or-later" homepage="https://github.com/strukturag/spreed-webrtc" distfiles="https://github.com/strukturag/spreed-webrtc/archive/v${version}.tar.gz" checksum=d05b820fe3883840eadf8b96bda663397991849d9bda4750fc7c4e642c9c3268 -patch_args=-Np0 system_accounts="_spreed_webrtc" diff --git a/srcpkgs/sqmail/patches/autouid.patch b/srcpkgs/sqmail/patches/autouid.patch index c9455a535a9..e262fdf3a99 100644 --- a/srcpkgs/sqmail/patches/autouid.patch +++ b/srcpkgs/sqmail/patches/autouid.patch @@ -1,7 +1,7 @@ We generate the file auto_uids.c ourselves. ---- mail/sqmail/sqmail-4.0.10/src/Makefile.orig -+++ mail/sqmail/sqmail-4.0.10/src/Makefile +--- a/mail/sqmail/sqmail-4.0.10/src/Makefile ++++ b/mail/sqmail/sqmail-4.0.10/src/Makefile @@ -95,20 +95,6 @@ compile auto_split.c ./compile auto_split.c diff --git a/srcpkgs/sqmail/template b/srcpkgs/sqmail/template index ac118d931df..78c0af18ead 100644 --- a/srcpkgs/sqmail/template +++ b/srcpkgs/sqmail/template @@ -16,7 +16,6 @@ nocross="custom build system" provides="smtp-server-0_1" replaces="smtp-server>=0" conf_files="/etc/sv/*/run /etc/sv/*/log/run" -patch_args=-Np0 system_groups="_nofiles:798 _sqmail:799" diff --git a/srcpkgs/squashfs-tools/patches/fix-glibc-2.28.patch b/srcpkgs/squashfs-tools/patches/fix-glibc-2.28.patch index 6df349e314c..e6e227a32ff 100644 --- a/srcpkgs/squashfs-tools/patches/fix-glibc-2.28.patch +++ b/srcpkgs/squashfs-tools/patches/fix-glibc-2.28.patch @@ -1,5 +1,5 @@ ---- squashfs-tools/mksquashfs.c 2018-02-15 14:11:24.661930637 +0100 -+++ squashfs-tools/mksquashfs.c 2018-02-15 14:12:28.218412025 +0100 +--- a/squashfs-tools/mksquashfs.c 2018-02-15 14:11:24.661930637 +0100 ++++ b/squashfs-tools/mksquashfs.c 2018-02-15 14:12:28.218412025 +0100 @@ -44,6 +44,7 @@ #include #include @@ -8,8 +8,8 @@ #include #include #include ---- squashfs-tools/unsquashfs.c 2018-02-15 14:25:34.608263881 +0100 -+++ squashfs-tools/unsquashfs.c 2018-02-15 14:26:01.376410327 +0100 +--- a/squashfs-tools/unsquashfs.c 2018-02-15 14:25:34.608263881 +0100 ++++ b/squashfs-tools/unsquashfs.c 2018-02-15 14:26:01.376410327 +0100 @@ -36,6 +36,7 @@ #include +#include diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template index f66e2db5391..d49d6c5602a 100644 --- a/srcpkgs/squashfs-tools/template +++ b/srcpkgs/squashfs-tools/template @@ -12,7 +12,6 @@ short_desc="Tool to create and append to squashfs filesystems" maintainer="Duncaen " distfiles="${SOURCEFORGE_SITE}/squashfs/squashfs${version}.tar.gz" checksum=a981b3f3f2054b5a2e658851a3c06a2460ad04a9a8a645e0afe063a63fdbb07e -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/srb2/patches/libadd-execinfo.patch b/srcpkgs/srb2/patches/libadd-execinfo.patch index 386010c3860..faa8fb25a68 100644 --- a/srcpkgs/srb2/patches/libadd-execinfo.patch +++ b/srcpkgs/srb2/patches/libadd-execinfo.patch @@ -1,6 +1,6 @@ diff -Naur SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg SRB2-SRB2_release_2.2.9.orig/src/sdl/MakeNIX.cfg ---- SRB2-SRB2_release_2.2.9.orig/src/sdl/MakeNIX.cfg 2021-05-07 00:06:51.901546000 -0700 -+++ SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg 2021-05-06 19:38:24.000000000 -0700 +--- a/SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg 2021-05-07 00:06:51.901546000 -0700 ++++ b/SRB2-SRB2_release_2.2.9/src/sdl/MakeNIX.cfg 2021-05-06 19:38:24.000000000 -0700 @@ -22,7 +22,7 @@ OPTS=-DUNIXCOMMON diff --git a/srcpkgs/srb2/template b/srcpkgs/srb2/template index de8c22c3a5b..08a2bff0886 100644 --- a/srcpkgs/srb2/template +++ b/srcpkgs/srb2/template @@ -19,7 +19,6 @@ distfiles="https://github.com/STJr/SRB2/archive/SRB2_release_${version}.tar.gz checksum="5f7eeb08e90323e28cdcb02ad25c904eef25ce75316720609b995a1e4ffd154a 48cf787a70f44b31fa7a56db4053a404a7103a494f1e09fd2bbfd563672a3534" restricted=yes -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in i686*) makedepends+=" nasm" ;; diff --git a/srcpkgs/ssoma/patches/no-git.diff b/srcpkgs/ssoma/patches/no-git.diff index 183c17fa855..66e371c1d6c 100644 --- a/srcpkgs/ssoma/patches/no-git.diff +++ b/srcpkgs/ssoma/patches/no-git.diff @@ -1,5 +1,5 @@ ---- Makefile.PL.orig -+++ Makefile.PL +--- a/Makefile.PL ++++ b/Makefile.PL @@ -6,9 +6,10 @@ # so don't depend on any public Perl API use strict; diff --git a/srcpkgs/ssoma/template b/srcpkgs/ssoma/template index 7de2723c4bc..9fbee6bead1 100644 --- a/srcpkgs/ssoma/template +++ b/srcpkgs/ssoma/template @@ -14,7 +14,6 @@ license="AGPL-3.0-or-later" homepage="https://ssoma.public-inbox.org/" distfiles="https://ssoma.public-inbox.org/files/${pkgname}-${version}.tar.gz" checksum=7455bafb344aaa8eeac78ae5efcca2384d11baface1194c35bafd30353168faf -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/sssd/patches/fix_tests.patch b/srcpkgs/sssd/patches/fix_tests.patch index 33003a07cb8..c7de01493a8 100644 --- a/srcpkgs/sssd/patches/fix_tests.patch +++ b/srcpkgs/sssd/patches/fix_tests.patch @@ -2,8 +2,8 @@ Fix tests by disabling failures related to softhsm, see https://github.com/SSSD/sssd/issues/5397 ---- src/tests/cmocka/test_pam_srv.c -+++ src/tests/cmocka/test_pam_srv.c +--- a/src/tests/cmocka/test_pam_srv.c ++++ b/src/tests/cmocka/test_pam_srv.c @@ -41,6 +41,8 @@ #include "tests/test_CA/SSSD_test_cert_x509_0002.h" #include "tests/test_CA/SSSD_test_cert_x509_0005.h" @@ -33,8 +33,8 @@ https://github.com/SSSD/sssd/issues/5397 The test_ncache_* functions require a working user directory, which is generally unavailable in xbps-src builds. ---- src/tests/cmocka/test_negcache.c -+++ src/tests/cmocka/test_negcache.c +--- a/src/tests/cmocka/test_negcache.c ++++ b/src/tests/cmocka/test_negcache.c @@ -1089,7 +1089,7 @@ setup, teardown), cmocka_unit_test_setup_teardown(test_sss_ncache_domain_locate_type, diff --git a/srcpkgs/sssd/patches/libressl.patch b/srcpkgs/sssd/patches/libressl.patch index 495a1066bea..e9c8a4bf7b0 100644 --- a/srcpkgs/sssd/patches/libressl.patch +++ b/srcpkgs/sssd/patches/libressl.patch @@ -1,15 +1,15 @@ diff -Naurp0 a/p11_child/p11_child_openssl.c b/p11_child/p11_child_openssl.c ---- src/p11_child/p11_child_openssl.c 2020-09-06 16:39:47.663132167 +0200 -+++ src/p11_child/p11_child_openssl.c 2020-09-06 16:39:51.887060887 +0200 +--- a/src/p11_child/p11_child_openssl.c 2020-09-06 16:39:47.663132167 +0200 ++++ b/src/p11_child/p11_child_openssl.c 2020-09-06 16:39:51.887060887 +0200 @@ -33,0 +34 @@ +#include diff -Naurp0 a/util/crypto/libcrypto/crypto_hmac_sha1.c b/util/crypto/libcrypto/crypto_hmac_sha1.c ---- src/util/crypto/libcrypto/crypto_hmac_sha1.c 2020-09-06 16:39:47.705131458 +0200 -+++ src/util/crypto/libcrypto/crypto_hmac_sha1.c 2020-09-06 16:39:51.870061174 +0200 +--- a/src/util/crypto/libcrypto/crypto_hmac_sha1.c 2020-09-06 16:39:47.705131458 +0200 ++++ b/src/util/crypto/libcrypto/crypto_hmac_sha1.c 2020-09-06 16:39:51.870061174 +0200 @@ -19,0 +20 @@ +#include ---- src/lib/certmap/sss_cert_content_crypto.c 2020-10-12 12:16:19.000000000 +0200 -+++ - 2021-02-01 15:35:14.968899293 +0100 +--- a/src/lib/certmap/sss_cert_content_crypto.c 2020-10-12 12:16:19.000000000 +0200 ++++ b/src/lib/certmap/sss_cert_content_crypto.c 2020-10-12 12:16:19.000000000 +0200 @@ -771,8 +771,13 @@ ret = EIO; goto done; diff --git a/srcpkgs/sssd/template b/srcpkgs/sssd/template index 758022a785c..61ead1c9e44 100644 --- a/srcpkgs/sssd/template +++ b/srcpkgs/sssd/template @@ -32,7 +32,6 @@ python_version=3 nocross="configure attempts to run compiled output" # These modules in /usr/lib/sssd are required by sssd-python3 shlib_provides="libsss_util.so libsss_crypt.so libsss_debug.so" -patch_args=-Np0 do_check() { export CK_TIMEOUT_MULTIPLIER=10 diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch index 1c06480515f..6da5cf5d61c 100644 --- a/srcpkgs/stack/patches/datakinds.patch +++ b/srcpkgs/stack/patches/datakinds.patch @@ -1,12 +1,12 @@ ---- src/Stack/Storage/User.hs 2020-10-15 15:51:28.000000000 +0200 -+++ src/Stack/Storage/User.hs 2020-12-06 20:51:06.632607164 +0100 +--- a/src/Stack/Storage/User.hs 2020-10-15 15:51:28.000000000 +0200 ++++ b/src/Stack/Storage/User.hs 2020-12-06 20:51:06.632607164 +0100 @@ -1,3 +1,4 @@ +{-# LANGUAGE DataKinds #-} {-# LANGUAGE DerivingStrategies #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GADTs #-} ---- src/Stack/Storage/Project.hs 2020-10-15 15:51:28.000000000 +0200 -+++ src/Stack/Storage/Project.hs 2020-12-06 21:55:21.349484738 +0100 +--- a/src/Stack/Storage/Project.hs 2020-10-15 15:51:28.000000000 +0200 ++++ b/src/Stack/Storage/Project.hs 2020-12-06 21:55:21.349484738 +0100 @@ -1,3 +1,4 @@ +{-# LANGUAGE DataKinds #-} {-# LANGUAGE DerivingStrategies #-} diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch index 6b55c176e15..e4cd0618da1 100644 --- a/srcpkgs/stack/patches/ghc-8.8.4.patch +++ b/srcpkgs/stack/patches/ghc-8.8.4.patch @@ -1,5 +1,5 @@ ---- masterdir/builddir/stack-2.5.1/stack.cabal 2020-10-17 17:19:10.724179166 +0200 -+++ stack.cabal 2020-10-17 17:18:03.803498792 +0200 +--- a/masterdir/builddir/stack-2.5.1/stack.cabal 2020-10-17 17:19:10.724179166 +0200 ++++ b/stack.cabal 2020-10-17 17:18:03.803498792 +0200 @@ -234,6 +234,7 @@ , base >=4.10 && <5 , base64-bytestring diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch index 1b5bc191b47..ef661e16b5b 100644 --- a/srcpkgs/stack/patches/ppc.patch +++ b/srcpkgs/stack/patches/ppc.patch @@ -1,5 +1,5 @@ ---- src/Stack/Setup.hs -+++ src/Stack/Setup.hs +--- a/src/Stack/Setup.hs ++++ b/src/Stack/Setup.hs @@ -95,5 +95,6 @@ import System.IO.Error (isPermissionError) import System.FilePath (searchPathSeparator) import qualified System.FilePath as FP @@ -19,8 +19,8 @@ Platform arch os -> throwM $ UnsupportedSetupCombo os arch downloadFromInfo ---- stack.cabal -+++ stack.cabal +--- a/stack.cabal ++++ b/stack.cabal @@ -235,6 +235,7 @@ library , conduit , conduit-extra diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template index 7a4ddad1a02..257aba10e50 100644 --- a/srcpkgs/stack/template +++ b/srcpkgs/stack/template @@ -17,7 +17,6 @@ checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076 skip_extraction="cabal.config-${_stackage}" nocross=yes nopie_files="/usr/bin/stack" -patch_args=-Np0 do_build() { cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/cabal.config-${_stackage} cabal.config diff --git a/srcpkgs/starplot/patches/02-fix-ftbfs-and-hrdiagram-opts.diff b/srcpkgs/starplot/patches/02-fix-ftbfs-and-hrdiagram-opts.diff index f8bcf101e09..7321f9f7051 100644 --- a/srcpkgs/starplot/patches/02-fix-ftbfs-and-hrdiagram-opts.diff +++ b/srcpkgs/starplot/patches/02-fix-ftbfs-and-hrdiagram-opts.diff @@ -4,8 +4,8 @@ Index: starplot-0.95.5/src/gui/hrdiagram.cc =================================================================== ---- src/gui/hrdiagram.cc 2008-04-10 21:14:00.000000000 +0200 -+++ src/gui/hrdiagram.cc 2012-06-26 21:16:14.000000000 +0200 +--- a/src/gui/hrdiagram.cc 2008-04-10 21:14:00.000000000 +0200 ++++ b/src/gui/hrdiagram.cc 2012-06-26 21:16:14.000000000 +0200 @@ -29,7 +29,7 @@ /* Functions to make sure the HR Diagram window stays updated */ @@ -45,8 +45,8 @@ Index: starplot-0.95.5/src/gui/hrdiagram.cc if (menubar) { Index: starplot-0.95.5/src/gui/menuops.cc =================================================================== ---- src/gui/menuops.cc 2008-04-11 20:46:31.000000000 +0200 -+++ src/gui/menuops.cc 2012-06-26 21:19:21.000000000 +0200 +--- a/src/gui/menuops.cc 2008-04-11 20:46:31.000000000 +0200 ++++ b/src/gui/menuops.cc 2012-06-26 21:19:21.000000000 +0200 @@ -305,10 +305,12 @@ { if (globals::chart_rules.StarLabels == l) return; @@ -77,8 +77,8 @@ Index: starplot-0.95.5/src/gui/menuops.cc } Index: starplot-0.95.5/src/gui/starplot.h =================================================================== ---- src/gui/starplot.h 2008-04-10 21:13:07.000000000 +0200 -+++ src/gui/starplot.h 2012-06-26 21:20:31.000000000 +0200 +--- a/src/gui/starplot.h 2008-04-10 21:13:07.000000000 +0200 ++++ b/src/gui/starplot.h 2012-06-26 21:20:31.000000000 +0200 @@ -134,6 +134,7 @@ extern GTKViewer *program_viewer; // The GTKViewer used by StarPlot extern GtkWidget *program_canvas; // The GTK_DRAWING_AREA used diff --git a/srcpkgs/starplot/patches/03-fix-ftbfs-convert.diff b/srcpkgs/starplot/patches/03-fix-ftbfs-convert.diff index 6213ec4c82a..8202ede4933 100644 --- a/srcpkgs/starplot/patches/03-fix-ftbfs-convert.diff +++ b/srcpkgs/starplot/patches/03-fix-ftbfs-convert.diff @@ -1,7 +1,7 @@ Index: starplot-0.95.5/src/convert/convert.cc =================================================================== ---- src/convert/convert.cc -+++ src/convert/convert.cc +--- a/src/convert/convert.cc ++++ b/src/convert/convert.cc @@ -49,7 +49,7 @@ void parse_star_file(istream & infile, o bool using_stdout, bool add_sun) { diff --git a/srcpkgs/starplot/patches/05-startup-crash.diff b/srcpkgs/starplot/patches/05-startup-crash.diff index cb0d35c05dc..5de87091392 100644 --- a/srcpkgs/starplot/patches/05-startup-crash.diff +++ b/srcpkgs/starplot/patches/05-startup-crash.diff @@ -10,8 +10,8 @@ https://bugs.debian.org/862065 diff --git a/src/classes/stararray.cc b/src/classes/stararray.cc index 26cc6a0..72cc856 100644 ---- src/classes/stararray.cc -+++ src/classes/stararray.cc +--- a/src/classes/stararray.cc ++++ b/src/classes/stararray.cc @@ -26,6 +26,7 @@ #define NEED_FULL_NAMES diff --git a/srcpkgs/starplot/template b/srcpkgs/starplot/template index 0c5bbe72944..ccc2232d460 100644 --- a/srcpkgs/starplot/template +++ b/srcpkgs/starplot/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="http://starplot.org/" distfiles="${homepage}downloads/${pkgname}-${version}.tar.gz" checksum=e320f141b736b3a6468e7d0c08a93961db6615e9eb4d533d554eea31c3fa845a -patch_args=-Np0 pre_build() { sed -i 's/_STRINGS_H/V_STRINGS_H/' src/classes/strings.h diff --git a/srcpkgs/stellarium/patches/indi_musl.patch b/srcpkgs/stellarium/patches/indi_musl.patch index 859c25af51b..64ca70176b9 100644 --- a/srcpkgs/stellarium/patches/indi_musl.patch +++ b/srcpkgs/stellarium/patches/indi_musl.patch @@ -1,5 +1,5 @@ ---- src/external/libindi/libs/indibase/indilogger.h 2019-06-18 16:09:33.000000000 +0200 -+++ src/external/libindi/libs/indibase/indilogger.h 2019-06-26 10:08:27.318535366 +0200 +--- a/src/external/libindi/libs/indibase/indilogger.h 2019-06-18 16:09:33.000000000 +0200 ++++ b/src/external/libindi/libs/indibase/indilogger.h 2019-06-26 10:08:27.318535366 +0200 @@ -30,7 +30,7 @@ #include #ifdef Q_OS_WIN diff --git a/srcpkgs/stellarium/template b/srcpkgs/stellarium/template index f7f61f7f2e9..188f87a3d39 100644 --- a/srcpkgs/stellarium/template +++ b/srcpkgs/stellarium/template @@ -14,4 +14,3 @@ homepage="https://stellarium.org/" distfiles="https://github.com/Stellarium/stellarium/releases/download/v${version}/stellarium-${version}.tar.gz" checksum=977fcd6776a47d34b1646727853d15968a1410c34c8ba1b3e5cfbf24b5126f13 replaces="stellarium-data>=0" -patch_args=-Np0 diff --git a/srcpkgs/stepmania/patches/flags.patch b/srcpkgs/stepmania/patches/flags.patch index ebf912e9ee2..c7ded8e0dd2 100644 --- a/srcpkgs/stepmania/patches/flags.patch +++ b/srcpkgs/stepmania/patches/flags.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2016-09-15 01:51:53.168404310 -0500 -+++ CMakeLists.txt 2016-09-15 16:00:14.326726871 -0500 +--- a/CMakeLists.txt 2016-09-15 01:51:53.168404310 -0500 ++++ b/CMakeLists.txt 2016-09-15 16:00:14.326726871 -0500 @@ -4,6 +4,11 @@ include (StepmaniaCore.cmake) diff --git a/srcpkgs/stepmania/patches/newgcc.patch b/srcpkgs/stepmania/patches/newgcc.patch index da23b59cc78..7698a266c9e 100644 --- a/srcpkgs/stepmania/patches/newgcc.patch +++ b/srcpkgs/stepmania/patches/newgcc.patch @@ -1,7 +1,7 @@ Upstream: yes https://github.com/stepmania/stepmania/commit/3f64564dd7c62a2f3d9557c1bdb8475fd953abea ---- src/MessageManager.cpp.orig -+++ src/MessageManager.cpp +--- a/src/MessageManager.cpp ++++ b/src/MessageManager.cpp @@ -207,8 +207,7 @@ void MessageManager::Unsubscribe( IMessageSubscriber* pSubscriber, MessageID m ) void MessageManager::Broadcast( Message &msg ) const @@ -12,8 +12,8 @@ https://github.com/stepmania/stepmania/commit/3f64564dd7c62a2f3d9557c1bdb8475fd9 { LOG->Trace("MESSAGEMAN:Broadcast: %s", msg.GetName().c_str()); } ---- src/StepMania.cpp.orig -+++ src/StepMania.cpp +--- a/src/StepMania.cpp ++++ b/src/StepMania.cpp @@ -1041,8 +1041,10 @@ int sm_main(int argc, char* argv[]) // This needs PREFSMAN. Dialog::Init(); diff --git a/srcpkgs/stepmania/template b/srcpkgs/stepmania/template index 0da6a45d775..07afdba93ce 100644 --- a/srcpkgs/stepmania/template +++ b/srcpkgs/stepmania/template @@ -14,7 +14,6 @@ license="MIT" homepage="http://www.stepmania.com/" distfiles="https://github.com/stepmania/stepmania/archive/v${version}.tar.gz" checksum=df79bcadd69d4ed60cf560d45386ec275181343495ffd744c3ff8f73c83d4755 -patch_args=-Np0 # Upstream has stated that only x86 hardware can meed the performance # constraints and that musl is not supported due to interop issues diff --git a/srcpkgs/stfl/patches/cross-fix.patch b/srcpkgs/stfl/patches/cross-fix.patch index 7c418d36baa..d4dfd1a4c9f 100644 --- a/srcpkgs/stfl/patches/cross-fix.patch +++ b/srcpkgs/stfl/patches/cross-fix.patch @@ -1,5 +1,5 @@ ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -20,9 +20,8 @@ include Makefile.cfg diff --git a/srcpkgs/stfl/patches/stfl-void.patch b/srcpkgs/stfl/patches/stfl-void.patch index 1458285e9d8..8221e88541e 100644 --- a/srcpkgs/stfl/patches/stfl-void.patch +++ b/srcpkgs/stfl/patches/stfl-void.patch @@ -1,6 +1,6 @@ diff -rupN Makefile.cfg Makefile.cfg ---- Makefile.cfg 2009-05-31 13:20:39.000000000 -0500 -+++ Makefile.cfg 2014-11-13 22:42:41.460682486 -0600 +--- a/Makefile.cfg 2009-05-31 13:20:39.000000000 -0500 ++++ b/Makefile.cfg 2014-11-13 22:42:41.460682486 -0600 @@ -19,11 +19,11 @@ # @@ -39,8 +39,8 @@ diff -rupN Makefile.cfg Makefile.cfg FOUND_RUBY = 0 endif diff -rupN stfl_internals.h stfl_internals.h ---- stfl_internals.h 2014-04-25 06:36:07.000000000 -0500 -+++ stfl_internals.h 2014-11-13 22:41:38.413685526 -0600 +--- a/stfl_internals.h 2014-04-25 06:36:07.000000000 -0500 ++++ b/stfl_internals.h 2014-11-13 22:41:38.413685526 -0600 @@ -28,7 +28,7 @@ extern "C" { #endif diff --git a/srcpkgs/stfl/template b/srcpkgs/stfl/template index f38cd252e8a..0d970c9d2c2 100644 --- a/srcpkgs/stfl/template +++ b/srcpkgs/stfl/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="http://www.clifford.at/stfl/" distfiles="http://www.clifford.at/${pkgname}/${pkgname}-${version}.tar.gz" checksum=d4a7aa181a475aaf8a8914a8ccb2a7ff28919d4c8c0f8a061e17a0c36869c090 -patch_args=-Np0 post_install() { ln -sf libstfl.so.${version} ${DESTDIR}/usr/lib/libstfl.so.0 diff --git a/srcpkgs/stk/patches/lib-include-dir.patch b/srcpkgs/stk/patches/lib-include-dir.patch index 50fb53a77cc..8c0901b2c97 100644 --- a/srcpkgs/stk/patches/lib-include-dir.patch +++ b/srcpkgs/stk/patches/lib-include-dir.patch @@ -1,5 +1,5 @@ ---- src/Makefile.in.orig 2021-01-18 20:34:19.338872822 +0700 -+++ src/Makefile.in 2021-01-18 20:35:11.314028147 +0700 +--- a/src/Makefile.in 2021-01-18 20:34:19.338872822 +0700 ++++ b/src/Makefile.in 2021-01-18 20:35:11.314028147 +0700 @@ -93,13 +93,13 @@ $(LN) -s @sharedname@ $(SHAREDLIB) diff --git a/srcpkgs/stk/template b/srcpkgs/stk/template index d0eecb39a8f..42b5918ced6 100644 --- a/srcpkgs/stk/template +++ b/srcpkgs/stk/template @@ -16,7 +16,6 @@ license="custom:MIT-like" homepage="https://ccrma.stanford.edu/software/stk/" distfiles="https://github.com/thestk/stk/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=8e0c362dd82421bae8f3e789d238a1c27aeac1a2697d7830eb51abc90fc17281 -patch_args=-Np0 pre_configure() { NOCONFIGURE=1 autoreconf -fi diff --git a/srcpkgs/stlink/patches/01-install-pkgconfig-files-again.patch b/srcpkgs/stlink/patches/01-install-pkgconfig-files-again.patch index 08ff4a1ad12..238387c6e90 100644 --- a/srcpkgs/stlink/patches/01-install-pkgconfig-files-again.patch +++ b/srcpkgs/stlink/patches/01-install-pkgconfig-files-again.patch @@ -9,8 +9,8 @@ Subject: [PATCH] CMakeLists.txt: Install pkgconfig files again diff --git a/CMakeLists.txt b/CMakeLists.txt index 86282775..60f9087d 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -49,7 +49,7 @@ find_package(libusb REQUIRED) ## Package configuration (pkg-config) on unix-based systems diff --git a/srcpkgs/stlink/patches/02-enable-cross-gtk.patch b/srcpkgs/stlink/patches/02-enable-cross-gtk.patch index c31ab28ad6a..b4f461ee523 100644 --- a/srcpkgs/stlink/patches/02-enable-cross-gtk.patch +++ b/srcpkgs/stlink/patches/02-enable-cross-gtk.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -48,7 +48,7 @@ find_package(libusb REQUIRED) diff --git a/srcpkgs/stlink/patches/03-dont-link-ssp-as-static.patch b/srcpkgs/stlink/patches/03-dont-link-ssp-as-static.patch index fb9dd61deac..a5c79c2abd3 100644 --- a/srcpkgs/stlink/patches/03-dont-link-ssp-as-static.patch +++ b/srcpkgs/stlink/patches/03-dont-link-ssp-as-static.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -71,7 +71,7 @@ CHECK_LIBRARY_EXISTS(ssp __stack_chk_fail "" _stack_chk_fail_exists) diff --git a/srcpkgs/stlink/patches/04-fix-paths.patch b/srcpkgs/stlink/patches/04-fix-paths.patch index 18aeca2fabc..c6fb69b8908 100644 --- a/srcpkgs/stlink/patches/04-fix-paths.patch +++ b/srcpkgs/stlink/patches/04-fix-paths.patch @@ -11,8 +11,8 @@ On Unix-like operating systems man pages are commonly installed to diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt index 23da9e15..9b3c5076 100644 ---- doc/man/CMakeLists.txt -+++ doc/man/CMakeLists.txt +--- a/doc/man/CMakeLists.txt ++++ b/doc/man/CMakeLists.txt @@ -30,7 +30,7 @@ foreach (manpage ${MANPAGES}) endif () @@ -40,8 +40,8 @@ They should be installed directly to diff --git a/src/stlink-gui/CMakeLists.txt b/src/stlink-gui/CMakeLists.txt index 8c36e5a1..cc68509f 100644 ---- src/stlink-gui/CMakeLists.txt -+++ src/stlink-gui/CMakeLists.txt +--- a/src/stlink-gui/CMakeLists.txt ++++ b/src/stlink-gui/CMakeLists.txt @@ -13,11 +13,11 @@ if (NOT WIN32) # Install desktop application entry diff --git a/srcpkgs/stlink/patches/05-musl.patch b/srcpkgs/stlink/patches/05-musl.patch index 2f13cc42d73..3ae0543eed9 100644 --- a/srcpkgs/stlink/patches/05-musl.patch +++ b/srcpkgs/stlink/patches/05-musl.patch @@ -1,5 +1,5 @@ ---- src/st-util/gdb-remote.c.orig -+++ src/st-util/gdb-remote.c +--- a/src/st-util/gdb-remote.c ++++ b/src/st-util/gdb-remote.c @@ -13,7 +13,7 @@ #include #else diff --git a/srcpkgs/stlink/template b/srcpkgs/stlink/template index e6b504938b5..06f39a7cf25 100644 --- a/srcpkgs/stlink/template +++ b/srcpkgs/stlink/template @@ -14,7 +14,6 @@ homepage="https://github.com/texane/stlink" changelog="https://raw.githubusercontent.com/texane/stlink/master/CHANGELOG.md" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=ca9a640f84c3e2c9873bd51759594bc05c00cdf6e1f21b434ae2c0e7985433d8 -patch_args=-Np0 post_install() { vlicense LICENSE.md LICENSE diff --git a/srcpkgs/stockfish/patches/makefile.patch b/srcpkgs/stockfish/patches/makefile.patch index b5fc75e7a0a..b822443bc11 100644 --- a/srcpkgs/stockfish/patches/makefile.patch +++ b/srcpkgs/stockfish/patches/makefile.patch @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2020-09-02 21:19:30.000000000 +0700 -+++ src/Makefile 2021-01-14 18:51:25.852600109 +0700 +--- a/src/Makefile 2020-09-02 21:19:30.000000000 +0700 ++++ b/src/Makefile 2021-01-14 18:51:25.852600109 +0700 @@ -306,26 +306,7 @@ ifeq ($(COMP),gcc) diff --git a/srcpkgs/stockfish/template b/srcpkgs/stockfish/template index 24ccc14fa43..1749c9c3692 100644 --- a/srcpkgs/stockfish/template +++ b/srcpkgs/stockfish/template @@ -18,7 +18,6 @@ distfiles="https://github.com/official-stockfish/Stockfish/archive/sf_${version} checksum="15d14721b3be17c597535bdbb44fb951a1ee948312d90fbf55fa0e52b8b81d62 62ef826d1a6d11b9e814188025aa02a60815c037292e0ef9bbb9bf4f724e5e63" skip_extraction="${_net_file}" -patch_args=-Np0 LDFLAGS+="-lpthread -Wl,-z,stack-size=2097152" diff --git a/srcpkgs/strawberry/patches/less-log-spam.patch b/srcpkgs/strawberry/patches/less-log-spam.patch index 5cf85ad5fcd..ffe5e3802f9 100644 --- a/srcpkgs/strawberry/patches/less-log-spam.patch +++ b/srcpkgs/strawberry/patches/less-log-spam.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2021-04-14 16:59:00.905391095 +0200 -+++ - 2021-04-29 21:22:05.347050684 +0200 +--- a/CMakeLists.txt 2021-04-14 16:59:00.905391095 +0200 ++++ b/CMakeLists.txt 2021-04-14 16:59:00.905391095 +0200 @@ -50,7 +50,6 @@ -Winit-self -Wmissing-include-dirs diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template index 1d51eaf7fc2..35828b1e3c2 100644 --- a/srcpkgs/strawberry/template +++ b/srcpkgs/strawberry/template @@ -14,7 +14,6 @@ license="GPL-3.0-or-later" homepage="https://www.strawberrymusicplayer.org/" distfiles="https://files.strawberrymusicplayer.org/${pkgname}-${version}.tar.xz" checksum=0fe9c38c4d1e2f10c1130dbd87ea6e740bef729fe78820a84ffabe524a80c83e -patch_args=-Np0 build_options="qt6" build_options_default="" diff --git a/srcpkgs/streamripper/patches/musl-fix.patch b/srcpkgs/streamripper/patches/musl-fix.patch index c9579d5ad58..fe4a49e87f9 100644 --- a/srcpkgs/streamripper/patches/musl-fix.patch +++ b/srcpkgs/streamripper/patches/musl-fix.patch @@ -1,5 +1,5 @@ ---- lib/ripstream.c -+++ lib/ripstream.c +--- a/lib/ripstream.c ++++ b/lib/ripstream.c @@ -714,7 +714,7 @@ char bigbuf[HEADER_SIZE] = ""; ID3V2frame id3v2frame; diff --git a/srcpkgs/streamripper/template b/srcpkgs/streamripper/template index d08ed26d3a4..8530d816be1 100644 --- a/srcpkgs/streamripper/template +++ b/srcpkgs/streamripper/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="http://streamripper.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=c1d75f2e9c7b38fd4695be66eff4533395248132f3cc61f375196403c4d8de42 -patch_args=-Np0 diff --git a/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch index 878dbb19b92..c452e1c899f 100644 --- a/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch +++ b/srcpkgs/stress-ng/patches/disable-linux52-syscalls.patch @@ -7,8 +7,8 @@ build. Glibc is fine because it uses syscall numbers from these kernel headers instead of defining its own. ---- core-shim.c -+++ core-shim.c +--- a/core-shim.c ++++ b/core-shim.c @@ -24,6 +24,19 @@ */ #include "stress-ng.h" @@ -29,8 +29,8 @@ instead of defining its own. /* * Various shim abstraction wrappers around systems calls and * GCC helper functions that may not be supported by some ---- stress-ramfs.c -+++ stress-ramfs.c +--- a/stress-ramfs.c ++++ b/stress-ramfs.c @@ -24,6 +24,19 @@ */ #include "stress-ng.h" diff --git a/srcpkgs/stress-ng/patches/ppc64-glibc-be-no-vecmath.patch b/srcpkgs/stress-ng/patches/ppc64-glibc-be-no-vecmath.patch index 0228d9fd29a..7da6604ff57 100644 --- a/srcpkgs/stress-ng/patches/ppc64-glibc-be-no-vecmath.patch +++ b/srcpkgs/stress-ng/patches/ppc64-glibc-be-no-vecmath.patch @@ -1,7 +1,7 @@ On big endian ppc64 glibc specifically, this causes ICEs. ---- stress-vecmath.c -+++ stress-vecmath.c +--- a/stress-vecmath.c ++++ b/stress-vecmath.c @@ -53,6 +53,11 @@ static const help_t help[] = { #undef HAVE_VECMATH #endif diff --git a/srcpkgs/stress-ng/template b/srcpkgs/stress-ng/template index 5610d73a24c..97cfd9cf39c 100644 --- a/srcpkgs/stress-ng/template +++ b/srcpkgs/stress-ng/template @@ -10,4 +10,3 @@ license="GPL-2.0-or-later" homepage="http://kernel.ubuntu.com/~cking/stress-ng/" distfiles="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${pkgname}-${version}.tar.xz" checksum=bd167b6559fa8a28680371b1defd3ffe2344eb550129d58dd7d5e2d568f2786e -patch_args=-Np0 diff --git a/srcpkgs/subversion-kwallet-auth/patches/cross.patch b/srcpkgs/subversion-kwallet-auth/patches/cross.patch deleted file mode 120000 index aae573525b1..00000000000 --- a/srcpkgs/subversion-kwallet-auth/patches/cross.patch +++ /dev/null @@ -1 +0,0 @@ -../../subversion/patches/cross.patch \ No newline at end of file diff --git a/srcpkgs/subversion-kwallet-auth/patches/cross.patch b/srcpkgs/subversion-kwallet-auth/patches/cross.patch new file mode 100644 index 00000000000..80a265a91dc --- /dev/null +++ b/srcpkgs/subversion-kwallet-auth/patches/cross.patch @@ -0,0 +1,26 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -56,8 +56,6 @@ + SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ + SVN_LZ4_LIBS = @SVN_LZ4_LIBS@ + SVN_UTF8PROC_LIBS = @SVN_UTF8PROC_LIBS@ +-SVN_MACOS_PLIST_LIBS = @SVN_MACOS_PLIST_LIBS@ +-SVN_MACOS_KEYCHAIN_LIBS = @SVN_MACOS_KEYCHAIN_LIBS@ + + LIBS = @LIBS@ + +--- a/configure.ac ++++ b/configure.ac +@@ -479,12 +479,6 @@ + [Defined if Cyrus SASL v2 is present on the system]) + fi + +-dnl Mac OS specific features ------------------- +- +-SVN_LIB_MACHO_ITERATE +-SVN_LIB_MACOS_PLIST +-SVN_LIB_MACOS_KEYCHAIN +- + dnl APR_HAS_DSO ------------------- + + AC_MSG_CHECKING([whether APR has support for DSOs]) diff --git a/srcpkgs/subversion-kwallet-auth/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch b/srcpkgs/subversion-kwallet-auth/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch deleted file mode 120000 index 98bf34f3ed2..00000000000 --- a/srcpkgs/subversion-kwallet-auth/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch +++ /dev/null @@ -1 +0,0 @@ -../../subversion/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch \ No newline at end of file diff --git a/srcpkgs/subversion-kwallet-auth/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch b/srcpkgs/subversion-kwallet-auth/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch new file mode 100644 index 00000000000..62733f2aac8 --- /dev/null +++ b/srcpkgs/subversion-kwallet-auth/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in 2011-07-16 13:50:53.000000000 +0200 ++++ b/Makefile.in 2012-03-11 12:13:57.000000000 +0100 +@@ -732,7 +732,7 @@ + extraclean-swig-headers: clean-swig-headers + $(EXTRACLEAN_SWIG_HEADERS) + +-$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in ++$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl + ./config.status subversion/bindings/swig/perl/native/Makefile.PL + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL diff --git a/srcpkgs/subversion-kwallet-auth/template b/srcpkgs/subversion-kwallet-auth/template index 00ad190384b..12210f250d5 100644 --- a/srcpkgs/subversion-kwallet-auth/template +++ b/srcpkgs/subversion-kwallet-auth/template @@ -24,7 +24,6 @@ changelog="https://subversion.apache.org/docs/release-notes/${version%.*}.html" distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2" checksum=2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9 lib32disabled=yes -patch_args=-Np0 pre_configure() { # Based on native build values diff --git a/srcpkgs/subversion/patches/cross.patch b/srcpkgs/subversion/patches/cross.patch index 54aa0a49fd7..80a265a91dc 100644 --- a/srcpkgs/subversion/patches/cross.patch +++ b/srcpkgs/subversion/patches/cross.patch @@ -1,5 +1,5 @@ ---- Makefile.in -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -56,8 +56,6 @@ SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@ SVN_LZ4_LIBS = @SVN_LZ4_LIBS@ @@ -9,8 +9,8 @@ LIBS = @LIBS@ ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -479,12 +479,6 @@ [Defined if Cyrus SASL v2 is present on the system]) fi diff --git a/srcpkgs/subversion/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch b/srcpkgs/subversion/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch index 225432075b9..62733f2aac8 100644 --- a/srcpkgs/subversion/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch +++ b/srcpkgs/subversion/patches/subversion-fix-parallel-build-support-for-perl-bindings.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2011-07-16 13:50:53.000000000 +0200 -+++ Makefile.in 2012-03-11 12:13:57.000000000 +0100 +--- a/Makefile.in 2011-07-16 13:50:53.000000000 +0200 ++++ b/Makefile.in 2012-03-11 12:13:57.000000000 +0100 @@ -732,7 +732,7 @@ extraclean-swig-headers: clean-swig-headers $(EXTRACLEAN_SWIG_HEADERS) diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index 70b4cedbfa6..e10c80ec8b1 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -22,7 +22,6 @@ homepage="http://subversion.apache.org/" changelog="https://subversion.apache.org/docs/release-notes/${version%.*}.html" distfiles="http://apache.uvigo.es/subversion/subversion-${version}.tar.bz2" checksum=2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9 -patch_args=-Np0 pre_configure() { # Based on native build values diff --git a/srcpkgs/sudo/patches/install_perms.patch b/srcpkgs/sudo/patches/install_perms.patch index bc7b8623587..ba1c3e8ff96 100644 --- a/srcpkgs/sudo/patches/install_perms.patch +++ b/srcpkgs/sudo/patches/install_perms.patch @@ -1,5 +1,5 @@ ---- scripts/install-sh.orig 2011-01-13 10:34:38.853561570 +0100 -+++ scripts/install-sh 2011-01-13 10:35:04.468525074 +0100 +--- a/scripts/install-sh 2011-01-13 10:34:38.853561570 +0100 ++++ b/scripts/install-sh 2011-01-13 10:35:04.468525074 +0100 @@ -91,7 +91,6 @@ while ${MORETODO} ; do X-G) GROUP="$2" diff --git a/srcpkgs/sudo/patches/mksigname-for-host.patch b/srcpkgs/sudo/patches/mksigname-for-host.patch index 2021df4f9a9..bde2d267a19 100644 --- a/srcpkgs/sudo/patches/mksigname-for-host.patch +++ b/srcpkgs/sudo/patches/mksigname-for-host.patch @@ -1,5 +1,5 @@ ---- lib/util/Makefile.in.orig 2015-07-17 07:53:22.343559193 +0200 -+++ lib/util/Makefile.in 2015-07-17 07:53:47.419297775 +0200 +--- a/lib/util/Makefile.in 2015-07-17 07:53:22.343559193 +0200 ++++ b/lib/util/Makefile.in 2015-07-17 07:53:47.419297775 +0200 @@ -160,10 +160,10 @@ signame.c: mksigname ./mksigname > $@ diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index cae14ef1cf4..f70418dd6b7 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -18,7 +18,6 @@ distfiles="https://www.sudo.ws/dist/sudo-${version}.tar.gz" checksum=2bbe7c2d6699b84d950ef9a43f09d4d967b8bc244b73bc095c4202068ddbe549 conf_files="/etc/pam.d/sudo /etc/sudoers" lib32disabled=yes -patch_args=-Np0 post_configure() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/sudoku/patches/musl-file.patch b/srcpkgs/sudoku/patches/musl-file.patch index a9e2470f027..58b9505ca41 100644 --- a/srcpkgs/sudoku/patches/musl-file.patch +++ b/srcpkgs/sudoku/patches/musl-file.patch @@ -1,5 +1,5 @@ ---- sudoku.c 2015-03-13 16:20:28.000000000 +0100 -+++ sudoku.c 2017-12-22 19:44:59.484598329 +0100 +--- a/sudoku.c 2015-03-13 16:20:28.000000000 +0100 ++++ b/sudoku.c 2017-12-22 19:44:59.484598329 +0100 @@ -369,7 +369,8 @@ static int opt_solve = 0; static int opt_restrict = 0; diff --git a/srcpkgs/sudoku/template b/srcpkgs/sudoku/template index a863e9f84bd..606bdd9557c 100644 --- a/srcpkgs/sudoku/template +++ b/srcpkgs/sudoku/template @@ -10,7 +10,6 @@ license="Public Domain" homepage="https://github.com/cinemast/sudoku" distfiles="https://github.com/cinemast/sudoku/archive/v${version}.tar.gz" checksum=3ce6d9b237546d4ac7cdb7a6bb0e47d5c99e696a710b8935bce40dc706d32ff2 -patch_args=-Np0 do_install() { vbin sudoku diff --git a/srcpkgs/sunxi-tools/patches/include_getopt.patch b/srcpkgs/sunxi-tools/patches/include_getopt.patch index 6bc79cf8565..5ea23d98d07 100644 --- a/srcpkgs/sunxi-tools/patches/include_getopt.patch +++ b/srcpkgs/sunxi-tools/patches/include_getopt.patch @@ -1,5 +1,5 @@ ---- fexc.c 2015-02-26 21:35:40.000000000 +0100 -+++ fexc.c 2015-11-27 13:31:52.663341582 +0100 +--- a/fexc.c 2015-02-26 21:35:40.000000000 +0100 ++++ b/fexc.c 2015-11-27 13:31:52.663341582 +0100 @@ -25,6 +25,7 @@ #include #include diff --git a/srcpkgs/sunxi-tools/template b/srcpkgs/sunxi-tools/template index e88e962b593..f4f547c7947 100644 --- a/srcpkgs/sunxi-tools/template +++ b/srcpkgs/sunxi-tools/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/linux-sunxi/sunxi-tools" distfiles="$homepage/archive/$_commit.tar.gz" checksum=93922d654df5153d468b0f7900f96fe858fe457894ff2dd0f5dfb5c94b65475b -patch_args=-Np0 CFLAGS="-std=c99 -I./include" diff --git a/srcpkgs/supercollider/patches/musl-implement-correct-xsi.patch b/srcpkgs/supercollider/patches/musl-implement-correct-xsi.patch index aa08a4ed374..cb85fbf7717 100644 --- a/srcpkgs/supercollider/patches/musl-implement-correct-xsi.patch +++ b/srcpkgs/supercollider/patches/musl-implement-correct-xsi.patch @@ -1,5 +1,5 @@ ---- external_libraries/link/modules/asio-standalone/asio/include/asio/impl/error_code.ipp.orig 2020-10-26 23:22:21.954194075 +0700 -+++ external_libraries/link/modules/asio-standalone/asio/include/asio/impl/error_code.ipp 2020-10-26 23:25:46.716820740 +0700 +--- a/external_libraries/link/modules/asio-standalone/asio/include/asio/impl/error_code.ipp 2020-10-26 23:22:21.954194075 +0700 ++++ b/external_libraries/link/modules/asio-standalone/asio/include/asio/impl/error_code.ipp 2020-10-26 23:25:46.716820740 +0700 @@ -106,9 +106,14 @@ using namespace std; strerror_r(value, buf, sizeof(buf)); diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index 421b50cf8aa..c7a878f91c0 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -18,7 +18,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/supercollider/supercollider" distfiles="https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2" checksum=2dd2f8179a55de4735ac940e2e2d0df4e68cc3a33172628e4dd99ae89c74856b -patch_args=-Np0 export CMAKE_GENERATOR="Unix Makefiles" diff --git a/srcpkgs/supertux2/patches/locale.patch b/srcpkgs/supertux2/patches/locale.patch index ca3dfb74923..ffe38ae8a26 100644 --- a/srcpkgs/supertux2/patches/locale.patch +++ b/srcpkgs/supertux2/patches/locale.patch @@ -8,8 +8,8 @@ Date: Wed Dec 9 16:22:22 2020 -0300 diff --git src/supertux/main.cpp src/supertux/main.cpp index ad5e3fde6..c33627e18 100644 ---- src/supertux/main.cpp -+++ src/supertux/main.cpp +--- a/src/supertux/main.cpp ++++ b/src/supertux/main.cpp @@ -563,10 +563,19 @@ Main::run(int argc, char** argv) _wfreopen(w_errpath.c_str(), L"a", stderr); #endif diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template index 75b6b37e3db..4c39b458dad 100644 --- a/srcpkgs/supertux2/template +++ b/srcpkgs/supertux2/template @@ -20,6 +20,5 @@ homepage="https://supertux.github.io/" distfiles="https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz" checksum=26a9e56ea2d284148849f3239177d777dda5b675a10ab2d76ee65854c91ff598 replaces="supertux2-data>=0" -patch_args=-Np0 export CMAKE_GENERATOR="Unix Makefiles" diff --git a/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch b/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch index eee9f9efb54..18dd7a6ef9c 100644 --- a/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch +++ b/srcpkgs/supertuxkart/patches/61833c9c26da5520f2eaa02f2458971ba07f2aad.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Fix compilation with latest SDL diff --git src/input/gamepad_config.cpp src/input/gamepad_config.cpp index 7c6f632099..c060e7a5a7 100644 ---- src/input/gamepad_config.cpp -+++ src/input/gamepad_config.cpp +--- a/src/input/gamepad_config.cpp ++++ b/src/input/gamepad_config.cpp @@ -32,8 +32,7 @@ #include "input/sdl_controller.hpp" #include diff --git a/srcpkgs/supertuxkart/patches/ns_name_ntop.patch b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch index 24d4555c5d5..d251deaa15a 100644 --- a/srcpkgs/supertuxkart/patches/ns_name_ntop.patch +++ b/srcpkgs/supertuxkart/patches/ns_name_ntop.patch @@ -4,8 +4,8 @@ Necessary because musl does not (yet?) implement ns_name_ntop. diff --git a/src/network/network_config.cpp b/src/network/network_config.cpp index 605254808..fd4fd5d24 100644 ---- src/network/network_config.cpp -+++ src/network/network_config.cpp +--- a/src/network/network_config.cpp ++++ b/src/network/network_config.cpp @@ -587,7 +587,7 @@ void NetworkConfig::fillStunList(std::vector >* l, for (unsigned i = 0; i < srv.size(); i++) { diff --git a/srcpkgs/supertuxkart/template b/srcpkgs/supertuxkart/template index aa4734caa91..519bc615782 100644 --- a/srcpkgs/supertuxkart/template +++ b/srcpkgs/supertuxkart/template @@ -17,7 +17,6 @@ license="GPL-3.0-or-later" homepage="https://supertuxkart.net" distfiles="https://github.com/${pkgname}/stk-code/releases/download/${version}/SuperTuxKart-${version}-src.tar.xz" checksum=052edf0afdbeb99583fe8676fb0ab80ecb6103fb88b7540f858d1b5fa1297d37 -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/sutils/patches/getopt-unsigned-char.patch b/srcpkgs/sutils/patches/getopt-unsigned-char.patch index 61aa27f1917..2218cd36712 100644 --- a/srcpkgs/sutils/patches/getopt-unsigned-char.patch +++ b/srcpkgs/sutils/patches/getopt-unsigned-char.patch @@ -14,8 +14,8 @@ Subject: [PATCH] Change opt char to int for armv7 compatability diff --git a/battery.c b/battery.c index 5cc45b4..20307e5 100644 ---- battery.c -+++ battery.c +--- a/battery.c ++++ b/battery.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]) int interval = INTERVAL; bool snoop = false; @@ -27,8 +27,8 @@ index 5cc45b4..20307e5 100644 case 'h': diff --git a/clock.c b/clock.c index 0847787..e2c0530 100644 ---- clock.c -+++ clock.c +--- a/clock.c ++++ b/clock.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) int interval = INTERVAL; bool snoop = false; @@ -40,8 +40,8 @@ index 0847787..e2c0530 100644 case 'h': diff --git a/essid.c b/essid.c index 2143556..4a768f0 100644 ---- essid.c -+++ essid.c +--- a/essid.c ++++ b/essid.c @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) char *interface = INTERFACE; bool snoop = false; @@ -53,8 +53,8 @@ index 2143556..4a768f0 100644 case 'h': diff --git a/exist.c b/exist.c index 27fdfca..3de5eb8 100644 ---- exist.c -+++ exist.c +--- a/exist.c ++++ b/exist.c @@ -14,7 +14,7 @@ void check_file(char *pth, bool inv) { } @@ -66,8 +66,8 @@ index 27fdfca..3de5eb8 100644 while ((opt = getopt(argc, argv, "hv")) != -1) { diff --git a/temp.c b/temp.c index 98ab33e..e93bc74 100644 ---- temp.c -+++ temp.c +--- a/temp.c ++++ b/temp.c @@ -38,7 +38,7 @@ int main(int argc, char *argv[]) int interval = INTERVAL; bool snoop = false; @@ -79,8 +79,8 @@ index 98ab33e..e93bc74 100644 case 'h': diff --git a/volume.c b/volume.c index 32e186a..8117279 100644 ---- volume.c -+++ volume.c +--- a/volume.c ++++ b/volume.c @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) int interval = INTERVAL; bool snoop = false; diff --git a/srcpkgs/sutils/template b/srcpkgs/sutils/template index 6ecc796f206..640b14ce66d 100644 --- a/srcpkgs/sutils/template +++ b/srcpkgs/sutils/template @@ -10,7 +10,6 @@ license="Unlicense" homepage="https://github.com/baskerville/sutils/" distfiles="https://github.com/baskerville/sutils/archive/${version}.tar.gz" checksum=da8cccace32094430be572cf59d85256023edf9107b12c926c7beb29586c56a3 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/sway/patches/primary_selection.diff b/srcpkgs/sway/patches/primary_selection.diff index e1f02fa0ee2..5ca2b0e14d6 100644 --- a/srcpkgs/sway/patches/primary_selection.diff +++ b/srcpkgs/sway/patches/primary_selection.diff @@ -5,8 +5,8 @@ this feature on sway. https://github.com/swaywm/sway/pull/5788 https://github.com/swaywm/wlroots/issues/2421 https://github.com/swaywm/wlroots/pull/2460 ---- sway/server.c -+++ sway/server.c +--- a/sway/server.c ++++ b/sway/server.c @@ -15,6 +15,7 @@ #include #include diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template index dd880002893..4a77658518e 100644 --- a/srcpkgs/sway/template +++ b/srcpkgs/sway/template @@ -15,7 +15,6 @@ license="MIT" homepage="https://swaywm.org" distfiles="https://github.com/swaywm/${pkgname}/archive/${version}.tar.gz" checksum=9ecfd2f38239f7e90922a13cd348fc95fc059e8fa0e4b75b8ffcc7b61685a5fb -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/swell-foop/patches/fix-vala-array.patch b/srcpkgs/swell-foop/patches/fix-vala-array.patch index 9ecaaefeb23..8231b5ce8a7 100644 --- a/srcpkgs/swell-foop/patches/fix-vala-array.patch +++ b/srcpkgs/swell-foop/patches/fix-vala-array.patch @@ -1,5 +1,5 @@ ---- src/game-view.vala 2019-10-15 12:48:06.000000000 +0200 -+++ src/game-view.vala 2020-11-04 11:56:58.582438926 +0100 +--- a/src/game-view.vala 2019-10-15 12:48:06.000000000 +0200 ++++ b/src/game-view.vala 2020-11-04 11:56:58.582438926 +0100 @@ -354,7 +354,7 @@ public Theme (string name) { diff --git a/srcpkgs/swell-foop/template b/srcpkgs/swell-foop/template index 45a2532e3c1..afb8dd466c3 100644 --- a/srcpkgs/swell-foop/template +++ b/srcpkgs/swell-foop/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Swell%20Foop" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=61c6b6ff9047c00bdc0dbe11a880058a5462921c702123a2d6d1a652bbbe6280 -patch_args=-Np0 diff --git a/srcpkgs/swiften/patches/boost-logic-tribool-io.patch b/srcpkgs/swiften/patches/boost-logic-tribool-io.patch index 9c2aa4fe093..a36fe783e05 100644 --- a/srcpkgs/swiften/patches/boost-logic-tribool-io.patch +++ b/srcpkgs/swiften/patches/boost-logic-tribool-io.patch @@ -1,5 +1,5 @@ ---- Swiften/Network/PlatformNATTraversalWorker.cpp.orig 2020-10-24 22:55:12.152288582 +0700 -+++ Swiften/Network/PlatformNATTraversalWorker.cpp 2020-10-24 22:55:31.022346592 +0700 +--- a/Swiften/Network/PlatformNATTraversalWorker.cpp 2020-10-24 22:55:12.152288582 +0700 ++++ b/Swiften/Network/PlatformNATTraversalWorker.cpp 2020-10-24 22:55:31.022346592 +0700 @@ -14,6 +14,7 @@ #include diff --git a/srcpkgs/swiften/patches/fix-cross-build.patch b/srcpkgs/swiften/patches/fix-cross-build.patch index 72dc820c884..906e60ce07d 100644 --- a/srcpkgs/swiften/patches/fix-cross-build.patch +++ b/srcpkgs/swiften/patches/fix-cross-build.patch @@ -1,5 +1,5 @@ ---- 3rdParty/LibMiniUPnPc/SConscript.orig 2016-09-07 10:29:12.251340787 +0200 -+++ 3rdParty/LibMiniUPnPc/SConscript 2016-09-07 10:29:49.165342691 +0200 +--- a/3rdParty/LibMiniUPnPc/SConscript 2016-09-07 10:29:12.251340787 +0200 ++++ b/3rdParty/LibMiniUPnPc/SConscript 2016-09-07 10:29:49.165342691 +0200 @@ -46,11 +46,11 @@ if myenv["PLATFORM"] == "win32": myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"]) diff --git a/srcpkgs/swiften/patches/fix-gcc8.patch b/srcpkgs/swiften/patches/fix-gcc8.patch index f7522ea2e01..3985438af22 100644 --- a/srcpkgs/swiften/patches/fix-gcc8.patch +++ b/srcpkgs/swiften/patches/fix-gcc8.patch @@ -1,5 +1,5 @@ ---- Sluift/main.cpp -+++ Sluift/main.cpp +--- a/Sluift/main.cpp ++++ b/Sluift/main.cpp @@ -20,6 +20,7 @@ #include #include diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template index f549e1abcb4..969ef1eb5d7 100644 --- a/srcpkgs/swiften/template +++ b/srcpkgs/swiften/template @@ -12,7 +12,6 @@ license="GPL-3.0-only" homepage="http://swift.im/" distfiles="http://swift.im/git/swift/snapshot/swift-${version}.tar.bz2" checksum=6a3f93e807afb51f1b8ab6ec8fef379dfcc50ba71fef6abeee7c123348da66b0 -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch index fa2a534e4f1..48eb8948a64 100644 --- a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch +++ b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch @@ -1,5 +1,5 @@ ---- src/CUPSNotifier.vala 2018-11-28 12:34:33.000000000 +0100 -+++ src/CUPSNotifier.vala 2021-01-29 19:26:11.191992396 +0100 +--- a/src/CUPSNotifier.vala 2018-11-28 12:34:33.000000000 +0100 ++++ b/src/CUPSNotifier.vala 2021-01-29 19:26:11.191992396 +0100 @@ -63,7 +63,7 @@ Bus.get_proxy.begin (BusType.SYSTEM, "org.cups.cupsd.Notifier", "/org/cups/cupsd/Notifier", GLib.DBusProxyFlags.NONE, null, (obj, res) => { try { diff --git a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch b/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch index 94710efc71b..e8e21e2c484 100644 --- a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch +++ b/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch @@ -10,8 +10,8 @@ Fixed bug with compilation diff --git a/vapi/cups.vapi b/vapi/cups.vapi index 7f1b795..5dcdba6 100644 ---- vapi/cups.vapi -+++ vapi/cups.vapi +--- a/vapi/cups.vapi ++++ b/vapi/cups.vapi @@ -605,7 +605,7 @@ namespace CUPS { [CCode (cname = "ippAddBooleans")] private unowned Attribute _add_booleans (Tag group, string name, [CCode (array_length_pos = 0.9)] char[] values); diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template index 76c235fbda5..caecd10c886 100644 --- a/srcpkgs/switchboard-plug-printers/template +++ b/srcpkgs/switchboard-plug-printers/template @@ -12,4 +12,3 @@ license="GPL-3.0-or-later" homepage="https://github.com/elementary/${pkgname}" distfiles="${homepage}/archive/${version}.tar.gz" checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442 -patch_args=-Np0 diff --git a/srcpkgs/sword/patches/ppc64.patch b/srcpkgs/sword/patches/ppc64.patch index 2ef8e02e84d..d6858746493 100644 --- a/srcpkgs/sword/patches/ppc64.patch +++ b/srcpkgs/sword/patches/ppc64.patch @@ -4,8 +4,8 @@ Subject: powerpc64 can define __s64 differently Index: sword/include/sysdata.h =================================================================== ---- include/sysdata.h -+++ include/sysdata.h +--- a/include/sysdata.h ++++ b/include/sysdata.h @@ -42,8 +42,13 @@ typedef unsigned int __u32; #ifdef OS_ANDROID diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template index 15a4213b6d5..13240a99316 100644 --- a/srcpkgs/sword/template +++ b/srcpkgs/sword/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="https://crosswire.org/sword/index.jsp" distfiles="https://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-${version}.tar.gz" checksum=ce9aa8f721a737f406115d35ff438bd07c829fce1605f0d6dcdabc4318bc5e93 -patch_args=-Np0 CXXFLAGS=' -DU_USING_ICU_NAMESPACE=1' diff --git a/srcpkgs/sxiv/patches/sxiv-1.3-makefile.patch b/srcpkgs/sxiv/patches/sxiv-1.3-makefile.patch index f4319912f66..86fc8e1b302 100644 --- a/srcpkgs/sxiv/patches/sxiv-1.3-makefile.patch +++ b/srcpkgs/sxiv/patches/sxiv-1.3-makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2014-10-24 12:25:18.000000000 +0200 -+++ Makefile 2014-10-26 01:19:33.040945097 +0200 +--- a/Makefile 2014-10-24 12:25:18.000000000 +0200 ++++ b/Makefile 2014-10-26 01:19:33.040945097 +0200 @@ -43,9 +43,9 @@ sed "s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" sxiv.1 > $(DESTDIR)$(MANPREFIX)/man1/sxiv.1 chmod 644 $(DESTDIR)$(MANPREFIX)/man1/sxiv.1 @@ -13,8 +13,8 @@ uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/sxiv ---- sxiv.1.orig 2014-10-24 12:25:18.000000000 +0200 -+++ sxiv.1 2014-10-26 01:18:00.053107605 +0200 +--- a/sxiv.1 2014-10-24 12:25:18.000000000 +0200 ++++ b/sxiv.1 2014-10-26 01:18:00.053107605 +0200 @@ -351,7 +351,7 @@ and the first argument to this script is the path of the loaded image. .P diff --git a/srcpkgs/sxiv/template b/srcpkgs/sxiv/template index f5a5adc2b26..3baaa111f61 100644 --- a/srcpkgs/sxiv/template +++ b/srcpkgs/sxiv/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/muennich/sxiv" distfiles="https://github.com/muennich/sxiv/archive/v${version}.tar.gz" checksum=a382ad57734243818e828ba161fc0357b48d8f3a7f8c29cac183492b46b58949 -patch_args=-Np0 pre_build() { [ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||: diff --git a/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch b/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch index 4ab0f7b5690..cdf31d254f5 100644 --- a/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch +++ b/srcpkgs/sylpheed/patches/libsylph_ssl_c.patch @@ -2,8 +2,8 @@ See https://sylpheed.sraoss.jp/redmine/issues/306 Patch is necessary both on LibreSSL and OpenSSL ---- libsylph/ssl.c.orig -+++ libsylph/ssl.c +--- a/libsylph/ssl.c ++++ b/libsylph/ssl.c @@ -258,6 +258,13 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinf return FALSE; } diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template index a37c3ced4ec..5df8312b53d 100644 --- a/srcpkgs/sylpheed/template +++ b/srcpkgs/sylpheed/template @@ -13,7 +13,6 @@ homepage="http://sylpheed.sraoss.jp" distfiles="http://sylpheed.sraoss.jp/sylpheed/v${version%.*}/$pkgname-$version.tar.bz2" checksum=eb23e6bda2c02095dfb0130668cf7c75d1f256904e3a7337815b4da5cb72eb04 lib32disabled=yes -patch_args=-Np0 pre_configure() { aclocal -I ac diff --git a/srcpkgs/synergy/patches/cmake.patch b/srcpkgs/synergy/patches/cmake.patch index 66ed48df3da..c66254b6337 100644 --- a/srcpkgs/synergy/patches/cmake.patch +++ b/srcpkgs/synergy/patches/cmake.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2020-12-29 14:53:13.000000000 +0100 -+++ - 2021-02-17 22:53:35.496937933 +0100 +--- a/CMakeLists.txt 2020-12-29 14:53:13.000000000 +0100 ++++ b/CMakeLists.txt 2020-12-29 14:53:13.000000000 +0100 @@ -87,6 +87,7 @@ include (CheckIncludeFileCXX) include (CheckSymbolExists) diff --git a/srcpkgs/synergy/patches/qt5-build-musl.patch b/srcpkgs/synergy/patches/qt5-build-musl.patch index fb90c3decea..4d587f41173 100644 --- a/srcpkgs/synergy/patches/qt5-build-musl.patch +++ b/srcpkgs/synergy/patches/qt5-build-musl.patch @@ -1,5 +1,5 @@ ---- src/gui/src/ZeroconfService.h -+++ src/gui/src/ZeroconfService.h +--- a/src/gui/src/ZeroconfService.h ++++ b/src/gui/src/ZeroconfService.h @@ -20,6 +20,7 @@ #include "ZeroconfServer.h" #include "ZeroconfRecord.h" diff --git a/srcpkgs/synergy/patches/qt5-build.patch b/srcpkgs/synergy/patches/qt5-build.patch index 65119a67a18..65caaa65a3a 100644 --- a/srcpkgs/synergy/patches/qt5-build.patch +++ b/srcpkgs/synergy/patches/qt5-build.patch @@ -1,5 +1,5 @@ ---- src/gui/src/ScreenSetupView.h.orig 2019-06-09 19:16:38.358110544 +0200 -+++ src/gui/src/ScreenSetupView.h 2019-06-09 19:16:53.268001862 +0200 +--- a/src/gui/src/ScreenSetupView.h 2019-06-09 19:16:38.358110544 +0200 ++++ b/src/gui/src/ScreenSetupView.h 2019-06-09 19:16:53.268001862 +0200 @@ -22,6 +22,7 @@ #include @@ -8,8 +8,8 @@ #include "Screen.h" ---- src/gui/src/ActionDialog.h.orig 2019-06-09 19:17:32.518715748 +0200 -+++ src/gui/src/ActionDialog.h 2019-06-09 19:17:50.508584615 +0200 +--- a/src/gui/src/ActionDialog.h 2019-06-09 19:17:32.518715748 +0200 ++++ b/src/gui/src/ActionDialog.h 2019-06-09 19:17:50.508584615 +0200 @@ -21,6 +21,7 @@ #define ACTIONDIALOG_H diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template index 79bcf7db11f..0c4f3b4f130 100644 --- a/srcpkgs/synergy/template +++ b/srcpkgs/synergy/template @@ -15,7 +15,6 @@ license="GPL-2.0-only" homepage="http://synergy-foss.org/" distfiles="https://github.com/symless/synergy-core/archive/v${version}-stable.tar.gz" checksum=a57989dd2d3ae30657f2b95cba3cae112c189f9bbbc3d1b25b3874859afeb94d -patch_args=-Np0 post_install() { vmkdir usr/share/examples/${pkgname} diff --git a/srcpkgs/synfigstudio/patches/musl-accessperms.patch b/srcpkgs/synfigstudio/patches/musl-accessperms.patch index 7dbbcdb2e12..23fc5387dba 100644 --- a/srcpkgs/synfigstudio/patches/musl-accessperms.patch +++ b/srcpkgs/synfigstudio/patches/musl-accessperms.patch @@ -1,5 +1,5 @@ ---- src/gui/app.cpp.orig 2017-09-09 05:03:59.000000000 +0200 -+++ src/gui/app.cpp 2017-11-13 07:17:16.769223845 +0100 +--- a/src/gui/app.cpp 2017-09-09 05:03:59.000000000 +0200 ++++ b/src/gui/app.cpp 2017-11-13 07:17:16.769223845 +0100 @@ -153,6 +153,10 @@ #endif @@ -11,8 +11,8 @@ /* === U S I N G =========================================================== */ using namespace std; ---- src/gui/autorecover.cpp.orig 2017-09-08 11:51:26.000000000 +0200 -+++ src/gui/autorecover.cpp 2017-11-13 07:21:41.550697678 +0100 +--- a/src/gui/autorecover.cpp 2017-09-08 11:51:26.000000000 +0200 ++++ b/src/gui/autorecover.cpp 2017-11-13 07:21:41.550697678 +0100 @@ -75,6 +75,10 @@ #endif diff --git a/srcpkgs/synfigstudio/template b/srcpkgs/synfigstudio/template index a04916c7868..3e40a99fb28 100644 --- a/srcpkgs/synfigstudio/template +++ b/srcpkgs/synfigstudio/template @@ -14,7 +14,6 @@ distfiles="https://github.com/synfig/synfig/releases/download/v${version}/synfig checksum=af9a9b0064064907ae24a693b607dcba633a8a2cd45fa1357f61c035efd6020e python_version=3 CXXFLAGS="-Wno-deprecated-copy -DHAVE_LOCALE_H=1" -patch_args=-Np0 if [ -n "$CROSS_BUILD" ]; then # uses synfig to create some icons diff --git a/srcpkgs/sysbench/patches/atomics.patch b/srcpkgs/sysbench/patches/atomics.patch index 30ed62af2d5..5c671434cd4 100644 --- a/srcpkgs/sysbench/patches/atomics.patch +++ b/srcpkgs/sysbench/patches/atomics.patch @@ -4,8 +4,8 @@ This is because unlike legacy __sync stuff, __atomic_* can make use of libatomic on any arbitrary platform, while on e.g. ppc32 and mips, __sync_val_compare_and_swap_8 and so on are not available at all. ---- src/sb_ck_pr.h -+++ src/sb_ck_pr.h +--- a/src/sb_ck_pr.h ++++ b/src/sb_ck_pr.h @@ -118,7 +118,8 @@ CK_PR_LOAD_S(64, uint64_t) ck_pr_cas_##S(M *target, T compare, T set) \ { \ diff --git a/srcpkgs/sysbench/template b/srcpkgs/sysbench/template index 88a162b2dc8..e2fe7be0cc8 100644 --- a/srcpkgs/sysbench/template +++ b/srcpkgs/sysbench/template @@ -17,7 +17,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/akopytov/sysbench" distfiles="https://github.com/akopytov/sysbench/archive/${version}.tar.gz" checksum=e8ee79b1f399b2d167e6a90de52ccc90e52408f7ade1b9b7135727efe181347f -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/sysdig/patches/fix-luajit.patch b/srcpkgs/sysdig/patches/fix-luajit.patch index d3b5d222c3b..f7c744788d9 100644 --- a/srcpkgs/sysdig/patches/fix-luajit.patch +++ b/srcpkgs/sysdig/patches/fix-luajit.patch @@ -22,8 +22,8 @@ sysdig-CLA-1.0-signed-off-by: Evgeni Golov Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -103,7 +103,7 @@ option(USE_BUNDLED_DEPS "Enable bundled option(USE_BUNDLED_LUAJIT "Enable building of the bundled LuaJIT" ${USE_BUNDLED_DEPS}) @@ -35,8 +35,8 @@ Index: CMakeLists.txt message(STATUS "Found LuaJIT: include: ${LUAJIT_INCLUDE}, lib: ${LUAJIT_LIB}") Index: userspace/libsinsp/chisel.cpp =================================================================== ---- userspace/libsinsp/chisel.cpp -+++ userspace/libsinsp/chisel.cpp +--- a/userspace/libsinsp/chisel.cpp ++++ b/userspace/libsinsp/chisel.cpp @@ -96,7 +96,7 @@ void lua_stackdump(lua_State *L) // Lua callbacks /////////////////////////////////////////////////////////////////////////////// @@ -66,8 +66,8 @@ Index: userspace/libsinsp/chisel.cpp {"get_num", &lua_cbacks::get_num}, Index: userspace/libsinsp/lua_parser.cpp =================================================================== ---- userspace/libsinsp/lua_parser.cpp -+++ userspace/libsinsp/lua_parser.cpp +--- a/userspace/libsinsp/lua_parser.cpp ++++ b/userspace/libsinsp/lua_parser.cpp @@ -14,7 +14,7 @@ extern "C" { #include "lauxlib.h" } @@ -79,8 +79,8 @@ Index: userspace/libsinsp/lua_parser.cpp {"bool_op", &lua_parser_cbacks::bool_op}, Index: userspace/libsinsp/lua_parser_api.cpp =================================================================== ---- userspace/libsinsp/lua_parser_api.cpp -+++ userspace/libsinsp/lua_parser_api.cpp +--- a/userspace/libsinsp/lua_parser_api.cpp ++++ b/userspace/libsinsp/lua_parser_api.cpp @@ -231,7 +231,7 @@ int lua_parser_cbacks::rel_expr(lua_Stat fprintf(stderr, "%s\n", err.c_str()); throw sinsp_exception("parser API error"); diff --git a/srcpkgs/sysdig/patches/grpc-abseil.patch b/srcpkgs/sysdig/patches/grpc-abseil.patch index 6d8f3d29e4b..641c900b25b 100644 --- a/srcpkgs/sysdig/patches/grpc-abseil.patch +++ b/srcpkgs/sysdig/patches/grpc-abseil.patch @@ -1,5 +1,5 @@ ---- userspace/libsinsp/CMakeLists.txt -+++ userspace/libsinsp/CMakeLists.txt +--- a/userspace/libsinsp/CMakeLists.txt ++++ b/userspace/libsinsp/CMakeLists.txt @@ -31,7 +31,7 @@ include_directories("${B64_INCLUDE}") include_directories("${CURSES_INCLUDE_DIR}") diff --git a/srcpkgs/sysdig/patches/nostatic.patch b/srcpkgs/sysdig/patches/nostatic.patch index 4846e065b3a..3f60c22f239 100644 --- a/srcpkgs/sysdig/patches/nostatic.patch +++ b/srcpkgs/sysdig/patches/nostatic.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -68,11 +68,6 @@ set(MINIMAL_BUILD_FLAGS "-DMINIMAL_BUILD") endif() diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template index 71289530034..8932775a781 100644 --- a/srcpkgs/sysdig/template +++ b/srcpkgs/sysdig/template @@ -23,7 +23,6 @@ checksum=b9d05854493d245a7a7e75f77fc654508f720aab5e5e8a3a932bd8eb54e49bda disable_parallel_build=yes dkms_modules="sysdig ${version}" nocross=yes -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) configure_args+=" -DMUSL_OPTIMIZED_BUILD=On" diff --git a/srcpkgs/sysexxer-ng/patches/fix-std_string.patch b/srcpkgs/sysexxer-ng/patches/fix-std_string.patch index d6e7a579642..bff9fe25739 100644 --- a/srcpkgs/sysexxer-ng/patches/fix-std_string.patch +++ b/srcpkgs/sysexxer-ng/patches/fix-std_string.patch @@ -1,5 +1,5 @@ ---- sources/utility.h 2019-03-14 19:21:37.000000000 +0100 -+++ sources/utility.h 2021-01-18 19:36:38.116292685 +0100 +--- a/sources/utility.h 2019-03-14 19:21:37.000000000 +0100 ++++ b/sources/utility.h 2021-01-18 19:36:38.116292685 +0100 @@ -5,6 +5,7 @@ #include diff --git a/srcpkgs/sysexxer-ng/template b/srcpkgs/sysexxer-ng/template index e09476331df..18b2a6e776a 100644 --- a/srcpkgs/sysexxer-ng/template +++ b/srcpkgs/sysexxer-ng/template @@ -11,7 +11,6 @@ license="BSL-1.0" homepage="https://github.com/linuxmao-org/sysexxer-ng" distfiles="${homepage}/releases/download/v${version}/sysexxer-ng-${version}.tar.gz" checksum=66e2eb66b7ab34b8287bba3230009a311b7db1870c47911049666c523fced5a9 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/sysprof/patches/build.patch b/srcpkgs/sysprof/patches/build.patch index ab7c2c1c164..4d99d6bc3f3 100644 --- a/srcpkgs/sysprof/patches/build.patch +++ b/srcpkgs/sysprof/patches/build.patch @@ -1,5 +1,5 @@ ---- src/libsysprof-capture/sysprof-capture-condition.c -+++ src/libsysprof-capture/sysprof-capture-condition.c +--- a/src/libsysprof-capture/sysprof-capture-condition.c ++++ b/src/libsysprof-capture/sysprof-capture-condition.c @@ -269,6 +269,7 @@ sysprof_capture_condition_copy (const SysprofCaptureCondition *self) } diff --git a/srcpkgs/sysprof/patches/musl.patch b/srcpkgs/sysprof/patches/musl.patch index 2a4cd9d927b..abaac692fb3 100644 --- a/srcpkgs/sysprof/patches/musl.patch +++ b/srcpkgs/sysprof/patches/musl.patch @@ -16,8 +16,8 @@ Subject: [PATCH] fix build on musl diff --git src/libsysprof-capture/sysprof-capture-cursor.c src/libsysprof-capture/sysprof-capture-cursor.c index 24563f0..bb77a60 100644 ---- src/libsysprof-capture/sysprof-capture-cursor.c -+++ src/libsysprof-capture/sysprof-capture-cursor.c +--- a/src/libsysprof-capture/sysprof-capture-cursor.c ++++ b/src/libsysprof-capture/sysprof-capture-cursor.c @@ -59,6 +59,7 @@ #include #include @@ -28,8 +28,8 @@ index 24563f0..bb77a60 100644 #include "sysprof-capture-reader.h" diff --git src/libsysprof-capture/sysprof-capture-reader.c src/libsysprof-capture/sysprof-capture-reader.c index 67c6b28..252d006 100644 ---- src/libsysprof-capture/sysprof-capture-reader.c -+++ src/libsysprof-capture/sysprof-capture-reader.c +--- a/src/libsysprof-capture/sysprof-capture-reader.c ++++ b/src/libsysprof-capture/sysprof-capture-reader.c @@ -68,6 +68,7 @@ #include #include @@ -40,8 +40,8 @@ index 67c6b28..252d006 100644 #include "sysprof-capture-writer.h" diff --git src/libsysprof-capture/sysprof-capture-util.c src/libsysprof-capture/sysprof-capture-util.c index 0bbea06..0e5f7e7 100644 ---- src/libsysprof-capture/sysprof-capture-util.c -+++ src/libsysprof-capture/sysprof-capture-util.c +--- a/src/libsysprof-capture/sysprof-capture-util.c ++++ b/src/libsysprof-capture/sysprof-capture-util.c @@ -56,6 +56,7 @@ #include "config.h" @@ -52,8 +52,8 @@ index 0bbea06..0e5f7e7 100644 #include diff --git src/libsysprof-capture/sysprof-capture-writer-cat.c src/libsysprof-capture/sysprof-capture-writer-cat.c index 66171b9..9febbbb 100644 ---- src/libsysprof-capture/sysprof-capture-writer-cat.c -+++ src/libsysprof-capture/sysprof-capture-writer-cat.c +--- a/src/libsysprof-capture/sysprof-capture-writer-cat.c ++++ b/src/libsysprof-capture/sysprof-capture-writer-cat.c @@ -63,6 +63,7 @@ #include #include @@ -64,8 +64,8 @@ index 66171b9..9febbbb 100644 diff --git src/libsysprof-capture/sysprof-collector.c src/libsysprof-capture/sysprof-collector.c index 1d7a0d6..7af6c96 100644 ---- src/libsysprof-capture/sysprof-collector.c -+++ src/libsysprof-capture/sysprof-collector.c +--- a/src/libsysprof-capture/sysprof-collector.c ++++ b/src/libsysprof-capture/sysprof-collector.c @@ -73,6 +73,7 @@ #include "mapped-ring-buffer.h" @@ -78,7 +78,7 @@ diff --git src/libsysprof-capture/sysprof-compat.h src/libsysprof-capture/syspro new file mode 100644 index 0000000..ae9bf10 --- /dev/null -+++ src/libsysprof-capture/sysprof-compat.h ++++ b/src/libsysprof-capture/sysprof-compat.h @@ -0,0 +1,28 @@ +/* added by q66 @ void to fix build on musl */ + @@ -110,8 +110,8 @@ index 0000000..ae9bf10 +#endif diff --git src/libsysprof-capture/sysprof-platform.c src/libsysprof-capture/sysprof-platform.c index a80ab89..05bd590 100644 ---- src/libsysprof-capture/sysprof-platform.c -+++ src/libsysprof-capture/sysprof-platform.c +--- a/src/libsysprof-capture/sysprof-platform.c ++++ b/src/libsysprof-capture/sysprof-platform.c @@ -60,6 +60,7 @@ #include #include @@ -126,8 +126,8 @@ index a80ab89..05bd590 100644 From here onward, blame sgn Index: meson.build =================================================================== ---- meson.build.orig -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -69,6 +69,7 @@ config_h.set('LOCALEDIR', 'PACKAGE_LOCAL config_h.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h')) @@ -138,8 +138,8 @@ Index: meson.build libunwind_dep = dependency('libunwind-generic', required: false) Index: src/libsysprof-capture/sysprof-compat.h =================================================================== ---- src/libsysprof-capture/sysprof-compat.h 2021-02-05 23:39:58.352258624 +0100 -+++ src/libsysprof-capture/sysprof-compat.h 2021-02-05 23:47:07.662841454 +0100 +--- a/src/libsysprof-capture/sysprof-compat.h 2021-02-05 23:39:58.352258624 +0100 ++++ b/src/libsysprof-capture/sysprof-compat.h 2021-02-05 23:47:07.662841454 +0100 @@ -17,6 +17,7 @@ __result; })) #endif diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index 39ea0ae1b9c..eae51ea7356 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="http://sysprof.com/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=8bcd728dc2f74e6f589410370dfb1b8801468bb3cc1803aa240735a7cff241ce -patch_args=-Np0 # for ITS rules if [ "$CROSS_BUILD" ]; then