diff options
author | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2021-06-19 03:03:21 +0000 |
---|---|---|
committer | Đoàn Trần Công Danh <sgn.danh@gmail.com> | 2021-06-20 06:17:29 +0000 |
commit | 49cb564d140a79e3a1a85c753aaef429981e4e67 (patch) | |
tree | 2517a45ab0afd6269f3c3a83abadd0006998ca85 | |
parent | 2fd8d4df94855a157a4de16c61d54153e16ef185 (diff) | |
download | void-packages-49cb564d140a79e3a1a85c753aaef429981e4e67.tar void-packages-49cb564d140a79e3a1a85c753aaef429981e4e67.tar.gz void-packages-49cb564d140a79e3a1a85c753aaef429981e4e67.tar.bz2 void-packages-49cb564d140a79e3a1a85c753aaef429981e4e67.tar.lz void-packages-49cb564d140a79e3a1a85c753aaef429981e4e67.tar.xz void-packages-49cb564d140a79e3a1a85c753aaef429981e4e67.tar.zst void-packages-49cb564d140a79e3a1a85c753aaef429981e4e67.zip |
srcpkgs/p*: convert patches to -Np1
* par is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
344 files changed, 724 insertions, 851 deletions
diff --git a/srcpkgs/p7zip/patches/20-CVE-2018-5996.patch b/srcpkgs/p7zip/patches/20-CVE-2018-5996.patch index 2935ec3657b..6733bff9189 100644 --- a/srcpkgs/p7zip/patches/20-CVE-2018-5996.patch +++ b/srcpkgs/p7zip/patches/20-CVE-2018-5996.patch @@ -17,8 +17,8 @@ Bug-Debian: https://bugs.debian.org/#888314 diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp index 1aaedcc..68030c7 100644 ---- CPP/7zip/Compress/Rar1Decoder.cpp -+++ CPP/7zip/Compress/Rar1Decoder.cpp +--- a/CPP/7zip/Compress/Rar1Decoder.cpp ++++ b/CPP/7zip/Compress/Rar1Decoder.cpp @@ -29,7 +29,7 @@ public: }; */ @@ -58,8 +58,8 @@ index 1aaedcc..68030c7 100644 STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h index 630f089..01b606b 100644 ---- CPP/7zip/Compress/Rar1Decoder.h -+++ CPP/7zip/Compress/Rar1Decoder.h +--- a/CPP/7zip/Compress/Rar1Decoder.h ++++ b/CPP/7zip/Compress/Rar1Decoder.h @@ -39,6 +39,7 @@ public: Int64 m_UnpackSize; @@ -70,8 +70,8 @@ index 630f089..01b606b 100644 HRESULT CopyBlock(UInt32 distance, UInt32 len); diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp index b3f2b4b..0580c8d 100644 ---- CPP/7zip/Compress/Rar2Decoder.cpp -+++ CPP/7zip/Compress/Rar2Decoder.cpp +--- a/CPP/7zip/Compress/Rar2Decoder.cpp ++++ b/CPP/7zip/Compress/Rar2Decoder.cpp @@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20; static const UInt32 kWindowReservSize = (1 << 22) + 256; @@ -112,8 +112,8 @@ index b3f2b4b..0580c8d 100644 { diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h index 3a0535c..0e9005f 100644 ---- CPP/7zip/Compress/Rar2Decoder.h -+++ CPP/7zip/Compress/Rar2Decoder.h +--- a/CPP/7zip/Compress/Rar2Decoder.h ++++ b/CPP/7zip/Compress/Rar2Decoder.h @@ -139,6 +139,7 @@ class CDecoder : UInt64 m_PackSize; @@ -124,8 +124,8 @@ index 3a0535c..0e9005f 100644 UInt32 ReadBits(unsigned numBits); diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp index 3bf2513..6cb8a6a 100644 ---- CPP/7zip/Compress/Rar3Decoder.cpp -+++ CPP/7zip/Compress/Rar3Decoder.cpp +--- a/CPP/7zip/Compress/Rar3Decoder.cpp ++++ b/CPP/7zip/Compress/Rar3Decoder.cpp @@ -92,7 +92,8 @@ CDecoder::CDecoder(): _writtenFileSize(0), _vmData(0), @@ -201,8 +201,8 @@ index 3bf2513..6cb8a6a 100644 } diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h index c130cec..2f72d7d 100644 ---- CPP/7zip/Compress/Rar3Decoder.h -+++ CPP/7zip/Compress/Rar3Decoder.h +--- a/CPP/7zip/Compress/Rar3Decoder.h ++++ b/CPP/7zip/Compress/Rar3Decoder.h @@ -192,6 +192,7 @@ class CDecoder: UInt32 _lastFilter; diff --git a/srcpkgs/p7zip/patches/30-CVE-2018-10115.patch b/srcpkgs/p7zip/patches/30-CVE-2018-10115.patch index 1941ab469fa..7d9c4bf81f0 100644 --- a/srcpkgs/p7zip/patches/30-CVE-2018-10115.patch +++ b/srcpkgs/p7zip/patches/30-CVE-2018-10115.patch @@ -19,8 +19,8 @@ Bugs-Debian: https://bugs.debian.org/897674 diff --git a/CPP/7zip/Compress/Rar1Decoder.cpp b/CPP/7zip/Compress/Rar1Decoder.cpp index 68030c7..8c890c8 100644 ---- CPP/7zip/Compress/Rar1Decoder.cpp -+++ CPP/7zip/Compress/Rar1Decoder.cpp +--- a/CPP/7zip/Compress/Rar1Decoder.cpp ++++ b/CPP/7zip/Compress/Rar1Decoder.cpp @@ -29,7 +29,7 @@ public: }; */ @@ -86,8 +86,8 @@ index 68030c7..8c890c8 100644 diff --git a/CPP/7zip/Compress/Rar1Decoder.h b/CPP/7zip/Compress/Rar1Decoder.h index 01b606b..8abb3a3 100644 ---- CPP/7zip/Compress/Rar1Decoder.h -+++ CPP/7zip/Compress/Rar1Decoder.h +--- a/CPP/7zip/Compress/Rar1Decoder.h ++++ b/CPP/7zip/Compress/Rar1Decoder.h @@ -38,7 +38,8 @@ public: UInt32 LastLength; @@ -100,8 +100,8 @@ index 01b606b..8abb3a3 100644 UInt32 ReadBits(int numBits); diff --git a/CPP/7zip/Compress/Rar2Decoder.cpp b/CPP/7zip/Compress/Rar2Decoder.cpp index 0580c8d..be8d842 100644 ---- CPP/7zip/Compress/Rar2Decoder.cpp -+++ CPP/7zip/Compress/Rar2Decoder.cpp +--- a/CPP/7zip/Compress/Rar2Decoder.cpp ++++ b/CPP/7zip/Compress/Rar2Decoder.cpp @@ -80,7 +80,8 @@ static const UInt32 kHistorySize = 1 << 20; static const UInt32 kWindowReservSize = (1 << 22) + 256; @@ -167,8 +167,8 @@ index 0580c8d..be8d842 100644 diff --git a/CPP/7zip/Compress/Rar2Decoder.h b/CPP/7zip/Compress/Rar2Decoder.h index 0e9005f..370bce2 100644 ---- CPP/7zip/Compress/Rar2Decoder.h -+++ CPP/7zip/Compress/Rar2Decoder.h +--- a/CPP/7zip/Compress/Rar2Decoder.h ++++ b/CPP/7zip/Compress/Rar2Decoder.h @@ -138,7 +138,8 @@ class CDecoder : Byte m_LastLevels[kMaxTableSize]; @@ -181,8 +181,8 @@ index 0e9005f..370bce2 100644 void InitStructures(); diff --git a/CPP/7zip/Compress/Rar3Decoder.cpp b/CPP/7zip/Compress/Rar3Decoder.cpp index 6cb8a6a..7b85833 100644 ---- CPP/7zip/Compress/Rar3Decoder.cpp -+++ CPP/7zip/Compress/Rar3Decoder.cpp +--- a/CPP/7zip/Compress/Rar3Decoder.cpp ++++ b/CPP/7zip/Compress/Rar3Decoder.cpp @@ -92,7 +92,8 @@ CDecoder::CDecoder(): _writtenFileSize(0), _vmData(0), @@ -251,8 +251,8 @@ index 6cb8a6a..7b85833 100644 diff --git a/CPP/7zip/Compress/Rar3Decoder.h b/CPP/7zip/Compress/Rar3Decoder.h index 2f72d7d..32c8943 100644 ---- CPP/7zip/Compress/Rar3Decoder.h -+++ CPP/7zip/Compress/Rar3Decoder.h +--- a/CPP/7zip/Compress/Rar3Decoder.h ++++ b/CPP/7zip/Compress/Rar3Decoder.h @@ -191,7 +191,8 @@ class CDecoder: CRecordVector<CTempFilter *> _tempFilters; UInt32 _lastFilter; @@ -265,8 +265,8 @@ index 2f72d7d..32c8943 100644 bool _lzMode; diff --git a/CPP/7zip/Compress/Rar5Decoder.cpp b/CPP/7zip/Compress/Rar5Decoder.cpp index dc8830f..a826d5a 100644 ---- CPP/7zip/Compress/Rar5Decoder.cpp -+++ CPP/7zip/Compress/Rar5Decoder.cpp +--- a/CPP/7zip/Compress/Rar5Decoder.cpp ++++ b/CPP/7zip/Compress/Rar5Decoder.cpp @@ -72,6 +72,7 @@ CDecoder::CDecoder(): _writtenFileSize(0), _dictSizeLog(0), @@ -299,8 +299,8 @@ index dc8830f..a826d5a 100644 diff --git a/CPP/7zip/Compress/Rar5Decoder.h b/CPP/7zip/Compress/Rar5Decoder.h index b0a4dd1..3db5018 100644 ---- CPP/7zip/Compress/Rar5Decoder.h -+++ CPP/7zip/Compress/Rar5Decoder.h +--- a/CPP/7zip/Compress/Rar5Decoder.h ++++ b/CPP/7zip/Compress/Rar5Decoder.h @@ -271,6 +271,7 @@ class CDecoder: Byte _dictSizeLog; bool _tableWasFilled; diff --git a/srcpkgs/p7zip/patches/CVE-2016-9296.patch b/srcpkgs/p7zip/patches/CVE-2016-9296.patch index 770929d1633..fbbb337737e 100644 --- a/srcpkgs/p7zip/patches/CVE-2016-9296.patch +++ b/srcpkgs/p7zip/patches/CVE-2016-9296.patch @@ -1,5 +1,5 @@ ---- CPP/7zip/Archive/7z/7zIn.cpp.orig Sun Nov 20 09:29:41 2016 -+++ CPP/7zip/Archive/7z/7zIn.cpp Sun Nov 20 09:31:22 2016 +--- a/CPP/7zip/Archive/7z/7zIn.cpp Sun Nov 20 09:29:41 2016 ++++ b/CPP/7zip/Archive/7z/7zIn.cpp Sun Nov 20 09:31:22 2016 @@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedStreams( if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) ThrowIncorrect(); diff --git a/srcpkgs/p7zip/patches/CVE-2017-17969.patch b/srcpkgs/p7zip/patches/CVE-2017-17969.patch index c5487304c45..9a820af7306 100644 --- a/srcpkgs/p7zip/patches/CVE-2017-17969.patch +++ b/srcpkgs/p7zip/patches/CVE-2017-17969.patch @@ -8,8 +8,8 @@ Subject: backport of the CVE-2017-17969 fix from 7zip 18.00-beta diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp index 80b7e67..4acdce5 100644 ---- CPP/7zip/Compress/ShrinkDecoder.cpp -+++ CPP/7zip/Compress/ShrinkDecoder.cpp +--- a/CPP/7zip/Compress/ShrinkDecoder.cpp ++++ b/CPP/7zip/Compress/ShrinkDecoder.cpp @@ -121,7 +121,12 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream * { _stack[i++] = _suffixes[cur]; diff --git a/srcpkgs/p7zip/template b/srcpkgs/p7zip/template index 192db3c04f6..642e24adaf5 100644 --- a/srcpkgs/p7zip/template +++ b/srcpkgs/p7zip/template @@ -10,7 +10,6 @@ license="LGPL-2.1-or-later" homepage="http://p7zip.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2" checksum=5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f -patch_args=-Np0 CXXFLAGS="-Wno-narrowing" diff --git a/srcpkgs/pa-applet/patches/fix-volume-notification.patch b/srcpkgs/pa-applet/patches/fix-volume-notification.patch index 20e6db7cc10..3c5b8b1b0bc 100644 --- a/srcpkgs/pa-applet/patches/fix-volume-notification.patch +++ b/srcpkgs/pa-applet/patches/fix-volume-notification.patch @@ -1,7 +1,7 @@ diff --git a/src/notifications.c b/src/notifications.c index f5ac1f8..e366a12 100644 ---- src/notifications.c -+++ src/notifications.c +--- a/src/notifications.c ++++ b/src/notifications.c @@ -7,6 +7,7 @@ * */ diff --git a/srcpkgs/pa-applet/template b/srcpkgs/pa-applet/template index c4586b7be4f..e190ff2d99a 100644 --- a/srcpkgs/pa-applet/template +++ b/srcpkgs/pa-applet/template @@ -13,7 +13,6 @@ license="BSD-2-Clause" homepage="https://github.com/fernandotcl/pa-applet" distfiles="$homepage/archive/$_commit.tar.gz" checksum=db30c04a6954e1d138c6bc80739dae80d667a0af151b015db503e48fb30b0b7a -patch_args=-Np0 pre_configure() { sed -i -e 's| -Werror||' src/Makefile.am diff --git a/srcpkgs/pacman/patches/gpg2gpg2.patch b/srcpkgs/pacman/patches/gpg2gpg2.patch index ba668e1f2ed..dd458cae9c4 100644 --- a/srcpkgs/pacman/patches/gpg2gpg2.patch +++ b/srcpkgs/pacman/patches/gpg2gpg2.patch @@ -4,8 +4,8 @@ This patches all references to the gpg command to use gpg2 instead. diff -Naur pacman-5.2.1.orig/scripts/pacman-key.sh.in pacman-5.2.1/scripts/pacman-key.sh.in ---- scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700 -+++ scripts/pacman-key.sh.in 2020-05-24 02:30:26.838797182 -0700 +--- a/scripts/pacman-key.sh.in 2019-10-24 06:29:08.000000000 -0700 ++++ b/scripts/pacman-key.sh.in 2020-05-24 02:30:26.838797182 -0700 @@ -51,6 +51,7 @@ UPDATEDB=0 USE_COLOR='y' diff --git a/srcpkgs/pacman/template b/srcpkgs/pacman/template index c676fb36113..d23aba0468b 100644 --- a/srcpkgs/pacman/template +++ b/srcpkgs/pacman/template @@ -17,7 +17,6 @@ license="GPL-2.0-or-later" homepage="https://www.archlinux.org/pacman/" distfiles="https://sources.archlinux.org/other/pacman/pacman-${version}.tar.gz" checksum=bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0 -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = musl ]; then do_check() { diff --git a/srcpkgs/pahole/patches/fix_always_inline.patch b/srcpkgs/pahole/patches/fix_always_inline.patch index 5c13fe90438..6ba75e61c51 100644 --- a/srcpkgs/pahole/patches/fix_always_inline.patch +++ b/srcpkgs/pahole/patches/fix_always_inline.patch @@ -1,5 +1,5 @@ ---- dutil.h.orig -+++ dutil.h +--- a/dutil.h ++++ b/dutil.h @@ -28,6 +28,10 @@ #define __pure __attribute__ ((pure)) #endif @@ -11,8 +11,8 @@ #define roundup(x,y) ((((x) + ((y) - 1)) / (y)) * (y)) static inline __attribute__((const)) bool is_power_of_2(unsigned long n) ---- lib/bpf/src/libbpf.c.orig -+++ lib/bpf/src/libbpf.c +--- a/lib/bpf/src/libbpf.c ++++ b/lib/bpf/src/libbpf.c @@ -10,6 +10,10 @@ * Copyright (C) 2019 Isovalent, Inc. */ diff --git a/srcpkgs/pahole/patches/fix_limits.patch b/srcpkgs/pahole/patches/fix_limits.patch index 5026509dd4a..0ad585ee193 100644 --- a/srcpkgs/pahole/patches/fix_limits.patch +++ b/srcpkgs/pahole/patches/fix_limits.patch @@ -1,7 +1,7 @@ diff --git dwarves.c dwarves.c index 8cb359f..98b8b6b 100644 ---- dwarves.c -+++ dwarves.c +--- a/dwarves.c ++++ b/dwarves.c @@ -22,6 +22,7 @@ #include <unistd.h> #include <sys/stat.h> @@ -12,8 +12,8 @@ index 8cb359f..98b8b6b 100644 #include "list.h" diff --git pahole.c pahole.c index dac7a49..15c0c29 100644 ---- pahole.c -+++ pahole.c +--- a/pahole.c ++++ b/pahole.c @@ -10,6 +10,7 @@ #include <assert.h> #include <stdio.h> diff --git a/srcpkgs/pahole/patches/fix_sysconf.patch b/srcpkgs/pahole/patches/fix_sysconf.patch index 30f38868651..bb07948c392 100644 --- a/srcpkgs/pahole/patches/fix_sysconf.patch +++ b/srcpkgs/pahole/patches/fix_sysconf.patch @@ -1,5 +1,5 @@ ---- dwarves_fprintf.c.orig -+++ dwarves_fprintf.c +--- a/dwarves_fprintf.c ++++ b/dwarves_fprintf.c @@ -1683,11 +1683,13 @@ void dwarves__fprintf_init(uint16_t user_cacheline_size) { diff --git a/srcpkgs/pahole/patches/fix_wordsize.patch b/srcpkgs/pahole/patches/fix_wordsize.patch index a4447d80913..a052883d869 100644 --- a/srcpkgs/pahole/patches/fix_wordsize.patch +++ b/srcpkgs/pahole/patches/fix_wordsize.patch @@ -1,5 +1,5 @@ ---- hash.h.orig -+++ hash.h +--- a/hash.h ++++ b/hash.h @@ -16,6 +16,9 @@ #include <stdint.h> diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template index ee34924e70c..d3b720d72f2 100644 --- a/srcpkgs/pahole/template +++ b/srcpkgs/pahole/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="http://git.kernel.org/?p=devel/pahole/pahole.git;a=summary" distfiles="https://fedorapeople.org/~acme/dwarves/dwarves-${version}.tar.xz" checksum=33a8bed6c0e1a5889578e01d1afed3f752353dc087d8bda36d258fe83e42a476 -patch_args=-Np0 case $XBPS_TARGET_MACHINE in *-musl) makedepends+=" musl-obstack-devel argp-standalone" diff --git a/srcpkgs/pam-mount/patches/add-luks2-support.patch b/srcpkgs/pam-mount/patches/add-luks2-support.patch index 4e665afbc75..45145fa4e91 100644 --- a/srcpkgs/pam-mount/patches/add-luks2-support.patch +++ b/srcpkgs/pam-mount/patches/add-luks2-support.patch @@ -1,6 +1,6 @@ From: https://sourceforge.net/p/pam-mount/pam-mount/ci/d4434c05e7c0cf05d87089404cfa2deedc60811a/tree/src/crypto-dmc.c?diff=e47b8ee42f14926b013a78cc487b794059edccff ---- src/crypto-dmc.c -+++ src/crypto-dmc.c +--- a/src/crypto-dmc.c ++++ b/src/crypto-dmc.c @@ -21,6 +21,12 @@ #include "libcryptmount.h" #include "pam_mount.h" diff --git a/srcpkgs/pam-mount/template b/srcpkgs/pam-mount/template index 235c7025df4..0a8e38d9de8 100644 --- a/srcpkgs/pam-mount/template +++ b/srcpkgs/pam-mount/template @@ -16,7 +16,6 @@ homepage="http://pam-mount.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/pam-mount/pam_mount/${version}/pam_mount-${version}.tar.xz" checksum=ae0207ea6c96189414f906a7b0880abc7751a98e26b3d0375c9afab3722471e7 conf_files="/etc/security/pam_mount.conf.xml" -patch_args=-Np0 libpam-mount_package() { short_desc+=" - runtime library" diff --git a/srcpkgs/pam-u2f/patches/musl.patch b/srcpkgs/pam-u2f/patches/musl.patch index 804612a4cd5..79c6c6096c6 100644 --- a/srcpkgs/pam-u2f/patches/musl.patch +++ b/srcpkgs/pam-u2f/patches/musl.patch @@ -1,7 +1,7 @@ diff --git b64.c b64.c index 0649c1e..7788089 100644 ---- b64.c -+++ b64.c +--- a/b64.c ++++ b/b64.c @@ -4,6 +4,7 @@ #include <openssl/bio.h> @@ -12,8 +12,8 @@ index 0649c1e..7788089 100644 diff --git util.c util.c index 3ec4e71..5989c6c 100644 ---- util.c -+++ util.c +--- a/util.c ++++ b/util.c @@ -9,6 +9,7 @@ #include <openssl/ec.h> #include <openssl/obj_mac.h> diff --git a/srcpkgs/pam-u2f/template b/srcpkgs/pam-u2f/template index 02fb19f2b41..7c1b5034a28 100644 --- a/srcpkgs/pam-u2f/template +++ b/srcpkgs/pam-u2f/template @@ -14,7 +14,6 @@ homepage="https://developers.yubico.com/pam-u2f/" #changelog="https://raw.githubusercontent.com/Yubico/pam-u2f/master/NEWS" distfiles="https://developers.yubico.com/pam-u2f/Releases/pam_u2f-${version}.tar.gz" checksum=0dc3bf96ebb69c6e398b5f8991493b37a8ce1af792948af71e694f695d5edc05 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/pam_rundir/patches/fix.patch b/srcpkgs/pam_rundir/patches/fix.patch index ffde6fbaf1a..3ef75edfea6 100644 --- a/srcpkgs/pam_rundir/patches/fix.patch +++ b/srcpkgs/pam_rundir/patches/fix.patch @@ -1,5 +1,5 @@ ---- pam_rundir.c 2015-09-23 12:57:53.000000000 -0400 -+++ pam_rundir2.c 2019-08-24 13:17:11.241470935 -0400 +--- a/pam_rundir.c 2015-09-23 12:57:53.000000000 -0400 ++++ b/pam_rundir2.c 2019-08-24 13:17:11.241470935 -0400 @@ -24,6 +24,8 @@ #include <sys/types.h> #include <sys/stat.h> diff --git a/srcpkgs/pam_rundir/template b/srcpkgs/pam_rundir/template index 578d660bf4c..f08238ddb5f 100644 --- a/srcpkgs/pam_rundir/template +++ b/srcpkgs/pam_rundir/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="https://jjacky.com/pam_rundir" distfiles="https://jjacky.com/${pkgname}/${pkgname}-${version}.tar.gz" checksum=c779b699ed23777a3bdba87b7f67ed395fe957f3c96138faee45f87a27bcc020 -patch_args=-Np0 diff --git a/srcpkgs/pam_ssh/patches/fix-cross-compile-openssl-feature-checks.patch b/srcpkgs/pam_ssh/patches/fix-cross-compile-openssl-feature-checks.patch index 90573970f77..0134536864d 100644 --- a/srcpkgs/pam_ssh/patches/fix-cross-compile-openssl-feature-checks.patch +++ b/srcpkgs/pam_ssh/patches/fix-cross-compile-openssl-feature-checks.patch @@ -2,8 +2,8 @@ The configure script contains checks that cannot run when cross-compiling. This patch disables them diff -Naur configure.orig configure ---- configure.orig 2016-08-01 15:39:25.194784834 +0200 -+++ configure 2016-08-01 15:40:38.914790397 +0200 +--- a/configure 2016-08-01 15:39:25.194784834 +0200 ++++ b/configure 2016-08-01 15:40:38.914790397 +0200 @@ -11621,10 +11621,6 @@ # Basic test to check for compatible version and correct linking # *does not* test for RSA - that comes later. diff --git a/srcpkgs/pam_ssh/template b/srcpkgs/pam_ssh/template index b2d2ae5f448..eba01a0fa45 100644 --- a/srcpkgs/pam_ssh/template +++ b/srcpkgs/pam_ssh/template @@ -14,7 +14,6 @@ license="BSD-2-Clause" homepage="http://pam-ssh.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/pam-ssh/${pkgname}-${version}.tar.xz" checksum=0c456f6a5c9e47ce6825ac50d467e7a797e14239b2b9a72bfeb2df0100f4af31 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch index bda9a37a5ff..fd334ec9d5f 100644 --- a/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch +++ b/srcpkgs/pam_ssh_agent_auth/patches/openssl.patch @@ -23,8 +23,8 @@ The patch works on FreeBSD head (will be 12.0) but the --without-openssl-header- diff --git a/authfd.c b/authfd.c index 7b96921..35f8de1 100644 ---- authfd.c -+++ authfd.c +--- a/authfd.c ++++ b/authfd.c @@ -372,6 +372,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio case 1: key = pamsshagentauth_key_new(KEY_RSA1); @@ -145,8 +145,8 @@ index 7b96921..35f8de1 100644 pamsshagentauth_buffer_put_char(&msg, SSH2_AGENTC_REMOVE_IDENTITY); diff --git a/bufbn.c b/bufbn.c index 6a49c73..4ecedc1 100644 ---- bufbn.c -+++ bufbn.c +--- a/bufbn.c ++++ b/bufbn.c @@ -151,7 +151,11 @@ pamsshagentauth_buffer_put_bignum2_ret(Buffer *buffer, const BIGNUM *value) pamsshagentauth_buffer_put_int(buffer, 0); return 0; @@ -161,8 +161,8 @@ index 6a49c73..4ecedc1 100644 } diff --git a/cipher.h b/cipher.h index 49bbc16..64f59ca 100644 ---- cipher.h -+++ cipher.h +--- a/cipher.h ++++ b/cipher.h @@ -59,15 +59,18 @@ #define CIPHER_DECRYPT 0 @@ -191,8 +191,8 @@ index 49bbc16..64f59ca 100644 #endif /* CIPHER_H */ diff --git a/kex.h b/kex.h index 8e29c90..81ca57d 100644 ---- kex.h -+++ kex.h +--- a/kex.h ++++ b/kex.h @@ -70,7 +70,7 @@ enum kex_exchange { #define KEX_INIT_SENT 0x0001 @@ -245,8 +245,8 @@ index 8e29c90..81ca57d 100644 #endif diff --git a/key.c b/key.c index 107a442..aedbbb5 100644 ---- key.c -+++ key.c +--- a/key.c ++++ b/key.c @@ -77,15 +77,21 @@ pamsshagentauth_key_new(int type) case KEY_RSA: if ((rsa = RSA_new()) == NULL) @@ -578,8 +578,8 @@ index 107a442..aedbbb5 100644 pamsshagentauth_fatal("key_demote: implement me"); diff --git a/ssh-dss.c b/ssh-dss.c index 9fdaa5d..1051ae2 100644 ---- ssh-dss.c -+++ ssh-dss.c +--- a/ssh-dss.c ++++ b/ssh-dss.c @@ -48,37 +48,53 @@ ssh_dss_sign(const Key *key, u_char **sigp, u_int *lenp, { DSA_SIG *sig; @@ -701,8 +701,8 @@ index 9fdaa5d..1051ae2 100644 diff --git a/ssh-ecdsa.c b/ssh-ecdsa.c index efa0f3d..c213959 100644 ---- ssh-ecdsa.c -+++ ssh-ecdsa.c +--- a/ssh-ecdsa.c ++++ b/ssh-ecdsa.c @@ -41,22 +41,27 @@ ssh_ecdsa_sign(const Key *key, u_char **sigp, u_int *lenp, { ECDSA_SIG *sig; @@ -807,8 +807,8 @@ index efa0f3d..c213959 100644 +} diff --git a/ssh-rsa.c b/ssh-rsa.c index d05844b..9d74eb6 100644 ---- ssh-rsa.c -+++ ssh-rsa.c +--- a/ssh-rsa.c ++++ b/ssh-rsa.c @@ -40,7 +40,7 @@ ssh_rsa_sign(const Key *key, u_char **sigp, u_int *lenp, const u_char *data, u_int datalen) { diff --git a/srcpkgs/pam_ssh_agent_auth/template b/srcpkgs/pam_ssh_agent_auth/template index 05c7a4f346c..50744824510 100644 --- a/srcpkgs/pam_ssh_agent_auth/template +++ b/srcpkgs/pam_ssh_agent_auth/template @@ -12,7 +12,6 @@ license="MIT" homepage="http://pamsshagentauth.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/pamsshagentauth/${pkgname}-${version}.tar.bz2" checksum=3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f47a763 -patch_args=-Np0 post_extract() { vsed -e '/^AR=/d' -i Makefile.in -i openbsd-compat/Makefile.in diff --git a/srcpkgs/papi/patches/gnu_source.patch b/srcpkgs/papi/patches/gnu_source.patch index eed88b43d3f..cc80e0ee643 100644 --- a/srcpkgs/papi/patches/gnu_source.patch +++ b/srcpkgs/papi/patches/gnu_source.patch @@ -1,5 +1,5 @@ ---- src/components/perf_event/tests/perf_event_system_wide.c.orig 2019-10-12 17:48:40.217216625 +0200 -+++ src/components/perf_event/tests/perf_event_system_wide.c 2019-10-12 17:49:48.246645644 +0200 +--- a/src/components/perf_event/tests/perf_event_system_wide.c 2019-10-12 17:48:40.217216625 +0200 ++++ b/src/components/perf_event/tests/perf_event_system_wide.c 2019-10-12 17:49:48.246645644 +0200 @@ -15,6 +15,9 @@ #define __USE_GNU #endif diff --git a/srcpkgs/papi/template b/srcpkgs/papi/template index c8d6d1e79fb..f8010c4b159 100644 --- a/srcpkgs/papi/template +++ b/srcpkgs/papi/template @@ -11,7 +11,6 @@ license="BSD-3-Clause" homepage="http://icl.cs.utk.edu/papi/" distfiles="http://icl.utk.edu/projects/papi/downloads/papi-${version}.tar.gz" checksum=d1a3bb848e292c805bc9f29e09c27870e2ff4cda6c2fba3b7da8b4bba6547589 -patch_args=-Np0 if [ -n "$CROSS_BUILD" ]; then _ARCH="${XBPS_TARGET_MACHINE%-musl}" diff --git a/srcpkgs/par2cmdline/patches/avoid-corrupt-files-in-wrkdir.patch b/srcpkgs/par2cmdline/patches/avoid-corrupt-files-in-wrkdir.patch index 65905670e8b..e3a229a69a5 100644 --- a/srcpkgs/par2cmdline/patches/avoid-corrupt-files-in-wrkdir.patch +++ b/srcpkgs/par2cmdline/patches/avoid-corrupt-files-in-wrkdir.patch @@ -12,8 +12,8 @@ Signed-off-by: BlackEagle <ike.devolder@gmail.com> diff --git Makefile.am Makefile.am index f404fd0..64ed9d2 100755 ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -19,6 +19,8 @@ AUTOMAKE_OPTIONS = subdir-objects diff --git a/srcpkgs/par2cmdline/template b/srcpkgs/par2cmdline/template index 10e1b5c63f4..548de4363a7 100644 --- a/srcpkgs/par2cmdline/template +++ b/srcpkgs/par2cmdline/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/Parchive/par2cmdline" distfiles="https://github.com/Parchive/par2cmdline/archive/v${version}.tar.gz" checksum=529f85857ec44e501cd8d95b0c8caf47477d7daa5bfb989e422c800bb71b689a -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/paraview/patches/cmake-py39.patch b/srcpkgs/paraview/patches/cmake-py39.patch index b309d596c81..5e15a6ffac1 100644 --- a/srcpkgs/paraview/patches/cmake-py39.patch +++ b/srcpkgs/paraview/patches/cmake-py39.patch @@ -1,5 +1,5 @@ ---- VTK/CMake/patches/99/FindPython/Support.cmake.orig 2020-10-08 00:54:51.788984364 -0400 -+++ VTK/CMake/patches/99/FindPython/Support.cmake 2020-10-08 00:54:56.640977251 -0400 +--- a/VTK/CMake/patches/99/FindPython/Support.cmake 2020-10-08 00:54:51.788984364 -0400 ++++ b/VTK/CMake/patches/99/FindPython/Support.cmake 2020-10-08 00:54:56.640977251 -0400 @@ -46,7 +46,7 @@ message (FATAL_ERROR "FindPython: INTERNAL ERROR") endif() diff --git a/srcpkgs/paraview/patches/fix-page_size-macro.patch b/srcpkgs/paraview/patches/fix-page_size-macro.patch index b632eae4ea6..62240a02014 100644 --- a/srcpkgs/paraview/patches/fix-page_size-macro.patch +++ b/srcpkgs/paraview/patches/fix-page_size-macro.patch @@ -1,5 +1,5 @@ ---- Plugins/Datamine/Readers/dmfile.cxx 2020-08-04 22:12:01.000000000 +0200 -+++ Plugins/Datamine/Readers/dmfile.cxx 2020-08-30 13:22:12.387889301 +0200 +--- a/Plugins/Datamine/Readers/dmfile.cxx 2020-08-04 22:12:01.000000000 +0200 ++++ b/Plugins/Datamine/Readers/dmfile.cxx 2020-08-30 13:22:12.387889301 +0200 @@ -421,8 +421,8 @@ // number of records per page diff --git a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch b/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch index fc17223a066..f01cce9b7e8 100644 --- a/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch +++ b/srcpkgs/paraview/patches/fix-vtksys-execinfo.patch @@ -1,5 +1,5 @@ ---- VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:24:27.200081977 +0200 -+++ VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:26:38.533088752 +0200 +--- a/VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:24:27.200081977 +0200 ++++ b/VTK/Utilities/KWSys/vtksys/CMakeLists.txt 2020-08-30 14:26:38.533088752 +0200 @@ -592,7 +592,8 @@ # check for simple stack trace # usually it's in libc but on FreeBSD diff --git a/srcpkgs/paraview/patches/vtk-isnan.patch b/srcpkgs/paraview/patches/vtk-isnan.patch index 2032af41546..8bf0ec27033 100644 --- a/srcpkgs/paraview/patches/vtk-isnan.patch +++ b/srcpkgs/paraview/patches/vtk-isnan.patch @@ -1,5 +1,5 @@ ---- VTK/Common/Core/vtkGenericDataArrayLookupHelper.h 2020-08-04 22:12:01.000000000 +0200 -+++ VTK/Common/Core/vtkGenericDataArrayLookupHelper.h 2020-08-29 22:33:06.824012475 +0200 +--- a/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h 2020-08-04 22:12:01.000000000 +0200 ++++ b/VTK/Common/Core/vtkGenericDataArrayLookupHelper.h 2020-08-29 22:33:06.824012475 +0200 @@ -36,20 +36,20 @@ template <typename T> struct has_NaN<T, true> diff --git a/srcpkgs/paraview/template b/srcpkgs/paraview/template index 875b5d1f176..20a7f558967 100644 --- a/srcpkgs/paraview/template +++ b/srcpkgs/paraview/template @@ -34,7 +34,6 @@ license="BSD-3-Clause" homepage="https://www.paraview.org" distfiles="https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${version:0:3}&type=source&os=Sources&downloadFile=ParaView-v${version}.tar.xz>paraview-${version}.tar.xz" checksum=7653950392a0d7c0287c26f1d3a25cdbaa11baa7524b0af0e6a1a0d7d487d034 -patch_args=-Np0 CFLAGS="-DYYERROR_VERBOSE -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DGNU_SOURCE -fcommon" CXXFLAGS="${CFLAGS}" diff --git a/srcpkgs/parcellite/patches/locale.patch b/srcpkgs/parcellite/patches/locale.patch index dbe545e0994..77ad91c89d4 100644 --- a/srcpkgs/parcellite/patches/locale.patch +++ b/srcpkgs/parcellite/patches/locale.patch @@ -1,7 +1,7 @@ Index: configure =================================================================== ---- configure.orig -+++ configure +--- a/configure ++++ b/configure @@ -4981,8 +4981,8 @@ fi DATADIRNAME=share ;; diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template index cb4de9fe608..98f7b661cd7 100644 --- a/srcpkgs/parcellite/template +++ b/srcpkgs/parcellite/template @@ -12,6 +12,5 @@ license="GPL-3.0-or-later" homepage="http://parcellite.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/parcellite/${version}/parcellite-${version}.tar.gz" checksum=aba1c7c56c7607e219ce9855723eefa552c5376982891aefbfb5a2d3297ef046 -patch_args=-Np0 export LIBS=-lgio-2.0 diff --git a/srcpkgs/partclone/patches/0001-musl.patch b/srcpkgs/partclone/patches/0001-musl.patch index 6720add1959..0d9071ee43c 100644 --- a/srcpkgs/partclone/patches/0001-musl.patch +++ b/srcpkgs/partclone/patches/0001-musl.patch @@ -10,8 +10,8 @@ Subject: [PATCH] musl diff --git src/btrfs/kernel-lib/rbtree.h src/btrfs/kernel-lib/rbtree.h index 6d68907..affab1d 100644 ---- src/btrfs/kernel-lib/rbtree.h -+++ src/btrfs/kernel-lib/rbtree.h +--- a/src/btrfs/kernel-lib/rbtree.h ++++ b/src/btrfs/kernel-lib/rbtree.h @@ -38,6 +38,10 @@ extern "C" { #endif @@ -25,8 +25,8 @@ index 6d68907..affab1d 100644 struct rb_node *rb_right; diff --git src/main.c src/main.c index babcf0c..8a543f3 100644 ---- src/main.c -+++ src/main.c +--- a/src/main.c ++++ b/src/main.c @@ -22,7 +22,6 @@ #include <sys/types.h> #include <stdio.h> diff --git a/srcpkgs/partclone/template b/srcpkgs/partclone/template index 5140c3dcf87..4813a8a250d 100644 --- a/srcpkgs/partclone/template +++ b/srcpkgs/partclone/template @@ -16,7 +16,6 @@ homepage="http://www.partclone.org/" distfiles="https://github.com/Thomas-Tsai/${pkgname}/archive/${version}.tar.gz" checksum=ef1391db3801e4b3ef82fc9417f1d7f0542b7229b3394120072b2dfeae0bbbb0 CFLAGS="-DBTRFS_DISABLE_BACKTRACE" -patch_args=-Np0 pre_configure() { ./autogen diff --git a/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch b/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch index 240d3fd0e32..a33c623d542 100644 --- a/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch +++ b/srcpkgs/passwordsafe/patches/use-gtest-from-package.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.ORIG 2021-02-25 23:45:37.917034534 +0100 -+++ CMakeLists.txt 2021-02-26 00:05:34.138397928 +0100 +--- a/CMakeLists.txt 2021-02-25 23:45:37.917034534 +0100 ++++ b/CMakeLists.txt 2021-02-26 00:05:34.138397928 +0100 @@ -255,34 +255,6 @@ endif (USE_ASAN) endif (MSVC) diff --git a/srcpkgs/passwordsafe/template b/srcpkgs/passwordsafe/template index 7d07f7849be..c4eab0c120e 100644 --- a/srcpkgs/passwordsafe/template +++ b/srcpkgs/passwordsafe/template @@ -16,7 +16,6 @@ license="Artistic-2.0" homepage="https://pwsafe.org" distfiles="https://github.com/pwsafe/pwsafe/archive/${version}.tar.gz" checksum=8962edf57b7f901d9ed23496c8ec387a4f186855976e8ac98f2dd55560c82ebe -patch_args=-Np0 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DNO_GTEST=OFF" diff --git a/srcpkgs/pax/patches/musl-headers.patch b/srcpkgs/pax/patches/musl-headers.patch index c56e15fda3b..ad504b910d9 100644 --- a/srcpkgs/pax/patches/musl-headers.patch +++ b/srcpkgs/pax/patches/musl-headers.patch @@ -1,5 +1,5 @@ ---- pax/strtonum.c 2020-03-13 01:26:39.000000000 +0100 -+++ pax/strtonum.c 2020-09-06 01:13:30.359370537 +0200 +--- a/pax/strtonum.c 2020-03-13 01:26:39.000000000 +0100 ++++ b/pax/strtonum.c 2020-09-06 01:13:30.359370537 +0200 @@ -21,6 +21,8 @@ #include <errno.h> #include <limits.h> diff --git a/srcpkgs/pax/template b/srcpkgs/pax/template index 5a678b9e614..0612a94cfeb 100644 --- a/srcpkgs/pax/template +++ b/srcpkgs/pax/template @@ -11,7 +11,6 @@ license="BSD-3-Clause" homepage="https://www.mirbsd.org/MirOS/dist/mir/cpio/" distfiles="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${version}.cpio.gz" checksum=fe3f99c28ba7a46c4bce0b329da3742908b87fe8fbe17f0db1f99a1bd053d46b -patch_args=-Np0 alternatives=" pax:pax:/usr/bin/paxmirabilis diff --git a/srcpkgs/pcaudiolib/patches/upstream-fix-alsa-sample-size.patch b/srcpkgs/pcaudiolib/patches/upstream-fix-alsa-sample-size.patch index 8fe68794577..fa3c235cdcd 100644 --- a/srcpkgs/pcaudiolib/patches/upstream-fix-alsa-sample-size.patch +++ b/srcpkgs/pcaudiolib/patches/upstream-fix-alsa-sample-size.patch @@ -6,8 +6,8 @@ Date: Sat Mar 10 06:55:58 2018 +0100 diff --git src/alsa.c src/alsa.c index 34e39be..6af1941 100644 ---- src/alsa.c -+++ src/alsa.c +--- a/src/alsa.c ++++ b/src/alsa.c @@ -53,7 +53,7 @@ alsa_object_open(struct audio_object *object, return -EEXIST; diff --git a/srcpkgs/pcaudiolib/patches/upstream-fix-snappiness.patch b/srcpkgs/pcaudiolib/patches/upstream-fix-snappiness.patch index 4ea1a613b38..82ddadfd82e 100644 --- a/srcpkgs/pcaudiolib/patches/upstream-fix-snappiness.patch +++ b/srcpkgs/pcaudiolib/patches/upstream-fix-snappiness.patch @@ -13,8 +13,8 @@ Date: Sun Oct 11 17:34:57 2020 +0200 diff --git src/alsa.c src/alsa.c index 64d5a90..c856788 100644 ---- src/alsa.c -+++ src/alsa.c +--- a/src/alsa.c ++++ b/src/alsa.c @@ -99,6 +99,7 @@ alsa_object_open(struct audio_object *object, snd_pcm_hw_params_t *params = NULL; @@ -34,8 +34,8 @@ index 64d5a90..c856788 100644 if ((err = snd_pcm_prepare(self->handle)) < 0) diff --git src/audio_priv.h src/audio_priv.h index 9526138..669a037 100644 ---- src/audio_priv.h -+++ src/audio_priv.h +--- a/src/audio_priv.h ++++ b/src/audio_priv.h @@ -52,6 +52,10 @@ struct audio_object int error); }; @@ -49,8 +49,8 @@ index 9526138..669a037 100644 #include <windows.h> diff --git src/pulseaudio.c src/pulseaudio.c index d23366d..2f80c62 100644 ---- src/pulseaudio.c -+++ src/pulseaudio.c +--- a/src/pulseaudio.c ++++ b/src/pulseaudio.c @@ -74,6 +74,13 @@ pulseaudio_object_open(struct audio_object *object, } diff --git a/srcpkgs/pcaudiolib/template b/srcpkgs/pcaudiolib/template index 54a1bf27c10..7f40e0388e1 100644 --- a/srcpkgs/pcaudiolib/template +++ b/srcpkgs/pcaudiolib/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/espeak-ng/pcaudiolib" distfiles="https://github.com/espeak-ng/pcaudiolib/archive/${version}.tar.gz" checksum=699a5a347b1e12dc5b122e192e19f4db01621826bf41b9ebefb1cbc63ae2180b -patch_args=-Np0 pre_configure() { ./autogen.sh diff --git a/srcpkgs/pcc/patches/build_PIC.patch b/srcpkgs/pcc/patches/build_PIC.patch index 3b7eea6a13f..3c49d45ffe3 100644 --- a/srcpkgs/pcc/patches/build_PIC.patch +++ b/srcpkgs/pcc/patches/build_PIC.patch @@ -1,7 +1,7 @@ Respect passed CFLAGS to configure and force PIC object generation. ---- pcc-libs/csu/linux/Makefile.orig 2011-02-24 12:59:36.988078869 +0100 -+++ pcc-libs/csu/linux/Makefile 2011-02-24 13:01:29.434007771 +0100 +--- a/pcc-libs/csu/linux/Makefile 2011-02-24 12:59:36.988078869 +0100 ++++ b/pcc-libs/csu/linux/Makefile 2011-02-24 13:01:29.434007771 +0100 @@ -4,7 +4,7 @@ VERSION ?= 0.9.9 PCCLIBDIR ?= /usr/local/lib/pcc/$(TARGET)/$(VERSION)/lib SRCDIR ?= . @@ -11,8 +11,8 @@ Respect passed CFLAGS to configure and force PIC object generation. OBJS = crt0.o crt1.o gcrt1.o crti.o crtn.o crtbegin.o crtend.o ---- pcc-libs/libpcc/Makefile.in.orig 2011-02-24 13:02:15.570566278 +0100 -+++ pcc-libs/libpcc/Makefile.in 2011-02-24 13:02:33.577393664 +0100 +--- a/pcc-libs/libpcc/Makefile.in 2011-02-24 13:02:15.570566278 +0100 ++++ b/pcc-libs/libpcc/Makefile.in 2011-02-24 13:02:33.577393664 +0100 @@ -12,6 +12,7 @@ exec_prefix = @exec_prefix@ libdir = @libdir@ @@ -21,8 +21,8 @@ Respect passed CFLAGS to configure and force PIC object generation. TARGMACH = @targmach@ TARGOS = @targos@ TARGET = @target@ ---- pcc-libs/libsoftfloat/Makefile.in.orig 2011-02-24 13:02:54.937188695 +0100 -+++ pcc-libs/libsoftfloat/Makefile.in 2011-02-24 13:03:09.281050924 +0100 +--- a/pcc-libs/libsoftfloat/Makefile.in 2011-02-24 13:02:54.937188695 +0100 ++++ b/pcc-libs/libsoftfloat/Makefile.in 2011-02-24 13:03:09.281050924 +0100 @@ -12,6 +12,7 @@ exec_prefix = @exec_prefix@ libdir = @libdir@ diff --git a/srcpkgs/pcc/patches/void.patch b/srcpkgs/pcc/patches/void.patch index beb390b8f1e..c868e05db28 100644 --- a/srcpkgs/pcc/patches/void.patch +++ b/srcpkgs/pcc/patches/void.patch @@ -1,5 +1,5 @@ ---- pcc/os/linux/ccconfig.h.orig 2019-04-21 12:16:53.029059057 +0200 -+++ pcc/os/linux/ccconfig.h 2019-04-21 12:18:19.757287684 +0200 +--- a/pcc/os/linux/ccconfig.h 2019-04-21 12:16:53.029059057 +0200 ++++ b/pcc/os/linux/ccconfig.h 2019-04-21 12:18:19.757287684 +0200 @@ -39,26 +39,31 @@ #if defined(mach_i386) diff --git a/srcpkgs/pcc/patches/x86-build-fix.patch b/srcpkgs/pcc/patches/x86-build-fix.patch index 3638bd37ac7..9a2ad39b80c 100644 --- a/srcpkgs/pcc/patches/x86-build-fix.patch +++ b/srcpkgs/pcc/patches/x86-build-fix.patch @@ -2,8 +2,8 @@ Fix x86 build failure: only use MULTIARCH_PATH if it's defined :-) --xtraeme ---- pcc/cc/cc/cc.c.orig 2014-12-18 14:57:43.961103113 +0100 -+++ pcc/cc/cc/cc.c 2014-12-18 14:57:52.881207162 +0100 +--- a/pcc/cc/cc/cc.c 2014-12-18 14:57:43.961103113 +0100 ++++ b/pcc/cc/cc/cc.c 2014-12-18 14:57:52.881207162 +0100 @@ -207,9 +207,9 @@ char *cppmdadd[] = CPPMDADD; #endif #ifndef DEFLIBDIRS /* default library search paths */ diff --git a/srcpkgs/pcc/template b/srcpkgs/pcc/template index e770914485c..84b020278d6 100644 --- a/srcpkgs/pcc/template +++ b/srcpkgs/pcc/template @@ -19,7 +19,6 @@ distfiles=" checksum="a114dfca04b8b0559ea5d67b87d2d0fcb2bae2b4d9b9ba16ebc27960b921c812 e810aa4d6683e769f490f734b13a296b33c2511ddba646bc526eb85532f1a23a" nocross=yes -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/pchar/patches/fix-build.patch b/srcpkgs/pchar/patches/fix-build.patch index 60702e0257a..655aa82c5cf 100644 --- a/srcpkgs/pchar/patches/fix-build.patch +++ b/srcpkgs/pchar/patches/fix-build.patch @@ -1,5 +1,5 @@ ---- ResultTable.cc.orig 2018-01-10 19:18:31.278796587 +0100 -+++ ResultTable.cc 2018-01-10 19:18:18.193831083 +0100 +--- a/ResultTable.cc 2018-01-10 19:18:31.278796587 +0100 ++++ b/ResultTable.cc 2018-01-10 19:18:18.193831083 +0100 @@ -909,8 +909,8 @@ void ResultTable::lmsint(double &a, doub l = 0; for (i = 0; i < columns; i++) { diff --git a/srcpkgs/pchar/patches/no-SO_BSDCOMPAT-2.diff b/srcpkgs/pchar/patches/no-SO_BSDCOMPAT-2.diff index 3b0de687a98..869823dbda2 100644 --- a/srcpkgs/pchar/patches/no-SO_BSDCOMPAT-2.diff +++ b/srcpkgs/pchar/patches/no-SO_BSDCOMPAT-2.diff @@ -1,5 +1,5 @@ ---- PctestIpv4Raw.cc.t 2008-03-13 12:33:16.058194372 -0700 -+++ PctestIpv4Raw.cc 2008-03-13 12:33:37.708748679 -0700 +--- a/PctestIpv4Raw.cc.t 2008-03-13 12:33:16.058194372 -0700 ++++ b/PctestIpv4Raw.cc 2008-03-13 12:33:37.708748679 -0700 @@ -101,7 +101,7 @@ return rc; } diff --git a/srcpkgs/pchar/patches/no-SO_BSDCOMPAT-3.diff b/srcpkgs/pchar/patches/no-SO_BSDCOMPAT-3.diff index 17197c88e72..25912f6e057 100644 --- a/srcpkgs/pchar/patches/no-SO_BSDCOMPAT-3.diff +++ b/srcpkgs/pchar/patches/no-SO_BSDCOMPAT-3.diff @@ -1,5 +1,5 @@ ---- PctestIpv6Udp.cc.t 2008-03-13 12:34:41.350681733 -0700 -+++ PctestIpv6Udp.cc 2008-03-13 12:34:52.625368131 -0700 +--- a/PctestIpv6Udp.cc.t 2008-03-13 12:34:41.350681733 -0700 ++++ b/PctestIpv6Udp.cc 2008-03-13 12:34:52.625368131 -0700 @@ -73,7 +73,7 @@ return socketOut; } diff --git a/srcpkgs/pchar/patches/no-SO_BSDCOMPAT.diff b/srcpkgs/pchar/patches/no-SO_BSDCOMPAT.diff index 2f17b194b18..91e2d34623e 100644 --- a/srcpkgs/pchar/patches/no-SO_BSDCOMPAT.diff +++ b/srcpkgs/pchar/patches/no-SO_BSDCOMPAT.diff @@ -1,5 +1,5 @@ ---- PctestIpv4Udp.cc.t 2008-03-13 12:32:02.312337354 -0700 -+++ PctestIpv4Udp.cc 2008-03-13 12:32:19.682770489 -0700 +--- a/PctestIpv4Udp.cc.t 2008-03-13 12:32:02.312337354 -0700 ++++ b/PctestIpv4Udp.cc 2008-03-13 12:32:19.682770489 -0700 @@ -49,7 +49,7 @@ return socketOut; } diff --git a/srcpkgs/pchar/template b/srcpkgs/pchar/template index 8186eb4aac2..da229e4e94c 100644 --- a/srcpkgs/pchar/template +++ b/srcpkgs/pchar/template @@ -9,7 +9,6 @@ license="custom" homepage="http://www.kitchenlab.org/www/bmah/Software/pchar/" distfiles="http://www.kitchenlab.org/www/bmah/Software/pchar/${pkgname}-${version}.tar.gz" checksum=7019297084f1000557a019501532ecae67772851717329cc02227f5c17e36d27 -patch_args=-Np0 do_install() { vbin pchar diff --git a/srcpkgs/pcsclite/patches/python3.patch b/srcpkgs/pcsclite/patches/python3.patch index 1f1e914ac98..095f4ee8aa4 100644 --- a/srcpkgs/pcsclite/patches/python3.patch +++ b/srcpkgs/pcsclite/patches/python3.patch @@ -1,5 +1,5 @@ ---- src/spy/pcsc-spy.orig 2019-12-26 20:48:20.222069705 +0700 -+++ src/spy/pcsc-spy 2019-12-26 20:48:41.407288561 +0700 +--- a/src/spy/pcsc-spy 2019-12-26 20:48:20.222069705 +0700 ++++ b/src/spy/pcsc-spy 2019-12-26 20:48:41.407288561 +0700 @@ -1,4 +1,4 @@ -#! /usr/bin/python +#!/usr/bin/python3 diff --git a/srcpkgs/pcsclite/template b/srcpkgs/pcsclite/template index 9363f84af59..ad9e221bfbc 100644 --- a/srcpkgs/pcsclite/template +++ b/srcpkgs/pcsclite/template @@ -14,7 +14,6 @@ license="BSD-2-Clause" homepage="https://salsa.debian.org/debian/pcsc-lite" distfiles="https://salsa.debian.org/debian/pcsc-lite/-/archive/upstream/${version}/pcsc-lite-upstream-${version}.tar.gz" checksum=686fbd1c29e282388111f01b6fdfa4fe6b8349908236645b869115b21e4f73e8 -patch_args=-Np0 post_install() { vsv pcscd diff --git a/srcpkgs/pcsx2/patches/6b7f20a9e048e4bd9d7760cb72e6335aee8155d4.patch b/srcpkgs/pcsx2/patches/6b7f20a9e048e4bd9d7760cb72e6335aee8155d4.patch index 7aefcc8dc72..1a76bc1fa68 100644 --- a/srcpkgs/pcsx2/patches/6b7f20a9e048e4bd9d7760cb72e6335aee8155d4.patch +++ b/srcpkgs/pcsx2/patches/6b7f20a9e048e4bd9d7760cb72e6335aee8155d4.patch @@ -10,8 +10,8 @@ closes #2796 diff --git pcsx2/gui/AppAssert.cpp pcsx2/gui/AppAssert.cpp index a282715c4e..4ce151f86f 100644 ---- pcsx2/gui/AppAssert.cpp -+++ pcsx2/gui/AppAssert.cpp +--- a/pcsx2/gui/AppAssert.cpp ++++ b/pcsx2/gui/AppAssert.cpp @@ -19,6 +19,7 @@ #include <wx/stackwalk.h> diff --git a/srcpkgs/pcsx2/template b/srcpkgs/pcsx2/template index 9fef26e81ef..59f8dfcdce7 100644 --- a/srcpkgs/pcsx2/template +++ b/srcpkgs/pcsx2/template @@ -2,7 +2,6 @@ archs="i686*" lib32mode="full" nopie=yes -patch_args=-Np0 pkgname=pcsx2 version=1.6.0 diff --git a/srcpkgs/pd/patches/musl-no-qsort_r.patch b/srcpkgs/pd/patches/musl-no-qsort_r.patch index dbc65956d0e..1e936f8d54d 100644 --- a/srcpkgs/pd/patches/musl-no-qsort_r.patch +++ b/srcpkgs/pd/patches/musl-no-qsort_r.patch @@ -1,7 +1,7 @@ Index: src/x_text.c =================================================================== ---- src/x_text.c.orig -+++ src/x_text.c +--- a/src/x_text.c ++++ b/src/x_text.c @@ -475,7 +475,8 @@ equal: * Both are not available in Emscripten, Android or older MSVC versions. * 'stupid_sortcompare' is thread-safe but not reentrant. diff --git a/srcpkgs/pd/template b/srcpkgs/pd/template index df8bcc64fb1..544afccd541 100644 --- a/srcpkgs/pd/template +++ b/srcpkgs/pd/template @@ -15,7 +15,6 @@ license="BSD-3-Clause" homepage="https://puredata.info" distfiles="http://msp.ucsd.edu/Software/pd-$_ver.src.tar.gz" checksum=52591f18316e9f2471ca21c3d6b41c56336e0615ec40a093232e95cc230bfcc1 -patch_args=-Np0 pre_configure() { ./autogen.sh diff --git a/srcpkgs/pdfgrep/patches/fix-musl.patch b/srcpkgs/pdfgrep/patches/fix-musl.patch index 979d4a32641..a31ce126138 100644 --- a/srcpkgs/pdfgrep/patches/fix-musl.patch +++ b/srcpkgs/pdfgrep/patches/fix-musl.patch @@ -1,7 +1,7 @@ diff --git a/src/pdfgrep.cc b/src/pdfgrep.cc index 7f8bdf8..5283e16 100644 ---- ./src/pdfgrep.cc -+++ ./src/pdfgrep.cc +--- a/src/pdfgrep.cc ++++ b/src/pdfgrep.cc @@ -460,7 +460,9 @@ int main(int argc, char** argv) // Set locale to user-preference. If this locale is an UTF-8 locale, the // regex-functions regcomp/regexec become unicode aware, which means diff --git a/srcpkgs/pdfgrep/template b/srcpkgs/pdfgrep/template index b7270c1af89..20fe67c7203 100644 --- a/srcpkgs/pdfgrep/template +++ b/srcpkgs/pdfgrep/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="https://pdfgrep.org" distfiles="https://pdfgrep.org/download/pdfgrep-${version}.tar.gz" checksum=0ef3dca1d749323f08112ffe68e6f4eb7bc25f56f90a2e933db477261b082aba -patch_args=-Np0 diff --git a/srcpkgs/pdfsandwich/patches/00-fix-tesseract-path.patch b/srcpkgs/pdfsandwich/patches/00-fix-tesseract-path.patch index b955adae40c..da99cb44208 100644 --- a/srcpkgs/pdfsandwich/patches/00-fix-tesseract-path.patch +++ b/srcpkgs/pdfsandwich/patches/00-fix-tesseract-path.patch @@ -1,7 +1,7 @@ diff --git pdfsandwich.ml pdfsandwich.ml index 10c92a0..c32f803 100644 ---- pdfsandwich.ml -+++ pdfsandwich.ml +--- a/pdfsandwich.ml ++++ b/pdfsandwich.ml @@ -19,7 +19,7 @@ let global_temp_dir = Filename.temp_file "pdfsandwich_tmp" "";; let unpaper = ref "unpaper";;
let identify = ref "identify";;
diff --git a/srcpkgs/pdfsandwich/template b/srcpkgs/pdfsandwich/template index 37d4290fef5..67c1a011ba7 100644 --- a/srcpkgs/pdfsandwich/template +++ b/srcpkgs/pdfsandwich/template @@ -12,4 +12,3 @@ license="GPL-2.0-only" homepage="http://www.tobias-elze.de/pdfsandwich/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=9795ffea84b9b6b501f38d49a4620cf0469ddf15aac31bac6dbdc9ec1716fa39 -patch_args=-Np0 diff --git a/srcpkgs/pdsh/patches/fix_configure_ac.patch b/srcpkgs/pdsh/patches/fix_configure_ac.patch index 9be920cd9c6..be104cc3270 100644 --- a/srcpkgs/pdsh/patches/fix_configure_ac.patch +++ b/srcpkgs/pdsh/patches/fix_configure_ac.patch @@ -1,7 +1,7 @@ configure.ac relies on git, which doesn't work for release tarball. See: https://github.com/chaos/pdsh/issues/116 ---- configure.ac 2017-06-28 19:28:26.000000000 -0500 -+++ configure.ac 2019-09-11 08:41:27.613006239 -0500 +--- a/configure.ac 2017-06-28 19:28:26.000000000 -0500 ++++ b/configure.ac 2019-09-11 08:41:27.613006239 -0500 @@ -4,12 +4,11 @@ # Copyright (C) 2000-2002 Regents of the University of California # See ./DISCLAIMER diff --git a/srcpkgs/pdsh/template b/srcpkgs/pdsh/template index 21d327d84a3..e03e90656ad 100644 --- a/srcpkgs/pdsh/template +++ b/srcpkgs/pdsh/template @@ -26,7 +26,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/chaos/pdsh" distfiles="https://github.com/chaos/pdsh/archive/pdsh-${version}.tar.gz" checksum=36e1b3c734ae9b4baf054c656b9735206cc56b290d2c0ec4f7825cdd9f7dff54 -patch_args=-Np0 build_options="rsh exec ssh mrsh xcpu netgroup readline" build_options_default="rsh exec ssh mrsh readline" diff --git a/srcpkgs/pekwm/patches/sysconfdir.patch b/srcpkgs/pekwm/patches/sysconfdir.patch index 91a6da3d8e5..b945d0bdcc5 100644 --- a/srcpkgs/pekwm/patches/sysconfdir.patch +++ b/srcpkgs/pekwm/patches/sysconfdir.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2021-03-01 07:37:20.447294425 -0500 -+++ CMakeLists.txt 2021-03-01 07:39:40.222030571 -0500 +--- a/CMakeLists.txt 2021-03-01 07:37:20.447294425 -0500 ++++ b/CMakeLists.txt 2021-03-01 07:39:40.222030571 -0500 @@ -10,6 +10,9 @@ set(pekwm_VERSION_PATCH 18) set(pekwm_VERSION "${pekwm_VERSION_MAJOR}.${pekwm_VERSION_MINOR}.${pekwm_VERSION_PATCH}") @@ -19,8 +19,8 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True) # Subdirectories ---- data/CMakeLists.txt.orig 2021-03-01 07:39:48.323015276 -0500 -+++ data/CMakeLists.txt 2021-03-01 07:40:19.475956467 -0500 +--- a/data/CMakeLists.txt 2021-03-01 07:39:48.323015276 -0500 ++++ b/data/CMakeLists.txt 2021-03-01 07:40:19.475956467 -0500 @@ -16,4 +16,4 @@ mouse_sloppy start diff --git a/srcpkgs/pekwm/template b/srcpkgs/pekwm/template index 908b9f20e31..367691f8cb7 100644 --- a/srcpkgs/pekwm/template +++ b/srcpkgs/pekwm/template @@ -15,4 +15,3 @@ homepage="https://www.pekwm.se/" distfiles="https://github.com/pekdon/pekwm/archive/release-${version}.tar.gz" checksum=e04e14ab7b212ec7c3a36e4c24b6228383df4ca3768f9fea7ba22dcd107d5d5a conf_files="/etc/pekwm/*" -patch_args=-Np0 diff --git a/srcpkgs/perl-Authen-SASL/patches/inc.patch b/srcpkgs/perl-Authen-SASL/patches/inc.patch index 8ba0ca2d3ac..fdee0d8f57a 100644 --- a/srcpkgs/perl-Authen-SASL/patches/inc.patch +++ b/srcpkgs/perl-Authen-SASL/patches/inc.patch @@ -1,5 +1,5 @@ ---- Makefile.PL.orig -+++ Makefile.PL +--- a/Makefile.PL ++++ b/Makefile.PL @@ -3,6 +3,7 @@ use strict; use warnings; diff --git a/srcpkgs/perl-Authen-SASL/template b/srcpkgs/perl-Authen-SASL/template index 66b079daaa3..c9aea8eb958 100644 --- a/srcpkgs/perl-Authen-SASL/template +++ b/srcpkgs/perl-Authen-SASL/template @@ -13,4 +13,3 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Authen-SASL" distfiles="${CPAN_SITE}/Authen/${pkgname/perl-/}-${version}.tar.gz" checksum=6614fa7518f094f853741b63c73f3627168c5d3aca89b1d02b1016dc32854e09 -patch_args=-Np0 diff --git a/srcpkgs/perl-Crypt-DH/patches/force_require_bigint_gmp.patch b/srcpkgs/perl-Crypt-DH/patches/force_require_bigint_gmp.patch index 82007ebdebc..d1ad1a6c6d4 100644 --- a/srcpkgs/perl-Crypt-DH/patches/force_require_bigint_gmp.patch +++ b/srcpkgs/perl-Crypt-DH/patches/force_require_bigint_gmp.patch @@ -1,5 +1,5 @@ ---- Makefile.PL -+++ Makefile.PL +--- a/Makefile.PL ++++ b/Makefile.PL @@ -15,14 +15,8 @@ include 'ExtUtils::AutoInstall'; perl_version '5.006'; diff --git a/srcpkgs/perl-Crypt-DH/template b/srcpkgs/perl-Crypt-DH/template index d4fc6f20a4c..95fe7e66836 100644 --- a/srcpkgs/perl-Crypt-DH/template +++ b/srcpkgs/perl-Crypt-DH/template @@ -13,4 +13,3 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Crypt-DH" distfiles="${CPAN_SITE}/Crypt/Crypt-DH-${version}.tar.gz" checksum=c88cf3423b01e6782e8986d7fe5304436ab84b0925c4498c6fdfa17ef9a37f5f -patch_args=-Np0 diff --git a/srcpkgs/perl-Crypt-Rijndael/patches/use-stdint_h.patch b/srcpkgs/perl-Crypt-Rijndael/patches/use-stdint_h.patch index f3f4fe7f88a..3eb8adb86d4 100644 --- a/srcpkgs/perl-Crypt-Rijndael/patches/use-stdint_h.patch +++ b/srcpkgs/perl-Crypt-Rijndael/patches/use-stdint_h.patch @@ -1,5 +1,5 @@ ---- rijndael.h -+++ rijndael.h +--- a/rijndael.h ++++ b/rijndael.h @@ -72,6 +72,11 @@ typedef u_char UINT8; #endif diff --git a/srcpkgs/perl-Crypt-Rijndael/template b/srcpkgs/perl-Crypt-Rijndael/template index a2c97d0d4ce..5154d035b35 100644 --- a/srcpkgs/perl-Crypt-Rijndael/template +++ b/srcpkgs/perl-Crypt-Rijndael/template @@ -13,4 +13,3 @@ license="LGPL-2.0-or-later" homepage="https://metacpan.org/release/Crypt-Rijndael" distfiles="${CPAN_SITE}/Crypt/Crypt-Rijndael-${version}.tar.gz" checksum=6451c3dffe8703523be2bb08d1adca97e77df2a8a4dd46944d18a99330b7850e -patch_args=-Np0 diff --git a/srcpkgs/perl-Fuse/patches/build-fix.patch b/srcpkgs/perl-Fuse/patches/build-fix.patch index 1c8ce1352c7..2f6e825575f 100644 --- a/srcpkgs/perl-Fuse/patches/build-fix.patch +++ b/srcpkgs/perl-Fuse/patches/build-fix.patch @@ -1,5 +1,5 @@ ---- Fuse.xs 2013-09-13 06:16:35.000000000 +0400 -+++ Fuse.xs 2013-10-29 14:38:44.000000000 +0400 +--- a/Fuse.xs 2013-09-13 06:16:35.000000000 +0400 ++++ b/Fuse.xs 2013-10-29 14:38:44.000000000 +0400 @@ -754,6 +754,9 @@ int _PLfuse_release (const char *file, struct fuse_file_info *fi) { @@ -12,8 +12,8 @@ DEBUGf("release begin\n"); diff --git Fuse.xs Fuse.xs index b41c761..266978b 100755 ---- Fuse.xs -+++ Fuse.xs +--- a/Fuse.xs ++++ b/Fuse.xs @@ -2,7 +2,7 @@ #include "EXTERN.h" #include "perl.h" diff --git a/srcpkgs/perl-Fuse/template b/srcpkgs/perl-Fuse/template index 3fb06c90e33..9793fbb001f 100644 --- a/srcpkgs/perl-Fuse/template +++ b/srcpkgs/perl-Fuse/template @@ -13,4 +13,3 @@ license="LGPL-2.1-only" homepage="https://metacpan.org/release/Fuse" distfiles="${CPAN_SITE}/Fuse/Fuse-$version.tar.gz" checksum=30a939fe5816b00ba9cabb6cd811f894e6a74361ce29d786ae1811b0021d7aa1 -patch_args=-Np0 diff --git a/srcpkgs/perl-OpenGL/patches/0001-no_glversion.patch b/srcpkgs/perl-OpenGL/patches/0001-no_glversion.patch index ed75de10edd..6518f97952e 100644 --- a/srcpkgs/perl-OpenGL/patches/0001-no_glversion.patch +++ b/srcpkgs/perl-OpenGL/patches/0001-no_glversion.patch @@ -1,5 +1,5 @@ ---- Makefile.PL -+++ Makefile.PL +--- a/Makefile.PL ++++ b/Makefile.PL @@ -879,9 +879,9 @@ sub get_extensions my($key,$val) = split('=',$line); $gldata->{$key} = $val; @@ -40,8 +40,8 @@ # Make an empty exclusion file if a Windows distribution build if ($no_excl) ---- utils/Makefile -+++ utils/Makefile +--- a/utils/Makefile ++++ b/utils/Makefile @@ -21,7 +21,8 @@ EXTRALIBS=-lGLU -lXi -lXmu -lXext -lX11 -lm all: glversion.txt diff --git a/srcpkgs/perl-OpenGL/template b/srcpkgs/perl-OpenGL/template index 3628d85f23e..31c5362852d 100644 --- a/srcpkgs/perl-OpenGL/template +++ b/srcpkgs/perl-OpenGL/template @@ -13,4 +13,3 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/OpenGL" distfiles="${CPAN_SITE}/OpenGL/${pkgname#perl-}-${version}.tar.gz" checksum=b20e2af4404b4901ab35bba6ad5e3a8aa60bff72413c99288f01018c4cf874e0 -patch_args=-Np0 diff --git a/srcpkgs/perl-Text-BibTeX/patches/FORTIFY_SOURCE.patch b/srcpkgs/perl-Text-BibTeX/patches/FORTIFY_SOURCE.patch index 2681effd326..7c9f3a59659 100644 --- a/srcpkgs/perl-Text-BibTeX/patches/FORTIFY_SOURCE.patch +++ b/srcpkgs/perl-Text-BibTeX/patches/FORTIFY_SOURCE.patch @@ -1,7 +1,7 @@ Void Linux uses -D_FORTIFY_SOURCE=2. Remove the flag to not interfere (just in case). ---- inc/MyBuilder.pm.orig 2019-04-29 17:02:41.000000000 +0200 -+++ inc/MyBuilder.pm 2019-11-24 08:35:16.561126918 +0100 +--- a/inc/MyBuilder.pm 2019-04-29 17:02:41.000000000 +0200 ++++ b/inc/MyBuilder.pm 2019-11-24 08:35:16.561126918 +0100 @@ -208,7 +208,7 @@ $object =~ s/\.c/.o/; next if $self->up_to_date($file, $object); diff --git a/srcpkgs/perl-Text-BibTeX/patches/lib64.patch b/srcpkgs/perl-Text-BibTeX/patches/lib64.patch index 9d499f5ca69..5b5f9d8c15b 100644 --- a/srcpkgs/perl-Text-BibTeX/patches/lib64.patch +++ b/srcpkgs/perl-Text-BibTeX/patches/lib64.patch @@ -1,5 +1,5 @@ ---- Build.PL -+++ Build.PL +--- a/Build.PL ++++ b/Build.PL @@ -88,17 +88,7 @@ if ( $^O =~ /mswin32/i ) { } } diff --git a/srcpkgs/perl-Text-BibTeX/template b/srcpkgs/perl-Text-BibTeX/template index af0285bd8a2..bf385a1c465 100644 --- a/srcpkgs/perl-Text-BibTeX/template +++ b/srcpkgs/perl-Text-BibTeX/template @@ -13,7 +13,6 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/Text-BibTeX/" distfiles="${CPAN_SITE}/Text/${pkgname/perl-/}-${version}.tar.gz" checksum=b014586e68bdbcafb0a2cfa0401eb0a04ea5de8c4d5bc36dd0f7faeab6acf42c -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then _perlprefix=${XBPS_STATEDIR}/perlprefix-${XBPS_TARGET_MACHINE} diff --git a/srcpkgs/perl-Tk/patches/cross.patch b/srcpkgs/perl-Tk/patches/cross.patch index 256b7950805..222371ddac3 100644 --- a/srcpkgs/perl-Tk/patches/cross.patch +++ b/srcpkgs/perl-Tk/patches/cross.patch @@ -2,8 +2,8 @@ For libpng and libjpeg Makefile.PL tries to run a short test program to see if the system libraries can be used. From native builds we know they can so remove the test. ---- PNG/Makefile.PL.orig 2013-11-18 10:04:04.000000000 +0100 -+++ PNG/Makefile.PL 2018-09-14 09:31:08.785202470 +0200 +--- a/PNG/Makefile.PL 2013-11-18 10:04:04.000000000 +0100 ++++ b/PNG/Makefile.PL 2018-09-14 09:31:08.785202470 +0200 @@ -53,8 +53,7 @@ $all_libs = "$libpng_libs $zlib_libs"; } @@ -14,8 +14,8 @@ the test. { warn "Using system's -lpng\n"; Tk::MMutil::TkExtMakefile( ---- JPEG/Makefile.PL.orig 2013-11-18 10:04:04.000000000 +0100 -+++ JPEG/Makefile.PL 2018-09-14 09:35:28.041623709 +0200 +--- a/JPEG/Makefile.PL 2013-11-18 10:04:04.000000000 +0100 ++++ b/JPEG/Makefile.PL 2018-09-14 09:35:28.041623709 +0200 @@ -6,7 +6,7 @@ use Tk::MMtry; diff --git a/srcpkgs/perl-Tk/template b/srcpkgs/perl-Tk/template index 6c2dbb6e269..3515340159f 100644 --- a/srcpkgs/perl-Tk/template +++ b/srcpkgs/perl-Tk/template @@ -14,7 +14,6 @@ homepage="https://metacpan.org/release/Tk" license="Artistic-1.0-Perl, GPL-1.0-or-later" distfiles="${CPAN_SITE}/Tk/Tk-${version}.tar.gz" checksum=4d2b80291ba6de34d8ec886a085a6dbd2b790b926035a087e99025614c5ffdd4 -patch_args=-Np0 post_configure() { sed -i 's,X11/Xproto.h,,; s,X11/Xutil.h,,' pTk/Makefile diff --git a/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch b/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch index 9c58d70b416..de26b63365f 100644 --- a/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch +++ b/srcpkgs/perl-WWW-Curl/patches/curl-7.50.2.patch @@ -1,7 +1,7 @@ CPAN RT#132197 ---- Makefile.PL -+++ Makefile.PL +--- a/Makefile.PL ++++ b/Makefile.PL @@ -127,7 +127,7 @@ close H; @@ -11,8 +11,8 @@ CPAN RT#132197 next; } my ($group) = $e =~ m/^([^_]+_)/; ---- Curl.xs -+++ Curl.xs +--- a/Curl.xs ++++ b/Curl.xs @@ -18,6 +18,10 @@ #include <curl/easy.h> #include <curl/multi.h> diff --git a/srcpkgs/perl-WWW-Curl/template b/srcpkgs/perl-WWW-Curl/template index e3e11f40736..5ff52959bfb 100644 --- a/srcpkgs/perl-WWW-Curl/template +++ b/srcpkgs/perl-WWW-Curl/template @@ -13,7 +13,6 @@ homepage="https://metacpan.org/release/WWW-Curl" license="MIT" distfiles="${CPAN_SITE}/WWW/WWW-Curl-$version.tar.gz" checksum=52ffab110e32348d775f241c973eb56f96b08eedbc110d77d257cdb0a24ab7ba -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/perl-XML-LibXSLT/patches/fix-cross-remove-have_library.patch b/srcpkgs/perl-XML-LibXSLT/patches/fix-cross-remove-have_library.patch index 81fe75f54f8..26e5665fb04 100644 --- a/srcpkgs/perl-XML-LibXSLT/patches/fix-cross-remove-have_library.patch +++ b/srcpkgs/perl-XML-LibXSLT/patches/fix-cross-remove-have_library.patch @@ -2,8 +2,8 @@ Remove the 'have_library()' check. It breaks cross compilation. The checked for libxslt and libexslt are pulled in via makedepends and therefore do exist, anyway. ---- Makefile.PL.orig -+++ Makefile.PL +--- a/Makefile.PL ++++ b/Makefile.PL @@ -157,20 +157,8 @@ $config{LIBS} .= $::is_Win32 ? '' :' -lm'; } diff --git a/srcpkgs/perl-XML-LibXSLT/template b/srcpkgs/perl-XML-LibXSLT/template index 2b6eecc0772..24fa3f44b1b 100644 --- a/srcpkgs/perl-XML-LibXSLT/template +++ b/srcpkgs/perl-XML-LibXSLT/template @@ -13,4 +13,3 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/XML-LibXSLT/" distfiles="${CPAN_SITE}/XML/${pkgname/perl-/}-${version}.tar.gz" checksum=127e17a877fb61e47b9e8b87bf8daad31339a62a00121f9751d522b438b0f7f0 -patch_args=-Np0 diff --git a/srcpkgs/perl-XML-SAX/patches/fix-installation.patch b/srcpkgs/perl-XML-SAX/patches/fix-installation.patch index b71247aa14c..780d180fc18 100644 --- a/srcpkgs/perl-XML-SAX/patches/fix-installation.patch +++ b/srcpkgs/perl-XML-SAX/patches/fix-installation.patch @@ -2,8 +2,8 @@ Source: maxice8 Upstream: No Reason: Fixes installation ---- Makefile.PL -+++ Makefile.PL +--- a/Makefile.PL ++++ b/Makefile.PL @@ -12,43 +12,3 @@ WriteMakefile( 'XML::NamespaceSupport' => 0.03, }, diff --git a/srcpkgs/perl-XML-SAX/template b/srcpkgs/perl-XML-SAX/template index 445c4c6e20f..d72f1eac7e8 100644 --- a/srcpkgs/perl-XML-SAX/template +++ b/srcpkgs/perl-XML-SAX/template @@ -13,4 +13,3 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://metacpan.org/release/XML-SAX" distfiles="${CPAN_SITE}/XML/XML-SAX-${version}.tar.gz" checksum=4506c387043aa6a77b455f00f57409f3720aa7e553495ab2535263b4ed1ea12a -patch_args=-Np0 diff --git a/srcpkgs/perl/patches/D-SHA-CFLAGS.diff b/srcpkgs/perl/patches/D-SHA-CFLAGS.diff index cdad78d6929..7c580648d22 100644 --- a/srcpkgs/perl/patches/D-SHA-CFLAGS.diff +++ b/srcpkgs/perl/patches/D-SHA-CFLAGS.diff @@ -14,8 +14,8 @@ Original-By: Matthias Maier <tamiko@gentoo.org> diff --git a/cpan/Digest-SHA/Makefile.PL b/cpan/Digest-SHA/Makefile.PL index af2c0c3..65f4771 100644 ---- cpan/Digest-SHA/Makefile.PL -+++ cpan/Digest-SHA/Makefile.PL +--- a/cpan/Digest-SHA/Makefile.PL ++++ b/cpan/Digest-SHA/Makefile.PL @@ -64,12 +64,6 @@ if ($^O eq 'VMS') { } } diff --git a/srcpkgs/perl/patches/cleanup-paths.diff b/srcpkgs/perl/patches/cleanup-paths.diff index 5bdcd5ef854..4456b667d5d 100644 --- a/srcpkgs/perl/patches/cleanup-paths.diff +++ b/srcpkgs/perl/patches/cleanup-paths.diff @@ -1,5 +1,5 @@ ---- Configure -+++ Configure +--- a/Configure ++++ b/Configure @@ -107,28 +107,6 @@ fi fi diff --git a/srcpkgs/perl/patches/cpan_definstalldirs.diff b/srcpkgs/perl/patches/cpan_definstalldirs.diff index 5f627d7af88..3f420feded4 100644 --- a/srcpkgs/perl/patches/cpan_definstalldirs.diff +++ b/srcpkgs/perl/patches/cpan_definstalldirs.diff @@ -16,8 +16,8 @@ Patch-Name: gentoo/cpan_definstalldirs.diff diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm index 5030ef9..5953cb7 100644 ---- cpan/CPAN/lib/CPAN/FirstTime.pm -+++ cpan/CPAN/lib/CPAN/FirstTime.pm +--- a/cpan/CPAN/lib/CPAN/FirstTime.pm ++++ b/cpan/CPAN/lib/CPAN/FirstTime.pm @@ -990,7 +990,7 @@ sub init { my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND'); diff --git a/srcpkgs/perl/patches/cross-Makefile.SH.patch b/srcpkgs/perl/patches/cross-Makefile.SH.patch index cba442f3ac0..c10163c4294 100644 --- a/srcpkgs/perl/patches/cross-Makefile.SH.patch +++ b/srcpkgs/perl/patches/cross-Makefile.SH.patch @@ -1,5 +1,5 @@ ---- Makefile.SH.orig 2015-06-16 13:22:55.921083153 +0200 -+++ Makefile.SH 2015-06-16 13:26:14.198352302 +0200 +--- a/Makefile.SH 2015-06-16 13:22:55.921083153 +0200 ++++ b/Makefile.SH 2015-06-16 13:26:14.198352302 +0200 @@ -311,6 +311,7 @@ OBJ_EXT = $_o PATH_SEP = $p_ diff --git a/srcpkgs/perl/patches/drop_fstack_protector.diff b/srcpkgs/perl/patches/drop_fstack_protector.diff index 43e07fa02fb..5602a012327 100644 --- a/srcpkgs/perl/patches/drop_fstack_protector.diff +++ b/srcpkgs/perl/patches/drop_fstack_protector.diff @@ -11,8 +11,8 @@ Original by Torsten Veller, ported to perl 5.20 diff -ruN perl-5.24.0-RC5.orig/Configure perl-5.24.0-RC5/Configure ---- Configure 2016-04-27 00:11:09.000000000 +0200 -+++ Configure 2016-05-05 21:32:53.575232970 +0200 +--- a/Configure 2016-04-27 00:11:09.000000000 +0200 ++++ b/Configure 2016-05-05 21:32:53.575232970 +0200 @@ -5474,23 +5474,6 @@ # is to add the flag to the flags passed to the compiler at link time, # as that way the compiler can do the right implementation dependant diff --git a/srcpkgs/perl/patches/usr_local.diff b/srcpkgs/perl/patches/usr_local.diff index 294abc0a18e..86eb2a49565 100644 --- a/srcpkgs/perl/patches/usr_local.diff +++ b/srcpkgs/perl/patches/usr_local.diff @@ -14,8 +14,8 @@ Original-By: Torsten Veller <tove@gentoo.org> diff --git a/Configure b/Configure index 63b8848..d0a3c28 100755 ---- Configure -+++ Configure +--- a/Configure ++++ b/Configure @@ -1315,8 +1315,7 @@ archobjs='' archname='' : Possible local include directories to search. diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index c5929e12b78..29da654b2f3 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -16,7 +16,6 @@ distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz" checksum="03b693901cd8ae807231b1787798cf1f2e0b8a56218d07b7da44f784a7caeb2c 91c66f6b2b99fccfd4fee14660b677380b0c98f9456359e91449798c2ad2ef25" -patch_args=-Np0 # Before updating this package to a new major version, run ${FILESDIR}/provides.pl # against ${wrksrc} to find the list of built in packages. diff --git a/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch b/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch index 434ea3d22d9..a42d1992b65 100644 --- a/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch +++ b/srcpkgs/pgadmin3/patches/pgadmin3-fix-segfault.patch @@ -1,7 +1,7 @@ https://bugs.archlinux.org/task/52683 ---- pgadmin/frm/plugins.cpp -+++ pgadmin/frm/plugins.cpp +--- a/pgadmin/frm/plugins.cpp ++++ b/pgadmin/frm/plugins.cpp @@ -380,7 +380,7 @@ bool pluginUtilityFactory::CheckEnable(p { // If we need a specific server type, we can't enable unless diff --git a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch index f3bcf852150..3a678ef3bed 100644 --- a/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch +++ b/srcpkgs/pgadmin3/patches/pgadmin3_unbundle-libssh.patch @@ -1,6 +1,6 @@ diff -rupN configure.ac.in configure.ac.in ---- configure.ac.in 2020-03-24 05:15:11.000000000 +0100 -+++ configure.ac.in 2020-04-09 14:54:07.189090418 +0200 +--- a/configure.ac.in 2020-03-24 05:15:11.000000000 +0100 ++++ b/configure.ac.in 2020-04-09 14:54:07.189090418 +0200 @@ -26,7 +26,6 @@ AC_CHECK_HEADERS([errno.h fcntl.h stdio. AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/ioctl.h sys/time.h]) AC_CHECK_HEADERS([sys/un.h], [have_sys_un_h=yes], [have_sys_un_h=no]) @@ -10,8 +10,8 @@ diff -rupN configure.ac.in configure.ac.in # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk ---- pgadmin/include/module.mk 2020-03-24 05:15:11.000000000 +0100 -+++ pgadmin/include/module.mk 2020-04-09 14:54:07.190090419 +0200 +--- a/pgadmin/include/module.mk 2020-03-24 05:15:11.000000000 +0100 ++++ b/pgadmin/include/module.mk 2020-04-09 14:54:07.190090419 +0200 @@ -36,5 +36,4 @@ include include/gqb/module.mk include include/hotdraw/module.mk include include/utils/module.mk @@ -19,8 +19,8 @@ diff -rupN pgadmin/include/module.mk pgadmin/include/module.mk -include include/libssh2/module.mk diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am ---- pgadmin/Makefile.am 2020-03-24 05:15:11.000000000 +0100 -+++ pgadmin/Makefile.am 2020-04-09 14:54:09.880094260 +0200 +--- a/pgadmin/Makefile.am 2020-03-24 05:15:11.000000000 +0100 ++++ b/pgadmin/Makefile.am 2020-04-09 14:54:09.880094260 +0200 @@ -49,7 +49,6 @@ include gqb/module.mk include hotdraw/module.mk include ui/module.mk @@ -55,8 +55,8 @@ diff -rupN pgadmin/Makefile.am pgadmin/Makefile.am install-exec-hook: cd $(bindir) ;\ diff -rupN pgadmin/utils/sshTunnel.cpp pgadmin/utils/sshTunnel.cpp ---- pgadmin/utils/sshTunnel.cpp 2020-03-24 05:15:11.000000000 +0100 -+++ pgadmin/utils/sshTunnel.cpp 2020-04-09 14:54:07.191090420 +0200 +--- a/pgadmin/utils/sshTunnel.cpp 2020-03-24 05:15:11.000000000 +0100 ++++ b/pgadmin/utils/sshTunnel.cpp 2020-04-09 14:54:07.191090420 +0200 @@ -15,7 +15,7 @@ #undef ssize_t diff --git a/srcpkgs/pgadmin3/template b/srcpkgs/pgadmin3/template index c4fc9f3c2aa..ad2465b3413 100644 --- a/srcpkgs/pgadmin3/template +++ b/srcpkgs/pgadmin3/template @@ -13,7 +13,6 @@ homepage="http://www.pgadmin.org" distfiles="https://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz" checksum=9b68b0e3d3f0a261344fb8196825967d1e7acaca1d8cc82c42e12368ca5844ac nocross=yes -patch_args=-Np0 CXXFLAGS="-Wno-narrowing" diff --git a/srcpkgs/php/patches/php-706-crypt.patch b/srcpkgs/php/patches/php-706-crypt.patch index 12bee4ae7ad..254f1d2187c 100644 --- a/srcpkgs/php/patches/php-706-crypt.patch +++ b/srcpkgs/php/patches/php-706-crypt.patch @@ -1,5 +1,5 @@ ---- ext/standard/crypt.c.orig 2016-04-28 14:13:00.000000000 -0400 -+++ ext/standard/crypt.c 2016-04-28 21:45:24.340955313 -0400 +--- a/ext/standard/crypt.c 2016-04-28 14:13:00.000000000 -0400 ++++ b/ext/standard/crypt.c 2016-04-28 21:45:24.340955313 -0400 @@ -267,6 +267,12 @@ } # elif defined(HAVE_CRYPT) diff --git a/srcpkgs/php/patches/php-cross-config.patch b/srcpkgs/php/patches/php-cross-config.patch index 5ce95cda930..d6af2c58cb2 100644 --- a/srcpkgs/php/patches/php-cross-config.patch +++ b/srcpkgs/php/patches/php-cross-config.patch @@ -1,5 +1,5 @@ ---- configure 2020-03-17 11:40:20.000000000 +0100 -+++ configure 2020-04-12 19:51:57.216350534 +0200 +--- a/configure 2020-03-17 11:40:20.000000000 +0100 ++++ b/configure 2020-04-12 19:51:57.216350534 +0200 @@ -6374,10 +6374,12 @@ IFS="- /. as_fn_error $? "Please note that Apache version >= 2.0.44 is required" "$LINENO" 5 fi diff --git a/srcpkgs/php/patches/php-fpm.patch b/srcpkgs/php/patches/php-fpm.patch index 53edcbc2512..5e55e179f8a 100644 --- a/srcpkgs/php/patches/php-fpm.patch +++ b/srcpkgs/php/patches/php-fpm.patch @@ -1,5 +1,5 @@ ---- sapi/fpm/Makefile.frag.orig 2017-04-15 23:58:56.965737425 +0200 -+++ sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200 +--- a/sapi/fpm/Makefile.frag 2017-04-15 23:58:56.965737425 +0200 ++++ b/sapi/fpm/Makefile.frag 2017-04-16 00:00:57.814831649 +0200 @@ -15,8 +15,8 @@ install-fpm: $(SAPI_FPM_PATH) else \ echo "Installing PHP FPM defconfig: $(INSTALL_ROOT)$(sysconfdir)/" && \ diff --git a/srcpkgs/php/patches/php-pear-cross.patch b/srcpkgs/php/patches/php-pear-cross.patch index 944a91dda9a..f9191a50a0b 100644 --- a/srcpkgs/php/patches/php-pear-cross.patch +++ b/srcpkgs/php/patches/php-pear-cross.patch @@ -1,5 +1,5 @@ ---- pear/Makefile.frag 2020-03-17 11:40:21.000000000 +0100 -+++ pear/Makefile.frag 2020-04-12 22:29:31.846943414 +0200 +--- a/pear/Makefile.frag 2020-03-17 11:40:21.000000000 +0100 ++++ b/pear/Makefile.frag 2020-04-12 22:29:31.846943414 +0200 @@ -8,9 +8,10 @@ FETCH = `which fetch 2>/dev/null` PEAR_PREFIX = -dp a${program_prefix} PEAR_SUFFIX = -ds a$(program_suffix) diff --git a/srcpkgs/php/patches/php-phar-cross.patch b/srcpkgs/php/patches/php-phar-cross.patch index 955ab80b0a1..1e4e627ec65 100644 --- a/srcpkgs/php/patches/php-phar-cross.patch +++ b/srcpkgs/php/patches/php-phar-cross.patch @@ -1,5 +1,5 @@ ---- ext/phar/Makefile.frag 2020-04-13 12:18:23.998801926 +0200 -+++ ext/phar/Makefile.frag 2020-04-13 12:20:58.031795293 +0200 +--- a/ext/phar/Makefile.frag 2020-04-13 12:18:23.998801926 +0200 ++++ b/ext/phar/Makefile.frag 2020-04-13 12:20:58.031795293 +0200 @@ -8,12 +8,14 @@ $(srcdir)/phar_path_check.c: $(srcdir)/p pharcmd: $(builddir)/phar.php $(builddir)/phar.phar diff --git a/srcpkgs/php/patches/php-phpize-sysroot-support.patch b/srcpkgs/php/patches/php-phpize-sysroot-support.patch index d91caf2791d..76cff3f8166 100644 --- a/srcpkgs/php/patches/php-phpize-sysroot-support.patch +++ b/srcpkgs/php/patches/php-phpize-sysroot-support.patch @@ -1,5 +1,5 @@ ---- scripts/phpize.m4 2020-03-17 11:40:21.000000000 +0100 -+++ scripts/phpize.m4 2020-04-15 12:27:36.400466387 +0200 +--- a/scripts/phpize.m4 2020-03-17 11:40:21.000000000 +0100 ++++ b/scripts/phpize.m4 2020-04-15 12:27:36.400466387 +0200 @@ -44,6 +44,12 @@ PHP_ARG_WITH([libdir], [lib], [no]) diff --git a/srcpkgs/php/patches/php.ini.patch b/srcpkgs/php/patches/php.ini.patch index 435c13e826b..47197c778d3 100644 --- a/srcpkgs/php/patches/php.ini.patch +++ b/srcpkgs/php/patches/php.ini.patch @@ -1,7 +1,7 @@ diff --git php.ini-production php.ini-production index 794d3e8ddb..c7acf9c883 100644 ---- php.ini-production -+++ php.ini-production +--- a/php.ini-production ++++ b/php.ini-production @@ -729,7 +729,7 @@ default_charset = "UTF-8" ;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 4d5649ef85b..bdc35ee2d84 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -14,7 +14,6 @@ license="PHP-3.01" homepage="https://www.php.net" distfiles="http://www.php.net/distributions/php-${version}.tar.xz" checksum=f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886 -patch_args=-Np0 conf_files="/etc/php/php.ini" diff --git a/srcpkgs/pidgin-gpg/patches/musl-encrypt.patch b/srcpkgs/pidgin-gpg/patches/musl-encrypt.patch index 70ac9ed053d..bc384969f4e 100644 --- a/srcpkgs/pidgin-gpg/patches/musl-encrypt.patch +++ b/srcpkgs/pidgin-gpg/patches/musl-encrypt.patch @@ -1,7 +1,7 @@ Musl provides encrypt() with different signature in unistd.h. ---- src/pidgin-gpg.c -+++ src/pidgin-gpg.c +--- a/src/pidgin-gpg.c ++++ b/src/pidgin-gpg.c @@ -458,7 +458,7 @@ static char* verify(const char* sig_str) /* ------------------ * encrypt a plain string with the key found with fingerprint fpr diff --git a/srcpkgs/pidgin-gpg/template b/srcpkgs/pidgin-gpg/template index b67e21ce24f..2442f04ea12 100644 --- a/srcpkgs/pidgin-gpg/template +++ b/srcpkgs/pidgin-gpg/template @@ -11,4 +11,3 @@ license="GPL-3.0-or-later" homepage="http://github.com/segler-alex/Pidgin-GPG" distfiles="http://github.com/downloads/segler-alex/Pidgin-GPG/${pkgname}-${version}.tar.gz" checksum=736681cb25da31eb8ced96055d4150d649fe6ef6e523b6f65846c3446ac09a96 -patch_args=-Np0 diff --git a/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-0.14-libnotify-0.7.patch b/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-0.14-libnotify-0.7.patch index 40e6c02b815..7279c3ad7ea 100644 --- a/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-0.14-libnotify-0.7.patch +++ b/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-0.14-libnotify-0.7.patch @@ -1,5 +1,5 @@ ---- src/pidgin-libnotify.c -+++ src/pidgin-libnotify.c +--- a/src/pidgin-libnotify.c ++++ b/src/pidgin-libnotify.c @@ -286,7 +286,15 @@ g_free (tr_body); return; diff --git a/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-getfocus.patch b/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-getfocus.patch index db45829d9d7..2848ef8bbc9 100644 --- a/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-getfocus.patch +++ b/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-getfocus.patch @@ -1,5 +1,5 @@ ---- src/pidgin-libnotify.c 2013-05-07 17:38:31.397261982 +0200 -+++ src2/pidgin-libnotify.c 2013-05-07 17:43:43.787904584 +0200 +--- a/src/pidgin-libnotify.c 2013-05-07 17:38:31.397261982 +0200 ++++ b/src2/pidgin-libnotify.c 2013-05-07 17:43:43.787904584 +0200 @@ -169,6 +169,49 @@ pixbuf_from_buddy_icon (PurpleBuddyIcon return icon; } diff --git a/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-showbutton.patch b/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-showbutton.patch index 1f84e602555..173619970e4 100644 --- a/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-showbutton.patch +++ b/srcpkgs/pidgin-libnotify/patches/pidgin-libnotify-showbutton.patch @@ -1,5 +1,5 @@ ---- src/pidgin-libnotify.c.orig 2007-10-01 20:52:38.000000000 +1000 -+++ src/pidgin-libnotify.c 2007-10-01 20:53:20.000000000 +1000 +--- a/src/pidgin-libnotify.c 2007-10-01 20:52:38.000000000 +1000 ++++ b/src/pidgin-libnotify.c 2007-10-01 20:53:20.000000000 +1000 @@ -307,6 +307,7 @@ g_hash_table_insert (buddy_hash, contact, notification); diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template index 670f6336a6d..5a627f32383 100644 --- a/srcpkgs/pidgin-libnotify/template +++ b/srcpkgs/pidgin-libnotify/template @@ -14,7 +14,6 @@ homepage="http://gaim-libnotify.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz" checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe lib32disabled=yes -patch_args=-Np0 post_patch() { vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure diff --git a/srcpkgs/pidgin-sipe/patches/time64.patch b/srcpkgs/pidgin-sipe/patches/time64.patch index e4397c65d92..cf7bc731121 100644 --- a/srcpkgs/pidgin-sipe/patches/time64.patch +++ b/srcpkgs/pidgin-sipe/patches/time64.patch @@ -1,5 +1,5 @@ ---- src/core/sipe-utils.c 2019-10-11 17:28:48.000000000 +0200 -+++ src/core/sipe-utils.c 2021-02-17 12:21:58.906079796 +0100 +--- a/src/core/sipe-utils.c 2019-10-11 17:28:48.000000000 +0200 ++++ b/src/core/sipe-utils.c 2021-02-17 12:21:58.906079796 +0100 @@ -25,6 +25,8 @@ #include <string.h> #include <ctype.h> diff --git a/srcpkgs/pidgin-sipe/template b/srcpkgs/pidgin-sipe/template index d9bead87f86..9ea248618f4 100644 --- a/srcpkgs/pidgin-sipe/template +++ b/srcpkgs/pidgin-sipe/template @@ -13,4 +13,3 @@ license="GPL-2.0-or-later" homepage="http://sipe.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/sipe/sipe/${pkgname}-${version}.tar.xz" checksum=738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba -patch_args=-Np0 diff --git a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch index 0bc02926559..2e82aaae330 100644 --- a/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch +++ b/srcpkgs/pidgin/patches/01-configure_ac-libnm_pc.patch @@ -1,5 +1,5 @@ ---- configure.ac 2018-03-08 07:22:25.000000000 +0100 -+++ configure.ac 2020-02-11 04:14:37.777681920 +0100 +--- a/configure.ac 2018-03-08 07:22:25.000000000 +0100 ++++ b/configure.ac 2020-02-11 04:14:37.777681920 +0100 @@ -1428,7 +1428,7 @@ dnl Check for NetworkManager.h; if we don't have it, oh well if test "x$enable_dbus" = "xyes" ; then diff --git a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch index 802d64b89f2..fd11e320c20 100644 --- a/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch +++ b/srcpkgs/pidgin/patches/02-libpurple-nm_state.patch @@ -1,5 +1,5 @@ ---- libpurple/network.c 2018-03-06 07:00:49.000000000 +0100 -+++ libpurple/network.c 2020-02-11 04:30:20.163644344 +0100 +--- a/libpurple/network.c 2018-03-06 07:00:49.000000000 +0100 ++++ b/libpurple/network.c 2020-02-11 04:30:20.163644344 +0100 @@ -939,8 +939,16 @@ #if NM_CHECK_VERSION(0,8,992) case NM_STATE_DISCONNECTING: diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template index fb6513a0045..a2668cf685e 100644 --- a/srcpkgs/pidgin/template +++ b/srcpkgs/pidgin/template @@ -18,7 +18,6 @@ distfiles="${SOURCEFORGE_SITE}/pidgin/pidgin-${version}.tar.bz2" checksum=2747150c6f711146bddd333c496870bfd55058bab22ffb7e4eb784018ec46d8f python_version=2 #unverified lib32disabled=yes -patch_args=-Np0 hostmakedepends="pkg-config intltool automake libtool gettext gettext-devel glib-devel" makedepends="libglib-devel gtk+-devel libXext-devel diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch index fd46ef59279..2457f1434d9 100644 --- a/srcpkgs/pijul/patches/bindgen.patch +++ b/srcpkgs/pijul/patches/bindgen.patch @@ -1,5 +1,5 @@ ---- Cargo.toml.orig -+++ Cargo.toml +--- a/Cargo.toml ++++ b/Cargo.toml @@ -133,3 +133,7 @@ version = "2.0" [target."cfg(unix)".dependencies.tokio-uds] diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index ad8534111db..40df186b938 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -14,7 +14,6 @@ distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${ver https://gitlab.com/sequoia-pgp/sequoia/-/archive/v${_sequoia_ver}/sequoia-v${_sequoia_ver}.tar.gz" checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889 71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b" -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then export HOST_CC="$BUILD_CC" diff --git a/srcpkgs/pilot-link/patches/fix-ai_non_const.patch b/srcpkgs/pilot-link/patches/fix-ai_non_const.patch index 631ea19d71a..2cd9cf98a79 100644 --- a/srcpkgs/pilot-link/patches/fix-ai_non_const.patch +++ b/srcpkgs/pilot-link/patches/fix-ai_non_const.patch @@ -1,5 +1,5 @@ ---- libpisock/address.c 2016-12-20 13:56:43.913681767 +0100 -+++ libpisock/address.c 2016-12-20 13:57:47.512723493 +0100 +--- a/libpisock/address.c 2016-12-20 13:56:43.913681767 +0100 ++++ b/libpisock/address.c 2016-12-20 13:57:47.512723493 +0100 @@ -260,7 +260,7 @@ * ***********************************************************************/ @@ -9,8 +9,8 @@ { int i; size_t destlen = 4 + 16 * 22 + 2 + 2; ---- include/pi-address.h 2007-01-15 01:29:59.000000000 +0100 -+++ include/pi-address.h 2016-12-20 14:05:35.094015860 +0100 +--- a/include/pi-address.h 2007-01-15 01:29:59.000000000 +0100 ++++ b/include/pi-address.h 2016-12-20 14:05:35.094015860 +0100 @@ -82,7 +82,7 @@ extern int unpack_AddressAppInfo PI_ARGS((AddressAppInfo_t *, const unsigned char *AppInfo, size_t len)); diff --git a/srcpkgs/pilot-link/patches/fix-const_uchar.patch b/srcpkgs/pilot-link/patches/fix-const_uchar.patch index 8f7f4f8720c..83de22818fc 100644 --- a/srcpkgs/pilot-link/patches/fix-const_uchar.patch +++ b/srcpkgs/pilot-link/patches/fix-const_uchar.patch @@ -1,5 +1,5 @@ ---- libpisock/address.c 2007-01-15 01:29:59.000000000 +0100 -+++ libpisock/address.c 2016-12-20 13:51:16.230458809 +0100 +--- a/libpisock/address.c 2007-01-15 01:29:59.000000000 +0100 ++++ b/libpisock/address.c 2016-12-20 13:51:16.230458809 +0100 @@ -209,7 +209,7 @@ size_t i, destlen = 4 + 16 * 22 + 2 + 2; @@ -9,8 +9,8 @@ unsigned long r; ai->type = address_v1; ---- libpisock/memo.c 2007-01-15 01:30:00.000000000 +0100 -+++ libpisock/memo.c 2016-12-20 13:55:47.344644240 +0100 +--- a/libpisock/memo.c 2007-01-15 01:30:00.000000000 +0100 ++++ b/libpisock/memo.c 2016-12-20 13:55:47.344644240 +0100 @@ -122,7 +122,7 @@ size_t len) { @@ -20,8 +20,8 @@ appinfo->type = memo_v1; ---- libpisock/todo.c 2007-01-15 01:30:00.000000000 +0100 -+++ libpisock/todo.c 2016-12-20 14:33:36.738559189 +0100 +--- a/libpisock/todo.c 2007-01-15 01:30:00.000000000 +0100 ++++ b/libpisock/todo.c 2016-12-20 14:33:36.738559189 +0100 @@ -232,7 +232,7 @@ unpack_ToDoAppInfo(ToDoAppInfo_t *appinfo, const unsigned char *record, size_t len) { diff --git a/srcpkgs/pilot-link/patches/fix-ifdef_syntax.patch b/srcpkgs/pilot-link/patches/fix-ifdef_syntax.patch index 6c940230bf4..5392acdec3a 100644 --- a/srcpkgs/pilot-link/patches/fix-ifdef_syntax.patch +++ b/srcpkgs/pilot-link/patches/fix-ifdef_syntax.patch @@ -1,5 +1,5 @@ ---- include/pi-md5.h.in 2010-02-07 04:42:49.000000000 +0100 -+++ include/pi-md5.h.in 2016-12-20 14:03:39.781946035 +0100 +--- a/include/pi-md5.h.in 2010-02-07 04:42:49.000000000 +0100 ++++ b/include/pi-md5.h.in 2016-12-20 14:03:39.781946035 +0100 @@ -22,7 +22,7 @@ #if HAVE_STDINT_H #include <stdint.h> diff --git a/srcpkgs/pilot-link/patches/fix-linuxusb_return_types.patch b/srcpkgs/pilot-link/patches/fix-linuxusb_return_types.patch index c6e34601d55..7948e224046 100644 --- a/srcpkgs/pilot-link/patches/fix-linuxusb_return_types.patch +++ b/srcpkgs/pilot-link/patches/fix-linuxusb_return_types.patch @@ -1,5 +1,5 @@ ---- libpisock/linuxusb.c 2006-10-12 16:21:22.000000000 +0200 -+++ libpisock/linuxusb.c 2016-12-20 14:17:56.216661746 +0100 +--- a/libpisock/linuxusb.c 2006-10-12 16:21:22.000000000 +0200 ++++ b/libpisock/linuxusb.c 2016-12-20 14:17:56.216661746 +0100 @@ -27,6 +27,7 @@ #include <stdio.h> #include <sys/types.h> diff --git a/srcpkgs/pilot-link/patches/fix-strncat_overrun.patch b/srcpkgs/pilot-link/patches/fix-strncat_overrun.patch index 38c4f63c00f..d00671b21c9 100644 --- a/srcpkgs/pilot-link/patches/fix-strncat_overrun.patch +++ b/srcpkgs/pilot-link/patches/fix-strncat_overrun.patch @@ -1,5 +1,5 @@ ---- src/pilot-memos.c 2009-06-04 15:26:19.000000000 +0200 -+++ src/pilot-memos.c 2016-12-20 15:20:12.137836228 +0100 +--- a/src/pilot-memos.c 2009-06-04 15:26:19.000000000 +0200 ++++ b/src/pilot-memos.c 2016-12-20 15:20:12.137836228 +0100 @@ -113,7 +113,7 @@ mkdir(dirname, 0700); diff --git a/srcpkgs/pilot-link/patches/fix-swig_const_char_ptr.patch b/srcpkgs/pilot-link/patches/fix-swig_const_char_ptr.patch index 8b497ca874f..8df5f2b5937 100644 --- a/srcpkgs/pilot-link/patches/fix-swig_const_char_ptr.patch +++ b/srcpkgs/pilot-link/patches/fix-swig_const_char_ptr.patch @@ -1,5 +1,5 @@ ---- bindings/Python/src/pisock_wrap.c 2006-03-24 21:07:52.000000000 +0100 -+++ bindings/Python/src/pisock_wrap.c 2016-12-20 15:03:35.066297623 +0100 +--- a/bindings/Python/src/pisock_wrap.c 2006-03-24 21:07:52.000000000 +0100 ++++ b/bindings/Python/src/pisock_wrap.c 2016-12-20 15:03:35.066297623 +0100 @@ -1211,7 +1211,7 @@ obj = pyobj; if (PyCFunction_Check(obj)) { diff --git a/srcpkgs/pilot-link/patches/fix-unused_result.patch b/srcpkgs/pilot-link/patches/fix-unused_result.patch index 41bbb421bca..4e4f30abacc 100644 --- a/srcpkgs/pilot-link/patches/fix-unused_result.patch +++ b/srcpkgs/pilot-link/patches/fix-unused_result.patch @@ -1,5 +1,5 @@ ---- libpisock/serial.c 2006-10-12 16:21:22.000000000 +0200 -+++ libpisock/serial.c 2016-12-20 14:38:46.477854828 +0100 +--- a/libpisock/serial.c 2006-10-12 16:21:22.000000000 +0200 ++++ b/libpisock/serial.c 2016-12-20 14:38:46.477854828 +0100 @@ -364,6 +364,7 @@ begin: if ((err = data->impl.open(ps, pa, addrlen)) < 0) { @@ -20,8 +20,8 @@ if (errno == ENOENT) { LOG((PI_DBG_DEV, PI_DBG_LVL_ERR, ---- src/pilot-foto-treo600.c 2009-06-04 15:32:30.000000000 +0200 -+++ src/pilot-foto-treo600.c 2016-12-20 15:24:35.897251325 +0100 +--- a/src/pilot-foto-treo600.c 2009-06-04 15:32:30.000000000 +0200 ++++ b/src/pilot-foto-treo600.c 2016-12-20 15:24:35.897251325 +0100 @@ -86,8 +86,14 @@ } diff --git a/srcpkgs/pilot-link/patches/musl-matherr.patch b/srcpkgs/pilot-link/patches/musl-matherr.patch index 722cb6d10ff..ac4c2599748 100644 --- a/srcpkgs/pilot-link/patches/musl-matherr.patch +++ b/srcpkgs/pilot-link/patches/musl-matherr.patch @@ -1,5 +1,5 @@ ---- bindings/Tcl/tclAppInit.c 2000-10-28 02:23:50.000000000 +0200 -+++ bindings/Tcl/tclAppInit.c 2016-12-20 16:24:35.056230117 +0100 +--- a/bindings/Tcl/tclAppInit.c 2000-10-28 02:23:50.000000000 +0200 ++++ b/bindings/Tcl/tclAppInit.c 2016-12-20 16:24:35.056230117 +0100 @@ -20,8 +20,10 @@ * Sun shared libraries to be used for Tcl. */ diff --git a/srcpkgs/pilot-link/patches/pilot-link-png14.diff b/srcpkgs/pilot-link/patches/pilot-link-png14.diff index bc1cba25db5..cda4612812e 100644 --- a/srcpkgs/pilot-link/patches/pilot-link-png14.diff +++ b/srcpkgs/pilot-link/patches/pilot-link-png14.diff @@ -1,5 +1,5 @@ ---- ./src/pilot-read-veo.c.orig 2007-02-04 17:06:03.000000000 -0600 -+++ ./src/pilot-read-veo.c 2010-02-19 12:52:30.000000000 -0600 +--- a/src/pilot-read-veo.c 2007-02-04 17:06:03.000000000 -0600 ++++ b/src/pilot-read-veo.c 2010-02-19 12:52:30.000000000 -0600 @@ -41,10 +41,6 @@ #ifdef HAVE_PNG @@ -22,8 +22,8 @@ if (!png_ptr) return; ---- ./src/pilot-read-notepad.c.orig 2007-02-04 17:06:02.000000000 -0600 -+++ ./src/pilot-read-notepad.c 2010-02-19 12:53:03.000000000 -0600 +--- a/src/pilot-read-notepad.c 2007-02-04 17:06:02.000000000 -0600 ++++ b/src/pilot-read-notepad.c 2010-02-19 12:53:03.000000000 -0600 @@ -39,10 +39,6 @@ #ifdef HAVE_PNG @@ -46,8 +46,8 @@ if(!png_ptr) return; ---- ./src/pilot-read-screenshot.c.orig 2006-11-02 08:54:31.000000000 -0600 -+++ ./src/pilot-read-screenshot.c 2010-02-19 12:50:44.000000000 -0600 +--- a/src/pilot-read-screenshot.c 2006-11-02 08:54:31.000000000 -0600 ++++ b/src/pilot-read-screenshot.c 2010-02-19 12:50:44.000000000 -0600 @@ -40,10 +40,6 @@ #ifdef HAVE_PNG @@ -70,8 +70,8 @@ if (!png_ptr) return; ---- ./src/pilot-read-palmpix.c.orig 2007-02-04 17:06:03.000000000 -0600 -+++ ./src/pilot-read-palmpix.c 2010-02-19 12:51:10.000000000 -0600 +--- a/src/pilot-read-palmpix.c 2007-02-04 17:06:03.000000000 -0600 ++++ b/src/pilot-read-palmpix.c 2010-02-19 12:51:10.000000000 -0600 @@ -42,10 +42,6 @@ #ifdef HAVE_PNG diff --git a/srcpkgs/pilot-link/patches/refactor-iconv_const_char_ptr.patch b/srcpkgs/pilot-link/patches/refactor-iconv_const_char_ptr.patch index 14d48db20dc..4e6f1a3c7ba 100644 --- a/srcpkgs/pilot-link/patches/refactor-iconv_const_char_ptr.patch +++ b/srcpkgs/pilot-link/patches/refactor-iconv_const_char_ptr.patch @@ -3,8 +3,8 @@ a const char* as the source text, but iconv() expects a char**. Create a local copy of the const char* and use that. Also add sanity checks to avoid dereferencing NULL pointers. ---- libpisync/util.c 2006-08-25 14:33:25.000000000 +0200 -+++ libpisync/util.c 2016-12-20 14:55:18.996691848 +0100 +--- a/libpisync/util.c 2006-08-25 14:33:25.000000000 +0200 ++++ b/libpisync/util.c 2016-12-20 14:55:18.996691848 +0100 @@ -104,24 +104,44 @@ int bytes, char **ptext, const char * pi_charset) { diff --git a/srcpkgs/pilot-link/template b/srcpkgs/pilot-link/template index e42936b5e2d..5b83232cef8 100644 --- a/srcpkgs/pilot-link/template +++ b/srcpkgs/pilot-link/template @@ -18,7 +18,6 @@ homepage="http://www.pilot-link.org/" #distfiles="http://downloads.pilot-link.org/${pkgname}-${version}.tar.bz2" distfiles="https://mirrors.slackware.com/slackware/slackware-14.1/source/l/pilot-link/pilot-link-${version}.tar.bz2" checksum=d3f99ec04016b38995fb370265200254710318105c792c017d3aaccfb97a84b2 -patch_args=-Np0 # Avoid error because of deprecation CFLAGS="-Wno-deprecated-declarations" diff --git a/srcpkgs/pinebookpro-uboot/patches/no-delay-autoboot.patch b/srcpkgs/pinebookpro-uboot/patches/no-delay-autoboot.patch index 8b7d262e3e6..1b2420a1029 100644 --- a/srcpkgs/pinebookpro-uboot/patches/no-delay-autoboot.patch +++ b/srcpkgs/pinebookpro-uboot/patches/no-delay-autoboot.patch @@ -11,8 +11,8 @@ Date: Mon Sep 7 09:14:07 2020 -0700 diff --git configs/pinebook-pro-rk3399_defconfig configs/pinebook-pro-rk3399_defconfig index 9a7487b04f..e9605a0ffd 100644 ---- configs/pinebook-pro-rk3399_defconfig -+++ configs/pinebook-pro-rk3399_defconfig +--- a/configs/pinebook-pro-rk3399_defconfig ++++ b/configs/pinebook-pro-rk3399_defconfig @@ -11,7 +11,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-pinebook-pro" diff --git a/srcpkgs/pinebookpro-uboot/patches/rk3399-power-led.patch b/srcpkgs/pinebookpro-uboot/patches/rk3399-power-led.patch index 8527d7763fe..f3c08bf33c6 100644 --- a/srcpkgs/pinebookpro-uboot/patches/rk3399-power-led.patch +++ b/srcpkgs/pinebookpro-uboot/patches/rk3399-power-led.patch @@ -10,8 +10,8 @@ this is a hack, but it works for now. diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 863024d071..cf37129d55 100644 ---- arch/arm/mach-rockchip/rk3399/rk3399.c -+++ arch/arm/mach-rockchip/rk3399/rk3399.c +--- a/arch/arm/mach-rockchip/rk3399/rk3399.c ++++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -15,6 +15,8 @@ #include <asm/arch-rockchip/grf_rk3399.h> #include <asm/arch-rockchip/hardware.h> diff --git a/srcpkgs/pinebookpro-uboot/patches/sdcard-boot.patch b/srcpkgs/pinebookpro-uboot/patches/sdcard-boot.patch index ea4a85eb248..27f6a5b704d 100644 --- a/srcpkgs/pinebookpro-uboot/patches/sdcard-boot.patch +++ b/srcpkgs/pinebookpro-uboot/patches/sdcard-boot.patch @@ -20,8 +20,8 @@ Date: Mon Sep 7 08:37:24 2020 -0700 diff --git include/configs/pinebook-pro-rk3399.h include/configs/pinebook-pro-rk3399.h index d478b19917..59780bfb0b 100644 ---- include/configs/pinebook-pro-rk3399.h -+++ include/configs/pinebook-pro-rk3399.h +--- a/include/configs/pinebook-pro-rk3399.h ++++ b/include/configs/pinebook-pro-rk3399.h @@ -14,6 +14,14 @@ #include <configs/rk3399_common.h> diff --git a/srcpkgs/pinebookpro-uboot/template b/srcpkgs/pinebookpro-uboot/template index ce053ca69d8..db629c4a8e5 100644 --- a/srcpkgs/pinebookpro-uboot/template +++ b/srcpkgs/pinebookpro-uboot/template @@ -14,7 +14,6 @@ license="GPL-2.0-only, BSD-3-Clause" homepage="https://www.denx.de/wiki/U-Boot/" distfiles="https://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2" checksum=0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622 -patch_args=-Np0 do_configure() { unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS diff --git a/srcpkgs/pingus/patches/fix-gcc7.diff b/srcpkgs/pingus/patches/fix-gcc7.diff index 025f5b944a7..daee9e44480 100644 --- a/srcpkgs/pingus/patches/fix-gcc7.diff +++ b/srcpkgs/pingus/patches/fix-gcc7.diff @@ -1,5 +1,5 @@ ---- src/pingus/screens/demo_session.cpp.orig 2018-01-15 12:30:12.557430067 +0100 -+++ src/pingus/screens/demo_session.cpp 2018-01-15 12:30:24.416546179 +0100 +--- a/src/pingus/screens/demo_session.cpp 2018-01-15 12:30:12.557430067 +0100 ++++ b/src/pingus/screens/demo_session.cpp 2018-01-15 12:30:24.416546179 +0100 @@ -16,6 +16,7 @@ #include "pingus/screens/demo_session.hpp" diff --git a/srcpkgs/pingus/patches/missing-header.patch b/srcpkgs/pingus/patches/missing-header.patch index 1f6c5685bb6..cc1dcdbb85c 100644 --- a/srcpkgs/pingus/patches/missing-header.patch +++ b/srcpkgs/pingus/patches/missing-header.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Add missing header for std::function and std::bind diff --git a/src/pingus/screens/demo_session.cpp b/src/pingus/screens/demo_session.cpp index e3ec49a2c..f887e50f0 100644 ---- src/pingus/screens/demo_session.cpp -+++ src/pingus/screens/demo_session.cpp +--- a/src/pingus/screens/demo_session.cpp ++++ b/src/pingus/screens/demo_session.cpp @@ -18,6 +18,7 @@ #include <algorithm> diff --git a/srcpkgs/pingus/patches/pingus-0.7.6-gcc470-udl.patch b/srcpkgs/pingus/patches/pingus-0.7.6-gcc470-udl.patch index 843439321c8..8c05149feb2 100644 --- a/srcpkgs/pingus/patches/pingus-0.7.6-gcc470-udl.patch +++ b/srcpkgs/pingus/patches/pingus-0.7.6-gcc470-udl.patch @@ -1,5 +1,5 @@ ---- src/pingus/pingus_main.cpp~ 2011-12-24 15:46:47.000000000 -0600 -+++ src/pingus/pingus_main.cpp 2012-01-03 13:13:03.034195720 -0600 +--- a/src/pingus/pingus_main.cpp~ 2011-12-24 15:46:47.000000000 -0600 ++++ b/src/pingus/pingus_main.cpp 2012-01-03 13:13:03.034195720 -0600 @@ -465,7 +465,7 @@ void PingusMain::print_greeting_message() @@ -9,8 +9,8 @@ greeting += "!"; std::cout << greeting << std::endl; for (unsigned int i = 0; i < greeting.length(); ++i) ---- src/pingus/screens/pingus_menu.cpp~ 2011-12-24 15:46:47.000000000 -0600 -+++ src/pingus/screens/pingus_menu.cpp 2012-01-03 13:30:28.967700554 -0600 +--- a/src/pingus/screens/pingus_menu.cpp~ 2011-12-24 15:46:47.000000000 -0600 ++++ b/src/pingus/screens/pingus_menu.cpp 2012-01-03 13:30:28.967700554 -0600 @@ -153,7 +153,7 @@ gc.get_height()/2 - 280)); diff --git a/srcpkgs/pingus/patches/pingus-1.76-boost-1.69.patch b/srcpkgs/pingus/patches/pingus-1.76-boost-1.69.patch index e412ffbb2e7..8dfb7a16b68 100644 --- a/srcpkgs/pingus/patches/pingus-1.76-boost-1.69.patch +++ b/srcpkgs/pingus/patches/pingus-1.76-boost-1.69.patch @@ -22,8 +22,8 @@ Subject: [PATCH] Switched to boost::signals2 diff --git a/SConscript b/SConscript index 758567f51..c4d25a8a9 100644 ---- SConscript -+++ SConscript +--- a/SConscript ++++ b/SConscript @@ -187,9 +187,8 @@ class Project: 'src/engine/input/xinput/xinput_device.cpp']) @@ -38,8 +38,8 @@ index 758567f51..c4d25a8a9 100644 if self.conf.CheckMyProgram('pkg-config'): diff --git a/src/editor/button.hpp b/src/editor/button.hpp index c85d7da9e..d89dfe669 100644 ---- src/editor/button.hpp -+++ src/editor/button.hpp +--- a/src/editor/button.hpp ++++ b/src/editor/button.hpp @@ -17,7 +17,7 @@ #ifndef HEADER_PINGUS_EDITOR_BUTTON_HPP #define HEADER_PINGUS_EDITOR_BUTTON_HPP @@ -60,8 +60,8 @@ index c85d7da9e..d89dfe669 100644 Button (const Button&); diff --git a/src/editor/checkbox.hpp b/src/editor/checkbox.hpp index 7c3bc835f..66382d79b 100644 ---- src/editor/checkbox.hpp -+++ src/editor/checkbox.hpp +--- a/src/editor/checkbox.hpp ++++ b/src/editor/checkbox.hpp @@ -17,7 +17,7 @@ #ifndef HEADER_PINGUS_EDITOR_CHECKBOX_HPP #define HEADER_PINGUS_EDITOR_CHECKBOX_HPP @@ -82,8 +82,8 @@ index 7c3bc835f..66382d79b 100644 Checkbox (const Checkbox&); diff --git a/src/editor/combobox.hpp b/src/editor/combobox.hpp index 0ca742593..603556bd9 100644 ---- src/editor/combobox.hpp -+++ src/editor/combobox.hpp +--- a/src/editor/combobox.hpp ++++ b/src/editor/combobox.hpp @@ -18,7 +18,7 @@ #ifndef HEADER_PINGUS_EDITOR_COMBOBOX_HPP #define HEADER_PINGUS_EDITOR_COMBOBOX_HPP @@ -104,8 +104,8 @@ index 0ca742593..603556bd9 100644 Combobox(); diff --git a/src/editor/file_list.hpp b/src/editor/file_list.hpp index cc4bba2de..85efe6aa0 100644 ---- src/editor/file_list.hpp -+++ src/editor/file_list.hpp +--- a/src/editor/file_list.hpp ++++ b/src/editor/file_list.hpp @@ -17,7 +17,7 @@ #ifndef HEADER_PINGUS_EDITOR_FILE_LIST_HPP #define HEADER_PINGUS_EDITOR_FILE_LIST_HPP @@ -126,8 +126,8 @@ index cc4bba2de..85efe6aa0 100644 int items_per_page(); diff --git a/src/editor/inputbox.hpp b/src/editor/inputbox.hpp index cad9663ec..87321dbba 100644 ---- src/editor/inputbox.hpp -+++ src/editor/inputbox.hpp +--- a/src/editor/inputbox.hpp ++++ b/src/editor/inputbox.hpp @@ -17,7 +17,7 @@ #ifndef HEADER_PINGUS_EDITOR_INPUTBOX_HPP #define HEADER_PINGUS_EDITOR_INPUTBOX_HPP @@ -150,8 +150,8 @@ index cad9663ec..87321dbba 100644 Inputbox (const Inputbox&); diff --git a/src/editor/message_box.hpp b/src/editor/message_box.hpp index 385387a61..d885767cf 100644 ---- src/editor/message_box.hpp -+++ src/editor/message_box.hpp +--- a/src/editor/message_box.hpp ++++ b/src/editor/message_box.hpp @@ -45,7 +45,7 @@ public: void on_cancel_button(); @@ -163,8 +163,8 @@ index 385387a61..d885767cf 100644 MessageBox(const MessageBox&); diff --git a/src/editor/object_selector.cpp b/src/editor/object_selector.cpp index 28e306826..f3a36b5e8 100644 ---- src/editor/object_selector.cpp -+++ src/editor/object_selector.cpp +--- a/src/editor/object_selector.cpp ++++ b/src/editor/object_selector.cpp @@ -16,7 +16,7 @@ #include "editor/object_selector.hpp" @@ -185,8 +185,8 @@ index 28e306826..f3a36b5e8 100644 ObjectSelectorButton(ObjectSelectorList* object_list_, diff --git a/src/editor/viewport.hpp b/src/editor/viewport.hpp index 1ae9eff7c..18868254d 100644 ---- src/editor/viewport.hpp -+++ src/editor/viewport.hpp +--- a/src/editor/viewport.hpp ++++ b/src/editor/viewport.hpp @@ -18,7 +18,7 @@ #ifndef HEADER_PINGUS_EDITOR_VIEWPORT_HPP #define HEADER_PINGUS_EDITOR_VIEWPORT_HPP @@ -207,8 +207,8 @@ index 1ae9eff7c..18868254d 100644 Viewport (const Viewport&); diff --git a/src/pingus/components/check_box.hpp b/src/pingus/components/check_box.hpp index 00e23b764..5bef50f6b 100644 ---- src/pingus/components/check_box.hpp -+++ src/pingus/components/check_box.hpp +--- a/src/pingus/components/check_box.hpp ++++ b/src/pingus/components/check_box.hpp @@ -17,7 +17,7 @@ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP #define HEADER_PINGUS_PINGUS_COMPONENTS_CHECK_BOX_HPP @@ -229,8 +229,8 @@ index 00e23b764..5bef50f6b 100644 CheckBox (const CheckBox&); diff --git a/src/pingus/components/choice_box.hpp b/src/pingus/components/choice_box.hpp index 49d6e1948..ef51b6dd2 100644 ---- src/pingus/components/choice_box.hpp -+++ src/pingus/components/choice_box.hpp +--- a/src/pingus/components/choice_box.hpp ++++ b/src/pingus/components/choice_box.hpp @@ -17,7 +17,7 @@ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP #define HEADER_PINGUS_PINGUS_COMPONENTS_CHOICE_BOX_HPP @@ -251,8 +251,8 @@ index 49d6e1948..ef51b6dd2 100644 ChoiceBox (const ChoiceBox&); diff --git a/src/pingus/components/slider_box.hpp b/src/pingus/components/slider_box.hpp index ae4d92406..75118eac2 100644 ---- src/pingus/components/slider_box.hpp -+++ src/pingus/components/slider_box.hpp +--- a/src/pingus/components/slider_box.hpp ++++ b/src/pingus/components/slider_box.hpp @@ -17,7 +17,7 @@ #ifndef HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP #define HEADER_PINGUS_PINGUS_COMPONENTS_SLIDER_BOX_HPP @@ -273,8 +273,8 @@ index ae4d92406..75118eac2 100644 SliderBox (const SliderBox&); diff --git a/src/pingus/config_manager.hpp b/src/pingus/config_manager.hpp index b07b83e65..4cf08e046 100644 ---- src/pingus/config_manager.hpp -+++ src/pingus/config_manager.hpp +--- a/src/pingus/config_manager.hpp ++++ b/src/pingus/config_manager.hpp @@ -17,7 +17,7 @@ #ifndef HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP #define HEADER_PINGUS_PINGUS_CONFIG_MANAGER_HPP @@ -355,8 +355,8 @@ index b07b83e65..4cf08e046 100644 ConfigManager (const ConfigManager&); diff --git a/src/pingus/screens/option_menu.hpp b/src/pingus/screens/option_menu.hpp index 60b1578d2..154ef0f69 100644 ---- src/pingus/screens/option_menu.hpp -+++ src/pingus/screens/option_menu.hpp +--- a/src/pingus/screens/option_menu.hpp ++++ b/src/pingus/screens/option_menu.hpp @@ -17,7 +17,7 @@ #ifndef HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP #define HEADER_PINGUS_PINGUS_SCREENS_OPTION_MENU_HPP diff --git a/srcpkgs/pingus/patches/scons-use-python3-print.patch b/srcpkgs/pingus/patches/scons-use-python3-print.patch index ab3daa0e201..7e682c1930e 100644 --- a/srcpkgs/pingus/patches/scons-use-python3-print.patch +++ b/srcpkgs/pingus/patches/scons-use-python3-print.patch @@ -5,8 +5,8 @@ Bug-Debian: https://bugs.debian.org/947574 Index: pingus/SConscript =================================================================== ---- SConscript -+++ SConscript +--- a/SConscript ++++ b/SConscript @@ -126,12 +126,12 @@ class Project: def configure_end(self): self.env = self.conf.Finish() diff --git a/srcpkgs/pingus/template b/srcpkgs/pingus/template index a4f8d003f7f..8e126cf7466 100644 --- a/srcpkgs/pingus/template +++ b/srcpkgs/pingus/template @@ -14,7 +14,6 @@ homepage="https://pingus.seul.org/" distfiles="https://gitlab.com/pingus/pingus/-/archive/v${version}/pingus-v${version}.tar.gz" checksum=31cb2c0ecddd49dbe03535648e8c7c2971da469c52af52cdf9dc2459798342c8 nocross=yes -patch_args=-Np0 do_build() { # XXX: defining CXXFLAGS breaks dependency detection. diff --git a/srcpkgs/pioneer/patches/endian.patch b/srcpkgs/pioneer/patches/endian.patch index 695d367a223..1f4a6a00a76 100644 --- a/srcpkgs/pioneer/patches/endian.patch +++ b/srcpkgs/pioneer/patches/endian.patch @@ -6,8 +6,8 @@ Date: Sun Jan 5 22:02:18 2020 +0100 diff --git src/PngWriter.cpp src/PngWriter.cpp index 76bfb0e..5908480 100644 ---- src/PngWriter.cpp -+++ src/PngWriter.cpp +--- a/src/PngWriter.cpp ++++ b/src/PngWriter.cpp @@ -10,7 +10,7 @@ void write_png(FileSystem::FileSourceFS &fs, const std::string &path, const Uint // Set up the pixel format color masks for RGB(A) byte arrays. Uint32 rmask, gmask, bmask, amask; diff --git a/srcpkgs/pioneer/patches/ppc.patch b/srcpkgs/pioneer/patches/ppc.patch index c1e6b7ee7d3..dd2a57fa3b4 100644 --- a/srcpkgs/pioneer/patches/ppc.patch +++ b/srcpkgs/pioneer/patches/ppc.patch @@ -1,5 +1,5 @@ ---- contrib/profiler/Profiler.h -+++ contrib/profiler/Profiler.h +--- a/contrib/profiler/Profiler.h ++++ b/contrib/profiler/Profiler.h @@ -11,7 +11,7 @@ #undef fastcall diff --git a/srcpkgs/pioneer/template b/srcpkgs/pioneer/template index c4b81ba6968..40812890ec7 100644 --- a/srcpkgs/pioneer/template +++ b/srcpkgs/pioneer/template @@ -16,7 +16,6 @@ license="GPL-3.0-or-later" homepage="https://pioneerspacesim.net" distfiles="https://github.com/pioneerspacesim/pioneer/archive/${version}.tar.gz" checksum=fcbc57374123b44161e9d15d97bd950255f654a222840894f50bfc2be716ea68 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" pioneer-modelcompiler" diff --git a/srcpkgs/pipenightdreams/patches/fix-new.patch b/srcpkgs/pipenightdreams/patches/fix-new.patch index 3f782495565..37c7910dfdb 100644 --- a/srcpkgs/pipenightdreams/patches/fix-new.patch +++ b/srcpkgs/pipenightdreams/patches/fix-new.patch @@ -1,5 +1,5 @@ ---- src/hash.cpp 2015-10-09 12:01:04.628050936 +0200 -+++ src/hash.cpp 2015-10-09 12:02:04.248055234 +0200 +--- a/src/hash.cpp 2015-10-09 12:01:04.628050936 +0200 ++++ b/src/hash.cpp 2015-10-09 12:02:04.248055234 +0200 @@ -58,7 +58,7 @@ Hash::Hash(int bs){ int i; diff --git a/srcpkgs/pipenightdreams/patches/fix-no-initializers.patch b/srcpkgs/pipenightdreams/patches/fix-no-initializers.patch index fa375f8e127..37c0974fdbe 100644 --- a/srcpkgs/pipenightdreams/patches/fix-no-initializers.patch +++ b/srcpkgs/pipenightdreams/patches/fix-no-initializers.patch @@ -1,7 +1,7 @@ Setting default values in c++ function bodies is wrong. ---- src/str.cpp 2002-01-17 20:56:42.000000000 +0100 -+++ src/str.cpp 2015-10-09 11:49:16.152999859 +0200 +--- a/src/str.cpp 2002-01-17 20:56:42.000000000 +0100 ++++ b/src/str.cpp 2015-10-09 11:49:16.152999859 +0200 @@ -11,7 +11,7 @@ const char Str::nul = '\0'; @@ -29,8 +29,8 @@ Setting default values in c++ function bodies is wrong. if (case_sensitive){ return (!strcmp(s, str->s)); } ---- src/pipe.cpp 2002-01-21 05:08:13.000000000 +0100 -+++ src/pipe.cpp 2015-10-09 11:52:00.066011676 +0200 +--- a/src/pipe.cpp 2002-01-21 05:08:13.000000000 +0100 ++++ b/src/pipe.cpp 2015-10-09 11:52:00.066011676 +0200 @@ -43,11 +43,11 @@ return !(full_level>0) && !fixed; } @@ -45,8 +45,8 @@ Setting default values in c++ function bodies is wrong. this->bonus=bonus; } ---- src/pointer.cpp 2002-01-17 20:56:41.000000000 +0100 -+++ src/pointer.cpp 2015-10-09 11:53:08.399016602 +0200 +--- a/src/pointer.cpp 2002-01-17 20:56:41.000000000 +0100 ++++ b/src/pointer.cpp 2015-10-09 11:53:08.399016602 +0200 @@ -17,7 +17,7 @@ #include "pointer.h" @@ -56,8 +56,8 @@ Setting default values in c++ function bodies is wrong. this->row=row; this->column=column; this->moved_flag=true; ---- src/score.cpp 2002-01-17 20:56:42.000000000 +0100 -+++ src/score.cpp 2015-10-09 11:54:15.372021431 +0200 +--- a/src/score.cpp 2002-01-17 20:56:42.000000000 +0100 ++++ b/src/score.cpp 2015-10-09 11:54:15.372021431 +0200 @@ -18,7 +18,7 @@ #include "score.h" #include <math.h> @@ -67,8 +67,8 @@ Setting default values in c++ function bodies is wrong. this->value=value; delta=0; changed=true; ---- src/list.cpp 2002-01-17 20:56:35.000000000 +0100 -+++ src/list.cpp 2015-10-09 11:57:17.844034586 +0200 +--- a/src/list.cpp 2002-01-17 20:56:35.000000000 +0100 ++++ b/src/list.cpp 2015-10-09 11:57:17.844034586 +0200 @@ -125,7 +125,7 @@ return (insert(indexOf(i), obj)); } @@ -87,8 +87,8 @@ Setting default values in c++ function bodies is wrong. while (!isEmpty()) remove(getFirst(), del); } ---- src/hash.cpp 2002-01-17 20:56:30.000000000 +0100 -+++ src/hash.cpp 2015-10-09 11:59:00.879042014 +0200 +--- a/src/hash.cpp 2002-01-17 20:56:30.000000000 +0100 ++++ b/src/hash.cpp 2015-10-09 11:59:00.879042014 +0200 @@ -55,7 +55,7 @@ return(sum % nbuckets); } @@ -116,8 +116,8 @@ Setting default values in c++ function bodies is wrong. int i; List * list; for (i=0;i<nbuckets;i++){ ---- src/image.cpp 2002-01-17 20:56:32.000000000 +0100 -+++ src/image.cpp 2015-10-09 12:00:23.067047939 +0200 +--- a/src/image.cpp 2002-01-17 20:56:32.000000000 +0100 ++++ b/src/image.cpp 2015-10-09 12:00:23.067047939 +0200 @@ -19,7 +19,7 @@ #include "SDL_image.h" #include <stdio.h> @@ -127,8 +127,8 @@ Setting default values in c++ function bodies is wrong. if (filename) load(filename); } ---- src/eventmanager.cpp 2002-01-17 20:56:26.000000000 +0100 -+++ src/eventmanager.cpp 2015-10-09 12:04:50.991067255 +0200 +--- a/src/eventmanager.cpp 2002-01-17 20:56:26.000000000 +0100 ++++ b/src/eventmanager.cpp 2015-10-09 12:04:50.991067255 +0200 @@ -40,7 +40,7 @@ lista_streams->remove(lista_streams->indexOf(s)); } @@ -138,8 +138,8 @@ Setting default values in c++ function bodies is wrong. SDL_Event event; Index * stream; bool got=false; ---- src/graphic.cpp 2002-01-17 20:56:29.000000000 +0100 -+++ src/graphic.cpp 2015-10-09 12:06:15.212073327 +0200 +--- a/src/graphic.cpp 2002-01-17 20:56:29.000000000 +0100 ++++ b/src/graphic.cpp 2015-10-09 12:06:15.212073327 +0200 @@ -44,11 +44,11 @@ if (pixels) free(pixels); } diff --git a/srcpkgs/pipenightdreams/patches/fix-no-inline.patch b/srcpkgs/pipenightdreams/patches/fix-no-inline.patch index 99460a473c8..66af94faefe 100644 --- a/srcpkgs/pipenightdreams/patches/fix-no-inline.patch +++ b/srcpkgs/pipenightdreams/patches/fix-no-inline.patch @@ -1,5 +1,5 @@ ---- src/pointer.h 2002-01-17 20:56:41.000000000 +0100 -+++ src/pointer.h 2015-10-09 12:08:16.918082101 +0200 +--- a/src/pointer.h 2002-01-17 20:56:41.000000000 +0100 ++++ b/src/pointer.h 2015-10-09 12:08:16.918082101 +0200 @@ -43,11 +43,11 @@ friend class Board; @@ -17,8 +17,8 @@ Str * image_name; Image * ima; ---- src/player.h 2002-01-17 20:56:40.000000000 +0100 -+++ src/player.h 2015-10-09 12:14:04.855107185 +0200 +--- a/src/player.h 2002-01-17 20:56:40.000000000 +0100 ++++ b/src/player.h 2015-10-09 12:14:04.855107185 +0200 @@ -47,8 +47,8 @@ void setStartRowColumn(int row, int column); void setBoard(Board * bd); diff --git a/srcpkgs/pipenightdreams/template b/srcpkgs/pipenightdreams/template index a8de6c96d19..baf9b32f95d 100644 --- a/srcpkgs/pipenightdreams/template +++ b/srcpkgs/pipenightdreams/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="https://www.libsdl.org/projects/pipenightdreams" distfiles="${homepage}/packages/${pkgname}-${version}.tar.bz2" checksum=302f8ce6e0eb32ebd779700527095cf086c2c7132d47095bae9a43c346245541 -patch_args=-Np0 pre_configure() { find . -type f -exec sed -i "{}" -e "s;/games/;/;g" \; diff --git a/srcpkgs/pipewire/patches/6df32666b4.patch b/srcpkgs/pipewire/patches/6df32666b4.patch index 8eea42116ad..ea42982b704 100644 --- a/srcpkgs/pipewire/patches/6df32666b4.patch +++ b/srcpkgs/pipewire/patches/6df32666b4.patch @@ -12,8 +12,8 @@ demonic filter work again. diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c index b1e727069..bb346b6d8 100644 ---- src/modules/module-filter-chain.c -+++ src/modules/module-filter-chain.c +--- a/src/modules/module-filter-chain.c ++++ b/src/modules/module-filter-chain.c @@ -972,16 +972,6 @@ static int parse_link(struct graph *graph, struct spa_json *json) pw_log_error("unknown input port %s", input); return -ENOENT; diff --git a/srcpkgs/pipewire/patches/autostart-media-session.patch b/srcpkgs/pipewire/patches/autostart-media-session.patch index 9e2b92b9a66..bb107435cdd 100644 --- a/srcpkgs/pipewire/patches/autostart-media-session.patch +++ b/srcpkgs/pipewire/patches/autostart-media-session.patch @@ -2,8 +2,8 @@ Upstream's config does not autostart pipewire-media-session anymore, which is an essential component. It's not easy to start it externally in a script since it needs the pipewire socket up, and Void doesn't have a mechanism to ensure it (systemd socket activation). ---- src/daemon/pipewire.conf.in.orig 2021-03-18 17:45:02.025992827 +0100 -+++ src/daemon/pipewire.conf.in 2021-03-18 17:47:17.606999440 +0100 +--- a/src/daemon/pipewire.conf.in 2021-03-18 17:45:02.025992827 +0100 ++++ b/src/daemon/pipewire.conf.in 2021-03-18 17:47:17.606999440 +0100 @@ -204,7 +204,7 @@ # but it is better to start it as a systemd service. # Run the session manager with -h for options. diff --git a/srcpkgs/pipewire/patches/fix-neon-detection.patch b/srcpkgs/pipewire/patches/fix-neon-detection.patch index e3ef144250c..597a4a3d30c 100644 --- a/srcpkgs/pipewire/patches/fix-neon-detection.patch +++ b/srcpkgs/pipewire/patches/fix-neon-detection.patch @@ -3,8 +3,8 @@ https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/235 diff --git meson.build meson.build index 29b4b892..0d048a1f 100644 ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -99,36 +99,16 @@ have_avx = cc.has_argument(avx_args) have_avx2 = cc.has_argument(avx2_args) diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index ac6ce7fffd6..43e3c1cfc9b 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -19,7 +19,6 @@ homepage="https://pipewire.org/" changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz" checksum=1d9271e121a5049aef379e9bb7c50524faa6f971e668806637d7b9df1b7cab88 -patch_args=-Np0 build_options="sdl2" diff --git a/srcpkgs/pjproject/patches/no-third-party.patch b/srcpkgs/pjproject/patches/no-third-party.patch index 46724eb5834..6594d023d0d 100644 --- a/srcpkgs/pjproject/patches/no-third-party.patch +++ b/srcpkgs/pjproject/patches/no-third-party.patch @@ -1,5 +1,5 @@ ---- third_party/build/os-linux.mak -+++ third_party/build/os-linux.mak +--- a/third_party/build/os-linux.mak ++++ b/third_party/build/os-linux.mak @@ -1,9 +1,9 @@ -DIRS += gsm -DIRS += ilbc diff --git a/srcpkgs/pjproject/template b/srcpkgs/pjproject/template index 041dd40b504..c94ead90e9d 100644 --- a/srcpkgs/pjproject/template +++ b/srcpkgs/pjproject/template @@ -24,7 +24,6 @@ license="GPL-2.0-or-later" homepage="http://www.pjsip.org/pjsua.htm" distfiles="http://www.pjsip.org/release/${version}/${pkgname}-${version}.tar.bz2" checksum=503d0bd7f9f13dc1492ac9b71b761b1089851fbb608b9a13996edc3c42006f79 -patch_args=-Np0 pre_configure() { export LD="${CC}" diff --git a/srcpkgs/plasma-desktop/patches/no-discover-recommendation.patch b/srcpkgs/plasma-desktop/patches/no-discover-recommendation.patch index c2c50bc46c3..77dc1f6273d 100644 --- a/srcpkgs/plasma-desktop/patches/no-discover-recommendation.patch +++ b/srcpkgs/plasma-desktop/patches/no-discover-recommendation.patch @@ -2,8 +2,8 @@ We don't ship Discover and the taskmanager doesn't check if the defaults even exist and having a not working link by default in the taskbar is well, useless. --- ---- applets/taskmanager/package/contents/config/main.xml 2020-09-17 13:26:23.000000000 +0200 -+++ - 2020-09-18 17:24:15.772878765 +0200 +--- a/applets/taskmanager/package/contents/config/main.xml 2020-09-17 13:26:23.000000000 +0200 ++++ b/applets/taskmanager/package/contents/config/main.xml 2020-09-17 13:26:23.000000000 +0200 @@ -77,7 +77,7 @@ </entry> <entry name="launchers" type="StringList"> diff --git a/srcpkgs/plasma-desktop/template b/srcpkgs/plasma-desktop/template index eeaf614bca9..4ec04abb501 100644 --- a/srcpkgs/plasma-desktop/template +++ b/srcpkgs/plasma-desktop/template @@ -21,4 +21,3 @@ distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=9be7d61a042b5d74c1a65ecc8101c81390d45c2fec766b5115d5924b5dac0972 replaces="user-manager>=0" python_version=3 -patch_args=-Np0 diff --git a/srcpkgs/plasma-framework/patches/GLESv2.patch b/srcpkgs/plasma-framework/patches/GLESv2.patch index 6ab612e65a1..a3ea973cee3 100644 --- a/srcpkgs/plasma-framework/patches/GLESv2.patch +++ b/srcpkgs/plasma-framework/patches/GLESv2.patch @@ -1,7 +1,7 @@ diff --git src/declarativeimports/core/CMakeLists.txt src/declarativeimports/core/CMakeLists.txt index 1d97bb5..bdf3240 100644 ---- src/declarativeimports/core/CMakeLists.txt -+++ src/declarativeimports/core/CMakeLists.txt +--- a/src/declarativeimports/core/CMakeLists.txt ++++ b/src/declarativeimports/core/CMakeLists.txt @@ -60,7 +60,7 @@ if(HAVE_EGL) endif() diff --git a/srcpkgs/plasma-framework/template b/srcpkgs/plasma-framework/template index bf8ac20852e..fd0eff95f4e 100644 --- a/srcpkgs/plasma-framework/template +++ b/srcpkgs/plasma-framework/template @@ -16,7 +16,6 @@ license="LGPL-2.1-or-later" homepage="https://invent.kde.org/frameworks/plasma-framework" distfiles="${KDE_SITE}/frameworks/${version%.*}/${pkgname}-${version}.tar.xz" checksum=7adf5f77d7ecf6a45626e7a329c941f6bfe21154b2ff9c6c943727b0e68f145d -patch_args=-Np0 do_check() { cd build diff --git a/srcpkgs/plasma-workspace/patches/dbus.patch b/srcpkgs/plasma-workspace/patches/dbus.patch index addb3011260..e4388b3b2ce 100644 --- a/srcpkgs/plasma-workspace/patches/dbus.patch +++ b/srcpkgs/plasma-workspace/patches/dbus.patch @@ -1,5 +1,5 @@ ---- ./login-sessions/plasmax11.desktop.cmake 2020-05-14 12:53:54.000000000 +0200 -+++ - 2020-05-20 14:39:34.856212360 +0200 +--- a/login-sessions/plasmax11.desktop.cmake 2020-05-14 12:53:54.000000000 +0200 ++++ b/login-sessions/plasmax11.desktop.cmake 2020-05-14 12:53:54.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Type=XSession diff --git a/srcpkgs/plasma-workspace/template b/srcpkgs/plasma-workspace/template index fe6fdbf2843..049bc5c1f28 100644 --- a/srcpkgs/plasma-workspace/template +++ b/srcpkgs/plasma-workspace/template @@ -24,7 +24,6 @@ license="GPL-2.0-or-later, GFDL-1.2-or-later, LGPL-2.1-or-later" homepage="https://invent.kde.org/plasma/plasma-workspace" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-${version}.tar.xz" checksum=61ad5adab412c935ae156c4de3f38d1e2640752c95100ad6996b9e51e8539725 -patch_args=-Np0 build_options="pipewire" build_options_default="pipewire" diff --git a/srcpkgs/plex-media-player/patches/fix-opengl-cb-api-usage.patch b/srcpkgs/plex-media-player/patches/fix-opengl-cb-api-usage.patch index 53010d9fc32..fb22e7f9f51 100644 --- a/srcpkgs/plex-media-player/patches/fix-opengl-cb-api-usage.patch +++ b/srcpkgs/plex-media-player/patches/fix-opengl-cb-api-usage.patch @@ -2,8 +2,8 @@ The opengl-cb interface has been retired; patch in libmpv usage. https://github.com/plexinc/plex-media-player/issues/997 https://github.com/plexinc/plex-media-player/pull/999 ---- src/player/PlayerComponent.cpp -+++ src/player/PlayerComponent.cpp +--- a/src/player/PlayerComponent.cpp ++++ b/src/player/PlayerComponent.cpp @@ -259,7 +259,7 @@ void PlayerComponent::setQtQuickWindow(QQuickWindow* window) /////////////////////////////////////////////////////////////////////////////////////////////////// void PlayerComponent::setWindow(QQuickWindow* window) @@ -22,8 +22,8 @@ https://github.com/plexinc/plex-media-player/pull/999 setQtQuickWindow(window); } ---- src/player/PlayerQuickItem.cpp -+++ src/player/PlayerQuickItem.cpp +--- a/src/player/PlayerQuickItem.cpp ++++ b/src/player/PlayerQuickItem.cpp @@ -11,6 +11,8 @@ #include <QtQuick/QQuickWindow> #include <QOpenGLFunctions> @@ -133,8 +133,8 @@ https://github.com/plexinc/plex-media-player/pull/999 connect(player, &PlayerComponent::windowVisible, this, &QQuickItem::setVisible); window()->update(); } ---- src/player/PlayerQuickItem.h -+++ src/player/PlayerQuickItem.h +--- a/src/player/PlayerQuickItem.h ++++ b/src/player/PlayerQuickItem.h @@ -6,7 +6,7 @@ #include <QOpenGLFramebufferObject> diff --git a/srcpkgs/plex-media-player/patches/qt5-append-header.patch b/srcpkgs/plex-media-player/patches/qt5-append-header.patch index 02ef423ec6c..898f7a32113 100644 --- a/srcpkgs/plex-media-player/patches/qt5-append-header.patch +++ b/srcpkgs/plex-media-player/patches/qt5-append-header.patch @@ -1,5 +1,5 @@ ---- src/player/CodecsComponent.cpp 2020-05-19 19:32:23.000000000 +0200 -+++ src/player/CodecsComponent.cpp 2020-07-28 08:00:34.966060781 +0200 +--- a/src/player/CodecsComponent.cpp 2020-05-19 19:32:23.000000000 +0200 ++++ b/src/player/CodecsComponent.cpp 2020-07-28 08:00:34.966060781 +0200 @@ -684,9 +684,11 @@ { Downloader::HeaderList headers; diff --git a/srcpkgs/plex-media-player/template b/srcpkgs/plex-media-player/template index e2b23f24dfe..830d09f8579 100644 --- a/srcpkgs/plex-media-player/template +++ b/srcpkgs/plex-media-player/template @@ -38,7 +38,6 @@ skip_extraction="buildid-${_buildid_version}.cmake web-client-desktop-${_clientdesktop_version}.tar.xz.sha1 web-client-tv-${_clienttv_version}.tar.xz web-client-tv-${_clienttv_version}.tar.xz.sha1" -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel qt5-host-tools" diff --git a/srcpkgs/plib/patches/CVE-2011-4620.diff b/srcpkgs/plib/patches/CVE-2011-4620.diff index 920580c6c02..b41b22bd9ac 100644 --- a/srcpkgs/plib/patches/CVE-2011-4620.diff +++ b/srcpkgs/plib/patches/CVE-2011-4620.diff @@ -1,5 +1,5 @@ ---- src/util/ulError.cxx -+++ src/util/ulError.cxx +--- a/src/util/ulError.cxx ++++ b/src/util/ulError.cxx @@ -39,7 +39,7 @@ { va_list argp; diff --git a/srcpkgs/plib/patches/CVE-2012-4552.diff b/srcpkgs/plib/patches/CVE-2012-4552.diff index a6d34bfddfa..00a75985e4e 100644 --- a/srcpkgs/plib/patches/CVE-2012-4552.diff +++ b/srcpkgs/plib/patches/CVE-2012-4552.diff @@ -1,6 +1,6 @@ diff -up plib-1.8.5/src/ssg/ssgParser.cxx~ plib-1.8.5/src/ssg/ssgParser.cxx ---- src/ssg/ssgParser.cxx~ 2008-03-11 03:06:23.000000000 +0100 -+++ src/ssg/ssgParser.cxx 2012-11-01 15:33:12.424483374 +0100 +--- a/src/ssg/ssgParser.cxx~ 2008-03-11 03:06:23.000000000 +0100 ++++ b/src/ssg/ssgParser.cxx 2012-11-01 15:33:12.424483374 +0100 @@ -57,18 +57,16 @@ void _ssgParser::error( const char *form char msgbuff[ 255 ]; va_list argp; diff --git a/srcpkgs/plib/patches/musl-ushort.patch b/srcpkgs/plib/patches/musl-ushort.patch index e04e6b60ca3..38ca65ed247 100644 --- a/srcpkgs/plib/patches/musl-ushort.patch +++ b/srcpkgs/plib/patches/musl-ushort.patch @@ -1,5 +1,5 @@ ---- src/ssg/ssgLoadFLT.cxx 2008-03-11 03:06:23.000000000 +0100 -+++ src/ssg/ssgLoadFLT.cxx 2015-10-31 15:45:55.426989776 +0100 +--- a/src/ssg/ssgLoadFLT.cxx 2008-03-11 03:06:23.000000000 +0100 ++++ b/src/ssg/ssgLoadFLT.cxx 2015-10-31 15:45:55.426989776 +0100 @@ -142,7 +142,7 @@ typedef unsigned char ubyte; diff --git a/srcpkgs/plib/patches/plib-1.8.5-shared-libs.patch b/srcpkgs/plib/patches/plib-1.8.5-shared-libs.patch index a6a261a65f3..86ba3340b6b 100644 --- a/srcpkgs/plib/patches/plib-1.8.5-shared-libs.patch +++ b/srcpkgs/plib/patches/plib-1.8.5-shared-libs.patch @@ -1,6 +1,6 @@ diff -ru ./configure.in ./configure.in ---- ./configure.in 2008-03-11 03:09:43.000000000 +0100 -+++ ./configure.in 2010-07-02 05:27:45.478055160 +0200 +--- a/configure.in 2008-03-11 03:09:43.000000000 +0100 ++++ b/configure.in 2010-07-02 05:27:45.478055160 +0200 @@ -36,7 +36,7 @@ AC_PROG_CXX AC_PROG_CXXCPP @@ -11,8 +11,8 @@ diff -ru ./configure.in ./configure.in dnl Command line arguments diff -ru ./src/fnt/Makefile.am ./src/fnt/Makefile.am ---- ./src/fnt/Makefile.am 2008-03-11 03:06:20.000000000 +0100 -+++ ./src/fnt/Makefile.am 2010-07-02 06:17:35.838107988 +0200 +--- a/src/fnt/Makefile.am 2008-03-11 03:06:20.000000000 +0100 ++++ b/src/fnt/Makefile.am 2010-07-02 06:17:35.838107988 +0200 @@ -1,10 +1,13 @@ if BUILD_FNT @@ -30,8 +30,8 @@ diff -ru ./src/fnt/Makefile.am ./src/fnt/Makefile.am INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util diff -ru ./src/js/Makefile.am ./src/js/Makefile.am ---- ./src/js/Makefile.am 2008-03-11 03:06:21.000000000 +0100 -+++ ./src/js/Makefile.am 2010-07-02 06:12:40.559441988 +0200 +--- a/src/js/Makefile.am 2008-03-11 03:06:21.000000000 +0100 ++++ b/src/js/Makefile.am 2010-07-02 06:12:40.559441988 +0200 @@ -1,10 +1,13 @@ if BUILD_JS @@ -49,14 +49,14 @@ diff -ru ./src/js/Makefile.am ./src/js/Makefile.am jsNone.cxx diff -ru ./src/Makefile.am ./src/Makefile.am ---- ./src/Makefile.am 2008-03-11 03:06:24.000000000 +0100 -+++ ./src/Makefile.am 2010-07-02 06:38:53.486390426 +0200 +--- a/src/Makefile.am 2008-03-11 03:06:24.000000000 +0100 ++++ b/src/Makefile.am 2010-07-02 06:38:53.486390426 +0200 @@ -1 +1 @@ -SUBDIRS = util js sl pui puAux sg ssg fnt ssgAux net psl pw +SUBDIRS = util js sl fnt pui sg ssg puAux ssgAux net psl pw diff -ru ./src/net/Makefile.am ./src/net/Makefile.am ---- ./src/net/Makefile.am 2008-03-11 03:06:20.000000000 +0100 -+++ ./src/net/Makefile.am 2010-07-02 06:14:40.710350074 +0200 +--- a/src/net/Makefile.am 2008-03-11 03:06:20.000000000 +0100 ++++ b/src/net/Makefile.am 2010-07-02 06:14:40.710350074 +0200 @@ -1,11 +1,14 @@ if BUILD_NET @@ -75,8 +75,8 @@ diff -ru ./src/net/Makefile.am ./src/net/Makefile.am INCLUDES = -I$(top_srcdir)/src/util diff -ru ./src/psl/Makefile.am ./src/psl/Makefile.am ---- ./src/psl/Makefile.am 2008-03-11 03:06:24.000000000 +0100 -+++ ./src/psl/Makefile.am 2010-07-02 06:13:48.314158343 +0200 +--- a/src/psl/Makefile.am 2008-03-11 03:06:24.000000000 +0100 ++++ b/src/psl/Makefile.am 2010-07-02 06:13:48.314158343 +0200 @@ -1,11 +1,14 @@ if BUILD_PSL @@ -95,8 +95,8 @@ diff -ru ./src/psl/Makefile.am ./src/psl/Makefile.am pslExpression.cxx pslProgram.cxx pslDump.cxx \ pslError.cxx pslFileIO.cxx pslCompiler.h \ diff -ru ./src/puAux/Makefile.am ./src/puAux/Makefile.am ---- ./src/puAux/Makefile.am 2008-03-11 03:06:20.000000000 +0100 -+++ ./src/puAux/Makefile.am 2010-07-02 06:16:04.001410273 +0200 +--- a/src/puAux/Makefile.am 2008-03-11 03:06:20.000000000 +0100 ++++ b/src/puAux/Makefile.am 2010-07-02 06:16:04.001410273 +0200 @@ -1,10 +1,13 @@ if BUILD_PUAUX @@ -114,8 +114,8 @@ diff -ru ./src/puAux/Makefile.am ./src/puAux/Makefile.am puAuxBiSliderWithEnds.cxx \ puAuxComboBox.cxx \ diff -ru ./src/pui/Makefile.am ./src/pui/Makefile.am ---- ./src/pui/Makefile.am 2008-03-11 03:06:23.000000000 +0100 -+++ ./src/pui/Makefile.am 2010-07-02 06:14:25.110128517 +0200 +--- a/src/pui/Makefile.am 2008-03-11 03:06:23.000000000 +0100 ++++ b/src/pui/Makefile.am 2010-07-02 06:14:25.110128517 +0200 @@ -1,10 +1,13 @@ if BUILD_PUI @@ -133,8 +133,8 @@ diff -ru ./src/pui/Makefile.am ./src/pui/Makefile.am puArrowButton.cxx puDialogBox.cxx puFrame.cxx puGroup.cxx \ puInput.cxx puInterface.cxx puLocal.h puMenuBar.cxx \ diff -ru ./src/pw/Makefile.am ./src/pw/Makefile.am ---- ./src/pw/Makefile.am 2008-03-11 03:06:20.000000000 +0100 -+++ ./src/pw/Makefile.am 2010-07-02 05:27:45.487123738 +0200 +--- a/src/pw/Makefile.am 2008-03-11 03:06:20.000000000 +0100 ++++ b/src/pw/Makefile.am 2010-07-02 05:27:45.487123738 +0200 @@ -1,10 +1,11 @@ if BUILD_PW @@ -150,8 +150,8 @@ diff -ru ./src/pw/Makefile.am ./src/pw/Makefile.am INCLUDES = -I$(top_srcdir)/src/util diff -ru ./src/sg/Makefile.am ./src/sg/Makefile.am ---- ./src/sg/Makefile.am 2008-03-11 03:06:20.000000000 +0100 -+++ ./src/sg/Makefile.am 2010-07-02 06:16:21.526342543 +0200 +--- a/src/sg/Makefile.am 2008-03-11 03:06:20.000000000 +0100 ++++ b/src/sg/Makefile.am 2010-07-02 06:16:21.526342543 +0200 @@ -1,10 +1,13 @@ if BUILD_SG @@ -169,8 +169,8 @@ diff -ru ./src/sg/Makefile.am ./src/sg/Makefile.am sgPerlinNoise.cxx diff -ru ./src/sl/Makefile.am ./src/sl/Makefile.am ---- ./src/sl/Makefile.am 2008-03-11 03:06:24.000000000 +0100 -+++ ./src/sl/Makefile.am 2010-07-02 06:12:48.165324370 +0200 +--- a/src/sl/Makefile.am 2008-03-11 03:06:24.000000000 +0100 ++++ b/src/sl/Makefile.am 2010-07-02 06:12:48.165324370 +0200 @@ -1,16 +1,20 @@ if BUILD_SL @@ -196,8 +196,8 @@ diff -ru ./src/sl/Makefile.am ./src/sl/Makefile.am INCLUDES = -I$(top_srcdir)/src/util diff -ru ./src/ssg/Makefile.am ./src/ssg/Makefile.am ---- ./src/ssg/Makefile.am 2008-03-11 03:06:23.000000000 +0100 -+++ ./src/ssg/Makefile.am 2010-07-02 06:13:29.638301515 +0200 +--- a/src/ssg/Makefile.am 2008-03-11 03:06:23.000000000 +0100 ++++ b/src/ssg/Makefile.am 2010-07-02 06:13:29.638301515 +0200 @@ -1,10 +1,13 @@ if BUILD_SSG @@ -215,8 +215,8 @@ diff -ru ./src/ssg/Makefile.am ./src/ssg/Makefile.am ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \ ssgLoadDOF.cxx ssgLoadAC.cxx \ diff -ru ./src/ssgAux/Makefile.am ./src/ssgAux/Makefile.am ---- ./src/ssgAux/Makefile.am 2008-03-11 03:06:21.000000000 +0100 -+++ ./src/ssgAux/Makefile.am 2010-07-02 06:17:02.592635791 +0200 +--- a/src/ssgAux/Makefile.am 2008-03-11 03:06:21.000000000 +0100 ++++ b/src/ssgAux/Makefile.am 2010-07-02 06:17:02.592635791 +0200 @@ -1,6 +1,6 @@ if BUILD_SSGAUX @@ -238,8 +238,8 @@ diff -ru ./src/ssgAux/Makefile.am ./src/ssgAux/Makefile.am ssgaPatch.cxx \ ssgaParticleSystem.cxx \ diff -ru ./src/util/Makefile.am ./src/util/Makefile.am ---- ./src/util/Makefile.am 2008-03-11 03:06:23.000000000 +0100 -+++ ./src/util/Makefile.am 2010-07-02 05:34:06.711150524 +0200 +--- a/src/util/Makefile.am 2008-03-11 03:06:23.000000000 +0100 ++++ b/src/util/Makefile.am 2010-07-02 05:34:06.711150524 +0200 @@ -1,10 +1,11 @@ if BUILD_UL diff --git a/srcpkgs/plib/template b/srcpkgs/plib/template index c212ec3dd70..cde1e8335d2 100644 --- a/srcpkgs/plib/template +++ b/srcpkgs/plib/template @@ -12,7 +12,6 @@ license="LGPL-2.0-or-later" homepage="http://plib.sourceforge.net" distfiles="http://plib.sourceforge.net/dist/plib-${version}.tar.gz" checksum=485b22bf6fdc0da067e34ead5e26f002b76326f6371e2ae006415dea6a380a32 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/plocate/patches/musl.patch b/srcpkgs/plocate/patches/musl.patch index c75020f99b3..a75e18b4ce1 100644 --- a/srcpkgs/plocate/patches/musl.patch +++ b/srcpkgs/plocate/patches/musl.patch @@ -1,5 +1,5 @@ ---- conf.cpp -+++ conf.cpp +--- a/conf.cpp ++++ b/conf.cpp @@ -479,7 +479,7 @@ if (conf_scan_root != NULL) error(EXIT_FAILURE, 0, _("--%s specified twice"), @@ -9,8 +9,8 @@ if (conf_scan_root == NULL) error(EXIT_FAILURE, errno, _("invalid value `%s' of --%s"), optarg, "database-root"); ---- database-builder.h -+++ database-builder.h +--- a/database-builder.h ++++ b/database-builder.h @@ -3,6 +3,7 @@ #include "db.h" diff --git a/srcpkgs/plocate/template b/srcpkgs/plocate/template index fa184f7b94c..58252651243 100644 --- a/srcpkgs/plocate/template +++ b/srcpkgs/plocate/template @@ -15,7 +15,6 @@ homepage="https://plocate.sesse.net/" changelog="https://git.sesse.net/?p=plocate;a=blob_plain;f=NEWS;hb=HEAD" distfiles="https://plocate.sesse.net/download/plocate-${version}.tar.gz" checksum=13002f065c28a93623a03d44c911a44f1659e8b1841aad80fd8a566a1200f43c -patch_args=-Np0 system_accounts="_plocate" diff --git a/srcpkgs/plotutils/patches/plotutils-2.6-libpng-1.5.patch b/srcpkgs/plotutils/patches/plotutils-2.6-libpng-1.5.patch index 8a10d19e560..7c0216618a3 100644 --- a/srcpkgs/plotutils/patches/plotutils-2.6-libpng-1.5.patch +++ b/srcpkgs/plotutils/patches/plotutils-2.6-libpng-1.5.patch @@ -1,7 +1,7 @@ fix building with libpng-1.5 ---- libplot/z_write.c -+++ libplot/z_write.c +--- a/libplot/z_write.c ++++ b/libplot/z_write.c @@ -164,7 +164,7 @@ } diff --git a/srcpkgs/plotutils/template b/srcpkgs/plotutils/template index b047906f96c..6b64353081b 100644 --- a/srcpkgs/plotutils/template +++ b/srcpkgs/plotutils/template @@ -10,7 +10,6 @@ license="GPL-3" homepage="http://directory.fsf.org/wiki/Plotutils" distfiles="${GNU_SITE}/plotutils/plotutils-${version}.tar.gz" checksum=4f4222820f97ca08c7ea707e4c53e5a3556af4d8f1ab51e0da6ff1627ff433ab -patch_args=-Np0 plotutils-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/plume-creator/patches/qt5.13.patch b/srcpkgs/plume-creator/patches/qt5.13.patch index bf543ff6ca0..644a7f52adc 100644 --- a/srcpkgs/plume-creator/patches/qt5.13.patch +++ b/srcpkgs/plume-creator/patches/qt5.13.patch @@ -1,5 +1,5 @@ ---- src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100 -+++ - 2019-11-18 02:47:15.027471998 +0100 +--- a/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100 ++++ b/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100 @@ -1,5 +1,6 @@ #include "selectpage.h" #include "ui_selectpage.h" diff --git a/srcpkgs/plume-creator/template b/srcpkgs/plume-creator/template index 86bd3b86ee4..3c415a06cdd 100644 --- a/srcpkgs/plume-creator/template +++ b/srcpkgs/plume-creator/template @@ -20,7 +20,6 @@ distfiles=" checksum=" f88f9524184bcf60dae855d6ad37899aefa39de0edd56098e93ce3b97b679e0c 7d473ee7283bc311c7d4dd3311d1e7726df7d45fa0123894265f355b436298e1" -patch_args=-Np0 post_extract() { mv -f ${wrksrc}/../debian ${wrksrc}/ diff --git a/srcpkgs/plymouth/patches/musl-rpmatch.patch b/srcpkgs/plymouth/patches/musl-rpmatch.patch index 353a425fbd7..7e677d73abd 100644 --- a/srcpkgs/plymouth/patches/musl-rpmatch.patch +++ b/srcpkgs/plymouth/patches/musl-rpmatch.patch @@ -1,5 +1,5 @@ ---- src/libply/ply-command-parser.c -+++ src/libply/ply-command-parser.c +--- a/src/libply/ply-command-parser.c ++++ b/src/libply/ply-command-parser.c @@ -33,6 +33,10 @@ #include "ply-list.h" #include "ply-utils.h" diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template index 9b15ecb110a..17f801fc531 100644 --- a/srcpkgs/plymouth/template +++ b/srcpkgs/plymouth/template @@ -19,7 +19,6 @@ license="GPL-2.0-or-later" homepage="https://www.freedesktop.org/wiki/Software/Plymouth/" distfiles="${FREEDESKTOP_SITE}/plymouth/releases/$pkgname-$version.tar.xz" checksum=ecae257f351d098340542a5bc06de029404c24dcee87e6ebb2abd5ef117fce86 -patch_args=-Np0 build_options="gtk3 pango" build_options_default="gtk3 pango" diff --git a/srcpkgs/pmount/patches/fix-musl.patch b/srcpkgs/pmount/patches/fix-musl.patch index 588bcdf9d65..005bf17202b 100644 --- a/srcpkgs/pmount/patches/fix-musl.patch +++ b/srcpkgs/pmount/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- src/utils.c.orig 2015-08-19 10:39:10.080521155 +0200 -+++ src/utils.c 2015-08-19 10:39:27.140521047 +0200 +--- a/src/utils.c 2015-08-19 10:39:10.080521155 +0200 ++++ b/src/utils.c 2015-08-19 10:39:27.140521047 +0200 @@ -22,6 +22,7 @@ #include <fcntl.h> #include <signal.h> diff --git a/srcpkgs/pmount/patches/pmount-f2fs.patch b/srcpkgs/pmount/patches/pmount-f2fs.patch index 02e6fcee9e8..9a93dd0b782 100644 --- a/srcpkgs/pmount/patches/pmount-f2fs.patch +++ b/srcpkgs/pmount/patches/pmount-f2fs.patch @@ -1,5 +1,5 @@ ---- src/fs.c 2009-09-14 22:54:54.000000000 +0200 -+++ src/fs.c.orig 2017-06-23 22:43:18.862270803 +0200 +--- a/src/fs.c 2009-09-14 22:54:54.000000000 +0200 ++++ b/src/fs.c.orig 2017-06-23 22:43:18.862270803 +0200 @@ -29,6 +29,7 @@ { "ext3", "nodev,noauto,nosuid,user,errors=remount-ro", 0, NULL, 0 }, { "ext2", "nodev,noauto,nosuid,user,errors=remount-ro", 0, NULL, 0 }, diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template index f4bb5a0939f..8a826f4e0fe 100644 --- a/srcpkgs/pmount/template +++ b/srcpkgs/pmount/template @@ -12,7 +12,6 @@ homepage="http://pmount.alioth.debian.org/" distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2" checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036 conf_files="/etc/pmount.allow" -patch_args=-Np0 post_patch() { vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure diff --git a/srcpkgs/png++/patches/fix-destdir.patch b/srcpkgs/png++/patches/fix-destdir.patch index 06827a117e2..2a454565c59 100644 --- a/srcpkgs/png++/patches/fix-destdir.patch +++ b/srcpkgs/png++/patches/fix-destdir.patch @@ -1,5 +1,5 @@ ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -54,8 +54,8 @@ uninstall: uninstall-headers uninstall-docs diff --git a/srcpkgs/png++/patches/musl-config.patch b/srcpkgs/png++/patches/musl-config.patch index b12a8aca605..dab7fa71a1a 100644 --- a/srcpkgs/png++/patches/musl-config.patch +++ b/srcpkgs/png++/patches/musl-config.patch @@ -1,5 +1,5 @@ ---- config.hpp 2015-10-25 20:42:45.000000000 +0100 -+++ config.hpp 2018-11-07 12:52:38.903453133 +0100 +--- a/config.hpp 2015-10-25 20:42:45.000000000 +0100 ++++ b/config.hpp 2018-11-07 12:52:38.903453133 +0100 @@ -34,7 +34,7 @@ #include <stdlib.h> diff --git a/srcpkgs/png++/template b/srcpkgs/png++/template index 01788d947b4..b156d606308 100644 --- a/srcpkgs/png++/template +++ b/srcpkgs/png++/template @@ -13,7 +13,6 @@ license="BSD-3-Clause" homepage="https://www.nongnu.org/pngpp" distfiles="${NONGNU_SITE}/pngpp/${pkgname}-${version}.tar.gz" checksum=998af216ab16ebb88543fbaa2dbb9175855e944775b66f2996fc945c8444eee1 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/pokoy/patches/build.patch b/srcpkgs/pokoy/patches/build.patch index 436217e37a3..2bbf51e06bb 100644 --- a/srcpkgs/pokoy/patches/build.patch +++ b/srcpkgs/pokoy/patches/build.patch @@ -1,5 +1,5 @@ ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -1,8 +1,8 @@ VERSION = 0.2.5 CC ?= gcc diff --git a/srcpkgs/pokoy/template b/srcpkgs/pokoy/template index f66ffc35c3f..490067f7d9f 100644 --- a/srcpkgs/pokoy/template +++ b/srcpkgs/pokoy/template @@ -11,4 +11,3 @@ license="GPL-2.0-only" homepage="https://github.com/ttygde/pokoy" distfiles="https://github.com/ttygde/pokoy/archive/v${version}.tar.gz" checksum=ae3ee5935e503d1f48f7fc8e4df2071e9d4586a52dfe778ef643deb28ca6a22f -patch_args=-Np0 diff --git a/srcpkgs/polkit-kde-agent/patches/cross.patch b/srcpkgs/polkit-kde-agent/patches/cross.patch index 1ae7572d3b8..5a211fbbdfb 100644 --- a/srcpkgs/polkit-kde-agent/patches/cross.patch +++ b/srcpkgs/polkit-kde-agent/patches/cross.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt 2018-07-31 15:01:17.000000000 +0200 -+++ - 2018-08-27 14:42:14.094150559 +0200 +--- a/CMakeLists.txt 2018-07-31 15:01:17.000000000 +0200 ++++ b/CMakeLists.txt 2018-07-31 15:01:17.000000000 +0200 @@ -49,6 +49,12 @@ find_package(PolkitQt5-1 REQUIRED 0.103.0) @@ -13,8 +13,8 @@ include_directories( ${POLKITQT-1_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ---- CMakeLists.txt 2018-08-27 14:58:54.560731243 +0200 -+++ - 2018-08-27 15:02:03.578280015 +0200 +--- a/CMakeLists.txt 2018-08-27 14:58:54.560731243 +0200 ++++ b/CMakeLists.txt 2018-08-27 14:58:54.560731243 +0200 @@ -82,7 +81,8 @@ KF5::I18n KF5::Crash diff --git a/srcpkgs/polkit-kde-agent/template b/srcpkgs/polkit-kde-agent/template index 2d383314caa..a9182b185f1 100644 --- a/srcpkgs/polkit-kde-agent/template +++ b/srcpkgs/polkit-kde-agent/template @@ -14,4 +14,3 @@ license="GPL-2.0-or-later" homepage="https://commits.kde.org/polkit-kde-agent" distfiles="${KDE_SITE}/plasma/${version}/${pkgname}-1-${version}.tar.xz" checksum=de9a6f1bdf434d013a8d6f0c1498257bc4a48349e652375b4dd036eb161214ee -patch_args=-Np0 diff --git a/srcpkgs/polkit/patches/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch b/srcpkgs/polkit/patches/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch index b3f15472d7d..c4bea97d19f 100644 --- a/srcpkgs/polkit/patches/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch +++ b/srcpkgs/polkit/patches/a04d13affe0fa53ff618e07aa8f57f4c0e3b9b81.patch @@ -10,8 +10,8 @@ initial values returned if error caught diff --git a/src/polkit/polkitsystembusname.c b/src/polkit/polkitsystembusname.c index 8daa12c..8ed1363 100644 ---- src/polkit/polkitsystembusname.c -+++ src/polkit/polkitsystembusname.c +--- a/src/polkit/polkitsystembusname.c ++++ b/src/polkit/polkitsystembusname.c @@ -435,6 +435,9 @@ polkit_system_bus_name_get_creds_sync (PolkitSystemBusName *system_bus while (!((data.retrieved_uid && data.retrieved_pid) || data.caught_error)) g_main_context_iteration (tmp_context, TRUE); diff --git a/srcpkgs/polkit/patches/fix-elogind.patch b/srcpkgs/polkit/patches/fix-elogind.patch index 449ca42cdc0..41b4156bba7 100644 --- a/srcpkgs/polkit/patches/fix-elogind.patch +++ b/srcpkgs/polkit/patches/fix-elogind.patch @@ -14,8 +14,8 @@ HAVE_LIBSYSTEMD is true. diff --git configure.ac configure.ac index 36df239..da47ecb 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [ AC_SUBST(LIBSYSTEMD_CFLAGS) diff --git a/srcpkgs/polkit/patches/make-innetgr-optional.patch b/srcpkgs/polkit/patches/make-innetgr-optional.patch index e1e4e9ae255..d135fd985af 100644 --- a/srcpkgs/polkit/patches/make-innetgr-optional.patch +++ b/srcpkgs/polkit/patches/make-innetgr-optional.patch @@ -1,5 +1,5 @@ ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -99,7 +99,7 @@ AC_CHECK_LIB(expat,XML_ParserCreate,[EXPAT_LIBS="-lexpat"], [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) AC_SUBST(EXPAT_LIBS) @@ -9,8 +9,8 @@ if test "x$GCC" = "xyes"; then LDFLAGS="-Wl,--as-needed $LDFLAGS" ---- src/polkitbackend/polkitbackendinteractiveauthority.c -+++ src/polkitbackend/polkitbackendinteractiveauthority.c +--- a/src/polkitbackend/polkitbackendinteractiveauthority.c ++++ b/src/polkitbackend/polkitbackendinteractiveauthority.c @@ -2228,6 +2228,7 @@ get_users_in_net_group (PolkitIdentity *group, ret = NULL; name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group)); @@ -48,8 +48,8 @@ return ret; } ---- src/polkitbackend/polkitbackendjsauthority.cpp -+++ src/polkitbackend/polkitbackendjsauthority.cpp +--- a/src/polkitbackend/polkitbackendjsauthority.cpp ++++ b/src/polkitbackend/polkitbackendjsauthority.cpp @@ -1502,6 +1502,7 @@ JS::CallArgs args = JS::CallArgsFromVp (argc, vp); diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template index 0fc0d667eb2..01d31d7dc6a 100644 --- a/srcpkgs/polkit/template +++ b/srcpkgs/polkit/template @@ -22,7 +22,6 @@ checksum=6d54e984e7072339f0d3147179e16e34e5fe0705158f259a765d772dcf78956b system_accounts="polkitd" #replaces="polkit-elogind>=0" #provides="polkit-elogind-${version}_${revision}" -patch_args=-Np0 # Package build options build_options="gir" diff --git a/srcpkgs/polygen/patches/ocaml-4.05.patch b/srcpkgs/polygen/patches/ocaml-4.05.patch index 8703d8c5ad2..ae089ba6973 100644 --- a/srcpkgs/polygen/patches/ocaml-4.05.patch +++ b/srcpkgs/polygen/patches/ocaml-4.05.patch @@ -1,5 +1,5 @@ ---- src/check.ml -+++ src/check.ml +--- a/src/check.ml ++++ b/src/check.ml @@ -37,7 +37,7 @@ let of_labels labels = List.fold_left (fun lbs lb -> add (lb, None) lbs) empty labels
diff --git a/srcpkgs/polygen/template b/srcpkgs/polygen/template index 20c1f27c303..22811a9f7b9 100644 --- a/srcpkgs/polygen/template +++ b/srcpkgs/polygen/template @@ -12,7 +12,6 @@ homepage="http://www.polygen.org" distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz" checksum=60dbcec8aedcbb2545202ad97d41e592f232b8fc842ea25a7998c88a385148d5 nocross=yes -patch_args=-Np0 do_check() { : diff --git a/srcpkgs/portaudio/patches/audacity-compat.patch b/srcpkgs/portaudio/patches/audacity-compat.patch index ef3b7a48241..a5a27cfc82a 100644 --- a/srcpkgs/portaudio/patches/audacity-compat.patch +++ b/srcpkgs/portaudio/patches/audacity-compat.patch @@ -5,8 +5,8 @@ Reason: Audacity needs Pa_GetStreamHostApiType to use system wide portaudio diff --git configure.in configure.in index 13816fb..83c239a 100644 ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -420,6 +420,7 @@ case "${host_os}" in DLL_LIBS="$DLL_LIBS -lossaudio" LIBS="$LIBS -lossaudio" @@ -19,7 +19,7 @@ diff --git include/pa_unix_oss.h include/pa_unix_oss.h new file mode 100644 index 0000000..64e04cb --- /dev/null -+++ include/pa_unix_oss.h ++++ b/include/pa_unix_oss.h @@ -0,0 +1,104 @@ +#ifndef PA_UNIX_OSS_H +#define PA_UNIX_OSS_H @@ -127,8 +127,8 @@ index 0000000..64e04cb +#endif diff --git include/pa_win_ds.h include/pa_win_ds.h index 5d38641..ba1c245 100644 ---- include/pa_win_ds.h -+++ include/pa_win_ds.h +--- a/include/pa_win_ds.h ++++ b/include/pa_win_ds.h @@ -86,6 +86,21 @@ typedef struct PaWinDirectSoundStreamInfo{ }PaWinDirectSoundStreamInfo; @@ -153,8 +153,8 @@ index 5d38641..ba1c245 100644 #ifdef __cplusplus diff --git include/portaudio.h include/portaudio.h index 8a94aaf..9c8a295 100644 ---- include/portaudio.h -+++ include/portaudio.h +--- a/include/portaudio.h ++++ b/include/portaudio.h @@ -1197,6 +1197,15 @@ signed long Pa_GetStreamReadAvailable( PaStream* stream ); signed long Pa_GetStreamWriteAvailable( PaStream* stream ); @@ -173,8 +173,8 @@ index 8a94aaf..9c8a295 100644 diff --git src/common/pa_front.c src/common/pa_front.c index 188cee9..52f44a6 100644 ---- src/common/pa_front.c -+++ src/common/pa_front.c +--- a/src/common/pa_front.c ++++ b/src/common/pa_front.c @@ -1257,8 +1257,10 @@ PaError Pa_OpenStream( PaStream** stream, hostApiInputParametersPtr, hostApiOutputParametersPtr, sampleRate, framesPerBuffer, streamFlags, streamCallback, userData ); @@ -222,8 +222,8 @@ index 188cee9..52f44a6 100644 { diff --git src/common/pa_stream.c src/common/pa_stream.c index 03a0ee6..c4376f9 100644 ---- src/common/pa_stream.c -+++ src/common/pa_stream.c +--- a/src/common/pa_stream.c ++++ b/src/common/pa_stream.c @@ -93,6 +93,8 @@ void PaUtil_InitializeStreamRepresentation( PaUtilStreamRepresentation *streamRe streamRepresentation->streamInfo.inputLatency = 0.; streamRepresentation->streamInfo.outputLatency = 0.; @@ -235,8 +235,8 @@ index 03a0ee6..c4376f9 100644 diff --git src/common/pa_stream.h src/common/pa_stream.h index 678e2ad..70572c7 100644 ---- src/common/pa_stream.h -+++ src/common/pa_stream.h +--- a/src/common/pa_stream.h ++++ b/src/common/pa_stream.h @@ -152,6 +152,7 @@ typedef struct PaUtilStreamRepresentation { PaStreamFinishedCallback *streamFinishedCallback; void *userData; @@ -247,8 +247,8 @@ index 678e2ad..70572c7 100644 diff --git src/hostapi/alsa/pa_linux_alsa.c src/hostapi/alsa/pa_linux_alsa.c index 584cde8..558fb3d 100644 ---- src/hostapi/alsa/pa_linux_alsa.c -+++ src/hostapi/alsa/pa_linux_alsa.c +--- a/src/hostapi/alsa/pa_linux_alsa.c ++++ b/src/hostapi/alsa/pa_linux_alsa.c @@ -621,6 +621,7 @@ typedef struct StreamDirection streamDir; @@ -299,8 +299,8 @@ index 584cde8..558fb3d 100644 return result; diff --git src/hostapi/coreaudio/pa_mac_core_blocking.c src/hostapi/coreaudio/pa_mac_core_blocking.c index 679c6ba..a69e085 100644 ---- src/hostapi/coreaudio/pa_mac_core_blocking.c -+++ src/hostapi/coreaudio/pa_mac_core_blocking.c +--- a/src/hostapi/coreaudio/pa_mac_core_blocking.c ++++ b/src/hostapi/coreaudio/pa_mac_core_blocking.c @@ -66,6 +66,9 @@ #ifdef MOSX_USE_NON_ATOMIC_FLAG_BITS # define OSAtomicOr32( a, b ) ( (*(b)) |= (a) ) @@ -313,8 +313,8 @@ index 679c6ba..a69e085 100644 #endif diff --git src/hostapi/oss/pa_unix_oss.c src/hostapi/oss/pa_unix_oss.c index 51e9630..f257d80 100644 ---- src/hostapi/oss/pa_unix_oss.c -+++ src/hostapi/oss/pa_unix_oss.c +--- a/src/hostapi/oss/pa_unix_oss.c ++++ b/src/hostapi/oss/pa_unix_oss.c @@ -2043,3 +2043,26 @@ error: #endif } diff --git a/srcpkgs/portaudio/patches/sndio.patch b/srcpkgs/portaudio/patches/sndio.patch index 7e43e3fcedd..b34cb7328b8 100644 --- a/srcpkgs/portaudio/patches/sndio.patch +++ b/srcpkgs/portaudio/patches/sndio.patch @@ -1,7 +1,7 @@ diff --git Makefile.in Makefile.in index 5e1a764..2747f73 100644 ---- Makefile.in -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -44,7 +44,7 @@ PALIB = libportaudio.la PAINC = include/portaudio.h @@ -21,8 +21,8 @@ index 5e1a764..2747f73 100644 src/hostapi/wmme \ diff --git configure.in configure.in index 83c239a..db11d65 100644 ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -24,6 +24,10 @@ AC_ARG_WITH(alsa, AS_HELP_STRING([--with-alsa], [Enable support for ALSA @<:@autodetect@:>@]), [with_alsa=$withval]) @@ -69,8 +69,8 @@ index 83c239a..db11d65 100644 ]) diff --git include/portaudio.h include/portaudio.h index 9c8a295..e535a02 100644 ---- include/portaudio.h -+++ include/portaudio.h +--- a/include/portaudio.h ++++ b/include/portaudio.h @@ -287,7 +287,8 @@ typedef enum PaHostApiTypeId paWDMKS=11, paJACK=12, @@ -85,7 +85,7 @@ diff --git src/hostapi/sndio/pa_sndio.c src/hostapi/sndio/pa_sndio.c new file mode 100644 index 0000000..725ef47 --- /dev/null -+++ src/hostapi/sndio/pa_sndio.c ++++ b/src/hostapi/sndio/pa_sndio.c @@ -0,0 +1,768 @@ +/* + * Copyright (c) 2009 Alexandre Ratchov <alex@caoua.org> @@ -857,8 +857,8 @@ index 0000000..725ef47 +} diff --git src/os/unix/pa_unix_hostapis.c src/os/unix/pa_unix_hostapis.c index a9b4a05..f10ced1 100644 ---- src/os/unix/pa_unix_hostapis.c -+++ src/os/unix/pa_unix_hostapis.c +--- a/src/os/unix/pa_unix_hostapis.c ++++ b/src/os/unix/pa_unix_hostapis.c @@ -44,6 +44,7 @@ PaError PaJack_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index ); diff --git a/srcpkgs/portaudio/template b/srcpkgs/portaudio/template index eaaacb9b299..7032f8da9d4 100644 --- a/srcpkgs/portaudio/template +++ b/srcpkgs/portaudio/template @@ -14,7 +14,6 @@ homepage="http://www.portaudio.com" distfiles="http://www.${pkgname}.com/archives/pa_stable_v${version%.*}_${version#*.}.tgz" checksum=f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 disable_parallel_build=yes -patch_args=-Np0 # sndio disabled by default: non-upstream patch build_options="sndio" diff --git a/srcpkgs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch b/srcpkgs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch index 28520d9cb48..dee61c628d2 100644 --- a/srcpkgs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch +++ b/srcpkgs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch @@ -1,5 +1,5 @@ ---- CMakeLists.txt.old 2010-08-03 21:46:45.000000000 +0100 -+++ CMakeLists.txt 2010-08-03 21:50:17.000000000 +0100 +--- a/CMakeLists.txt.old 2010-08-03 21:46:45.000000000 +0100 ++++ b/CMakeLists.txt 2010-08-03 21:50:17.000000000 +0100 @@ -65,6 +65,8 @@ endif(CMAKE_LIBRARY_OUTPUT_DIRECTORY MATCHES ${BAD_DIR}) endif(UNIX) @@ -20,8 +20,8 @@ + add_subdirectory(pm_java) +endif(PORTMIDI_ENABLE_JAVA) ---- pm_common/CMakeLists.txt.old 2010-10-01 13:33:52.000000000 +0100 -+++ pm_common/CMakeLists.txt 2010-10-01 14:02:55.000000000 +0100 +--- a/pm_common/CMakeLists.txt.old 2010-10-01 13:33:52.000000000 +0100 ++++ b/pm_common/CMakeLists.txt 2010-10-01 14:02:55.000000000 +0100 @@ -62,19 +62,23 @@ ${COREMIDI_LIB} ${CORESERVICES_LIB} CACHE INTERNAL "") @@ -124,8 +124,8 @@ # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here # INSTALL(FILES portmidi.h ../porttime/porttime.h # DESTINATION /usr/local/include) ---- pm_dylib/CMakeLists.txt 2010-10-01 13:33:56.000000000 +0100 -+++ pm_dylib/CMakeLists.txt 2010-10-11 15:13:47.000000000 +0100 +--- a/pm_dylib/CMakeLists.txt 2010-10-01 13:33:56.000000000 +0100 ++++ b/pm_dylib/CMakeLists.txt 2010-10-11 15:13:47.000000000 +0100 @@ -63,7 +63,8 @@ message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT}) else(APPLE) @@ -195,8 +195,8 @@ - DESTINATION /usr/local/include) + DESTINATION include) endif(UNIX) ---- pm_java/CMakeLists.txt.old 2010-08-03 21:47:24.000000000 +0100 -+++ pm_java/CMakeLists.txt 2010-08-03 22:03:54.000000000 +0100 +--- a/pm_java/CMakeLists.txt.old 2010-08-03 21:47:24.000000000 +0100 ++++ b/pm_java/CMakeLists.txt 2010-08-03 22:03:54.000000000 +0100 @@ -39,9 +39,9 @@ # install the libraries (Linux only) diff --git a/srcpkgs/portmidi/patches/portmidi-217-python-setup.py.patch b/srcpkgs/portmidi/patches/portmidi-217-python-setup.py.patch index 17783af8903..5ae4add89d5 100644 --- a/srcpkgs/portmidi/patches/portmidi-217-python-setup.py.patch +++ b/srcpkgs/portmidi/patches/portmidi-217-python-setup.py.patch @@ -1,5 +1,5 @@ ---- pm_python/setup.py.old 2010-11-05 14:43:04.000000000 +0000 -+++ pm_python/setup.py 2010-11-05 17:40:26.000000000 +0000 +--- a/pm_python/setup.py.old 2010-11-05 14:43:04.000000000 +0000 ++++ b/pm_python/setup.py 2010-11-05 17:40:26.000000000 +0000 @@ -173,7 +173,8 @@ EXTENSION = dict( ext_modules=[ diff --git a/srcpkgs/portmidi/template b/srcpkgs/portmidi/template index 88906d95e14..e3afd5cd831 100644 --- a/srcpkgs/portmidi/template +++ b/srcpkgs/portmidi/template @@ -17,7 +17,6 @@ license="MIT" homepage="http://portmedia.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/portmedia/${pkgname}/${version}/${pkgname}-src-${version}.zip" checksum=08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f -patch_args=-Np0 post_install() { ln -s libportmidi.so ${DESTDIR}/usr/lib/libporttime.so diff --git a/srcpkgs/posixovl/patches/musl.patch b/srcpkgs/posixovl/patches/musl.patch index 654c2de4255..67dcef2e2a6 100644 --- a/srcpkgs/posixovl/patches/musl.patch +++ b/srcpkgs/posixovl/patches/musl.patch @@ -3,8 +3,8 @@ On musl-based systems, <string.h> causes redefintions --- diff --git posixovl.c posixovl.c index ae64f21..04e41fb 100644 ---- posixovl.c -+++ posixovl.c +--- a/posixovl.c ++++ b/posixovl.c @@ -30,7 +30,9 @@ #include <stdbool.h> #include <stdio.h> diff --git a/srcpkgs/posixovl/template b/srcpkgs/posixovl/template index 221b61c832b..1146191fcf8 100644 --- a/srcpkgs/posixovl/template +++ b/srcpkgs/posixovl/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="https://sourceforge.net/projects/posixovl/" distfiles="${SOURCEFORGE_SITE}/posixovl/files/${pkgname}-${version}.tar.xz" checksum=a827798b02c0f27b37d8a10502e76c21adac43b887a49e7234e8d27668f62e72 -patch_args=-Np0 diff --git a/srcpkgs/postfix/patches/postfix-install-dont-overwrite-path.patch b/srcpkgs/postfix/patches/postfix-install-dont-overwrite-path.patch index cd5ae250e7c..85683a93c7b 100644 --- a/srcpkgs/postfix/patches/postfix-install-dont-overwrite-path.patch +++ b/srcpkgs/postfix/patches/postfix-install-dont-overwrite-path.patch @@ -1,5 +1,5 @@ ---- postfix-install.orig 2012-01-31 16:18:56.687116320 +0100 -+++ postfix-install 2012-01-31 16:19:00.198032219 +0100 +--- a/postfix-install 2012-01-31 16:18:56.687116320 +0100 ++++ b/postfix-install 2012-01-31 16:19:00.198032219 +0100 @@ -168,7 +168,7 @@ # By now, shells must have functions. Ultrix users must use sh5 or lose. diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index 7eef653977d..80d321fb726 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -11,7 +11,6 @@ license="IPL-1.0, EPL-2.0" homepage="http://www.postfix.org/" distfiles="http://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz" checksum=20a805625601e7b95989220832c8fa14ce374f0711da054188f8cec6a92fd71c -patch_args=-Np0 system_accounts="postfix" postfix_homedir="/var/spool/postfix" diff --git a/srcpkgs/postgresql/patches/pg_config-cross-value.patch b/srcpkgs/postgresql/patches/pg_config-cross-value.patch index 67e3aabde0e..214344520d7 100644 --- a/srcpkgs/postgresql/patches/pg_config-cross-value.patch +++ b/srcpkgs/postgresql/patches/pg_config-cross-value.patch @@ -5,8 +5,8 @@ Upstream: No - Second part would un-usable for Windows diff --git src/common/Makefile src/common/Makefile index ec04710..2af845f 100644 ---- src/common/Makefile -+++ src/common/Makefile +--- a/src/common/Makefile ++++ b/src/common/Makefile @@ -22,11 +22,14 @@ include $(top_builddir)/src/Makefile.global # don't include subdirectory-path-dependent -I and -L switches diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index f638aa7642e..3167e0657fe 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -22,7 +22,6 @@ distfiles="https://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${versio checksum=3d32cd101025a0556813397c69feff3df3d63736adb8adeaf365c522f39f2930 # initdb fails on github actions, works locally with xbps-uunshare make_check=ci-skip -patch_args=-Np0 conf_files=" /etc/default/${pkgname} diff --git a/srcpkgs/postgresql12/patches/pg_config-cross-value.patch b/srcpkgs/postgresql12/patches/pg_config-cross-value.patch index 65877ee1fef..4a5fea6cc86 100644 --- a/srcpkgs/postgresql12/patches/pg_config-cross-value.patch +++ b/srcpkgs/postgresql12/patches/pg_config-cross-value.patch @@ -5,8 +5,8 @@ Upstream: No - Second part would un-usable for Windows diff --git src/common/Makefile src/common/Makefile index ec04710..2af845f 100644 ---- src/common/Makefile -+++ src/common/Makefile +--- a/src/common/Makefile ++++ b/src/common/Makefile @@ -30,11 +30,14 @@ include $(top_builddir)/src/Makefile.global # don't include subdirectory-path-dependent -I and -L switches diff --git a/srcpkgs/postgresql12/patches/relocate.patch b/srcpkgs/postgresql12/patches/relocate.patch index 65bab8ad4c6..d2cc14281e3 100644 --- a/srcpkgs/postgresql12/patches/relocate.patch +++ b/srcpkgs/postgresql12/patches/relocate.patch @@ -6,8 +6,8 @@ Subject: [PATCH] relocate diff --git src/port/path.c src/port/path.c index 710988b..20dc57d 100644 ---- src/port/path.c -+++ src/port/path.c +--- a/src/port/path.c ++++ b/src/port/path.c @@ -544,6 +544,8 @@ make_relative_path(char *ret_path, const char *target_path, int tail_len; int i; diff --git a/srcpkgs/postgresql12/template b/srcpkgs/postgresql12/template index 5450b782873..02b9e6b1f79 100644 --- a/srcpkgs/postgresql12/template +++ b/srcpkgs/postgresql12/template @@ -23,7 +23,6 @@ homepage="https://www.postgresql.org" changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html" distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2" checksum=8490741f47c88edc8b6624af009ce19fda4dc9b31c4469ce2551d84075d5d995 -patch_args=-Np0 conf_files=" /${_prefix}/etc/default/postgresql diff --git a/srcpkgs/postgresql13/patches/pg_config-cross-value.patch b/srcpkgs/postgresql13/patches/pg_config-cross-value.patch index e16ae25a005..cc0a9fc1913 100644 --- a/srcpkgs/postgresql13/patches/pg_config-cross-value.patch +++ b/srcpkgs/postgresql13/patches/pg_config-cross-value.patch @@ -5,8 +5,8 @@ Upstream: No - Second part would un-usable for Windows diff --git src/common/Makefile src/common/Makefile index ec04710..2af845f 100644 ---- src/common/Makefile -+++ src/common/Makefile +--- a/src/common/Makefile ++++ b/src/common/Makefile @@ -30,10 +30,13 @@ include $(top_builddir)/src/Makefile.global # don't include subdirectory-path-dependent -I and -L switches diff --git a/srcpkgs/postgresql13/patches/relocate.patch b/srcpkgs/postgresql13/patches/relocate.patch index 65bab8ad4c6..d2cc14281e3 100644 --- a/srcpkgs/postgresql13/patches/relocate.patch +++ b/srcpkgs/postgresql13/patches/relocate.patch @@ -6,8 +6,8 @@ Subject: [PATCH] relocate diff --git src/port/path.c src/port/path.c index 710988b..20dc57d 100644 ---- src/port/path.c -+++ src/port/path.c +--- a/src/port/path.c ++++ b/src/port/path.c @@ -544,6 +544,8 @@ make_relative_path(char *ret_path, const char *target_path, int tail_len; int i; diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template index 1757cac0a3a..be54f0bafe4 100644 --- a/srcpkgs/postgresql13/template +++ b/srcpkgs/postgresql13/template @@ -23,7 +23,6 @@ homepage="https://www.postgresql.org" changelog="https://www.postgresql.org/docs/current/release-${version//./-}.html" distfiles="https://ftp.postgresql.org/pub/source/v${version}/postgresql-${version}.tar.bz2" checksum=3cd9454fa8c7a6255b6743b767700925ead1b9ab0d7a0f9dcb1151010f8eb4a1 -patch_args=-Np0 conf_files=" /${_prefix}/etc/default/postgresql diff --git a/srcpkgs/povray/patches/musl.patch b/srcpkgs/povray/patches/musl.patch index 693656b2f43..1abf7472a9c 100644 --- a/srcpkgs/povray/patches/musl.patch +++ b/srcpkgs/povray/patches/musl.patch @@ -1,5 +1,5 @@ ---- vfe/vfesession.h 2019-01-30 18:47:18.816545460 +0100 -+++ - 2019-01-30 18:50:31.169629844 +0100 +--- a/vfe/vfesession.h 2019-01-30 18:47:18.816545460 +0100 ++++ b/vfe/vfesession.h 2019-01-30 18:47:18.816545460 +0100 @@ -40,6 +40,8 @@ #include "base/image/colourspace.h" diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template index 20f0417c268..30a2baab203 100644 --- a/srcpkgs/povray/template +++ b/srcpkgs/povray/template @@ -20,7 +20,6 @@ checksum=53d11ebd2972fc452af168a00eb83aefb61387662c10784e81b63e44aa575de4 nocross="Builds fail on ARM architectures Logs are at https://travis-ci.org/void-linux/void-packages/builds/412583835." LDFLAGS+=" -Wl,-z,stack-size=1048576" -patch_args=-Np0 pre_configure() { cd $wrksrc/unix diff --git a/srcpkgs/powerpc-utils/patches/fix-endian_h.patch b/srcpkgs/powerpc-utils/patches/fix-endian_h.patch index 75dd274eb90..acf344ddbd9 100644 --- a/srcpkgs/powerpc-utils/patches/fix-endian_h.patch +++ b/srcpkgs/powerpc-utils/patches/fix-endian_h.patch @@ -1,5 +1,5 @@ ---- src/rtas_dbg.c 2018-12-15 01:18:13.000000000 +0100 -+++ src/rtas_dbg.c 2019-03-19 15:51:46.699643983 +0100 +--- a/src/rtas_dbg.c 2018-12-15 01:18:13.000000000 +0100 ++++ b/src/rtas_dbg.c 2019-03-19 15:51:46.699643983 +0100 @@ -29,6 +29,7 @@ #include <errno.h> #include <stdio.h> diff --git a/srcpkgs/powerpc-utils/patches/fix-limits_h.patch b/srcpkgs/powerpc-utils/patches/fix-limits_h.patch index 98cdc39b0c5..bdc1fd00bd1 100644 --- a/srcpkgs/powerpc-utils/patches/fix-limits_h.patch +++ b/srcpkgs/powerpc-utils/patches/fix-limits_h.patch @@ -1,5 +1,5 @@ ---- src/drmgr/drmig_chrp_pmig.c 2018-12-15 01:18:13.000000000 +0100 -+++ src/drmgr/drmig_chrp_pmig.c 2019-03-19 15:25:47.321563535 +0100 +--- a/src/drmgr/drmig_chrp_pmig.c 2018-12-15 01:18:13.000000000 +0100 ++++ b/src/drmgr/drmig_chrp_pmig.c 2019-03-19 15:25:47.321563535 +0100 @@ -26,6 +26,7 @@ #include <ctype.h> #include <sys/stat.h> diff --git a/srcpkgs/powerpc-utils/template b/srcpkgs/powerpc-utils/template index f33782a127d..e975d94658a 100644 --- a/srcpkgs/powerpc-utils/template +++ b/srcpkgs/powerpc-utils/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/ibm-power-utilities/powerpc-utils" distfiles="https://github.com/ibm-power-utilities/powerpc-utils/archive/v${version}.tar.gz" checksum=bb48758bca3b9d056141b522e700218ee4e814b517aadf5a01f53b970ad1d3c3 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args+=" --with-librtas ac_cv_lib_rtasevent_parse_rtas_event=yes" diff --git a/srcpkgs/powertop/patches/musl-fix-headers.patch b/srcpkgs/powertop/patches/musl-fix-headers.patch index a94dc361e60..fb0631b3fa2 100644 --- a/srcpkgs/powertop/patches/musl-fix-headers.patch +++ b/srcpkgs/powertop/patches/musl-fix-headers.patch @@ -1,5 +1,5 @@ ---- src/devices/devfreq.h.orig -+++ src/devices/devfreq.h +--- a/src/devices/devfreq.h ++++ b/src/devices/devfreq.h @@ -25,6 +25,7 @@ #ifndef _INCLUDE_GUARD_DEVFREQ_H #define _INCLUDE_GUARD_DEVFREQ_H @@ -10,8 +10,8 @@ diff --git a/src/perf/perf.h b/src/perf/perf.h index ee072ae06d24..932588a684f9 100644 ---- src/perf/perf.h.orig -+++ src/perf/perf.h +--- a/src/perf/perf.h ++++ b/src/perf/perf.h @@ -26,6 +26,7 @@ #define _INCLUDE_GUARD_PERF_H_ diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template index 2c9c25319c6..d0841935e7f 100644 --- a/srcpkgs/powertop/template +++ b/srcpkgs/powertop/template @@ -11,4 +11,3 @@ license="GPL-2.0-only" homepage="https://01.org/powertop/" distfiles="https://01.org/sites/default/files/downloads/powertop-${version}.tar.gz" checksum=a65f992ca4a419bc73b623651060eb9fc00c5a86fa03556358cd9db011ef3178 -patch_args=-Np0 diff --git a/srcpkgs/ppp/patches/musl.patch b/srcpkgs/ppp/patches/musl.patch index 7ed236180aa..d0ad4f7f399 100644 --- a/srcpkgs/ppp/patches/musl.patch +++ b/srcpkgs/ppp/patches/musl.patch @@ -1,7 +1,7 @@ /* Ethernet frame types according to RFC 2516 */ #define ETH_PPPOE_DISCOVERY 0x8863 ---- include/net/ppp_defs.h.orig 2015-05-10 11:09:54.505127657 +0200 -+++ include/net/ppp_defs.h 2015-05-10 11:10:10.753309024 +0200 +--- a/include/net/ppp_defs.h 2015-05-10 11:09:54.505127657 +0200 ++++ b/include/net/ppp_defs.h 2015-05-10 11:10:10.753309024 +0200 @@ -38,6 +38,8 @@ #ifndef _PPP_DEFS_H_ #define _PPP_DEFS_H_ diff --git a/srcpkgs/ppp/patches/openssl_include.patch b/srcpkgs/ppp/patches/openssl_include.patch index 11284e42ecf..72fd115f9ec 100644 --- a/srcpkgs/ppp/patches/openssl_include.patch +++ b/srcpkgs/ppp/patches/openssl_include.patch @@ -1,5 +1,5 @@ ---- pppd/pppcrypt.h.orig -+++ pppd/pppcrypt.h +--- a/pppd/pppcrypt.h ++++ b/pppd/pppcrypt.h @@ -38,7 +38,7 @@ #endif diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template index c59d266437f..8f597b56516 100644 --- a/srcpkgs/ppp/template +++ b/srcpkgs/ppp/template @@ -25,7 +25,6 @@ conf_files=" /etc/ppp/options /etc/ppp/chap-secrets /etc/ppp/pap-secrets" -patch_args=-Np0 do_configure() { ./configure --prefix=/usr --cc="${CC}" --cflags="${CFLAGS}" diff --git a/srcpkgs/pps-tools/patches/makefile-DESTDIR.patch b/srcpkgs/pps-tools/patches/makefile-DESTDIR.patch index 21f995372d2..ff468cfb834 100644 --- a/srcpkgs/pps-tools/patches/makefile-DESTDIR.patch +++ b/srcpkgs/pps-tools/patches/makefile-DESTDIR.patch @@ -26,8 +26,8 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> diff --git a/Makefile b/Makefile index 9394668..30672f7 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -19,8 +19,8 @@ include .depend endif diff --git a/srcpkgs/pps-tools/patches/ppsfind-fixes.patch b/srcpkgs/pps-tools/patches/ppsfind-fixes.patch index e61975d4a47..a6b0355fd14 100644 --- a/srcpkgs/pps-tools/patches/ppsfind-fixes.patch +++ b/srcpkgs/pps-tools/patches/ppsfind-fixes.patch @@ -12,8 +12,8 @@ Signed-off-by: Alexander GQ Gerasiov <gq@cs.msu.su> diff --git a/ppsfind b/ppsfind index 2ff7abc..adbcab9 100644 ---- ppsfind -+++ ppsfind +--- a/ppsfind ++++ b/ppsfind @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh diff --git a/srcpkgs/pps-tools/patches/ppswatch-signal.patch b/srcpkgs/pps-tools/patches/ppswatch-signal.patch index 4212131bcce..f8f3509bce3 100644 --- a/srcpkgs/pps-tools/patches/ppswatch-signal.patch +++ b/srcpkgs/pps-tools/patches/ppswatch-signal.patch @@ -29,8 +29,8 @@ Signed-off-by: Konrad Gräfe <konradgraefe@aol.com> diff --git a/ppswatch.c b/ppswatch.c index eb0500c..5c6202b 100644 ---- ppswatch.c -+++ ppswatch.c +--- a/ppswatch.c ++++ b/ppswatch.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ diff --git a/srcpkgs/pps-tools/template b/srcpkgs/pps-tools/template index 459a701ff5d..2227ed811c0 100644 --- a/srcpkgs/pps-tools/template +++ b/srcpkgs/pps-tools/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="http://linuxpps.org/" distfiles="https://github.com/ago/pps-tools/archive/v${version}.tar.gz" checksum=1a7efd66152e5439b69143f1f380b40ac5decbbbef516b37a017410b8ba7dff4 -patch_args=-Np0 pps-tools-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/ppsspp/patches/unittest.patch b/srcpkgs/ppsspp/patches/unittest.patch index e97e9efb10f..dcba4a60746 100644 --- a/srcpkgs/ppsspp/patches/unittest.patch +++ b/srcpkgs/ppsspp/patches/unittest.patch @@ -1,5 +1,5 @@ ---- unittest/TestVertexJit.cpp 2021-03-09 23:26:11.430146058 +0100 -+++ - 2021-03-09 23:30:50.634618762 +0100 +--- a/unittest/TestVertexJit.cpp 2021-03-09 23:26:11.430146058 +0100 ++++ b/unittest/TestVertexJit.cpp 2021-03-09 23:26:11.430146058 +0100 @@ -15,6 +15,7 @@ // Official git repository and contact information can be found at // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/. @@ -8,8 +8,8 @@ #include "Common/Common.h" #include "Common/TimeUtil.h" #include "Core/Config.h" ---- CMakeLists.txt 2021-03-02 21:50:51.000000000 +0100 -+++ - 2021-03-09 23:37:13.803584455 +0100 +--- a/CMakeLists.txt 2021-03-02 21:50:51.000000000 +0100 ++++ b/CMakeLists.txt 2021-03-02 21:50:51.000000000 +0100 @@ -2100,6 +2100,7 @@ if(UNITTEST) diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template index eee3c9fe1a1..eaf14bc7cf1 100644 --- a/srcpkgs/ppsspp/template +++ b/srcpkgs/ppsspp/template @@ -36,7 +36,6 @@ checksum="503f046fa68e4be24d08822b0aa2280e653ad513d9a12c77a59809467b95c516 f8a03906135fb6f2932b80b7ef5991f39ccac46b36ec3690776fb38c69775c3d 20fe5dbd7a64f7a8fdbaeb81f8dd485df61121c5054e0f7f917c6193f209ff2e 6819f0984fa647f69a74831a2333859a07099f64098ce58c35d8604d19532d3d" -patch_args=-Np0 # ppsspp always tries to compile x86 unittest # https://gist.github.com/Johnnynator/e18d59274451cff890b7235009d2e93d diff --git a/srcpkgs/pptpclient/patches/musl.patch b/srcpkgs/pptpclient/patches/musl.patch index a5990ff85ac..58a0ce2f386 100644 --- a/srcpkgs/pptpclient/patches/musl.patch +++ b/srcpkgs/pptpclient/patches/musl.patch @@ -1,7 +1,7 @@ diff --git ppp_fcs.c ppp_fcs.c index 8822691..70ae09b 100644 ---- ppp_fcs.c -+++ ppp_fcs.c +--- a/ppp_fcs.c ++++ b/ppp_fcs.c @@ -27,7 +27,7 @@ * u16 represents an unsigned 16-bit number. Adjust the typedef for * your hardware. @@ -13,8 +13,8 @@ index 8822691..70ae09b 100644 * FCS lookup table as calculated by the table generator. diff --git ppp_fcs.h ppp_fcs.h index dc1891c..5cb9ed7 100644 ---- ppp_fcs.h -+++ ppp_fcs.h +--- a/ppp_fcs.h ++++ b/ppp_fcs.h @@ -5,8 +5,9 @@ */ @@ -28,8 +28,8 @@ index dc1891c..5cb9ed7 100644 +uint16_t pppfcs16(uint16_t fcs, void *cp, int len); diff --git pptp.c pptp.c index 8995e30..c20ab65 100644 ---- pptp.c -+++ pptp.c +--- a/pptp.c ++++ b/pptp.c @@ -22,6 +22,7 @@ */ @@ -70,8 +70,8 @@ index 8995e30..c20ab65 100644 * outside the local host. diff --git pptp_callmgr.c pptp_callmgr.c index 0bdfb93..0ca47b8 100644 ---- pptp_callmgr.c -+++ pptp_callmgr.c +--- a/pptp_callmgr.c ++++ b/pptp_callmgr.c @@ -7,6 +7,7 @@ #include <signal.h> #include <sys/time.h> @@ -91,8 +91,8 @@ index 0bdfb93..0ca47b8 100644 /* okey dokey. This means that the call_id and peer_call_id are diff --git pptp_compat.h pptp_compat.h index ab1517a..27b0b7a 100644 ---- pptp_compat.h -+++ pptp_compat.h +--- a/pptp_compat.h ++++ b/pptp_compat.h @@ -5,9 +5,9 @@ #if defined (__SVR4) && defined (__sun) /* Solaris */ #include <sys/termios.h> @@ -108,8 +108,8 @@ index ab1517a..27b0b7a 100644 #define INADDR_NONE 0xffffffffU diff --git pptp_ctrl.c pptp_ctrl.c index 9864374..69d82b0 100644 ---- pptp_ctrl.c -+++ pptp_ctrl.c +--- a/pptp_ctrl.c ++++ b/pptp_ctrl.c @@ -11,6 +11,7 @@ #endif /* Solaris */ #include <sys/time.h> @@ -218,8 +218,8 @@ index 9864374..69d82b0 100644 *call_id = call->call_id; diff --git pptp_ctrl.h pptp_ctrl.h index 9020443..a2f728a 100644 ---- pptp_ctrl.h -+++ pptp_ctrl.h +--- a/pptp_ctrl.h ++++ b/pptp_ctrl.h @@ -7,6 +7,7 @@ #ifndef INC_PPTP_CTRL_H #define INC_PPTP_CTRL_H @@ -248,8 +248,8 @@ index 9020443..a2f728a 100644 * pptp_call|conn_close() diff --git pptp_gre.c pptp_gre.c index 6d1e288..c6e7c11 100644 ---- pptp_gre.c -+++ pptp_gre.c +--- a/pptp_gre.c ++++ b/pptp_gre.c @@ -6,6 +6,7 @@ */ @@ -327,8 +327,8 @@ index 6d1e288..c6e7c11 100644 /* package this up in a GRE shell. */ diff --git pptp_gre.h pptp_gre.h index 01604a6..0d1cca0 100644 ---- pptp_gre.h -+++ pptp_gre.h +--- a/pptp_gre.h ++++ b/pptp_gre.h @@ -5,10 +5,11 @@ * $Id: pptp_gre.h,v 1.6 2008/02/19 05:05:03 quozl Exp $ */ @@ -344,8 +344,8 @@ index 01604a6..0d1cca0 100644 extern int syncppp; diff --git pptp_msg.h pptp_msg.h index f7c231c..010e6b3 100644 ---- pptp_msg.h -+++ pptp_msg.h +--- a/pptp_msg.h ++++ b/pptp_msg.h @@ -9,6 +9,7 @@ /* Grab definitions of int16, int32, etc. */ @@ -611,8 +611,8 @@ index f7c231c..010e6b3 100644 diff --git pqueue.c pqueue.c index 41507ff..c07e850 100644 ---- pqueue.c -+++ pqueue.c +--- a/pqueue.c ++++ b/pqueue.c @@ -17,7 +17,7 @@ #define MIN_CAPACITY 128 /* min allocated buffer for a packet */ @@ -642,8 +642,8 @@ index 41507ff..c07e850 100644 /* get a new entry */ diff --git pqueue.h pqueue.h index a56590f..19bc7e2 100644 ---- pqueue.h -+++ pqueue.h +--- a/pqueue.h ++++ b/pqueue.h @@ -1,6 +1,7 @@ #ifndef PQUEUE_H #define PQUEUE_H diff --git a/srcpkgs/pptpclient/template b/srcpkgs/pptpclient/template index 4b75b7dd481..3761f308658 100644 --- a/srcpkgs/pptpclient/template +++ b/srcpkgs/pptpclient/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="http://pptpclient.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/pptpclient/files/pptp-${version}.tar.gz" checksum=82492db8e487ce73b182ee7f444251d20c44f5c26d6e96c553ec7093aefb5af4 -patch_args=-Np0 pre_build() { sed -i Makefile \ diff --git a/srcpkgs/projectlibre/patches/020.fix-projhome.patch b/srcpkgs/projectlibre/patches/020.fix-projhome.patch index 879c27352a7..20a49774206 100644 --- a/srcpkgs/projectlibre/patches/020.fix-projhome.patch +++ b/srcpkgs/projectlibre/patches/020.fix-projhome.patch @@ -1,5 +1,5 @@ ---- projectlibre.sh.orig -+++ projectlibre.sh +--- a/projectlibre.sh ++++ b/projectlibre.sh @@ -70,8 +70,7 @@ #Default conf values JAVA_EXE="java" diff --git a/srcpkgs/projectlibre/template b/srcpkgs/projectlibre/template index 9bac53e4496..4f6d94cef75 100644 --- a/srcpkgs/projectlibre/template +++ b/srcpkgs/projectlibre/template @@ -9,7 +9,6 @@ license="CPAL-1.0" homepage="https://www.projectlibre.com/" distfiles="${SOURCEFORGE_SITE}/projectlibre/${version}/projectlibre-${version}.tar.gz" checksum=58160173ecb384d988a398b7fe5400fc9667209aab2dedc21f5445f4f88f09c4 -patch_args=-Np0 do_install() { _dest="usr/share/projectlibre" diff --git a/srcpkgs/proot/patches/1001-prevent-tracees-from-becoming-undumpable.patch b/srcpkgs/proot/patches/1001-prevent-tracees-from-becoming-undumpable.patch index e7053abd3b6..b067b0da7e6 100644 --- a/srcpkgs/proot/patches/1001-prevent-tracees-from-becoming-undumpable.patch +++ b/srcpkgs/proot/patches/1001-prevent-tracees-from-becoming-undumpable.patch @@ -8,8 +8,8 @@ From: Michal Bednarski <bednarski.michal2@gmail.com> Date: Thu, 5 Sep 2019 15:19:08 +0200 Subject: [PATCH] Prevent tracees from becoming undumpable ---- src/syscall/enter.c -+++ src/syscall/enter.c +--- a/src/syscall/enter.c ++++ b/src/syscall/enter.c @@ -26,7 +26,8 @@ #include <linux/net.h> /* SYS_*, */ #include <fcntl.h> /* AT_FDCWD, */ @@ -36,8 +36,8 @@ Subject: [PATCH] Prevent tracees from becoming undumpable } end: ---- src/syscall/seccomp.c -+++ src/syscall/seccomp.c +--- a/src/syscall/seccomp.c ++++ b/src/syscall/seccomp.c @@ -377,6 +377,7 @@ { PR_open, 0 }, { PR_openat, 0 }, diff --git a/srcpkgs/proot/patches/arm64.patch b/srcpkgs/proot/patches/arm64.patch index 595d942f1e6..51dbd3bf366 100644 --- a/srcpkgs/proot/patches/arm64.patch +++ b/srcpkgs/proot/patches/arm64.patch @@ -1,6 +1,6 @@ diff -ru proot-5.1.0.orig/src/arch.h proot-5.1.0/src/arch.h ---- src/arch.h -+++ src/arch.h +--- a/src/arch.h ++++ b/src/arch.h @@ -125,6 +125,9 @@ #define OFFSETOF_STAT_UID_32 0 #define OFFSETOF_STAT_GID_32 0 @@ -13,7 +13,7 @@ diff -ru proot-5.1.0.orig/src/arch.h proot-5.1.0/src/arch.h #define SYSNUMS_HEADER1 "syscall/sysnums-i386.h" diff -ru proot-5.1.0.orig/src/loader/assembly-arm64.h proot-5.1.0/src/loader/assembly-arm64.h --- /dev/null -+++ src/loader/assembly-arm64.h ++++ b/src/loader/assembly-arm64.h @@ -0,0 +1,93 @@ +/* -*- c-set-style: "K&R"; c-basic-offset: 8 -*- + * @@ -109,8 +109,8 @@ diff -ru proot-5.1.0.orig/src/loader/assembly-arm64.h proot-5.1.0/src/loader/ass +#define PRCTL 167 + diff -ru proot-5.1.0.orig/src/loader/loader.c proot-5.1.0/src/loader/loader.c ---- src/loader/loader.c -+++ src/loader/loader.c +--- a/src/loader/loader.c ++++ b/src/loader/loader.c @@ -39,6 +39,8 @@ # include "loader/assembly-x86_64.h" #elif defined(ARCH_ARM_EABI) diff --git a/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch b/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch index 1f178a86f79..9257f2ea48d 100644 --- a/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch +++ b/srcpkgs/proot/patches/disable-seccomp-based-tracing.patch @@ -14,8 +14,8 @@ Bug: https://github.com/proot-me/PRoot/issues/106 --- ---- src/GNUmakefile -+++ src/GNUmakefile +--- a/src/GNUmakefile ++++ b/src/GNUmakefile @@ -105,7 +105,7 @@ CHECK_VERSION = VERSION=$$($(GIT) descri then /bin/echo -e "\#undef VERSION\n\#define VERSION \"$${VERSION}\""; \ fi; diff --git a/srcpkgs/proot/patches/linux4.8.patch b/srcpkgs/proot/patches/linux4.8.patch index 212802a7260..33bceffd7e3 100644 --- a/srcpkgs/proot/patches/linux4.8.patch +++ b/srcpkgs/proot/patches/linux4.8.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fix event.c for seccomp and ptrace diff --git src/tracee/event.c src/tracee/event.c index bafc3c5..64166f6 100644 ---- src/tracee/event.c -+++ src/tracee/event.c +--- a/src/tracee/event.c ++++ b/src/tracee/event.c @@ -20,6 +20,7 @@ * 02110-1301 USA. */ diff --git a/srcpkgs/proot/patches/linux_wait_h.patch b/srcpkgs/proot/patches/linux_wait_h.patch index b5b7e16478a..ab9b1ecbec0 100644 --- a/srcpkgs/proot/patches/linux_wait_h.patch +++ b/srcpkgs/proot/patches/linux_wait_h.patch @@ -1,5 +1,5 @@ ---- src/ptrace/ptrace.c 2014-12-15 15:18:11.000000000 +0100 -+++ src/ptrace/ptrace.c 2015-07-12 13:13:45.970093333 +0200 +--- a/src/ptrace/ptrace.c 2014-12-15 15:18:11.000000000 +0100 ++++ b/src/ptrace/ptrace.c 2015-07-12 13:13:45.970093333 +0200 @@ -28,6 +28,7 @@ #include <sys/uio.h> /* struct iovec, */ #include <sys/param.h> /* MIN(), MAX(), */ @@ -8,8 +8,8 @@ #include "ptrace/ptrace.h" #include "ptrace/user.h" ---- src/ptrace/wait.c 2014-12-15 15:18:11.000000000 +0100 -+++ src/ptrace/wait.c 2015-07-12 13:16:41.930106019 +0200 +--- a/src/ptrace/wait.c 2014-12-15 15:18:11.000000000 +0100 ++++ b/src/ptrace/wait.c 2015-07-12 13:16:41.930106019 +0200 @@ -26,6 +26,7 @@ #include <stdbool.h> /* bool, true, false, */ #include <signal.h> /* SIG*, */ @@ -18,8 +18,8 @@ #include "ptrace/wait.h" #include "ptrace/ptrace.h" ---- src/tracee/tracee.c 2014-12-15 15:18:11.000000000 +0100 -+++ src/tracee/tracee.c 2015-07-12 13:20:01.058120375 +0200 +--- a/src/tracee/tracee.c 2014-12-15 15:18:11.000000000 +0100 ++++ b/src/tracee/tracee.c 2015-07-12 13:20:01.058120375 +0200 @@ -31,6 +31,11 @@ #include <signal.h> /* kill(2), SIGKILL, */ #include <sys/ptrace.h> /* ptrace(2), PTRACE_*, */ diff --git a/srcpkgs/proot/patches/loader.patch b/srcpkgs/proot/patches/loader.patch index 8f8d2359557..3e0219545a1 100644 --- a/srcpkgs/proot/patches/loader.patch +++ b/srcpkgs/proot/patches/loader.patch @@ -9,8 +9,8 @@ Subject: [PATCH] Fix use of size diff --git src/execve/enter.c b/src/execve/enter.c index 8f22d9c..4c163a1 100644 ---- src/execve/enter.c -+++ src/execve/enter.c +--- a/src/execve/enter.c ++++ b/src/execve/enter.c @@ -454,10 +454,10 @@ static int expand_runner(Tracee* tracee, char host_path[PATH_MAX], char user_pat } diff --git a/srcpkgs/proot/patches/makefile-fix-vars.patch b/srcpkgs/proot/patches/makefile-fix-vars.patch index 5620507cb3c..b617f6f07b2 100644 --- a/srcpkgs/proot/patches/makefile-fix-vars.patch +++ b/srcpkgs/proot/patches/makefile-fix-vars.patch @@ -1,5 +1,5 @@ ---- src/GNUmakefile -+++ src/GNUmakefile +--- a/src/GNUmakefile ++++ b/src/GNUmakefile @@ -8,11 +8,11 @@ GIT = git RM = rm diff --git a/srcpkgs/proot/patches/musl_execinfo.patch b/srcpkgs/proot/patches/musl_execinfo.patch index 7c838664196..901f8e7edd0 100644 --- a/srcpkgs/proot/patches/musl_execinfo.patch +++ b/srcpkgs/proot/patches/musl_execinfo.patch @@ -1,5 +1,5 @@ ---- src/cli/cli.c 2014-12-15 15:18:11.000000000 +0100 -+++ src/cli/cli.c 2015-07-12 13:18:46.548115003 +0200 +--- a/src/cli/cli.c 2014-12-15 15:18:11.000000000 +0100 ++++ b/src/cli/cli.c 2015-07-12 13:18:46.548115003 +0200 @@ -30,7 +30,9 @@ #include <sys/types.h> /* getpid(2), */ #include <unistd.h> /* getpid(2), */ diff --git a/srcpkgs/proot/patches/ptrace_compat.patch b/srcpkgs/proot/patches/ptrace_compat.patch index e937b743228..fb4318933e1 100644 --- a/srcpkgs/proot/patches/ptrace_compat.patch +++ b/srcpkgs/proot/patches/ptrace_compat.patch @@ -1,5 +1,5 @@ ---- src/tracee/tracee.h 2014-12-15 15:18:11.000000000 +0100 -+++ src/tracee/tracee.h 2015-07-12 13:12:10.726086466 +0200 +--- a/src/tracee/tracee.h 2014-12-15 15:18:11.000000000 +0100 ++++ b/src/tracee/tracee.h 2015-07-12 13:12:10.726086466 +0200 @@ -28,6 +28,9 @@ #include <stdbool.h> /* bool, */ #include <sys/queue.h> /* LIST_*, */ diff --git a/srcpkgs/proot/template b/srcpkgs/proot/template index de493094767..bf03af65a90 100644 --- a/srcpkgs/proot/template +++ b/srcpkgs/proot/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://proot-me.github.io" distfiles="https://github.com/proot-me/PRoot/archive/v${version}.tar.gz" checksum=ce0a3baca8312613bd10f65bb436a3aaa28e1034f498a22c35ad0693600e01dd -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then makedepends+=" musl-legacy-compat" diff --git a/srcpkgs/protobuf-c/patches/fix-compile-error.patch b/srcpkgs/protobuf-c/patches/fix-compile-error.patch index 4ef0e80dc8b..1cc3115e883 100644 --- a/srcpkgs/protobuf-c/patches/fix-compile-error.patch +++ b/srcpkgs/protobuf-c/patches/fix-compile-error.patch @@ -1,5 +1,5 @@ ---- protoc-c/c_file.h.orig 2018-07-01 11:52:24.135863225 +0200 -+++ protoc-c/c_file.h 2018-07-01 11:54:02.117755492 +0200 +--- a/protoc-c/c_file.h 2018-07-01 11:52:24.135863225 +0200 ++++ b/protoc-c/c_file.h 2018-07-01 11:54:02.117755492 +0200 @@ -67,6 +67,10 @@ #include <vector> #include <google/protobuf/stubs/common.h> @@ -11,8 +11,8 @@ namespace google { namespace protobuf { ---- protoc-c/c_helpers.cc.orig 2018-07-01 11:52:24.137863243 +0200 -+++ protoc-c/c_helpers.cc 2018-07-01 11:54:05.424785612 +0200 +--- a/protoc-c/c_helpers.cc 2018-07-01 11:52:24.137863243 +0200 ++++ b/protoc-c/c_helpers.cc 2018-07-01 11:54:05.424785612 +0200 @@ -67,6 +67,10 @@ #include <protoc-c/c_helpers.h> @@ -24,8 +24,8 @@ namespace google { namespace protobuf { ---- protoc-c/c_message.h.orig 2018-07-01 11:52:24.138863253 +0200 -+++ protoc-c/c_message.h 2018-07-01 11:54:08.375812485 +0200 +--- a/protoc-c/c_message.h 2018-07-01 11:52:24.138863253 +0200 ++++ b/protoc-c/c_message.h 2018-07-01 11:54:08.375812485 +0200 @@ -66,6 +66,10 @@ #include <string> #include <google/protobuf/stubs/common.h> @@ -37,8 +37,8 @@ namespace google { namespace protobuf { ---- protoc-c/c_field.h.orig 2018-07-01 11:52:24.142863289 +0200 -+++ protoc-c/c_field.h 2018-07-01 11:54:11.010836479 +0200 +--- a/protoc-c/c_field.h 2018-07-01 11:52:24.142863289 +0200 ++++ b/protoc-c/c_field.h 2018-07-01 11:54:11.010836479 +0200 @@ -65,6 +65,10 @@ #include <google/protobuf/stubs/common.h> diff --git a/srcpkgs/protobuf-c/template b/srcpkgs/protobuf-c/template index cb483c41044..ab3915524c6 100644 --- a/srcpkgs/protobuf-c/template +++ b/srcpkgs/protobuf-c/template @@ -12,7 +12,6 @@ license="BSD-2-Clause" homepage="https://github.com/protobuf-c/protobuf-c" distfiles="${homepage}/releases/download/v${version}/protobuf-c-${version}.tar.gz" checksum=22956606ef50c60de1fabc13a78fbc50830a0447d780467d3c519f84ad527e78 -patch_args=-Np0 # buildprocess calls compiler while building, disable it on cross build build_options="protoc" diff --git a/srcpkgs/prototype/patches/build.patch b/srcpkgs/prototype/patches/build.patch index 38dda960987..d2592d539b8 100644 --- a/srcpkgs/prototype/patches/build.patch +++ b/srcpkgs/prototype/patches/build.patch @@ -1,5 +1,5 @@ ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -4,8 +4,7 @@ LDFLAGS = -lGL -lm DEST = /usr/local diff --git a/srcpkgs/prototype/template b/srcpkgs/prototype/template index 653e1508987..03d8f26c39b 100644 --- a/srcpkgs/prototype/template +++ b/srcpkgs/prototype/template @@ -9,7 +9,6 @@ license="Public Domain" homepage="https://github.com/ptitSeb/prototype" distfiles="https://github.com/ptitSeb/prototype/archive/v${version}.tar.gz" checksum=400f8a5c727c9feaa6b48b65c23c312db41dd238af9526659bf3342346c05af6 -patch_args=-Np0 CXXFLAGS="-Wno-write-strings" diff --git a/srcpkgs/psensor/patches/microhttpd-0.9.71.patch b/srcpkgs/psensor/patches/microhttpd-0.9.71.patch index 6c7c46e4fd1..56f56b11e15 100644 --- a/srcpkgs/psensor/patches/microhttpd-0.9.71.patch +++ b/srcpkgs/psensor/patches/microhttpd-0.9.71.patch @@ -1,8 +1,8 @@ Upstream: git diff --no-prefix 4088dc4~ ad8a1e3 diff --git src/server/server.c src/server/server.c index a70f6ab..5d7f751 100644 ---- src/server/server.c -+++ src/server/server.c +--- a/src/server/server.c ++++ b/src/server/server.c @@ -306,14 +306,20 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code) MHD_RESPMEM_MUST_FREE); } diff --git a/srcpkgs/psensor/template b/srcpkgs/psensor/template index b4841eed588..00cf7ba46a6 100644 --- a/srcpkgs/psensor/template +++ b/srcpkgs/psensor/template @@ -16,7 +16,6 @@ changelog="https://gitlab.com/jeanfi/psensor/-/raw/master/NEWS" distfiles="https://wpitchoune.net/${pkgname}/files/${pkgname}-${version}.tar.gz" checksum=084f785d169f533d3010e50c5933436ed427afc70d41740b762f1db5034833ab disable_parallel_build=yes -patch_args=-Np0 if [ -z "$CROSS_BUILD" ]; then hostmakedepends+=" help2man" diff --git a/srcpkgs/ptii/patches/fix-installpaths.patch b/srcpkgs/ptii/patches/fix-installpaths.patch index c3ee97e7499..23aac81eef8 100644 --- a/srcpkgs/ptii/patches/fix-installpaths.patch +++ b/srcpkgs/ptii/patches/fix-installpaths.patch @@ -1,7 +1,7 @@ Adjust install paths and add LICENSE to installed files. ---- Makefile 2014-02-10 10:36:26.000000000 +0100 -+++ Makefile 2015-10-23 20:24:01.308136083 +0200 +--- a/Makefile 2014-02-10 10:36:26.000000000 +0100 ++++ b/Makefile 2015-10-23 20:24:01.308136083 +0200 @@ -26,7 +26,8 @@ install: all diff --git a/srcpkgs/ptii/template b/srcpkgs/ptii/template index a0c21edea43..572d59daad4 100644 --- a/srcpkgs/ptii/template +++ b/srcpkgs/ptii/template @@ -10,6 +10,5 @@ license="WTFPL" homepage="http://git.z3bra.org/cgit.cgi/ptii/" distfiles="https://sources.voidlinux.de/ptii-${version}/ptii-${version}.tar.bz2" checksum=2f130417251938c9947293f4df07b6db37909e03d4f600e0af025d1ae6a02d26 -patch_args=-Np0 LDFLAGS="-lpthread" diff --git a/srcpkgs/pugixml/patches/patch-src_pugiconfig.patch b/srcpkgs/pugixml/patches/patch-src_pugiconfig.patch index bee679acaa5..a04344fbfa6 100644 --- a/srcpkgs/pugixml/patches/patch-src_pugiconfig.patch +++ b/srcpkgs/pugixml/patches/patch-src_pugiconfig.patch @@ -1,5 +1,5 @@ ---- src/pugiconfig.hpp.orig 2015-08-18 17:07:06 UTC -+++ src/pugiconfig.hpp +--- a/src/pugiconfig.hpp 2015-08-18 17:07:06 UTC ++++ b/src/pugiconfig.hpp @@ -41,7 +41,7 @@ // #define PUGIXML_HEADER_ONLY diff --git a/srcpkgs/pugixml/template b/srcpkgs/pugixml/template index c34c9d86dde..45d0d36a67b 100644 --- a/srcpkgs/pugixml/template +++ b/srcpkgs/pugixml/template @@ -10,7 +10,6 @@ license="MIT" homepage="http://pugixml.org/" distfiles="http://github.com/zeux/pugixml/releases/download/v${version}/pugixml-${version}.tar.gz" checksum=8ddf57b65fb860416979a3f0640c2ad45ddddbbafa82508ef0a0af3ce7061716 -patch_args=-Np0 post_install() { tail -22 readme.txt > LICENSE diff --git a/srcpkgs/pulseview/patches/qt-5.15.patch b/srcpkgs/pulseview/patches/qt-5.15.patch index 986ed098ab5..bb91eeb696b 100644 --- a/srcpkgs/pulseview/patches/qt-5.15.patch +++ b/srcpkgs/pulseview/patches/qt-5.15.patch @@ -1,5 +1,5 @@ ---- pv/util.cpp.orig 2020-11-21 15:56:56.690899190 +0700 -+++ pv/util.cpp 2020-11-21 16:00:40.981375801 +0700 +--- a/pv/util.cpp 2020-11-21 15:56:56.690899190 +0700 ++++ b/pv/util.cpp 2020-11-21 16:00:40.981375801 +0700 @@ -137,7 +137,7 @@ QString s; QTextStream ts(&s); diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template index b6e099c7b68..83ce80bc39d 100644 --- a/srcpkgs/pulseview/template +++ b/srcpkgs/pulseview/template @@ -15,6 +15,5 @@ license="GPL-3" homepage="https://sigrok.org/" distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz" checksum=f042f77a3e1b35bf30666330e36ec38fab8d248c3693c37b7e35d401c3bfabcb -patch_args=-Np0 CXXFLAGS+=" -fext-numeric-literals" diff --git a/srcpkgs/putty/patches/fix-include.patch b/srcpkgs/putty/patches/fix-include.patch index 1a51996d87e..37ce7776dff 100644 --- a/srcpkgs/putty/patches/fix-include.patch +++ b/srcpkgs/putty/patches/fix-include.patch @@ -1,5 +1,5 @@ ---- unix/uxcons.c -+++ unix/uxcons.c +--- a/unix/uxcons.c ++++ b/unix/uxcons.c @@ -8,6 +8,7 @@ #include <stdarg.h> #include <assert.h> diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template index c87cbf5b609..e4efe58debd 100644 --- a/srcpkgs/putty/template +++ b/srcpkgs/putty/template @@ -11,7 +11,6 @@ license="MIT" homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/" distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz" checksum=d3173b037eddbe9349abe978101277b4ba9f9959e25dedd44f87e7b85cc8f9f5 -patch_args=-Np0 CFLAGS="-Wno-error" diff --git a/srcpkgs/pvoc/patches/musl.patch b/srcpkgs/pvoc/patches/musl.patch index 2d036bffba5..38fa1b4f67c 100644 --- a/srcpkgs/pvoc/patches/musl.patch +++ b/srcpkgs/pvoc/patches/musl.patch @@ -1,5 +1,5 @@ ---- basics.h 2019-01-23 12:32:20.420486153 +0700 -+++ basics.h 2019-01-23 12:33:23.746320325 +0700 +--- a/basics.h 2019-01-23 12:32:20.420486153 +0700 ++++ b/basics.h 2019-01-23 12:33:23.746320325 +0700 @@ -46,6 +46,7 @@ #include <assert.h> diff --git a/srcpkgs/pvoc/template b/srcpkgs/pvoc/template index 7d27e4d7108..da23784124a 100644 --- a/srcpkgs/pvoc/template +++ b/srcpkgs/pvoc/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="http://quitte.de/dsp/pvoc.html" distfiles="http://quitte.de/dsp/pvoc_${version}.tar.gz" checksum=d519d416049143cb2c4775feae639021b5693f39e27e99b1f036392580baa32d -patch_args=-Np0 pre_build() { sed -i "s@-O6.\+@${CFLAGS}@" Makefile diff --git a/srcpkgs/pwnat/patches/fix_argument_parsing.diff b/srcpkgs/pwnat/patches/fix_argument_parsing.diff index 316441e6126..cf2c2b99e42 100644 --- a/srcpkgs/pwnat/patches/fix_argument_parsing.diff +++ b/srcpkgs/pwnat/patches/fix_argument_parsing.diff @@ -11,8 +11,8 @@ would recognise "b" as proxy port, and eventually crash with a segfault diff --git udpclient.c udpclient.c index a95ac50..0d23c0d 100644 ---- udpclient.c -+++ udpclient.c +--- a/udpclient.c ++++ b/udpclient.c @@ -60,7 +60,20 @@ static void disconnect_and_remove_client(uint16_t id, list_t *clients, fd_set *fds); static void signal_handler(int sig); diff --git a/srcpkgs/pwnat/template b/srcpkgs/pwnat/template index 2fe12805a70..a1e9f92078d 100644 --- a/srcpkgs/pwnat/template +++ b/srcpkgs/pwnat/template @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="http://samy.pl/pwnat/" distfiles="https://github.com/samyk/pwnat/archive/${_githash}.tar.gz" checksum=365da981ba1a39d7e3c8427fbcd9e7fcd3dd16cd30ae7e3b0aca50511fd8e1b1 -patch_args=-Np0 do_configure() { sed -i 's#sys/unistd.h#unistd.h#' $(find -name '*.[ch]') diff --git a/srcpkgs/pygtk/patches/pango-1.44.6.patch b/srcpkgs/pygtk/patches/pango-1.44.6.patch index 6a3cda76e6b..708b41348aa 100644 --- a/srcpkgs/pygtk/patches/pango-1.44.6.patch +++ b/srcpkgs/pygtk/patches/pango-1.44.6.patch @@ -18,8 +18,8 @@ https://gitlab.gnome.org/GNOME/pango/issues/417 diff --git pango.defs pango.defs index 6935c964..da968f58 100644 ---- pango.defs -+++ pango.defs +--- a/pango.defs ++++ b/pango.defs @@ -1391,15 +1391,6 @@ ) ) diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template index ca12604df12..41554b81763 100644 --- a/srcpkgs/pygtk/template +++ b/srcpkgs/pygtk/template @@ -20,7 +20,6 @@ distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" checksum=cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912 lib32disabled=yes python_version=2 -patch_args=-Np0 pre_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/pymol/patches/musl.patch b/srcpkgs/pymol/patches/musl.patch index a94d8235593..8071fbdbf1f 100644 --- a/srcpkgs/pymol/patches/musl.patch +++ b/srcpkgs/pymol/patches/musl.patch @@ -1,7 +1,7 @@ diff --git a/ov/src/ov_types.h b/ov/src/ov_types.h index 6d2ad80..11d1589 100644 ---- ov/src/ov_types.h -+++ ov/src/ov_types.h +--- a/ov/src/ov_types.h ++++ b/ov/src/ov_types.h @@ -19,6 +19,8 @@ extern "C" { #include <windows.h> #endif diff --git a/srcpkgs/pymol/template b/srcpkgs/pymol/template index fe0fb1faa35..dfb9441f22a 100644 --- a/srcpkgs/pymol/template +++ b/srcpkgs/pymol/template @@ -17,7 +17,6 @@ distfiles="https://github.com/schrodinger/pymol-open-source/archive/v${version}. checksum="5ede4ce2e8f53713c5ee64f5905b2d29bf01e4391da7e536ce8909d6b9116581 0ea81faaf336becc669a193777d0dca55475d303d1236b57df25cf67ff7c2bcd" skip_extraction="${pkgname}.png" -patch_args=-Np0 export PREFIX_PATH="${XBPS_CROSS_BASE}/usr" # PREFIX_PATH isn't used for the py3 include path diff --git a/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch b/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch index 9f1bd43c312..9ba21ea664b 100644 --- a/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch +++ b/srcpkgs/pyside2-tools/patches/dont-install-symlinks.patch @@ -3,8 +3,8 @@ don't install these symlinks, it's not pyside2-tools business: * /usr/bin/rcc -> /usr/bin/qtchooser * /usr/bin/uic -> /usr/bin/qtchooser ---- sources/pyside2-tools/CMakeLists.txt.ORIG -+++ sources/pyside2-tools/CMakeLists.txt +--- a/sources/pyside2-tools/CMakeLists.txt ++++ b/sources/pyside2-tools/CMakeLists.txt @@ -55,38 +55,6 @@ set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}") endif() diff --git a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch index 0dc0f0bfb11..0ec2442b65f 100644 --- a/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch +++ b/srcpkgs/pyside2-tools/patches/tests-use-qt5-rcc-and-uic.patch @@ -1,5 +1,5 @@ ---- sources/pyside2-tools/tests/CMakeLists.txt -+++ sources/pyside2-tools/tests/CMakeLists.txt +--- a/sources/pyside2-tools/tests/CMakeLists.txt ++++ b/sources/pyside2-tools/tests/CMakeLists.txt @@ -1,4 +1,11 @@ + +# Since Qt v5.14, pyside2-uic and pyside2-rcc are directly provided by Qt5Core uic and rcc, @@ -13,8 +13,8 @@ +add_test(QWizard ${PYSIDE2UICBINARY} --generator=python "${CMAKE_CURRENT_SOURCE_DIR}/qwizard_test.ui") set_tests_properties(QWizard PROPERTIES ENVIRONMENT "PYTHONPATH=$ENV{PYTHONPATH}:${CMAKE_SOURCE_DIR}:${CMAKE_CURRENT_SOURCE_DIR}") ---- sources/pyside2-tools/tests/rcc/CMakeLists.txt -+++ sources/pyside2-tools/tests/rcc/CMakeLists.txt +--- a/sources/pyside2-tools/tests/rcc/CMakeLists.txt ++++ b/sources/pyside2-tools/tests/rcc/CMakeLists.txt @@ -1,6 +1,6 @@ macro(ADD_RCC_TEST name pyfile qrcfile) add_test(${name} ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh @@ -23,8 +23,8 @@ ${CMAKE_CURRENT_SOURCE_DIR}/${pyfile} ${CMAKE_CURRENT_SOURCE_DIR}/${qrcfile} ${CMAKE_CURRENT_SOURCE_DIR}) ---- sources/pyside2-tools/tests/rcc/run_test.sh -+++ sources/pyside2-tools/tests/rcc/run_test.sh +--- a/sources/pyside2-tools/tests/rcc/run_test.sh ++++ b/sources/pyside2-tools/tests/rcc/run_test.sh @@ -8,5 +8,5 @@ # $3: qrc file diff --git a/srcpkgs/pyside2-tools/template b/srcpkgs/pyside2-tools/template index b7559676933..35d353aba95 100644 --- a/srcpkgs/pyside2-tools/template +++ b/srcpkgs/pyside2-tools/template @@ -17,7 +17,6 @@ homepage="https://wiki.qt.io/Qt_for_Python/Shiboken" distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz" checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 python_version=3 -patch_args=-Np0 if [ ${CROSS_BUILD} ]; then hostmakedepends+=" qt5-qmake qt5-host-tools" diff --git a/srcpkgs/python-M2Crypto/patches/libressl.patch b/srcpkgs/python-M2Crypto/patches/libressl.patch index d82b408943f..ee2a24ad9f4 100644 --- a/srcpkgs/python-M2Crypto/patches/libressl.patch +++ b/srcpkgs/python-M2Crypto/patches/libressl.patch @@ -1,5 +1,5 @@ ---- SWIG/_bio.i.orig -+++ SWIG/_bio.i +--- a/SWIG/_bio.i ++++ b/SWIG/_bio.i @@ -293,8 +293,12 @@ int bio_should_write(BIO* a) { } @@ -27,8 +27,8 @@ BIO_meth_free( BIO_METHOD *meth ) { if ( meth == NULL ) { ---- SWIG/_evp.i.orig -+++ SWIG/_evp.i +--- a/SWIG/_evp.i ++++ b/SWIG/_evp.i @@ -19,7 +19,7 @@ Copyright (c) 2009-2010 Heikki Toivonen. All rights re #include <openssl/rsa.h> #include <openssl/opensslv.h> @@ -38,8 +38,8 @@ HMAC_CTX *HMAC_CTX_new(void) { HMAC_CTX *ret = PyMem_Malloc(sizeof(HMAC_CTX)); ---- SWIG/_lib11_compat.i.orig -+++ SWIG/_lib11_compat.i +--- a/SWIG/_lib11_compat.i ++++ b/SWIG/_lib11_compat.i @@ -8,7 +8,7 @@ */ @@ -49,8 +49,8 @@ #include <string.h> #include <openssl/engine.h> ---- SWIG/_lib.i.orig -+++ SWIG/_lib.i +--- a/SWIG/_lib.i ++++ b/SWIG/_lib.i @@ -21,7 +21,7 @@ %{ @@ -69,8 +69,8 @@ SSLeay_add_all_algorithms(); ERR_load_ERR_strings(); #endif ---- SWIG/_ssl.i.orig -+++ SWIG/_ssl.i +--- a/SWIG/_ssl.i ++++ b/SWIG/_ssl.i @@ -275,7 +275,7 @@ const SSL_METHOD *sslv3_method(void) { #endif @@ -80,8 +80,8 @@ PyErr_WarnEx(PyExc_DeprecationWarning, "Function TLSv1_method has been deprecated.", 1); #endif ---- SWIG/_threads.i.orig -+++ SWIG/_threads.i +--- a/SWIG/_threads.i ++++ b/SWIG/_threads.i @@ -5,7 +5,7 @@ #include <pythread.h> #include <openssl/crypto.h> @@ -127,8 +127,8 @@ int i; if (thread_mode) { CRYPTO_set_locking_callback(NULL); ---- SWIG/libcrypto-compat.h.orig -+++ SWIG/libcrypto-compat.h +--- a/SWIG/libcrypto-compat.h ++++ b/SWIG/libcrypto-compat.h @@ -1,7 +1,7 @@ #ifndef LIBCRYPTO_COMPAT_H #define LIBCRYPTO_COMPAT_H diff --git a/srcpkgs/python-M2Crypto/template b/srcpkgs/python-M2Crypto/template index ac5752871e2..4c684d18f57 100644 --- a/srcpkgs/python-M2Crypto/template +++ b/srcpkgs/python-M2Crypto/template @@ -14,7 +14,6 @@ license="MIT" homepage="https://gitlab.com/m2crypto/m2crypto/" distfiles="${PYPI_SITE}/M/M2Crypto/M2Crypto-${version}.tar.gz" checksum=4c6ad45ffb88670c590233683074f2440d96aaccb05b831371869fc387cbd127 -patch_args=-Np0 post_install() { vlicense LICENCE diff --git a/srcpkgs/python-coverage/patches/no-versioned-coverage.patch b/srcpkgs/python-coverage/patches/no-versioned-coverage.patch index 18e9d541c1b..fefbfc0af76 100644 --- a/srcpkgs/python-coverage/patches/no-versioned-coverage.patch +++ b/srcpkgs/python-coverage/patches/no-versioned-coverage.patch @@ -1,5 +1,5 @@ ---- setup.py.orig -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -86,12 +86,9 @@ setup_args = dict( }, diff --git a/srcpkgs/python-coverage/template b/srcpkgs/python-coverage/template index 99b9a3c07ea..332e7baa3b7 100644 --- a/srcpkgs/python-coverage/template +++ b/srcpkgs/python-coverage/template @@ -14,7 +14,6 @@ homepage="https://bitbucket.org/ned/coveragepy" distfiles="${PYPI_SITE}/c/coverage/coverage-${version}.tar.gz" checksum=77afca04240c40450c331fa796b3eab6f1e15c5ecf8bf2b8bee9706cd5452fef alternatives="coverage:coverage:/usr/bin/coverage2" -patch_args=-Np0 python3-coverage_package() { depends="python3-setuptools" diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch index 12c22971680..9521dab29d9 100644 --- a/srcpkgs/python-docutils/patches/test-import.patch +++ b/srcpkgs/python-docutils/patches/test-import.patch @@ -1,5 +1,5 @@ ---- test/DocutilsTestSupport.py -+++ test/DocutilsTestSupport.py +--- a/test/DocutilsTestSupport.py ++++ b/test/DocutilsTestSupport.py @@ -51,14 +51,9 @@ testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir) diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template index f2843fc47cf..02232f31a26 100644 --- a/srcpkgs/python-docutils/template +++ b/srcpkgs/python-docutils/template @@ -14,7 +14,6 @@ homepage="http://docutils.sourceforge.net" distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz" checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc checkdepends+="$depends python3-Pygments" -patch_args=-Np0 alternatives=" docutils:rst2html:/usr/bin/rst2html.py2 diff --git a/srcpkgs/python-evdev/patches/time64.patch b/srcpkgs/python-evdev/patches/time64.patch index d65d6fa8964..bfcb6598f0c 100644 --- a/srcpkgs/python-evdev/patches/time64.patch +++ b/srcpkgs/python-evdev/patches/time64.patch @@ -1,5 +1,5 @@ ---- evdev/input.c 2019-04-07 17:40:25.000000000 +0200 -+++ evdev/input.c 2020-12-14 14:48:49.568344738 +0100 +--- a/evdev/input.c 2019-04-07 17:40:25.000000000 +0200 ++++ b/evdev/input.c 2020-12-14 14:48:49.568344738 +0100 @@ -60,8 +60,8 @@ return NULL; } @@ -22,8 +22,8 @@ val = PyLong_FromLong(event[i].value); py_input_event = Py_BuildValue("OOhhO", sec, usec, event[i].type, event[i].code, val); ---- evdev/uinput.c 2019-04-07 17:40:25.000000000 +0200 -+++ evdev/uinput.c 2020-12-14 14:51:58.809761744 +0100 +--- a/evdev/uinput.c 2019-04-07 17:40:25.000000000 +0200 ++++ b/evdev/uinput.c 2020-12-14 14:51:58.809761744 +0100 @@ -226,6 +226,7 @@ static PyObject * uinput_write(PyObject *self, PyObject *args) diff --git a/srcpkgs/python-evdev/template b/srcpkgs/python-evdev/template index 40b60c09472..ded33276800 100644 --- a/srcpkgs/python-evdev/template +++ b/srcpkgs/python-evdev/template @@ -12,7 +12,6 @@ license="BSD-3-Clause" homepage="https://github.com/gvalkov/python-evdev" distfiles="https://github.com/gvalkov/python-evdev/archive/v${version}.tar.gz" checksum=f788584510620251c6a6c68802935b71c4b474df99b87ee223e18b84dd1719a6 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/python-nose/patches/setup.py.patch b/srcpkgs/python-nose/patches/setup.py.patch index 617ce52951e..34fea9b54e9 100644 --- a/srcpkgs/python-nose/patches/setup.py.patch +++ b/srcpkgs/python-nose/patches/setup.py.patch @@ -1,5 +1,5 @@ ---- setup.py.orig -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -30,7 +30,6 @@ try: entry_points = { 'console_scripts': [ diff --git a/srcpkgs/python-nose/template b/srcpkgs/python-nose/template index e0ee55d59fe..95f3607a40a 100644 --- a/srcpkgs/python-nose/template +++ b/srcpkgs/python-nose/template @@ -15,7 +15,6 @@ homepage="https://github.com/nose-devs/nose" distfiles="${PYPI_SITE}/n/nose/nose-${version}.tar.gz" checksum=f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 alternatives="nose:nosetests:/usr/bin/nosetests2" -patch_args=-Np0 python3-nose_package() { pycompile_module="nose" diff --git a/srcpkgs/python-pip/patches/no-versioned-pip.patch b/srcpkgs/python-pip/patches/no-versioned-pip.patch index 4dba0fd543d..17c0a38d434 100644 --- a/srcpkgs/python-pip/patches/no-versioned-pip.patch +++ b/srcpkgs/python-pip/patches/no-versioned-pip.patch @@ -1,5 +1,5 @@ ---- setup.py.orig -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -75,10 +75,6 @@ entry_points={ "console_scripts": [ diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template index aca1c8836df..096aa7b63b2 100644 --- a/srcpkgs/python-pip/template +++ b/srcpkgs/python-pip/template @@ -13,7 +13,6 @@ homepage="https://pip.pypa.io/" changelog="https://raw.githubusercontent.com/pypa/pip/master/NEWS.rst" distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz" checksum=6773934e5f5fc3eaa8c5a44949b5b924fc122daa0a8aa9f80c835b4ca2a543fc -patch_args=-Np0 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python-requests/patches/use-system-cacerts.patch b/srcpkgs/python-requests/patches/use-system-cacerts.patch index bf8673c4c5a..865450920e5 100644 --- a/srcpkgs/python-requests/patches/use-system-cacerts.patch +++ b/srcpkgs/python-requests/patches/use-system-cacerts.patch @@ -1,5 +1,5 @@ ---- requests/certs.py.orig 2017-05-29 20:09:29.000000000 +0200 -+++ requests/certs.py 2017-06-06 13:06:31.803000513 +0200 +--- a/requests/certs.py 2017-05-29 20:09:29.000000000 +0200 ++++ b/requests/certs.py 2017-06-06 13:06:31.803000513 +0200 @@ -12,7 +12,8 @@ environment, you can change the definition of where() to return a separately packaged CA bundle. diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template index 406e20f881b..bde0b03b9ef 100644 --- a/srcpkgs/python-requests/template +++ b/srcpkgs/python-requests/template @@ -13,7 +13,6 @@ homepage="https://python-requests.org/" changelog="https://raw.githubusercontent.com/psf/requests/master/HISTORY.md" distfiles="${PYPI_SITE}/r/requests/requests-${version}.tar.gz" checksum=27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804 -patch_args=-Np0 post_patch() { vsed -i '/certifi/d' setup.py diff --git a/srcpkgs/python/patches/fix-i686-rlock.patch b/srcpkgs/python/patches/fix-i686-rlock.patch index 6867590e18a..94e5567bece 100644 --- a/srcpkgs/python/patches/fix-i686-rlock.patch +++ b/srcpkgs/python/patches/fix-i686-rlock.patch @@ -4,8 +4,8 @@ semaphore locking and unlocking. One example of failing builds is firefox-esr running gyp in an i686 environment. ---- Lib/multiprocessing/queues.py 2017-09-16 19:38:35.000000000 +0200 -+++ Lib/multiprocessing/queues.py 2017-10-24 19:49:06.291351206 +0200 +--- a/Lib/multiprocessing/queues.py 2017-09-16 19:38:35.000000000 +0200 ++++ b/Lib/multiprocessing/queues.py 2017-10-24 19:49:06.291351206 +0200 @@ -369,13 +369,11 @@ def _make_methods(self): @@ -42,8 +42,8 @@ One example of failing builds is firefox-esr running gyp in an i686 environment. + finally: + self._wlock.release() self.put = put ---- Modules/_multiprocessing/semaphore.c 2017-09-16 19:38:35.000000000 +0200 -+++ Modules/_multiprocessing/semaphore.c 2017-10-28 10:49:56.944993401 +0200 +--- a/Modules/_multiprocessing/semaphore.c 2017-09-16 19:38:35.000000000 +0200 ++++ b/Modules/_multiprocessing/semaphore.c 2017-10-28 10:49:56.944993401 +0200 @@ -378,7 +378,7 @@ } } diff --git a/srcpkgs/python/patches/musl-find_library.patch b/srcpkgs/python/patches/musl-find_library.patch index ec9f3d94f15..82f436b4072 100644 --- a/srcpkgs/python/patches/musl-find_library.patch +++ b/srcpkgs/python/patches/musl-find_library.patch @@ -1,5 +1,5 @@ ---- Lib/ctypes/util.py.orig -+++ Lib/ctypes/util.py +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py @@ -204,6 +204,41 @@ def find_library(name, is64 = False): return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name)) diff --git a/srcpkgs/python/patches/sysconfig.patch b/srcpkgs/python/patches/sysconfig.patch index f5cd56707f0..6a089a89adb 100644 --- a/srcpkgs/python/patches/sysconfig.patch +++ b/srcpkgs/python/patches/sysconfig.patch @@ -1,5 +1,5 @@ ---- Lib/distutils/sysconfig.py 2019-10-19 20:38:44.000000000 +0200 -+++ Lib/distutils/sysconfig.py 2019-03-02 19:17:42.000000000 +0100 +--- a/Lib/distutils/sysconfig.py 2019-10-19 20:38:44.000000000 +0200 ++++ b/Lib/distutils/sysconfig.py 2019-03-02 19:17:42.000000000 +0100 @@ -181,8 +171,8 @@ _osx_support.customize_compiler(_config_vars) _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' diff --git a/srcpkgs/python/template b/srcpkgs/python/template index 1412f66d4d6..fc52e87228e 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -17,7 +17,6 @@ license="Python-2.0" homepage="https://www.python.org" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" checksum=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43 -patch_args=-Np0 alternatives=" python:idle:/usr/bin/idle2.7 diff --git a/srcpkgs/python3-PyBrowserID/patches/m2_python3.patch b/srcpkgs/python3-PyBrowserID/patches/m2_python3.patch index 196f09172f3..7215368894b 100644 --- a/srcpkgs/python3-PyBrowserID/patches/m2_python3.patch +++ b/srcpkgs/python3-PyBrowserID/patches/m2_python3.patch @@ -1,5 +1,5 @@ ---- browserid/crypto/m2.py.orig 2014-12-12 06:15:36.000000000 +0100 -+++ browserid/crypto/m2.py 2018-10-12 18:55:28.450882271 +0200 +--- a/browserid/crypto/m2.py 2014-12-12 06:15:36.000000000 +0100 ++++ b/browserid/crypto/m2.py 2018-10-12 18:55:28.450882271 +0200 @@ -21,6 +21,7 @@ from browserid.crypto._m2_monkeypatch import m2 from browserid.crypto._m2_monkeypatch import DSA as _DSA diff --git a/srcpkgs/python3-PyBrowserID/patches/m2crypto.patch b/srcpkgs/python3-PyBrowserID/patches/m2crypto.patch index 5ae3971f85e..b719f46b7fe 100644 --- a/srcpkgs/python3-PyBrowserID/patches/m2crypto.patch +++ b/srcpkgs/python3-PyBrowserID/patches/m2crypto.patch @@ -1,7 +1,7 @@ Fix compatibility with M2Crypto>=0.26.0 ---- browserid/crypto/_m2_monkeypatch.py.orig 2014-12-12 06:15:36.000000000 +0100 -+++ browserid/crypto/_m2_monkeypatch.py 2018-10-12 18:29:19.859395622 +0200 +--- a/browserid/crypto/_m2_monkeypatch.py 2014-12-12 06:15:36.000000000 +0100 ++++ b/browserid/crypto/_m2_monkeypatch.py 2018-10-12 18:29:19.859395622 +0200 @@ -8,9 +8,9 @@ # We use ctypes to avoid recompiling the M2Crypto binaries. diff --git a/srcpkgs/python3-PyBrowserID/patches/test_m2_monkeypatch_python3.patch b/srcpkgs/python3-PyBrowserID/patches/test_m2_monkeypatch_python3.patch index 86f7692da83..fa4c231ca44 100644 --- a/srcpkgs/python3-PyBrowserID/patches/test_m2_monkeypatch_python3.patch +++ b/srcpkgs/python3-PyBrowserID/patches/test_m2_monkeypatch_python3.patch @@ -1,5 +1,5 @@ ---- browserid/tests/test_m2_monkeypatch.py.orig 2018-10-12 19:47:04.690816753 +0200 -+++ browserid/tests/test_m2_monkeypatch.py 2018-10-12 19:48:32.177899673 +0200 +--- a/browserid/tests/test_m2_monkeypatch.py 2018-10-12 19:47:04.690816753 +0200 ++++ b/browserid/tests/test_m2_monkeypatch.py 2018-10-12 19:48:32.177899673 +0200 @@ -41,17 +41,17 @@ k = _m2.DSA.gen_params(512) k.gen_key() diff --git a/srcpkgs/python3-PyBrowserID/template b/srcpkgs/python3-PyBrowserID/template index f8b86f119e2..a8cdd9230d3 100644 --- a/srcpkgs/python3-PyBrowserID/template +++ b/srcpkgs/python3-PyBrowserID/template @@ -14,7 +14,6 @@ license="MPL-2.0" homepage="https://github.com/mozilla/PyBrowserID" distfiles="${PYPI_SITE}/P/PyBrowserID/PyBrowserID-${version}.tar.gz" checksum=6c227669e87cc25796ae76f6a0ef65025528c8ad82d352679fa9a3e5663a71e3 -patch_args=-Np0 do_check() { # needs network access (persona.org has been shut down anyway) diff --git a/srcpkgs/python3-PyQt5/patches/pyproject-cross.patch b/srcpkgs/python3-PyQt5/patches/pyproject-cross.patch index 6acb1bfd787..72b59e10350 100644 --- a/srcpkgs/python3-PyQt5/patches/pyproject-cross.patch +++ b/srcpkgs/python3-PyQt5/patches/pyproject-cross.patch @@ -1,5 +1,5 @@ ---- project.py.orig 2020-09-27 14:28:27.338774698 +0700 -+++ project.py 2020-09-27 14:28:29.317795099 +0700 +--- a/project.py 2020-09-27 14:28:27.338774698 +0700 ++++ b/project.py 2020-09-27 14:28:29.317795099 +0700 @@ -51,6 +51,15 @@ _QOpenGLFunctions_2_1, _QOpenGLFunctions_4_1_Core, _QOpenGLFunctions_ES2, pylupdate, pyrcc] diff --git a/srcpkgs/python3-PyQt5/template b/srcpkgs/python3-PyQt5/template index 4b36464197e..a704d41698b 100644 --- a/srcpkgs/python3-PyQt5/template +++ b/srcpkgs/python3-PyQt5/template @@ -23,7 +23,6 @@ checksum=2a69597e0dd11caabe75fae133feca66387819fc9bc050f547e5551bce97e5be lib32disabled=yes CFLAGS=-I$XBPS_CROSS_BASE/usr/include/python$py3_ver CXXFLAGS="$CFLAGS" -patch_args=-Np0 export INCPATH=$XBPS_CROSS_BASE/usr/include/python$py3_ver diff --git a/srcpkgs/python3-aiohttp/patches/chardet-version.patch b/srcpkgs/python3-aiohttp/patches/chardet-version.patch index 43fac97ac8f..91cc8ca7efb 100644 --- a/srcpkgs/python3-aiohttp/patches/chardet-version.patch +++ b/srcpkgs/python3-aiohttp/patches/chardet-version.patch @@ -17,8 +17,8 @@ Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.c diff --git setup.py setup.py index a9edd5d0c8..54b548c7b4 100644 ---- setup.py -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -66,7 +66,7 @@ install_requires = [ diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template index 65465ff7b6a..d8b4761c8b9 100644 --- a/srcpkgs/python3-aiohttp/template +++ b/srcpkgs/python3-aiohttp/template @@ -14,7 +14,6 @@ license="Apache-2.0" homepage="https://aiohttp.readthedocs.io/" distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz" checksum=5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de -patch_args=-Np0 post_patch() { # use system http-parser diff --git a/srcpkgs/python3-boltons/patches/py39-test.patch b/srcpkgs/python3-boltons/patches/py39-test.patch index eee52fc9cbb..45df36723a9 100644 --- a/srcpkgs/python3-boltons/patches/py39-test.patch +++ b/srcpkgs/python3-boltons/patches/py39-test.patch @@ -11,8 +11,8 @@ Subject: [PATCH] Fix Python 3.9 compatibility for FrozenDict due to PEP 584 diff --git boltons/dictutils.py boltons/dictutils.py index ce5884c..8d1a4e7 100644 ---- boltons/dictutils.py -+++ boltons/dictutils.py +--- a/boltons/dictutils.py ++++ b/boltons/dictutils.py @@ -1076,7 +1076,7 @@ def _raise_frozen_typeerror(self, *a, **kw): "raises a TypeError, because FrozenDicts are immutable" raise TypeError('%s object is immutable' % self.__class__.__name__) @@ -24,8 +24,8 @@ index ce5884c..8d1a4e7 100644 del _raise_frozen_typeerror diff --git tests/test_dictutils.py tests/test_dictutils.py index b6873a8..6eac812 100644 ---- tests/test_dictutils.py -+++ tests/test_dictutils.py +--- a/tests/test_dictutils.py ++++ b/tests/test_dictutils.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- diff --git a/srcpkgs/python3-boltons/template b/srcpkgs/python3-boltons/template index c0806503630..a4c71fb7713 100644 --- a/srcpkgs/python3-boltons/template +++ b/srcpkgs/python3-boltons/template @@ -13,7 +13,6 @@ license="BSD-3-Clause" homepage="https://github.com/mahmoud/boltons" distfiles="https://github.com/mahmoud/boltons/archive/${version}.tar.gz" checksum=f5b63fba62bed021c5086e43b4cfdaf6c8396a3ae1ccdcb549b4eb2f36f8a794 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch b/srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch index 1251ccbb94e..7af8c9d2402 100644 --- a/srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch +++ b/srcpkgs/python3-cli_helpers/patches/use-python3-mock-on-tests.patch @@ -1,7 +1,7 @@ diff --git tests/test_config.py tests/test_config.py index 3cbe211..4d2bc77 100644 ---- tests/test_config.py -+++ tests/test_config.py +--- a/tests/test_config.py ++++ b/tests/test_config.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import os diff --git a/srcpkgs/python3-cli_helpers/template b/srcpkgs/python3-cli_helpers/template index ab7008da0cc..91e22d2471c 100644 --- a/srcpkgs/python3-cli_helpers/template +++ b/srcpkgs/python3-cli_helpers/template @@ -15,7 +15,6 @@ license="BSD-3-Clause" homepage="https://github.com/dbcli/cli_helpers" distfiles="${PYPI_SITE}/c/cli_helpers/cli_helpers-${version}.tar.gz" checksum=98db22eaa86827d99ee6af9f5f3923142d04df256425204530842b032849a165 -patch_args=-Np0 do_check() { python3 -m pytest diff --git a/srcpkgs/python3-curtsies/patches/fix-setup.py.patch b/srcpkgs/python3-curtsies/patches/fix-setup.py.patch index a7587e733ef..e182f3bc28d 100644 --- a/srcpkgs/python3-curtsies/patches/fix-setup.py.patch +++ b/srcpkgs/python3-curtsies/patches/fix-setup.py.patch @@ -1,5 +1,5 @@ ---- setup.py.orig -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -41,7 +41,7 @@ def get_long_description(): install_requires = [ 'blessings>=1.5', diff --git a/srcpkgs/python3-curtsies/template b/srcpkgs/python3-curtsies/template index aa224291ddb..0d03da5b9b3 100644 --- a/srcpkgs/python3-curtsies/template +++ b/srcpkgs/python3-curtsies/template @@ -12,7 +12,6 @@ license="MIT" homepage="https://github.com/thomasballinger/curtsies" distfiles="${PYPI_SITE}/c/curtsies/curtsies-${version}.tar.gz" checksum=89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-entrypoints/patches/setup.py.patch b/srcpkgs/python3-entrypoints/patches/setup.py.patch index bc76686dcef..b39cd6d403b 100644 --- a/srcpkgs/python3-entrypoints/patches/setup.py.patch +++ b/srcpkgs/python3-entrypoints/patches/setup.py.patch @@ -1,5 +1,5 @@ --- /dev/null -+++ setup.py ++++ b/setup.py @@ -0,0 +1,14 @@ +from setuptools import setup + diff --git a/srcpkgs/python3-entrypoints/template b/srcpkgs/python3-entrypoints/template index 89093839963..eb3318811dc 100644 --- a/srcpkgs/python3-entrypoints/template +++ b/srcpkgs/python3-entrypoints/template @@ -12,7 +12,6 @@ license="MIT" homepage="https://github.com/takluyver/entrypoints" distfiles="https://github.com/takluyver/entrypoints/archive/${version}.tar.gz" checksum=f26eddc371e37d8e9f6663b77524d6731567f005bd1e4ac950c0e33c48fbc065 -patch_args=-Np0 pre_build() { vsed -i "s|@VERSION@|${version}|" setup.py diff --git a/srcpkgs/python3-gevent/patches/fix-tests.patch b/srcpkgs/python3-gevent/patches/fix-tests.patch index 61ddd278d72..65bf623a03d 100644 --- a/srcpkgs/python3-gevent/patches/fix-tests.patch +++ b/srcpkgs/python3-gevent/patches/fix-tests.patch @@ -1,7 +1,7 @@ OSError: [Errno 97] Address family not supported by protocol ---- src/gevent/tests/test__socket.py -+++ src/gevent/tests/test__socket.py +--- a/src/gevent/tests/test__socket.py ++++ b/src/gevent/tests/test__socket.py @@ -483,7 +483,7 @@ # use', which makes even less sense. The manylinux # 2010 environment produces 'errno 99 Cannot assign diff --git a/srcpkgs/python3-gevent/template b/srcpkgs/python3-gevent/template index e1ba6525214..4ec0c1ce42e 100644 --- a/srcpkgs/python3-gevent/template +++ b/srcpkgs/python3-gevent/template @@ -14,7 +14,6 @@ license="MIT" homepage="http://www.gevent.org/" distfiles="https://github.com/gevent/gevent/archive/${version}.tar.gz" checksum=1fc6579fee04c0bc348cb1dcbc10f822129e6af7dcf2c52c24f1497cea3bd45c -patch_args=-Np0 post_extract() { # purge bundled dependencies diff --git a/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch b/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch index efc271d01e0..8663e69a0e2 100644 --- a/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch +++ b/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch @@ -1,7 +1,7 @@ Make sure that setuptools_scm actually installs the module and entrypoint. ---- setup.cfg 2021-01-28 10:10:54.291152917 -0500 -+++ setup.cfg 2021-01-28 10:13:12.191007896 -0500 +--- a/setup.cfg 2021-01-28 10:10:54.291152917 -0500 ++++ b/setup.cfg 2021-01-28 10:13:12.191007896 -0500 @@ -61,3 +61,20 @@ tag_date = 0 tag_svn_revision = 0 diff --git a/srcpkgs/python3-gitchangelog/patches/setup.py.patch b/srcpkgs/python3-gitchangelog/patches/setup.py.patch index c9f5b7ced26..23c261a1fbd 100644 --- a/srcpkgs/python3-gitchangelog/patches/setup.py.patch +++ b/srcpkgs/python3-gitchangelog/patches/setup.py.patch @@ -2,8 +2,8 @@ The d2to1 package is defunct and not offered by Void; roughly equivalent functionality is provided by setuptools_scm, which is provided by Void. Drop the special d2to1 setup call to allow setuptools_scm to work properly. ---- setup.py 2021-01-28 10:00:20.165871918 -0500 -+++ setup.py 2021-01-28 10:01:07.760817952 -0500 +--- a/setup.py 2021-01-28 10:00:20.165871918 -0500 ++++ b/setup.py 2021-01-28 10:01:07.760817952 -0500 @@ -58,17 +58,4 @@ ## Normal d2to1 setup ## diff --git a/srcpkgs/python3-gitchangelog/template b/srcpkgs/python3-gitchangelog/template index 8c3a5cfb5aa..348dc2c83b6 100644 --- a/srcpkgs/python3-gitchangelog/template +++ b/srcpkgs/python3-gitchangelog/template @@ -12,7 +12,6 @@ license="BSD-3-Clause" homepage="https://github.com/vaab/gitchangelog" distfiles="${PYPI_SITE}/g/gitchangelog/gitchangelog-${version}.tar.gz" checksum=3d8d6a730450fbd5b0a9bc58d0dd3e269c967d7eb4fece0c5cff4372a3f77421 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch index a60b159c2e9..4b328a58fd9 100644 --- a/srcpkgs/python3-grpcio/patches/abseil-sucks.patch +++ b/srcpkgs/python3-grpcio/patches/abseil-sucks.patch @@ -5,8 +5,8 @@ An all-in-one patch that fixes several issues: 3) powerpc stacktrace implementation has ppc64 assumptions (fixed) 4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) ---- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -+++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc +--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc ++++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc @@ -20,7 +20,7 @@ #include <intrin.h> #endif @@ -25,8 +25,8 @@ An all-in-one patch that fixes several issues: int64_t UnscaledCycleClock::Now() { #ifdef __GLIBC__ ---- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h -+++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h +--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h ++++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h @@ -46,7 +46,7 @@ // The following platforms have an implementation of a hardware counter. @@ -36,8 +36,8 @@ An all-in-one patch that fixes several issues: defined(_M_IX86) || defined(_M_X64) #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 #else ---- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h -+++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h +--- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h ++++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h @@ -64,7 +64,7 @@ #elif defined(__i386__) || defined(__x86_64__) #define ABSL_STACKTRACE_INL_HEADER \ diff --git a/srcpkgs/python3-grpcio/template b/srcpkgs/python3-grpcio/template index 654abdcfada..d96e11f9c14 100644 --- a/srcpkgs/python3-grpcio/template +++ b/srcpkgs/python3-grpcio/template @@ -13,7 +13,6 @@ license="Apache-2.0" homepage="https://grpc.io" distfiles="${PYPI_SITE}/g/grpcio/grpcio-${version}.tar.gz" checksum=abbf9c8c3df4d5233d5888c6cfa85c1bb68a6923749bd4dd1abc6e1e93986f17 -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/python3-mygpoclient/patches/python3-fix-comparison-with-literal.patch b/srcpkgs/python3-mygpoclient/patches/python3-fix-comparison-with-literal.patch index b9425ea1eae..5f08626b43a 100644 --- a/srcpkgs/python3-mygpoclient/patches/python3-fix-comparison-with-literal.patch +++ b/srcpkgs/python3-mygpoclient/patches/python3-fix-comparison-with-literal.patch @@ -12,8 +12,8 @@ See https://bugs.python.org/issue34850 diff --git a/mygpoclient/locator.py b/mygpoclient/locator.py index c0dc9d7..810f973 100644 ---- mygpoclient/locator.py -+++ mygpoclient/locator.py +--- a/mygpoclient/locator.py ++++ b/mygpoclient/locator.py @@ -317,17 +317,17 @@ def settings_uri(self, type, scope_param1, scope_param2): filename = self._username + '/%(type)s.json' % locals() diff --git a/srcpkgs/python3-mygpoclient/template b/srcpkgs/python3-mygpoclient/template index 5aa34ad58d1..6ed17293703 100644 --- a/srcpkgs/python3-mygpoclient/template +++ b/srcpkgs/python3-mygpoclient/template @@ -13,7 +13,6 @@ homepage="https://github.com/gpodder/mygpoclient" distfiles="${homepage}/archive/${version}.tar.gz" checksum=65fcb3ab220a2ba2d32a77f969b423a2f663413b6c485b7b02e5a955b28e68d2 conflicts="python-mygpoclient>=0" -patch_args=-Np0 pre_build() { vsed -i '/share\/man\/man1/d' setup.py diff --git a/srcpkgs/python3-nose2/patches/no-versioned-nose2.patch b/srcpkgs/python3-nose2/patches/no-versioned-nose2.patch index bfe3dfa0c24..dbd8b0a7867 100644 --- a/srcpkgs/python3-nose2/patches/no-versioned-nose2.patch +++ b/srcpkgs/python3-nose2/patches/no-versioned-nose2.patch @@ -1,5 +1,5 @@ ---- setup.py.orig -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -89,7 +89,6 @@ else: params['entry_points'] = { 'console_scripts': [ diff --git a/srcpkgs/python3-nose2/template b/srcpkgs/python3-nose2/template index ac13621690a..d1f95c3e373 100644 --- a/srcpkgs/python3-nose2/template +++ b/srcpkgs/python3-nose2/template @@ -13,7 +13,6 @@ homepage="https://github.com/nose-devs/nose2" distfiles="${PYPI_SITE}/n/nose2/nose2-${version}.tar.gz" checksum=9052f2b46807b63d9bdf68e0768da1f8386368889b50043fd5d0889c470258f3 conflicts="python-nose2>=0" -patch_args=-Np0 post_install() { vlicense license.txt diff --git a/srcpkgs/python3-orocos-kdl/patches/sip.patch b/srcpkgs/python3-orocos-kdl/patches/sip.patch index 1aae42273fc..ce2943f93e3 100644 --- a/srcpkgs/python3-orocos-kdl/patches/sip.patch +++ b/srcpkgs/python3-orocos-kdl/patches/sip.patch @@ -11,8 +11,8 @@ operator. This PR makes this known to SIP as well. [ Rebased against release version by Andrew J. Hesford. ] --- diff -ur python_orocos_kdl/PyKDL.orig/dynamics.sip python_orocos_kdl/PyKDL/dynamics.sip ---- python_orocos_kdl/PyKDL.orig/dynamics.sip 2020-10-08 09:41:13.830476720 -0400 -+++ python_orocos_kdl/PyKDL/dynamics.sip 2020-10-08 09:41:58.875476576 -0400 +--- a/python_orocos_kdl/PyKDL/dynamics.sip 2020-10-08 09:41:13.830476720 -0400 ++++ b/python_orocos_kdl/PyKDL/dynamics.sip 2020-10-08 09:41:58.875476576 -0400 @@ -72,4 +72,6 @@ int JntToCoriolis(const JntArray &q, const JntArray &q_dot, JntArray &coriolis); int JntToMass(const JntArray &q, JntSpaceInertiaMatrix& H); @@ -21,8 +21,8 @@ diff -ur python_orocos_kdl/PyKDL.orig/dynamics.sip python_orocos_kdl/PyKDL/dynam + ChainDynParam& operator=(const ChainDynParam&); }; diff -ur python_orocos_kdl/PyKDL.orig/kinfam.sip python_orocos_kdl/PyKDL/kinfam.sip ---- python_orocos_kdl/PyKDL.orig/kinfam.sip 2020-10-08 09:41:13.830476720 -0400 -+++ python_orocos_kdl/PyKDL/kinfam.sip 2020-10-08 09:47:26.314475457 -0400 +--- a/python_orocos_kdl/PyKDL/kinfam.sip 2020-10-08 09:41:13.830476720 -0400 ++++ b/python_orocos_kdl/PyKDL/kinfam.sip 2020-10-08 09:47:26.314475457 -0400 @@ -344,6 +344,8 @@ ChainFkSolverPos_recursive(const Chain& chain); virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1); diff --git a/srcpkgs/python3-orocos-kdl/template b/srcpkgs/python3-orocos-kdl/template index d27ab90a9b7..281ea8978c5 100644 --- a/srcpkgs/python3-orocos-kdl/template +++ b/srcpkgs/python3-orocos-kdl/template @@ -15,4 +15,3 @@ license="LGPL-2.1-only" homepage="http://www.orocos.org/kdl" distfiles="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${version}.tar.gz" checksum=05b93e759923684dc07433ccae1e476d158d89b3c2be5079c20062406da7b4dd -patch_args=-Np0 diff --git a/srcpkgs/python3-pdfminer.six/patches/dep.patch b/srcpkgs/python3-pdfminer.six/patches/dep.patch index c5c7186184f..4cbc19d8d31 100644 --- a/srcpkgs/python3-pdfminer.six/patches/dep.patch +++ b/srcpkgs/python3-pdfminer.six/patches/dep.patch @@ -1,5 +1,5 @@ ---- ./CHANGELOG.md -+++ ./CHANGELOG.md +--- a/CHANGELOG.md ++++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes in pdfminer.six will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). @@ -13,8 +13,8 @@ ### Deprecated ---- ./setup.py -+++ ./setup.py +--- a/setup.py ++++ b/setup.py @@ -15,7 +15,6 @@ install_requires=[ 'chardet ; python_version > "3.0"', diff --git a/srcpkgs/python3-pdfminer.six/template b/srcpkgs/python3-pdfminer.six/template index bb75c36e196..753dbfb9b81 100644 --- a/srcpkgs/python3-pdfminer.six/template +++ b/srcpkgs/python3-pdfminer.six/template @@ -13,7 +13,6 @@ license="MIT" homepage="https://github.com/pdfminer/pdfminer.six" distfiles="${homepage}/archive/refs/tags/${version}.tar.gz" checksum=0e9c8b0a9c40c2aee044c3091ad6b18b5e6279722e64b6b975f8aedc26bf8e38 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-pikepdf/patches/remove_pytest-xdist_dependency.patch b/srcpkgs/python3-pikepdf/patches/remove_pytest-xdist_dependency.patch index 27d129188df..8532dd07449 100644 --- a/srcpkgs/python3-pikepdf/patches/remove_pytest-xdist_dependency.patch +++ b/srcpkgs/python3-pikepdf/patches/remove_pytest-xdist_dependency.patch @@ -1,5 +1,5 @@ ---- setup.cfg -+++ setup.cfg +--- a/setup.cfg ++++ b/setup.cfg @@ -7,8 +7,6 @@ test=pytest [tool:pytest] norecursedirs = lib .pc .git venv diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template index 21329296c6c..c2ff79e138f 100644 --- a/srcpkgs/python3-pikepdf/template +++ b/srcpkgs/python3-pikepdf/template @@ -14,7 +14,6 @@ license="MPL-2.0" homepage="https://github.com/pikepdf/pikepdf" distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz" checksum=5ff35499b1ae7b181277f78ce5b1bcc8d3009182bb389917791c5dc811fcc8e4 -patch_args=-Np0 pre_build() { vsed -e '/setuptools_scm_git_archive/d' -i setup.py diff --git a/srcpkgs/python3-pip/patches/no-versioned-pip.patch b/srcpkgs/python3-pip/patches/no-versioned-pip.patch index 7fb56fda667..d6d446b2157 100644 --- a/srcpkgs/python3-pip/patches/no-versioned-pip.patch +++ b/srcpkgs/python3-pip/patches/no-versioned-pip.patch @@ -1,5 +1,5 @@ ---- setup.py -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -70,8 +70,6 @@ entry_points={ "console_scripts": [ diff --git a/srcpkgs/python3-pip/template b/srcpkgs/python3-pip/template index b30bc633412..4dbc22b73b4 100644 --- a/srcpkgs/python3-pip/template +++ b/srcpkgs/python3-pip/template @@ -15,7 +15,6 @@ distfiles="${PYPI_SITE}/p/pip/pip-${version}.tar.gz" checksum=eb5df6b9ab0af50fe1098a52fd439b04730b6e066887ff7497357b9ebd19f79b # Tests have unpackaged dependencies make_check=no -patch_args=-Np0 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python3-pwntools/patches/do-not-check-build-python-header.patch b/srcpkgs/python3-pwntools/patches/do-not-check-build-python-header.patch index 56e8b6b78b0..739af6984c4 100644 --- a/srcpkgs/python3-pwntools/patches/do-not-check-build-python-header.patch +++ b/srcpkgs/python3-pwntools/patches/do-not-check-build-python-header.patch @@ -1,7 +1,7 @@ Index: setup.py =================================================================== ---- setup.py -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -64,13 +64,6 @@ install_requires = ['paramiko>=1.15. 'six>=1.12.0', ] diff --git a/srcpkgs/python3-pwntools/template b/srcpkgs/python3-pwntools/template index 753c28f1c68..76ec9944221 100644 --- a/srcpkgs/python3-pwntools/template +++ b/srcpkgs/python3-pwntools/template @@ -17,7 +17,6 @@ license="MIT, BSD-2-Clause" homepage="https://github.com/Gallopsled/pwntools" distfiles="${PYPI_SITE}/p/pwntools/pwntools-${version}.tar.gz" checksum=97f945aed7ffa9d3e87f8759df83a5eac6dc2112907f35d0aee66a9bf62fd8eb -patch_args=-Np0 post_install() { rm -f ${DESTDIR}/usr/lib/python*/site-packages/*.md diff --git a/srcpkgs/python3-pykeepass/patches/be.patch b/srcpkgs/python3-pykeepass/patches/be.patch index 5b6f819ad84..7fcdca64954 100644 --- a/srcpkgs/python3-pykeepass/patches/be.patch +++ b/srcpkgs/python3-pykeepass/patches/be.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fix big endian support diff --git pykeepass/kdbx_parsing/pytwofish.py pykeepass/kdbx_parsing/pytwofish.py index 7cea419..4749d72 100644 ---- pykeepass/kdbx_parsing/pytwofish.py -+++ pykeepass/kdbx_parsing/pytwofish.py +--- a/pykeepass/kdbx_parsing/pytwofish.py ++++ b/pykeepass/kdbx_parsing/pytwofish.py @@ -140,8 +140,9 @@ import struct import sys diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template index 7223950538b..dc3fe59fa41 100644 --- a/srcpkgs/python3-pykeepass/template +++ b/srcpkgs/python3-pykeepass/template @@ -15,4 +15,3 @@ homepage="https://github.com/libkeepass/pykeepass" changelog="https://raw.githubusercontent.com/libkeepass/pykeepass/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/p/pykeepass/pykeepass-${version}.tar.gz" checksum=b3e07eb2dd3aeb1dfa1a2d2d17be77066ee560c1e770f1c72d7ea5608117d284 -patch_args=-Np0 diff --git a/srcpkgs/python3-pylibgen/patches/fix-setup.patch b/srcpkgs/python3-pylibgen/patches/fix-setup.patch index 1fa9e9f2acb..d6d6afcc900 100644 --- a/srcpkgs/python3-pylibgen/patches/fix-setup.patch +++ b/srcpkgs/python3-pylibgen/patches/fix-setup.patch @@ -1,7 +1,7 @@ diff --git setup.py setup.py index 1a84791..1a6d7c2 100644 ---- setup.py -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -14,9 +14,6 @@ with open(os.path.join(here, "README.md")) as f: with open(os.path.join(here, "requirements.txt")) as f: install_requires = f.read() diff --git a/srcpkgs/python3-pylibgen/template b/srcpkgs/python3-pylibgen/template index d59a68eca8a..4d77619ae93 100644 --- a/srcpkgs/python3-pylibgen/template +++ b/srcpkgs/python3-pylibgen/template @@ -12,7 +12,6 @@ license="MIT" homepage="https://github.com/JoshuaRLi/pylibgen" distfiles="${PYPI_SITE}/p/pylibgen/pylibgen-${version}.tar.gz" checksum=87b28a27fa7c1912e2b38020262dd6086b292d670b0c08d76baecbcd7678b9ee -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch index daad1fea702..0498ad09e40 100644 --- a/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch +++ b/srcpkgs/python3-pyside2/patches/crossbuild-for-shiboken2.patch @@ -1,5 +1,5 @@ ---- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG -+++ sources/pyside2/cmake/Macros/PySideModules.cmake +--- a/sources/pyside2/cmake/Macros/PySideModules.cmake ++++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -94,7 +94,7 @@ # Workaround: Added ${QT_INCLUDE_DIR}/QtCore until # qtdeclarative/8d560d1bf0a747bf62f73fad6b6774095442d9d2 has reached qt5.git diff --git a/srcpkgs/python3-pyside2/patches/crossbuild-no-pyi-generation.patch b/srcpkgs/python3-pyside2/patches/crossbuild-no-pyi-generation.patch index b43838964b5..f9dd51b585b 100644 --- a/srcpkgs/python3-pyside2/patches/crossbuild-no-pyi-generation.patch +++ b/srcpkgs/python3-pyside2/patches/crossbuild-no-pyi-generation.patch @@ -2,8 +2,8 @@ pyside2 cmake code does not handle crossbuild while generating pyi files. (stub files for type checker). From now, disable their generation. ---- sources/pyside2/cmake/Macros/PySideModules.cmake.ORIG -+++ sources/pyside2/cmake/Macros/PySideModules.cmake +--- a/sources/pyside2/cmake/Macros/PySideModules.cmake ++++ b/sources/pyside2/cmake/Macros/PySideModules.cmake @@ -201,18 +201,24 @@ endif() diff --git a/srcpkgs/python3-pyside2/patches/no-python-arch-suffix.patch b/srcpkgs/python3-pyside2/patches/no-python-arch-suffix.patch index 67a52d3efa0..756c3821872 100644 --- a/srcpkgs/python3-pyside2/patches/no-python-arch-suffix.patch +++ b/srcpkgs/python3-pyside2/patches/no-python-arch-suffix.patch @@ -3,8 +3,8 @@ so libs and cmake files: removes intermediate suffix like ".cpython-36m-x86_64-l Avoid overwriting the "real" cmake file with the generic wrapper's one (same name in such a case) ---- sources/pyside2/libpyside/CMakeLists.txt.ORIG -+++ sources/pyside2/libpyside/CMakeLists.txt +--- a/sources/pyside2/libpyside/CMakeLists.txt ++++ b/sources/pyside2/libpyside/CMakeLists.txt @@ -177,8 +177,6 @@ PATH_VARS PYSIDE_PYTHONPATH PYSIDE_TYPESYSTEMS PYSIDE_GLUE ) diff --git a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch index 540e4304958..90e34a4b531 100644 --- a/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch +++ b/srcpkgs/python3-pyside2/patches/tests-correct-build_dir.patch @@ -1,7 +1,7 @@ Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430 ---- sources/pyside2/tests/CMakeLists.txt.ORIG 2020-11-11 13:51:30.000000000 +0100 -+++ sources/pyside2/tests/CMakeLists.txt 2020-11-24 11:42:34.629110123 +0100 +--- a/sources/pyside2/tests/CMakeLists.txt 2020-11-11 13:51:30.000000000 +0100 ++++ b/sources/pyside2/tests/CMakeLists.txt 2020-11-24 11:42:34.629110123 +0100 @@ -7,8 +7,7 @@ # BUILD_DIR and QT_DIR are used by init_paths.py for setting diff --git a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch index ca4894b6fa9..a364e739fa2 100644 --- a/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch +++ b/srcpkgs/python3-pyside2/patches/tests-disable-invalid-ones.patch @@ -3,12 +3,12 @@ unsupported by vnc virtual backend. Raw testing Status: 98% tests passed, 9 tests failed out of 471 ---- sources/pyside2/tests/QtDataVisualization/CMakeLists.txt.ORIG -+++ sources/pyside2/tests/QtDataVisualization/CMakeLists.txt +--- a/sources/pyside2/tests/QtDataVisualization/CMakeLists.txt ++++ b/sources/pyside2/tests/QtDataVisualization/CMakeLists.txt @@ -1 +0,0 @@ -PYSIDE_TEST(datavisualization_test.py) ---- sources/pyside2/tests/QtGui/CMakeLists.txt.ORIG -+++ sources/pyside2/tests/QtGui/CMakeLists.txt +--- a/sources/pyside2/tests/QtGui/CMakeLists.txt ++++ b/sources/pyside2/tests/QtGui/CMakeLists.txt @@ -20,14 +20,12 @@ PYSIDE_TEST(qcolor_test.py) PYSIDE_TEST(qcolor_reduce_test.py) @@ -24,31 +24,31 @@ Raw testing Status: 98% tests passed, 9 tests failed out of 471 PYSIDE_TEST(qpainter_test.py) PYSIDE_TEST(qpdfwriter_test.py) PYSIDE_TEST(qpixelformat_test.py) ---- sources/pyside2/tests/QtOpenGL/CMakeLists.txt.ORIG -+++ sources/pyside2/tests/QtOpenGL/CMakeLists.txt +--- a/sources/pyside2/tests/QtOpenGL/CMakeLists.txt ++++ b/sources/pyside2/tests/QtOpenGL/CMakeLists.txt @@ -1,2 +1 @@ -PYSIDE_TEST(qglbuffer_test.py) PYSIDE_TEST(qglwidget_test.py) ---- sources/pyside2/tests/QtScriptTools/CMakeLists.txt.ORIG -+++ sources/pyside2/tests/QtScriptTools/CMakeLists.txt +--- a/sources/pyside2/tests/QtScriptTools/CMakeLists.txt ++++ b/sources/pyside2/tests/QtScriptTools/CMakeLists.txt @@ -1 +0,0 @@ -PYSIDE_TEST(debugger_test.py) ---- sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt.ORIG -+++ sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt +--- a/sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt ++++ b/sources/pyside2/tests/QtWebEngineCore/CMakeLists.txt @@ -26,4 +26,3 @@ ## ############################################################################# -PYSIDE_TEST(web_engine_custom_scheme.py) ---- sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt.ORIG -+++ sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt +--- a/sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt ++++ b/sources/pyside2/tests/QtWebEngineWidgets/CMakeLists.txt @@ -26,4 +26,3 @@ ## ############################################################################# -PYSIDE_TEST(pyside-474-qtwebengineview.py) ---- sources/pyside2/tests/QtWidgets/CMakeLists.txt.ORIG -+++ sources/pyside2/tests/QtWidgets/CMakeLists.txt +--- a/sources/pyside2/tests/QtWidgets/CMakeLists.txt ++++ b/sources/pyside2/tests/QtWidgets/CMakeLists.txt @@ -6,7 +6,6 @@ PYSIDE_TEST(application_test.py) PYSIDE_TEST(bug_172.py) @@ -65,8 +65,8 @@ Raw testing Status: 98% tests passed, 9 tests failed out of 471 PYSIDE_TEST(qcolormap_test.py) PYSIDE_TEST(reference_count_test.py) PYSIDE_TEST(signature_test.py) ---- sources/pyside2/tests/registry/CMakeLists.txt.ORIG -+++ sources/pyside2/tests/registry/CMakeLists.txt +--- a/sources/pyside2/tests/registry/CMakeLists.txt ++++ b/sources/pyside2/tests/registry/CMakeLists.txt @@ -37,4 +37,3 @@ ## ############################################################################# diff --git a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch index 673998bc049..c9115239740 100644 --- a/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch +++ b/srcpkgs/python3-pyside2/patches/tests-find-python-modules-from-build.patch @@ -1,8 +1,8 @@ tests need python modules that are not installed yet: point the built ones. Reported upstream: https://bugreports.qt.io/browse/PYSIDE-1430 ---- sources/pyside2/tests/init_paths.py.ORIG 2020-11-11 13:51:30.000000000 +0100 -+++ sources/pyside2/tests/init_paths.py 2020-11-21 23:36:33.131282473 +0100 +--- a/sources/pyside2/tests/init_paths.py 2020-11-11 13:51:30.000000000 +0100 ++++ b/sources/pyside2/tests/init_paths.py 2020-11-21 23:36:33.131282473 +0100 @@ -75,12 +75,12 @@ python_dirs = [os.path.join(src_dir, 'util')] # Helper module diff --git a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch index 2c2e1367907..7f3ab1172f9 100644 --- a/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch +++ b/srcpkgs/python3-pyside2/patches/tests-python-syntax.patch @@ -31,8 +31,8 @@ Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> diff --git build_history/blacklist.txt build_history/blacklist.txt index 9b63f9784..2a2a5d4c4 100644 ---- build_history/blacklist.txt -+++ build_history/blacklist.txt +--- a/build_history/blacklist.txt ++++ b/build_history/blacklist.txt @@ -18,9 +18,6 @@ darwin py3 [QtCore::qfileread_test] @@ -45,8 +45,8 @@ index 9b63f9784..2a2a5d4c4 100644 darwin diff --git sources/pyside2/tests/QtCore/qflags_test.py sources/pyside2/tests/QtCore/qflags_test.py index 08a7c55b1..e1e989c1e 100644 ---- sources/pyside2/tests/QtCore/qflags_test.py -+++ sources/pyside2/tests/QtCore/qflags_test.py +--- a/sources/pyside2/tests/QtCore/qflags_test.py ++++ b/sources/pyside2/tests/QtCore/qflags_test.py @@ -30,6 +30,7 @@ '''Test cases for QFlags''' @@ -76,8 +76,8 @@ index 08a7c55b1..e1e989c1e 100644 unittest.main() diff --git sources/shiboken2/generator/shiboken2/cppgenerator.cpp sources/shiboken2/generator/shiboken2/cppgenerator.cpp index ff44db955..87ddd73a5 100644 ---- sources/shiboken2/generator/shiboken2/cppgenerator.cpp -+++ sources/shiboken2/generator/shiboken2/cppgenerator.cpp +--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp ++++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp @@ -5230,6 +5230,8 @@ void CppGenerator::writeFlagsBinaryOperator(QTextStream &s, const AbstractMetaEn s << INDENT << "cppArg = static_cast<" << flagsEntry->originalName() << ">(int(PyInt_AsLong(" << PYTHON_ARG << ")));\n"; @@ -93,8 +93,8 @@ index ff44db955..87ddd73a5 100644 Fix python warning about 'is not' usage. This diff is DISTINCT from the previous patch ---- sources/pyside2/tests/QtWidgets/qwidget_test.py 2020-11-11 13:51:30.000000000 +0100 -+++ sources/pyside2/tests/QtWidgets/qwidget_test.py 2020-11-24 14:28:06.103093649 +0100 +--- a/sources/pyside2/tests/QtWidgets/qwidget_test.py 2020-11-11 13:51:30.000000000 +0100 ++++ b/sources/pyside2/tests/QtWidgets/qwidget_test.py 2020-11-24 14:28:06.103093649 +0100 @@ -73,7 +73,7 @@ self.assertTrue(not widget.isVisible()) widget.setVisible(True) diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template index c0387c4d6d0..6040ef39243 100644 --- a/srcpkgs/python3-pyside2/template +++ b/srcpkgs/python3-pyside2/template @@ -25,7 +25,6 @@ license="LGPL-3.0-or-later" homepage="https://wiki.qt.io/Qt_for_Python" distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz" checksum=b306504b0b8037079a8eab772ee774b9e877a2d84bab2dbefbe4fa6f83941418 -patch_args=-Np0 build_options="webengine" desc_option_webengine="Build Qt5 WebEngine bindings" diff --git a/srcpkgs/python3-repoze.sphinx.autointerface/patches/sphinx3.patch b/srcpkgs/python3-repoze.sphinx.autointerface/patches/sphinx3.patch index 7611b89a2b3..d823ceb8fe8 100644 --- a/srcpkgs/python3-repoze.sphinx.autointerface/patches/sphinx3.patch +++ b/srcpkgs/python3-repoze.sphinx.autointerface/patches/sphinx3.patch @@ -14,8 +14,8 @@ Modified by fosslinux. diff --git repoze/sphinx/autointerface.py repoze/sphinx/autointerface.py index 597567e..147c790 100644 ---- repoze/sphinx/autointerface.py -+++ repoze/sphinx/autointerface.py +--- a/repoze/sphinx/autointerface.py ++++ b/repoze/sphinx/autointerface.py @@ -1,2 +1,10 @@ from zope.interface.interface import InterfaceClass diff --git a/srcpkgs/python3-repoze.sphinx.autointerface/template b/srcpkgs/python3-repoze.sphinx.autointerface/template index 9feb6d5a273..18141a5bd46 100644 --- a/srcpkgs/python3-repoze.sphinx.autointerface/template +++ b/srcpkgs/python3-repoze.sphinx.autointerface/template @@ -13,7 +13,6 @@ license="BSD-4-Clause" homepage="https://github.com/repoze/repoze.sphinx.autointerface/" distfiles="${PYPI_SITE}/r/repoze.sphinx.autointerface/repoze.sphinx.autointerface-${version}.tar.gz" checksum=8ef0383276ab722efb1e4a6523726262058dfd82615ccf7e5004aee3fe8ecc23 -patch_args=-Np0 post_install() { vlicense LICENSE.txt diff --git a/srcpkgs/python3-telegram/patches/remove-precompiled-libraries.patch b/srcpkgs/python3-telegram/patches/remove-precompiled-libraries.patch index 4a84da651a6..73f4376b25d 100644 --- a/srcpkgs/python3-telegram/patches/remove-precompiled-libraries.patch +++ b/srcpkgs/python3-telegram/patches/remove-precompiled-libraries.patch @@ -2,8 +2,8 @@ # Upstream issue: https://github.com/alexander-akhmetov/python-telegram/issues/119 diff --git a/setup.py b/setup.py index a1ac7b0..aecc107 100644 ---- setup.py -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -25,10 +25,4 @@ setup( packages=[ 'telegram', diff --git a/srcpkgs/python3-telegram/patches/use-system-tdlib.patch b/srcpkgs/python3-telegram/patches/use-system-tdlib.patch index 298db83a5c1..ef13f12a5b6 100644 --- a/srcpkgs/python3-telegram/patches/use-system-tdlib.patch +++ b/srcpkgs/python3-telegram/patches/use-system-tdlib.patch @@ -2,8 +2,8 @@ # Upstream issue: https://github.com/alexander-akhmetov/python-telegram/issues/119 diff --git a/telegram/tdjson.py b/telegram/tdjson.py index 091145e..21c0361 100644 ---- telegram/tdjson.py -+++ telegram/tdjson.py +--- a/telegram/tdjson.py ++++ b/telegram/tdjson.py @@ -2,6 +2,7 @@ import json import logging import platform diff --git a/srcpkgs/python3-telegram/template b/srcpkgs/python3-telegram/template index a865f479908..13cc66ab33c 100644 --- a/srcpkgs/python3-telegram/template +++ b/srcpkgs/python3-telegram/template @@ -12,7 +12,6 @@ license="MIT" homepage="https://github.com/alexander-akhmetov/python-telegram" distfiles="https://github.com/alexander-akhmetov/python-telegram/archive/${version}.tar.gz" checksum=11b0a2387bae642eb7f134fe35b9ef67b8183aa961412bcdfa86ff404beed897 -patch_args=-Np0 post_extract() { rm -r telegram/lib diff --git a/srcpkgs/python3-transifex-client/patches/relax-deps.patch b/srcpkgs/python3-transifex-client/patches/relax-deps.patch index 38a1c1a6682..272634f3775 100644 --- a/srcpkgs/python3-transifex-client/patches/relax-deps.patch +++ b/srcpkgs/python3-transifex-client/patches/relax-deps.patch @@ -1,5 +1,5 @@ ---- requirements.txt.orig 2019-03-05 20:38:40.487366801 +0100 -+++ requirements.txt 2019-03-05 20:39:34.522087398 +0100 +--- a/requirements.txt 2019-03-05 20:38:40.487366801 +0100 ++++ b/requirements.txt 2019-03-05 20:39:34.522087398 +0100 @@ -1,4 +1,4 @@ -urllib3<1.24 -six==1.11.0 diff --git a/srcpkgs/python3-transifex-client/template b/srcpkgs/python3-transifex-client/template index c71fd7a3233..e34c310c0a8 100644 --- a/srcpkgs/python3-transifex-client/template +++ b/srcpkgs/python3-transifex-client/template @@ -13,4 +13,3 @@ license="GPL-2.0-only" homepage="https://www.transifex.com" distfiles="https://github.com/transifex/transifex-client/archive/${version}.tar.gz" checksum=460f3a829e57b8025280e03a6ad497a87beba142adb2e1579678227f49d4a9ab -patch_args=-Np0 diff --git a/srcpkgs/python3-yara/patches/use-system-yara.patch b/srcpkgs/python3-yara/patches/use-system-yara.patch index 89b36bd567c..104bc865a1b 100644 --- a/srcpkgs/python3-yara/patches/use-system-yara.patch +++ b/srcpkgs/python3-yara/patches/use-system-yara.patch @@ -1,5 +1,5 @@ ---- setup.py.orig 2019-05-02 17:34:46.000000000 +0800 -+++ setup.py 2019-05-07 08:20:20.841022106 +0800 +--- a/setup.py 2019-05-02 17:34:46.000000000 +0800 ++++ b/setup.py 2019-05-07 08:20:20.841022106 +0800 @@ -325,5 +325,5 @@ 'update': UpdateCommand}, ext_modules=[Extension( diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template index 359edc090a5..d3c42f7fa06 100644 --- a/srcpkgs/python3-yara/template +++ b/srcpkgs/python3-yara/template @@ -13,4 +13,3 @@ license="Apache-2.0" homepage="http://virustotal.github.io/yara/" distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz" checksum=4bc1a69bc9c5f70419806e15a05123a7879456b52a9c50832c34c22eecb4de81 -patch_args=-Np0 diff --git a/srcpkgs/python3/patches/musl-find_library.patch b/srcpkgs/python3/patches/musl-find_library.patch index ec9f3d94f15..82f436b4072 100644 --- a/srcpkgs/python3/patches/musl-find_library.patch +++ b/srcpkgs/python3/patches/musl-find_library.patch @@ -1,5 +1,5 @@ ---- Lib/ctypes/util.py.orig -+++ Lib/ctypes/util.py +--- a/Lib/ctypes/util.py ++++ b/Lib/ctypes/util.py @@ -204,6 +204,41 @@ def find_library(name, is64 = False): return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name)) diff --git a/srcpkgs/python3/patches/ppcle.patch b/srcpkgs/python3/patches/ppcle.patch index 7cc7bd2dd09..9ed7b9cef4e 100644 --- a/srcpkgs/python3/patches/ppcle.patch +++ b/srcpkgs/python3/patches/ppcle.patch @@ -10,8 +10,8 @@ Subject: [PATCH] add powerpcle triple diff --git configure configure index 2d379fe..97d1f9b 100755 ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -5302,7 +5302,11 @@ cat >> conftest.c <<EOF powerpc64-linux-gnu # endif @@ -26,8 +26,8 @@ index 2d379fe..97d1f9b 100755 # elif defined(__s390__) diff --git configure.ac configure.ac index c968d14..499ef7a 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -826,7 +826,11 @@ cat >> conftest.c <<EOF powerpc64-linux-gnu # endif diff --git a/srcpkgs/python3/patches/tweak-MULTIARCH-for-powerpc-linux-musl.patch b/srcpkgs/python3/patches/tweak-MULTIARCH-for-powerpc-linux-musl.patch index 0240928cff8..387da05da3c 100644 --- a/srcpkgs/python3/patches/tweak-MULTIARCH-for-powerpc-linux-musl.patch +++ b/srcpkgs/python3/patches/tweak-MULTIARCH-for-powerpc-linux-musl.patch @@ -1,5 +1,5 @@ ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -5205,6 +5205,14 @@ MULTIARCH=$($CC --print-multiarch 2>/dev/null) diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 6bcb10bfc66..40c6cc1ef8e 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -18,7 +18,6 @@ license="Python-2.0" homepage="https://www.python.org" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" checksum=0c5a140665436ec3dbfbb79e2dfb6d192655f26ef4a29aeffcb6d1820d716d83 -patch_args=-Np0 alternatives=" python:idle:/usr/bin/idle${version%.*} |