From c6ce65d3d01e10c330144c6616c5afd6695be44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 19 Jun 2021 09:18:31 +0700 Subject: [PATCH] srcpkgs/b*: convert patches to -Np1 ```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.-][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ``` --- srcpkgs/bacula-common/patches/fix-cross.patch | 4 +- srcpkgs/bacula-common/patches/fix-musl.patch | 4 +- srcpkgs/bacula-common/template | 1 - srcpkgs/balsa/patches/portability.patch | 4 +- srcpkgs/balsa/template | 1 - srcpkgs/bananapi-uboot/patches/musl.patch | 12 +-- .../no-inline-show_boot_progress.patch | 4 +- .../patches/no-inline-weak.patch | 4 +- .../patches/static-inline.patch | 4 +- srcpkgs/bananapi-uboot/template | 1 - srcpkgs/basu/patches/uid-nobody.patch | 4 +- srcpkgs/basu/template | 1 - srcpkgs/batctl14/patches/musl.patch | 16 ++-- srcpkgs/batctl14/template | 1 - .../batman-adv14/patches/0001-fix-build.diff | 84 +++++++++---------- srcpkgs/batman-adv14/template | 1 - srcpkgs/bbkeys/patches/fix-cross.patch | 8 +- srcpkgs/bbkeys/template | 1 - ...s-structure-for-kernel-version-5.6.0.patch | 4 +- .../0002-Add-missing-proc_fs.h-header.patch | 4 +- srcpkgs/bbswitch/template | 1 - srcpkgs/bc/patches/read.patch | 4 +- srcpkgs/bc/template | 1 - srcpkgs/bcc/patches/musl.patch | 20 ++--- srcpkgs/bcc/template | 1 - .../bctoolbox/patches/cmake-bcunit-fix.patch | 4 +- srcpkgs/bctoolbox/template | 1 - srcpkgs/beep/patches/CVE-2018-0492.patch | 4 +- srcpkgs/beep/template | 1 - srcpkgs/beets/patches/python-3.8.patch | 4 +- srcpkgs/beets/template | 1 - srcpkgs/beignet/patches/cl_uint.patch | 8 +- ...419a0008e38ef2d9d255d9e9c74e9fba084b.patch | 24 +++--- srcpkgs/beignet/patches/llvm06.patch | 8 +- srcpkgs/beignet/patches/llvm08.patch | 8 +- srcpkgs/beignet/patches/llvm09.patch | 20 ++--- srcpkgs/beignet/patches/llvm10.patch | 44 +++++----- srcpkgs/beignet/patches/llvm11.patch | 44 +++++----- srcpkgs/beignet/patches/llvm12.patch | 20 ++--- srcpkgs/beignet/patches/musl.patch | 4 +- srcpkgs/beignet/template | 1 - srcpkgs/belle-sip/patches/musl.patch | 4 +- srcpkgs/belle-sip/template | 1 - .../patches/remove_bzlib_convenience.patch | 12 +-- .../patches/remove_zlib_convenience.patch | 16 ++-- .../patches/reproducibility.patch | 8 +- srcpkgs/berkeley-abc/template | 1 - srcpkgs/berry/patches/fix-cross.patch | 4 +- srcpkgs/berry/template | 1 - srcpkgs/biew/patches/bool.patch | 4 +- srcpkgs/biew/template | 1 - srcpkgs/bin86/patches/fix_x86_64.diff | 4 +- srcpkgs/bin86/template | 1 - .../binwalk/patches/fallback-version.patch | 4 +- srcpkgs/binwalk/template | 1 - srcpkgs/biosdisk/patches/fix-sbin.patch | 4 +- srcpkgs/biosdisk/template | 1 - srcpkgs/bird/patches/fix-tests-musl.patch | 4 +- srcpkgs/bird/template | 1 - srcpkgs/birdtray/patches/QPainterPath.patch | 4 +- srcpkgs/birdtray/template | 1 - srcpkgs/bish/patches/fix-ldflags.patch | 4 +- srcpkgs/bish/template | 1 - .../patches/bitchx-1.2.1-security.patch | 8 +- srcpkgs/bitchx/patches/openssl-1.1.patch | 8 +- srcpkgs/bitchx/template | 1 - srcpkgs/bitfighter/patches/cmake.patch | 36 ++++---- srcpkgs/bitfighter/template | 1 - .../bitwise/patches/tests-use-bcunit.patch | 8 +- srcpkgs/bitwise/template | 1 - srcpkgs/blackboxwm/patches/time64.patch | 4 +- srcpkgs/blackboxwm/template | 1 - srcpkgs/bmon/patches/Add_CTRL-N_CTRL-P.patch | 4 +- srcpkgs/bmon/patches/out_curses.patch | 4 +- srcpkgs/bmon/template | 1 - srcpkgs/boinc/patches/arm-not-android.patch | 12 +-- .../boinc/patches/boinc-am_conditional.patch | 4 +- srcpkgs/boinc/template | 1 - srcpkgs/bomi/patches/ffmpeg3.x.patch | 12 +-- srcpkgs/bomi/patches/ffmpeg4.patch | 32 +++---- srcpkgs/bomi/patches/fix-cxx14.patch | 24 +++--- srcpkgs/bomi/patches/fix-sysctl_h.patch | 8 +- srcpkgs/bomi/template | 1 - srcpkgs/bonnie++/patches/configure.patch | 4 +- srcpkgs/bonnie++/template | 1 - .../patches/dont_include_toolchain-file.patch | 4 +- srcpkgs/boomerang/patches/fix-cflags.patch | 4 +- .../boomerang/patches/include-stdint.patch | 4 +- srcpkgs/boomerang/template | 1 - srcpkgs/boost/patches/mips.patch | 4 +- srcpkgs/boost/patches/musl-memset.patch | 4 +- srcpkgs/boost/template | 1 - srcpkgs/bootchart2/patches/python-3.9.patch | 8 +- .../bootchart2/patches/rdinit-fix-panic.patch | 4 +- srcpkgs/bootchart2/template | 1 - .../patches/botan_types_include_climits.patch | 4 +- srcpkgs/botan/template | 1 - srcpkgs/bridge-utils/patches/cflags.patch | 4 +- srcpkgs/bridge-utils/patches/fix-musl.patch | 4 +- srcpkgs/bridge-utils/template | 1 - srcpkgs/brltty/patches/crosspython.patch | 4 +- srcpkgs/brltty/patches/time64.patch | 4 +- srcpkgs/brltty/template | 1 - .../patches/001-null-pointer-fix.patch | 4 +- .../broadcom-wl-dkms/patches/gcc-4.9.patch | 4 +- .../broadcom-wl-dkms/patches/linux-4.11.patch | 8 +- .../broadcom-wl-dkms/patches/linux-4.12.patch | 4 +- .../broadcom-wl-dkms/patches/linux-4.15.patch | 4 +- .../broadcom-wl-dkms/patches/linux-4.3.patch | 4 +- .../broadcom-wl-dkms/patches/linux-4.7.patch | 8 +- .../broadcom-wl-dkms/patches/linux-4.8.patch | 4 +- .../broadcom-wl-dkms/patches/linux-5.1.patch | 8 +- .../broadcom-wl-dkms/patches/linux-5.10.patch | 20 ++--- .../broadcom-wl-dkms/patches/linux-5.6.patch | 8 +- srcpkgs/broadcom-wl-dkms/template | 1 - srcpkgs/browsh/patches/go-bindata.patch | 4 +- srcpkgs/browsh/patches/modules.patch | 8 +- srcpkgs/browsh/template | 1 - srcpkgs/bsdiff/patches/CVE-2014-9862.diff | 4 +- srcpkgs/bsdiff/template | 1 - srcpkgs/bsdunzip/patches/add-license.patch | 2 +- srcpkgs/bsdunzip/template | 1 - ...dc6022f67a4e1f49397b8bf519b2a34f74c9.patch | 4 +- srcpkgs/bti/template | 1 - .../fix-TEMP_FAILTURE_RETRY-musl.patch | 4 +- .../patches/realpath-workaround.patch | 6 +- srcpkgs/bubblewrap/template | 1 - srcpkgs/buffer/patches/musl-sem.patch | 4 +- srcpkgs/buffer/template | 1 - srcpkgs/buildbot/patches/terse-irc.patch | 4 +- srcpkgs/buildbot/template | 1 - .../patches/0001-Use-system-cacerts.patch | 4 +- srcpkgs/buku/template | 1 - srcpkgs/bullet/patches/disableExample.patch | 4 +- srcpkgs/bullet/patches/musl.patch | 12 +-- srcpkgs/bullet/template | 1 - .../patches/10-modprobe-replace-rmmod.patch | 4 +- .../20-better-module-load-unload.patch | 72 ++++++++-------- srcpkgs/bumblebee/template | 1 - srcpkgs/bup/patches/disable-git-call.patch | 4 +- srcpkgs/bup/template | 1 - .../patches/tests-disable-failing.patch | 4 +- srcpkgs/burp2-server/template | 1 - ...ss_gunzip-Fix-DoS-if-gzip-is-corrupt.patch | 4 +- .../patches/testsuite-fix-date-works.patch | 4 +- srcpkgs/busybox/template | 1 - srcpkgs/bzflag/patches/NetHandler-musl.patch | 4 +- srcpkgs/bzflag/patches/bzfs-musl.patch | 4 +- srcpkgs/bzflag/template | 1 - srcpkgs/bzip2/patches/soname.patch | 8 +- srcpkgs/bzip2/template | 1 - 151 files changed, 454 insertions(+), 508 deletions(-) diff --git a/srcpkgs/bacula-common/patches/fix-cross.patch b/srcpkgs/bacula-common/patches/fix-cross.patch index f7e6f86170..408298575f 100644 --- a/srcpkgs/bacula-common/patches/fix-cross.patch +++ b/srcpkgs/bacula-common/patches/fix-cross.patch @@ -1,5 +1,5 @@ ---- configure 2016-09-29 15:59:30.000000000 +0200 -+++ configure 2017-02-14 01:48:10.874916913 +0100 +--- a/configure 2016-09-29 15:59:30.000000000 +0200 ++++ b/configure 2017-02-14 01:48:10.874916913 +0100 @@ -23873,6 +23873,14 @@ POSTGRESQL_LIBDIR=/usr/lib/postgresql fi diff --git a/srcpkgs/bacula-common/patches/fix-musl.patch b/srcpkgs/bacula-common/patches/fix-musl.patch index 4710bc9435..f6c94499bb 100644 --- a/srcpkgs/bacula-common/patches/fix-musl.patch +++ b/srcpkgs/bacula-common/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- src/findlib/fstype.c 2016-09-29 15:59:30.000000000 +0200 -+++ src/findlib/fstype.c 2017-02-19 19:24:02.050639457 +0100 +--- a/src/findlib/fstype.c 2016-09-29 15:59:30.000000000 +0200 ++++ b/src/findlib/fstype.c 2017-02-19 19:24:02.050639457 +0100 @@ -162,6 +162,9 @@ #include diff --git a/srcpkgs/bacula-common/template b/srcpkgs/bacula-common/template index 9facbbf2ef..04b89e171a 100644 --- a/srcpkgs/bacula-common/template +++ b/srcpkgs/bacula-common/template @@ -17,7 +17,6 @@ distfiles="${SOURCEFORGE_SITE}/bacula/bacula-${version}.tar.gz" checksum=a40d04d2c48135972cecb6578405e835c4b9d798c0950017de0fad40ca94e8a0 alternatives="bacula-db-backend:/usr/lib/libbaccats-${version}.so:/usr/lib/libbaccats-sqlite3-${version}.so" shlib_provides="libbaccats-${version}.so" -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/balsa/patches/portability.patch b/srcpkgs/balsa/patches/portability.patch index 9add8f86d3..9cf7ef4ec0 100644 --- a/srcpkgs/balsa/patches/portability.patch +++ b/srcpkgs/balsa/patches/portability.patch @@ -1,5 +1,5 @@ ---- libbalsa/misc.c.orig 2015-05-31 10:17:19.494312782 +0200 -+++ libbalsa/misc.c 2015-05-31 10:17:27.054393821 +0200 +--- a/libbalsa/misc.c 2015-05-31 10:17:19.494312782 +0200 ++++ b/libbalsa/misc.c 2015-05-31 10:17:27.054393821 +0200 @@ -34,6 +34,7 @@ #include #include diff --git a/srcpkgs/balsa/template b/srcpkgs/balsa/template index 5d3f410bf0..255ae0f226 100644 --- a/srcpkgs/balsa/template +++ b/srcpkgs/balsa/template @@ -15,4 +15,3 @@ license="GPL-2.0-or-later" homepage="https://pawsa.fedorapeople.org/balsa/" distfiles="https://pawsa.fedorapeople.org/balsa/balsa-${version}.tar.bz2" checksum=6441772cb5e1870f10c358c21f7e709da8cc0bfa6cc005ec744b9f1b00ea7df6 -patch_args=-Np0 diff --git a/srcpkgs/bananapi-uboot/patches/musl.patch b/srcpkgs/bananapi-uboot/patches/musl.patch index 3efa59142c..01c76c3554 100644 --- a/srcpkgs/bananapi-uboot/patches/musl.patch +++ b/srcpkgs/bananapi-uboot/patches/musl.patch @@ -1,5 +1,5 @@ ---- include/image.h 2014-08-19 08:42:46.000000000 +0200 -+++ include/image.h 2020-09-15 10:43:48.410147914 +0200 +--- a/include/image.h 2014-08-19 08:42:46.000000000 +0200 ++++ b/include/image.h 2020-09-15 10:43:48.410147914 +0200 @@ -19,6 +19,11 @@ #include "compiler.h" #include @@ -12,8 +12,8 @@ /* Define this to avoid #ifdefs later on */ struct lmb; ---- tools/mkimage.h 2014-08-19 08:42:46.000000000 +0200 -+++ tools/mkimage.h 2020-09-15 10:46:44.221140904 +0200 +--- a/tools/mkimage.h 2014-08-19 08:42:46.000000000 +0200 ++++ b/tools/mkimage.h 2020-09-15 10:46:44.221140904 +0200 @@ -22,6 +22,11 @@ #include "fdt_host.h" #include "imagetool.h" @@ -26,8 +26,8 @@ #undef MKIMAGE_DEBUG #ifdef MKIMAGE_DEBUG ---- tools/proftool.c 2014-08-19 08:42:46.000000000 +0200 -+++ tools/proftool.c 2020-09-15 10:48:28.212136757 +0200 +--- a/tools/proftool.c 2014-08-19 08:42:46.000000000 +0200 ++++ b/tools/proftool.c 2020-09-15 10:48:28.212136757 +0200 @@ -20,6 +20,11 @@ #include #include diff --git a/srcpkgs/bananapi-uboot/patches/no-inline-show_boot_progress.patch b/srcpkgs/bananapi-uboot/patches/no-inline-show_boot_progress.patch index fd56762f70..74bdbbe94f 100644 --- a/srcpkgs/bananapi-uboot/patches/no-inline-show_boot_progress.patch +++ b/srcpkgs/bananapi-uboot/patches/no-inline-show_boot_progress.patch @@ -1,5 +1,5 @@ ---- common/main.c 2014-08-19 08:42:46.000000000 +0200 -+++ common/main.c 2020-09-15 09:39:04.675302769 +0200 +--- a/common/main.c 2014-08-19 08:42:46.000000000 +0200 ++++ b/common/main.c 2020-09-15 09:39:04.675302769 +0200 @@ -27,7 +27,7 @@ /* * Board-specific Platform code can reimplement show_boot_progress () if needed diff --git a/srcpkgs/bananapi-uboot/patches/no-inline-weak.patch b/srcpkgs/bananapi-uboot/patches/no-inline-weak.patch index c18d52171b..4700b2ba58 100644 --- a/srcpkgs/bananapi-uboot/patches/no-inline-weak.patch +++ b/srcpkgs/bananapi-uboot/patches/no-inline-weak.patch @@ -1,5 +1,5 @@ ---- common/board_f.c 2014-08-19 08:42:46.000000000 +0200 -+++ common/board_f.c 2020-09-15 09:40:56.739298301 +0200 +--- a/common/board_f.c 2014-08-19 08:42:46.000000000 +0200 ++++ b/common/board_f.c 2020-09-15 09:40:56.739298301 +0200 @@ -78,24 +78,24 @@ ************************************************************************ * May be supplied by boards if desired diff --git a/srcpkgs/bananapi-uboot/patches/static-inline.patch b/srcpkgs/bananapi-uboot/patches/static-inline.patch index 40546d7ed6..ddf7c12f96 100644 --- a/srcpkgs/bananapi-uboot/patches/static-inline.patch +++ b/srcpkgs/bananapi-uboot/patches/static-inline.patch @@ -1,5 +1,5 @@ ---- arch/arm/include/asm/io.h 2014-08-19 08:42:46.000000000 +0200 -+++ arch/arm/include/asm/io.h 2020-09-15 09:36:28.791308985 +0200 +--- a/arch/arm/include/asm/io.h 2014-08-19 08:42:46.000000000 +0200 ++++ b/arch/arm/include/asm/io.h 2020-09-15 09:36:28.791308985 +0200 @@ -75,7 +75,7 @@ #define __arch_putw(v,a) (*(volatile unsigned short *)(a) = (v)) #define __arch_putl(v,a) (*(volatile unsigned int *)(a) = (v)) diff --git a/srcpkgs/bananapi-uboot/template b/srcpkgs/bananapi-uboot/template index 80acf0c6e8..fabedf3d59 100644 --- a/srcpkgs/bananapi-uboot/template +++ b/srcpkgs/bananapi-uboot/template @@ -10,7 +10,6 @@ license="GPL-2.0-only" homepage="https://github.com/hardkernel/u-boot" distfiles="https://github.com/Bananian/u-boot-bananapi/archive/bananian-v${version}.tar.gz" checksum=8be162b0b8e85d3fbc2e14af3b71c4a204f4a9c63f6f13275f86629624c1d6a6 -patch_args=-Np0 conf_files="/boot/uEnv.txt" archs="armv7l*" diff --git a/srcpkgs/basu/patches/uid-nobody.patch b/srcpkgs/basu/patches/uid-nobody.patch index 27524c0f47..894ad82c37 100644 --- a/srcpkgs/basu/patches/uid-nobody.patch +++ b/srcpkgs/basu/patches/uid-nobody.patch @@ -1,5 +1,5 @@ ---- src/basic/user-util.h -+++ src/basic/user-util.h +--- a/src/basic/user-util.h ++++ b/src/basic/user-util.h @@ -17,7 +17,7 @@ char* uid_to_name(uid_t uid); #define UID_INVALID ((uid_t) -1) diff --git a/srcpkgs/basu/template b/srcpkgs/basu/template index 0244cc11cc..1a3614b781 100644 --- a/srcpkgs/basu/template +++ b/srcpkgs/basu/template @@ -11,7 +11,6 @@ license="LGPL-2.1-or-later" homepage="https://github.com/emersion/basu" distfiles="${homepage}/releases/download/v${version}/${pkgname}-${version}.tar.gz" checksum=e2fda9b69fc6c4530173fcf8db94c29aa5f3ed932d948cc6a31892623cde5e4b -patch_args=-Np0 basu-devel_package() { short_desc+=" - development files" diff --git a/srcpkgs/batctl14/patches/musl.patch b/srcpkgs/batctl14/patches/musl.patch index caca064950..0579519a18 100644 --- a/srcpkgs/batctl14/patches/musl.patch +++ b/srcpkgs/batctl14/patches/musl.patch @@ -1,7 +1,7 @@ Use POSIX instead of Linux fields. Glibc has both, musl only has POSIX. ---- ioctl.c -+++ ioctl.c +--- a/ioctl.c ++++ b/ioctl.c @@ -25,6 +25,7 @@ #include #include @@ -10,8 +10,8 @@ Use POSIX instead of Linux fields. Glibc has both, musl only has POSIX. #include #include #include ---- ping.c -+++ ping.c +--- a/ping.c ++++ b/ping.c @@ -30,6 +30,7 @@ #include #include @@ -20,8 +20,8 @@ Use POSIX instead of Linux fields. Glibc has both, musl only has POSIX. #include "main.h" #include "ping.h" ---- tcpdump.c -+++ tcpdump.c +--- a/tcpdump.c ++++ b/tcpdump.c @@ -36,6 +36,7 @@ #include #include @@ -82,8 +82,8 @@ Use POSIX instead of Linux fields. Glibc has both, musl only has POSIX. (size_t)buff_len - (iphdr->ihl * 4) - sizeof(struct udphdr)); break; } ---- traceroute.c -+++ traceroute.c +--- a/traceroute.c ++++ b/traceroute.c @@ -28,6 +28,7 @@ #include #include diff --git a/srcpkgs/batctl14/template b/srcpkgs/batctl14/template index 9fc5556c20..4ca1b15ed0 100644 --- a/srcpkgs/batctl14/template +++ b/srcpkgs/batctl14/template @@ -14,4 +14,3 @@ homepage="http://www.open-mesh.net/" distfiles="http://downloads.open-mesh.net/batman/releases/batman-adv-${version}/batctl-${version}.tar.gz" checksum=4deae3b6664d0d13acf7a8ece74175a31a72fe58fb15cb9112a9a2014b32cb4c conflicts="batctl>=0" -patch_args=-Np0 diff --git a/srcpkgs/batman-adv14/patches/0001-fix-build.diff b/srcpkgs/batman-adv14/patches/0001-fix-build.diff index ee8fc175a5..69b59c9ce3 100644 --- a/srcpkgs/batman-adv14/patches/0001-fix-build.diff +++ b/srcpkgs/batman-adv14/patches/0001-fix-build.diff @@ -1,7 +1,7 @@ diff --git a/Makefile.kbuild b/Makefile.kbuild index 489bb36..8ddbfe6 100644 ---- Makefile.kbuild -+++ Makefile.kbuild +--- a/Makefile.kbuild ++++ b/Makefile.kbuild @@ -38,4 +38,3 @@ batman-adv-y += soft-interface.o batman-adv-y += sysfs.o batman-adv-y += translation-table.o @@ -9,8 +9,8 @@ index 489bb36..8ddbfe6 100644 -batman-adv-y += vis.o diff --git a/README b/README index c1d8204..4c20e91 100644 ---- README -+++ README +--- a/README ++++ b/README @@ -1,3 +1,34 @@ +BATMAN-ADV-LEGACY +----------------- @@ -68,8 +68,8 @@ index c1d8204..4c20e91 100644 +Matthias Schiffer diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 2031071..6407369 100644 ---- bat_iv_ogm.c -+++ bat_iv_ogm.c +--- a/bat_iv_ogm.c ++++ b/bat_iv_ogm.c @@ -687,11 +687,10 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) struct batadv_ogm_packet *batadv_ogm_packet; struct batadv_hard_iface *primary_if; @@ -97,8 +97,8 @@ index 2031071..6407369 100644 atomic_read(&bat_priv->gw_mode) == BATADV_GW_MODE_SERVER) { diff --git a/compat.h b/compat.h index 3e11f89..0f07edb 100644 ---- compat.h -+++ compat.h +--- a/compat.h ++++ b/compat.h @@ -258,7 +258,6 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) \ }\ static int __batadv_interface_set_mac_addr(x, y) @@ -176,8 +176,8 @@ index 3e11f89..0f07edb 100644 #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/debugfs.c b/debugfs.c index f186a55..049a7a2 100644 ---- debugfs.c -+++ debugfs.c +--- a/debugfs.c ++++ b/debugfs.c @@ -28,7 +28,6 @@ #include "gateway_common.h" #include "gateway_client.h" @@ -217,8 +217,8 @@ index f186a55..049a7a2 100644 #endif diff --git a/gateway_client.c b/gateway_client.c index 7614af3..6958356 100644 ---- gateway_client.c -+++ gateway_client.c +--- a/gateway_client.c ++++ b/gateway_client.c @@ -115,16 +115,12 @@ batadv_gw_get_best_gw_node(struct batadv_priv *bat_priv) { struct batadv_neigh_node *router; @@ -278,8 +278,8 @@ index 7614af3..6958356 100644 if (curr_gw) diff --git a/gateway_common.c b/gateway_common.c index 84bb2b1..bb3f667 100644 ---- gateway_common.c -+++ gateway_common.c +--- a/gateway_common.c ++++ b/gateway_common.c @@ -87,10 +87,10 @@ static bool batadv_parse_gw_bandwidth(struct net_device *net_dev, char *buff, if (strlen(buff) > 4) { tmp_ptr = buff + strlen(buff) - 4; @@ -308,8 +308,8 @@ index 84bb2b1..bb3f667 100644 } diff --git a/gen-compat-autoconf.sh b/gen-compat-autoconf.sh index 78573e4..c5a3f5d 100755 ---- gen-compat-autoconf.sh -+++ gen-compat-autoconf.sh +--- a/gen-compat-autoconf.sh ++++ b/gen-compat-autoconf.sh @@ -5,7 +5,8 @@ set -e TARGET=${1:="compat-autoconf.h"} TMP="${TARGET}.tmp" @@ -322,8 +322,8 @@ index 78573e4..c5a3f5d 100755 KEY="${1}" diff --git a/hard-interface.c b/hard-interface.c index c478e6b..5948c80 100644 ---- hard-interface.c -+++ hard-interface.c +--- a/hard-interface.c ++++ b/hard-interface.c @@ -83,19 +83,18 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev) return true; @@ -391,8 +391,8 @@ index c478e6b..5948c80 100644 diff --git a/main.c b/main.c index c8e0671..a718d07 100644 ---- main.c -+++ main.c +--- a/main.c ++++ b/main.c @@ -32,7 +32,6 @@ #include "gateway_client.h" #include "bridge_loop_avoidance.h" @@ -432,8 +432,8 @@ index c8e0671..a718d07 100644 batadv_dat_free(bat_priv); diff --git a/main.h b/main.h index 2c0c14d..06e8971 100644 ---- main.h -+++ main.h +--- a/main.h ++++ b/main.h @@ -86,8 +86,6 @@ /* numbers of originator to contact for any PUT/GET DHT operation */ #define BATADV_DAT_CANDIDATES_NUM 3 @@ -479,8 +479,8 @@ index 2c0c14d..06e8971 100644 struct net_device *_netdev = (net_dev); \ diff --git a/originator.c b/originator.c index f50553a..af1b427 100644 ---- originator.c -+++ originator.c +--- a/originator.c ++++ b/originator.c @@ -147,8 +147,6 @@ static void batadv_orig_node_free_rcu(struct rcu_head *rcu) batadv_nc_purge_orig(orig_node->bat_priv, orig_node, NULL); @@ -510,8 +510,8 @@ index f50553a..af1b427 100644 } diff --git a/packet.h b/packet.h index a51ccfc..d12da01 100644 ---- packet.h -+++ packet.h +--- a/packet.h ++++ b/packet.h @@ -53,7 +53,6 @@ enum batadv_subtype { enum batadv_iv_flags { BATADV_NOT_BEST_NEXT_HOP = BIT(3), @@ -544,8 +544,8 @@ index a51ccfc..d12da01 100644 uint8_t prev_sender[ETH_ALEN]; diff --git a/routing.c b/routing.c index 2f0bd3f..f69a32c 100644 ---- routing.c -+++ routing.c +--- a/routing.c ++++ b/routing.c @@ -25,7 +25,6 @@ #include "icmp_socket.h" #include "translation-table.h" @@ -695,8 +695,8 @@ index 2f0bd3f..f69a32c 100644 } diff --git a/send.c b/send.c index e9ff8d8..fd42c65 100644 ---- send.c -+++ send.c +--- a/send.c ++++ b/send.c @@ -24,11 +24,11 @@ #include "translation-table.h" #include "soft-interface.h" @@ -741,8 +741,8 @@ index e9ff8d8..fd42c65 100644 if (skb1) diff --git a/soft-interface.c b/soft-interface.c index 33b6144..3e3f81c 100644 ---- soft-interface.c -+++ soft-interface.c +--- a/soft-interface.c ++++ b/soft-interface.c @@ -162,7 +162,7 @@ static int batadv_interface_tx(struct sk_buff *skb, if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) goto dropped; @@ -792,8 +792,8 @@ index 33b6144..3e3f81c 100644 diff --git a/sysfs-class-net-batman-adv b/sysfs-class-net-batman-adv index bdc0070..88f6f70 100644 ---- sysfs-class-net-batman-adv -+++ sysfs-class-net-batman-adv +--- a/sysfs-class-net-batman-adv ++++ b/sysfs-class-net-batman-adv @@ -13,3 +13,13 @@ Description: displays the batman mesh interface this currently is associated with. @@ -810,8 +810,8 @@ index bdc0070..88f6f70 100644 + break your mesh network, use at your own risk! diff --git a/sysfs.c b/sysfs.c index 929e304..944209a 100644 ---- sysfs.c -+++ sysfs.c +--- a/sysfs.c ++++ b/sysfs.c @@ -25,7 +25,6 @@ #include "hard-interface.h" #include "gateway_common.h" @@ -998,8 +998,8 @@ index 929e304..944209a 100644 diff --git a/translation-table.c b/translation-table.c index 429aeef..9a8aab6 100644 ---- translation-table.c -+++ translation-table.c +--- a/translation-table.c ++++ b/translation-table.c @@ -1487,6 +1487,19 @@ static uint16_t batadv_tt_local_crc(struct batadv_priv *bat_priv) return total; } @@ -1076,8 +1076,8 @@ index 429aeef..9a8aab6 100644 diff --git a/types.h b/types.h index b2c94e1..b4d38e4 100644 ---- types.h -+++ types.h +--- a/types.h ++++ b/types.h @@ -85,6 +85,7 @@ struct batadv_hard_iface { struct rcu_head rcu; struct batadv_hard_iface_bat_iv bat_iv; @@ -1227,7 +1227,7 @@ index b2c94e1..b4d38e4 100644 diff --git a/vis.c b/vis.c deleted file mode 100644 index 4983340..0000000 ---- vis.c +--- a/vis.c +++ /dev/null @@ -1,936 +0,0 @@ -/* Copyright (C) 2008-2013 B.A.T.M.A.N. contributors: @@ -2169,7 +2169,7 @@ index 4983340..0000000 diff --git a/vis.h b/vis.h deleted file mode 100644 index ad92b0e..0000000 ---- vis.h +--- a/vis.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright (C) 2008-2013 B.A.T.M.A.N. contributors: diff --git a/srcpkgs/batman-adv14/template b/srcpkgs/batman-adv14/template index a1776f1210..8fb3582705 100644 --- a/srcpkgs/batman-adv14/template +++ b/srcpkgs/batman-adv14/template @@ -11,7 +11,6 @@ distfiles="http://downloads.open-mesh.org/batman/releases/batman-adv-${version}/ checksum=a9b1b7542c94cc6bf7c97b7b0d02bf071b5632a64480ae419358b9cb9cab6870 provides="batman-adv-${version}_${revision}" conflicts="batman-adv>=0" -patch_args=-Np0 dkms_modules="batman-adv14 ${version}" depends="dkms" diff --git a/srcpkgs/bbkeys/patches/fix-cross.patch b/srcpkgs/bbkeys/patches/fix-cross.patch index 48dcdac17a..f722e5ebb4 100644 --- a/srcpkgs/bbkeys/patches/fix-cross.patch +++ b/srcpkgs/bbkeys/patches/fix-cross.patch @@ -1,5 +1,5 @@ ---- src/Makefile.in.orig -+++ src/Makefile.in +--- a/src/Makefile.in ++++ b/src/Makefile.in @@ -108,7 +108,6 @@ Netclient.$(OBJEXT) ScreenHandler.$(OBJEXT) window.$(OBJEXT) \ WindowlistMenu.$(OBJEXT) @@ -26,8 +26,8 @@ @rm -f bbkeys$(EXEEXT) $(AM_V_CXXLD)$(CXXLINK) $(bbkeys_OBJECTS) $(bbkeys_LDADD) $(LIBS) ---- src/Makefile.am.orig -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -31,6 +31,5 @@ window.hh \ WindowlistMenu.cpp \ diff --git a/srcpkgs/bbkeys/template b/srcpkgs/bbkeys/template index 40ae05dec7..a9a52c1100 100644 --- a/srcpkgs/bbkeys/template +++ b/srcpkgs/bbkeys/template @@ -11,7 +11,6 @@ license="MIT" homepage="https://github.com/bbidulock/bbkeys" distfiles="${homepage}/releases/download/rel-${version//.}/bbkeys-${version}.tar.lz" checksum=ece0113b2cc6367e2cad95f59cf43d7576b5a1a7eb8a9e3f10ce9814db67b95c -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/bbswitch/patches/0001-Use-proc_ops-structure-for-kernel-version-5.6.0.patch b/srcpkgs/bbswitch/patches/0001-Use-proc_ops-structure-for-kernel-version-5.6.0.patch index 6c758c00aa..bb13cea2bc 100644 --- a/srcpkgs/bbswitch/patches/0001-Use-proc_ops-structure-for-kernel-version-5.6.0.patch +++ b/srcpkgs/bbswitch/patches/0001-Use-proc_ops-structure-for-kernel-version-5.6.0.patch @@ -15,8 +15,8 @@ https://github.com/torvalds/linux/commit/d56c0d45f0e27f814e87a1676b6bdccccbc252e diff --git bbswitch.c bbswitch.c index 228d722..4ce9aae 100644 ---- bbswitch.c -+++ bbswitch.c +--- a/bbswitch.c ++++ b/bbswitch.c @@ -35,6 +35,7 @@ #include #include diff --git a/srcpkgs/bbswitch/patches/0002-Add-missing-proc_fs.h-header.patch b/srcpkgs/bbswitch/patches/0002-Add-missing-proc_fs.h-header.patch index 4a51358ec0..37a27a6838 100644 --- a/srcpkgs/bbswitch/patches/0002-Add-missing-proc_fs.h-header.patch +++ b/srcpkgs/bbswitch/patches/0002-Add-missing-proc_fs.h-header.patch @@ -13,8 +13,8 @@ Required for 'struct proc_ops' since v5.7-rc1 with commit df23e2be3d24 diff --git bbswitch.c bbswitch.c index 4ce9aae..c0c6713 100644 ---- bbswitch.c -+++ bbswitch.c +--- a/bbswitch.c ++++ b/bbswitch.c @@ -35,6 +35,7 @@ #include #include diff --git a/srcpkgs/bbswitch/template b/srcpkgs/bbswitch/template index 049ba73bc3..4dc9d3235e 100644 --- a/srcpkgs/bbswitch/template +++ b/srcpkgs/bbswitch/template @@ -11,7 +11,6 @@ homepage="http://github.com/Bumblebee-Project/bbswitch" distfiles="https://github.com/Bumblebee-Project/bbswitch/archive/v$version.tar.gz" checksum=76cabd3f734fb4fe6ebfe3ec9814138d0d6f47d47238521ecbd6a986b60d1477 dkms_modules="${pkgname} ${version}" -patch_args=-Np0 do_install() { vinstall Makefile 644 usr/src/${pkgname}-${version} diff --git a/srcpkgs/bc/patches/read.patch b/srcpkgs/bc/patches/read.patch index f45a2b0d2b..ce3dfa5d9b 100644 --- a/srcpkgs/bc/patches/read.patch +++ b/srcpkgs/bc/patches/read.patch @@ -1,5 +1,5 @@ ---- bc/execute.c -+++ bc/execute.c +--- a/bc/execute.c ++++ b/bc/execute.c @@ -638,19 +638,19 @@ push_constant (int (*in_char)(VOID), int conv_base) } diff --git a/srcpkgs/bc/template b/srcpkgs/bc/template index bff25a4c64..c6ca1b7d89 100644 --- a/srcpkgs/bc/template +++ b/srcpkgs/bc/template @@ -18,7 +18,6 @@ alternatives=" dc:dc:/usr/bin/gnu-dc dc:dc.1:/usr/share/man/man1/gnu-dc.1" disable_parallel_build=yes -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" bc" diff --git a/srcpkgs/bcc/patches/musl.patch b/srcpkgs/bcc/patches/musl.patch index bc7ac1e772..41bf27f4bc 100644 --- a/srcpkgs/bcc/patches/musl.patch +++ b/srcpkgs/bcc/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/cc/api/BPFTable.cc.orig -+++ src/cc/api/BPFTable.cc +--- a/src/cc/api/BPFTable.cc ++++ b/src/cc/api/BPFTable.cc @@ -14,6 +14,7 @@ * limitations under the License. */ @@ -8,8 +8,8 @@ #include #include #include ---- src/cc/api/BPF.cc.orig -+++ src/cc/api/BPF.cc +--- a/src/cc/api/BPF.cc ++++ b/src/cc/api/BPF.cc @@ -14,6 +14,7 @@ * limitations under the License. */ @@ -18,8 +18,8 @@ #include #include #include ---- src/cc/perf_reader.c.orig -+++ src/cc/perf_reader.c +--- a/src/cc/perf_reader.c ++++ b/src/cc/perf_reader.c @@ -14,6 +14,7 @@ * limitations under the License. */ @@ -28,8 +28,8 @@ #include #include #include ---- src/cc/libbpf/src/libbpf.c.orig -+++ src/cc/libbpf/src/libbpf.c +--- a/src/cc/libbpf/src/libbpf.c ++++ b/src/cc/libbpf/src/libbpf.c @@ -12,6 +12,7 @@ #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -38,8 +38,8 @@ #include #include #include ---- src/cc/libbpf.c.orig -+++ src/cc/libbpf.c +--- a/src/cc/libbpf.c ++++ b/src/cc/libbpf.c @@ -17,6 +17,7 @@ #define _GNU_SOURCE #endif diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template index 091ad9473a..cbdb9de0ab 100644 --- a/srcpkgs/bcc/template +++ b/srcpkgs/bcc/template @@ -15,7 +15,6 @@ homepage="https://github.com/iovisor/bcc" distfiles="https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz" checksum=93edc925675262aa509f5eaf146f2fc7dfa3e01d1b0336a5de01ee6d72fa493b python_version="3" -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/bctoolbox/patches/cmake-bcunit-fix.patch b/srcpkgs/bctoolbox/patches/cmake-bcunit-fix.patch index 2a67c9a4c1..ef883d5690 100644 --- a/srcpkgs/bctoolbox/patches/cmake-bcunit-fix.patch +++ b/srcpkgs/bctoolbox/patches/cmake-bcunit-fix.patch @@ -1,7 +1,7 @@ diff --git CMakeLists.txt CMakeLists.txt index 6828b3f..b41262f 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -106,14 +106,9 @@ if(POLARSSL_FOUND) endif() diff --git a/srcpkgs/bctoolbox/template b/srcpkgs/bctoolbox/template index f308b68741..4de00e55e2 100644 --- a/srcpkgs/bctoolbox/template +++ b/srcpkgs/bctoolbox/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="https://gitlab.linphone.org/BC/public/bctoolbox" distfiles="https://gitlab.linphone.org/BC/public/bctoolbox/-/archive/${version}/bctoolbox-${version}.tar.gz" checksum=1364d5f42b5514546b9c6654c227804ff92cf9cf13fdc7cb6ca666e3bb5a7987 -patch_args=-Np0 bctoolbox-devel_package() { depends="bctoolbox-${version}_${revision}" diff --git a/srcpkgs/beep/patches/CVE-2018-0492.patch b/srcpkgs/beep/patches/CVE-2018-0492.patch index fd0a771d53..c3c20ab624 100644 --- a/srcpkgs/beep/patches/CVE-2018-0492.patch +++ b/srcpkgs/beep/patches/CVE-2018-0492.patch @@ -1,5 +1,5 @@ ---- beep.c -+++ beep.c +--- a/beep.c ++++ b/beep.c @@ -109,6 +109,7 @@ void do_beep(int freq) { /* BEEP_TYPE_EVDEV */ struct input_event e; diff --git a/srcpkgs/beep/template b/srcpkgs/beep/template index 3be4bf6147..0f3c10d978 100644 --- a/srcpkgs/beep/template +++ b/srcpkgs/beep/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://www.johnath.com/beep/" distfiles="http://www.johnath.com/${pkgname}/${pkgname}-${version}.tar.gz" checksum=59acef7a987de5557cefd1a904666cc2691f132929af39e65450b182a581ec2d -patch_args=-Np0 post_extract() { rm -f Makefile diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch index 423f25985b..fc394e59ba 100644 --- a/srcpkgs/beets/patches/python-3.8.patch +++ b/srcpkgs/beets/patches/python-3.8.patch @@ -13,8 +13,8 @@ In fact, our generation of some Literals has been invalid since Python diff --git beets/util/functemplate.py beets/util/functemplate.py index af22b79082..266534a9b4 100644 ---- beets/util/functemplate.py -+++ beets/util/functemplate.py +--- a/beets/util/functemplate.py ++++ b/beets/util/functemplate.py @@ -73,15 +73,26 @@ def ex_literal(val): """An int, float, long, bool, string, or None literal with the given value. diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template index 60e86df753..8dfb44bf88 100644 --- a/srcpkgs/beets/template +++ b/srcpkgs/beets/template @@ -17,7 +17,6 @@ license="MIT" homepage="http://beets.radbox.org/" distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz" checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054 -patch_args=-Np0 post_install() { vman man/beet.1 diff --git a/srcpkgs/beignet/patches/cl_uint.patch b/srcpkgs/beignet/patches/cl_uint.patch index 27f247cf00..86ba00f04e 100644 --- a/srcpkgs/beignet/patches/cl_uint.patch +++ b/srcpkgs/beignet/patches/cl_uint.patch @@ -1,5 +1,5 @@ ---- src/cl_api_kernel.c 2017-09-22 10:05:22.000000000 +0200 -+++ src/cl_api_kernel.c 2020-03-24 18:27:40.186485887 +0100 +--- a/src/cl_api_kernel.c 2017-09-22 10:05:22.000000000 +0200 ++++ b/src/cl_api_kernel.c 2020-03-24 18:27:40.186485887 +0100 @@ -151,7 +151,7 @@ fixed_local_sz[0] = 16; fixed_local_sz[1] = 1; @@ -9,8 +9,8 @@ size_t realGroupSize = 1; for (i = 0; i < work_dim; i++) { for (j = maxDimSize; j > 1; j--) { ---- src/cl_enqueue.c 2017-09-22 10:05:22.000000000 +0200 -+++ src/cl_enqueue.c 2020-03-24 18:30:12.031479833 +0100 +--- a/src/cl_enqueue.c 2017-09-22 10:05:22.000000000 +0200 ++++ b/src/cl_enqueue.c 2020-03-24 18:30:12.031479833 +0100 @@ -494,7 +494,7 @@ cl_int cl_enqueue_svm_free(enqueue_data *data, cl_int status) { int i; diff --git a/srcpkgs/beignet/patches/e1b2419a0008e38ef2d9d255d9e9c74e9fba084b.patch b/srcpkgs/beignet/patches/e1b2419a0008e38ef2d9d255d9e9c74e9fba084b.patch index 36cdef7208..8de9e6e2f0 100644 --- a/srcpkgs/beignet/patches/e1b2419a0008e38ef2d9d255d9e9c74e9fba084b.patch +++ b/srcpkgs/beignet/patches/e1b2419a0008e38ef2d9d255d9e9c74e9fba084b.patch @@ -26,8 +26,8 @@ Reviewed-by: Yang Rong diff --git a/CMake/FindLLVM.cmake b/CMake/FindLLVM.cmake index 5457f24..f882589 100644 ---- CMake/FindLLVM.cmake -+++ CMake/FindLLVM.cmake +--- a/CMake/FindLLVM.cmake ++++ b/CMake/FindLLVM.cmake @@ -113,10 +113,10 @@ macro(add_one_lib name) endmacro() @@ -42,8 +42,8 @@ index 5457f24..f882589 100644 add_one_lib("clangStaticAnalyzerCheckers") diff --git a/backend/src/backend/gen_program.cpp b/backend/src/backend/gen_program.cpp index 274c99c..4159234 100644 ---- backend/src/backend/gen_program.cpp -+++ backend/src/backend/gen_program.cpp +--- a/backend/src/backend/gen_program.cpp ++++ b/backend/src/backend/gen_program.cpp @@ -454,7 +454,11 @@ namespace gbe { #ifdef GBE_COMPILER_AVAILABLE std::string str; @@ -70,8 +70,8 @@ index 274c99c..4159234 100644 if (LLVMLinkModules(wrap(dst), wrap(src), LLVMLinkerPreserveSource_Removed, &errMsg)) { diff --git a/backend/src/backend/program.cpp b/backend/src/backend/program.cpp index c37c595..b36f7b4 100644 ---- backend/src/backend/program.cpp -+++ backend/src/backend/program.cpp +--- a/backend/src/backend/program.cpp ++++ b/backend/src/backend/program.cpp @@ -794,7 +794,11 @@ namespace gbe { llvm::raw_fd_ostream ostream (dumpSPIRBinaryName.c_str(), err, llvm::sys::fs::F_None); @@ -86,8 +86,8 @@ index c37c595..b36f7b4 100644 return true; diff --git a/backend/src/llvm/ExpandLargeIntegers.cpp b/backend/src/llvm/ExpandLargeIntegers.cpp index 8515dc1..4aec44e 100644 ---- backend/src/llvm/ExpandLargeIntegers.cpp -+++ backend/src/llvm/ExpandLargeIntegers.cpp +--- a/backend/src/llvm/ExpandLargeIntegers.cpp ++++ b/backend/src/llvm/ExpandLargeIntegers.cpp @@ -99,8 +99,8 @@ using namespace llvm; #ifdef DEBUG @@ -100,8 +100,8 @@ index 8515dc1..4aec44e 100644 static const unsigned kChunkBytes = kChunkBits / CHAR_BIT; diff --git a/backend/src/llvm/llvm_bitcode_link.cpp b/backend/src/llvm/llvm_bitcode_link.cpp index ef56e4c..4c3e20e 100644 ---- backend/src/llvm/llvm_bitcode_link.cpp -+++ backend/src/llvm/llvm_bitcode_link.cpp +--- a/backend/src/llvm/llvm_bitcode_link.cpp ++++ b/backend/src/llvm/llvm_bitcode_link.cpp @@ -340,7 +340,11 @@ namespace gbe /* We use beignet's bitcode as dst because it will have a lot of lazy functions which will not be loaded. */ @@ -116,8 +116,8 @@ index ef56e4c..4c3e20e 100644 char* errorMsg; diff --git a/backend/src/llvm/llvm_includes.hpp b/backend/src/llvm/llvm_includes.hpp index 184553a..ffccf02 100644 ---- backend/src/llvm/llvm_includes.hpp -+++ backend/src/llvm/llvm_includes.hpp +--- a/backend/src/llvm/llvm_includes.hpp ++++ b/backend/src/llvm/llvm_includes.hpp @@ -89,6 +89,10 @@ #include "llvm/CodeGen/IntrinsicLowering.h" diff --git a/srcpkgs/beignet/patches/llvm06.patch b/srcpkgs/beignet/patches/llvm06.patch index ebd142ac09..3389e66c82 100644 --- a/srcpkgs/beignet/patches/llvm06.patch +++ b/srcpkgs/beignet/patches/llvm06.patch @@ -2,8 +2,8 @@ Source: Arch Linux Upstream: unknown Reason: fixes llvm6 compilation ---- backend/src/llvm/llvm_to_gen.cpp 2017-10-24 09:04:48.000000000 +0300 -+++ backend/src/llvm/llvm_to_gen.cpp 2018-03-16 16:08:54.669963824 +0200 +--- a/backend/src/llvm/llvm_to_gen.cpp 2017-10-24 09:04:48.000000000 +0300 ++++ b/backend/src/llvm/llvm_to_gen.cpp 2018-03-16 16:08:54.669963824 +0200 @@ -322,7 +322,11 @@ namespace gbe DataLayout DL(&mod); @@ -16,8 +16,8 @@ Reason: fixes llvm6 compilation #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 37 mod.setDataLayout(DL); ---- backend/src/llvm/llvm_unroll.cpp 2017-10-24 09:04:48.000000000 +0300 -+++ backend/src/llvm/llvm_unroll.cpp 2018-03-16 16:09:47.736403557 +0200 +--- a/backend/src/llvm/llvm_unroll.cpp 2017-10-24 09:04:48.000000000 +0300 ++++ b/backend/src/llvm/llvm_unroll.cpp 2018-03-16 16:09:47.736403557 +0200 @@ -205,7 +205,9 @@ namespace gbe { if (parentTripCount != 0 && currTripCount * parentTripCount > 32) { //Don't change the unrollID if doesn't force unroll. diff --git a/srcpkgs/beignet/patches/llvm08.patch b/srcpkgs/beignet/patches/llvm08.patch index 15128d1a11..a0c5e7a7c4 100644 --- a/srcpkgs/beignet/patches/llvm08.patch +++ b/srcpkgs/beignet/patches/llvm08.patch @@ -19,8 +19,8 @@ backend/src/llvm/llvm_gen_backend.cpp:3083:5: error: TerminatorInst *term = bb->getTerminator(); ^ ---- backend/src/CMakeLists.txt.orig 2017-09-22 08:05:22 UTC -+++ backend/src/CMakeLists.txt +--- a/backend/src/CMakeLists.txt 2017-09-22 08:05:22 UTC ++++ b/backend/src/CMakeLists.txt @@ -168,6 +168,7 @@ add_dependencies(gbe beignet_bitcode) endif (NOT (USE_STANDALONE_GBE_COMPILER STREQUAL "true")) @@ -29,8 +29,8 @@ backend/src/llvm/llvm_gen_backend.cpp:3083:5: error: if (LLVM_VERSION_NODOT VERSION_EQUAL 34) find_library(TERMINFO NAMES tinfo ncurses) ---- backend/src/llvm/llvm_gen_backend.cpp.orig 2017-10-24 06:04:48 UTC -+++ backend/src/llvm/llvm_gen_backend.cpp +--- a/backend/src/llvm/llvm_gen_backend.cpp 2017-10-24 06:04:48 UTC ++++ b/backend/src/llvm/llvm_gen_backend.cpp @@ -3073,14 +3073,22 @@ namespace gbe diff --git a/srcpkgs/beignet/patches/llvm09.patch b/srcpkgs/beignet/patches/llvm09.patch index bff503800b..acaeceabb6 100644 --- a/srcpkgs/beignet/patches/llvm09.patch +++ b/srcpkgs/beignet/patches/llvm09.patch @@ -3,8 +3,8 @@ Source: FreeBSD + q66 Mostly FreeBSD other than FindLLVM.cmake changes. Linking against clang-cpp does not work for us. ---- CMake/FindLLVM.cmake -+++ CMake/FindLLVM.cmake +--- a/CMake/FindLLVM.cmake ++++ b/CMake/FindLLVM.cmake @@ -140,6 +140,7 @@ add_one_lib("clangStaticAnalyzerCore") add_one_lib("clangAnalysis") add_one_lib("clangEdit") @@ -13,8 +13,8 @@ Linking against clang-cpp does not work for us. add_one_lib("clangParse") add_one_lib("clangSema") add_one_lib("clangLex") ---- backend/src/llvm/llvm_intrinsic_lowering.cpp.orig 2017-10-24 06:04:48 UTC -+++ backend/src/llvm/llvm_intrinsic_lowering.cpp +--- a/backend/src/llvm/llvm_intrinsic_lowering.cpp 2017-10-24 06:04:48 UTC ++++ b/backend/src/llvm/llvm_intrinsic_lowering.cpp @@ -77,7 +77,11 @@ namespace gbe { std::vector ParamTys; for (Value** I = ArgBegin; I != ArgEnd; ++I) @@ -27,8 +27,8 @@ Linking against clang-cpp does not work for us. FunctionType::get(RetTy, ParamTys, false)); IRBuilder<> Builder(CI->getParent(), BasicBlock::iterator(CI)); ---- backend/src/llvm/llvm_sampler_fix.cpp.orig 2017-10-24 06:04:48 UTC -+++ backend/src/llvm/llvm_sampler_fix.cpp +--- a/backend/src/llvm/llvm_sampler_fix.cpp 2017-10-24 06:04:48 UTC ++++ b/backend/src/llvm/llvm_sampler_fix.cpp @@ -82,7 +82,11 @@ namespace gbe { #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 40 Module *M = I->getParent()->getParent()->getParent(); @@ -53,8 +53,8 @@ Linking against clang-cpp does not work for us. #else Value* samplerCvt = M->getOrInsertFunction("__gen_ocl_sampler_to_int", i32Ty, I->getOperand(0)->getType(), nullptr); #endif ---- backend/src/llvm/llvm_profiling.cpp.orig 2017-10-24 06:04:48 UTC -+++ backend/src/llvm/llvm_profiling.cpp +--- a/backend/src/llvm/llvm_profiling.cpp 2017-10-24 06:04:48 UTC ++++ b/backend/src/llvm/llvm_profiling.cpp @@ -163,10 +163,18 @@ namespace gbe // __gen_ocl_store_timestamp(int nth, int type); Value *Args[2] = {ConstantInt::get(intTy, pointNum++), ConstantInt::get(intTy, profilingType)}; @@ -93,8 +93,8 @@ Linking against clang-cpp does not work for us. ArrayRef(Args2)); #else builder->CreateCall(cast(module->getOrInsertFunction( ---- backend/src/llvm/llvm_device_enqueue.cpp.orig 2017-10-24 06:04:48 UTC -+++ backend/src/llvm/llvm_device_enqueue.cpp +--- a/backend/src/llvm/llvm_device_enqueue.cpp 2017-10-24 06:04:48 UTC ++++ b/backend/src/llvm/llvm_device_enqueue.cpp @@ -398,8 +398,13 @@ namespace gbe { std::vector ParamTys; for (Value** iter = args.begin(); iter != args.end(); ++iter) diff --git a/srcpkgs/beignet/patches/llvm10.patch b/srcpkgs/beignet/patches/llvm10.patch index 9a6cc5a8e8..8aafe48a24 100644 --- a/srcpkgs/beignet/patches/llvm10.patch +++ b/srcpkgs/beignet/patches/llvm10.patch @@ -1,7 +1,7 @@ diff --git CMake/FindLLVM.cmake CMake/FindLLVM.cmake index 0a59e47..6e90923 100644 ---- CMake/FindLLVM.cmake -+++ CMake/FindLLVM.cmake +--- a/CMake/FindLLVM.cmake ++++ b/CMake/FindLLVM.cmake @@ -104,28 +104,16 @@ string(REGEX REPLACE " *\n" "" LLVM_SYSTEM_LIBS ${LLVM_SYSTEM_LIBS_ORIG}) endif (LLVM_SYSTEM_LIBS_ORIG) endif (LLVM_VERSION_NODOT VERSION_GREATER 34) @@ -38,8 +38,8 @@ index 0a59e47..6e90923 100644 +add_one_lib("clang-cpp") diff --git CMakeLists.txt CMakeLists.txt index c11acbb..08f427d 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -79,7 +79,7 @@ elseif (COMPILER STREQUAL "CLANG") elseif (COMPILER STREQUAL "ICC") set (CMAKE_C_CXX_FLAGS "${CMAKE_C_CXX_FLAGS} -wd2928 -Wall -fPIC -fstrict-aliasing -fp-model fast -msse4.1 -Wl,-E") @@ -51,8 +51,8 @@ index c11acbb..08f427d 100644 set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DGBE_DEBUG=1") diff --git backend/src/backend/program.cpp backend/src/backend/program.cpp index b36f7b4..e666031 100644 ---- backend/src/backend/program.cpp -+++ backend/src/backend/program.cpp +--- a/backend/src/backend/program.cpp ++++ b/backend/src/backend/program.cpp @@ -694,9 +694,9 @@ namespace gbe { #endif ); @@ -77,8 +77,8 @@ index b36f7b4..e666031 100644 #endif diff --git backend/src/llvm/llvm_gen_backend.cpp backend/src/llvm/llvm_gen_backend.cpp index c6fc30d..82441d8 100644 ---- backend/src/llvm/llvm_gen_backend.cpp -+++ backend/src/llvm/llvm_gen_backend.cpp +--- a/backend/src/llvm/llvm_gen_backend.cpp ++++ b/backend/src/llvm/llvm_gen_backend.cpp @@ -575,10 +575,12 @@ namespace gbe has_errors(false), legacyMode(true) @@ -94,8 +94,8 @@ index c6fc30d..82441d8 100644 } diff --git backend/src/llvm/llvm_gen_backend.hpp backend/src/llvm/llvm_gen_backend.hpp index b4715b1..8e74f7a 100644 ---- backend/src/llvm/llvm_gen_backend.hpp -+++ backend/src/llvm/llvm_gen_backend.hpp +--- a/backend/src/llvm/llvm_gen_backend.hpp ++++ b/backend/src/llvm/llvm_gen_backend.hpp @@ -130,10 +130,10 @@ namespace gbe llvm::FunctionPass *createGenPass(ir::Unit &unit); @@ -120,8 +120,8 @@ index b4715b1..8e74f7a 100644 llvm::FunctionPass* createPrintfParserPass(ir::Unit &unit); diff --git backend/src/llvm/llvm_intrinsic_lowering.cpp backend/src/llvm/llvm_intrinsic_lowering.cpp index 94f0ce6..b5539e9 100644 ---- backend/src/llvm/llvm_intrinsic_lowering.cpp -+++ backend/src/llvm/llvm_intrinsic_lowering.cpp +--- a/backend/src/llvm/llvm_intrinsic_lowering.cpp ++++ b/backend/src/llvm/llvm_intrinsic_lowering.cpp @@ -29,12 +29,12 @@ using namespace llvm; @@ -168,8 +168,8 @@ index 94f0ce6..b5539e9 100644 } // end namespace diff --git backend/src/llvm/llvm_loadstore_optimization.cpp backend/src/llvm/llvm_loadstore_optimization.cpp index 5aa38be..e314302 100644 ---- backend/src/llvm/llvm_loadstore_optimization.cpp -+++ backend/src/llvm/llvm_loadstore_optimization.cpp +--- a/backend/src/llvm/llvm_loadstore_optimization.cpp ++++ b/backend/src/llvm/llvm_loadstore_optimization.cpp @@ -26,13 +26,13 @@ using namespace llvm; @@ -237,8 +237,8 @@ index 5aa38be..e314302 100644 }; diff --git backend/src/llvm/llvm_passes.cpp backend/src/llvm/llvm_passes.cpp index 10752a3..b8f2282 100644 ---- backend/src/llvm/llvm_passes.cpp -+++ backend/src/llvm/llvm_passes.cpp +--- a/backend/src/llvm/llvm_passes.cpp ++++ b/backend/src/llvm/llvm_passes.cpp @@ -37,7 +37,7 @@ #include "sys/map.hpp" @@ -298,8 +298,8 @@ index 10752a3..b8f2282 100644 } /* namespace gbe */ diff --git backend/src/llvm/llvm_sampler_fix.cpp backend/src/llvm/llvm_sampler_fix.cpp index 2a097c8..863be6d 100644 ---- backend/src/llvm/llvm_sampler_fix.cpp -+++ backend/src/llvm/llvm_sampler_fix.cpp +--- a/backend/src/llvm/llvm_sampler_fix.cpp ++++ b/backend/src/llvm/llvm_sampler_fix.cpp @@ -33,10 +33,12 @@ namespace gbe { class SamplerFix : public FunctionPass { public: @@ -315,8 +315,8 @@ index 2a097c8..863be6d 100644 diff --git backend/src/llvm/llvm_scalarize.cpp backend/src/llvm/llvm_scalarize.cpp index e9a2a66..e9d2ee4 100644 ---- backend/src/llvm/llvm_scalarize.cpp -+++ backend/src/llvm/llvm_scalarize.cpp +--- a/backend/src/llvm/llvm_scalarize.cpp ++++ b/backend/src/llvm/llvm_scalarize.cpp @@ -96,10 +96,12 @@ namespace gbe { Scalarize() : FunctionPass(ID) @@ -332,8 +332,8 @@ index e9a2a66..e9d2ee4 100644 diff --git utests/CMakeLists.txt utests/CMakeLists.txt index 300d87a..64179c7 100644 ---- utests/CMakeLists.txt -+++ utests/CMakeLists.txt +--- a/utests/CMakeLists.txt ++++ b/utests/CMakeLists.txt @@ -26,8 +26,8 @@ if (NOT NOT_BUILD_STAND_ALONE_UTEST) # Threads Find_Package(Threads) diff --git a/srcpkgs/beignet/patches/llvm11.patch b/srcpkgs/beignet/patches/llvm11.patch index 9f32826769..7bd82e5807 100644 --- a/srcpkgs/beignet/patches/llvm11.patch +++ b/srcpkgs/beignet/patches/llvm11.patch @@ -7,8 +7,8 @@ There were a few changes required for LLVM 11: * CallInst::getCalledValue() was renamed to CallInst::getCalledOperand() * Implicit conversion from MaybeAlign to Align was removed, so MaybeAlign::valueOrOne was used instead. ---- backend/src/llvm/StripAttributes.cpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/StripAttributes.cpp 2020-11-09 19:04:19.641897141 +0100 +--- a/backend/src/llvm/StripAttributes.cpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/StripAttributes.cpp 2020-11-09 19:04:19.641897141 +0100 @@ -107,9 +107,8 @@ BB != E; ++BB) { for (BasicBlock::iterator Inst = BB->begin(), E = BB->end(); @@ -21,8 +21,8 @@ There were a few changes required for LLVM 11: } } ---- backend/src/llvm/llvm_bitcode_link.cpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/llvm_bitcode_link.cpp 2020-11-09 17:04:09.633753428 +0100 +--- a/backend/src/llvm/llvm_bitcode_link.cpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/llvm_bitcode_link.cpp 2020-11-09 17:04:09.633753428 +0100 @@ -98,7 +98,7 @@ if (callFunc && callFunc->getIntrinsicID() != 0) continue; @@ -32,8 +32,8 @@ There were a few changes required for LLVM 11: if (!MFS.insert(fnName).second) { continue; ---- backend/src/llvm/llvm_device_enqueue.cpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/llvm_device_enqueue.cpp 2020-11-09 19:01:49.201915008 +0100 +--- a/backend/src/llvm/llvm_device_enqueue.cpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/llvm_device_enqueue.cpp 2020-11-09 19:01:49.201915008 +0100 @@ -45,7 +45,7 @@ return NULL; @@ -119,8 +119,8 @@ There were a few changes required for LLVM 11: } } } else if(isa(block)) { ---- backend/src/llvm/llvm_gen_backend.cpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/llvm_gen_backend.cpp 2020-11-09 18:33:50.919114327 +0100 +--- a/backend/src/llvm/llvm_gen_backend.cpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/llvm_gen_backend.cpp 2020-11-09 18:33:50.919114327 +0100 @@ -376,7 +376,7 @@ GBE_ASSERT(index == 0); return this->_newScalar(value, key, type, index, uniform); @@ -725,8 +725,8 @@ There were a few changes required for LLVM 11: case GEN_OCL_GET_PIPE: case GEN_OCL_MAKE_RID: case GEN_OCL_GET_RID: ---- backend/src/llvm/llvm_includes.hpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/llvm_includes.hpp 2020-11-09 19:00:09.955926795 +0100 +--- a/backend/src/llvm/llvm_includes.hpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/llvm_includes.hpp 2020-11-09 19:00:09.955926795 +0100 @@ -103,7 +103,6 @@ #if LLVM_VERSION_MAJOR * 10 + LLVM_VERSION_MINOR >= 35 @@ -735,8 +735,8 @@ There were a few changes required for LLVM 11: #include "llvm/IR/CFG.h" #include "llvm/IR/InstVisitor.h" #include "llvm/IR/IRPrintingPasses.h" ---- backend/src/llvm/llvm_loadstore_optimization.cpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/llvm_loadstore_optimization.cpp 2020-11-09 19:10:37.141852308 +0100 +--- a/backend/src/llvm/llvm_loadstore_optimization.cpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/llvm_loadstore_optimization.cpp 2020-11-09 19:10:37.141852308 +0100 @@ -160,7 +160,7 @@ Value *vecPtr = Builder.CreateBitCast(ld->getPointerOperand(), PointerType::get(vecTy, addrSpace)); @@ -755,8 +755,8 @@ There were a few changes required for LLVM 11: } // Find the safe iterator we can point to. If reorder happens, we need to ---- backend/src/llvm/llvm_passes.cpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/llvm_passes.cpp 2020-11-09 18:48:55.997006837 +0100 +--- a/backend/src/llvm/llvm_passes.cpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/llvm_passes.cpp 2020-11-09 18:48:55.997006837 +0100 @@ -87,14 +87,14 @@ } @@ -800,8 +800,8 @@ There were a few changes required for LLVM 11: GBE_ASSERT(elementType); return elementType; } ---- backend/src/llvm/llvm_printf_parser.cpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/llvm_printf_parser.cpp 2020-11-09 18:57:52.618943105 +0100 +--- a/backend/src/llvm/llvm_printf_parser.cpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/llvm_printf_parser.cpp 2020-11-09 18:57:52.618943105 +0100 @@ -323,8 +323,7 @@ bool PrintfParser::parseOnePrintfInstruction(CallInst * call) @@ -856,8 +856,8 @@ There were a few changes required for LLVM 11: bool sign = false; if (vec_num != slot.state.vector_n) { ---- backend/src/llvm/llvm_profiling.cpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/llvm_profiling.cpp 2020-11-09 18:59:50.120929150 +0100 +--- a/backend/src/llvm/llvm_profiling.cpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/llvm_profiling.cpp 2020-11-09 18:59:50.120929150 +0100 @@ -35,7 +35,6 @@ #include "llvm/IR/IRBuilder.h" @@ -866,8 +866,8 @@ There were a few changes required for LLVM 11: #include "llvm/IR/CFG.h" #else #include "llvm/Support/CallSite.h" ---- backend/src/llvm/llvm_sampler_fix.cpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/llvm_sampler_fix.cpp 2020-11-09 17:01:09.407774832 +0100 +--- a/backend/src/llvm/llvm_sampler_fix.cpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/llvm_sampler_fix.cpp 2020-11-09 17:01:09.407774832 +0100 @@ -45,8 +45,8 @@ bool visitCallInst(CallInst *I) { if(!I) @@ -897,8 +897,8 @@ There were a few changes required for LLVM 11: { const ConstantInt *ci = dyn_cast(init->getOperand(0)); uint32_t samplerInt = ci->getZExtValue(); ---- backend/src/llvm/llvm_scalarize.cpp 2020-11-09 16:48:20.823866112 +0100 -+++ backend/src/llvm/llvm_scalarize.cpp 2020-11-09 18:51:16.888990104 +0100 +--- a/backend/src/llvm/llvm_scalarize.cpp 2020-11-09 16:48:20.823866112 +0100 ++++ b/backend/src/llvm/llvm_scalarize.cpp 2020-11-09 18:51:16.888990104 +0100 @@ -178,7 +178,7 @@ if(!type) return type; diff --git a/srcpkgs/beignet/patches/llvm12.patch b/srcpkgs/beignet/patches/llvm12.patch index a773b4488d..6f8ab005c1 100644 --- a/srcpkgs/beignet/patches/llvm12.patch +++ b/srcpkgs/beignet/patches/llvm12.patch @@ -1,7 +1,7 @@ diff --git backend/src/llvm/ExpandLargeIntegers.cpp backend/src/llvm/ExpandLargeIntegers.cpp index 8515dc13..27080380 100644 ---- backend/src/llvm/ExpandLargeIntegers.cpp -+++ backend/src/llvm/ExpandLargeIntegers.cpp +--- a/backend/src/llvm/ExpandLargeIntegers.cpp ++++ b/backend/src/llvm/ExpandLargeIntegers.cpp @@ -328,7 +328,7 @@ static Value *buildVectorOrScalar(ConversionState &State, IRBuilder<> &IRB, Smal // splited, that's why these temporary values should be erased. bool KeepInsert = isLegalBitSize(ElemTy->getPrimitiveSizeInBits() * ElemNo); @@ -31,8 +31,8 @@ index 8515dc13..27080380 100644 } diff --git backend/src/llvm/llvm_gen_backend.cpp backend/src/llvm/llvm_gen_backend.cpp index c93d89cc..64d5b0e5 100644 ---- backend/src/llvm/llvm_gen_backend.cpp -+++ backend/src/llvm/llvm_gen_backend.cpp +--- a/backend/src/llvm/llvm_gen_backend.cpp ++++ b/backend/src/llvm/llvm_gen_backend.cpp @@ -304,7 +304,7 @@ namespace gbe TYPESIZEVEC(long,8) TYPESIZEVEC(unsigned long,8) @@ -44,8 +44,8 @@ index c93d89cc..64d5b0e5 100644 } diff --git backend/src/llvm/llvm_loadstore_optimization.cpp backend/src/llvm/llvm_loadstore_optimization.cpp index 5aa38bef..6b5c1bad 100644 ---- backend/src/llvm/llvm_loadstore_optimization.cpp -+++ backend/src/llvm/llvm_loadstore_optimization.cpp +--- a/backend/src/llvm/llvm_loadstore_optimization.cpp ++++ b/backend/src/llvm/llvm_loadstore_optimization.cpp @@ -152,7 +152,7 @@ namespace gbe { unsigned addrSpace = ld->getPointerAddressSpace(); // insert before first load @@ -66,8 +66,8 @@ index 5aa38bef..6b5c1bad 100644 parent = Builder.CreateInsertElement(parent, values[i], ConstantInt::get(IntegerType::get(st->getContext(), 32), i)); diff --git backend/src/llvm/llvm_printf_parser.cpp backend/src/llvm/llvm_printf_parser.cpp index 6bb7c52a..af459cd2 100644 ---- backend/src/llvm/llvm_printf_parser.cpp -+++ backend/src/llvm/llvm_printf_parser.cpp +--- a/backend/src/llvm/llvm_printf_parser.cpp ++++ b/backend/src/llvm/llvm_printf_parser.cpp @@ -630,7 +630,7 @@ error: if (elt_type != elt_dst_type) { Value *II = NULL; @@ -88,8 +88,8 @@ index 6bb7c52a..af459cd2 100644 Value* cvt = builder->CreateFPCast(org, Type::getFloatTy(module->getContext())); diff --git backend/src/llvm/llvm_to_gen.cpp backend/src/llvm/llvm_to_gen.cpp index 7f7deffe..9e8ccc67 100644 ---- backend/src/llvm/llvm_to_gen.cpp -+++ backend/src/llvm/llvm_to_gen.cpp +--- a/backend/src/llvm/llvm_to_gen.cpp ++++ b/backend/src/llvm/llvm_to_gen.cpp @@ -358,7 +358,7 @@ namespace gbe passes.add(createScalarReplAggregatesPass(64, true, -1, -1, 64)); #endif diff --git a/srcpkgs/beignet/patches/musl.patch b/srcpkgs/beignet/patches/musl.patch index b6c9c68d50..cefafbb655 100644 --- a/srcpkgs/beignet/patches/musl.patch +++ b/srcpkgs/beignet/patches/musl.patch @@ -1,5 +1,5 @@ ---- backend/src/backend/gen/gen_mesa_disasm.c -+++ backend/src/backend/gen/gen_mesa_disasm.c +--- a/backend/src/backend/gen/gen_mesa_disasm.c ++++ b/backend/src/backend/gen/gen_mesa_disasm.c @@ -1137,7 +1137,7 @@ static uint32_t __conv_half_to_float(uint16_t h) // Adjust mantissa so it's normalized (and keep // track of exponent adjustment) diff --git a/srcpkgs/beignet/template b/srcpkgs/beignet/template index dbe0d1888c..29a1ef99db 100644 --- a/srcpkgs/beignet/template +++ b/srcpkgs/beignet/template @@ -14,7 +14,6 @@ license="LGPL-2.1-or-later" homepage="http://www.freedesktop.org/wiki/Software/Beignet/" distfiles="https://01.org/sites/default/files/${pkgname}-${version}-source.tar.gz" checksum=c555edba149de23243965a703f39f79fa06f15bcff5a3762b5544b0925010b43 -patch_args=-Np0 post_install() { # remove CL headers, we do use opencl-headers instead. diff --git a/srcpkgs/belle-sip/patches/musl.patch b/srcpkgs/belle-sip/patches/musl.patch index 2bbbddb198..806402719c 100644 --- a/srcpkgs/belle-sip/patches/musl.patch +++ b/srcpkgs/belle-sip/patches/musl.patch @@ -1,5 +1,5 @@ ---- src/belle_sip_resolver.c 2018-02-21 17:30:40.474348393 +0100 -+++ - 2018-02-21 17:32:31.892044464 +0100 +--- a/src/belle_sip_resolver.c 2018-02-21 17:30:40.474348393 +0100 ++++ b/src/belle_sip_resolver.c 2018-02-21 17:30:40.474348393 +0100 @@ -459,7 +459,11 @@ } diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template index 9f9c297d35..6351feba63 100644 --- a/srcpkgs/belle-sip/template +++ b/srcpkgs/belle-sip/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://www.linphone.org" distfiles="https://gitlab.linphone.org/BC/public/belle-sip/-/archive/${version}/belle-sip-${version}.tar.gz" checksum=4f9218b0bbf55c2f68d70a0e83779e591ef9fe97f1caf7550768ea192ee34cee -patch_args=-Np0 belle-sip-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/berkeley-abc/patches/remove_bzlib_convenience.patch b/srcpkgs/berkeley-abc/patches/remove_bzlib_convenience.patch index 00bf278ce7..e7fc2e8967 100644 --- a/srcpkgs/berkeley-abc/patches/remove_bzlib_convenience.patch +++ b/srcpkgs/berkeley-abc/patches/remove_bzlib_convenience.patch @@ -14,8 +14,8 @@ Forwarded: doesn't make sense upstream diff --git Makefile Makefile index e0e8b8f..36b0f89 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -20,7 +20,7 @@ MODULES := \ src/map/mapper src/map/mio src/map/super src/map/if \ src/map/amap src/map/cov src/map/scl src/map/mpm \ @@ -36,8 +36,8 @@ index e0e8b8f..36b0f89 100644 $(info $(MSG_PREFIX)Using explicit -lstdc++) diff --git src/base/io/ioReadAiger.c src/base/io/ioReadAiger.c index f87d971..4f0f6a3 100644 ---- src/base/io/ioReadAiger.c -+++ src/base/io/ioReadAiger.c +--- a/src/base/io/ioReadAiger.c ++++ b/src/base/io/ioReadAiger.c @@ -26,7 +26,7 @@ #include #include @@ -49,8 +49,8 @@ index f87d971..4f0f6a3 100644 diff --git src/base/io/ioWriteAiger.c src/base/io/ioWriteAiger.c index 0a68c7e..f0744c6 100644 ---- src/base/io/ioWriteAiger.c -+++ src/base/io/ioWriteAiger.c +--- a/src/base/io/ioWriteAiger.c ++++ b/src/base/io/ioWriteAiger.c @@ -26,7 +26,7 @@ #include #include diff --git a/srcpkgs/berkeley-abc/patches/remove_zlib_convenience.patch b/srcpkgs/berkeley-abc/patches/remove_zlib_convenience.patch index d869703569..64a63d3d7e 100644 --- a/srcpkgs/berkeley-abc/patches/remove_zlib_convenience.patch +++ b/srcpkgs/berkeley-abc/patches/remove_zlib_convenience.patch @@ -15,8 +15,8 @@ Forwarded: doesn't make sense upstream diff --git Makefile Makefile index 36b0f89..68651d2 100644 ---- Makefile -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -20,7 +20,7 @@ MODULES := \ src/map/mapper src/map/mio src/map/super src/map/if \ src/map/amap src/map/cov src/map/scl src/map/mpm \ @@ -36,8 +36,8 @@ index 36b0f89..68651d2 100644 LIBS += -lstdc++ diff --git src/base/io/ioReadAiger.c src/base/io/ioReadAiger.c index 4f0f6a3..e174ff6 100644 ---- src/base/io/ioReadAiger.c -+++ src/base/io/ioReadAiger.c +--- a/src/base/io/ioReadAiger.c ++++ b/src/base/io/ioReadAiger.c @@ -27,7 +27,7 @@ #include @@ -49,8 +49,8 @@ index 4f0f6a3..e174ff6 100644 ABC_NAMESPACE_IMPL_START diff --git src/base/io/ioWriteAiger.c src/base/io/ioWriteAiger.c index f0744c6..d265104 100644 ---- src/base/io/ioWriteAiger.c -+++ src/base/io/ioWriteAiger.c +--- a/src/base/io/ioWriteAiger.c ++++ b/src/base/io/ioWriteAiger.c @@ -27,7 +27,7 @@ #include @@ -62,8 +62,8 @@ index f0744c6..d265104 100644 diff --git src/sat/cnf/cnfMan.c src/sat/cnf/cnfMan.c index 5a125ec..54c582f 100644 ---- src/sat/cnf/cnfMan.c -+++ src/sat/cnf/cnfMan.c +--- a/src/sat/cnf/cnfMan.c ++++ b/src/sat/cnf/cnfMan.c @@ -21,7 +21,7 @@ #include "cnf.h" #include "sat/bsat/satSolver.h" diff --git a/srcpkgs/berkeley-abc/patches/reproducibility.patch b/srcpkgs/berkeley-abc/patches/reproducibility.patch index c807519fa4..4ab0c9a46b 100644 --- a/srcpkgs/berkeley-abc/patches/reproducibility.patch +++ b/srcpkgs/berkeley-abc/patches/reproducibility.patch @@ -11,8 +11,8 @@ Otherwise the debian package checking complains... diff --git src/base/cmd/cmdUtils.c src/base/cmd/cmdUtils.c index 3409543..9b7223f 100644 ---- src/base/cmd/cmdUtils.c -+++ src/base/cmd/cmdUtils.c +--- a/src/base/cmd/cmdUtils.c ++++ b/src/base/cmd/cmdUtils.c @@ -589,7 +589,7 @@ void CmdCommandPrint( Abc_Frame_t * pAbc, int fPrintAll, int fDetails ) nColumns = 79 / (LenghtMax + 2); @@ -24,8 +24,8 @@ index 3409543..9b7223f 100644 sGroupCur = NULL; diff --git src/base/main/mainUtils.c src/base/main/mainUtils.c index d1fe1d2..3668f3b 100644 ---- src/base/main/mainUtils.c -+++ src/base/main/mainUtils.c +--- a/src/base/main/mainUtils.c ++++ b/src/base/main/mainUtils.c @@ -52,7 +52,7 @@ static char * DateReadFromDateString( char * datestr ); char * Abc_UtilsGetVersion( Abc_Frame_t * pAbc ) { diff --git a/srcpkgs/berkeley-abc/template b/srcpkgs/berkeley-abc/template index 280c3e0bce..f5aeb2a1e4 100644 --- a/srcpkgs/berkeley-abc/template +++ b/srcpkgs/berkeley-abc/template @@ -15,7 +15,6 @@ license="custom:University-of-California, BSD-4-Clause, MIT, BSD-2-Clause" homepage="http://www.eecs.berkeley.edu/~alanmi/abc/" distfiles="https://github.com/berkeley-abc/abc/archive/$_gitrev.tar.gz" checksum=52f1e9bf62c1e0d3b3cbe145f61b409a725e73fe606ba010efcbb2701a14171b -patch_args=-Np0 post_patch() { vsed -i -e '/^CC *:=/d' -e '/^CXX *:=/d' -e '/^AR *:=/d' \ diff --git a/srcpkgs/berry/patches/fix-cross.patch b/srcpkgs/berry/patches/fix-cross.patch index 2b069971ae..3756ccfa40 100644 --- a/srcpkgs/berry/patches/fix-cross.patch +++ b/srcpkgs/berry/patches/fix-cross.patch @@ -1,5 +1,5 @@ ---- config.mk.orig -+++ config.mk +--- a/config.mk ++++ b/config.mk @@ -9,11 +9,11 @@ # Customize below to fit your system diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template index a9fb2bf943..05256589af 100644 --- a/srcpkgs/berry/template +++ b/srcpkgs/berry/template @@ -11,7 +11,6 @@ license="MIT" homepage="https://github.com/JLErvin/berry" distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz" checksum=1d6de883a0cd96ceb167c5ad2e855b0b15fa84872d41a22e05d0fdf0cf4be6b8 -patch_args=-Np0 post_install() { vlicense LICENSE diff --git a/srcpkgs/biew/patches/bool.patch b/srcpkgs/biew/patches/bool.patch index 707af17de4..624cb50093 100644 --- a/srcpkgs/biew/patches/bool.patch +++ b/srcpkgs/biew/patches/bool.patch @@ -2,8 +2,8 @@ The two underscores in the front violate namespace and break build at least on some systems, as __bool might be a builtin type name. ---- plugins/bin/ne.c -+++ plugins/bin/ne.c +--- a/plugins/bin/ne.c ++++ b/plugins/bin/ne.c @@ -465,16 +465,16 @@ static void __FASTCALL__ ShowProcListNE( int modno ) { BGLOBAL handle; diff --git a/srcpkgs/biew/template b/srcpkgs/biew/template index 06db316d4c..73a17e44c8 100644 --- a/srcpkgs/biew/template +++ b/srcpkgs/biew/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://beye.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/beye/${pkgname}/${version}/${pkgname}-${_shortversion}-src.tar.bz2" checksum=2e85f03c908dd6ec832461fbfbc79169a33f4caccf48c8fe60cbd29f5fb06d17 -patch_args=-Np0 pre_configure() { configure_args+=" --target-arch=generic --ld=$CC" diff --git a/srcpkgs/bin86/patches/fix_x86_64.diff b/srcpkgs/bin86/patches/fix_x86_64.diff index f8efc33d2b..05c374aeb6 100644 --- a/srcpkgs/bin86/patches/fix_x86_64.diff +++ b/srcpkgs/bin86/patches/fix_x86_64.diff @@ -1,5 +1,5 @@ ---- ld/x86_aout.h 2005-11-07 20:07:31.506442000 +0100 -+++ ld/x86_aout.h 2020-02-07 20:07:41.106982496 +0100 +--- a/ld/x86_aout.h 2005-11-07 20:07:31.506442000 +0100 ++++ b/ld/x86_aout.h 2020-02-07 20:07:41.106982496 +0100 @@ -12,6 +12,9 @@ #if defined(i386) || defined(__BCC__) || defined(MSDOS) typedef long Long; diff --git a/srcpkgs/bin86/template b/srcpkgs/bin86/template index fd37d2a267..8d71121019 100644 --- a/srcpkgs/bin86/template +++ b/srcpkgs/bin86/template @@ -9,7 +9,6 @@ license="GPL-2" distfiles="http://v3.sk/~lkundrak/dev86/bin86-${version}.tar.gz" checksum=021e37cde3a20632c4c9000993cb4aa9f58cb82b1d3c26b9aeb62d6566925738 archs="i686* x86_64*" -patch_args=-Np0 do_build() { make ${makejobs} CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" PREFIX=/usr diff --git a/srcpkgs/binwalk/patches/fallback-version.patch b/srcpkgs/binwalk/patches/fallback-version.patch index b319bfebb5..8cd2a430d9 100644 --- a/srcpkgs/binwalk/patches/fallback-version.patch +++ b/srcpkgs/binwalk/patches/fallback-version.patch @@ -1,5 +1,5 @@ ---- src/binwalk/core/version.py.orig -+++ src/binwalk/core/version.py +--- a/src/binwalk/core/version.py ++++ b/src/binwalk/core/version.py @@ -1,6 +1,10 @@ try: from importlib import metadata diff --git a/srcpkgs/binwalk/template b/srcpkgs/binwalk/template index cec10ddb7e..6c61fff87a 100644 --- a/srcpkgs/binwalk/template +++ b/srcpkgs/binwalk/template @@ -13,7 +13,6 @@ license="MIT" homepage="https://github.com/ReFirmLabs/binwalk" distfiles="https://github.com/ReFirmLabs/binwalk/archive/v${version}.tar.gz" checksum=7ec9d8fcb8686f4060d37e1096669e3ed8ce1194c91ad80199622448bcc01b19 -patch_args=-Np0 post_extract() { vsed -i -e 's;/etc/bash_completion.d/%s;%s.bash;' setup.py diff --git a/srcpkgs/biosdisk/patches/fix-sbin.patch b/srcpkgs/biosdisk/patches/fix-sbin.patch index 5914863cbb..aa9d7d5bdd 100644 --- a/srcpkgs/biosdisk/patches/fix-sbin.patch +++ b/srcpkgs/biosdisk/patches/fix-sbin.patch @@ -1,5 +1,5 @@ ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -3,7 +3,7 @@ DESTDIR = prefix ?= /usr/ diff --git a/srcpkgs/biosdisk/template b/srcpkgs/biosdisk/template index ea5ad3aebc..ccbc76f4e5 100644 --- a/srcpkgs/biosdisk/template +++ b/srcpkgs/biosdisk/template @@ -10,4 +10,3 @@ license="GPL-2.0-or-later" homepage="https://github.com/dell/biosdisk" distfiles="https://github.com/dell/biosdisk/archive/${version}.tar.gz" checksum=e89cf680914ab3d5bbb549c124c6c29594ef495880befc0d059ec8a3aaf1e3e7 -patch_args=-Np0 diff --git a/srcpkgs/bird/patches/fix-tests-musl.patch b/srcpkgs/bird/patches/fix-tests-musl.patch index 2bac77b009..55403f6e75 100644 --- a/srcpkgs/bird/patches/fix-tests-musl.patch +++ b/srcpkgs/bird/patches/fix-tests-musl.patch @@ -1,5 +1,5 @@ ---- lib/printf_test.c -+++ lib/printf_test.c +--- a/lib/printf_test.c ++++ b/lib/printf_test.c @@ -22,6 +22,7 @@ static int t_simple(void) { diff --git a/srcpkgs/bird/template b/srcpkgs/bird/template index 493605a5ce..bc40598b03 100644 --- a/srcpkgs/bird/template +++ b/srcpkgs/bird/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="https://bird.network.cz" distfiles="https://gitlab.labs.nic.cz/labs/bird/-/archive/v${version}/bird-v${version}.tar.gz" checksum=4d0eeea762dcd4422e1e276e2ed123cfed630cf1cce017b50463d79fcf2fff0c -patch_args=-Np0 conf_files="/etc/bird.conf" system_accounts="_bird" diff --git a/srcpkgs/birdtray/patches/QPainterPath.patch b/srcpkgs/birdtray/patches/QPainterPath.patch index c73ef6e6da..32d34196d7 100644 --- a/srcpkgs/birdtray/patches/QPainterPath.patch +++ b/srcpkgs/birdtray/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- src/trayicon.cpp 2020-04-29 13:40:12.000000000 +0200 -+++ src/trayicon.cpp 2020-08-31 20:47:56.018726289 +0200 +--- a/src/trayicon.cpp 2020-04-29 13:40:12.000000000 +0200 ++++ b/src/trayicon.cpp 2020-08-31 20:47:56.018726289 +0200 @@ -1,6 +1,7 @@ #include #include diff --git a/srcpkgs/birdtray/template b/srcpkgs/birdtray/template index acf7c1d9c1..8695820ecc 100644 --- a/srcpkgs/birdtray/template +++ b/srcpkgs/birdtray/template @@ -11,4 +11,3 @@ license="GPL-3.0-or-later" homepage="https://github.com/gyunaev/birdtray" distfiles="https://github.com/gyunaev/birdtray/archive/v${version}.tar.gz" checksum=672256bfadbde2841dcd6bad00662aeba825a4f041fa9a1980763f9eb29294d0 -patch_args=-Np0 diff --git a/srcpkgs/bish/patches/fix-ldflags.patch b/srcpkgs/bish/patches/fix-ldflags.patch index a3d8bc6c62..682642138d 100644 --- a/srcpkgs/bish/patches/fix-ldflags.patch +++ b/srcpkgs/bish/patches/fix-ldflags.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2016-05-24 14:29:52.349935460 +0200 -+++ Makefile 2016-05-24 14:30:01.190934798 +0200 +--- a/Makefile 2016-05-24 14:29:52.349935460 +0200 ++++ b/Makefile 2016-05-24 14:30:01.190934798 +0200 @@ -29,7 +29,7 @@ $(OBJ)/libbish.a: $(OBJECTS) ranlib $@ diff --git a/srcpkgs/bish/template b/srcpkgs/bish/template index f5140a9ac2..2355c664a4 100644 --- a/srcpkgs/bish/template +++ b/srcpkgs/bish/template @@ -9,7 +9,6 @@ license="MIT" homepage="https://github.com/tdenniston/bish" distfiles="https://github.com/tdenniston/bish/archive/v${version}.tar.gz" checksum=796d1efcbc9e8c7ea604881860aa8d857aad089c4eeb766283c21c210687942b -patch_args=-Np0 do_install() { vbin bish diff --git a/srcpkgs/bitchx/patches/bitchx-1.2.1-security.patch b/srcpkgs/bitchx/patches/bitchx-1.2.1-security.patch index 4964db9c84..d65bb1207c 100644 --- a/srcpkgs/bitchx/patches/bitchx-1.2.1-security.patch +++ b/srcpkgs/bitchx/patches/bitchx-1.2.1-security.patch @@ -1,7 +1,7 @@ diff --git include/dcc.h include/dcc.h index 9cc1e7c..3e4f12d 100644 ---- include/dcc.h -+++ include/dcc.h +--- a/include/dcc.h ++++ b/include/dcc.h @@ -97,6 +97,7 @@ #define DCC_OFFER 0x00040000 #define DCC_DELETE 0x00080000 @@ -12,8 +12,8 @@ index 9cc1e7c..3e4f12d 100644 #define DCC_CNCT_PEND 0x00200000 diff --git source/dcc.c source/dcc.c index d0706f8..b158189 100644 ---- source/dcc.c -+++ source/dcc.c +--- a/source/dcc.c ++++ b/source/dcc.c @@ -1415,6 +1415,7 @@ UserList *ul = NULL; if (autoresume && stat(fullname, &sb) != -1) { n->transfer_orders.byteoffset = sb.st_size; diff --git a/srcpkgs/bitchx/patches/openssl-1.1.patch b/srcpkgs/bitchx/patches/openssl-1.1.patch index f062675dc6..ef009186f1 100644 --- a/srcpkgs/bitchx/patches/openssl-1.1.patch +++ b/srcpkgs/bitchx/patches/openssl-1.1.patch @@ -10,8 +10,8 @@ Date: Fri Mar 17 00:38:46 2017 +1100 diff --git configure configure index d435491..f4af7bb 100755 ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -10630,9 +10630,9 @@ esac case "$with_ssl" in yes|check) @@ -76,8 +76,8 @@ index d435491..f4af7bb 100755 echo $ECHO_N "checking for SSL_accept in -lssl... $ECHO_C" >&6 diff --git configure.in configure.in index 63d133f..3694a7f 100644 ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -562,8 +562,8 @@ case "$with_ssl" in esac case "$with_ssl" in diff --git a/srcpkgs/bitchx/template b/srcpkgs/bitchx/template index f5de7ac869..450fde27de 100644 --- a/srcpkgs/bitchx/template +++ b/srcpkgs/bitchx/template @@ -11,7 +11,6 @@ license="BSD-3-Clause" homepage="http://bitchx.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2 -patch_args=-Np0 disable_parallel_build=yes diff --git a/srcpkgs/bitfighter/patches/cmake.patch b/srcpkgs/bitfighter/patches/cmake.patch index 217ba74076..ad2808546e 100644 --- a/srcpkgs/bitfighter/patches/cmake.patch +++ b/srcpkgs/bitfighter/patches/cmake.patch @@ -1,5 +1,5 @@ ---- cmake/Platform/Linux.cmake.orig 2018-12-20 21:54:40.020718363 -0700 -+++ cmake/Platform/Linux.cmake 2018-12-20 21:54:49.064912089 -0700 +--- a/cmake/Platform/Linux.cmake 2018-12-20 21:54:40.020718363 -0700 ++++ b/cmake/Platform/Linux.cmake 2018-12-20 21:54:49.064912089 -0700 @@ -99,7 +99,7 @@ function(BF_PLATFORM_INSTALL targetName) if(INSTALL_NOTIFIER) @@ -9,8 +9,8 @@ # Modify python script to use proper path to the system-installed icon install(CODE "execute_process(COMMAND sed -i -e \"s@redship48.png@bitfighter.png@\" -e \"s@^ICON_BASE =.*@ICON_BASE = \\\"${CMAKE_DESKTOP_DATA_PATH}/pixmaps/\\\"@\" ${CMAKE_SOURCE_DIR}/notifier/bitfighter_notifier.py)") install(PROGRAMS ${CMAKE_SOURCE_DIR}/notifier/bitfighter_notifier.py DESTINATION ${CMAKE_BIN_PATH} RENAME bitfighter_notifier) ---- zap/bitfighterd.cmake.orig 2018-12-20 21:19:40.666559517 -0700 -+++ zap/bitfighterd.cmake 2018-12-20 21:19:44.866653338 -0700 +--- a/zap/bitfighterd.cmake 2018-12-20 21:19:40.666559517 -0700 ++++ b/zap/bitfighterd.cmake 2018-12-20 21:19:44.866653338 -0700 @@ -11,13 +11,13 @@ add_executable(bitfighterd add_dependencies(bitfighterd tnl @@ -26,8 +26,8 @@ ) set_target_properties(bitfighterd ---- ./zap/bitfighter_client.cmake.orig 2018-12-16 09:12:56.168753252 -0700 -+++ ./zap/bitfighter_client.cmake 2018-12-20 21:02:50.936433248 -0700 +--- a/zap/bitfighter_client.cmake 2018-12-16 09:12:56.168753252 -0700 ++++ b/zap/bitfighter_client.cmake 2018-12-20 21:02:50.936433248 -0700 @@ -11,13 +11,23 @@ add_library(bitfighter_client OBJECT ${OTHER_HEADERS} ) @@ -54,8 +54,8 @@ ) if(USE_GLES) ---- ./master/CMakeLists.txt.orig 2018-12-20 21:10:17.222088600 -0700 -+++ ./master/CMakeLists.txt 2018-12-20 21:13:57.550931398 -0700 +--- a/master/CMakeLists.txt 2018-12-20 21:10:17.222088600 -0700 ++++ b/master/CMakeLists.txt 2018-12-20 21:13:57.550931398 -0700 @@ -41,7 +41,11 @@ else() endif() @@ -69,8 +69,8 @@ set(MASTER_LIBS tnl ---- ./CMakeLists.txt.orig 2018-12-12 15:40:38.904058738 -0700 -+++ ./CMakeLists.txt 2018-12-20 21:09:57.017647629 -0700 +--- a/CMakeLists.txt 2018-12-12 15:40:38.904058738 -0700 ++++ b/CMakeLists.txt 2018-12-20 21:09:57.017647629 -0700 @@ -1,17 +1,6 @@ project (bitfighter) cmake_minimum_required (VERSION 3.1.0) @@ -90,8 +90,8 @@ # # CMake options ---- zap/bitfighter_client.cmake 2019-01-07 02:43:43.453459870 +0100 -+++ - 2019-01-07 02:54:56.118124604 +0100 +--- a/zap/bitfighter_client.cmake 2019-01-07 02:43:43.453459870 +0100 ++++ b/zap/bitfighter_client.cmake 2019-01-07 02:43:43.453459870 +0100 @@ -20,12 +20,13 @@ if(NOT TOMCRYPT_FOUND) list(APPEND CLIENT_EXTRA_DEPS tomcrypt) @@ -108,8 +108,8 @@ poly2tri ${CLIENT_EXTRA_DEPS} ) ---- zap/bitfighterd.cmake 2019-01-07 02:57:05.348462052 +0100 -+++ - 2019-01-07 02:59:39.300598740 +0100 +--- a/zap/bitfighterd.cmake 2019-01-07 02:57:05.348462052 +0100 ++++ b/zap/bitfighterd.cmake 2019-01-07 02:57:05.348462052 +0100 @@ -11,12 +11,12 @@ add_dependencies(bitfighterd tnl @@ -124,8 +124,8 @@ ${TOMCRYPT__LIBRARIES} ) ---- zap/bitfighter_client.cmake 2019-01-07 03:03:15.449271742 +0100 -+++ - 2019-01-07 03:05:39.233731581 +0100 +--- a/zap/bitfighter_client.cmake 2019-01-07 03:03:15.449271742 +0100 ++++ b/zap/bitfighter_client.cmake 2019-01-07 03:03:15.449271742 +0100 @@ -25,7 +25,6 @@ endif() @@ -134,8 +134,8 @@ tnl poly2tri ${CLIENT_EXTRA_DEPS} ---- zap/bitfighterd.cmake 2019-01-07 03:03:15.456271777 +0100 -+++ - 2019-01-07 03:05:59.095945997 +0100 +--- a/zap/bitfighterd.cmake 2019-01-07 03:03:15.456271777 +0100 ++++ b/zap/bitfighterd.cmake 2019-01-07 03:03:15.456271777 +0100 @@ -10,12 +10,12 @@ add_dependencies(bitfighterd diff --git a/srcpkgs/bitfighter/template b/srcpkgs/bitfighter/template index 58e0331073..c3b2cc22a2 100644 --- a/srcpkgs/bitfighter/template +++ b/srcpkgs/bitfighter/template @@ -20,7 +20,6 @@ checksum="cd47c453d9e6875ded627b987a645e2ff2c757363f394b152f62d868e1d81427 d628a2b0af024a965b92877f321f2174d6309b7ce9236775af3bd86a67fcc72b" python_version=2 replaces="bitfighter-data>=0" -patch_args=-Np0 CXXFLAGS="-Wno-narrowing" diff --git a/srcpkgs/bitwise/patches/tests-use-bcunit.patch b/srcpkgs/bitwise/patches/tests-use-bcunit.patch index 154d098e7d..b3fca7b06d 100644 --- a/srcpkgs/bitwise/patches/tests-use-bcunit.patch +++ b/srcpkgs/bitwise/patches/tests-use-bcunit.patch @@ -1,6 +1,6 @@ diff '--color=auto' -ruN bitwise-v0.42/Makefile.in bitwise-v0.42_new/Makefile.in ---- Makefile.in 2021-04-16 17:21:30.000000000 +0200 -+++ Makefile.in 2021-04-17 09:36:46.661320033 +0200 +--- a/Makefile.in 2021-04-16 17:21:30.000000000 +0200 ++++ b/Makefile.in 2021-04-17 09:36:46.661320033 +0200 @@ -518,7 +518,7 @@ src/misc.c \ tests/test-shunting-yard.c @@ -11,8 +11,8 @@ diff '--color=auto' -ruN bitwise-v0.42/Makefile.in bitwise-v0.42_new/Makefile.in all: all-am diff '--color=auto' -ruN bitwise-v0.42/tests/test-shunting-yard.c bitwise-v0.42_new/tests/test-shunting-yard.c ---- tests/test-shunting-yard.c 2021-04-16 17:17:19.000000000 +0200 -+++ tests/test-shunting-yard.c 2021-04-17 09:36:46.660320033 +0200 +--- a/tests/test-shunting-yard.c 2021-04-16 17:17:19.000000000 +0200 ++++ b/tests/test-shunting-yard.c 2021-04-17 09:36:46.660320033 +0200 @@ -7,7 +7,7 @@ #include "../inc/shunting-yard.h" diff --git a/srcpkgs/bitwise/template b/srcpkgs/bitwise/template index 9e3fe3fa18..16b8b2a23f 100644 --- a/srcpkgs/bitwise/template +++ b/srcpkgs/bitwise/template @@ -12,4 +12,3 @@ license="GPL-3.0-only" homepage="https://github.com/mellowcandle/bitwise" distfiles="${homepage}/releases/download/v${version}/bitwise-v${version}.tar.gz" checksum=d3d43cef47bf8f49e85f7ed381c3eaf1df921ca51805e0962f1a97a517e1d1d2 -patch_args=-Np0 diff --git a/srcpkgs/blackboxwm/patches/time64.patch b/srcpkgs/blackboxwm/patches/time64.patch index 9bbcf04b74..02239565fd 100644 --- a/srcpkgs/blackboxwm/patches/time64.patch +++ b/srcpkgs/blackboxwm/patches/time64.patch @@ -1,5 +1,5 @@ ---- src/Toolbar.cc 2020-12-13 23:57:20.285876509 +0100 -+++ src/Toolbar.cc 2020-12-13 23:58:32.570856812 +0100 +--- a/src/Toolbar.cc 2020-12-13 23:57:20.285876509 +0100 ++++ b/src/Toolbar.cc 2020-12-13 23:58:32.570856812 +0100 @@ -44,7 +44,7 @@ { timeval now; diff --git a/srcpkgs/blackboxwm/template b/srcpkgs/blackboxwm/template index 05fffcbf3a..10ad09eac5 100644 --- a/srcpkgs/blackboxwm/template +++ b/srcpkgs/blackboxwm/template @@ -12,7 +12,6 @@ license="MIT" homepage="https://github.com/bbidulock/blackboxwm" distfiles="${homepage}/releases/download/${version}/blackbox-${version}.tar.lz" checksum=e4f814fb02f6a977e9aab1c60192087597b79b0a56cc4a14e8a962b7d45d82d1 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/bmon/patches/Add_CTRL-N_CTRL-P.patch b/srcpkgs/bmon/patches/Add_CTRL-N_CTRL-P.patch index c89f6242a6..4aace67218 100644 --- a/srcpkgs/bmon/patches/Add_CTRL-N_CTRL-P.patch +++ b/srcpkgs/bmon/patches/Add_CTRL-N_CTRL-P.patch @@ -9,8 +9,8 @@ Subject: [PATCH] curses: Add CTRL-N/CTRL-P for next/previous element diff --git src/out_curses.c src/out_curses.c index 51b6391..330e8f6 100644 ---- src/out_curses.c -+++ src/out_curses.c +--- a/src/out_curses.c ++++ b/src/out_curses.c @@ -45,6 +45,8 @@ enum { KEY_TOGGLE_DETAILS = 'd', KEY_TOGGLE_INFO = 'i', diff --git a/srcpkgs/bmon/patches/out_curses.patch b/srcpkgs/bmon/patches/out_curses.patch index 4cdf135580..334fb56cce 100644 --- a/srcpkgs/bmon/patches/out_curses.patch +++ b/srcpkgs/bmon/patches/out_curses.patch @@ -16,8 +16,8 @@ Signed-off-by: Nachiketa Prachanda diff --git src/out_curses.c src/out_curses.c index 6d70ae3..e5317de 100644 ---- src/out_curses.c -+++ src/out_curses.c +--- a/src/out_curses.c ++++ b/src/out_curses.c @@ -147,22 +147,24 @@ static char *float2str(double value, int width, int prec, char *buf, size_t len) static void put_line(const char *fmt, ...) { diff --git a/srcpkgs/bmon/template b/srcpkgs/bmon/template index 64f426cc2e..67b13cb31a 100644 --- a/srcpkgs/bmon/template +++ b/srcpkgs/bmon/template @@ -11,7 +11,6 @@ license="BSD-2-Clause, MIT" homepage="http://github.com/tgraf/bmon/" distfiles="http://github.com/tgraf/${pkgname}/archive/v${version}.tar.gz" checksum=d5e503ff6b116c681ebf4d10e238604dde836dceb9c0008eb92416a96c87ca40 -patch_args=-Np0 pre_configure() { ./autogen.sh diff --git a/srcpkgs/boinc/patches/arm-not-android.patch b/srcpkgs/boinc/patches/arm-not-android.patch index d04f8f780a..18f64e9942 100644 --- a/srcpkgs/boinc/patches/arm-not-android.patch +++ b/srcpkgs/boinc/patches/arm-not-android.patch @@ -1,5 +1,5 @@ ---- client/Makefile.am 2020-05-31 01:43:58.000000000 -0400 -+++ client/Makefile.am 2020-06-06 11:31:53.051972845 -0400 +--- a/client/Makefile.am 2020-05-31 01:43:58.000000000 -0400 ++++ b/client/Makefile.am 2020-06-06 11:31:53.051972845 -0400 @@ -113,6 +113,7 @@ boinc_clientdir = $(bindir) @@ -16,8 +16,8 @@ switcher_SOURCES = switcher.cpp switcher_LDFLAGS = $(AM_LDFLAGS) -L../lib ---- client/whetstone.cpp 2018-01-14 11:07:52.000000000 +0100 -+++ client/whetstone.cpp 2018-02-26 20:49:52.185904752 +0100 +--- a/client/whetstone.cpp 2018-01-14 11:07:52.000000000 +0100 ++++ b/client/whetstone.cpp 2018-02-26 20:49:52.185904752 +0100 @@ -290,6 +290,8 @@ return 0; } @@ -27,8 +27,8 @@ } #endif // namespace closure +#endif ---- configure.ac 2020-05-31 01:43:58.000000000 -0400 -+++ configure.ac 2020-06-06 11:41:14.259984481 -0400 +--- a/configure.ac 2020-05-31 01:43:58.000000000 -0400 ++++ b/configure.ac 2020-06-06 11:41:14.259984481 -0400 @@ -1051,6 +1051,7 @@ dnl or OS2 AM_CONDITIONAL(OS_OS2, [echo $host_os | grep '^os2' > /dev/null]) diff --git a/srcpkgs/boinc/patches/boinc-am_conditional.patch b/srcpkgs/boinc/patches/boinc-am_conditional.patch index a9f47e5970..7d59f15434 100644 --- a/srcpkgs/boinc/patches/boinc-am_conditional.patch +++ b/srcpkgs/boinc/patches/boinc-am_conditional.patch @@ -1,7 +1,7 @@ Add objective c++ program and check for gtk2 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -39,6 +39,7 @@ AC_PROG_CC AC_PROG_CXX AC_PROG_F77 diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index 944fdaf172..1eba13495c 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -21,7 +21,6 @@ system_accounts="boinc" boinc_homedir="/var/lib/boinc" boinc_shell="/bin/bash" conflicts="boinc-nox>=0" -patch_args=-Np0 CXXFLAGS="-Wno-redundant-decls" diff --git a/srcpkgs/bomi/patches/ffmpeg3.x.patch b/srcpkgs/bomi/patches/ffmpeg3.x.patch index 561c6262e4..3b224fd76a 100644 --- a/srcpkgs/bomi/patches/ffmpeg3.x.patch +++ b/srcpkgs/bomi/patches/ffmpeg3.x.patch @@ -1,7 +1,7 @@ libavutil/audioconvert.h is gone in ffmpeg3.x ---- src/mpv/audio/filter/af_lavcac3enc.c 2015-05-20 11:31:58.000000000 +0200 -+++ src/mpv/audio/filter/af_lavcac3enc.c 2016-09-22 19:52:47.730132367 +0200 +--- a/src/mpv/audio/filter/af_lavcac3enc.c 2015-05-20 11:31:58.000000000 +0200 ++++ b/src/mpv/audio/filter/af_lavcac3enc.c 2016-09-22 19:52:47.730132367 +0200 @@ -26,7 +26,6 @@ #include @@ -10,8 +10,8 @@ libavutil/audioconvert.h is gone in ffmpeg3.x #include #include #include ---- src/mpv/audio/out/ao_lavc.c 2015-05-20 11:31:58.000000000 +0200 -+++ src/mpv/audio/out/ao_lavc.c 2016-09-22 19:54:50.291163189 +0200 +--- a/src/mpv/audio/out/ao_lavc.c 2015-05-20 11:31:58.000000000 +0200 ++++ b/src/mpv/audio/out/ao_lavc.c 2016-09-22 19:54:50.291163189 +0200 @@ -25,7 +25,6 @@ #include @@ -20,8 +20,8 @@ libavutil/audioconvert.h is gone in ffmpeg3.x #include "config.h" #include "options/options.h" ---- src/mpv/audio/filter/af_lavrresample.c 2015-05-20 11:31:58.000000000 +0200 -+++ src/mpv/audio/filter/af_lavrresample.c 2016-09-22 19:57:13.539200765 +0200 +--- a/src/mpv/audio/filter/af_lavrresample.c 2015-05-20 11:31:58.000000000 +0200 ++++ b/src/mpv/audio/filter/af_lavrresample.c 2016-09-22 19:57:13.539200765 +0200 @@ -28,7 +28,6 @@ #include diff --git a/srcpkgs/bomi/patches/ffmpeg4.patch b/srcpkgs/bomi/patches/ffmpeg4.patch index 1ce9ea97b4..fefd786df6 100644 --- a/srcpkgs/bomi/patches/ffmpeg4.patch +++ b/srcpkgs/bomi/patches/ffmpeg4.patch @@ -2,8 +2,8 @@ source: https://github.com/d-s-x/bomi/commit/c1473b38bf92e9ac858fd58588a9d45fe71 diff --git a/src/bomi/video/ffmpegfilters.hpp b/src/bomi/video/ffmpegfilters.hpp index 77b1df41c5..5365525c48 100644 ---- src/bomi/video/ffmpegfilters.hpp -+++ src/bomi/video/ffmpegfilters.hpp +--- a/src/bomi/video/ffmpegfilters.hpp ++++ b/src/bomi/video/ffmpegfilters.hpp @@ -6,7 +6,7 @@ extern "C" { #include