diff --git a/srcpkgs/dante/patches/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch b/srcpkgs/dante/patches/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch index 71d8c8b9c58..f6abb7220ae 100644 --- a/srcpkgs/dante/patches/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch +++ b/srcpkgs/dante/patches/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch @@ -17,8 +17,8 @@ So drop these checks Signed-off-by: Fabrice Fontaine diff -Nuar osdep.m4 osdep.m4 ---- osdep.m4 2019-12-09 21:28:38.936003218 +0100 -+++ osdep.m4 2019-12-09 21:49:48.764019371 +0100 +--- a/osdep.m4 2019-12-09 21:28:38.936003218 +0100 ++++ b/osdep.m4 2019-12-09 21:49:48.764019371 +0100 @@ -956,13 +956,7 @@ unset UNIQUEVALS UNIQUESYMBOLS if test -s $ERRVALFILE; then diff --git a/srcpkgs/dante/patches/ppc.patch b/srcpkgs/dante/patches/ppc.patch index f71bc5c51fd..c4e292067fd 100644 --- a/srcpkgs/dante/patches/ppc.patch +++ b/srcpkgs/dante/patches/ppc.patch @@ -6,8 +6,8 @@ Author: Peter Pentchev Forwarded: not-yet Last-Update: 2016-04-11 ---- libscompat.m4 -+++ libscompat.m4 +--- a/libscompat.m4 ++++ b/libscompat.m4 @@ -377,7 +377,7 @@ return 0; diff --git a/srcpkgs/dante/template b/srcpkgs/dante/template index 62b5f04f9a4..17fe0f69ae6 100644 --- a/srcpkgs/dante/template +++ b/srcpkgs/dante/template @@ -10,7 +10,6 @@ license="MIT-CMU" homepage="http://www.inet.no/dante/index.html" distfiles="http://www.inet.no/dante/files/dante-${version}.tar.gz" checksum=4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7 -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then configure_args="--with-libc=libc.so.6" diff --git a/srcpkgs/dar/patches/fix-configure.patch b/srcpkgs/dar/patches/fix-configure.patch index 1e3111bb8e6..f6b6a04578c 100644 --- a/srcpkgs/dar/patches/fix-configure.patch +++ b/srcpkgs/dar/patches/fix-configure.patch @@ -1,8 +1,8 @@ Disable cross compile checks for libgcrypt usability tests. They are not required. ---- configure 2015-10-18 14:02:02.423216637 +0200 -+++ configure 2015-10-18 14:04:45.198228372 +0200 +--- a/configure 2015-10-18 14:02:02.423216637 +0200 ++++ b/configure 2015-10-18 14:04:45.198228372 +0200 @@ -22294,7 +22294,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgcrypt usability" >&5 @@ -23,8 +23,8 @@ tests. They are not required. as_fn_error $? "cannot run test program while cross compiling diff --git configure configure index 157b7a9..7c6a50d 100755 ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -25481,7 +25481,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libthreadar() operationability" >&5 diff --git a/srcpkgs/dar/patches/musl-getopt.patch b/srcpkgs/dar/patches/musl-getopt.patch index 583c0201eda..1200567a30d 100644 --- a/srcpkgs/dar/patches/musl-getopt.patch +++ b/srcpkgs/dar/patches/musl-getopt.patch @@ -2,8 +2,8 @@ Since the musl libc constellation results in unistd.h being included, which defines the getopt() function but not the getopt globals, define them here as well. ---- src/dar_suite/my_getopt_long.h 2015-10-17 10:42:50.000000000 +0200 -+++ src/dar_suite/my_getopt_long.h 2015-10-18 13:13:32.631006858 +0200 +--- a/src/dar_suite/my_getopt_long.h 2015-10-17 10:42:50.000000000 +0200 ++++ b/src/dar_suite/my_getopt_long.h 2015-10-18 13:13:32.631006858 +0200 @@ -27,6 +27,12 @@ #ifndef MY_GETOPT_LONG_H #define MY_GETOPT_LONG_H diff --git a/srcpkgs/dar/template b/srcpkgs/dar/template index ec40334f51f..c289909e812 100644 --- a/srcpkgs/dar/template +++ b/srcpkgs/dar/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="http://dar.linux.free.fr/" distfiles="${SOURCEFORGE_SITE}/dar/dar-${version}.tar.gz" checksum=3fea9ff9e55fb9827e17a080de7d1a2605b82c2320c0dec969071efefdbfd097 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args+=" --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr diff --git a/srcpkgs/darkice/patches/casting.patch b/srcpkgs/darkice/patches/casting.patch index fe16f26dbd7..1a75f7cd52c 100644 --- a/srcpkgs/darkice/patches/casting.patch +++ b/srcpkgs/darkice/patches/casting.patch @@ -1,8 +1,8 @@ Cast float* in SRC lib calls to delete fpermissive compilation error https://github.com/rafael2k/darkice/commit/1e2eb18d349f205c70cb2836232825442359b6e3 ---- src/aacPlusEncoder.cpp.orig 2015-05-18 19:38:07.000000000 +0200 -+++ src/aacPlusEncoder.cpp 2018-01-15 20:12:25.067851245 +0100 +--- a/src/aacPlusEncoder.cpp 2015-05-18 19:38:07.000000000 +0200 ++++ b/src/aacPlusEncoder.cpp 2018-01-15 20:12:25.067851245 +0100 @@ -155,7 +155,7 @@ if ( converter ) { unsigned int converted; @@ -12,8 +12,8 @@ https://github.com/rafael2k/darkice/commit/1e2eb18d349f205c70cb2836232825442359b converterData.input_frames = nSamples; converterData.data_out = resampledOffset + (resampledOffsetSize * channels); int srcError = src_process (converter, &converterData); ---- src/FaacEncoder.cpp.orig 2015-05-18 19:38:07.000000000 +0200 -+++ src/FaacEncoder.cpp 2018-01-15 20:10:28.737280304 +0100 +--- a/src/FaacEncoder.cpp 2015-05-18 19:38:07.000000000 +0200 ++++ b/src/FaacEncoder.cpp 2018-01-15 20:10:28.737280304 +0100 @@ -164,7 +164,7 @@ if ( converter ) { unsigned int converted; @@ -23,8 +23,8 @@ https://github.com/rafael2k/darkice/commit/1e2eb18d349f205c70cb2836232825442359b converterData.input_frames = nSamples; converterData.data_out = resampledOffset + (resampledOffsetSize * channels); int srcError = src_process (converter, &converterData); ---- src/OpusLibEncoder.cpp.orig 2016-08-03 22:18:23.000000000 +0200 -+++ src/OpusLibEncoder.cpp 2018-01-15 20:11:22.804545634 +0100 +--- a/src/OpusLibEncoder.cpp 2016-08-03 22:18:23.000000000 +0200 ++++ b/src/OpusLibEncoder.cpp 2018-01-15 20:11:22.804545634 +0100 @@ -403,7 +403,7 @@ #ifdef HAVE_SRC_LIB (void)inCount; @@ -34,8 +34,8 @@ https://github.com/rafael2k/darkice/commit/1e2eb18d349f205c70cb2836232825442359b int srcError = src_process (converter, &converterData); if (srcError) throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError)); ---- src/VorbisLibEncoder.cpp.orig 2015-05-18 19:38:07.000000000 +0200 -+++ src/VorbisLibEncoder.cpp 2018-01-15 20:06:39.258178098 +0100 +--- a/src/VorbisLibEncoder.cpp 2015-05-18 19:38:07.000000000 +0200 ++++ b/src/VorbisLibEncoder.cpp 2018-01-15 20:06:39.258178098 +0100 @@ -337,7 +337,7 @@ int converted; #ifdef HAVE_SRC_LIB diff --git a/srcpkgs/darkice/template b/srcpkgs/darkice/template index d6afbebc344..b61c6d8c7f8 100644 --- a/srcpkgs/darkice/template +++ b/srcpkgs/darkice/template @@ -21,4 +21,3 @@ license="GPL-3.0-or-later" homepage="http://www.darkice.org" distfiles="${SOURCEFORGE_SITE}/project/darkice/darkice/${version}/darkice-${version}.tar.gz" checksum=2c0d0faaa627c0273b2ce8b38775a73ef97e34ef866862a398f660ad8f6e9de6 -patch_args=-Np0 diff --git a/srcpkgs/darkplaces/patches/musl.patch b/srcpkgs/darkplaces/patches/musl.patch index af3c58d539f..bf5a8e82fc2 100644 --- a/srcpkgs/darkplaces/patches/musl.patch +++ b/srcpkgs/darkplaces/patches/musl.patch @@ -1,5 +1,5 @@ ---- darkplaces/sys_shared.c.orig 2015-05-31 12:54:42.131106842 +0200 -+++ darkplaces/sys_shared.c 2015-05-31 12:54:58.842284100 +0200 +--- a/darkplaces/sys_shared.c 2015-05-31 12:54:42.131106842 +0200 ++++ b/darkplaces/sys_shared.c 2015-05-31 12:54:58.842284100 +0200 @@ -69,7 +69,7 @@ void Sys_AllowProfiling(qboolean enable) else moncleanup(); diff --git a/srcpkgs/darkplaces/template b/srcpkgs/darkplaces/template index cb5f7671d68..9e282a06105 100644 --- a/srcpkgs/darkplaces/template +++ b/srcpkgs/darkplaces/template @@ -12,7 +12,6 @@ license="GPL-2" homepage="http://icculus.org/twilight/darkplaces/" distfiles="http://icculus.org/twilight/$pkgname/files/darkplacesengine${version}.zip" checksum=69e5a50991884196e403bd6aab4a33bba553a934a167be366672ab4e223b06c9 -patch_args=-Np0 post_extract() { # Extract the real source code. diff --git a/srcpkgs/darktable/patches/0001-only-use-target_clones-with-glibc.patch b/srcpkgs/darktable/patches/0001-only-use-target_clones-with-glibc.patch index 22ea16ba9be..32fc760a2fc 100644 --- a/srcpkgs/darktable/patches/0001-only-use-target_clones-with-glibc.patch +++ b/srcpkgs/darktable/patches/0001-only-use-target_clones-with-glibc.patch @@ -9,8 +9,8 @@ Subject: [PATCH] only use target_clones with glibc diff --git src/common/darktable.h src/common/darktable.h index b3ad929..ae871a0 100644 ---- src/common/darktable.h -+++ src/common/darktable.h +--- a/src/common/darktable.h ++++ b/src/common/darktable.h @@ -102,7 +102,7 @@ typedef unsigned int u_int; /* Create cloned functions for various CPU SSE generations */ /* See for instructions https://hannes.hauswedell.net/post/2017/12/09/fmv/ */ diff --git a/srcpkgs/darktable/patches/cmake-build-type-none.patch b/srcpkgs/darktable/patches/cmake-build-type-none.patch index 7101f9c1a0e..6c467467dac 100644 --- a/srcpkgs/darktable/patches/cmake-build-type-none.patch +++ b/srcpkgs/darktable/patches/cmake-build-type-none.patch @@ -1,7 +1,7 @@ Index: src/external/rawspeed/cmake/build-type.cmake =================================================================== ---- src/external/rawspeed/cmake/build-type.cmake.orig -+++ src/external/rawspeed/cmake/build-type.cmake +--- a/src/external/rawspeed/cmake/build-type.cmake ++++ b/src/external/rawspeed/cmake/build-type.cmake @@ -27,9 +27,6 @@ string(TOUPPER "${RAWSPEED_SPECIAL_BUILD # is this one of the known build types? diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template index 6b3d09a1c0a..24f17d36dda 100644 --- a/srcpkgs/darktable/template +++ b/srcpkgs/darktable/template @@ -23,7 +23,6 @@ homepage="http://www.darktable.org/" changelog="https://github.com/darktable-org/darktable/releases" distfiles="https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz" checksum=7fc3f851da9bcd7c5053ecd09f21aa3eb6103be98a6c58f52010b6f22174941e -patch_args=-Np0 build_options="gmic" diff --git a/srcpkgs/dash/patches/0005-SHELL-Disable-sh-c-command-sh-c-exec-command-optimiza.diff b/srcpkgs/dash/patches/0005-SHELL-Disable-sh-c-command-sh-c-exec-command-optimiza.diff index d0522e0e968..811643d6807 100644 --- a/srcpkgs/dash/patches/0005-SHELL-Disable-sh-c-command-sh-c-exec-command-optimiza.diff +++ b/srcpkgs/dash/patches/0005-SHELL-Disable-sh-c-command-sh-c-exec-command-optimiza.diff @@ -13,8 +13,8 @@ Signed-off-by: Jonathan Nieder diff --git a/src/main.c b/src/main.c index 65e236be..1614ffbb 100644 ---- src/main.c -+++ src/main.c +--- a/src/main.c ++++ b/src/main.c @@ -171,7 +171,7 @@ state2: state3: state = 4; diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template index 34375cdca66..d966b55956b 100644 --- a/srcpkgs/dash/template +++ b/srcpkgs/dash/template @@ -11,7 +11,6 @@ homepage="http://gondor.apana.org.au/~herbert/dash/" distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz" checksum=4e15b7ba5363bcc2a443549910cdc15b5ad601df8196b5f294c712eff037e08d register_shell="/usr/bin/sh /usr/bin/dash /bin/sh /bin/dash" -patch_args=-Np0 alternatives=" sh:sh:/usr/bin/dash diff --git a/srcpkgs/davfs2/patches/010-main_code_fix.patch b/srcpkgs/davfs2/patches/010-main_code_fix.patch index ba64a7fad05..d91336d2734 100644 --- a/srcpkgs/davfs2/patches/010-main_code_fix.patch +++ b/srcpkgs/davfs2/patches/010-main_code_fix.patch @@ -1,5 +1,5 @@ ---- src/cache.c -+++ src/cache.c +--- a/src/cache.c ++++ b/src/cache.c @@ -58,7 +58,7 @@ #ifdef HAVE_SYS_TYPES_H #include @@ -9,8 +9,8 @@ #include #include ---- src/webdav.c -+++ src/webdav.c +--- a/src/webdav.c ++++ b/src/webdav.c @@ -2033,7 +2033,7 @@ ssl_verify(void *userdata, int failures, len = getline(&s, &n, stdin); if (len < 0) diff --git a/srcpkgs/davfs2/patches/100-musl-compat.patch b/srcpkgs/davfs2/patches/100-musl-compat.patch index 6d56821f2ff..00f48b574dc 100644 --- a/srcpkgs/davfs2/patches/100-musl-compat.patch +++ b/srcpkgs/davfs2/patches/100-musl-compat.patch @@ -1,5 +1,5 @@ ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -42,7 +42,7 @@ DAV_CHECK_NEON # Checks for header files. AC_HEADER_DIRENT @@ -18,8 +18,8 @@ # Misc. DAV_DEFAULTS ---- src/cache.c -+++ src/cache.c +--- a/src/cache.c ++++ b/src/cache.c @@ -19,12 +19,12 @@ @@ -34,8 +34,8 @@ #ifdef HAVE_FCNTL_H #include #endif ---- src/dav_fuse.c -+++ src/dav_fuse.c +--- a/src/dav_fuse.c ++++ b/src/dav_fuse.c @@ -47,6 +47,9 @@ #ifdef HAVE_SYS_STAT_H #include @@ -46,8 +46,8 @@ #include "defaults.h" #include "mount_davfs.h" ---- src/kernel_interface.c -+++ src/kernel_interface.c +--- a/src/kernel_interface.c ++++ b/src/kernel_interface.c @@ -19,8 +19,8 @@ @@ -69,8 +69,8 @@ #include #include "defaults.h" ---- src/mount_davfs.c -+++ src/mount_davfs.c +--- a/src/mount_davfs.c ++++ b/src/mount_davfs.c @@ -19,10 +19,10 @@ @@ -83,8 +83,8 @@ #ifdef HAVE_FCNTL_H #include #endif ---- src/umount_davfs.c -+++ src/umount_davfs.c +--- a/src/umount_davfs.c ++++ b/src/umount_davfs.c @@ -19,8 +19,8 @@ @@ -95,8 +95,8 @@ #include #include #ifdef HAVE_LIBINTL_H ---- src/webdav.c -+++ src/webdav.c +--- a/src/webdav.c ++++ b/src/webdav.c @@ -19,9 +19,9 @@ @@ -127,7 +127,7 @@ session = ne_session_create(args->scheme, args->host, args->port); --- /dev/null -+++ src/compat.h ++++ b/src/compat.h @@ -0,0 +1,64 @@ +#ifndef _COMPAT_H +#define _COMPAT_H diff --git a/srcpkgs/davfs2/template b/srcpkgs/davfs2/template index 0b38a2b6f8c..01eb6336fc4 100644 --- a/srcpkgs/davfs2/template +++ b/srcpkgs/davfs2/template @@ -13,7 +13,6 @@ license="GPL-3.0-or-later" homepage="https://savannah.nongnu.org/projects/davfs2" distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=2e6b675685bd917772be60f0999ae098c80f79ff20dc131e8fec4547cbb63b50 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/db/patches/gcc-atomic_compare_exchange.patch b/srcpkgs/db/patches/gcc-atomic_compare_exchange.patch index d80837fc60e..7c1fd7a7ba2 100644 --- a/srcpkgs/db/patches/gcc-atomic_compare_exchange.patch +++ b/srcpkgs/db/patches/gcc-atomic_compare_exchange.patch @@ -1,5 +1,5 @@ ---- src/dbinc/atomic.h 2013-06-03 21:04:07.000000000 +0200 -+++ src/dbinc/atomic.h 2013-06-03 21:10:53.000000000 +0200 +--- a/src/dbinc/atomic.h 2013-06-03 21:04:07.000000000 +0200 ++++ b/src/dbinc/atomic.h 2013-06-03 21:10:53.000000000 +0200 @@ -144,7 +144,7 @@ #define atomic_inc(env, p) __atomic_inc(p) #define atomic_dec(env, p) __atomic_dec(p) diff --git a/srcpkgs/db/patches/time64.patch b/srcpkgs/db/patches/time64.patch index b199e800272..9a2a02ab787 100644 --- a/srcpkgs/db/patches/time64.patch +++ b/srcpkgs/db/patches/time64.patch @@ -1,8 +1,8 @@ By the comment's own admission, this cannot affect on-disk nor ABI because 'long' varies per architecture. So, this change is always correct. ---- src/dbinc/clock.h 2013-09-09 15:35:08.000000000 +0000 -+++ src/dbinc/clock.h 2020-01-31 19:22:11.630000000 +0000 +--- a/src/dbinc/clock.h 2013-09-09 15:35:08.000000000 +0000 ++++ b/src/dbinc/clock.h 2020-01-31 19:22:11.630000000 +0000 @@ -54,11 +54,7 @@ */ typedef struct { diff --git a/srcpkgs/db/template b/srcpkgs/db/template index 217e0eb0139..2d340913b04 100644 --- a/srcpkgs/db/template +++ b/srcpkgs/db/template @@ -14,7 +14,6 @@ license="BSD-4-Clause" homepage="http://www.oracle.com/technetwork/products/berkeleydb/overview/index.html" distfiles="http://download.oracle.com/berkeley-db/db-${version}.tar.gz" checksum=e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628 -patch_args=-Np0 post_install() { chmod 755 ${DESTDIR}/usr/bin/* diff --git a/srcpkgs/dbus-glib/patches/fix-build.patch b/srcpkgs/dbus-glib/patches/fix-build.patch index ac812289f8a..9a03d866844 100644 --- a/srcpkgs/dbus-glib/patches/fix-build.patch +++ b/srcpkgs/dbus-glib/patches/fix-build.patch @@ -1,5 +1,5 @@ ---- dbus/dbus-gvalue.c.orig 2013-04-03 11:46:39.075287327 +0200 -+++ dbus/dbus-gvalue.c 2013-04-03 11:46:59.178392995 +0200 +--- a/dbus/dbus-gvalue.c 2013-04-03 11:46:39.075287327 +0200 ++++ b/dbus/dbus-gvalue.c 2013-04-03 11:46:59.178392995 +0200 @@ -1932,8 +1932,6 @@ G_STATIC_ASSERT (sizeof (dbus_bool_t) == G_STATIC_ASSERT (sizeof (dbus_int32_t) == sizeof (gint)); G_STATIC_ASSERT (sizeof (dbus_uint32_t) == sizeof (guint)); diff --git a/srcpkgs/dbus-glib/template b/srcpkgs/dbus-glib/template index 3a273bea56b..ee905b75bfe 100644 --- a/srcpkgs/dbus-glib/template +++ b/srcpkgs/dbus-glib/template @@ -13,7 +13,6 @@ license="GPL-2" homepage="http://www.freedesktop.org/wiki/Software/DBusBindings" distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz" checksum=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args+=" --with-dbus-binding-tool=dbus-binding-tool" diff --git a/srcpkgs/dcraw/patches/add-missing-locale_h-include.patch b/srcpkgs/dcraw/patches/add-missing-locale_h-include.patch index e71729ab2cc..e895c2f60d2 100644 --- a/srcpkgs/dcraw/patches/add-missing-locale_h-include.patch +++ b/srcpkgs/dcraw/patches/add-missing-locale_h-include.patch @@ -1,7 +1,7 @@ diff --git a/dcraw.c b/dcraw.c index 1d0676c..18e1f3e 100644 ---- dcraw.c -+++ dcraw.c +--- a/dcraw.c ++++ b/dcraw.c @@ -84,6 +84,7 @@ typedef unsigned long long UINT64; #endif #ifdef LOCALEDIR diff --git a/srcpkgs/dcraw/template b/srcpkgs/dcraw/template index e05e4f27e3b..67cb2f426ef 100644 --- a/srcpkgs/dcraw/template +++ b/srcpkgs/dcraw/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="https://www.dechifro.org/dcraw/" distfiles="https://www.dechifro.org/dcraw/archive/${pkgname}-${version}.tar.gz" checksum=2890c3da2642cd44c5f3bfed2c9b2c1db83da5cec09cc17e0fa72e17541fb4b9 -patch_args=-Np0 do_build() { $CC $CFLAGS $LDFLAGS \ diff --git a/srcpkgs/dcron/patches/respect_cflags_and_ldflags.patch b/srcpkgs/dcron/patches/respect_cflags_and_ldflags.patch index 431bdd653f3..78fd6fa170d 100644 --- a/srcpkgs/dcron/patches/respect_cflags_and_ldflags.patch +++ b/srcpkgs/dcron/patches/respect_cflags_and_ldflags.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2012-01-23 10:56:26.473607101 +0100 -+++ Makefile 2012-01-23 10:57:43.806746482 +0100 +--- a/Makefile 2012-01-23 10:56:26.473607101 +0100 ++++ b/Makefile 2012-01-23 10:57:43.806746482 +0100 @@ -32,7 +32,6 @@ TABSRCS = crontab.c chuser.c TABOBJS = crontab.o chuser.o PROTOS = protos.h diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template index e7333970c76..eb975fd13a3 100644 --- a/srcpkgs/dcron/template +++ b/srcpkgs/dcron/template @@ -11,7 +11,6 @@ changelog="https://raw.githubusercontent.com/dubiousjim/dcron/v${version}/CHANGE distfiles="https://github.com/dubiousjim/dcron/archive/v${version}.tar.gz" checksum=7c047194b9339b781971b000bf5512c11e856d20a14fe5323d5a1823f04c2a3f provides="cron-daemon-0_1" -patch_args=-Np0 alternatives=" crond:crond:/etc/sv/dcron diff --git a/srcpkgs/ddd/patches/cstdio-missing.diff b/srcpkgs/ddd/patches/cstdio-missing.diff index aa264de28ab..e8f5a2bc379 100644 --- a/srcpkgs/ddd/patches/cstdio-missing.diff +++ b/srcpkgs/ddd/patches/cstdio-missing.diff @@ -1,5 +1,5 @@ ---- ddd/strclass.C 2014-05-29 20:30:26.494721840 +0200 -+++ ddd/strclass.C 2014-05-29 20:30:10.492723038 +0200 +--- a/ddd/strclass.C 2014-05-29 20:30:26.494721840 +0200 ++++ b/ddd/strclass.C 2014-05-29 20:30:10.492723038 +0200 @@ -39,6 +39,7 @@ extern "C" int malloc_verify(); #include #include diff --git a/srcpkgs/ddd/patches/gcc9-ftbfs.patch b/srcpkgs/ddd/patches/gcc9-ftbfs.patch index e369269e53f..4ce937927a1 100644 --- a/srcpkgs/ddd/patches/gcc9-ftbfs.patch +++ b/srcpkgs/ddd/patches/gcc9-ftbfs.patch @@ -19,8 +19,8 @@ in the code to add default values if not overwritten. diff --git a/ddd/DispValue.C b/ddd/DispValue.C index de25768..2656242 100644 ---- ddd/DispValue.C -+++ ddd/DispValue.C +--- a/ddd/DispValue.C ++++ b/ddd/DispValue.C @@ -1432,8 +1432,8 @@ void DispValue::get_index_surroundings(string& prefix, string& suffix) const for (int i = 1; i < nchildren(); i++) @@ -34,8 +34,8 @@ index de25768..2656242 100644 diff --git a/ddd/complete.C b/ddd/complete.C index b161e74..4bde5ff 100644 ---- ddd/complete.C -+++ ddd/complete.C +--- a/ddd/complete.C ++++ b/ddd/complete.C @@ -354,7 +354,7 @@ static void complete_reply(const string& complete_answer, void *qu_data) string common_pfx = completions[0]; int i; @@ -47,8 +47,8 @@ index b161e74..4bde5ff 100644 { diff --git a/ddd/exit.C b/ddd/exit.C index f490c23..664f203 100644 ---- ddd/exit.C -+++ ddd/exit.C +--- a/ddd/exit.C ++++ b/ddd/exit.C @@ -478,7 +478,7 @@ void get_core_pattern(int signal) str_func_ret = "core"; } @@ -60,8 +60,8 @@ index f490c23..664f203 100644 { diff --git a/ddd/strclass.C b/ddd/strclass.C index be0bade..dfbb054 100644 ---- ddd/strclass.C -+++ ddd/strclass.C +--- a/ddd/strclass.C ++++ b/ddd/strclass.C @@ -1563,6 +1563,7 @@ std::istream& operator>>(std::istream& s, string& x) return s; } @@ -72,8 +72,8 @@ index be0bade..dfbb054 100644 assert(!x.consuming()); diff --git a/ddd/strclass.h b/ddd/strclass.h index 7ef16fa..035a17e 100644 ---- ddd/strclass.h -+++ ddd/strclass.h +--- a/ddd/strclass.h ++++ b/ddd/strclass.h @@ -811,9 +811,11 @@ public: const regex& sep); diff --git a/srcpkgs/ddd/template b/srcpkgs/ddd/template index 71dc933f104..24f44a9abc2 100644 --- a/srcpkgs/ddd/template +++ b/srcpkgs/ddd/template @@ -10,4 +10,3 @@ license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/ddd" distfiles="${GNU_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=3ad6cd67d7f4b1d6b2d38537261564a0d26aaed077bf25c51efc1474d0e8b65c -patch_args=-Np0 diff --git a/srcpkgs/deadbeef-fb/patches/my-errno.patch b/srcpkgs/deadbeef-fb/patches/my-errno.patch index f848c0bf4da..fe256a84eee 100644 --- a/srcpkgs/deadbeef-fb/patches/my-errno.patch +++ b/srcpkgs/deadbeef-fb/patches/my-errno.patch @@ -2,8 +2,8 @@ Source: @pullmoll Upstream: no Reason: errno is a reserved name ---- utils.c 2017-02-14 17:32:20.000000000 +0100 -+++ utils.c 2020-10-26 20:38:54.549564389 +0100 +--- a/utils.c 2017-02-14 17:32:20.000000000 +0100 ++++ b/utils.c 2020-10-26 20:38:54.549564389 +0100 @@ -234,9 +234,9 @@ if (slash) *slash = 0; diff --git a/srcpkgs/deadbeef-fb/template b/srcpkgs/deadbeef-fb/template index ae67fbb103f..c62ae6fc7b4 100644 --- a/srcpkgs/deadbeef-fb/template +++ b/srcpkgs/deadbeef-fb/template @@ -17,7 +17,6 @@ distfiles="https://gitlab.com/zykure/${pkgname}/repository/${_commit}/archive.ta checksum=19a0c2ea3743926e71f9b20f616ff5bdbfd9839a553b33cc192dfed7bed3cb1d build_options="gtk3" build_options_default="gtk3" -patch_args=-Np0 pre_configure() { ./autogen.sh diff --git a/srcpkgs/deadbeef/patches/musl_strdupa.patch b/srcpkgs/deadbeef/patches/musl_strdupa.patch index 6188e10078a..e4bbbcbaadc 100644 --- a/srcpkgs/deadbeef/patches/musl_strdupa.patch +++ b/srcpkgs/deadbeef/patches/musl_strdupa.patch @@ -1,8 +1,8 @@ musl strdupa() fails to compile in c++ due to a missing cast use deadbeef's fallback version instead ---- strdupa.h -+++ strdupa.h +--- a/strdupa.h ++++ b/strdupa.h @@ -26,6 +26,10 @@ #include diff --git a/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch index a76fecc318b..2768dff2cc9 100644 --- a/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch +++ b/srcpkgs/deadbeef/patches/patch_skip_glade_translations.patch @@ -2,8 +2,8 @@ Upstream packages a number of tools which define translations for gettext to process. The glade files don't appear to actually have translation marks which causes the build to complain and, in the case of packaging, fail. ---- po/POTFILES.skip.orig 2021-02-20 21:51:50.867875091 -0800 -+++ po/POTFILES.skip 2021-02-20 21:51:57.689896618 -0800 +--- a/po/POTFILES.skip 2021-02-20 21:51:50.867875091 -0800 ++++ b/po/POTFILES.skip 2021-02-20 21:51:57.689896618 -0800 @@ -4,3 +4,151 @@ plugins/pltbrowser/support.c plugins/gtkui/support.c diff --git a/srcpkgs/deadbeef/patches/ppc-musl.patch b/srcpkgs/deadbeef/patches/ppc-musl.patch index cf7955a3c21..2cd10102649 100644 --- a/srcpkgs/deadbeef/patches/ppc-musl.patch +++ b/srcpkgs/deadbeef/patches/ppc-musl.patch @@ -4,8 +4,8 @@ covered by __LITTLE_ENDIAN__/__BIG_ENDIAN__ (which is specified as a part of the ELFv2 ABI itself to be always present). Glibc was not broken because it has its own check before that. ---- plugins/gme/game-music-emu-0.6pre/gme/blargg_endian.h -+++ plugins/gme/game-music-emu-0.6pre/gme/blargg_endian.h +--- a/plugins/gme/game-music-emu-0.6pre/gme/blargg_endian.h ++++ b/plugins/gme/game-music-emu-0.6pre/gme/blargg_endian.h @@ -36,7 +36,7 @@ #endif diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template index a070c45c9a2..5666c1d97c9 100644 --- a/srcpkgs/deadbeef/template +++ b/srcpkgs/deadbeef/template @@ -26,7 +26,6 @@ checksum="cbfe873d5bd84b70011dd6131b249fea8c89318c37411696a890c55029ac3e27 c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286 35b58679dbfec2c3a2688b1896afb0fb73b5184ac05d5bdbb787a86b5c00430d" LDFLAGS+=" -Wl,-z,stack-size=1048576" -patch_args=-Np0 # The soundtouchup plugin was made default in 1.8.4 and fails to build on i686. # Fixing that might be a good maintainer task. diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.8.3.patch index f1779331c5a..dc9be027822 100644 --- a/srcpkgs/debug-me/patches/ghc8.8.3.patch +++ b/srcpkgs/debug-me/patches/ghc8.8.3.patch @@ -1,5 +1,5 @@ ---- Val.hs 2020-03-31 11:00:33.329814064 +0200 -+++ Val.hs 2020-03-31 11:00:24.602711845 +0200 +--- a/Val.hs 2020-03-31 11:00:33.329814064 +0200 ++++ b/Val.hs 2020-03-31 11:00:24.602711845 +0200 @@ -42,7 +42,7 @@ b64 :: B.ByteString -> T.Text b64 = T.decodeUtf8 . B64.encode @@ -9,8 +9,8 @@ unb64 t = either (\_ -> fail "bad base64 data") return ---- Server.hs 2020-03-31 12:53:45.860509650 +0200 -+++ Server.hs 2020-03-31 12:52:34.873835069 +0200 +--- a/Server.hs 2020-03-31 12:53:45.860509650 +0200 ++++ b/Server.hs 2020-03-31 12:52:34.873835069 +0200 @@ -105,7 +105,7 @@ -- (Workaround for -- https://github.com/jaspervdj/websockets/issues/140) diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template index e6f9059f38c..3df514e0be4 100644 --- a/srcpkgs/debug-me/template +++ b/srcpkgs/debug-me/template @@ -12,7 +12,6 @@ distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-$ checksum=9497dc9b85a58e5c499ea25fa1bed9f4fd6cdd2f57564f52a0e4152ad4fdc102 nocross=yes # Can't yet cross compile Haskell nopie_files="/usr/bin/debug-me" -patch_args=-Np0 post_install() { vlicense AGPL diff --git a/srcpkgs/desmume/patches/fix-gcc7.patch b/srcpkgs/desmume/patches/fix-gcc7.patch index f9c287a7b40..2c2c6538db6 100644 --- a/srcpkgs/desmume/patches/fix-gcc7.patch +++ b/srcpkgs/desmume/patches/fix-gcc7.patch @@ -1,5 +1,5 @@ ---- ./src/wifi.cpp.orig 2018-01-16 14:39:01.175395010 +0100 -+++ ./src/wifi.cpp 2018-01-16 14:38:10.762596117 +0100 +--- a/src/wifi.cpp 2018-01-16 14:39:01.175395010 +0100 ++++ b/src/wifi.cpp 2018-01-16 14:38:10.762596117 +0100 @@ -314,9 +314,9 @@ WifiComInterface* wifiCom; #if (WIFI_LOGGING_LEVEL >= 1) @@ -12,8 +12,8 @@ #endif #else #define WIFI_LOG(level, ...) {} ---- ./src/MMU_timing.h.orig 2018-01-16 14:47:05.818461679 +0100 -+++ ./src/MMU_timing.h 2018-01-16 14:48:05.344224219 +0100 +--- a/src/MMU_timing.h 2018-01-16 14:47:05.818461679 +0100 ++++ b/src/MMU_timing.h 2018-01-16 14:48:05.344224219 +0100 @@ -155,8 +155,8 @@ private: enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT }; enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT }; @@ -25,8 +25,8 @@ enum { WORDSIZE = sizeof(u32) }; enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE }; enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY }; ---- ./src/utils/libfat/directory.cpp.orig 2018-01-16 14:52:24.057192162 +0100 -+++ ./src/utils/libfat/directory.cpp 2018-01-16 14:52:27.833177099 +0100 +--- a/src/utils/libfat/directory.cpp 2018-01-16 14:52:24.057192162 +0100 ++++ b/src/utils/libfat/directory.cpp 2018-01-16 14:52:27.833177099 +0100 @@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 ( int bytes; size_t count = 0; diff --git a/srcpkgs/desmume/patches/glx_3Demu.cpp.patch b/srcpkgs/desmume/patches/glx_3Demu.cpp.patch index 544b5b58224..b4cbc755f29 100644 --- a/srcpkgs/desmume/patches/glx_3Demu.cpp.patch +++ b/srcpkgs/desmume/patches/glx_3Demu.cpp.patch @@ -1,7 +1,7 @@ Function returning void should not return a value :-) ---- src/gtk/glx_3Demu.cpp.orig 2014-02-01 16:26:52.801231527 +0100 -+++ src/gtk/glx_3Demu.cpp 2014-02-01 16:27:17.632357063 +0100 +--- a/src/gtk/glx_3Demu.cpp 2014-02-01 16:26:52.801231527 +0100 ++++ b/src/gtk/glx_3Demu.cpp 2014-02-01 16:27:17.632357063 +0100 @@ -41,11 +41,7 @@ void deinit_glx_3Demu(void) glXDestroyContext(dpy, ctx); diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template index db37ee4a51b..3afaa5027f7 100644 --- a/srcpkgs/desmume/template +++ b/srcpkgs/desmume/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="http://www.desmume.org" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896 -patch_args=-Np0 post_extract() { # git eats CRLFs, so the patch has wrong line ending. Instead diff --git a/srcpkgs/devil/patches/fix-mips-variable.patch b/srcpkgs/devil/patches/fix-mips-variable.patch index dd9ba3678a3..d0c3568d54e 100644 --- a/srcpkgs/devil/patches/fix-mips-variable.patch +++ b/srcpkgs/devil/patches/fix-mips-variable.patch @@ -1,5 +1,5 @@ ---- DevIL/src-IL/src/il_devil.cpp 2017-01-02 01:03:56.000000000 +0100 -+++ DevIL/src-IL/src/il_devil.cpp 2017-12-08 22:20:16.696024947 +0100 +--- a/DevIL/src-IL/src/il_devil.cpp 2017-01-02 01:03:56.000000000 +0100 ++++ b/DevIL/src-IL/src/il_devil.cpp 2017-12-08 22:20:16.696024947 +0100 @@ -187,7 +187,7 @@ // Internal version of ilTexImageSurface. ILboolean ILAPIENTRY ilTexImageSurface_(ILimage *Image, ILuint Width, ILuint Height, ILuint Depth, ILubyte Bpp, ILenum Format, ILenum Type, void *Data) diff --git a/srcpkgs/devil/patches/fix-solib-versions.patch b/srcpkgs/devil/patches/fix-solib-versions.patch index 7fba1d218e7..a17672348dc 100644 --- a/srcpkgs/devil/patches/fix-solib-versions.patch +++ b/srcpkgs/devil/patches/fix-solib-versions.patch @@ -1,5 +1,5 @@ ---- DevIL/src-IL/CMakeLists.txt 2017-01-02 01:03:56.000000000 +0100 -+++ DevIL/src-IL/CMakeLists.txt 2017-01-02 15:48:51.400299099 +0100 +--- a/DevIL/src-IL/CMakeLists.txt 2017-01-02 01:03:56.000000000 +0100 ++++ b/DevIL/src-IL/CMakeLists.txt 2017-01-02 15:48:51.400299099 +0100 @@ -58,6 +58,7 @@ if(BUILD_SHARED_LIBS) @@ -8,8 +8,8 @@ else(BUILD_SHARED_LIBS) add_library(IL ${DevIL_SRCS} ${DevIL_INC} ${DevIL_RSRC} ${DevIL_TXT}) endif(BUILD_SHARED_LIBS) ---- DevIL/src-ILU/CMakeLists.txt 2017-01-02 01:03:56.000000000 +0100 -+++ DevIL/src-ILU/CMakeLists.txt 2017-01-02 15:53:22.944560222 +0100 +--- a/DevIL/src-ILU/CMakeLists.txt 2017-01-02 01:03:56.000000000 +0100 ++++ b/DevIL/src-ILU/CMakeLists.txt 2017-01-02 15:53:22.944560222 +0100 @@ -44,6 +44,7 @@ # Remove SHARED to create a static library @@ -18,8 +18,8 @@ ## ILU requires IL ---- DevIL/src-ILUT/CMakeLists.txt 2017-01-02 01:03:56.000000000 +0100 -+++ DevIL/src-ILUT/CMakeLists.txt 2017-01-02 15:54:12.176607698 +0100 +--- a/DevIL/src-ILUT/CMakeLists.txt 2017-01-02 01:03:56.000000000 +0100 ++++ b/DevIL/src-ILUT/CMakeLists.txt 2017-01-02 15:54:12.176607698 +0100 @@ -44,6 +44,7 @@ # Remove SHARED to create a static library diff --git a/srcpkgs/devil/patches/jasper-2.0.17.patch b/srcpkgs/devil/patches/jasper-2.0.17.patch index c19ebb465b1..bee46f7912c 100644 --- a/srcpkgs/devil/patches/jasper-2.0.17.patch +++ b/srcpkgs/devil/patches/jasper-2.0.17.patch @@ -2,8 +2,8 @@ but it breaks API Index: DevIL/src-IL/src/il_jp2.cpp =================================================================== ---- DevIL/src-IL/src/il_jp2.cpp.orig -+++ DevIL/src-IL/src/il_jp2.cpp +--- a/DevIL/src-IL/src/il_jp2.cpp ++++ b/DevIL/src-IL/src/il_jp2.cpp @@ -314,15 +314,15 @@ ILboolean iLoadJp2Internal(jas_stream_t diff --git a/srcpkgs/devil/template b/srcpkgs/devil/template index 1a76819b665..1dffc7bdd52 100644 --- a/srcpkgs/devil/template +++ b/srcpkgs/devil/template @@ -16,7 +16,6 @@ distfiles="${SOURCEFORGE_SITE}/openil/DevIL-${version}.tar.gz" checksum=0075973ee7dd89f0507873e2580ac78336452d29d34a07134b208f44e2feb709 # The examples subpkg is gone replaces="devil-examples<1.8.0" -patch_args=-Np0 devil-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/dhcp/patches/0002-iproute2.patch b/srcpkgs/dhcp/patches/0002-iproute2.patch index 8f7297eac61..7d728e99ccc 100644 --- a/srcpkgs/dhcp/patches/0002-iproute2.patch +++ b/srcpkgs/dhcp/patches/0002-iproute2.patch @@ -1,7 +1,7 @@ diff --git a/client/scripts/linux b/client/scripts/linux index 5fb16121..c4cef632 100755 ---- client/scripts/linux -+++ client/scripts/linux +--- a/client/scripts/linux ++++ b/client/scripts/linux @@ -362,7 +362,7 @@ case "$reason" in interface_up_wait_time=5 for i in $(seq 0 ${interface_up_wait_time}) diff --git a/srcpkgs/dhcp/patches/dhcp-3.0-fix-perms.patch b/srcpkgs/dhcp/patches/dhcp-3.0-fix-perms.patch index 13debb20ed0..78725c2c79e 100644 --- a/srcpkgs/dhcp/patches/dhcp-3.0-fix-perms.patch +++ b/srcpkgs/dhcp/patches/dhcp-3.0-fix-perms.patch @@ -1,5 +1,5 @@ ---- server/dhcpd.c 2003-11-05 14:08:09.000000000 -0800 -+++ server/dhcpd.c 2003-11-05 14:15:32.000000000 -0800 +--- a/server/dhcpd.c 2003-11-05 14:08:09.000000000 -0800 ++++ b/server/dhcpd.c 2003-11-05 14:15:32.000000000 -0800 @@ -602,6 +602,12 @@ if (lftest) exit (0); diff --git a/srcpkgs/dhcp/patches/fix-includes.patch b/srcpkgs/dhcp/patches/fix-includes.patch index ef3d6dae008..10946a584c1 100644 --- a/srcpkgs/dhcp/patches/fix-includes.patch +++ b/srcpkgs/dhcp/patches/fix-includes.patch @@ -1,5 +1,5 @@ ---- includes/arpa/nameser.h -+++ includes/arpa/nameser.h +--- a/includes/arpa/nameser.h ++++ b/includes/arpa/nameser.h @@ -61,6 +61,8 @@ #ifndef _ARPA_NAMESER_H_ #define _ARPA_NAMESER_H_ diff --git a/srcpkgs/dhcp/patches/libatomic.patch b/srcpkgs/dhcp/patches/libatomic.patch index b32a4b3bacb..54f61b22851 100644 --- a/srcpkgs/dhcp/patches/libatomic.patch +++ b/srcpkgs/dhcp/patches/libatomic.patch @@ -8,8 +8,8 @@ Date: Fri Feb 7 14:26:35 2020 +0100 diff --git client/Makefile.am client/Makefile.am index d177159..5793903 100644 ---- client/Makefile.am -+++ client/Makefile.am +--- a/client/Makefile.am ++++ b/client/Makefile.am @@ -17,6 +17,6 @@ dhclient_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ @BINDLIBIRSDIR@/libirs.@A@ \ @BINDLIBDNSDIR@/libdns.@A@ \ @@ -20,8 +20,8 @@ index d177159..5793903 100644 EXTRA_DIST = $(man_MANS) diff --git client/tests/Makefile.am client/tests/Makefile.am index 8f1f058..fbf3e82 100644 ---- client/tests/Makefile.am -+++ client/tests/Makefile.am +--- a/client/tests/Makefile.am ++++ b/client/tests/Makefile.am @@ -22,7 +22,7 @@ DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \ @BINDLIBIRSDIR@/libirs.@A@ \ @BINDLIBDNSDIR@/libdns.@A@ \ @@ -33,8 +33,8 @@ index 8f1f058..fbf3e82 100644 if HAVE_ATF diff --git common/tests/Makefile.am common/tests/Makefile.am index a515265..8bd616c 100644 ---- common/tests/Makefile.am -+++ common/tests/Makefile.am +--- a/common/tests/Makefile.am ++++ b/common/tests/Makefile.am @@ -17,7 +17,7 @@ alloc_unittest_LDADD += ../libdhcp.@A@ ../../omapip/libomapi.@A@ \ @BINDLIBIRSDIR@/libirs.@A@ \ @BINDLIBDNSDIR@/libdns.@A@ \ @@ -91,8 +91,8 @@ index a515265..8bd616c 100644 @if test $(top_srcdir) != ${top_builddir}; then \ diff --git configure.ac configure.ac index 3a583a5..453bbd5 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -990,6 +990,9 @@ esac AC_C_FLEXIBLE_ARRAY_MEMBER @@ -105,8 +105,8 @@ index 3a583a5..453bbd5 100644 client/Makefile diff --git dhcpctl/Makefile.am dhcpctl/Makefile.am index 0d66971..413ad25 100644 ---- dhcpctl/Makefile.am -+++ dhcpctl/Makefile.am +--- a/dhcpctl/Makefile.am ++++ b/dhcpctl/Makefile.am @@ -14,7 +14,7 @@ omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \ $(BINDLIBIRSDIR)/libirs.a \ $(BINDLIBDNSDIR)/libdns.a \ @@ -124,8 +124,8 @@ index 0d66971..413ad25 100644 + $(BINDLIBISCDIR)/libisc.a @LIBATOMIC@ diff --git omapip/Makefile.am omapip/Makefile.am index 5b61581..bd5664f 100644 ---- omapip/Makefile.am -+++ omapip/Makefile.am +--- a/omapip/Makefile.am ++++ b/omapip/Makefile.am @@ -19,4 +19,4 @@ svtest_LDADD = libomapi.a \ $(BINDLIBIRSDIR)/libirs.a \ $(BINDLIBDNSDIR)/libdns.a \ @@ -134,8 +134,8 @@ index 5b61581..bd5664f 100644 + $(BINDLIBISCDIR)/libisc.a @LIBATOMIC@ diff --git relay/Makefile.am relay/Makefile.am index 5562b69..8b788b7 100644 ---- relay/Makefile.am -+++ relay/Makefile.am +--- a/relay/Makefile.am ++++ b/relay/Makefile.am @@ -8,6 +8,6 @@ dhcrelay_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ @BINDLIBIRSDIR@/libirs.@A@ \ @BINDLIBDNSDIR@/libdns.@A@ \ @@ -146,8 +146,8 @@ index 5562b69..8b788b7 100644 EXTRA_DIST = $(man_MANS) diff --git relay/tests/Makefile.am relay/tests/Makefile.am index fce3115..acbe68b 100644 ---- relay/tests/Makefile.am -+++ relay/tests/Makefile.am +--- a/relay/tests/Makefile.am ++++ b/relay/tests/Makefile.am @@ -19,7 +19,7 @@ DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \ @BINDLIBIRSDIR@/libirs.@A@ \ @BINDLIBDNSDIR@/libdns.@A@ \ @@ -159,8 +159,8 @@ index fce3115..acbe68b 100644 if HAVE_ATF diff --git server/Makefile.am server/Makefile.am index 787efca..f019d97 100644 ---- server/Makefile.am -+++ server/Makefile.am +--- a/server/Makefile.am ++++ b/server/Makefile.am @@ -18,7 +18,7 @@ dhcpd_LDADD = ../common/libdhcp.@A@ ../omapip/libomapi.@A@ \ $(BINDLIBIRSDIR)/libirs.@A@ \ $(BINDLIBDNSDIR)/libdns.@A@ \ @@ -172,8 +172,8 @@ index 787efca..f019d97 100644 EXTRA_DIST = $(man_MANS) diff --git server/tests/Makefile.am server/tests/Makefile.am index 699a0b6..3d97990 100644 ---- server/tests/Makefile.am -+++ server/tests/Makefile.am +--- a/server/tests/Makefile.am ++++ b/server/tests/Makefile.am @@ -23,7 +23,7 @@ DHCPLIBS = $(top_builddir)/common/libdhcp.@A@ \ $(BINDLIBIRSDIR)/libirs.@A@ \ $(BINDLIBDNSDIR)/libdns.@A@ \ diff --git a/srcpkgs/dhcp/template b/srcpkgs/dhcp/template index a466f6607a2..2db18dcc60b 100644 --- a/srcpkgs/dhcp/template +++ b/srcpkgs/dhcp/template @@ -11,7 +11,6 @@ license="MPL-2.0" homepage="https://www.isc.org/downloads/dhcp" distfiles="http://ftp.isc.org/isc/dhcp/${version/P/-P}/dhcp-${version/P/-P}.tar.gz" checksum=b05e04337539545a8faa0d6ac518defc61a07e5aec66a857f455e7f218c85a1a -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/dhcpcd/patches/privsep-ppc-build.patch b/srcpkgs/dhcpcd/patches/privsep-ppc-build.patch index 8d44dad000b..2ae9be602c0 100644 --- a/srcpkgs/dhcpcd/patches/privsep-ppc-build.patch +++ b/srcpkgs/dhcpcd/patches/privsep-ppc-build.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fix privsep build on ppc* diff --git src/privsep-linux.c src/privsep-linux.c index e588ecd..9d335ca 100644 ---- src/privsep-linux.c -+++ src/privsep-linux.c +--- a/src/privsep-linux.c ++++ b/src/privsep-linux.c @@ -42,6 +42,7 @@ #include #include diff --git a/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch b/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch index 2555efbb009..1d16db43168 100644 --- a/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch +++ b/srcpkgs/dhcpcd/patches/wpa-hook-stop.patch @@ -1,5 +1,5 @@ ---- hooks/10-wpa_supplicant.orig 2014-11-26 16:34:35.000000000 +0100 -+++ hooks/10-wpa_supplicant 2014-11-28 11:53:48.929217243 +0100 +--- a/hooks/10-wpa_supplicant 2014-11-26 16:34:35.000000000 +0100 ++++ b/hooks/10-wpa_supplicant 2014-11-28 11:53:48.929217243 +0100 @@ -114,6 +114,6 @@ then case "$reason" in PREINIT) wpa_supplicant_start;; diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index dbd6f288fbb..e651bd01906 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -17,7 +17,6 @@ distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz" checksum=41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513 lib32disabled=yes conf_files=/etc/dhcpcd.conf -patch_args=-Np0 system_accounts="_dhcpcd" _dhcpcd_homedir="/var/db/dhcpcd" diff --git a/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch b/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch index c31a74af3e8..0b5a8a81584 100644 --- a/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch +++ b/srcpkgs/dhewm3/patches/musl-temp_failure_retry.patch @@ -1,5 +1,5 @@ ---- neo/sys/posix/posix_net.cpp 2016-06-19 01:48:20.000000000 +0200 -+++ new/sys/posix/posix_net.cpp 2016-08-17 18:20:27.634588999 +0200 +--- a/neo/sys/posix/posix_net.cpp 2016-06-19 01:48:20.000000000 +0200 ++++ b/new/sys/posix/posix_net.cpp 2016-08-17 18:20:27.634588999 +0200 @@ -49,6 +49,15 @@ #include "sys/posix/posix_public.h" diff --git a/srcpkgs/dhewm3/template b/srcpkgs/dhewm3/template index f2cfd2c0f79..5509900e8c0 100644 --- a/srcpkgs/dhewm3/template +++ b/srcpkgs/dhewm3/template @@ -11,4 +11,3 @@ license="GPL-3.0-or-later" homepage="https://dhewm3.org/" distfiles="https://github.com/dhewm/dhewm3/releases/download/${version}/dhewm3-${version}-src.tar.xz" checksum=31671f35fb6f83272dfa2a27c0dad6183bc228f1f1a448ef925052cf4dcf4b68 -patch_args=-Np0 diff --git a/srcpkgs/dia/patches/isinf.patch b/srcpkgs/dia/patches/isinf.patch index 4cd4adbc864..0f55c0f2928 100644 --- a/srcpkgs/dia/patches/isinf.patch +++ b/srcpkgs/dia/patches/isinf.patch @@ -1,5 +1,5 @@ ---- ./configure.orig -+++ ./configure +--- a/configure ++++ b/configure @@ -17436,11 +17436,11 @@ #ifdef __cplusplus extern "C" diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template index 62af8fcba80..45f48aab4dc 100644 --- a/srcpkgs/dia/template +++ b/srcpkgs/dia/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Dia" distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz" checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34 -patch_args=-Np0 post_patch() { vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure diff --git a/srcpkgs/dialogbox/patches/fix-cxx11-string_literals.patch b/srcpkgs/dialogbox/patches/fix-cxx11-string_literals.patch index a16ad326670..218b286b205 100644 --- a/srcpkgs/dialogbox/patches/fix-cxx11-string_literals.patch +++ b/srcpkgs/dialogbox/patches/fix-cxx11-string_literals.patch @@ -1,8 +1,8 @@ Compiling with -std=c++11 requires blanks between string literals and macros defining strings. ---- dialogmain.cpp 2016-03-02 20:31:01.000000000 +0100 -+++ dialogmain.cpp 2016-12-27 22:03:26.774405881 +0100 +--- a/dialogmain.cpp 2016-03-02 20:31:01.000000000 +0100 ++++ b/dialogmain.cpp 2016-12-27 22:03:26.774405881 +0100 @@ -28,7 +28,7 @@ #define VERSION "1.0" diff --git a/srcpkgs/dialogbox/patches/fix-missing_headers.patch b/srcpkgs/dialogbox/patches/fix-missing_headers.patch index dfbec53bd63..74c69f3c501 100644 --- a/srcpkgs/dialogbox/patches/fix-missing_headers.patch +++ b/srcpkgs/dialogbox/patches/fix-missing_headers.patch @@ -1,7 +1,7 @@ For Qt5 the header files of widgets have to be explicitly included. ---- dialogbox.hpp 2016-03-02 20:31:01.000000000 +0100 -+++ dialogbox.hpp 2016-12-27 21:54:05.335465144 +0100 +--- a/dialogbox.hpp 2016-03-02 20:31:01.000000000 +0100 ++++ b/dialogbox.hpp 2016-12-27 21:54:05.335465144 +0100 @@ -22,6 +22,23 @@ #define DIALOGBOX_H diff --git a/srcpkgs/dialogbox/patches/fix-qt_add_widgets.patch b/srcpkgs/dialogbox/patches/fix-qt_add_widgets.patch index ac999d4a6ef..0e8f49485f8 100644 --- a/srcpkgs/dialogbox/patches/fix-qt_add_widgets.patch +++ b/srcpkgs/dialogbox/patches/fix-qt_add_widgets.patch @@ -1,7 +1,7 @@ For Qt5 the project file needs to add QT += widgets. ---- dialogbox.pro 2016-03-02 20:31:01.000000000 +0100 -+++ dialogbox.pro 2016-12-27 22:06:17.270398461 +0100 +--- a/dialogbox.pro 2016-03-02 20:31:01.000000000 +0100 ++++ b/dialogbox.pro 2016-12-27 22:06:17.270398461 +0100 @@ -1,5 +1,6 @@ TEMPLATE = app TARGET = dialogbox diff --git a/srcpkgs/dialogbox/template b/srcpkgs/dialogbox/template index f213a4c2d3a..31d985e6176 100644 --- a/srcpkgs/dialogbox/template +++ b/srcpkgs/dialogbox/template @@ -11,4 +11,3 @@ license="GPL-3.0-or-later" homepage="https://github.com/martynets/dialogbox" distfiles="https://github.com/martynets/dialogbox/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=554e59712a616772cff5734206e2a223171ad57c0e922421d8383a763b11640e -patch_args=-Np0 diff --git a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch index 1ab52f8f5bf..87410a38b0b 100644 --- a/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch +++ b/srcpkgs/dillo/patches/fix-FTBFS-with-gcc-10.patch @@ -4,8 +4,8 @@ Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1799282 Author: Axel Beckert Forwarded: no ---- dpid/dpid.h -+++ dpid/dpid.h +--- a/dpid/dpid.h ++++ b/dpid/dpid.h @@ -25,10 +25,10 @@ /*! \TODO: Should read this from dillorc */ @@ -44,8 +44,8 @@ Forwarded: no /*! Set to 1 by the SIGCHLD handler dpi_sigchld */ extern volatile sig_atomic_t caught_sigchld; ---- dpid/main.c -+++ dpid/main.c +--- a/dpid/main.c ++++ b/dpid/main.c @@ -31,6 +31,17 @@ #include "../dpip/dpip.h" @@ -64,8 +64,8 @@ Forwarded: no /* Start a dpi filter plugin after accepting the pending connection ---- dpid/dpid_common.h -+++ dpid/dpid_common.h +--- a/dpid/dpid_common.h ++++ b/dpid/dpid_common.h @@ -38,10 +38,7 @@ diff --git a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch index 40f7066dffa..868737753bd 100644 --- a/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch +++ b/srcpkgs/dillo/patches/fix-OpenSSL-1.1-detection.patch @@ -3,8 +3,8 @@ Bug-Debian: https://bugs.debian.org/845035 Author: Axel Beckert Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html ---- configure 2015-06-30 16:07:22.000000000 +0200 -+++ - 2021-02-26 22:19:38.871826383 +0100 +--- a/configure 2015-06-30 16:07:22.000000000 +0200 ++++ b/configure 2015-06-30 16:07:22.000000000 +0200 @@ -6002,9 +6002,9 @@ if test "x$ssl_ok" = "xyes"; then @@ -53,8 +53,8 @@ Forwarded: http://lists.dillo.org/pipermail/dillo-dev/2017-September/011076.html ssl_ok=yes else ssl_ok=no ---- dpi/https.c -+++ dpi/https.c +--- a/dpi/https.c ++++ b/dpi/https.c @@ -476,7 +476,7 @@ case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: /*Either self signed and untrusted*/ diff --git a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch index 702ade447f9..270f4247d3f 100644 --- a/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch +++ b/srcpkgs/dillo/patches/fix-duckduckgo-shortcut-in-dillorc.patch @@ -3,8 +3,8 @@ Bug-Debian: https://bugs.debian/org/924357 Forwarded: no Author: liftof+dbug@gmail.com ---- dillorc -+++ dillorc +--- a/dillorc ++++ b/dillorc @@ -157,7 +157,7 @@ # You can enable multiple search_url strings at once and select from among # them at runtime, with the first being the default. diff --git a/srcpkgs/dillo/template b/srcpkgs/dillo/template index 16a821062d9..d2bdc4bf77e 100644 --- a/srcpkgs/dillo/template +++ b/srcpkgs/dillo/template @@ -15,4 +15,3 @@ license="GPL-3.0-or-later" homepage="http://www.dillo.org/download/" distfiles="http://www.dillo.org/download/${pkgname}-${version}.tar.bz2" checksum=db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b -patch_args=-Np0 diff --git a/srcpkgs/diod/patches/fix-ftbfs.patch b/srcpkgs/diod/patches/fix-ftbfs.patch index 6af28e7be4a..12b0f8fab57 100644 --- a/srcpkgs/diod/patches/fix-ftbfs.patch +++ b/srcpkgs/diod/patches/fix-ftbfs.patch @@ -1,5 +1,5 @@ ---- diod/ops.c -+++ diod/ops.c +--- a/diod/ops.c ++++ b/diod/ops.c @@ -69,6 +69,7 @@ #include #include @@ -8,8 +8,8 @@ #include #include #include ---- diod/xattr.c -+++ diod/xattr.c +--- a/diod/xattr.c ++++ b/diod/xattr.c @@ -39,7 +39,7 @@ #include #include diff --git a/srcpkgs/diod/template b/srcpkgs/diod/template index 548e1f9f054..de62d6c62b7 100644 --- a/srcpkgs/diod/template +++ b/srcpkgs/diod/template @@ -12,7 +12,6 @@ license="GPL-2" homepage="https://github.com/chaos/diod" distfiles="https://github.com/chaos/diod/releases/download/${version}/${pkgname}-${version}.tar.gz" checksum=f41d2b91c1a712132f5457d9d1c3caca985f069bdc8ef27bf4c148ac1d9f8c9f -patch_args=-Np0 post_install() { vsv diod diff --git a/srcpkgs/discord-ptb/patches/discord-ptb.desktop.patch b/srcpkgs/discord-ptb/patches/discord-ptb.desktop.patch index e92f14b4da3..eae6d3d09f9 100644 --- a/srcpkgs/discord-ptb/patches/discord-ptb.desktop.patch +++ b/srcpkgs/discord-ptb/patches/discord-ptb.desktop.patch @@ -1,5 +1,5 @@ -*** discord-ptb.desktop ---- discord-ptb.desktop +*** a/discord-ptb.desktop +--- a/discord-ptb.desktop *************** GenericName=Internet Messenger *** 6 **** ! Exec=/usr/share/discord-ptb/DiscordPTB diff --git a/srcpkgs/discord-ptb/template b/srcpkgs/discord-ptb/template index 35bd7f20fa2..b1467a7dc26 100644 --- a/srcpkgs/discord-ptb/template +++ b/srcpkgs/discord-ptb/template @@ -16,7 +16,6 @@ _license_checksum=9abbd207c86f76a59c0017c131dc7a30089c40b4dacb54a0f339272468344e nopie=yes restricted=yes repository=nonfree -patch_args=-Np0 post_extract() { $XBPS_FETCH_CMD -o eula https://discord.com/terms; cat eula | diff --git a/srcpkgs/discord/patches/discord.desktop.patch b/srcpkgs/discord/patches/discord.desktop.patch index d87f6970527..27b4a43c0ef 100644 --- a/srcpkgs/discord/patches/discord.desktop.patch +++ b/srcpkgs/discord/patches/discord.desktop.patch @@ -1,5 +1,5 @@ -*** discord.desktop ---- discord.desktop +*** a/discord.desktop +--- a/discord.desktop *************** GenericName=Internet Messenger *** 6 **** ! Exec=/usr/share/discord/Discord diff --git a/srcpkgs/discord/template b/srcpkgs/discord/template index 17f259b8206..fc6a70079d8 100644 --- a/srcpkgs/discord/template +++ b/srcpkgs/discord/template @@ -14,7 +14,6 @@ checksum=adede954e9c696d96e254759b539527a24ab1d42f0d548c5c4309d1a3fc3c25e repository=nonfree restricted=yes nopie=yes -patch_args=-Np0 do_install() { local package_location="usr/lib/$pkgname" item diff --git a/srcpkgs/discount/patches/cross-configure_inc.patch b/srcpkgs/discount/patches/cross-configure_inc.patch index 2d6995911c5..8babeec442e 100644 --- a/srcpkgs/discount/patches/cross-configure_inc.patch +++ b/srcpkgs/discount/patches/cross-configure_inc.patch @@ -1,5 +1,5 @@ ---- configure.inc.orig -+++ configure.inc +--- a/configure.inc ++++ b/configure.inc @@ -1770,7 +1770,7 @@ } EOF diff --git a/srcpkgs/discount/patches/cross-makefile_in.patch b/srcpkgs/discount/patches/cross-makefile_in.patch index 8d33a304df0..b5276a8761f 100644 --- a/srcpkgs/discount/patches/cross-makefile_in.patch +++ b/srcpkgs/discount/patches/cross-makefile_in.patch @@ -1,5 +1,5 @@ ---- Makefile.in.orig -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -95,8 +95,8 @@ blocktags: mktags ./mktags > blocktags diff --git a/srcpkgs/discount/template b/srcpkgs/discount/template index 3bee8589539..d47f4651841 100644 --- a/srcpkgs/discount/template +++ b/srcpkgs/discount/template @@ -12,7 +12,6 @@ homepage="http://www.pell.portland.or.us/~orc/Code/discount" distfiles="https://github.com/Orc/discount/archive/v${version}.tar.gz" checksum=72c1325ddfc40871d6810f1e272cf2d45b361f26357eb38f170fd04d737bb9f2 disable_parallel_build=yes -patch_args=-Np0 do_install() { make DESTDIR=${DESTDIR} install install.man diff --git a/srcpkgs/dislocker/patches/fix-cflags.patch b/srcpkgs/dislocker/patches/fix-cflags.patch index 1229efeeaf0..80d82e3f8a1 100644 --- a/srcpkgs/dislocker/patches/fix-cflags.patch +++ b/srcpkgs/dislocker/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: src/CMakeLists.txt =================================================================== ---- src/CMakeLists.txt.orig -+++ src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -71,7 +71,7 @@ if(NOT DEFINED WARN_FLAGS) set (WARN_FLAGS "-Wall -Wextra" CACHE STRING "" FORCE) endif() diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template index 97b42c35a35..a5580034c6f 100644 --- a/srcpkgs/dislocker/template +++ b/srcpkgs/dislocker/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="https://github.com/Aorimn/dislocker" distfiles="https://github.com/Aorimn/${pkgname}/archive/v${version}.tar.gz" checksum=8d5275577c44f2bd87f6e05dd61971a71c0e56a9cbedf000bd38deadd8b6c1e6 -patch_args=-Np0 diff --git a/srcpkgs/dispcalGUI/patches/error.patch b/srcpkgs/dispcalGUI/patches/error.patch index 35fd457a242..169fc528b13 100644 --- a/srcpkgs/dispcalGUI/patches/error.patch +++ b/srcpkgs/dispcalGUI/patches/error.patch @@ -4,8 +4,8 @@ Therefore the current code either results in garbled output or doesn't work at all. Replace it with a simple printf. --- ---- DisplayCAL/RealDisplaySizeMM.c 2018-07-25 16:47:01.000000000 +0200 -+++ - 2020-06-07 22:27:10.984231905 +0200 +--- a/DisplayCAL/RealDisplaySizeMM.c 2018-07-25 16:47:01.000000000 +0200 ++++ b/DisplayCAL/RealDisplaySizeMM.c 2018-07-25 16:47:01.000000000 +0200 @@ -822,13 +822,13 @@ sprintf(desc1, "_ICC_PROFILE_%d",disps[ndisps]->uscreen); diff --git a/srcpkgs/dispcalGUI/template b/srcpkgs/dispcalGUI/template index 6e86a157729..1bb51316a5d 100644 --- a/srcpkgs/dispcalGUI/template +++ b/srcpkgs/dispcalGUI/template @@ -14,7 +14,6 @@ license="GPL-3.0-or-later" homepage="https://displaycal.net/" distfiles="${SOURCEFORGE_SITE}/dispcalgui/${_name}-${version}.tar.gz" checksum=7c34dfbd9f66f24f1d4c88de4a5a0de688aad719f095874b6259637d30893bea -patch_args=-Np0 pre_configure() { sed -i 's|MimeType=model/vrml;x-world/x-vrml;|MimeType=model/vrml;|' misc/displaycal-vrml-to-x3d-converter.desktop diff --git a/srcpkgs/djview/patches/sane-qmake-query.patch b/srcpkgs/djview/patches/sane-qmake-query.patch index 09df531f62d..9162fe06187 100644 --- a/srcpkgs/djview/patches/sane-qmake-query.patch +++ b/srcpkgs/djview/patches/sane-qmake-query.patch @@ -1,7 +1,7 @@ Index: config/acinclude.m4 =================================================================== ---- config/acinclude.m4.orig -+++ config/acinclude.m4 +--- a/config/acinclude.m4 ++++ b/config/acinclude.m4 @@ -302,19 +302,8 @@ Please define variable QMAKE and possibl Defining QTDIR can help although it is deprecated.]) fi diff --git a/srcpkgs/djview/template b/srcpkgs/djview/template index bade9c6f96b..76a0d1cc410 100644 --- a/srcpkgs/djview/template +++ b/srcpkgs/djview/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="http://djvu.sourceforge.net/djview4.html" distfiles="${SOURCEFORGE_SITE}/djvu/${pkgname}-${version}.tar.gz" checksum=5673c6a8b7e195b91a1720b24091915b8145de34879db1158bc936b100eaf3e3 -patch_args=-Np0 post_extract() { vsed -i -e '/Exec/s/djview4/djview/' \ diff --git a/srcpkgs/dma/patches/musl_getprogname.patch b/srcpkgs/dma/patches/musl_getprogname.patch index dc252907df4..732415021c3 100644 --- a/srcpkgs/dma/patches/musl_getprogname.patch +++ b/srcpkgs/dma/patches/musl_getprogname.patch @@ -1,7 +1,7 @@ Even if not defining __GLIBC__, musl libc has program_invocation_short_name ---- dfcompat.c 2013-06-03 16:03:15.000000000 +0200 -+++ dfcompat.c 2015-08-07 14:57:37.814738238 +0200 +--- a/dfcompat.c 2013-06-03 16:03:15.000000000 +0200 ++++ b/dfcompat.c 2015-08-07 14:57:37.814738238 +0200 @@ -105,8 +105,6 @@ #ifndef HAVE_GETPROGNAME diff --git a/srcpkgs/dma/template b/srcpkgs/dma/template index 5ec809adcf7..71892496013 100644 --- a/srcpkgs/dma/template +++ b/srcpkgs/dma/template @@ -13,7 +13,6 @@ homepage="https://github.com/corecode/dma" distfiles="https://github.com/corecode/dma/archive/v${version}.tar.gz" checksum=9d4b903f2b750d888f51d668d08d2ea18404dedb0a52cffeb3c81376023c1946 system_accounts="mail" -patch_args=-Np0 provides="smtp-server-0_1 smtp-forwarder-0_1" replaces="smtp-server>=0 smtp-forwarder>=0" diff --git a/srcpkgs/dmd-bootstrap/patches/pic.patch b/srcpkgs/dmd-bootstrap/patches/pic.patch index 60811fa8321..5102451d15c 100644 --- a/srcpkgs/dmd-bootstrap/patches/pic.patch +++ b/srcpkgs/dmd-bootstrap/patches/pic.patch @@ -1,5 +1,5 @@ ---- dmd/src/mars.c -+++ dmd/src/mars.c +--- a/dmd/src/mars.c ++++ b/dmd/src/mars.c @@ -267,6 +267,7 @@ int tryMain(size_t argc, const char *argv[]) // Set default values diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template index 1a7c483982f..029b0024fae 100644 --- a/srcpkgs/dmd-bootstrap/template +++ b/srcpkgs/dmd-bootstrap/template @@ -21,7 +21,6 @@ checksum=" 7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422 57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19" provides="d-compiler-${version}_${revision}" -patch_args=-Np0 post_extract() { rm -rf dmd druntime phobos diff --git a/srcpkgs/dmd2.081/patches/backport-ld-exit.patch b/srcpkgs/dmd2.081/patches/backport-ld-exit.patch index a3012be7bee..2c021517af0 100644 --- a/srcpkgs/dmd2.081/patches/backport-ld-exit.patch +++ b/srcpkgs/dmd2.081/patches/backport-ld-exit.patch @@ -1,5 +1,5 @@ ---- dmd/src/dmd/link.d -+++ dmd/src/dmd/link.d +--- a/dmd/src/dmd/link.d ++++ b/dmd/src/dmd/link.d @@ -685,7 +685,7 @@ public int runLINK() close(fds[0]); execvp(argv[0], cast(char**)argv.tdata()); diff --git a/srcpkgs/dmd2.081/template b/srcpkgs/dmd2.081/template index f33ef534d0e..79aad094008 100644 --- a/srcpkgs/dmd2.081/template +++ b/srcpkgs/dmd2.081/template @@ -24,7 +24,6 @@ provides="d-compiler-${version}_${revision}" conflicts="dmd-bootstrap" nopie=yes LDFLAGS="-lpthread" -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in x86_64*) _archbits=64;; diff --git a/srcpkgs/dmd2.091/patches/backport-ld-exit.patch b/srcpkgs/dmd2.091/patches/backport-ld-exit.patch index d4d34035791..40fa13584e4 100644 --- a/srcpkgs/dmd2.091/patches/backport-ld-exit.patch +++ b/srcpkgs/dmd2.091/patches/backport-ld-exit.patch @@ -1,5 +1,5 @@ ---- dmd/src/dmd/link.d -+++ dmd/src/dmd/link.d +--- a/dmd/src/dmd/link.d ++++ b/dmd/src/dmd/link.d @@ -782,7 +782,7 @@ public int runLINK() close(fds[0]); execvp(argv[0], argv.tdata()); diff --git a/srcpkgs/dmd2.091/template b/srcpkgs/dmd2.091/template index 13e976b57a4..72521df7cd3 100644 --- a/srcpkgs/dmd2.091/template +++ b/srcpkgs/dmd2.091/template @@ -26,7 +26,6 @@ nopie=yes nocross=yes disable_parallel_build=yes LDFLAGS="-lpthread" -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in x86_64*) _archbits=64;; diff --git a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch index c5769dfc12f..b5ed45d2ff3 100644 --- a/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch +++ b/srcpkgs/dmg2img/patches/0001-openssl-1.1-compatibility.patch @@ -17,8 +17,8 @@ Fixes https://github.com/Lekensteyn/dmg2img/issues/4 diff --git a/vfdecrypt.c b/vfdecrypt.c index 56d3530..b1a36d3 100644 ---- vfdecrypt.c -+++ vfdecrypt.c +--- a/vfdecrypt.c ++++ b/vfdecrypt.c @@ -183,7 +183,7 @@ void adjust_v2_header_byteorder(cencrypted_v2_pwheader *pwhdr) { pwhdr->encrypted_keyblob_size = htonl(pwhdr->encrypted_keyblob_size); } diff --git a/srcpkgs/dmg2img/template b/srcpkgs/dmg2img/template index bfe2c851b26..a14781b0c3b 100644 --- a/srcpkgs/dmg2img/template +++ b/srcpkgs/dmg2img/template @@ -10,4 +10,3 @@ license="GPL-2.0-or-later" homepage="http://vu1tur.eu.org/dmg2img" distfiles="http://vu1tur.eu.org/tools/dmg2img-${version}.tar.gz" checksum=02aea6d05c5b810074913b954296ddffaa43497ed720ac0a671da4791ec4d018 -patch_args=-Np0 diff --git a/srcpkgs/dmtx-utils/patches/fix-compiler-warnings.patch b/srcpkgs/dmtx-utils/patches/fix-compiler-warnings.patch index 0936ff9a967..d98cab744d7 100644 --- a/srcpkgs/dmtx-utils/patches/fix-compiler-warnings.patch +++ b/srcpkgs/dmtx-utils/patches/fix-compiler-warnings.patch @@ -3,8 +3,8 @@ Author: Roberto Lumbreras Index: dmtx-utils-0.7.6/dmtxread/dmtxread.c =================================================================== ---- dmtxread/dmtxread.c 2018-08-09 08:08:03.657379018 +0200 -+++ dmtxread/dmtxread.c 2018-08-09 08:08:03.649378973 +0200 +--- a/dmtxread/dmtxread.c 2018-08-09 08:08:03.657379018 +0200 ++++ b/dmtxread/dmtxread.c 2018-08-09 08:08:03.649378973 +0200 @@ -724,7 +724,7 @@ int i, idx; int row, rowCount; @@ -16,8 +16,8 @@ Index: dmtx-utils-0.7.6/dmtxread/dmtxread.c list = MagickQueryFormats("*", &totalCount); Index: dmtx-utils-0.7.6/dmtxwrite/dmtxwrite.c =================================================================== ---- dmtxwrite/dmtxwrite.c 2018-08-09 08:08:03.657379018 +0200 -+++ dmtxwrite/dmtxwrite.c 2018-08-09 08:08:03.649378973 +0200 +--- a/dmtxwrite/dmtxwrite.c 2018-08-09 08:08:03.657379018 +0200 ++++ b/dmtxwrite/dmtxwrite.c 2018-08-09 08:08:03.649378973 +0200 @@ -455,7 +455,7 @@ int i, idx; int row, rowCount; diff --git a/srcpkgs/dmtx-utils/patches/fix-getopt_check.patch b/srcpkgs/dmtx-utils/patches/fix-getopt_check.patch index a46b06eeb47..e6d14a5a443 100644 --- a/srcpkgs/dmtx-utils/patches/fix-getopt_check.patch +++ b/srcpkgs/dmtx-utils/patches/fix-getopt_check.patch @@ -1,8 +1,8 @@ Remove check for getopt_long and not existing source files common/getopt.c and common/getopt1.c ---- configure.ac 2015-10-25 20:55:07.635988008 +0100 -+++ configure.ac 2015-10-25 20:56:18.683993130 +0100 +--- a/configure.ac 2015-10-25 20:55:07.635988008 +0100 ++++ b/configure.ac 2015-10-25 20:56:18.683993130 +0100 @@ -20,7 +20,6 @@ AC_CHECK_HEADERS([sysexits.h]) diff --git a/srcpkgs/dmtx-utils/patches/pkg-config.patch b/srcpkgs/dmtx-utils/patches/pkg-config.patch index d4abeaaac1c..038df0a7378 100644 --- a/srcpkgs/dmtx-utils/patches/pkg-config.patch +++ b/srcpkgs/dmtx-utils/patches/pkg-config.patch @@ -3,8 +3,8 @@ Author: Roberto Lumbreras Index: dmtx-utils-0.7.6/configure.ac =================================================================== ---- configure.ac 2018-08-08 19:49:08.880725473 +0200 -+++ configure.ac 2018-08-08 19:49:08.872725433 +0200 +--- a/configure.ac 2018-08-08 19:49:08.880725473 +0200 ++++ b/configure.ac 2018-08-08 19:49:08.872725433 +0200 @@ -6,7 +6,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) diff --git a/srcpkgs/dmtx-utils/template b/srcpkgs/dmtx-utils/template index a38d7cfcb77..b251f0a2061 100644 --- a/srcpkgs/dmtx-utils/template +++ b/srcpkgs/dmtx-utils/template @@ -11,7 +11,6 @@ license="LGPL-2.1-or-later" homepage="https://github.com/dmtx/dmtx-utils" distfiles="https://github.com/dmtx/dmtx-utils/archive/v${version}/dmtx-utils-${version}.tar.gz" checksum=0d396ec14f32a8cf9e08369a4122a16aa2e5fa1675e02218f16f1ab777ea2a28 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/docbook-xsl-ns/patches/catalog-compat.patch b/srcpkgs/docbook-xsl-ns/patches/catalog-compat.patch index de3fb36ba0c..080a7700d88 100644 --- a/srcpkgs/docbook-xsl-ns/patches/catalog-compat.patch +++ b/srcpkgs/docbook-xsl-ns/patches/catalog-compat.patch @@ -10,8 +10,8 @@ does not break with changed registered URI. Forwarded: not-needed Last-Update: 2020-06-02 ---- catalog.xml -+++ catalog.xml +--- a/catalog.xml ++++ b/catalog.xml @@ -5,4 +5,7 @@ diff --git a/srcpkgs/docbook-xsl-ns/template b/srcpkgs/docbook-xsl-ns/template index 1b88e629d0a..04b3c274e51 100644 --- a/srcpkgs/docbook-xsl-ns/template +++ b/srcpkgs/docbook-xsl-ns/template @@ -13,7 +13,6 @@ homepage="https://docbook.org/" distfiles="https://github.com/docbook/xslt10-stylesheets/releases/download/release/${version}/${wrksrc}.tar.bz2" checksum=316524ea444e53208a2fb90eeb676af755da96e1417835ba5f5eb719c81fa371 xml_entries="nextCatalog /usr/share/xsl-ns/docbook/catalog.xml --" -patch_args=-Np0 do_install() { local xslmods="assembly common eclipse epub epub3 fo highlighting html \ diff --git a/srcpkgs/docbook-xsl/patches/0001_non-recursive_string_subst.patch b/srcpkgs/docbook-xsl/patches/0001_non-recursive_string_subst.patch index 944d18b1a5b..56637ccdef1 100644 --- a/srcpkgs/docbook-xsl/patches/0001_non-recursive_string_subst.patch +++ b/srcpkgs/docbook-xsl/patches/0001_non-recursive_string_subst.patch @@ -7,8 +7,8 @@ long strings with many matches will cause stack overflows. Bug-Debian: https://bugs.debian.org/750593 ---- lib/lib.xsl -+++ lib/lib.xsl +--- a/lib/lib.xsl ++++ b/lib/lib.xsl @@ -6,7 +6,11 @@ This module implements DTD-independent functions diff --git a/srcpkgs/docbook-xsl/patches/0002_docbook-xsl-mandir.patch b/srcpkgs/docbook-xsl/patches/0002_docbook-xsl-mandir.patch index 99c81f0c819..17c337ae4ff 100644 --- a/srcpkgs/docbook-xsl/patches/0002_docbook-xsl-mandir.patch +++ b/srcpkgs/docbook-xsl/patches/0002_docbook-xsl-mandir.patch @@ -5,8 +5,8 @@ Subject: Fix bad .so links in man pages Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=%23727251 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=831831 ---- manpages/other.xsl -+++ manpages/other.xsl +--- a/manpages/other.xsl ++++ b/manpages/other.xsl @@ -558,7 +558,14 @@ Note: (soelim stub) diff --git a/srcpkgs/docbook-xsl/patches/0003_catalog.xml-Compatibility-with-1.79.1-or-earlier.patch b/srcpkgs/docbook-xsl/patches/0003_catalog.xml-Compatibility-with-1.79.1-or-earlier.patch index 56ce2cb3d44..2eeb07385cc 100644 --- a/srcpkgs/docbook-xsl/patches/0003_catalog.xml-Compatibility-with-1.79.1-or-earlier.patch +++ b/srcpkgs/docbook-xsl/patches/0003_catalog.xml-Compatibility-with-1.79.1-or-earlier.patch @@ -10,8 +10,8 @@ does not break with changed registered URI. Forwarded: not-needed Last-Update: 2020-06-02 ---- catalog.xml -+++ catalog.xml +--- a/catalog.xml ++++ b/catalog.xml @@ -5,4 +5,7 @@ diff --git a/srcpkgs/docbook-xsl/template b/srcpkgs/docbook-xsl/template index 260eee70d6f..5cf9b0d5fc9 100644 --- a/srcpkgs/docbook-xsl/template +++ b/srcpkgs/docbook-xsl/template @@ -13,7 +13,6 @@ homepage="https://docbook.org/" distfiles="https://github.com/docbook/xslt10-stylesheets/releases/download/release/${version}/${wrksrc}.tar.bz2" checksum=ee8b9eca0b7a8f89075832a2da7534bce8c5478fc8fc2676f512d5d87d832102 xml_entries="nextCatalog /usr/share/xsl/docbook/catalog.xml --" -patch_args=-Np0 do_install() { local xslmods="assembly common eclipse epub epub3 fo highlighting html \ diff --git a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch index 65d86f08147..62d1bc86304 100644 --- a/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch +++ b/srcpkgs/dolphin-emu/patches/VkDeviceMemory.patch @@ -11,8 +11,8 @@ Subject: [PATCH] Resolve VkDeviceMemory/nullptr type mismatch to fix build on diff --git Source/Core/VideoBackends/Vulkan/VKTexture.cpp Source/Core/VideoBackends/Vulkan/VKTexture.cpp index fcff0db4048..80c0c4aa86d 100644 ---- Source/Core/VideoBackends/Vulkan/VKTexture.cpp -+++ Source/Core/VideoBackends/Vulkan/VKTexture.cpp +--- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp ++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp @@ -122,7 +122,7 @@ std::unique_ptr VKTexture::CreateAdopted(const TextureConfig& tex_con VkImageViewType view_type, VkImageLayout layout) { @@ -24,8 +24,8 @@ index fcff0db4048..80c0c4aa86d 100644 diff --git Source/Core/VideoBackends/Vulkan/VKTexture.h Source/Core/VideoBackends/Vulkan/VKTexture.h index 91d3e54eac2..3b803dd4da4 100644 ---- Source/Core/VideoBackends/Vulkan/VKTexture.h -+++ Source/Core/VideoBackends/Vulkan/VKTexture.h +--- a/Source/Core/VideoBackends/Vulkan/VKTexture.h ++++ b/Source/Core/VideoBackends/Vulkan/VKTexture.h @@ -54,7 +54,7 @@ class VKTexture final : public AbstractTexture VkImageView GetView() const { return m_view; } VkImageLayout GetLayout() const { return m_layout; } diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index fdd4a636e7a..729f66512d4 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -22,7 +22,6 @@ homepage="http://dolphin-emu.org" distfiles="https://github.com/dolphin-emu/dolphin/archive/${_commit}.tar.gz" checksum=a7ce8390993b3309108dea8f23976b343d2d7cd527f3ded9ef4c2a0462c7f338 nopie=yes -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in x86_64*|aarch64*) ;; diff --git a/srcpkgs/dovecot/patches/mkcert-ssldir.patch b/srcpkgs/dovecot/patches/mkcert-ssldir.patch index 3841b025dad..b19beedb95e 100644 --- a/srcpkgs/dovecot/patches/mkcert-ssldir.patch +++ b/srcpkgs/dovecot/patches/mkcert-ssldir.patch @@ -1,7 +1,7 @@ Set correct path to OPENSSLCONFIG. ---- doc/mkcert.sh.orig 2012-01-31 15:25:06.611718182 +0100 -+++ doc/mkcert.sh 2012-01-31 15:25:27.298222975 +0100 +--- a/doc/mkcert.sh 2012-01-31 15:25:06.611718182 +0100 ++++ b/doc/mkcert.sh 2012-01-31 15:25:27.298222975 +0100 @@ -5,7 +5,7 @@ OPENSSL=${OPENSSL-openssl} diff --git a/srcpkgs/dovecot/patches/system-account.patch b/srcpkgs/dovecot/patches/system-account.patch index c2032ab77bc..ee0e5a6b048 100644 --- a/srcpkgs/dovecot/patches/system-account.patch +++ b/srcpkgs/dovecot/patches/system-account.patch @@ -1,5 +1,5 @@ ---- src/master/master-settings.c.orig -+++ src/master/master-settings.c +--- a/src/master/master-settings.c ++++ b/src/master/master-settings.c @@ -209,9 +209,9 @@ .protocols = "imap pop3 lmtp", .listen = "*, ::", diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index fddc5c1649d..0222fd25026 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -21,7 +21,6 @@ homepage="https://dovecot.org/" distfiles="${homepage}/releases/2.3/${pkgname}-${version}.tar.gz" checksum=c8b3d7f3af1e558a3ff0f970309d4013a4d3ce136f8c02a53a3b05f345b9a34a keep_libtool_archives=yes -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then _tsize=${XBPS_TARGET_WORDSIZE} diff --git a/srcpkgs/doxygen/patches/fix-time64.patch b/srcpkgs/doxygen/patches/fix-time64.patch index 7f94c20ba48..4f9616b31a1 100644 --- a/srcpkgs/doxygen/patches/fix-time64.patch +++ b/srcpkgs/doxygen/patches/fix-time64.patch @@ -1,5 +1,5 @@ ---- qtools/qdatetime.cpp 2020-01-03 23:51:18.000000000 +0100 -+++ qtools/qdatetime.cpp 2020-12-02 10:48:03.245635836 +0100 +--- a/qtools/qdatetime.cpp 2020-01-03 23:51:18.000000000 +0100 ++++ b/qtools/qdatetime.cpp 2020-12-02 10:48:03.245635836 +0100 @@ -35,7 +35,6 @@ ** **********************************************************************/ diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template index f86d771cb36..051c1568bbb 100644 --- a/srcpkgs/doxygen/template +++ b/srcpkgs/doxygen/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="http://www.doxygen.org/" distfiles="http://doxygen.nl/files/doxygen-${version}.src.tar.gz" checksum=67aeae1be4e1565519898f46f1f7092f1973cce8a767e93101ee0111717091d1 -patch_args=-Np0 build_options="wizard" desc_option_wizard="build Qt5 GUI configuration tool, doxywizard" diff --git a/srcpkgs/dpdk/patches/arm.patch b/srcpkgs/dpdk/patches/arm.patch index de5d8f7b66b..5a30e4d4fc1 100644 --- a/srcpkgs/dpdk/patches/arm.patch +++ b/srcpkgs/dpdk/patches/arm.patch @@ -1,7 +1,7 @@ diff --git config/meson.build config/meson.build index 2bafea5..6b15f13 100644 ---- config/meson.build -+++ config/meson.build +--- a/config/meson.build ++++ b/config/meson.build @@ -50,11 +50,7 @@ meson.add_install_script('../buildtools/symlink-drivers-solibs.sh', pmd_subdir_opt) diff --git a/srcpkgs/dpdk/template b/srcpkgs/dpdk/template index acd23532f88..0f74b4c99d6 100644 --- a/srcpkgs/dpdk/template +++ b/srcpkgs/dpdk/template @@ -18,7 +18,6 @@ distfiles="https://github.com/DPDK/${pkgname}/archive/v${version}.tar.gz" checksum=1ceff1a6f4f8d5f6f62c1682097249227ac5225ccd9638e0af09f5411c681038 # import py3compat python_version=3 -patch_args=-Np0 case "${XBPS_TARGET_MACHINE}" in armv7l*) configure_args+=" -Dmachine=armv7-a";; diff --git a/srcpkgs/dracut-crypt-ssh/patches/fix_ssh-keygen.patch b/srcpkgs/dracut-crypt-ssh/patches/fix_ssh-keygen.patch index 58b0104815e..4a0fe8d3379 100644 --- a/srcpkgs/dracut-crypt-ssh/patches/fix_ssh-keygen.patch +++ b/srcpkgs/dracut-crypt-ssh/patches/fix_ssh-keygen.patch @@ -1,7 +1,7 @@ diff --git modules/60crypt-ssh/module-setup.sh modules/60crypt-ssh/module-setup.sh index c3b6584..80e7dbe 100644 ---- modules/60crypt-ssh/module-setup.sh -+++ modules/60crypt-ssh/module-setup.sh +--- a/modules/60crypt-ssh/module-setup.sh ++++ b/modules/60crypt-ssh/module-setup.sh @@ -40,7 +40,7 @@ install() { case ${state} in diff --git a/srcpkgs/dracut-crypt-ssh/template b/srcpkgs/dracut-crypt-ssh/template index 4a13f8ac5c1..1425d223052 100644 --- a/srcpkgs/dracut-crypt-ssh/template +++ b/srcpkgs/dracut-crypt-ssh/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/dracut-crypt-ssh/dracut-crypt-ssh" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=c50b57b16d4aea3707e1f3e86777fafdb1b3551f2f4b6c4de5576eeb3b2f6bbc -patch_args=-Np0 pre_configure() { sed -i '111s/^/#/' configure diff --git a/srcpkgs/dracut/patches/force_poweroff.patch b/srcpkgs/dracut/patches/force_poweroff.patch index 6ffda53e31a..655746cc374 100644 --- a/srcpkgs/dracut/patches/force_poweroff.patch +++ b/srcpkgs/dracut/patches/force_poweroff.patch @@ -1,5 +1,5 @@ ---- modules.d/99base/dracut-lib.sh -+++ modules.d/99base/dracut-lib.sh +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh @@ -1128,11 +1128,11 @@ case "$_emergency_action" in diff --git a/srcpkgs/dracut/patches/musl-__wordsize.patch b/srcpkgs/dracut/patches/musl-__wordsize.patch index d2dbd5f0833..7a8b40a2903 100644 --- a/srcpkgs/dracut/patches/musl-__wordsize.patch +++ b/srcpkgs/dracut/patches/musl-__wordsize.patch @@ -1,8 +1,8 @@ For musl libc it is required to include to have __WORDSIZE defined to e.g. 32 for arm*-musl. ---- install/util.h 2015-06-15 12:27:21.000000000 +0200 -+++ install/util.h 2015-09-02 09:07:57.321104222 +0200 +--- a/install/util.h 2015-06-15 12:27:21.000000000 +0200 ++++ b/install/util.h 2015-09-02 09:07:57.321104222 +0200 @@ -33,6 +33,9 @@ #include #include diff --git a/srcpkgs/dracut/patches/plymouth-udev-seat.patch b/srcpkgs/dracut/patches/plymouth-udev-seat.patch index fe770eda69b..490dd63b310 100644 --- a/srcpkgs/dracut/patches/plymouth-udev-seat.patch +++ b/srcpkgs/dracut/patches/plymouth-udev-seat.patch @@ -1,5 +1,5 @@ ---- modules.d/95udev-rules/module-setup.sh 2018-02-19 06:00:33.000000000 -0300 -+++ modules.d/95udev-rules/module-setup.sh 2018-05-02 00:27:53.710253893 -0300 +--- a/modules.d/95udev-rules/module-setup.sh 2018-02-19 06:00:33.000000000 -0300 ++++ b/modules.d/95udev-rules/module-setup.sh 2018-05-02 00:27:53.710253893 -0300 @@ -39,6 +39,8 @@ 60-persistent-storage.rules \ 61-persistent-storage-edd.rules \ diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 240e6661f2b..c8db2195c8a 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -17,7 +17,6 @@ checksum=d5a1b47cdb07919d8225d5b5f538e6ae604988f3df0afbde99a8dc775277b726 subpackages="dracut-network" # Checks require distfiles come from a git repository make_check=no -patch_args=-Np0 make_dirs=" /etc/dracut.conf.d 0755 root root diff --git a/srcpkgs/drawterm/patches/gui_x11_Makefile_fix.patch b/srcpkgs/drawterm/patches/gui_x11_Makefile_fix.patch index 47bbde360a9..0a9cd1c5665 100644 --- a/srcpkgs/drawterm/patches/gui_x11_Makefile_fix.patch +++ b/srcpkgs/drawterm/patches/gui_x11_Makefile_fix.patch @@ -1,5 +1,5 @@ ---- gui-x11/Makefile -+++ gui-x11/Makefile +--- a/gui-x11/Makefile ++++ b/gui-x11/Makefile @@ -13,3 +13,6 @@ $(LIB): $(OFILES) x11.$O: ../glenda-t.xbm diff --git a/srcpkgs/drawterm/patches/gui_x11_thirdbutton.patch b/srcpkgs/drawterm/patches/gui_x11_thirdbutton.patch index 852831ec5ed..809621ed4be 100644 --- a/srcpkgs/drawterm/patches/gui_x11_thirdbutton.patch +++ b/srcpkgs/drawterm/patches/gui_x11_thirdbutton.patch @@ -1,5 +1,5 @@ ---- gui-x11/x11.c -+++ gui-x11/x11.c +--- a/gui-x11/x11.c ++++ b/gui-x11/x11.c @@ -1004,8 +1004,12 @@ xmouse(XEvent *e) ms.buttons |= 1; if(s & Button2Mask) diff --git a/srcpkgs/drawterm/patches/posix_generic.patch b/srcpkgs/drawterm/patches/posix_generic.patch index aec5c76e018..afe4d1c8f27 100644 --- a/srcpkgs/drawterm/patches/posix_generic.patch +++ b/srcpkgs/drawterm/patches/posix_generic.patch @@ -17,8 +17,8 @@ Also make sure our CFLAGS/LDFLAGS are respected. diff --git Make.unix Make.unix index f61c516..3a536b3 100644 ---- Make.unix -+++ Make.unix +--- a/Make.unix ++++ b/Make.unix @@ -4,14 +4,14 @@ PTHREAD=-pthread AR=ar AS=as @@ -49,7 +49,7 @@ diff --git posix-generic/Makefile posix-generic/Makefile new file mode 100644 index 0000000..970204e --- /dev/null -+++ posix-generic/Makefile ++++ b/posix-generic/Makefile @@ -0,0 +1,15 @@ +ROOT=.. +include ../Make.config @@ -70,7 +70,7 @@ diff --git posix-generic/getcallerpc.c posix-generic/getcallerpc.c new file mode 100644 index 0000000..3614c59 --- /dev/null -+++ posix-generic/getcallerpc.c ++++ b/posix-generic/getcallerpc.c @@ -0,0 +1,8 @@ +#include "u.h" +#include "libc.h" @@ -84,7 +84,7 @@ diff --git posix-generic/tas.c posix-generic/tas.c new file mode 100644 index 0000000..289f747 --- /dev/null -+++ posix-generic/tas.c ++++ b/posix-generic/tas.c @@ -0,0 +1,18 @@ +#include "u.h" +#include "libc.h" diff --git a/srcpkgs/drawterm/template b/srcpkgs/drawterm/template index 50dcbd25c79..b871806e44e 100644 --- a/srcpkgs/drawterm/template +++ b/srcpkgs/drawterm/template @@ -11,7 +11,6 @@ license="LPL-1.02" homepage="http://drawterm.9front.org/" distfiles="https://code.9front.org/hg/${pkgname}/archive/${_hghash}.tar.gz" checksum=5740acc4f7eb8f0ea0524839847d993b7865d240070da69f7a28ca3b7aef6813 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in armv5*) CFLAGS+=" -DARMv5" ;; diff --git a/srcpkgs/drbd-utils/patches/ftbfs.patch b/srcpkgs/drbd-utils/patches/ftbfs.patch index 525feb2737f..575bb6d8580 100644 --- a/srcpkgs/drbd-utils/patches/ftbfs.patch +++ b/srcpkgs/drbd-utils/patches/ftbfs.patch @@ -1,5 +1,5 @@ ---- user/v83/drbdadm.h -+++ user/v83/drbdadm.h +--- a/user/v83/drbdadm.h ++++ b/user/v83/drbdadm.h @@ -4,6 +4,7 @@ #include #include @@ -8,8 +8,8 @@ #include #include #include ---- user/v84/drbdadm.h -+++ user/v84/drbdadm.h +--- a/user/v84/drbdadm.h ++++ b/user/v84/drbdadm.h @@ -4,6 +4,7 @@ #include #include @@ -18,8 +18,8 @@ #include #include #include ---- user/v9/drbdadm.h -+++ user/v9/drbdadm.h +--- a/user/v9/drbdadm.h ++++ b/user/v9/drbdadm.h @@ -4,6 +4,7 @@ #include #include diff --git a/srcpkgs/drbd-utils/template b/srcpkgs/drbd-utils/template index 2b0963b34c1..10574a2bee1 100644 --- a/srcpkgs/drbd-utils/template +++ b/srcpkgs/drbd-utils/template @@ -28,7 +28,6 @@ license="GPL-2.0-or-later" homepage="http://www.drbd.org" distfiles="https://www.linbit.com/downloads/drbd/utils/${pkgname}-${version}.tar.gz" checksum=1102e2a2001a45685c2f4ce5cb14e5a8a099044f53389d38480b3a88f5db3fd1 -patch_args=-Np0 # XXX mirror which is reachable from musl builders if [ "$XBPS_TARGET_LIBC" = "musl" ]; then diff --git a/srcpkgs/dstat/patches/dstat.patch b/srcpkgs/dstat/patches/dstat.patch index 4866b024755..cbc525f247e 100644 --- a/srcpkgs/dstat/patches/dstat.patch +++ b/srcpkgs/dstat/patches/dstat.patch @@ -1,5 +1,5 @@ ---- dstat.orig 2020-11-21 17:50:21.000000000 -0800 -+++ dstat 2021-02-04 22:50:28.970723977 -0800 +--- a/dstat.orig 2020-11-21 17:50:21.000000000 -0800 ++++ b/dstat 2021-02-04 22:50:28.970723977 -0800 @@ -19,7 +19,7 @@ from __future__ import absolute_import, division, generators, print_function __metaclass__ = type diff --git a/srcpkgs/dstat/template b/srcpkgs/dstat/template index d23277b42bd..9e9d9d3217a 100644 --- a/srcpkgs/dstat/template +++ b/srcpkgs/dstat/template @@ -11,7 +11,6 @@ homepage="http://dag.wiee.rs/home-made/dstat/" distfiles="https://github.com/dagwieers/dstat/archive/v${version}.tar.gz" checksum=4fbd58f3461c86d09a3ab97472aa204de37aa33d31a0493a3e5ed86a2045abea python_version="3" -patch_args=-Np0 do_install() { make install DESTDIR=$DESTDIR diff --git a/srcpkgs/dua-cli/patches/atomicu64.patch b/srcpkgs/dua-cli/patches/atomicu64.patch index 75f16c5d9d1..801601a2fce 100644 --- a/srcpkgs/dua-cli/patches/atomicu64.patch +++ b/srcpkgs/dua-cli/patches/atomicu64.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fix on platforms without 64-bit atomics diff --git src/aggregate.rs src/aggregate.rs index dacaaa7..6fc474d 100644 ---- src/aggregate.rs -+++ src/aggregate.rs +--- a/src/aggregate.rs ++++ b/src/aggregate.rs @@ -8,7 +8,7 @@ use std::{ io, path::Path, diff --git a/srcpkgs/dua-cli/template b/srcpkgs/dua-cli/template index ef71afecf4d..4215cb08773 100644 --- a/srcpkgs/dua-cli/template +++ b/srcpkgs/dua-cli/template @@ -9,7 +9,6 @@ license="MIT" homepage="https://github.com/Byron/dua-cli" distfiles="https://github.com/Byron/dua-cli/archive/v${version}.tar.gz" checksum=2af2408eecca4a1a04d0d395322f110b97e49d5366eb435e2e0e36b8b92684bb -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/dumpet/patches/endian.patch b/srcpkgs/dumpet/patches/endian.patch index 3b2ee254c6c..f7669cfd0bb 100644 --- a/srcpkgs/dumpet/patches/endian.patch +++ b/srcpkgs/dumpet/patches/endian.patch @@ -6,8 +6,8 @@ Date: Tue Jan 7 02:03:11 2020 +0100 diff --git endian.h endian.h index 7c78807..3cae0e1 100644 ---- endian.h -+++ endian.h +--- a/endian.h ++++ b/endian.h @@ -20,6 +20,7 @@ #define ENDIAN_H diff --git a/srcpkgs/dumpet/template b/srcpkgs/dumpet/template index 866d90e01bc..35204d8aa5e 100644 --- a/srcpkgs/dumpet/template +++ b/srcpkgs/dumpet/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="https://tracker.debian.org/pkg/dumpet" distfiles="http://http.debian.net/debian/pool/main/d/dumpet/dumpet_${version}.orig.tar.bz2" checksum=2cc1fa3a1b06f885e4524d1be80bdacc5b6a55057d0577262f2f5186b49a4da3 -patch_args=-Np0 do_build() { make CC=$CC CFLAGS="$CFLAGS -I${XBPS_CROSS_BASE}/usr/include/libxml2" \ diff --git a/srcpkgs/dunelegacy/patches/sdl2.patch b/srcpkgs/dunelegacy/patches/sdl2.patch index e900653f6ca..6e790407507 100644 --- a/srcpkgs/dunelegacy/patches/sdl2.patch +++ b/srcpkgs/dunelegacy/patches/sdl2.patch @@ -1,5 +1,5 @@ ---- src/FileClasses/music/DirectoryPlayer.cpp.orig 2016-11-20 15:57:02.000000000 +0100 -+++ src/FileClasses/music/DirectoryPlayer.cpp 2018-01-13 17:29:35.816857954 +0100 +--- a/src/FileClasses/music/DirectoryPlayer.cpp 2016-11-20 15:57:02.000000000 +0100 ++++ b/src/FileClasses/music/DirectoryPlayer.cpp 2018-01-13 17:29:35.816857954 +0100 @@ -61,7 +61,7 @@ music = nullptr; @@ -9,8 +9,8 @@ } DirectoryPlayer::~DirectoryPlayer() { ---- src/FileClasses/music/XMIPlayer.cpp.orig 2016-11-18 00:06:11.000000000 +0100 -+++ src/FileClasses/music/XMIPlayer.cpp 2018-01-13 17:29:45.983900596 +0100 +--- a/src/FileClasses/music/XMIPlayer.cpp 2016-11-18 00:06:11.000000000 +0100 ++++ b/src/FileClasses/music/XMIPlayer.cpp 2018-01-13 17:29:45.983900596 +0100 @@ -32,7 +32,7 @@ XMIPlayer::XMIPlayer() : MusicPlayer(settings.audio.playMusic, settings.audio.musicVolume) { music = nullptr; diff --git a/srcpkgs/dunelegacy/template b/srcpkgs/dunelegacy/template index 2f87366e852..b9373d6d47d 100644 --- a/srcpkgs/dunelegacy/template +++ b/srcpkgs/dunelegacy/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="http://dunelegacy.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${version}/${pkgname}-${version}-src.tar.bz2" checksum=4740df9e94712b34f5d6fa1ca3c24658c4808b40431aa156ed66c318be9f4de8 -patch_args=-Np0 post_install() { vinstall dunelegacy.desktop 644 usr/share/applications diff --git a/srcpkgs/duplicity/patches/0001-remove-failing-test.patch b/srcpkgs/duplicity/patches/0001-remove-failing-test.patch index aec35423f19..89bbf6a77bb 100644 --- a/srcpkgs/duplicity/patches/0001-remove-failing-test.patch +++ b/srcpkgs/duplicity/patches/0001-remove-failing-test.patch @@ -9,8 +9,8 @@ Subject: [PATCH] remove failing test diff --git a/testing/unit/test_statistics.py b/testing/unit/test_statistics.py index 3ac0627..9ad206a 100644 ---- testing/unit/test_statistics.py -+++ testing/unit/test_statistics.py +--- a/testing/unit/test_statistics.py ++++ b/testing/unit/test_statistics.py @@ -53,41 +53,6 @@ class StatsObjTest(UnitTestCase): s.StartTime = 13 s.EndTime = 14 diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template index 5ca7c963de6..85bfe131638 100644 --- a/srcpkgs/duplicity/template +++ b/srcpkgs/duplicity/template @@ -13,7 +13,6 @@ homepage="http://duplicity.nongnu.org/" changelog="http://duplicity.nongnu.org/vers8/CHANGELOG.md" distfiles="http://launchpad.net/duplicity/${version%.*}-series/${version}/+download/duplicity-${version}.tar.gz" checksum=2643fea0f52920a0fb114069c78389f9621f1c24db7f26bda77bbc239b01ae53 -patch_args=-Np0 do_check() { # Disable as tests don't work diff --git a/srcpkgs/dust3d/patches/QPainterPath.patch b/srcpkgs/dust3d/patches/QPainterPath.patch index 4c42b45cc3b..811b22a04e9 100644 --- a/srcpkgs/dust3d/patches/QPainterPath.patch +++ b/srcpkgs/dust3d/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- src/texturegenerator.h 2019-07-11 15:02:38.000000000 +0200 -+++ src/texturegenerator.h 2020-09-01 01:01:14.662510375 +0200 +--- a/src/texturegenerator.h 2019-07-11 15:02:38.000000000 +0200 ++++ b/src/texturegenerator.h 2020-09-01 01:01:14.662510375 +0200 @@ -4,6 +4,7 @@ #include #include diff --git a/srcpkgs/dust3d/template b/srcpkgs/dust3d/template index ae6182905ce..9ad93449998 100644 --- a/srcpkgs/dust3d/template +++ b/srcpkgs/dust3d/template @@ -13,7 +13,6 @@ license="MIT" homepage="https://dust3d.org/" distfiles="https://github.com/huxingyi/dust3d/archive/${_version}.tar.gz" checksum=7c29e1153e6b568459ab8a8fadbec3398a43b5d60f295018c3f0cdcad2d2b4b1 -patch_args=-Np0 do_install() { vbin dust3d diff --git a/srcpkgs/dvd+rw-tools/patches/dvddl.patch b/srcpkgs/dvd+rw-tools/patches/dvddl.patch index c1c6fb3332a..7990a1da18e 100644 --- a/srcpkgs/dvd+rw-tools/patches/dvddl.patch +++ b/srcpkgs/dvd+rw-tools/patches/dvddl.patch @@ -1,5 +1,5 @@ ---- ./growisofs_mmc.cpp.joe 2006-04-27 20:45:00.788446635 +0200 -+++ ./growisofs_mmc.cpp 2006-04-27 20:46:01.666824300 +0200 +--- a/growisofs_mmc.cpp.joe 2006-04-27 20:45:00.788446635 +0200 ++++ b/growisofs_mmc.cpp 2006-04-27 20:46:01.666824300 +0200 @@ -1412,9 +1412,7 @@ blocks += 15, blocks &= ~15; diff --git a/srcpkgs/dvd+rw-tools/patches/glibc.patch b/srcpkgs/dvd+rw-tools/patches/glibc.patch index a2d2594ae1a..7bfd56f8cdf 100644 --- a/srcpkgs/dvd+rw-tools/patches/glibc.patch +++ b/srcpkgs/dvd+rw-tools/patches/glibc.patch @@ -1,6 +1,6 @@ diff -up transport.hxx.glibc2.6.90 transport.hxx ---- transport.hxx.glibc2.6.90 2007-08-15 12:56:17.000000000 +0200 -+++ transport.hxx 2007-08-15 12:56:42.000000000 +0200 +--- a/transport.hxx.glibc2.6.90 2007-08-15 12:56:17.000000000 +0200 ++++ b/transport.hxx 2007-08-15 12:56:42.000000000 +0200 @@ -11,6 +11,7 @@ #include #include diff --git a/srcpkgs/dvd+rw-tools/patches/sysmacros.patch b/srcpkgs/dvd+rw-tools/patches/sysmacros.patch index ba51c8a0159..e48e5cc8b99 100644 --- a/srcpkgs/dvd+rw-tools/patches/sysmacros.patch +++ b/srcpkgs/dvd+rw-tools/patches/sysmacros.patch @@ -1,5 +1,5 @@ ---- growisofs.c 2018-10-25 17:33:50.039660925 +0200 -+++ growisofs.c 2018-10-25 17:34:10.649662395 +0200 +--- a/growisofs.c 2018-10-25 17:33:50.039660925 +0200 ++++ b/growisofs.c 2018-10-25 17:34:10.649662395 +0200 @@ -450,6 +450,7 @@ # include # include diff --git a/srcpkgs/dvd+rw-tools/patches/wctomb.patch b/srcpkgs/dvd+rw-tools/patches/wctomb.patch index 56bd72575e8..eac1e22def8 100644 --- a/srcpkgs/dvd+rw-tools/patches/wctomb.patch +++ b/srcpkgs/dvd+rw-tools/patches/wctomb.patch @@ -1,5 +1,5 @@ ---- transport.hxx~ 2008-03-25 21:24:47.000000000 -0400 -+++ transport.hxx 2008-03-25 21:25:36.000000000 -0400 +--- a/transport.hxx~ 2008-03-25 21:24:47.000000000 -0400 ++++ b/transport.hxx 2008-03-25 21:25:36.000000000 -0400 @@ -116,7 +116,7 @@ extern "C" char *plusminus_locale() { static class __plusminus { diff --git a/srcpkgs/dvd+rw-tools/patches/wexit.patch b/srcpkgs/dvd+rw-tools/patches/wexit.patch index e17e6fe2df8..db3e5f546f6 100644 --- a/srcpkgs/dvd+rw-tools/patches/wexit.patch +++ b/srcpkgs/dvd+rw-tools/patches/wexit.patch @@ -1,5 +1,5 @@ ---- dvd+rw-format.cpp.wexit 2007-06-21 12:42:30.000000000 +0200 -+++ dvd+rw-format.cpp 2007-06-21 12:44:13.000000000 +0200 +--- a/dvd+rw-format.cpp.wexit 2007-06-21 12:42:30.000000000 +0200 ++++ b/dvd+rw-format.cpp 2007-06-21 12:44:13.000000000 +0200 @@ -245,7 +245,7 @@ int main (int argc, char *argv[]) alarm(1); while ((waitpid(pid,&i,0) != pid) && !WIFEXITED(i)) ; diff --git a/srcpkgs/dvd+rw-tools/template b/srcpkgs/dvd+rw-tools/template index 29fac22fb79..b3c996b8fc2 100644 --- a/srcpkgs/dvd+rw-tools/template +++ b/srcpkgs/dvd+rw-tools/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="http://fy.chalmers.se/~appro/linux/DVD+RW/" distfiles="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${pkgname}-${version}.tar.gz" checksum=f8d60f822e914128bcbc5f64fbe3ed131cbff9045dca7e12c5b77b26edde72ca -patch_args=-Np0 do_install() { vbin growisofs diff --git a/srcpkgs/dvdauthor/patches/freetype-pkg_config.patch b/srcpkgs/dvdauthor/patches/freetype-pkg_config.patch index 0f01eeee179..f6f55fa18d7 100644 --- a/srcpkgs/dvdauthor/patches/freetype-pkg_config.patch +++ b/srcpkgs/dvdauthor/patches/freetype-pkg_config.patch @@ -1,5 +1,5 @@ ---- configure.ac 2016-12-31 00:25:38.000000000 +0100 -+++ configure.ac 2020-09-20 00:16:14.950903683 +0200 +--- a/configure.ac 2016-12-31 00:25:38.000000000 +0100 ++++ b/configure.ac 2020-09-20 00:16:14.950903683 +0200 @@ -84,10 +84,8 @@ AC_SUBST(FRIBIDI_CFLAGS) AC_SUBST(FRIBIDI_LIBS) diff --git a/srcpkgs/dvdauthor/template b/srcpkgs/dvdauthor/template index 499be371af6..c4a81cd4aaf 100644 --- a/srcpkgs/dvdauthor/template +++ b/srcpkgs/dvdauthor/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="http://dvdauthor.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/dvdauthor/dvdauthor-${version}.tar.gz" checksum="3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7" -patch_args=-Np0 build_options="NTSC PAL" build_options_default="PAL" diff --git a/srcpkgs/dvdbackup/patches/dvdbackup-dvdread-6.1.patch b/srcpkgs/dvdbackup/patches/dvdbackup-dvdread-6.1.patch index 30ba8217d87..44196890a26 100644 --- a/srcpkgs/dvdbackup/patches/dvdbackup-dvdread-6.1.patch +++ b/srcpkgs/dvdbackup/patches/dvdbackup-dvdread-6.1.patch @@ -1,5 +1,5 @@ ---- src/dvdbackup.c 2012-06-24 01:10:29 UTC -+++ src/dvdbackup.c +--- a/src/dvdbackup.c 2012-06-24 01:10:29 UTC ++++ b/src/dvdbackup.c @@ -1132,7 +1132,7 @@ static int DVDCopyIfoBup(dvd_reader_t* dvd, title_set_ int size; diff --git a/srcpkgs/dvdbackup/template b/srcpkgs/dvdbackup/template index 11d83f01651..0d823b6f97e 100644 --- a/srcpkgs/dvdbackup/template +++ b/srcpkgs/dvdbackup/template @@ -10,4 +10,3 @@ license="GPL-3.0-or-later" homepage="http://dvdbackup.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/dvdbackup/dvdbackup-${version}.tar.xz" checksum=ef8c56fbb82b15b7eef00d2d3118c8253f9770009ed7bb2a5d4849acf88183e6 -patch_args=-Np0