From 2fd8d4df94855a157a4de16c61d54153e16ef185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 19 Jun 2021 10:03:21 +0700 Subject: [PATCH] srcpkgs/o*: convert patches to -Np1 ```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.-][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ``` --- srcpkgs/obexftp/patches/fix-cross.patch | 12 +++++------ srcpkgs/obexftp/template | 1 - .../occt/patches/cmake-build-type-none.patch | 4 ++-- srcpkgs/occt/patches/fix-cmake-regex.patch | 4 ++-- srcpkgs/occt/patches/fix-install-dir.patch | 8 ++++---- srcpkgs/occt/patches/fix-osd-host.patch | 4 ++-- srcpkgs/occt/patches/musl-fenv.patch | 4 ++-- srcpkgs/occt/patches/musl-mallinfo.patch | 4 ++-- srcpkgs/occt/template | 1 - ...ing-ref-leak-in-join_session_keyring.patch | 4 ++-- srcpkgs/odroid-u2-kernel/template | 1 - .../patches/fix-TEMP_FAILURE_RETRY.patch | 4 ++-- srcpkgs/ofono/template | 1 - srcpkgs/ogmrip/patches/enchant-2.patch | 4 ++-- srcpkgs/ogmrip/patches/tesseract.patch | 4 ++-- srcpkgs/ogmrip/template | 1 - .../ogmtools/patches/fix-Makefile_am.patch | 4 ++-- .../ogmtools/patches/fix-acinclude_m4.patch | 4 ++-- .../patches/fix-avilib_Makefile_in.patch | 4 ++-- .../ogmtools/patches/fix-configure_in.patch | 4 ++-- srcpkgs/ogmtools/template | 1 - srcpkgs/oksh/patches/cross.patch | 4 ++-- srcpkgs/oksh/template | 1 - .../patches/cmake.testing.working_dir.patch | 4 ++-- srcpkgs/okteta/template | 1 - srcpkgs/okular/patches/musl-vasprintf.patch | 4 ++-- srcpkgs/okular/template | 1 - srcpkgs/olive/patches/QPainterPath.patch | 16 +++++++-------- srcpkgs/olive/template | 1 - srcpkgs/olsrd/patches/bison-header.patch | 4 ++-- srcpkgs/olsrd/template | 1 - srcpkgs/omxplayer/patches/build.patch | 4 ++-- srcpkgs/omxplayer/template | 1 - srcpkgs/open-iscsi/patches/fix-musl.patch | 8 ++++---- srcpkgs/open-iscsi/patches/libressl.patch | 4 ++-- srcpkgs/open-iscsi/template | 1 - .../patches/0001-recognize-Void.patch | 8 ++++---- .../patches/0002-disable-werror.patch | 4 ++-- ...at-linux-and-gnu-libc-are-the-same-t.patch | 4 ++-- ...e-configure-test-for-struct-timespec.patch | 8 ++++---- ...finition-of-ALLPERMS-and-ACCESSPERMS.patch | 8 ++++---- ...-test-for-feature-instead-of-platfor.patch | 12 +++++------ ...onfigure-test-for-sys-stat.h-include.patch | 4 ++-- ...0010-use-posix-strerror_r-unless-gnu.patch | 4 ++-- .../0011-use-off64_t-instead-of-loff_t.patch | 12 +++++------ .../patches/0020-configure-kernelver.patch | 4 ++-- .../patches/1000-strerror_r.patch | 4 ++-- .../1001-pr383-rename-poll-vm_poll.patch | 20 +++++++++---------- ...2-Fix-subdir-objects-configure-error.patch | 4 ++-- .../patches/2001-res_ninit-for-musl.patch | 4 ++-- srcpkgs/open-vm-tools/template | 1 - srcpkgs/openbabel/patches/unsigned_char.patch | 8 ++++---- srcpkgs/openbabel/template | 1 - .../openblas/patches/ppc-dynamic-gcc9.patch | 4 ++-- srcpkgs/openblas/template | 1 - .../openbox-3.5.0-title-matching.patch | 4 ++-- .../patches/openbox-3.5.0-which-2.20.patch | 4 ++-- srcpkgs/openbox/template | 1 - srcpkgs/openbsd-file/patches/musl.patch | 8 ++++---- .../openbsd-file/patches/no-x86-seccomp.patch | 4 ++-- srcpkgs/openbsd-file/template | 1 - .../patches/001-fix-no_return_value.patch | 4 ++-- .../patches/002-fix-stdint_h.patch | 4 ++-- .../patches/003-musl-stdint_h.patch | 4 ++-- .../patches/004-fix-libpcre-8.42-compat.patch | 4 ++-- srcpkgs/opencollada/template | 1 - .../opencolorio/patches/disable_werror.patch | 8 ++++---- .../patches/fix-cmake-files-location.patch | 12 +++++------ srcpkgs/opencolorio/template | 1 - .../patches/undef-altivec-macros-cpp.patch | 4 ++-- srcpkgs/opencv/template | 1 - .../patches/undef-altivec-macros-cpp.patch | 4 ++-- srcpkgs/opencv4/template | 1 - .../patches/openssl_1.1.0_compat.patch | 8 ++++---- srcpkgs/opendkim/template | 1 - srcpkgs/openexr/patches/musl-_fpstate.patch | 4 ++-- .../openexr/patches/pkgconfig-prefix.patch | 4 ++-- srcpkgs/openexr/template | 1 - srcpkgs/openjade/patches/musl.patch | 4 ++-- .../openjade/patches/openjade-1.3.2-lt.patch | 4 ++-- .../patches/openjade-1.3.2-msggen.pl.patch | 4 ++-- .../patches/patch-jade_TeXFOTBuilder.cxx.diff | 4 ++-- .../patch-jade_TransformFOTBuilder.cxx.diff | 4 ++-- srcpkgs/openjade/template | 1 - ...c27e7c91f745a1dda9991b5deea3cbef2072.patch | 4 ++-- ...49edad7fb31ebbf03c60a45b72aaa7b7412b.patch | 4 ++-- srcpkgs/openjpeg2/template | 1 - srcpkgs/openlierox/patches/fix-cflags.patch | 4 ++-- srcpkgs/openlierox/patches/ppc-musl.patch | 4 ++-- srcpkgs/openlierox/template | 1 - srcpkgs/openmpi/patches/drop-orted-mpir.patch | 4 ++-- srcpkgs/openmpi/template | 1 - srcpkgs/openntpd/patches/libtls.patch | 4 ++-- srcpkgs/openntpd/patches/musl.patch | 8 ++++---- srcpkgs/openntpd/template | 1 - srcpkgs/opensm/patches/fix-musl.patch | 6 +++--- srcpkgs/opensm/template | 1 - .../opensmtpd-extras/patches/fix-musl.patch | 4 ++-- srcpkgs/opensmtpd-extras/template | 1 - .../opensmtpd/patches/configure-cross.patch | 4 ++-- .../patches/cross-no-varrun-check.patch | 4 ++-- srcpkgs/opensmtpd/template | 1 - srcpkgs/opensonic/patches/allegro.patch | 8 ++++---- srcpkgs/opensonic/patches/fix-cflags.patch | 4 ++-- srcpkgs/opensonic/template | 1 - srcpkgs/openssh/patches/config.patch | 4 ++-- srcpkgs/openssh/template | 1 - srcpkgs/openssl/patches/ppc-auxv.patch | 4 ++-- srcpkgs/openssl/patches/ppc64.patch | 8 ++++---- srcpkgs/openssl/patches/xxx-ppcle.patch | 12 +++++------ srcpkgs/openssl/template | 1 - srcpkgs/opensurge/patches/fix-ssize.patch | 4 ++-- srcpkgs/opensurge/template | 1 - srcpkgs/opkg/patches/lock-var-run.patch | 4 ++-- srcpkgs/opkg/template | 1 - srcpkgs/oprofile/patches/musl.patch | 4 ++-- srcpkgs/oprofile/patches/system-account.patch | 4 ++-- srcpkgs/oprofile/template | 1 - srcpkgs/oragono/patches/paths.patch | 4 ++-- srcpkgs/oragono/template | 1 - ...280a83521ac29a1438e05e8f7a331842bcb4.patch | 6 +++--- ...0bbd4a856ea45c770f882be9e63a663a9acd.patch | 4 ++-- ...b86f241df9e17238833c091992c80bb1d298.patch | 4 ++-- srcpkgs/orion/template | 1 - srcpkgs/os-prober/patches/detect-void.patch | 4 ++-- srcpkgs/os-prober/template | 1 - srcpkgs/osg/patches/fix-narrowing.patch | 8 ++++---- srcpkgs/osg/patches/musl-endianess.patch | 4 ++-- srcpkgs/osg/patches/musl-pthread.patch | 4 ++-- srcpkgs/osg/template | 1 - srcpkgs/osmid/patches/big-endian.patch | 4 ++-- srcpkgs/osmid/patches/musl.patch | 8 ++++---- srcpkgs/osmid/template | 1 - .../patches/fix-vq_c-missing-return.patch | 4 ++-- srcpkgs/otfcc/template | 1 - srcpkgs/otpw/patches/ldflags.patch | 4 ++-- srcpkgs/otpw/template | 1 - ...9a352063f372a1573d326a80bd79ff4d5c37.patch | 4 ++-- srcpkgs/owncloudclient/template | 1 - 139 files changed, 250 insertions(+), 296 deletions(-) diff --git a/srcpkgs/obexftp/patches/fix-cross.patch b/srcpkgs/obexftp/patches/fix-cross.patch index 2e0acf2557..0f4874d5e1 100644 --- a/srcpkgs/obexftp/patches/fix-cross.patch +++ b/srcpkgs/obexftp/patches/fix-cross.patch @@ -1,7 +1,7 @@ diff --git a/bfb/CMakeLists.txt b/bfb/CMakeLists.txt index 008241d..be233aa 100644 ---- bfb/CMakeLists.txt -+++ bfb/CMakeLists.txt +--- a/bfb/CMakeLists.txt ++++ b/bfb/CMakeLists.txt @@ -16,14 +16,17 @@ set ( bfb_HEADERS ${bfb_PUBLIC_HEADERS} ) @@ -29,8 +29,8 @@ index 008241d..be233aa 100644 diff --git apps/CMakeLists.txt apps/CMakeLists.txt index b5c84e4..e43aaeb 100644 ---- apps/CMakeLists.txt -+++ apps/CMakeLists.txt +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt @@ -5,14 +5,21 @@ add_definitions( -DVERSION="${obexftp_VERSION}" ) add_definitions ( -DHAVE_USB ) @@ -57,8 +57,8 @@ index b5c84e4..e43aaeb 100644 ) diff --git fuse/CMakeLists.txt fuse/CMakeLists.txt index 0c80d3d..bba052b 100644 ---- fuse/CMakeLists.txt -+++ fuse/CMakeLists.txt +--- a/fuse/CMakeLists.txt ++++ b/fuse/CMakeLists.txt @@ -14,6 +14,8 @@ if ( Fuse_FOUND ) target_link_libraries ( obexfs diff --git a/srcpkgs/obexftp/template b/srcpkgs/obexftp/template index 457386c803..9e4123be13 100644 --- a/srcpkgs/obexftp/template +++ b/srcpkgs/obexftp/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" distfiles="${SOURCEFORGE_SITE}/openobex/${pkgname}-${version}-Source.tar.gz" checksum=d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1c989a3 -patch_args=-Np0 post_install() { # Do not require 'bluetooth', does not exist. diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch index acb06fb557..ecb0e3da39 100644 --- a/srcpkgs/occt/patches/cmake-build-type-none.patch +++ b/srcpkgs/occt/patches/cmake-build-type-none.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D set (CMAKE_SUPPRESS_REGENERATION TRUE) diff --git a/srcpkgs/occt/patches/fix-cmake-regex.patch b/srcpkgs/occt/patches/fix-cmake-regex.patch index 4742ed9f2e..f38e0108ac 100644 --- a/srcpkgs/occt/patches/fix-cmake-regex.patch +++ b/srcpkgs/occt/patches/fix-cmake-regex.patch @@ -1,8 +1,8 @@ # fix regex for cmake Config file # inspired by https://git.archlinux.org/svntogit/community.git/commit/trunk/cmake-fix-variable.patch?h=packages/opencascade&id=c99074d88da40ae59882aaf173de94cd0ec73ca7 ---- adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 00:18:42.763819658 -0500 -+++ adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 23:40:32.872489521 -0500 +--- a/adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 00:18:42.763819658 -0500 ++++ b/adm/templates/OpenCASCADEConfig.cmake.in 2019-01-27 23:40:32.872489521 -0500 @@ -26,7 +26,7 @@ if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) diff --git a/srcpkgs/occt/patches/fix-install-dir.patch b/srcpkgs/occt/patches/fix-install-dir.patch index 5f866d5030..68b3ee4ef4 100644 --- a/srcpkgs/occt/patches/fix-install-dir.patch +++ b/srcpkgs/occt/patches/fix-install-dir.patch @@ -1,8 +1,8 @@ # fix cmake install dir references # source: https://aur.archlinux.org/cgit/aur.git/commit/fix-install-dir-references.patch?h=opencascade7&id=a6a582af3688e26236cf0d4469f8f782908a9ff9 ---- CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100 -+++ CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100 +--- a/CMakeLists.txt 2016-11-25 11:50:18.000000000 +0100 ++++ b/CMakeLists.txt 2017-03-18 08:44:10.406668714 +0100 @@ -906,7 +906,7 @@ endforeach() # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration @@ -12,8 +12,8 @@ foreach (OCCT_MODULE ${OCCT_MODULES}) if (BUILD_MODULE_${OCCT_MODULE}) ---- adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100 -+++ adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100 +--- a/adm/cmake/occt_macros.cmake 2016-11-25 11:50:18.000000000 +0100 ++++ b/adm/cmake/occt_macros.cmake 2017-03-18 08:44:10.406668714 +0100 @@ -558,7 +558,7 @@ "cmake_policy(PUSH) cmake_policy(SET CMP0007 NEW) diff --git a/srcpkgs/occt/patches/fix-osd-host.patch b/srcpkgs/occt/patches/fix-osd-host.patch index 329e9a2e9e..ef705c7291 100644 --- a/srcpkgs/occt/patches/fix-osd-host.patch +++ b/srcpkgs/occt/patches/fix-osd-host.patch @@ -1,7 +1,7 @@ # gethostbyname returns a nullptr, because the host can't resolve itself ---- src/OSD/OSD_Host.cxx -+++ src/OSD/OSD_Host.cxx +--- a/src/OSD/OSD_Host.cxx ++++ b/src/OSD/OSD_Host.cxx @@ -124,7 +124,7 @@ TCollection_AsciiString OSD_Host::InternetAddress(){ host = HostName(); diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch index c4fd770646..09da8d0afe 100644 --- a/srcpkgs/occt/patches/musl-fenv.patch +++ b/srcpkgs/occt/patches/musl-fenv.patch @@ -5,8 +5,8 @@ is probably wrong, but I don't have a replacement for the non-posix functions fegetexcept(3) and feenableexcept(3). """ ---- src/OSD/OSD_signal.cxx.orig -+++ src/OSD/OSD_signal.cxx +--- a/src/OSD/OSD_signal.cxx ++++ b/src/OSD/OSD_signal.cxx @@ -703,7 +703,7 @@ #include diff --git a/srcpkgs/occt/patches/musl-mallinfo.patch b/srcpkgs/occt/patches/musl-mallinfo.patch index 3561c31f05..4e5825bf1c 100644 --- a/srcpkgs/occt/patches/musl-mallinfo.patch +++ b/srcpkgs/occt/patches/musl-mallinfo.patch @@ -1,7 +1,7 @@ In musl libc there is no struct mallinfo and no function mallinf() ---- src/OSD/OSD_MemInfo.cxx.orig -+++ src/OSD/OSD_MemInfo.cxx +--- a/src/OSD/OSD_MemInfo.cxx ++++ b/src/OSD/OSD_MemInfo.cxx @@ -147,8 +147,12 @@ } aFile.close(); diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template index c72fcd3844..9298edc76e 100644 --- a/srcpkgs/occt/template +++ b/srcpkgs/occt/template @@ -19,7 +19,6 @@ homepage="https://www.opencascade.com" distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz" checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0 conflicts="oce>=0" -patch_args=-Np0 post_install() { rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt diff --git a/srcpkgs/odroid-u2-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch b/srcpkgs/odroid-u2-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch index c4f6ca2b4c..3e57b755ef 100644 --- a/srcpkgs/odroid-u2-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch +++ b/srcpkgs/odroid-u2-kernel/patches/KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch @@ -60,8 +60,8 @@ Signed-off-by: David Howells diff --git security/keys/process_keys.c security/keys/process_keys.c index a3f85d2..e6d50172 100644 ---- security/keys/process_keys.c -+++ security/keys/process_keys.c +--- a/security/keys/process_keys.c ++++ b/security/keys/process_keys.c @@ -794,6 +794,7 @@ long join_session_keyring(const char *name) ret = PTR_ERR(keyring); goto error2; diff --git a/srcpkgs/odroid-u2-kernel/template b/srcpkgs/odroid-u2-kernel/template index 4369f4c8a9..748f904ee1 100644 --- a/srcpkgs/odroid-u2-kernel/template +++ b/srcpkgs/odroid-u2-kernel/template @@ -3,7 +3,6 @@ # Latest commit as of 20140809 _githash="0c5ca23376fdddc43a08e5709e4d4bf18bc747f0" _gitshort="${_githash:0:7}" -patch_args=-Np0 pkgname=odroid-u2-kernel version=3.8.13.28 diff --git a/srcpkgs/ofono/patches/fix-TEMP_FAILURE_RETRY.patch b/srcpkgs/ofono/patches/fix-TEMP_FAILURE_RETRY.patch index 19539edd08..70df8c9702 100644 --- a/srcpkgs/ofono/patches/fix-TEMP_FAILURE_RETRY.patch +++ b/srcpkgs/ofono/patches/fix-TEMP_FAILURE_RETRY.patch @@ -1,7 +1,7 @@ diff --git a/drivers/mbimmodem/mbim.c b/drivers/mbimmodem/mbim.c index 54b18ac..5f924ca 100644 ---- drivers/mbimmodem/mbim.c -+++ drivers/mbimmodem/mbim.c +--- a/drivers/mbimmodem/mbim.c ++++ b/drivers/mbimmodem/mbim.c @@ -41,6 +41,15 @@ #define HEADER_SIZE (sizeof(struct mbim_message_header) + \ sizeof(struct mbim_fragment_header)) diff --git a/srcpkgs/ofono/template b/srcpkgs/ofono/template index 78f8026458..248e58d950 100644 --- a/srcpkgs/ofono/template +++ b/srcpkgs/ofono/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://01.org/ofono" distfiles="${KERNEL_SITE}/network/${pkgname}/${pkgname}-${version}.tar.xz" checksum=a15c5d28096c10eb30e47a68b6dc2e7c4a5a99d7f4cfedf0b69624f33d859e9b -patch_args=-Np0 post_install() { vsv ofonod diff --git a/srcpkgs/ogmrip/patches/enchant-2.patch b/srcpkgs/ogmrip/patches/enchant-2.patch index 25acfd9899..3dde7eab73 100644 --- a/srcpkgs/ogmrip/patches/enchant-2.patch +++ b/srcpkgs/ogmrip/patches/enchant-2.patch @@ -2,8 +2,8 @@ Source: Arch Linux Upstream: Unknown Reason: Fixes compilation with enchant-2 ---- src/ogmrip-spell-dialog.c -+++ src/ogmrip-spell-dialog.c +--- a/src/ogmrip-spell-dialog.c ++++ b/src/ogmrip-spell-dialog.c @@ -315,14 +315,14 @@ enchant_dict_add_to_session (dialog->priv->dict, word, len); break; diff --git a/srcpkgs/ogmrip/patches/tesseract.patch b/srcpkgs/ogmrip/patches/tesseract.patch index 228679bfa0..b69e67ec65 100644 --- a/srcpkgs/ogmrip/patches/tesseract.patch +++ b/srcpkgs/ogmrip/patches/tesseract.patch @@ -1,5 +1,5 @@ ---- libogmrip/ogmrip-srt.c.orig 2015-01-10 14:39:43.000000000 +0100 -+++ libogmrip/ogmrip-srt.c 2017-10-16 21:00:19.921665865 +0200 +--- a/libogmrip/ogmrip-srt.c 2015-01-10 14:39:43.000000000 +0100 ++++ b/libogmrip/ogmrip-srt.c 2017-10-16 21:00:19.921665865 +0200 @@ -228,7 +228,7 @@ g_return_val_if_fail (input != NULL, NULL); diff --git a/srcpkgs/ogmrip/template b/srcpkgs/ogmrip/template index 7a6bc318a0..1905d67b6a 100644 --- a/srcpkgs/ogmrip/template +++ b/srcpkgs/ogmrip/template @@ -15,7 +15,6 @@ license="LGPL-2.1-or-later" homepage="http://ogmrip.sourceforge.net/en/index.html" distfiles="${SOURCEFORGE_SITE}/ogmrip/ogmrip/${version%.*}/${version}/ogmrip-${version}.tar.gz" checksum=4e2e9778ac4da9fe1ab159e3dc6d4367b7a9dbd8f3501df99733ecedb25b02ff -patch_args=-Np0 pre_configure() { sed -i 's/enchant >=/enchant-2 >=/' configure diff --git a/srcpkgs/ogmtools/patches/fix-Makefile_am.patch b/srcpkgs/ogmtools/patches/fix-Makefile_am.patch index 639eb9b3a0..70d0678e36 100644 --- a/srcpkgs/ogmtools/patches/fix-Makefile_am.patch +++ b/srcpkgs/ogmtools/patches/fix-Makefile_am.patch @@ -1,5 +1,5 @@ ---- Makefile.am 2003-05-04 11:41:26.000000000 +0200 -+++ Makefile.am 2015-08-30 13:35:53.976381119 +0200 +--- a/Makefile.am 2003-05-04 11:41:26.000000000 +0200 ++++ b/Makefile.am 2015-08-30 13:35:53.976381119 +0200 @@ -7,7 +7,7 @@ if HAVE_LIBDVDREAD DVDXCHAP=dvdxchap diff --git a/srcpkgs/ogmtools/patches/fix-acinclude_m4.patch b/srcpkgs/ogmtools/patches/fix-acinclude_m4.patch index f5da454b5e..09d95b3713 100644 --- a/srcpkgs/ogmtools/patches/fix-acinclude_m4.patch +++ b/srcpkgs/ogmtools/patches/fix-acinclude_m4.patch @@ -1,5 +1,5 @@ ---- acinclude.m4 2003-05-04 11:41:26.000000000 +0200 -+++ acinclude.m4 2015-08-30 14:11:25.882425946 +0200 +--- a/acinclude.m4 2003-05-04 11:41:26.000000000 +0200 ++++ b/acinclude.m4 2015-08-30 14:11:25.882425946 +0200 @@ -1,7 +1,7 @@ dnl PATH_AVILIB([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for avilib, and define AVILIB_CFLAGS and AVILIB_LIBS diff --git a/srcpkgs/ogmtools/patches/fix-avilib_Makefile_in.patch b/srcpkgs/ogmtools/patches/fix-avilib_Makefile_in.patch index 90fe20e976..278a7046cb 100644 --- a/srcpkgs/ogmtools/patches/fix-avilib_Makefile_in.patch +++ b/srcpkgs/ogmtools/patches/fix-avilib_Makefile_in.patch @@ -1,5 +1,5 @@ ---- avilib/Makefile.am 2004-03-29 22:00:28.000000000 +0200 -+++ avilib/Makefile.am 2015-08-30 13:57:05.720407860 +0200 +--- a/avilib/Makefile.am 2004-03-29 22:00:28.000000000 +0200 ++++ b/avilib/Makefile.am 2015-08-30 13:57:05.720407860 +0200 @@ -5,7 +5,7 @@ noinst_LIBRARIES = libavi.a diff --git a/srcpkgs/ogmtools/patches/fix-configure_in.patch b/srcpkgs/ogmtools/patches/fix-configure_in.patch index 1812a636b2..a0f7da3b45 100644 --- a/srcpkgs/ogmtools/patches/fix-configure_in.patch +++ b/srcpkgs/ogmtools/patches/fix-configure_in.patch @@ -1,5 +1,5 @@ ---- configure.in 2004-11-07 11:01:34.000000000 +0100 -+++ configure.in 2015-08-30 13:46:25.944394407 +0200 +--- a/configure.in 2004-11-07 11:01:34.000000000 +0100 ++++ b/configure.in 2015-08-30 13:46:25.944394407 +0200 @@ -1,7 +1,8 @@ dnl process this file with autoconf to generate the configure script diff --git a/srcpkgs/ogmtools/template b/srcpkgs/ogmtools/template index 5dc3772bd7..29c7e04d6e 100644 --- a/srcpkgs/ogmtools/template +++ b/srcpkgs/ogmtools/template @@ -14,7 +14,6 @@ license="GPL-2.0-only" homepage="http://www.bunkus.org/videotools/ogmtools/" distfiles="http://www.bunkus.org/videotools/ogmtools/ogmtools-${version}.tar.bz2" checksum=c8d61d1dbceb981dc7399c1a85e43b509fd3d071fb8d3ca89ea9385e6e40fdea -patch_args=-Np0 CFLAGS="-I./avilib" CXXFLAGS="${CFLAGS}" diff --git a/srcpkgs/oksh/patches/cross.patch b/srcpkgs/oksh/patches/cross.patch index df00dc4df1..3f2c0a3bb6 100644 --- a/srcpkgs/oksh/patches/cross.patch +++ b/srcpkgs/oksh/patches/cross.patch @@ -1,5 +1,5 @@ ---- configure.orig -+++ configure +--- a/configure ++++ b/configure @@ -932,7 +932,7 @@ fi diff --git a/srcpkgs/oksh/template b/srcpkgs/oksh/template index 932eac8c82..84e6085f54 100644 --- a/srcpkgs/oksh/template +++ b/srcpkgs/oksh/template @@ -11,7 +11,6 @@ homepage="https://github.com/ibara/oksh" distfiles="https://github.com/ibara/oksh/releases/download/oksh-${version}/oksh-${version}.tar.gz" checksum=c08d97b2ac9ee5d88e9e508d27c75502b2d06c20d4c5ab87b496cb3b9951bd35 register_shell="/bin/oksh" -patch_args=-Np0 alternatives=" ksh:ksh:/usr/bin/oksh diff --git a/srcpkgs/okteta/patches/cmake.testing.working_dir.patch b/srcpkgs/okteta/patches/cmake.testing.working_dir.patch index 7a5dc93528..76af2ac078 100644 --- a/srcpkgs/okteta/patches/cmake.testing.working_dir.patch +++ b/srcpkgs/okteta/patches/cmake.testing.working_dir.patch @@ -1,7 +1,7 @@ upstream bug: https://bugs.kde.org/show_bug.cgi?id=436128 ---- kasten/controllers/CMakeLists.txt.ORIG 2021-03-29 13:51:56.000000000 +0200 -+++ kasten/controllers/CMakeLists.txt 2021-04-24 23:12:17.358195447 +0200 +--- a/kasten/controllers/CMakeLists.txt 2021-03-29 13:51:56.000000000 +0200 ++++ b/kasten/controllers/CMakeLists.txt 2021-04-24 23:12:17.358195447 +0200 @@ -584,15 +584,12 @@ LINK_LIBRARIES structureview-tested-srcs Qt5::Test poddecoder-typeeditors ) diff --git a/srcpkgs/okteta/template b/srcpkgs/okteta/template index f767b376f4..7d3878ca03 100644 --- a/srcpkgs/okteta/template +++ b/srcpkgs/okteta/template @@ -16,7 +16,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://apps.kde.org/okteta/" distfiles="${KDE_SITE}/okteta/${version}/src/okteta-${version}.tar.xz" checksum=c569cd5b55503e46df1a5b5c9162b08888c426aa52c6f3f2f926c658bee0144c -patch_args=-Np0 okteta-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/okular/patches/musl-vasprintf.patch b/srcpkgs/okular/patches/musl-vasprintf.patch index eac89d815e..6b7677e973 100644 --- a/srcpkgs/okular/patches/musl-vasprintf.patch +++ b/srcpkgs/okular/patches/musl-vasprintf.patch @@ -1,5 +1,5 @@ ---- core/synctex/synctex_parser.c 2017-12-05 23:07:10.000000000 +0100 -+++ core/synctex/synctex_parser.c 2018-01-01 19:03:46.281593488 +0100 +--- a/core/synctex/synctex_parser.c 2017-12-05 23:07:10.000000000 +0100 ++++ b/core/synctex/synctex_parser.c 2018-01-01 19:03:46.281593488 +0100 @@ -8188,6 +8188,26 @@ } diff --git a/srcpkgs/okular/template b/srcpkgs/okular/template index 7fcc1686d3..44c3b7e82b 100644 --- a/srcpkgs/okular/template +++ b/srcpkgs/okular/template @@ -17,7 +17,6 @@ license="GPL-2.0-only" homepage="https://kde.org/applications/en/graphics/org.kde.okular" distfiles="${KDE_SITE}/release-service/${version}/src/${pkgname}-${version}.tar.xz" checksum=330dbe847409bfc544093ac703754fb5f43398ea3dbea88b976dc393d3bda65c -patch_args=-Np0 do_check() { cd build diff --git a/srcpkgs/olive/patches/QPainterPath.patch b/srcpkgs/olive/patches/QPainterPath.patch index 396363551f..eb7db9e373 100644 --- a/srcpkgs/olive/patches/QPainterPath.patch +++ b/srcpkgs/olive/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- effects/internal/texteffect.cpp 2020-08-31 20:39:58.048701631 +0200 -+++ effects/internal/texteffect.cpp 2019-11-11 07:05:02.000000000 +0100 +--- a/effects/internal/texteffect.cpp 2020-08-31 20:39:58.048701631 +0200 ++++ b/effects/internal/texteffect.cpp 2019-11-11 07:05:02.000000000 +0100 @@ -25,6 +25,7 @@ #include #include @@ -8,8 +8,8 @@ #include #include #include ---- effects/internal/timecodeeffect.cpp 2020-08-31 20:39:49.809701206 +0200 -+++ effects/internal/timecodeeffect.cpp 2019-11-11 07:05:02.000000000 +0100 +--- a/effects/internal/timecodeeffect.cpp 2020-08-31 20:39:49.809701206 +0200 ++++ b/effects/internal/timecodeeffect.cpp 2019-11-11 07:05:02.000000000 +0100 @@ -25,6 +25,7 @@ #include #include @@ -18,8 +18,8 @@ #include #include #include ---- ui/graphview.cpp 2020-08-31 20:39:43.016700855 +0200 -+++ ui/graphview.cpp 2019-11-11 07:05:02.000000000 +0100 +--- a/ui/graphview.cpp 2020-08-31 20:39:43.016700855 +0200 ++++ b/ui/graphview.cpp 2019-11-11 07:05:02.000000000 +0100 @@ -21,6 +21,7 @@ #include "graphview.h" @@ -28,8 +28,8 @@ #include #include #include ---- ui/timelineheader.cpp 2020-08-31 20:39:36.992700545 +0200 -+++ ui/timelineheader.cpp 2019-11-11 07:05:02.000000000 +0100 +--- a/ui/timelineheader.cpp 2020-08-31 20:39:36.992700545 +0200 ++++ b/ui/timelineheader.cpp 2019-11-11 07:05:02.000000000 +0100 @@ -21,6 +21,7 @@ #include "timelineheader.h" diff --git a/srcpkgs/olive/template b/srcpkgs/olive/template index c001284d41..11468a8b04 100644 --- a/srcpkgs/olive/template +++ b/srcpkgs/olive/template @@ -11,4 +11,3 @@ license="GPL-3.0-or-later" homepage="https://www.olivevideoeditor.org" distfiles="https://github.com/olive-editor/olive/archive/${version}.tar.gz" checksum=cb9a5b109e67a47f03448633cbc7a257aa8e6c3c76a59c1fada77fd3d97875c1 -patch_args=-Np0 diff --git a/srcpkgs/olsrd/patches/bison-header.patch b/srcpkgs/olsrd/patches/bison-header.patch index 882edeef00..22dbd7f53a 100644 --- a/srcpkgs/olsrd/patches/bison-header.patch +++ b/srcpkgs/olsrd/patches/bison-header.patch @@ -1,5 +1,5 @@ ---- src/cfgparser/local.mk.orig 2020-11-21 14:03:26.244348554 +0700 -+++ src/cfgparser/local.mk 2020-11-21 14:06:09.976236365 +0700 +--- a/src/cfgparser/local.mk 2020-11-21 14:03:26.244348554 +0700 ++++ b/src/cfgparser/local.mk 2020-11-21 14:06:09.976236365 +0700 @@ -77,6 +77,7 @@ $(MAKECMDPREFIX)$(BISON) -d -o "$@-tmp" "$<" $(MAKECMDPREFIX)sed -e 's/register //' \ diff --git a/srcpkgs/olsrd/template b/srcpkgs/olsrd/template index fe19e2a1a8..314527b834 100644 --- a/srcpkgs/olsrd/template +++ b/srcpkgs/olsrd/template @@ -11,7 +11,6 @@ license="BSD-3-Clause" homepage="http://www.olsr.org/" distfiles="https://github.com/OLSR/olsrd/archive/v${version}.tar.gz" checksum=9baf2e4993dbb53babf18eea9e81a2e92ce79686632711a16a5b4f7776e94451 -patch_args=-Np0 conf_files="/etc/olsrd.conf" diff --git a/srcpkgs/omxplayer/patches/build.patch b/srcpkgs/omxplayer/patches/build.patch index 85c9450422..01c58e786c 100644 --- a/srcpkgs/omxplayer/patches/build.patch +++ b/srcpkgs/omxplayer/patches/build.patch @@ -1,7 +1,7 @@ diff --git Makefile Makefile index 5f4e414..c5b33f5 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -1,10 +1,10 @@ -CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog +CFLAGS=-fomit-frame-pointer -mtune=arm1176jzf-s diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template index c6742b439a..f20b056f40 100644 --- a/srcpkgs/omxplayer/template +++ b/srcpkgs/omxplayer/template @@ -6,7 +6,6 @@ short_desc="Commandline OMX player for the Raspberry Pi" maintainer="Orphaned " license="GPL-2" homepage="https://github.com/popcornmix/omxplayer" -patch_args=-Np0 _commit="f06235cc9690a6d58187514452df8cf8fcdaacec" wrksrc="omxplayer-$_commit" diff --git a/srcpkgs/open-iscsi/patches/fix-musl.patch b/srcpkgs/open-iscsi/patches/fix-musl.patch index d82b304f07..9c2719fe66 100644 --- a/srcpkgs/open-iscsi/patches/fix-musl.patch +++ b/srcpkgs/open-iscsi/patches/fix-musl.patch @@ -7,8 +7,8 @@ that indicates an argument error. Later check this flag and error out, if it is set. ---- usr/iscsiadm.c 2016-09-29 20:33:24.000000000 +0200 -+++ usr/iscsiadm.c 2017-01-08 03:03:20.648496369 +0100 +--- a/usr/iscsiadm.c 2016-09-29 20:33:24.000000000 +0200 ++++ b/usr/iscsiadm.c 2017-01-08 03:03:20.648496369 +0100 @@ -3263,7 +3263,8 @@ int packet_size=32, ping_count=1, ping_interval=0; int do_discover = 0, sub_mode = -1; @@ -40,8 +40,8 @@ Later check this flag and error out, if it is set. rc = ISCSI_ERR_INVAL; goto free_ifaces; } ---- usr/mgmt_ipc.c.orig -+++ usr/mgmt_ipc.c +--- a/usr/mgmt_ipc.c ++++ b/usr/mgmt_ipc.c @@ -22,6 +22,7 @@ * See the file COPYING included with this distribution for more details. */ diff --git a/srcpkgs/open-iscsi/patches/libressl.patch b/srcpkgs/open-iscsi/patches/libressl.patch index c8cd9e3393..5fce5bf341 100644 --- a/srcpkgs/open-iscsi/patches/libressl.patch +++ b/srcpkgs/open-iscsi/patches/libressl.patch @@ -1,5 +1,5 @@ ---- usr/auth.c.orig -+++ usr/auth.c +--- a/usr/auth.c ++++ b/usr/auth.c @@ -182,9 +182,11 @@ case AUTH_CHAP_ALG_SHA256: digest = EVP_sha256(); diff --git a/srcpkgs/open-iscsi/template b/srcpkgs/open-iscsi/template index e772af1da0..7cd8308b04 100644 --- a/srcpkgs/open-iscsi/template +++ b/srcpkgs/open-iscsi/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="http://www.open-iscsi.com/" distfiles="https://github.com/${pkgname}/${pkgname}/archive/${version}.tar.gz" checksum=5410474b23552016220d04aa181903cb50ae988f29e99cb03f3e2de86a109be4 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) CFLAGS+="-D_LINUX_IF_ETHER_H -Wno-error=format -Wno-error=cpp";; diff --git a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch index 4880f22c0e..87a145a2be 100644 --- a/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch +++ b/srcpkgs/open-vm-tools/patches/0001-recognize-Void.patch @@ -1,8 +1,8 @@ #inspired by alpine #upstream: no ---- open-vm-tools/lib/include/guest_os.h -+++ open-vm-tools/lib/include/guest_os.h +--- a/open-vm-tools/lib/include/guest_os.h ++++ b/open-vm-tools/lib/include/guest_os.h @@ -309,6 +309,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_ULTRAPENGUIN "UltraPenguin" #define STR_OS_UNITEDLINUX "UnitedLinux" @@ -13,8 +13,8 @@ diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c index 6ac15412..ea898e24 100644 ---- open-vm-tools/lib/misc/hostinfoPosix.c -+++ open-vm-tools/lib/misc/hostinfoPosix.c +--- a/open-vm-tools/lib/misc/hostinfoPosix.c ++++ b/open-vm-tools/lib/misc/hostinfoPosix.c @@ -1259,6 +1259,7 @@ static const ShortNameSet shortNameArray[] = { {"united linux", STR_OS_UNITEDLINUX, HostinfoGenericSetShortName}, {"va linux", STR_OS_VALINUX, HostinfoGenericSetShortName}, diff --git a/srcpkgs/open-vm-tools/patches/0002-disable-werror.patch b/srcpkgs/open-vm-tools/patches/0002-disable-werror.patch index 552d39fd07..839702f054 100644 --- a/srcpkgs/open-vm-tools/patches/0002-disable-werror.patch +++ b/srcpkgs/open-vm-tools/patches/0002-disable-werror.patch @@ -1,7 +1,7 @@ #upstream: no ---- open-vm-tools/configure.ac -+++ open-vm-tools/configure.ac +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac @@ -1218,7 +1218,7 @@ ### General flags / actions diff --git a/srcpkgs/open-vm-tools/patches/0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch b/srcpkgs/open-vm-tools/patches/0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch index 40ca6716cd..508d74e024 100644 --- a/srcpkgs/open-vm-tools/patches/0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch +++ b/srcpkgs/open-vm-tools/patches/0003-Do-not-assume-that-linux-and-gnu-libc-are-the-same-t.patch @@ -19,8 +19,8 @@ Signed-off-by: Natanael Copa diff --git a/open-vm-tools/lib/file/fileIOPosix.c b/open-vm-tools/lib/file/fileIOPosix.c index 23108279..603ea28d 100644 ---- open-vm-tools/lib/file/fileIOPosix.c -+++ open-vm-tools/lib/file/fileIOPosix.c +--- a/open-vm-tools/lib/file/fileIOPosix.c ++++ b/open-vm-tools/lib/file/fileIOPosix.c @@ -198,7 +198,7 @@ static AlignedPool alignedPool; * are not available in any header file. */ diff --git a/srcpkgs/open-vm-tools/patches/0004-Use-configure-test-for-struct-timespec.patch b/srcpkgs/open-vm-tools/patches/0004-Use-configure-test-for-struct-timespec.patch index 8a3f9714ca..bcfd8d25ce 100644 --- a/srcpkgs/open-vm-tools/patches/0004-Use-configure-test-for-struct-timespec.patch +++ b/srcpkgs/open-vm-tools/patches/0004-Use-configure-test-for-struct-timespec.patch @@ -17,8 +17,8 @@ Signed-off-by: Natanael Copa diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac index 367e4ff8..5dc0be2b 100644 ---- open-vm-tools/configure.ac -+++ open-vm-tools/configure.ac +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac @@ -1208,6 +1208,7 @@ AC_TYPE_OFF_T AC_TYPE_PID_T AC_TYPE_SIZE_T @@ -29,8 +29,8 @@ index 367e4ff8..5dc0be2b 100644 AC_C_VOLATILE diff --git a/open-vm-tools/lib/include/hgfsUtil.h b/open-vm-tools/lib/include/hgfsUtil.h index 609f4c00..a3a022d4 100644 ---- open-vm-tools/lib/include/hgfsUtil.h -+++ open-vm-tools/lib/include/hgfsUtil.h +--- a/open-vm-tools/lib/include/hgfsUtil.h ++++ b/open-vm-tools/lib/include/hgfsUtil.h @@ -53,13 +53,7 @@ # include # endif diff --git a/srcpkgs/open-vm-tools/patches/0005-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/srcpkgs/open-vm-tools/patches/0005-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch index dce384483e..f480d41f88 100644 --- a/srcpkgs/open-vm-tools/patches/0005-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch +++ b/srcpkgs/open-vm-tools/patches/0005-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch @@ -19,8 +19,8 @@ Signed-off-by: Natanael Copa diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c index f2b7ce67..0e6351a9 100644 ---- open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -+++ open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +--- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c ++++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c @@ -105,11 +105,13 @@ typedef struct DirectoryEntry { #endif @@ -40,8 +40,8 @@ index f2b7ce67..0e6351a9 100644 diff --git a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c index 89133652..7e9c3a91 100644 ---- open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c -+++ open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c +--- a/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c ++++ b/open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c @@ -52,7 +52,7 @@ #define DND_ROOTDIR_PERMS (S_IRWXU | S_IRWXG | S_IRWXO) diff --git a/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch b/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch index af4d0cac62..f6c0c084d5 100644 --- a/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/srcpkgs/open-vm-tools/patches/0006-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -31,8 +31,8 @@ Signed-off-by: Natanael Copa diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac index 9aa95abb..941195c1 100644 ---- open-vm-tools/configure.ac -+++ open-vm-tools/configure.ac +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac @@ -879,6 +879,7 @@ AC_CHECK_FUNCS( AC_CHECK_FUNCS([ecvt]) @@ -56,8 +56,8 @@ index 9aa95abb..941195c1 100644 AC_CHECK_HEADERS([sys/io.h]) diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c index 1bb86f48..2116f2aa 100644 ---- open-vm-tools/lib/misc/idLinux.c -+++ open-vm-tools/lib/misc/idLinux.c +--- a/open-vm-tools/lib/misc/idLinux.c ++++ b/open-vm-tools/lib/misc/idLinux.c @@ -27,12 +27,9 @@ #include #include @@ -119,8 +119,8 @@ index 1bb86f48..2116f2aa 100644 #endif diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c index 3363f3ac..b343196b 100644 ---- open-vm-tools/lib/nicInfo/nicInfoPosix.c -+++ open-vm-tools/lib/nicInfo/nicInfoPosix.c +--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c ++++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c @@ -35,9 +35,13 @@ #include #include diff --git a/srcpkgs/open-vm-tools/patches/0007-Use-configure-test-for-sys-stat.h-include.patch b/srcpkgs/open-vm-tools/patches/0007-Use-configure-test-for-sys-stat.h-include.patch index 464765681e..adfeab4721 100644 --- a/srcpkgs/open-vm-tools/patches/0007-Use-configure-test-for-sys-stat.h-include.patch +++ b/srcpkgs/open-vm-tools/patches/0007-Use-configure-test-for-sys-stat.h-include.patch @@ -15,8 +15,8 @@ Signed-off-by: Natanael Copa diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c index e5273786..cabc4137 100644 ---- open-vm-tools/services/plugins/vix/vixTools.c -+++ open-vm-tools/services/plugins/vix/vixTools.c +--- a/open-vm-tools/services/plugins/vix/vixTools.c ++++ b/open-vm-tools/services/plugins/vix/vixTools.c @@ -66,7 +66,7 @@ #include #endif diff --git a/srcpkgs/open-vm-tools/patches/0010-use-posix-strerror_r-unless-gnu.patch b/srcpkgs/open-vm-tools/patches/0010-use-posix-strerror_r-unless-gnu.patch index 8c425b0678..12d7f13bd8 100644 --- a/srcpkgs/open-vm-tools/patches/0010-use-posix-strerror_r-unless-gnu.patch +++ b/srcpkgs/open-vm-tools/patches/0010-use-posix-strerror_r-unless-gnu.patch @@ -12,8 +12,8 @@ Subject: [PATCH 10/12] use posix strerror_r unless gnu diff --git a/open-vm-tools/lib/err/errPosix.c b/open-vm-tools/lib/err/errPosix.c index c81b4c13..a34e8190 100644 ---- open-vm-tools/lib/err/errPosix.c -+++ open-vm-tools/lib/err/errPosix.c +--- a/open-vm-tools/lib/err/errPosix.c ++++ b/open-vm-tools/lib/err/errPosix.c @@ -63,11 +63,13 @@ ErrErrno2String(Err_Number errorNumber, // IN { char *p; diff --git a/srcpkgs/open-vm-tools/patches/0011-use-off64_t-instead-of-loff_t.patch b/srcpkgs/open-vm-tools/patches/0011-use-off64_t-instead-of-loff_t.patch index 61d0b6f663..7393232087 100644 --- a/srcpkgs/open-vm-tools/patches/0011-use-off64_t-instead-of-loff_t.patch +++ b/srcpkgs/open-vm-tools/patches/0011-use-off64_t-instead-of-loff_t.patch @@ -14,8 +14,8 @@ Subject: [PATCH 11/12] use off64_t instead of loff_t diff --git a/open-vm-tools/vmhgfs-fuse/file.c b/open-vm-tools/vmhgfs-fuse/file.c index 389ebba8..d22b66df 100644 ---- open-vm-tools/vmhgfs-fuse/file.c -+++ open-vm-tools/vmhgfs-fuse/file.c +--- a/open-vm-tools/vmhgfs-fuse/file.c ++++ b/open-vm-tools/vmhgfs-fuse/file.c @@ -535,7 +535,7 @@ static int HgfsDoRead(HgfsHandle handle, // IN: Handle for this file char *buf, // OUT: Buffer to copy data into @@ -64,8 +64,8 @@ index 389ebba8..d22b66df 100644 diff --git a/open-vm-tools/vmhgfs-fuse/fsutil.c b/open-vm-tools/vmhgfs-fuse/fsutil.c index 042c223c..c3d581d3 100644 ---- open-vm-tools/vmhgfs-fuse/fsutil.c -+++ open-vm-tools/vmhgfs-fuse/fsutil.c +--- a/open-vm-tools/vmhgfs-fuse/fsutil.c ++++ b/open-vm-tools/vmhgfs-fuse/fsutil.c @@ -680,7 +680,7 @@ HgfsStatusConvertToLinux(HgfsStatus hgfsStatus) // IN: Status code to convert unsigned long HgfsCalcBlockSize(uint64 tsize) @@ -77,8 +77,8 @@ index 042c223c..c3d581d3 100644 diff --git a/open-vm-tools/vmhgfs-fuse/fsutil.h b/open-vm-tools/vmhgfs-fuse/fsutil.h index 34b6d489..a75cff82 100644 ---- open-vm-tools/vmhgfs-fuse/fsutil.h -+++ open-vm-tools/vmhgfs-fuse/fsutil.h +--- a/open-vm-tools/vmhgfs-fuse/fsutil.h ++++ b/open-vm-tools/vmhgfs-fuse/fsutil.h @@ -32,10 +32,6 @@ #include "hgfsProto.h" #include diff --git a/srcpkgs/open-vm-tools/patches/0020-configure-kernelver.patch b/srcpkgs/open-vm-tools/patches/0020-configure-kernelver.patch index 44416a9bc6..e8df3a024b 100644 --- a/srcpkgs/open-vm-tools/patches/0020-configure-kernelver.patch +++ b/srcpkgs/open-vm-tools/patches/0020-configure-kernelver.patch @@ -2,8 +2,8 @@ reason: drop localversion in x.y.z_LOCALVERSION, else later numeric comparisons on `micro_version` fail. upstream: no ---- open-vm-tools/configure.ac -+++ open-vm-tools/configure.ac +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac @@ -100,7 +100,7 @@ [AS_HELP_STRING([--with-kernel-release], [specifies the kernel release you want to build against])], diff --git a/srcpkgs/open-vm-tools/patches/1000-strerror_r.patch b/srcpkgs/open-vm-tools/patches/1000-strerror_r.patch index eba4217900..189faa44b3 100644 --- a/srcpkgs/open-vm-tools/patches/1000-strerror_r.patch +++ b/srcpkgs/open-vm-tools/patches/1000-strerror_r.patch @@ -3,8 +3,8 @@ diff --git a/open-vm-tools/vgauth/common/VGAuthLog.c b/open-vm-tools/vgauth/common/VGAuthLog.c index fb4261e..1b29536 100644 ---- open-vm-tools/vgauth/common/VGAuthLog.c -+++ open-vm-tools/vgauth/common/VGAuthLog.c +--- a/open-vm-tools/vgauth/common/VGAuthLog.c ++++ b/open-vm-tools/vgauth/common/VGAuthLog.c @@ -210,7 +210,7 @@ LogErrorPosixCodeV(int code, g_vsnprintf(buf, sizeof buf, fmt, args); buf[sizeof buf - 1] = '\0'; diff --git a/srcpkgs/open-vm-tools/patches/1001-pr383-rename-poll-vm_poll.patch b/srcpkgs/open-vm-tools/patches/1001-pr383-rename-poll-vm_poll.patch index 8b13808e5b..e1c29f273e 100644 --- a/srcpkgs/open-vm-tools/patches/1001-pr383-rename-poll-vm_poll.patch +++ b/srcpkgs/open-vm-tools/patches/1001-pr383-rename-poll-vm_poll.patch @@ -48,8 +48,8 @@ Signed-off-by: Fabrice Fontaine diff --git lib/asyncsocket/asyncsocket.c lib/asyncsocket/asyncsocket.c index 102638cc9..01181a957 100644 ---- open-vm-tools/lib/asyncsocket/asyncsocket.c -+++ open-vm-tools/lib/asyncsocket/asyncsocket.c +--- a/open-vm-tools/lib/asyncsocket/asyncsocket.c ++++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c @@ -69,8 +69,8 @@ #else #include @@ -71,8 +71,8 @@ index 102638cc9..01181a957 100644 #include "hostinfo.h" diff --git lib/hgfsServer/hgfsServer.c lib/hgfsServer/hgfsServer.c index 462245511..fc6912860 100644 ---- open-vm-tools/lib/hgfsServer/hgfsServer.c -+++ open-vm-tools/lib/hgfsServer/hgfsServer.c +--- a/open-vm-tools/lib/hgfsServer/hgfsServer.c ++++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c @@ -48,7 +48,7 @@ #include "hgfsServerOplock.h" #include "hgfsDirNotify.h" @@ -84,8 +84,8 @@ index 462245511..fc6912860 100644 #include "unicodeOperations.h" diff --git lib/include/asyncsocket.h lib/include/asyncsocket.h index 95a5e4643..a4b4e5aae 100644 ---- open-vm-tools/lib/include/asyncsocket.h -+++ open-vm-tools/lib/include/asyncsocket.h +--- a/open-vm-tools/lib/include/asyncsocket.h ++++ b/open-vm-tools/lib/include/asyncsocket.h @@ -164,7 +164,7 @@ typedef struct AsyncSocket AsyncSocket; * Or the client can specify its favorite poll class and locking behavior. * Use of IVmdbPoll is only supported for regular sockets and for Attach. @@ -97,8 +97,8 @@ index 95a5e4643..a4b4e5aae 100644 int flags; /* Default 0, only POLL_FLAG_NO_BULL is valid */ diff --git lib/include/pollImpl.h lib/include/pollImpl.h index 46442e556..8bc669970 100644 ---- open-vm-tools/lib/include/pollImpl.h -+++ open-vm-tools/lib/include/pollImpl.h +--- a/open-vm-tools/lib/include/pollImpl.h ++++ b/open-vm-tools/lib/include/pollImpl.h @@ -44,7 +44,7 @@ #define INCLUDE_ALLOW_USERLEVEL #include "includeCheck.h" @@ -114,8 +114,8 @@ rename from open-vm-tools/lib/include/poll.h rename to open-vm-tools/lib/include/vm_poll.h diff --git lib/rpcIn/rpcin.c lib/rpcIn/rpcin.c index 47a3380e4..660382c62 100644 ---- open-vm-tools/lib/rpcIn/rpcin.c -+++ open-vm-tools/lib/rpcIn/rpcin.c +--- a/open-vm-tools/lib/rpcIn/rpcin.c ++++ b/open-vm-tools/lib/rpcIn/rpcin.c @@ -57,7 +57,7 @@ #if defined(VMTOOLS_USE_VSOCKET) diff --git a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch b/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch index 85884a472f..775a78d303 100644 --- a/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch +++ b/srcpkgs/open-vm-tools/patches/1002-Fix-subdir-objects-configure-error.patch @@ -15,8 +15,8 @@ Signed-off-by: Khem Raj diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac index 71e684bb..b76a7966 100644 ---- open-vm-tools/configure.ac -+++ open-vm-tools/configure.ac +--- a/open-vm-tools/configure.ac ++++ b/open-vm-tools/configure.ac @@ -303,6 +303,7 @@ AC_ARG_ENABLE( [], [enable_resolutionkms="auto"]) diff --git a/srcpkgs/open-vm-tools/patches/2001-res_ninit-for-musl.patch b/srcpkgs/open-vm-tools/patches/2001-res_ninit-for-musl.patch index 727ca6c8eb..837e4e745d 100644 --- a/srcpkgs/open-vm-tools/patches/2001-res_ninit-for-musl.patch +++ b/srcpkgs/open-vm-tools/patches/2001-res_ninit-for-musl.patch @@ -1,6 +1,6 @@ #upstream: no ---- open-vm-tools/lib/nicInfo/nicInfoPosix.c -+++ open-vm-tools/lib/nicInfo/nicInfoPosix.c +--- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c ++++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c @@ -66,6 +66,35 @@ # include #endif diff --git a/srcpkgs/open-vm-tools/template b/srcpkgs/open-vm-tools/template index b965024f76..c452f7365a 100644 --- a/srcpkgs/open-vm-tools/template +++ b/srcpkgs/open-vm-tools/template @@ -20,7 +20,6 @@ homepage="https://github.com/vmware/open-vm-tools" changelog="https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/ChangeLog" distfiles="https://github.com/vmware/open-vm-tools/archive/stable-${version}.tar.gz" checksum=7c31bb8ef70a0e32b81cde6550cae390a53108e4abb28bb539b0ab5b9e4fc188 -patch_args=-Np0 build_options="pam x11" build_options_default="pam x11" diff --git a/srcpkgs/openbabel/patches/unsigned_char.patch b/srcpkgs/openbabel/patches/unsigned_char.patch index 15fedf1235..47ec0f7d09 100644 --- a/srcpkgs/openbabel/patches/unsigned_char.patch +++ b/srcpkgs/openbabel/patches/unsigned_char.patch @@ -1,7 +1,7 @@ https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216 ---- src/formats/pngformat.cpp.orig 2016-09-21 21:55:37.000000000 +0200 -+++ src/formats/pngformat.cpp 2018-01-04 08:22:33.377616730 +0100 +--- a/src/formats/pngformat.cpp 2016-09-21 21:55:37.000000000 +0200 ++++ b/src/formats/pngformat.cpp 2018-01-04 08:22:33.377616730 +0100 @@ -218,7 +218,7 @@ _count=0; _hasInputPngFile=true; @@ -11,8 +11,8 @@ https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e char readbytes[9]; ifs.read(readbytes, 8); ---- src/formats/yasaraformat.cpp.orig 2016-09-21 21:55:37.000000000 +0200 -+++ src/formats/yasaraformat.cpp 2018-01-04 09:00:45.636003936 +0100 +--- a/src/formats/yasaraformat.cpp 2016-09-21 21:55:37.000000000 +0200 ++++ b/src/formats/yasaraformat.cpp 2018-01-04 09:00:45.636003936 +0100 @@ -472,7 +472,7 @@ // bool hetatom; diff --git a/srcpkgs/openbabel/template b/srcpkgs/openbabel/template index 9e16fb318d..83eef561f8 100644 --- a/srcpkgs/openbabel/template +++ b/srcpkgs/openbabel/template @@ -14,7 +14,6 @@ license="GPL-2.0-only" homepage="http://openbabel.org" distfiles="https://github.com/openbabel/openbabel/archive/openbabel-${_ver}.tar.gz" checksum=594c7f8a83f3502381469d643f7b185882da1dd4bc2280c16502ef980af2a776 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python" diff --git a/srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch b/srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch index 2be46aec36..92dcb7f738 100644 --- a/srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch +++ b/srcpkgs/openblas/patches/ppc-dynamic-gcc9.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fix build on gcc9 diff --git driver/others/dynamic_power.c driver/others/dynamic_power.c index a2f56d8..e79e7e9 100644 ---- driver/others/dynamic_power.c -+++ driver/others/dynamic_power.c +--- a/driver/others/dynamic_power.c ++++ b/driver/others/dynamic_power.c @@ -53,7 +53,7 @@ static gotoblas_t *get_coretype(void) { return &gotoblas_POWER10; #endif diff --git a/srcpkgs/openblas/template b/srcpkgs/openblas/template index 2e3773fc10..58a75941be 100644 --- a/srcpkgs/openblas/template +++ b/srcpkgs/openblas/template @@ -14,7 +14,6 @@ homepage="https://www.openblas.net/" changelog="https://raw.githubusercontent.com/xianyi/OpenBLAS/v${version}/Changelog.txt" distfiles="https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz" checksum=79197543b17cc314b7e43f7a33148c308b0807cd6381ee77f77e15acf3e6459e -patch_args=-Np0 case "${XBPS_TARGET_MACHINE}" in armv5*) make_build_args+=" TARGET=ARMV5" ;; diff --git a/srcpkgs/openbox/patches/openbox-3.5.0-title-matching.patch b/srcpkgs/openbox/patches/openbox-3.5.0-title-matching.patch index 88ed73546c..e18fed7f5b 100644 --- a/srcpkgs/openbox/patches/openbox-3.5.0-title-matching.patch +++ b/srcpkgs/openbox/patches/openbox-3.5.0-title-matching.patch @@ -1,5 +1,5 @@ ---- openbox/client.c 2011-08-01 22:14:58.000000000 +0200 -+++ openbox/client.c 2011-10-22 14:59:56.000000000 +0200 +--- a/openbox/client.c 2011-08-01 22:14:58.000000000 +0200 ++++ b/openbox/client.c 2011-10-22 14:59:56.000000000 +0200 @@ -883,7 +883,7 @@ !g_pattern_match(app->role, strlen(self->role), self->role, NULL)) diff --git a/srcpkgs/openbox/patches/openbox-3.5.0-which-2.20.patch b/srcpkgs/openbox/patches/openbox-3.5.0-which-2.20.patch index acb5ba357a..debef007b0 100644 --- a/srcpkgs/openbox/patches/openbox-3.5.0-which-2.20.patch +++ b/srcpkgs/openbox/patches/openbox-3.5.0-which-2.20.patch @@ -1,5 +1,5 @@ ---- data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000 -+++ data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000 +--- a/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000 ++++ b/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000 @@ -8,7 +8,7 @@ # #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template index 346329d63b..fb62d8d4fe 100644 --- a/srcpkgs/openbox/template +++ b/srcpkgs/openbox/template @@ -20,7 +20,6 @@ homepage="http://www.openbox.org" distfiles="http://openbox.org/dist/openbox/openbox-$version.tar.xz" checksum=abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d python_version=2 #unverified -patch_args=-Np0 # Package build options build_options="svg" diff --git a/srcpkgs/openbsd-file/patches/musl.patch b/srcpkgs/openbsd-file/patches/musl.patch index 430b889161..b410f6affe 100644 --- a/srcpkgs/openbsd-file/patches/musl.patch +++ b/srcpkgs/openbsd-file/patches/musl.patch @@ -1,5 +1,5 @@ ---- file.c -+++ file.c +--- a/file.c ++++ b/file.c @@ -19,6 +19,7 @@ #include #include @@ -8,8 +8,8 @@ #include #include ---- seccomp-sandbox.c -+++ seccomp-sandbox.c +--- a/seccomp-sandbox.c ++++ b/seccomp-sandbox.c @@ -109,6 +109,9 @@ static const struct sock_filter filt_insns[] = { #ifdef __NR_write SC_ALLOW(__NR_write), diff --git a/srcpkgs/openbsd-file/patches/no-x86-seccomp.patch b/srcpkgs/openbsd-file/patches/no-x86-seccomp.patch index 7c055b84b2..3402d4cfd4 100644 --- a/srcpkgs/openbsd-file/patches/no-x86-seccomp.patch +++ b/srcpkgs/openbsd-file/patches/no-x86-seccomp.patch @@ -1,5 +1,5 @@ ---- seccomp-sandbox.c.orig 2020-01-30 15:59:29.517540311 +0100 -+++ seccomp-sandbox.c 2020-01-30 16:03:43.046273793 +0100 +--- a/seccomp-sandbox.c 2020-01-30 15:59:29.517540311 +0100 ++++ b/seccomp-sandbox.c 2020-01-30 16:03:43.046273793 +0100 @@ -40,6 +40,16 @@ #define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386 #elif defined __x86_64__ || defined __amd64__ diff --git a/srcpkgs/openbsd-file/template b/srcpkgs/openbsd-file/template index 0556a0f33b..839afee47d 100644 --- a/srcpkgs/openbsd-file/template +++ b/srcpkgs/openbsd-file/template @@ -12,7 +12,6 @@ license="ISC" homepage="https://github.com/brynet/file/" distfiles="https://github.com/brynet/file/archive/v${version}.tar.gz" checksum=f6bf601f513bd83038e343bbd93b7982f373669a2ffa76dc52d48fa7251515b2 -patch_args=-Np0 system_accounts="_file" diff --git a/srcpkgs/opencollada/patches/001-fix-no_return_value.patch b/srcpkgs/opencollada/patches/001-fix-no_return_value.patch index 7ca5482e33..9d2155c31c 100644 --- a/srcpkgs/opencollada/patches/001-fix-no_return_value.patch +++ b/srcpkgs/opencollada/patches/001-fix-no_return_value.patch @@ -1,5 +1,5 @@ ---- common/libBuffer/src/CommonFWriteBufferFlusher.cpp 2016-02-23 00:57:35.000000000 +0100 -+++ common/libBuffer/src/CommonFWriteBufferFlusher.cpp 2016-02-29 02:14:07.709567632 +0100 +--- a/common/libBuffer/src/CommonFWriteBufferFlusher.cpp 2016-02-23 00:57:35.000000000 +0100 ++++ b/common/libBuffer/src/CommonFWriteBufferFlusher.cpp 2016-02-29 02:14:07.709567632 +0100 @@ -147,6 +147,7 @@ } } diff --git a/srcpkgs/opencollada/patches/002-fix-stdint_h.patch b/srcpkgs/opencollada/patches/002-fix-stdint_h.patch index 27532354be..1f9e4d98f4 100644 --- a/srcpkgs/opencollada/patches/002-fix-stdint_h.patch +++ b/srcpkgs/opencollada/patches/002-fix-stdint_h.patch @@ -1,5 +1,5 @@ ---- common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-02-23 00:57:35.000000000 +0100 -+++ common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-02-29 02:18:38.673566829 +0100 +--- a/common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-02-23 00:57:35.000000000 +0100 ++++ b/common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-02-29 02:18:38.673566829 +0100 @@ -44,6 +44,7 @@ typedef int64_t __int64; #else diff --git a/srcpkgs/opencollada/patches/003-musl-stdint_h.patch b/srcpkgs/opencollada/patches/003-musl-stdint_h.patch index aafdacb20b..410fbff32d 100644 --- a/srcpkgs/opencollada/patches/003-musl-stdint_h.patch +++ b/srcpkgs/opencollada/patches/003-musl-stdint_h.patch @@ -1,5 +1,5 @@ ---- common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-04-11 20:10:51.000000000 +0200 -+++ common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-04-12 10:56:39.685988592 +0200 +--- a/common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-04-11 20:10:51.000000000 +0200 ++++ b/common/libBuffer/include/CommonFWriteBufferFlusher.h 2016-04-12 10:56:39.685988592 +0200 @@ -35,7 +35,7 @@ #ifdef __GNUC__ # include /* size_t */ diff --git a/srcpkgs/opencollada/patches/004-fix-libpcre-8.42-compat.patch b/srcpkgs/opencollada/patches/004-fix-libpcre-8.42-compat.patch index 964ed60e3a..cf428b6d33 100644 --- a/srcpkgs/opencollada/patches/004-fix-libpcre-8.42-compat.patch +++ b/srcpkgs/opencollada/patches/004-fix-libpcre-8.42-compat.patch @@ -9,8 +9,8 @@ This fixes a compilation error with libpcre-8.42: error: conflicting declaration 'typedef struct real_pcre8_or_16 pcre' ``` ---- COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h -+++ COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h +--- a/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h ++++ b/COLLADABaseUtils/include/COLLADABUPcreCompiledPattern.h @@ -13,8 +13,7 @@ #include "COLLADABUPrerequisites.h" diff --git a/srcpkgs/opencollada/template b/srcpkgs/opencollada/template index 3bc1f23010..6041120059 100644 --- a/srcpkgs/opencollada/template +++ b/srcpkgs/opencollada/template @@ -13,7 +13,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/KhronosGroup/OpenCOLLADA" distfiles="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=d9db0c0a518aa6ac0359626f222707c6ca1b63a83cbf229d97a5999c9cde347b -patch_args=-Np0 CXXFLAGS="-fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2" if [ -n "$CROSS_BUILD" ]; then diff --git a/srcpkgs/opencolorio/patches/disable_werror.patch b/srcpkgs/opencolorio/patches/disable_werror.patch index ca802c1e5a..4d1111452d 100644 --- a/srcpkgs/opencolorio/patches/disable_werror.patch +++ b/srcpkgs/opencolorio/patches/disable_werror.patch @@ -1,7 +1,7 @@ diff --git src/core/CMakeLists.txt src/core/CMakeLists.txt index 1eb691b..cff9bd8 100644 ---- src/core/CMakeLists.txt -+++ src/core/CMakeLists.txt +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt @@ -23,8 +23,6 @@ if(WIN32) if("${CMAKE_BUILD_TYPE}" STREQUAL "Release") set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX") @@ -13,8 +13,8 @@ index 1eb691b..cff9bd8 100644 # SHARED diff --git src/pyglue/CMakeLists.txt src/pyglue/CMakeLists.txt index a90ca1c..b1f0361 100644 ---- src/pyglue/CMakeLists.txt -+++ src/pyglue/CMakeLists.txt +--- a/src/pyglue/CMakeLists.txt ++++ b/src/pyglue/CMakeLists.txt @@ -20,12 +20,6 @@ if(WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275") endif() diff --git a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch index 805b85f5de..6a2e118f0a 100644 --- a/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch +++ b/srcpkgs/opencolorio/patches/fix-cmake-files-location.patch @@ -18,8 +18,8 @@ Signed-off by: Jonathan Scruggs diff --git a/CMakeLists.txt b/CMakeLists.txt index a399d57a..473f1b79 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -60,6 +60,7 @@ endif() include(ParseArguments) include(OCIOMacros) @@ -63,8 +63,8 @@ index a399d57a..473f1b79 100644 +install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO) diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index 5970db64..4d97f72c 100644 ---- docs/CMakeLists.txt -+++ docs/CMakeLists.txt +--- a/docs/CMakeLists.txt ++++ b/docs/CMakeLists.txt @@ -138,7 +138,7 @@ add_custom_target(doc ALL add_dependencies(doc Sphinx) @@ -84,8 +84,8 @@ index 5970db64..4d97f72c 100644 endif() diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in index 81ab4ce3..c4553a4f 100644 ---- export/pkgconfig/OpenColorIO.pc.in -+++ export/pkgconfig/OpenColorIO.pc.in +--- a/export/pkgconfig/OpenColorIO.pc.in ++++ b/export/pkgconfig/OpenColorIO.pc.in @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@ diff --git a/srcpkgs/opencolorio/template b/srcpkgs/opencolorio/template index c444616b8c..1797365985 100644 --- a/srcpkgs/opencolorio/template +++ b/srcpkgs/opencolorio/template @@ -19,7 +19,6 @@ homepage="http://opencolorio.org" changelog="https://raw.githubusercontent.com/imageworks/OpenColorIO/master/ChangeLog" distfiles="https://github.com/imageworks/OpenColorIO/archive/v${version}.tar.gz" checksum=c9b5b9def907e1dafb29e37336b702fff22cc6306d445a13b1621b8a754c14c8 -patch_args=-Np0 export CMAKE_GENERATOR="Unix Makefiles" diff --git a/srcpkgs/opencv/patches/undef-altivec-macros-cpp.patch b/srcpkgs/opencv/patches/undef-altivec-macros-cpp.patch index 67dd2a7a6d..83460ce56f 100644 --- a/srcpkgs/opencv/patches/undef-altivec-macros-cpp.patch +++ b/srcpkgs/opencv/patches/undef-altivec-macros-cpp.patch @@ -2,8 +2,8 @@ This is necessary because otherwise conflicts are introduced in C++ code that includes this. The header itself does not rely on the macros. The issue is not visible on little endian because they undef the macros somewhere else. ---- 3rdparty/include/opencl/1.2/CL/cl_platform.h -+++ 3rdparty/include/opencl/1.2/CL/cl_platform.h +--- a/3rdparty/include/opencl/1.2/CL/cl_platform.h ++++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h @@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum; /* Define basic vector types */ #if defined( __VEC__ ) diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template index a484fbc925..4ebf6fe915 100644 --- a/srcpkgs/opencv/template +++ b/srcpkgs/opencv/template @@ -18,7 +18,6 @@ license="BSD-3-Clause" homepage="https://opencv.org" distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz" checksum=1ed6f5b02a7baf14daca04817566e7c98ec668cec381e0edf534fa49f10f58a2 -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch b/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch index 67dd2a7a6d..83460ce56f 100644 --- a/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch +++ b/srcpkgs/opencv4/patches/undef-altivec-macros-cpp.patch @@ -2,8 +2,8 @@ This is necessary because otherwise conflicts are introduced in C++ code that includes this. The header itself does not rely on the macros. The issue is not visible on little endian because they undef the macros somewhere else. ---- 3rdparty/include/opencl/1.2/CL/cl_platform.h -+++ 3rdparty/include/opencl/1.2/CL/cl_platform.h +--- a/3rdparty/include/opencl/1.2/CL/cl_platform.h ++++ b/3rdparty/include/opencl/1.2/CL/cl_platform.h @@ -332,6 +332,9 @@ typedef unsigned int cl_GLenum; /* Define basic vector types */ #if defined( __VEC__ ) diff --git a/srcpkgs/opencv4/template b/srcpkgs/opencv4/template index 02a8e293b9..f15c5f1ec2 100644 --- a/srcpkgs/opencv4/template +++ b/srcpkgs/opencv4/template @@ -24,7 +24,6 @@ distfiles="https://github.com/opencv/opencv/archive/${version}.tar.gz https://github.com/opencv/opencv_contrib/archive/${version}.tar.gz>contrib.tar.gz" checksum="68bc40cbf47fdb8ee73dfaf0d9c6494cd095cf6294d99de445ab64cf853d278a acb8e89c9e7d1174e63e40532125b60d248b00e517255a98a419d415228c6a55" -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch index 3957bb12bc..5a5298b7b0 100644 --- a/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch +++ b/srcpkgs/opendkim/patches/openssl_1.1.0_compat.patch @@ -8,8 +8,8 @@ Forwarded: no Reviewed-By: Scott Kitterman Last-Update: ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -864,26 +864,28 @@ then AC_SEARCH_LIBS([ERR_peek_error], [crypto], , AC_MSG_ERROR([libcrypto not found])) @@ -58,8 +58,8 @@ Last-Update: AC_CHECK_DECL([SHA256_DIGEST_LENGTH], AC_DEFINE([HAVE_SHA256], 1, ---- opendkim/opendkim-crypto.c -+++ opendkim/opendkim-crypto.c +--- a/opendkim/opendkim-crypto.c ++++ b/opendkim/opendkim-crypto.c @@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr) { assert(pthread_setspecific(id_key, ptr) == 0); diff --git a/srcpkgs/opendkim/template b/srcpkgs/opendkim/template index cccc65ca3f..c9d0abfda6 100644 --- a/srcpkgs/opendkim/template +++ b/srcpkgs/opendkim/template @@ -13,7 +13,6 @@ homepage="http://www.opendkim.org" distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/${pkgname}-${version}.tar.gz" checksum=43a0ba57bf942095fe159d0748d8933c6b1dd1117caf0273fa9a0003215e681b python_version=2 #unverified -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/openexr/patches/musl-_fpstate.patch b/srcpkgs/openexr/patches/musl-_fpstate.patch index f7e6b371ed..0584598bb3 100644 --- a/srcpkgs/openexr/patches/musl-_fpstate.patch +++ b/srcpkgs/openexr/patches/musl-_fpstate.patch @@ -1,5 +1,5 @@ ---- IlmBase/IexMath/IexMathFpu.cpp.orig 2019-12-01 15:42:08.143387128 +0100 -+++ IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100 +--- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100 ++++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100 @@ -281,10 +281,18 @@ inline void restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) diff --git a/srcpkgs/openexr/patches/pkgconfig-prefix.patch b/srcpkgs/openexr/patches/pkgconfig-prefix.patch index 2142208dbc..d28d9a6e33 100644 --- a/srcpkgs/openexr/patches/pkgconfig-prefix.patch +++ b/srcpkgs/openexr/patches/pkgconfig-prefix.patch @@ -1,5 +1,5 @@ ---- OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200 -+++ OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100 +--- a/OpenEXR/OpenEXR.pc.in 2019-09-18 03:02:06.000000000 +0200 ++++ b/OpenEXR/OpenEXR.pc.in 2019-12-01 17:30:08.680721453 +0100 @@ -6,8 +6,8 @@ prefix=@prefix@ -exec_prefix=@exec_prefix@ diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template index f99fd2d8ab..3f1b59753c 100644 --- a/srcpkgs/openexr/template +++ b/srcpkgs/openexr/template @@ -12,7 +12,6 @@ license="BSD-3-Clause" homepage="https://www.openexr.com/" distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=3ebbe9a8e67edb4a25890b98c598e9fe23b10f96d1416d6a3ff0732e99d001c1 -patch_args=-Np0 pre_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/openjade/patches/musl.patch b/srcpkgs/openjade/patches/musl.patch index 556ead28e0..3cfc8677e9 100644 --- a/srcpkgs/openjade/patches/musl.patch +++ b/srcpkgs/openjade/patches/musl.patch @@ -1,5 +1,5 @@ ---- configure.orig 2015-05-09 05:42:21.144044831 +0200 -+++ configure 2015-05-09 05:43:00.305016564 +0200 +--- a/configure 2015-05-09 05:42:21.144044831 +0200 ++++ b/configure 2015-05-09 05:43:00.305016564 +0200 @@ -8428,7 +8428,7 @@ linux-gnuoldld* | linux-gnuaout* | linux ;; diff --git a/srcpkgs/openjade/patches/openjade-1.3.2-lt.patch b/srcpkgs/openjade/patches/openjade-1.3.2-lt.patch index cb1182b734..fb4f35589e 100644 --- a/srcpkgs/openjade/patches/openjade-1.3.2-lt.patch +++ b/srcpkgs/openjade/patches/openjade-1.3.2-lt.patch @@ -1,5 +1,5 @@ ---- Makefile.prog.in -+++ Makefile.prog.in +--- a/Makefile.prog.in ++++ b/Makefile.prog.in @@ -13,6 +13,7 @@ ALL_LIBS = $(XLIBS) $(LIBS) Makefile.lt: diff --git a/srcpkgs/openjade/patches/openjade-1.3.2-msggen.pl.patch b/srcpkgs/openjade/patches/openjade-1.3.2-msggen.pl.patch index 2289b6e5af..1afe68b800 100644 --- a/srcpkgs/openjade/patches/openjade-1.3.2-msggen.pl.patch +++ b/srcpkgs/openjade/patches/openjade-1.3.2-msggen.pl.patch @@ -1,8 +1,8 @@ Use Getopt::Std in place of getopts.pl. https://bugs.gentoo.org/show_bug.cgi?id=420083 ---- msggen.pl -+++ msggen.pl +--- a/msggen.pl ++++ b/msggen.pl @@ -4,6 +4,7 @@ # See the file COPYING for copying permission. diff --git a/srcpkgs/openjade/patches/patch-jade_TeXFOTBuilder.cxx.diff b/srcpkgs/openjade/patches/patch-jade_TeXFOTBuilder.cxx.diff index b7a3df73c3..028af86483 100644 --- a/srcpkgs/openjade/patches/patch-jade_TeXFOTBuilder.cxx.diff +++ b/srcpkgs/openjade/patches/patch-jade_TeXFOTBuilder.cxx.diff @@ -2,8 +2,8 @@ $NetBSD: patch-jade_TeXFOTBuilder.cxx,v 1.1 2011/04/22 07:27:45 adam Exp $ Fix building with Clang. ---- jade/TeXFOTBuilder.cxx.orig 2011-04-22 07:00:24.000000000 +0000 -+++ jade/TeXFOTBuilder.cxx +--- a/jade/TeXFOTBuilder.cxx 2011-04-22 07:00:24.000000000 +0000 ++++ b/jade/TeXFOTBuilder.cxx @@ -1873,8 +1873,8 @@ static OutputByteStream &operator<<(Outp FOTBuilder *makeTeXFOTBuilder(OutputByteStream *os, Messenger *mgr, const FOTBuilder::Extension *&ext) diff --git a/srcpkgs/openjade/patches/patch-jade_TransformFOTBuilder.cxx.diff b/srcpkgs/openjade/patches/patch-jade_TransformFOTBuilder.cxx.diff index 2b13e2cc5f..cd114eab5f 100644 --- a/srcpkgs/openjade/patches/patch-jade_TransformFOTBuilder.cxx.diff +++ b/srcpkgs/openjade/patches/patch-jade_TransformFOTBuilder.cxx.diff @@ -2,8 +2,8 @@ $NetBSD: patch-jade_TransformFOTBuilder.cxx,v 1.1 2011/04/22 07:27:45 adam Exp $ Fix building with Clang. ---- jade/TransformFOTBuilder.cxx.orig 2011-04-22 07:04:25.000000000 +0000 -+++ jade/TransformFOTBuilder.cxx +--- a/jade/TransformFOTBuilder.cxx 2011-04-22 07:04:25.000000000 +0000 ++++ b/jade/TransformFOTBuilder.cxx @@ -248,12 +248,12 @@ FOTBuilder *makeTransformFOTBuilder(CmdL const Vector &options, const FOTBuilder::Extension *&ext) diff --git a/srcpkgs/openjade/template b/srcpkgs/openjade/template index 401ab09110..5d27cec3f6 100644 --- a/srcpkgs/openjade/template +++ b/srcpkgs/openjade/template @@ -19,7 +19,6 @@ homepage="http://openjade.sourceforge.net/" license="MIT" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-$version.tar.gz" checksum=1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1 -patch_args=-Np0 CXXFLAGS="-fno-lifetime-dse" diff --git a/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch b/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch index 3f658e849d..28d654fa88 100644 --- a/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch +++ b/srcpkgs/openjpeg2/patches/14f4c27e7c91f745a1dda9991b5deea3cbef2072.patch @@ -13,8 +13,8 @@ DESTDIR usage). diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in index 8a726697a..2925108ad 100644 ---- cmake/OpenJPEGConfig.cmake.in -+++ cmake/OpenJPEGConfig.cmake.in +--- a/cmake/OpenJPEGConfig.cmake.in ++++ b/cmake/OpenJPEGConfig.cmake.in @@ -27,8 +27,12 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) # This is an install tree include(${SELF_DIR}/OpenJPEGTargets.cmake) diff --git a/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch b/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch index 9c6b47ce47..18907a5d74 100644 --- a/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch +++ b/srcpkgs/openjpeg2/patches/4d0b49edad7fb31ebbf03c60a45b72aaa7b7412b.patch @@ -13,8 +13,8 @@ Signed-off-by: Fabrice Fontaine diff --git cmake/OpenJPEGConfig.cmake.in cmake/OpenJPEGConfig.cmake.in index 2925108ad..6e88036c6 100644 ---- cmake/OpenJPEGConfig.cmake.in -+++ cmake/OpenJPEGConfig.cmake.in +--- a/cmake/OpenJPEGConfig.cmake.in ++++ b/cmake/OpenJPEGConfig.cmake.in @@ -32,7 +32,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") diff --git a/srcpkgs/openjpeg2/template b/srcpkgs/openjpeg2/template index dae52dc781..4e6f16ac7c 100644 --- a/srcpkgs/openjpeg2/template +++ b/srcpkgs/openjpeg2/template @@ -12,7 +12,6 @@ license="BSD-2-Clause" homepage="http://www.openjpeg.org/" distfiles="https://github.com/uclouvain/openjpeg/archive/v${version}.tar.gz" checksum=8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/openlierox/patches/fix-cflags.patch b/srcpkgs/openlierox/patches/fix-cflags.patch index 4fe6652fd0..711358a3bf 100644 --- a/srcpkgs/openlierox/patches/fix-cflags.patch +++ b/srcpkgs/openlierox/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeOlxCommon.cmake =================================================================== ---- CMakeOlxCommon.cmake.orig -+++ CMakeOlxCommon.cmake +--- a/CMakeOlxCommon.cmake ++++ b/CMakeOlxCommon.cmake @@ -36,12 +36,6 @@ OPTION(BREAKPAD "Google Breakpad support OPTION(DISABLE_JOYSTICK "Disable joystick support" No) OPTION(MINGW_CROSS_COMPILE "Cross-compile Windows .EXE using i686-w64-mingw32-gcc compiler" No) diff --git a/srcpkgs/openlierox/patches/ppc-musl.patch b/srcpkgs/openlierox/patches/ppc-musl.patch index 71bde1fef8..dc1441fc72 100644 --- a/srcpkgs/openlierox/patches/ppc-musl.patch +++ b/srcpkgs/openlierox/patches/ppc-musl.patch @@ -1,5 +1,5 @@ ---- src/client/CrashHandler.cpp -+++ src/client/CrashHandler.cpp +--- a/src/client/CrashHandler.cpp ++++ b/src/client/CrashHandler.cpp @@ -23,6 +23,9 @@ #include "../breakpad/BreakPad.h" diff --git a/srcpkgs/openlierox/template b/srcpkgs/openlierox/template index 343b26f494..7ae0e22f2d 100644 --- a/srcpkgs/openlierox/template +++ b/srcpkgs/openlierox/template @@ -17,7 +17,6 @@ distfiles="${SOURCEFORGE_SITE}/openlierox/OpenLieroX_${version/.rc/_rc}.src.tar. checksum=3e029aba20f22d902027293e1f1a196e2f1794455cb2483d099709d7fb6c5fbb python_version=2 replaces="openlierox-data>=0" -patch_args=-Np0 CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libxml2" case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/openmpi/patches/drop-orted-mpir.patch b/srcpkgs/openmpi/patches/drop-orted-mpir.patch index a50c9ec97a..75ab3d2632 100644 --- a/srcpkgs/openmpi/patches/drop-orted-mpir.patch +++ b/srcpkgs/openmpi/patches/drop-orted-mpir.patch @@ -6,8 +6,8 @@ https://github.com/open-mpi/ompi/pull/8892 diff --git orte/orted/orted-mpir/Makefile.am orte/orted/orted-mpir/Makefile.am index 5c0dd33564..8a03fcd387 100644 ---- orte/orted/orted-mpir/Makefile.am -+++ orte/orted/orted-mpir/Makefile.am +--- a/orte/orted/orted-mpir/Makefile.am ++++ b/orte/orted/orted-mpir/Makefile.am @@ -15,7 +15,7 @@ CFLAGS = $(CFLAGS_WITHOUT_OPTFLAGS) $(DEBUGGER_CFLAGS) diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index 0881292b27..ce8585fa68 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -19,7 +19,6 @@ distfiles="${homepage}/software/ompi/v${version%.*}/downloads/${pkgname}-${versi checksum=e24f7a778bd11a71ad0c14587a7f5b00e68a71aa5623e2157bafee3d44c07cda nocross="configure attempts to run target binaries" lib32disabled=yes -patch_args=-Np0 post_extract() { vsed -e 's,sys/unistd.h,unistd.h,g' -i opal/include/opal/sys/cma.h diff --git a/srcpkgs/openntpd/patches/libtls.patch b/srcpkgs/openntpd/patches/libtls.patch index 978f4d5d00..2f8a0c111a 100644 --- a/srcpkgs/openntpd/patches/libtls.patch +++ b/srcpkgs/openntpd/patches/libtls.patch @@ -1,5 +1,5 @@ ---- configure.ac 2017-06-13 02:47:58.000000000 +0200 -+++ - 2021-03-09 20:37:29.357052132 +0100 +--- a/configure.ac 2017-06-13 02:47:58.000000000 +0200 ++++ b/configure.ac 2017-06-13 02:47:58.000000000 +0200 @@ -61,7 +61,7 @@ # check for libtls diff --git a/srcpkgs/openntpd/patches/musl.patch b/srcpkgs/openntpd/patches/musl.patch index 99f8f63f93..2afd78836b 100644 --- a/srcpkgs/openntpd/patches/musl.patch +++ b/srcpkgs/openntpd/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/ntpd.h.orig -+++ src/ntpd.h +--- a/src/ntpd.h ++++ b/src/ntpd.h @@ -33,6 +33,10 @@ #include "ntp.h" @@ -11,8 +11,8 @@ #define MAXIMUM(a, b) ((a) > (b) ? (a) : (b)) #ifndef NTPD_USER ---- src/log.c.orig -+++ src/log.c +--- a/src/log.c ++++ b/src/log.c @@ -24,6 +24,10 @@ #include #include diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template index e8c003ec9f..34bb4ed3a5 100644 --- a/srcpkgs/openntpd/template +++ b/srcpkgs/openntpd/template @@ -13,7 +13,6 @@ license="ISC" homepage="http://openntpd.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz" checksum=7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a -patch_args=-Np0 conf_files="/etc/ntpd.conf" provides="ntp-daemon-0_1" diff --git a/srcpkgs/opensm/patches/fix-musl.patch b/srcpkgs/opensm/patches/fix-musl.patch index c6be721073..20f2fcb3c1 100644 --- a/srcpkgs/opensm/patches/fix-musl.patch +++ b/srcpkgs/opensm/patches/fix-musl.patch @@ -1,6 +1,6 @@ diff -ru a/include/complib/cl_debug_osd.h include/complib/cl_debug_osd.h --- a/include/complib/cl_debug_osd.h 2019-04-17 04:02:47.000000000 -0400 -+++ include/complib/cl_debug_osd.h 2019-04-17 11:56:45.870471013 -0400 ++++ b/include/complib/cl_debug_osd.h 2019-04-17 11:56:45.870471013 -0400 @@ -42,7 +42,7 @@ #define _CL_DEBUG_OSD_H_ @@ -12,7 +12,7 @@ diff -ru a/include/complib/cl_debug_osd.h include/complib/cl_debug_osd.h # define BEGIN_C_DECLS extern "C" { diff -ru a/include/complib/cl_types.h include/complib/cl_types.h --- a/include/complib/cl_types.h 2019-04-17 04:02:47.000000000 -0400 -+++ include/complib/cl_types.h 2019-04-17 11:57:35.064280498 -0400 ++++ b/include/complib/cl_types.h 2019-04-17 11:57:35.064280498 -0400 @@ -56,6 +56,9 @@ BEGIN_C_DECLS #include @@ -25,7 +25,7 @@ diff -ru a/include/complib/cl_types.h include/complib/cl_types.h typedef uint64_t net64_t; diff -ru a/opensm/osm_db_files.c opensm/osm_db_files.c --- a/opensm/osm_db_files.c 2019-04-17 04:02:47.000000000 -0400 -+++ opensm/osm_db_files.c 2019-04-17 11:58:57.600529423 -0400 ++++ b/opensm/osm_db_files.c 2019-04-17 11:58:57.600529423 -0400 @@ -394,7 +394,7 @@ p_accum_val); diff --git a/srcpkgs/opensm/template b/srcpkgs/opensm/template index 62b6cf0ea3..101bf3a27c 100644 --- a/srcpkgs/opensm/template +++ b/srcpkgs/opensm/template @@ -11,7 +11,6 @@ license="GPL-2.0-only" homepage="https://github.com/linux-rdma/opensm" distfiles="https://github.com/linux-rdma/opensm/releases/download/${version}/opensm-${version}.tar.gz" checksum=1e0dc56a5cf5f8e5cd68bd534591405a5f5f1975ace40509f61a43cc2fe74ca7 -patch_args=-Np0 pre_configure() { ./autogen.sh diff --git a/srcpkgs/opensmtpd-extras/patches/fix-musl.patch b/srcpkgs/opensmtpd-extras/patches/fix-musl.patch index 2f67db6085..f2ad64bda1 100644 --- a/srcpkgs/opensmtpd-extras/patches/fix-musl.patch +++ b/srcpkgs/opensmtpd-extras/patches/fix-musl.patch @@ -1,7 +1,7 @@ diff --git a/extras/tables/table-ldap/ber.h b/extras/tables/table-ldap/ber.h index d656508..b92656c 100644 ---- extras/tables/table-ldap/ber.h -+++ extras/tables/table-ldap/ber.h +--- a/extras/tables/table-ldap/ber.h ++++ b/extras/tables/table-ldap/ber.h @@ -75,7 +75,9 @@ struct ber_oid { size_t bo_n; }; diff --git a/srcpkgs/opensmtpd-extras/template b/srcpkgs/opensmtpd-extras/template index b8b0a4b5a0..f022e13ed9 100644 --- a/srcpkgs/opensmtpd-extras/template +++ b/srcpkgs/opensmtpd-extras/template @@ -16,7 +16,6 @@ license="ISC" homepage="https://www.opensmtpd.org" distfiles="https://www.opensmtpd.org/archives/${pkgname}-${version}.tar.gz" checksum=126b023602e8bb222bf24543a056ee0a548343dc86d184669ff9d82dfca1fbdf -patch_args=-Np0 CFLAGS="-D_DEFAULT_SOURCE" diff --git a/srcpkgs/opensmtpd/patches/configure-cross.patch b/srcpkgs/opensmtpd/patches/configure-cross.patch index 2b5003f6e1..ace1ce00e0 100644 --- a/srcpkgs/opensmtpd/patches/configure-cross.patch +++ b/srcpkgs/opensmtpd/patches/configure-cross.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -1207,8 +1207,8 @@ dnl # stripping any trailing slash. If for some strage reason our program dnl # does not find what it needs, we default to /var/spool/mail. diff --git a/srcpkgs/opensmtpd/patches/cross-no-varrun-check.patch b/srcpkgs/opensmtpd/patches/cross-no-varrun-check.patch index 2ec9f50b79..c12d4c37ae 100644 --- a/srcpkgs/opensmtpd/patches/cross-no-varrun-check.patch +++ b/srcpkgs/opensmtpd/patches/cross-no-varrun-check.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -1340,40 +1340,6 @@ # Where to place smtpd.pid diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template index 5dfe9d09b8..ab0b2e6a10 100644 --- a/srcpkgs/opensmtpd/template +++ b/srcpkgs/opensmtpd/template @@ -26,7 +26,6 @@ checksum=51bf05312fe56764748faab9e63170bfbb7c7d84a37c4117b62b2681eb3a4d17 provides="smtp-forwarder-0_1 smtp-server-0_1" replaces="smtp-forwarder>=0 smtp-server>=0" system_accounts="_smtpd _smtpq" -patch_args=-Np0 CFLAGS=-D_DEFAULT_SOURCE diff --git a/srcpkgs/opensonic/patches/allegro.patch b/srcpkgs/opensonic/patches/allegro.patch index 6086a06c7f..de647351e0 100644 --- a/srcpkgs/opensonic/patches/allegro.patch +++ b/srcpkgs/opensonic/patches/allegro.patch @@ -1,7 +1,7 @@ Source: FreeBSD ---- CMakeLists.txt.orig 2010-09-19 18:31:26 UTC -+++ CMakeLists.txt +--- a/CMakeLists.txt 2010-09-19 18:31:26 UTC ++++ b/CMakeLists.txt @@ -82,12 +82,6 @@ IF(NOT LJPGALLEG) MESSAGE(FATAL_ERROR "Fatal error: libjpgalleg not found! ${RTFM}") ENDIF(NOT LJPGALLEG) @@ -64,8 +64,8 @@ Source: FreeBSD - - INSTALL(CODE "MESSAGE(\"Done! Please run ${GAME_UNIXNAME} to start ${GAME_NAME}.\")") ENDIF(UNIX) ---- src/core/audio.c.orig 2019-02-06 16:44:28 UTC -+++ src/core/audio.c +--- a/src/core/audio.c 2019-02-06 16:44:28 UTC ++++ b/src/core/audio.c @@ -18,7 +18,7 @@ */ diff --git a/srcpkgs/opensonic/patches/fix-cflags.patch b/srcpkgs/opensonic/patches/fix-cflags.patch index 10d2c7c80e..be3110e076 100644 --- a/srcpkgs/opensonic/patches/fix-cflags.patch +++ b/srcpkgs/opensonic/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -25,12 +25,10 @@ SET(GAME_NAME "Open Sonic") SET(GAME_VERSION "0.1.4") SET(RTFM "Please read the user manual (readme.html) to get help.") diff --git a/srcpkgs/opensonic/template b/srcpkgs/opensonic/template index 5b438426d1..4dff7f06bd 100644 --- a/srcpkgs/opensonic/template +++ b/srcpkgs/opensonic/template @@ -17,7 +17,6 @@ distfiles="${SOURCEFORGE_SITE}/opensnc/opensnc-src-${version}.tar.gz https://github.com/t6/loggcompat/archive/${_loggcompat_ver}.tar.gz" checksum="3a4c3fa9538ee27c04b5ea848c9ad0a83f335471936d4617a18d3648c42588e9 481fe569959eefa92d0babeca27709b2efcf7a815cd5c49596b6c0403db76a4e" -patch_args=-Np0 replaces="opensonic-data>=0" CFLAGS="-I./../loggcompat-${_loggcompat_ver}" diff --git a/srcpkgs/openssh/patches/config.patch b/srcpkgs/openssh/patches/config.patch index 9424dd29cc..c269363cdf 100644 --- a/srcpkgs/openssh/patches/config.patch +++ b/srcpkgs/openssh/patches/config.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -184,6 +184,7 @@ OSSH_CHECK_CFLAG_COMPILE([-Wall]) OSSH_CHECK_CFLAG_COMPILE([-Wpointer-arith]) diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index fdd089dab3..95c8b31073 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -26,7 +26,6 @@ distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${ver checksum=c3e6e4da1621762c850d03b47eed1e48dff4cc9608ddeb547202a234df8ed7ae conf_files="/etc/ssh/moduli /etc/ssh/ssh_config /etc/ssh/sshd_config /etc/pam.d/sshd" make_dirs="/var/chroot/ssh 0755 root root" -patch_args=-Np0 # Package build options build_options="fido2 gssapi ldns ssl" diff --git a/srcpkgs/openssl/patches/ppc-auxv.patch b/srcpkgs/openssl/patches/ppc-auxv.patch index b1e1d627c8..308cb2218b 100644 --- a/srcpkgs/openssl/patches/ppc-auxv.patch +++ b/srcpkgs/openssl/patches/ppc-auxv.patch @@ -1,5 +1,5 @@ ---- crypto/ppccap.c.old 2020-03-17 14:31:17.000000000 +0000 -+++ crypto/ppccap.c 2020-03-30 06:32:25.943988524 +0000 +--- a/crypto/ppccap.c.old 2020-03-17 14:31:17.000000000 +0000 ++++ b/crypto/ppccap.c 2020-03-30 06:32:25.943988524 +0000 @@ -207,11 +207,9 @@ return 0; } diff --git a/srcpkgs/openssl/patches/ppc64.patch b/srcpkgs/openssl/patches/ppc64.patch index bbb4a6f464..c75ceedba2 100644 --- a/srcpkgs/openssl/patches/ppc64.patch +++ b/srcpkgs/openssl/patches/ppc64.patch @@ -20,8 +20,8 @@ Reviewed-by: Richard Levitte diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl index e52f2f6ea62..5fcd0526dff 100755 ---- crypto/perlasm/ppc-xlate.pl -+++ crypto/perlasm/ppc-xlate.pl +--- a/crypto/perlasm/ppc-xlate.pl ++++ b/crypto/perlasm/ppc-xlate.pl @@ -49,7 +49,7 @@ /osx/ && do { $name = "_$name"; last; @@ -76,8 +76,8 @@ Reviewed-by: Richard Levitte diff --git a/Configure b/Configure index 22082deb4c7..e303d98deb3 100755 ---- Configure -+++ Configure +--- a/Configure ++++ b/Configure @@ -1402,8 +1402,15 @@ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC}); my %predefined_CXX = $config{CXX} diff --git a/srcpkgs/openssl/patches/xxx-ppcle.patch b/srcpkgs/openssl/patches/xxx-ppcle.patch index 09f1da8ca1..2498af9688 100644 --- a/srcpkgs/openssl/patches/xxx-ppcle.patch +++ b/srcpkgs/openssl/patches/xxx-ppcle.patch @@ -6,8 +6,8 @@ Date: Fri Mar 5 18:36:01 2021 +0100 diff --git Configurations/10-main.conf Configurations/10-main.conf index 8dc3e85..18f10c9 100644 ---- Configurations/10-main.conf -+++ Configurations/10-main.conf +--- a/Configurations/10-main.conf ++++ b/Configurations/10-main.conf @@ -665,6 +665,11 @@ my %targets = ( perlasm_scheme => "linux32", lib_cppflags => add("-DB_ENDIAN"), @@ -22,8 +22,8 @@ index 8dc3e85..18f10c9 100644 cflags => add("-m64"), diff --git config config index 26225ca..6a1e830 100755 ---- config -+++ config +--- a/config ++++ b/config @@ -543,6 +543,7 @@ case "$GUESSOS" in fi ;; @@ -34,8 +34,8 @@ index 26225ca..6a1e830 100755 echo "WARNING! If you wish to build 64-bit library, then you have to" diff --git crypto/poly1305/asm/poly1305-ppc.pl crypto/poly1305/asm/poly1305-ppc.pl index e5d6933..3283f6b 100755 ---- crypto/poly1305/asm/poly1305-ppc.pl -+++ crypto/poly1305/asm/poly1305-ppc.pl +--- a/crypto/poly1305/asm/poly1305-ppc.pl ++++ b/crypto/poly1305/asm/poly1305-ppc.pl @@ -314,10 +314,10 @@ $code.=<<___; beq- Lno_key ___ diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template index 007e2fc5b3..01dfd74de1 100644 --- a/srcpkgs/openssl/template +++ b/srcpkgs/openssl/template @@ -20,7 +20,6 @@ distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz" checksum=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 conf_files="/etc/ssl/openssl.cnf" replaces="libressl>=0" -patch_args=-Np0 build_options=asm diff --git a/srcpkgs/opensurge/patches/fix-ssize.patch b/srcpkgs/opensurge/patches/fix-ssize.patch index b586a48ef4..1b0ce7269c 100644 --- a/srcpkgs/opensurge/patches/fix-ssize.patch +++ b/srcpkgs/opensurge/patches/fix-ssize.patch @@ -1,5 +1,5 @@ ---- src/core/zip/zip.h.orig -+++ src/core/zip/zip.h +--- a/src/core/zip/zip.h ++++ b/src/core/zip/zip.h @@ -19,15 +19,6 @@ extern "C" { #endif diff --git a/srcpkgs/opensurge/template b/srcpkgs/opensurge/template index 90714ddef5..f39fb00280 100644 --- a/srcpkgs/opensurge/template +++ b/srcpkgs/opensurge/template @@ -12,7 +12,6 @@ homepage="https://opensurge2d.org/" distfiles="https://github.com/alemart/opensurge/archive/v${version}.tar.gz" checksum=27764a82d97b54026c90044fbc31ea4a61f7836568020b869e63376322a155af replaces="opensurge-data>=0" -patch_args=-Np0 pre_configure() { vsed -i CMakeLists.txt -e 's/GAME_BINDIR "games"/GAME_BINDIR "bin"/' diff --git a/srcpkgs/opkg/patches/lock-var-run.patch b/srcpkgs/opkg/patches/lock-var-run.patch index 68b10f5638..f9dd871364 100644 --- a/srcpkgs/opkg/patches/lock-var-run.patch +++ b/srcpkgs/opkg/patches/lock-var-run.patch @@ -19,8 +19,8 @@ Signed-off-by: Jonathan Liu diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h index 7bca948..5a1bc44 100644 ---- libopkg/opkg_conf.h -+++ libopkg/opkg_conf.h +--- a/libopkg/opkg_conf.h ++++ b/libopkg/opkg_conf.h @@ -40,7 +40,7 @@ extern "C" { #define OPKG_CONF_DEFAULT_STATUS_FILE VARDIR "/lib/opkg/status" #define OPKG_CONF_DEFAULT_CACHE_DIR VARDIR "/cache/opkg" diff --git a/srcpkgs/opkg/template b/srcpkgs/opkg/template index 04d4362ae1..33b8bdd334 100644 --- a/srcpkgs/opkg/template +++ b/srcpkgs/opkg/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="http://code.google.com/p/opkg/" distfiles="https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz" checksum=a1214a75fa34fb9228db8da47308e0e711b1c93fd8938cf164c10fd28eb50f1e -patch_args=-Np0 build_options="gpg lz4 ssl" build_options_default="ssl" diff --git a/srcpkgs/oprofile/patches/musl.patch b/srcpkgs/oprofile/patches/musl.patch index 22214dfdb2..add883f972 100644 --- a/srcpkgs/oprofile/patches/musl.patch +++ b/srcpkgs/oprofile/patches/musl.patch @@ -1,8 +1,8 @@ musl does not implement glibc extensions such as FTW_STOP, FTW_CONTINUE, and FTW_ACTIONRETVAL. ---- pe_profiling/operf.cpp 2017-08-08 13:44:44.573674304 -0400 -+++ pe_profiling/operf.cpp 2017-08-08 13:46:27.876692262 -0400 +--- a/pe_profiling/operf.cpp 2017-08-08 13:44:44.573674304 -0400 ++++ b/pe_profiling/operf.cpp 2017-08-08 13:46:27.876692262 -0400 @@ -860,9 +860,17 @@ { if (remove(fpath)) { diff --git a/srcpkgs/oprofile/patches/system-account.patch b/srcpkgs/oprofile/patches/system-account.patch index a49217f01b..3be1850cfc 100644 --- a/srcpkgs/oprofile/patches/system-account.patch +++ b/srcpkgs/oprofile/patches/system-account.patch @@ -1,5 +1,5 @@ ---- opjitconv/opjitconv.c.orig -+++ opjitconv/opjitconv.c +--- a/opjitconv/opjitconv.c ++++ b/opjitconv/opjitconv.c @@ -659,7 +659,7 @@ if (non_root) { pw_oprofile = NULL; diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template index da5caf24f4..6625c36343 100644 --- a/srcpkgs/oprofile/template +++ b/srcpkgs/oprofile/template @@ -15,7 +15,6 @@ license="GPL-2.0-only" homepage="http://oprofile.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=7ba06f99d7c188389d20d1d5e53ee690c7733f87aa9af62bd664fa0ca235a412 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in ppc*) makedepends+=" papi-devel";; diff --git a/srcpkgs/oragono/patches/paths.patch b/srcpkgs/oragono/patches/paths.patch index 22ecab8b1b..ad9fb05123 100644 --- a/srcpkgs/oragono/patches/paths.patch +++ b/srcpkgs/oragono/patches/paths.patch @@ -1,5 +1,5 @@ ---- default.yaml.orig 2021-01-30 22:19:08.000000000 -0500 -+++ default.yaml 2021-01-31 20:20:33.092293843 -0500 +--- a/default.yaml 2021-01-30 22:19:08.000000000 -0500 ++++ b/default.yaml 2021-01-31 20:20:33.092293843 -0500 @@ -50,8 +50,8 @@ # The standard SSL/TLS port for IRC is 6697. This will listen on all interfaces: ":6697": diff --git a/srcpkgs/oragono/template b/srcpkgs/oragono/template index d3e8842533..33a91197e9 100644 --- a/srcpkgs/oragono/template +++ b/srcpkgs/oragono/template @@ -16,7 +16,6 @@ system_accounts="_oragono" _oragono_homedir="/var/lib/oragono" make_dirs=" /var/lib/oragono 0755 _oragono _oragono" -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch b/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch index 67f7f15a16..175435bc3d 100644 --- a/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch +++ b/srcpkgs/orion/patches/516d280a83521ac29a1438e05e8f7a331842bcb4.patch @@ -1,5 +1,5 @@ ---- src/player/mpvobject.h -+++ src/player/mpvobject.h +--- a/src/player/mpvobject.h ++++ b/src/player/mpvobject.h @@ -21,7 +21,7 @@ typedef mpv_opengl_cb_context mpv_context; typedef mpv_render_context mpv_context; #endif @@ -10,7 +10,7 @@ class MpvRenderer; --- /dev/null -+++ src/player/qthelper.hpp ++++ b/src/player/qthelper.hpp @@ -0,0 +1,386 @@ +/* Copyright (C) 2017 the mpv developers + * diff --git a/srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch b/srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch index dfa699baed..87ad8cc85f 100644 --- a/srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch +++ b/srcpkgs/orion/patches/b7360bbd4a856ea45c770f882be9e63a663a9acd.patch @@ -1,5 +1,5 @@ ---- src/qml/PlayerView.qml -+++ src/qml/PlayerView.qml +--- a/src/qml/PlayerView.qml ++++ b/src/qml/PlayerView.qml @@ -128,13 +128,27 @@ diff --git a/srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch b/srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch index 327ee7036d..c2628f8429 100644 --- a/srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch +++ b/srcpkgs/orion/patches/c61bb86f241df9e17238833c091992c80bb1d298.patch @@ -1,5 +1,5 @@ ---- src/qml/irc/ChatView.qml -+++ src/qml/irc/ChatView.qml +--- a/src/qml/irc/ChatView.qml ++++ b/src/qml/irc/ChatView.qml @@ -280,6 +280,10 @@ Page { } diff --git a/srcpkgs/orion/template b/srcpkgs/orion/template index 29feec2b0b..d69f2ff04d 100644 --- a/srcpkgs/orion/template +++ b/srcpkgs/orion/template @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/alamminsalo/orion" distfiles="${homepage}/archive/${version}.tar.gz" checksum=19d9c170d0bcf21d47947704d8c8e927cff5140f94cb840b51d2b8574b0149fb -patch_args=-Np0 do_install() { vbin orion diff --git a/srcpkgs/os-prober/patches/detect-void.patch b/srcpkgs/os-prober/patches/detect-void.patch index 750950ea38..bd625d6987 100644 --- a/srcpkgs/os-prober/patches/detect-void.patch +++ b/srcpkgs/os-prober/patches/detect-void.patch @@ -1,5 +1,5 @@ ---- os-probes/mounted/common/90linux-distro.orig 2014-04-16 09:49:59.028554885 +0200 -+++ os-probes/mounted/common/90linux-distro 2014-04-16 09:50:54.603990982 +0200 +--- a/os-probes/mounted/common/90linux-distro 2014-04-16 09:49:59.028554885 +0200 ++++ b/os-probes/mounted/common/90linux-distro 2014-04-16 09:50:54.603990982 +0200 @@ -116,6 +116,13 @@ elif [ -e "$dir/sbin/pkgtool" ]; then short="Slackware" diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index 3cd0dcc7a0..f22ca4e63e 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="https://packages.debian.org/sid/os-prober" distfiles="${DEBIAN_SITE}/main/o/${pkgname}/${pkgname}_${version}.tar.xz" checksum=6e909f511035698145ba01ad63fd53fce6ee24529c76e2698e346bbac49950e9 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) _ARCH="x86";; diff --git a/srcpkgs/osg/patches/fix-narrowing.patch b/srcpkgs/osg/patches/fix-narrowing.patch index a5c7684a85..241c31bdc1 100644 --- a/srcpkgs/osg/patches/fix-narrowing.patch +++ b/srcpkgs/osg/patches/fix-narrowing.patch @@ -1,8 +1,8 @@ Use short instead of char for the decoding[] table. Also fix an off-by-one error when checking the upper boundary for value_in. ---- src/osgDB/ConvertBase64.cpp 2015-07-23 13:14:00.000000000 +0200 -+++ src/osgDB/ConvertBase64.cpp 2016-12-06 14:05:50.435406287 +0100 +--- a/src/osgDB/ConvertBase64.cpp 2015-07-23 13:14:00.000000000 +0200 ++++ b/src/osgDB/ConvertBase64.cpp 2016-12-06 14:05:50.435406287 +0100 @@ -28,10 +28,10 @@ int base64_decode_value(char value_in) @@ -17,8 +17,8 @@ Also fix an off-by-one error when checking the upper boundary for value_in. return decoding[(int)value_in]; } ---- src/osgPlugins/osgjs/Base64.cpp 2015-03-09 12:27:26.000000000 +0100 -+++ src/osgPlugins/osgjs/Base64.cpp 2016-12-06 14:27:36.284022097 +0100 +--- a/src/osgPlugins/osgjs/Base64.cpp 2015-03-09 12:27:26.000000000 +0100 ++++ b/src/osgPlugins/osgjs/Base64.cpp 2016-12-06 14:27:36.284022097 +0100 @@ -20,22 +20,22 @@ const char _from_table[128] = diff --git a/srcpkgs/osg/patches/musl-endianess.patch b/srcpkgs/osg/patches/musl-endianess.patch index 32f7530589..d7db8f0c36 100644 --- a/srcpkgs/osg/patches/musl-endianess.patch +++ b/srcpkgs/osg/patches/musl-endianess.patch @@ -2,8 +2,8 @@ This time it's the other way round: both GNU libc and musl libc have so use defined(__linux__) to use this header file for setting the target's endianness. ---- src/osgPlugins/osc/osc/OscHostEndianness.h 2015-07-23 13:14:00.000000000 +0200 -+++ src/osgPlugins/osc/osc/OscHostEndianness.h 2015-10-31 06:39:02.503234496 +0100 +--- a/src/osgPlugins/osc/osc/OscHostEndianness.h 2015-07-23 13:14:00.000000000 +0200 ++++ b/src/osgPlugins/osc/osc/OscHostEndianness.h 2015-10-31 06:39:02.503234496 +0100 @@ -51,7 +51,7 @@ #else diff --git a/srcpkgs/osg/patches/musl-pthread.patch b/srcpkgs/osg/patches/musl-pthread.patch index b90cbd0c64..d0f155ce53 100644 --- a/srcpkgs/osg/patches/musl-pthread.patch +++ b/srcpkgs/osg/patches/musl-pthread.patch @@ -1,5 +1,5 @@ ---- src/OpenThreads/pthreads/PThread.cpp 2015-04-07 20:01:12.000000000 +0200 -+++ src/OpenThreads/pthreads/PThread.cpp 2015-10-31 06:24:45.189319272 +0100 +--- a/src/OpenThreads/pthreads/PThread.cpp 2015-04-07 20:01:12.000000000 +0200 ++++ b/src/OpenThreads/pthreads/PThread.cpp 2015-10-31 06:24:45.189319272 +0100 @@ -27,7 +27,7 @@ #include #include diff --git a/srcpkgs/osg/template b/srcpkgs/osg/template index c01c0e2535..08bf6d4b65 100644 --- a/srcpkgs/osg/template +++ b/srcpkgs/osg/template @@ -23,7 +23,6 @@ license="OSGPL-2.0-or-later" homepage="http://www.openscenegraph.org" distfiles="https://github.com/openscenegraph/OpenSceneGraph/archive/OpenSceneGraph-${version}.tar.gz" checksum=930eb46f05781a76883ec16c5f49cfb29a059421db131005d75bec4d78401fd5 -patch_args=-Np0 # Append CFLAGS and CXXFLAGS to set work around code which gcc6 would # otherwise regard as out-of-specification and allow it to produce a diff --git a/srcpkgs/osmid/patches/big-endian.patch b/srcpkgs/osmid/patches/big-endian.patch index fdb11eb4a6..cdc9468795 100644 --- a/srcpkgs/osmid/patches/big-endian.patch +++ b/srcpkgs/osmid/patches/big-endian.patch @@ -1,5 +1,5 @@ -+++ external_libs/oscpack_1_1_0/osc/OscReceivedElements.cpp 2019-06-06 22:06:36.000000000 +0200 ---- external_libs/oscpack_1_1_0/osc/OscReceivedElements.cpp 2019-06-07 10:54:40.107305153 +0200 ++++ b/external_libs/oscpack_1_1_0/osc/OscReceivedElements.cpp 2019-06-06 22:06:36.000000000 +0200 +--- a/external_libs/oscpack_1_1_0/osc/OscReceivedElements.cpp 2019-06-07 10:54:40.107305153 +0200 @@ -105,7 +105,7 @@ return u.i; diff --git a/srcpkgs/osmid/patches/musl.patch b/srcpkgs/osmid/patches/musl.patch index c7f247c725..2bca5782b9 100644 --- a/srcpkgs/osmid/patches/musl.patch +++ b/srcpkgs/osmid/patches/musl.patch @@ -1,5 +1,5 @@ ---- JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2018-03-27 16:52:31.000000000 +0200 -+++ JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2018-06-26 02:41:16.728143943 +0200 +--- a/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2018-03-27 16:52:31.000000000 +0200 ++++ b/JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp 2018-06-26 02:41:16.728143943 +0200 @@ -126,9 +126,15 @@ return result; } @@ -16,8 +16,8 @@ //============================================================================== void CPUInformation::initialise() noexcept ---- external_libs/spdlog-0.11.0/include/spdlog/details/os.h 2018-03-27 16:52:31.000000000 +0200 -+++ external_libs/spdlog-0.11.0/include/spdlog/details/os.h 2018-06-26 02:45:39.903133450 +0200 +--- a/external_libs/spdlog-0.11.0/include/spdlog/details/os.h 2018-03-27 16:52:31.000000000 +0200 ++++ b/external_libs/spdlog-0.11.0/include/spdlog/details/os.h 2018-06-26 02:45:39.903133450 +0200 @@ -343,7 +343,7 @@ return "Unkown error"; diff --git a/srcpkgs/osmid/template b/srcpkgs/osmid/template index 2482ca2547..f89e27caed 100644 --- a/srcpkgs/osmid/template +++ b/srcpkgs/osmid/template @@ -11,7 +11,6 @@ license="MIT, ISC, GPL-3.0-or-later" homepage="https://github.com/llloret/osmid/" distfiles="https://github.com/llloret/osmid/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=774d6c2c7ba81d1ab9d4e7ee031ce15a1506f19ee940166d277dbdee98f87b50 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libexecinfo-devel" ;; diff --git a/srcpkgs/otfcc/patches/fix-vq_c-missing-return.patch b/srcpkgs/otfcc/patches/fix-vq_c-missing-return.patch index 95bf9e4d57..4e34129f76 100644 --- a/srcpkgs/otfcc/patches/fix-vq_c-missing-return.patch +++ b/srcpkgs/otfcc/patches/fix-vq_c-missing-return.patch @@ -1,7 +1,7 @@ Non-void functions need a return, even if it is never reached. ---- lib/vf/vq.c 2018-01-04 04:38:06.000000000 +0100 -+++ lib/vf/vq.c 2018-01-14 17:21:38.048770122 +0100 +--- a/lib/vf/vq.c 2018-01-04 04:38:06.000000000 +0100 ++++ b/lib/vf/vq.c 2018-01-14 17:21:38.048770122 +0100 @@ -76,6 +76,7 @@ return 0; } diff --git a/srcpkgs/otfcc/template b/srcpkgs/otfcc/template index 38ec8833f2..b19fbcb522 100644 --- a/srcpkgs/otfcc/template +++ b/srcpkgs/otfcc/template @@ -11,7 +11,6 @@ license="Apache-2.0" homepage="https://github.com/caryll/otfcc" distfiles="https://github.com/caryll/otfcc/archive/v${version}.tar.gz" checksum=d9c74825ddac700eb429de31de7cb0a249636f47c6a4cc64eaa102a40966cf00 -patch_args=-Np0 # Yes, there are architectures besides x86 and x64 :-P case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/otpw/patches/ldflags.patch b/srcpkgs/otpw/patches/ldflags.patch index 883b4ed4b4..065fd103e4 100644 --- a/srcpkgs/otpw/patches/ldflags.patch +++ b/srcpkgs/otpw/patches/ldflags.patch @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -17,9 +17,9 @@ TARGETS=otpw-gen demologin pam_otpw.so pam_otpw.8.gz otpw-gen.1.gz all: $(TARGETS) diff --git a/srcpkgs/otpw/template b/srcpkgs/otpw/template index 2f86ba39e0..03c9c86d6a 100644 --- a/srcpkgs/otpw/template +++ b/srcpkgs/otpw/template @@ -10,7 +10,6 @@ license="GPL-3" homepage="http://www.cl.cam.ac.uk/~mgk25/otpw.html" distfiles="https://www.cl.cam.ac.uk/%7Emgk25/download/otpw-${version}.tar.gz" checksum=98aca38a61c7713677b96f24426ca7053480c0fd077d91b1e99bc9f92ccb832a -patch_args=-Np0 do_build() { make CC=$CC LD=$LD CFLAGS="$CFLAGS -fPIC" LDFLAGS="$LDFLAGS" ${makejobs} diff --git a/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch b/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch index 78bbcfbd3b..536db5f230 100644 --- a/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch +++ b/srcpkgs/owncloudclient/patches/89e59a352063f372a1573d326a80bd79ff4d5c37.patch @@ -15,8 +15,8 @@ csync_exclude.cpp:489:34: error: use of deleted function 'QCharRef& QCharRef::op diff --git a/src/csync/csync_exclude.cpp b/src/csync/csync_exclude.cpp index 586035346b7..c5c7bbccf5c 100644 ---- src/csync/csync_exclude.cpp -+++ src/csync/csync_exclude.cpp +--- a/src/csync/csync_exclude.cpp ++++ b/src/csync/csync_exclude.cpp @@ -488,7 +488,7 @@ QString ExcludedFiles::convertToRegexpSyntax(QString exclude, bool wildcardsMatc // Translate [! to [^ QString bracketExpr = exclude.mid(i, j - i + 1); diff --git a/srcpkgs/owncloudclient/template b/srcpkgs/owncloudclient/template index cf7871bd64..2146b9110d 100644 --- a/srcpkgs/owncloudclient/template +++ b/srcpkgs/owncloudclient/template @@ -17,7 +17,6 @@ license="GPL-2.0-or-later" homepage="https://www.owncloud.org" distfiles="https://github.com/owncloud/client/archive/v${version}.tar.gz" checksum=aafc6044a4c6727ad747195cb90a6be8c3a5b28de50df97fa961b6b551fe6d89 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-tools-devel"