From 986c0a7d5eeb718f4ba22deda919dc6c3c33975a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 19 Jun 2021 10:03:21 +0700 Subject: [PATCH] srcpkgs/i*: 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 ``` --- .../patches/pulseaudio-optional.patch | 16 +-- srcpkgs/i3status/template | 1 - .../0001-read-utf-8-encoded-zipfile.patch | 4 +- srcpkgs/ibus-anthy/template | 1 - srcpkgs/ibus-avro/patches/autocorrect.patch | 4 +- srcpkgs/ibus-avro/template | 1 - srcpkgs/icecast/patches/no-group.patch | 4 +- srcpkgs/icecast/template | 1 - .../10-fix-compilation-with-cpp-headers.patch | 8 +- srcpkgs/id3lib/patches/30-fix-utf16.patch | 8 +- .../patches/50-remove-outdated-check.patch | 4 +- .../60-id3lib-missing-nullpointer-check.patch | 4 +- .../patches/61-fix_vbr_stack_smash.patch | 4 +- srcpkgs/id3lib/patches/CVE-2007-4460.patch | 4 +- srcpkgs/id3lib/template | 1 - srcpkgs/ifupdown/patches/fix-musl.patch | 4 +- srcpkgs/ifupdown/patches/installdirs.patch | 4 +- srcpkgs/ifupdown/template | 1 - ...-loading-failure-in-resolve-function.patch | 4 +- srcpkgs/igt-gpu-tools/patches/musl.patch | 50 ++++---- srcpkgs/igt-gpu-tools/template | 1 - srcpkgs/ilmbase/patches/musl-_fpstate.patch | 4 +- .../ilmbase/patches/pkgconfig-prefix.patch | 4 +- srcpkgs/ilmbase/template | 1 - srcpkgs/imagescan/patches/fix-iostream.patch | 8 +- .../patches/makefile_in-sane_dll_d.patch | 4 +- srcpkgs/imagescan/template | 1 - srcpkgs/imagewriter/patches/musl.patch | 4 +- srcpkgs/imagewriter/template | 1 - .../patches/fix_color_profile_path.patch | 8 +- srcpkgs/img2pdf/template | 1 - .../imgbrd-grabber/patches/QPainterPath.patch | 4 +- srcpkgs/imgbrd-grabber/template | 1 - .../imwheel/patches/fix-jax-intptr_t.patch | 4 +- srcpkgs/imwheel/patches/no-imwheel-gpm.patch | 4 +- srcpkgs/imwheel/template | 1 - srcpkgs/indent/patches/fix-locale_h.patch | 4 +- srcpkgs/indent/template | 1 - srcpkgs/injeqt/patches/gcc7-fix.patch | 4 +- srcpkgs/injeqt/template | 1 - srcpkgs/input-utils/patches/time64.patch | 12 +- srcpkgs/input-utils/template | 1 - srcpkgs/inspectrum/patches/QPainterPath.patch | 4 +- srcpkgs/inspectrum/template | 1 - .../patches/configurable-compiler.patch | 4 +- .../intel-undervolt/patches/fix-musl.patch | 4 +- srcpkgs/intel-undervolt/template | 1 - .../intltool/patches/avoid-process-race.patch | 4 +- srcpkgs/intltool/patches/perl522.patch | 8 +- srcpkgs/intltool/template | 1 - .../patches/invada-studio-fixes.patch | 116 +++++++++--------- srcpkgs/invada-studio-plugins-lv2/template | 1 - .../patches/00-musl.patch | 8 +- srcpkgs/io.elementary.calendar/template | 1 - .../io.elementary.code/patches/vala050.patch | 4 +- srcpkgs/io.elementary.code/template | 1 - .../patches/vala-array-size.patch | 4 +- srcpkgs/io.elementary.music/template | 1 - .../patches/fix-meson.patch | 8 +- srcpkgs/io.elementary.photos/template | 1 - srcpkgs/iotop/patches/python3.patch | 4 +- srcpkgs/iotop/template | 1 - srcpkgs/iouyap/patches/musl.patch | 12 +- srcpkgs/iouyap/template | 1 - .../patches/ipmitool-openssl-1.1.patch | 4 +- srcpkgs/ipmitool/template | 1 - srcpkgs/ipp-usb/patches/udev_runit.patch | 4 +- srcpkgs/ipp-usb/template | 1 - srcpkgs/ippusbxd/patches/fix-cflags.patch | 4 +- srcpkgs/ippusbxd/template | 1 - ...tions-add-check-to-the-phony-targets.patch | 4 +- srcpkgs/iptables/template | 1 - .../ipv6calc-db-update-download-fix.patch | 4 +- .../patches/use-bash-for-scripts.patch | 8 +- srcpkgs/ipv6calc/template | 1 - srcpkgs/iscan/patches/jpegstream.cc.patch | 4 +- srcpkgs/iscan/patches/libpng15.patch | 8 +- srcpkgs/iscan/patches/uchar.patch | 4 +- srcpkgs/iscan/template | 1 - srcpkgs/itstool/patches/fix-segfault.patch | 4 +- srcpkgs/itstool/template | 1 - .../iucode-tool/patches/musl-limits_h.patch | 4 +- srcpkgs/iucode-tool/template | 1 - srcpkgs/iverilog/patches/lxt2.patch | 4 +- srcpkgs/iverilog/template | 1 - srcpkgs/iwd/patches/fix-name-request.patch | 8 +- srcpkgs/iwd/patches/resolvconf-default.patch | 8 +- srcpkgs/iwd/template | 1 - srcpkgs/iwgtk/patches/fix-makefile.patch | 4 +- srcpkgs/iwgtk/template | 1 - 90 files changed, 221 insertions(+), 258 deletions(-) diff --git a/srcpkgs/i3status/patches/pulseaudio-optional.patch b/srcpkgs/i3status/patches/pulseaudio-optional.patch index 895097d221c..9e80ef6abb5 100644 --- a/srcpkgs/i3status/patches/pulseaudio-optional.patch +++ b/srcpkgs/i3status/patches/pulseaudio-optional.patch @@ -7,8 +7,8 @@ diff --git Makefile.am Makefile.am index bb251f0..c2c1c0a 100644 ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -68,8 +68,11 @@ i3status_SOURCES = \ src/print_volume.c \ src/print_wireless_info.c \ @@ -25,8 +25,8 @@ index bb251f0..c2c1c0a 100644 i3status.conf diff --git configure.ac configure.ac index cf9e430..11caa33 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -80,11 +80,24 @@ AC_CANONICAL_HOST PKG_CHECK_MODULES([CONFUSE], [libconfuse]) PKG_CHECK_MODULES([YAJL], [yajl]) @@ -63,8 +63,8 @@ index cf9e430..11caa33 100644 diff --git i3status.c i3status.c index 0898da3..1ab8400 100644 ---- i3status.c -+++ i3status.c +--- a/i3status.c ++++ b/i3status.c @@ -565,7 +565,13 @@ int main(int argc, char *argv[]) { return 0; break; @@ -82,8 +82,8 @@ index 0898da3..1ab8400 100644 case 0: diff --git src/print_volume.c src/print_volume.c index 91e8ce2..7364d47 100644 ---- src/print_volume.c -+++ src/print_volume.c +--- a/src/print_volume.c ++++ b/src/print_volume.c @@ -86,7 +86,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char * free(instance); } diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template index 5edaa41782d..5ef9f206834 100644 --- a/srcpkgs/i3status/template +++ b/srcpkgs/i3status/template @@ -16,7 +16,6 @@ homepage="https://www.i3wm.org/i3status/" distfiles="${homepage}/${pkgname}-${version}.tar.bz2" checksum=ce89c9ff8565f62e88299f1a611229afdfc356b4e97368a5f8c4f06ad2fa1466 conf_files="/etc/i3status.conf" -patch_args=-Np0 build_options="pulseaudio" build_options_default="pulseaudio" diff --git a/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch b/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch index f84de477023..e8d5315cbf6 100644 --- a/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch +++ b/srcpkgs/ibus-anthy/patches/0001-read-utf-8-encoded-zipfile.patch @@ -9,8 +9,8 @@ Subject: read utf-8 encoded zipfile diff --git a/data/zipcode-textdic.py b/data/zipcode-textdic.py index 6fa50d6..cb28a1f 100755 ---- data/zipcode-textdic.py -+++ data/zipcode-textdic.py +--- a/data/zipcode-textdic.py ++++ b/data/zipcode-textdic.py @@ -21,9 +21,9 @@ if len(sys.argv) < 2: anthy_zipfile = sys.argv[1] diff --git a/srcpkgs/ibus-anthy/template b/srcpkgs/ibus-anthy/template index 8e3bb449acd..9b96fa82063 100644 --- a/srcpkgs/ibus-anthy/template +++ b/srcpkgs/ibus-anthy/template @@ -15,7 +15,6 @@ homepage="https://github.com/ibus/ibus/wiki" distfiles="https://github.com/ibus/${pkgname}/archive/${version}.tar.gz" checksum=57d42a302be72409708274aa680c6d7515077766853a2b9193b9974c9c6eeaf6 make_check=extended -patch_args=-Np0 post_patch() { 2to3 -w gir/test.py diff --git a/srcpkgs/ibus-avro/patches/autocorrect.patch b/srcpkgs/ibus-avro/patches/autocorrect.patch index 46166cc2f62..2b8609f3881 100644 --- a/srcpkgs/ibus-avro/patches/autocorrect.patch +++ b/srcpkgs/ibus-avro/patches/autocorrect.patch @@ -1,7 +1,7 @@ diff --git autocorrect.js autocorrect.js index 61dbeda..0579d20 100644 ---- autocorrect.js -+++ autocorrect.js +--- a/autocorrect.js ++++ b/autocorrect.js @@ -866,6 +866,8 @@ var db = "home": "hOm", "hostel": "hOsTel", diff --git a/srcpkgs/ibus-avro/template b/srcpkgs/ibus-avro/template index 5067e69d761..22b51f29ee9 100644 --- a/srcpkgs/ibus-avro/template +++ b/srcpkgs/ibus-avro/template @@ -13,7 +13,6 @@ license="MPL-1.1" homepage="https://linux.omicronlab.com" distfiles="https://github.com/sarim/${pkgname}/archive/${version}.tar.gz" checksum=9d00f12f2d01916e56533fd0267173b644a57161770b60a0f4d9daa61fe8bd1a -patch_args=-Np0 pre_configure() { autoreconf -vfi diff --git a/srcpkgs/icecast/patches/no-group.patch b/srcpkgs/icecast/patches/no-group.patch index c200f8468f4..a14baba3c2b 100644 --- a/srcpkgs/icecast/patches/no-group.patch +++ b/srcpkgs/icecast/patches/no-group.patch @@ -1,5 +1,5 @@ ---- conf/icecast.xml.in 2010-11-12 16:47:54.750000918 +0100 -+++ conf/icecast.xml.in 2010-11-12 16:48:08.086667585 +0100 +--- a/conf/icecast.xml.in 2010-11-12 16:47:54.750000918 +0100 ++++ b/conf/icecast.xml.in 2010-11-12 16:48:08.086667585 +0100 @@ -164,11 +164,9 @@ diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template index b3fed3c3760..920d6ffe9d3 100644 --- a/srcpkgs/icecast/template +++ b/srcpkgs/icecast/template @@ -13,4 +13,3 @@ homepage="http://www.icecast.org/" distfiles="http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${version}.tar.gz" checksum=49b5979f9f614140b6a38046154203ee28218d8fc549888596a683ad604e4d44 conf_files="/etc/icecast.xml" -patch_args=-Np0 diff --git a/srcpkgs/id3lib/patches/10-fix-compilation-with-cpp-headers.patch b/srcpkgs/id3lib/patches/10-fix-compilation-with-cpp-headers.patch index 01206eff4ba..9f1eb3326f3 100644 --- a/srcpkgs/id3lib/patches/10-fix-compilation-with-cpp-headers.patch +++ b/srcpkgs/id3lib/patches/10-fix-compilation-with-cpp-headers.patch @@ -1,5 +1,5 @@ ---- include/id3/id3lib_strings.h -+++ include/id3/id3lib_strings.h +--- a/include/id3/id3lib_strings.h ++++ b/include/id3/id3lib_strings.h @@ -30,6 +30,7 @@ #define _ID3LIB_STRINGS_H_ @@ -8,8 +8,8 @@ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000)) namespace std ---- include/id3/writers.h -+++ include/id3/writers.h +--- a/include/id3/writers.h ++++ b/include/id3/writers.h @@ -30,7 +30,7 @@ #include "id3/writer.h" diff --git a/srcpkgs/id3lib/patches/30-fix-utf16.patch b/srcpkgs/id3lib/patches/30-fix-utf16.patch index e484572f670..3d3f50fed65 100644 --- a/srcpkgs/id3lib/patches/30-fix-utf16.patch +++ b/srcpkgs/id3lib/patches/30-fix-utf16.patch @@ -1,6 +1,6 @@ Patch from 'Spoon' to fix issues with writing certain unicode characters ---- ChangeLog -+++ ChangeLog +--- a/ChangeLog ++++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-17 Jerome Couderc + @@ -10,8 +10,8 @@ Patch from 'Spoon' to fix issues with writing certain unicode characters 2003-03-02 Sunday 17:38 Thijmen Klok * THANKS (1.20): added more people ---- src/io_helpers.cpp -+++ src/io_helpers.cpp +--- a/src/io_helpers.cpp ++++ b/src/io_helpers.cpp @@ -363,11 +363,22 @@ // Write the BOM: 0xFEFF unicode_t BOM = 0xFEFF; diff --git a/srcpkgs/id3lib/patches/50-remove-outdated-check.patch b/srcpkgs/id3lib/patches/50-remove-outdated-check.patch index ca85a656127..305f143968e 100644 --- a/srcpkgs/id3lib/patches/50-remove-outdated-check.patch +++ b/srcpkgs/id3lib/patches/50-remove-outdated-check.patch @@ -1,5 +1,5 @@ ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -227,7 +227,6 @@ ) AC_CHECK_HEADERS( \ diff --git a/srcpkgs/id3lib/patches/60-id3lib-missing-nullpointer-check.patch b/srcpkgs/id3lib/patches/60-id3lib-missing-nullpointer-check.patch index cdf93033476..d4ca5d292f1 100644 --- a/srcpkgs/id3lib/patches/60-id3lib-missing-nullpointer-check.patch +++ b/srcpkgs/id3lib/patches/60-id3lib-missing-nullpointer-check.patch @@ -1,6 +1,6 @@ This patch adds a check for a null pointer ---- src/header_tag.cpp -+++ src/header_tag.cpp +--- a/src/header_tag.cpp ++++ b/src/header_tag.cpp @@ -54,7 +54,7 @@ { size_t bytesUsed = ID3_TagHeader::SIZE; diff --git a/srcpkgs/id3lib/patches/61-fix_vbr_stack_smash.patch b/srcpkgs/id3lib/patches/61-fix_vbr_stack_smash.patch index 984a1f7324b..441256b183a 100644 --- a/srcpkgs/id3lib/patches/61-fix_vbr_stack_smash.patch +++ b/srcpkgs/id3lib/patches/61-fix_vbr_stack_smash.patch @@ -6,8 +6,8 @@ Author: Urs Fleisch Index: id3lib3.8.3-3.8.3/src/mp3_parse.cpp =================================================================== ---- src/mp3_parse.cpp 2009-10-06 23:12:10.381250132 +0200 -+++ src/mp3_parse.cpp 2009-10-06 23:14:09.545252591 +0200 +--- a/src/mp3_parse.cpp 2009-10-06 23:12:10.381250132 +0200 ++++ b/src/mp3_parse.cpp 2009-10-06 23:14:09.545252591 +0200 @@ -465,7 +465,7 @@ // from http://www.xingtech.com/developer/mp3/ diff --git a/srcpkgs/id3lib/patches/CVE-2007-4460.patch b/srcpkgs/id3lib/patches/CVE-2007-4460.patch index ad1a4fe01e0..7fcab02a870 100644 --- a/srcpkgs/id3lib/patches/CVE-2007-4460.patch +++ b/srcpkgs/id3lib/patches/CVE-2007-4460.patch @@ -3,8 +3,8 @@ way. It was first intruduced in version 3.8.3-7 and fixes http://bugs.debian.org/438540 ---- src/tag_file.cpp -+++ src/tag_file.cpp +--- a/src/tag_file.cpp ++++ b/src/tag_file.cpp @@ -242,8 +242,8 @@ strcpy(sTempFile, filename.c_str()); strcat(sTempFile, sTmpSuffix.c_str()); diff --git a/srcpkgs/id3lib/template b/srcpkgs/id3lib/template index 7452bae122e..44cb7f55f1d 100644 --- a/srcpkgs/id3lib/template +++ b/srcpkgs/id3lib/template @@ -11,7 +11,6 @@ license="LGPL-2.0-or-later" homepage="http://id3lib.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079 -patch_args=-Np0 pre_configure() { libtoolize -fc diff --git a/srcpkgs/ifupdown/patches/fix-musl.patch b/srcpkgs/ifupdown/patches/fix-musl.patch index 892644b4fec..2da0cb35951 100644 --- a/srcpkgs/ifupdown/patches/fix-musl.patch +++ b/srcpkgs/ifupdown/patches/fix-musl.patch @@ -1,5 +1,5 @@ ---- archcommon.h -+++ archcommon.h +--- a/archcommon.h ++++ b/archcommon.h @@ -2,6 +2,10 @@ bool execable(const char *); diff --git a/srcpkgs/ifupdown/patches/installdirs.patch b/srcpkgs/ifupdown/patches/installdirs.patch index b4984e837b8..01d49de4c7b 100644 --- a/srcpkgs/ifupdown/patches/installdirs.patch +++ b/srcpkgs/ifupdown/patches/installdirs.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2017-08-31 13:27:17.009081874 +0200 -+++ Makefile 2017-08-31 13:28:55.868955322 +0200 +--- a/Makefile 2017-08-31 13:27:17.009081874 +0200 ++++ b/Makefile 2017-08-31 13:28:55.868955322 +0200 @@ -22,13 +22,13 @@ all : ifup ifdown ifquery ifup.8 ifdown. .SECONDARY: link.c ipx.c can.c meta.c inet6.c inet.c diff --git a/srcpkgs/ifupdown/template b/srcpkgs/ifupdown/template index fd60247ccc7..584d52eea19 100644 --- a/srcpkgs/ifupdown/template +++ b/srcpkgs/ifupdown/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="https://tracker.debian.org/pkg/ifupdown" distfiles="http://http.debian.net/debian/pool/main/i/ifupdown/ifupdown_${version}.tar.xz" checksum=d754426562a63b7d0cf06e8b00abe353fe9fd7ac5aabe3745f6d4e294ca233a8 -patch_args=-Np0 make_dirs="/etc/network/interfaces.d 0755 root root /etc/network/if-pre-up.d 0755 root root diff --git a/srcpkgs/igt-gpu-tools/patches/i-g-t-Fix-global-symbol-loading-failure-in-resolve-function.patch b/srcpkgs/igt-gpu-tools/patches/i-g-t-Fix-global-symbol-loading-failure-in-resolve-function.patch index 40e3fb006cb..0c3b554d994 100644 --- a/srcpkgs/igt-gpu-tools/patches/i-g-t-Fix-global-symbol-loading-failure-in-resolve-function.patch +++ b/srcpkgs/igt-gpu-tools/patches/i-g-t-Fix-global-symbol-loading-failure-in-resolve-function.patch @@ -1,7 +1,7 @@ diff --git lib/igt_halffloat.c lib/igt_halffloat.c index 08ab05fc..e5e8a5bd 100644 ---- lib/igt_halffloat.c -+++ lib/igt_halffloat.c +--- a/lib/igt_halffloat.c ++++ b/lib/igt_halffloat.c @@ -24,6 +24,19 @@ #include diff --git a/srcpkgs/igt-gpu-tools/patches/musl.patch b/srcpkgs/igt-gpu-tools/patches/musl.patch index aaaa8c71ed6..0615cf9e1ad 100644 --- a/srcpkgs/igt-gpu-tools/patches/musl.patch +++ b/srcpkgs/igt-gpu-tools/patches/musl.patch @@ -1,7 +1,7 @@ diff --git benchmarks/gem_syslatency.c benchmarks/gem_syslatency.c index 7671dc4..3ac9544 100644 ---- benchmarks/gem_syslatency.c -+++ benchmarks/gem_syslatency.c +--- a/benchmarks/gem_syslatency.c ++++ b/benchmarks/gem_syslatency.c @@ -44,7 +44,11 @@ #include @@ -17,8 +17,8 @@ index 7671dc4..3ac9544 100644 diff --git lib/igt_aux.c lib/igt_aux.c index 578f857..3e98cf0 100644 ---- lib/igt_aux.c -+++ lib/igt_aux.c +--- a/lib/igt_aux.c ++++ b/lib/igt_aux.c @@ -31,6 +31,7 @@ #endif #include @@ -42,8 +42,8 @@ index 578f857..3e98cf0 100644 * @short_description: Auxiliary libraries and support functions diff --git lib/igt_aux.h lib/igt_aux.h index 04d2290..a0ada9e 100644 ---- lib/igt_aux.h -+++ lib/igt_aux.h +--- a/lib/igt_aux.h ++++ b/lib/igt_aux.h @@ -46,7 +46,7 @@ # define gettid() (pid_t)(syscall(__NR_gettid)) # endif @@ -55,8 +55,8 @@ index 04d2290..a0ada9e 100644 /* generally useful helpers */ diff --git lib/igt_eld.c lib/igt_eld.c index 3d7fd4d..d51774b 100644 ---- lib/igt_eld.c -+++ lib/igt_eld.c +--- a/lib/igt_eld.c ++++ b/lib/igt_eld.c @@ -29,6 +29,7 @@ #include #include @@ -67,8 +67,8 @@ index 3d7fd4d..d51774b 100644 #include "igt_eld.h" diff --git lib/igt_halffloat.c lib/igt_halffloat.c index 08ab05f..7d6a6e6 100644 ---- lib/igt_halffloat.c -+++ lib/igt_halffloat.c +--- a/lib/igt_halffloat.c ++++ b/lib/igt_halffloat.c @@ -162,7 +162,7 @@ static inline float _half_to_float(uint16_t val) return fi.f; } @@ -80,8 +80,8 @@ index 08ab05f..7d6a6e6 100644 diff --git lib/igt_x86.c lib/igt_x86.c index 6ac700d..ddf5edd 100644 ---- lib/igt_x86.c -+++ lib/igt_x86.c +--- a/lib/igt_x86.c ++++ b/lib/igt_x86.c @@ -190,7 +190,7 @@ char *igt_x86_features_to_string(unsigned features, char *line) } #endif @@ -95,7 +95,7 @@ diff --git lib/signal_compat.h lib/signal_compat.h new file mode 100644 index 0000000..acae648 --- /dev/null -+++ lib/signal_compat.h ++++ b/lib/signal_compat.h @@ -0,0 +1,4 @@ +#define SIGEV_SIGNAL 0 /* notify via signal */ +#define SIGEV_NONE 1 /* other notification: meaningless */ @@ -103,8 +103,8 @@ index 0000000..acae648 +#define SIGEV_THREAD_ID 4 /* deliver to thread */ diff --git tests/drm_read.c tests/drm_read.c index cfb1c04..18be922 100644 ---- tests/drm_read.c -+++ tests/drm_read.c +--- a/tests/drm_read.c ++++ b/tests/drm_read.c @@ -220,7 +220,7 @@ static void test_short_buffer_wakeup(int in, enum pipe pipe) pthread_mutex_unlock(&w.mutex); @@ -116,8 +116,8 @@ index cfb1c04..18be922 100644 generate_event(w.fd, pipe); diff --git tests/kms_hdmi_inject.c tests/kms_hdmi_inject.c index 8c0d133..f272418 100644 ---- tests/kms_hdmi_inject.c -+++ tests/kms_hdmi_inject.c +--- a/tests/kms_hdmi_inject.c ++++ b/tests/kms_hdmi_inject.c @@ -25,7 +25,7 @@ #include "config.h" @@ -129,8 +129,8 @@ index 8c0d133..f272418 100644 #include "igt_eld.h" diff --git tests/kms_sysfs_edid_timing.c tests/kms_sysfs_edid_timing.c index 1201388..e75c7e9 100644 ---- tests/kms_sysfs_edid_timing.c -+++ tests/kms_sysfs_edid_timing.c +--- a/tests/kms_sysfs_edid_timing.c ++++ b/tests/kms_sysfs_edid_timing.c @@ -24,6 +24,7 @@ #include @@ -141,8 +141,8 @@ index 1201388..e75c7e9 100644 #define THRESHOLD_PER_CONNECTOR 10 diff --git tests/i915/gem_close_race.c tests/i915/gem_close_race.c index 57e0048..ad5f504 100644 ---- tests/i915/gem_close_race.c -+++ tests/i915/gem_close_race.c +--- a/tests/i915/gem_close_race.c ++++ b/tests/i915/gem_close_race.c @@ -51,7 +51,11 @@ static uint32_t devid; static bool has_64bit_relocations; @@ -158,8 +158,8 @@ index 57e0048..ad5f504 100644 { diff --git tests/i915/i915_pm_rpm.c tests/i915/i915_pm_rpm.c index e2c7ba2..08e44b7 100644 ---- tests/i915/i915_pm_rpm.c -+++ tests/i915/i915_pm_rpm.c +--- a/tests/i915/i915_pm_rpm.c ++++ b/tests/i915/i915_pm_rpm.c @@ -36,6 +36,7 @@ #include #include @@ -170,8 +170,8 @@ index e2c7ba2..08e44b7 100644 #include diff --git tests/panfrost_submit.c tests/panfrost_submit.c index 13ce85b..ceb2e6d 100644 ---- tests/panfrost_submit.c -+++ tests/panfrost_submit.c +--- a/tests/panfrost_submit.c ++++ b/tests/panfrost_submit.c @@ -68,7 +68,7 @@ static void check_error(int fd, struct panfrost_submit *submit) static void check_fb(int fd, struct panfrost_bo *bo) { diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template index 0bcf2cfe2c7..3b222ecd18d 100644 --- a/srcpkgs/igt-gpu-tools/template +++ b/srcpkgs/igt-gpu-tools/template @@ -17,7 +17,6 @@ distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz" checksum=40454d8f0484ea2477862007398a08eef78a6c252c4defce1c934548593fdd11 # tests don't behave in containers make_check=ci-skip -patch_args=-Np0 lib32disabled=yes archs="i686* x86_64*" diff --git a/srcpkgs/ilmbase/patches/musl-_fpstate.patch b/srcpkgs/ilmbase/patches/musl-_fpstate.patch index f7e6b371ed5..0584598bb38 100644 --- a/srcpkgs/ilmbase/patches/musl-_fpstate.patch +++ b/srcpkgs/ilmbase/patches/musl-_fpstate.patch @@ -1,5 +1,5 @@ ---- IlmBase/IexMath/IexMathFpu.cpp.orig 2019-12-01 15:42:08.143387128 +0100 -+++ IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100 +--- a/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:42:08.143387128 +0100 ++++ b/IlmBase/IexMath/IexMathFpu.cpp 2019-12-01 15:43:02.402389927 +0100 @@ -281,10 +281,18 @@ inline void restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) diff --git a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch index 4d514f926e5..340fdd7ce51 100644 --- a/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch +++ b/srcpkgs/ilmbase/patches/pkgconfig-prefix.patch @@ -1,5 +1,5 @@ ---- IlmBase/IlmBase.pc.in.orig 2019-09-18 03:02:06.000000000 +0200 -+++ IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100 +--- a/IlmBase/IlmBase.pc.in 2019-09-18 03:02:06.000000000 +0200 ++++ b/IlmBase/IlmBase.pc.in 2019-12-01 19:18:24.067056545 +0100 @@ -4,9 +4,9 @@ ## diff --git a/srcpkgs/ilmbase/template b/srcpkgs/ilmbase/template index ca4c57337f1..1dd24b5335f 100644 --- a/srcpkgs/ilmbase/template +++ b/srcpkgs/ilmbase/template @@ -13,7 +13,6 @@ license="BSD-3-Clause" homepage="https://www.openexr.com/" distfiles="https://github.com/openexr/openexr/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=8e5bfd89f4ae1221f84216a163003edddf0d37b8aac4ee42b46edb55544599b9 -patch_args=-Np0 pre_configure() { if [ "$CROSS_BUILD" ]; then diff --git a/srcpkgs/imagescan/patches/fix-iostream.patch b/srcpkgs/imagescan/patches/fix-iostream.patch index b05f5f70bd6..11ac322741d 100644 --- a/srcpkgs/imagescan/patches/fix-iostream.patch +++ b/srcpkgs/imagescan/patches/fix-iostream.patch @@ -1,5 +1,5 @@ ---- utsushi/string.hpp 2019-04-02 02:01:37.000000000 +0200 -+++ utsushi/string.hpp 2021-01-19 00:58:03.102000070 +0100 +--- a/utsushi/string.hpp 2019-04-02 02:01:37.000000000 +0200 ++++ b/utsushi/string.hpp 2021-01-19 00:58:03.102000070 +0100 @@ -23,6 +23,7 @@ #include @@ -8,8 +8,8 @@ #include ---- utsushi/toggle.hpp 2019-04-02 02:01:36.000000000 +0200 -+++ utsushi/toggle.hpp 2021-01-19 01:00:34.884821885 +0100 +--- a/utsushi/toggle.hpp 2019-04-02 02:01:36.000000000 +0200 ++++ b/utsushi/toggle.hpp 2021-01-19 01:00:34.884821885 +0100 @@ -22,6 +22,7 @@ #define utsushi_toggle_hpp_ diff --git a/srcpkgs/imagescan/patches/makefile_in-sane_dll_d.patch b/srcpkgs/imagescan/patches/makefile_in-sane_dll_d.patch index d1ceb3b8614..56187bdb7b6 100644 --- a/srcpkgs/imagescan/patches/makefile_in-sane_dll_d.patch +++ b/srcpkgs/imagescan/patches/makefile_in-sane_dll_d.patch @@ -1,5 +1,5 @@ ---- sane/Makefile.in 2018-01-29 07:20:05.000000000 +0100 -+++ sane/Makefile.in 2018-03-10 14:33:27.313350166 +0100 +--- a/sane/Makefile.in 2018-01-29 07:20:05.000000000 +0100 ++++ b/sane/Makefile.in 2018-03-10 14:33:27.313350166 +0100 @@ -1005,28 +1005,12 @@ @enable_sane_config_TRUE@ echo " skipping component activation"; \ @enable_sane_config_TRUE@ exit 1; \ diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template index 2deac5f8b87..0a0cb5e2b3f 100644 --- a/srcpkgs/imagescan/template +++ b/srcpkgs/imagescan/template @@ -18,7 +18,6 @@ homepage="https://gitlab.com/utsushi/imagescan/" distfiles="http://support.epson.net/linux/src/scanner/imagescanv3/debian/${pkgname}_${version}.orig.tar.gz" checksum=9440b103b8218863ab08e891d2a9dc9ef52db51485e11017d52fb2036e279477 mutable_files="/etc/sane.d/dll.d/utsushi" -patch_args=-Np0 CFLAGS="-Wno-error" CXXFLAGS="-Wno-error" diff --git a/srcpkgs/imagewriter/patches/musl.patch b/srcpkgs/imagewriter/patches/musl.patch index 2ea8e2a002b..1df43f79260 100644 --- a/srcpkgs/imagewriter/patches/musl.patch +++ b/srcpkgs/imagewriter/patches/musl.patch @@ -1,5 +1,5 @@ ---- MainWindow.cpp.orig 2018-05-24 00:26:18.366922607 +0200 -+++ MainWindow.cpp 2018-05-24 00:27:09.802922613 +0200 +--- a/MainWindow.cpp 2018-05-24 00:26:18.366922607 +0200 ++++ b/MainWindow.cpp 2018-05-24 00:27:09.802922613 +0200 @@ -37,7 +37,7 @@ #include diff --git a/srcpkgs/imagewriter/template b/srcpkgs/imagewriter/template index 197bc547634..cd4d3c9af69 100644 --- a/srcpkgs/imagewriter/template +++ b/srcpkgs/imagewriter/template @@ -15,4 +15,3 @@ license="GPL-2.0-or-later" homepage="https://github.com/openSUSE/imagewriter" distfiles="https://github.com/openSUSE/imagewriter/archive/${_commit}.tar.gz" checksum=7761ee45b16b5841c6b62b091c7f9d0b8c64b14b79d77e9909ca813e1dc9885d -patch_args=-Np0 diff --git a/srcpkgs/img2pdf/patches/fix_color_profile_path.patch b/srcpkgs/img2pdf/patches/fix_color_profile_path.patch index 3fae35d8161..cfbbb6f54b0 100644 --- a/srcpkgs/img2pdf/patches/fix_color_profile_path.patch +++ b/srcpkgs/img2pdf/patches/fix_color_profile_path.patch @@ -1,5 +1,5 @@ ---- src/img2pdf.py -+++ src/img2pdf.py +--- a/src/img2pdf.py ++++ b/src/img2pdf.py @@ -3439,10 +3439,10 @@ RGB.""", outargs.add_argument( "--pdfa", @@ -13,8 +13,8 @@ ) sizeargs = parser.add_argument_group( ---- src/img2pdf_test.py -+++ src/img2pdf_test.py +--- a/src/img2pdf_test.py ++++ b/src/img2pdf_test.py @@ -304,7 +304,7 @@ def compare(im1, im2, exact, icc, cmyk): else: iccargs = [] diff --git a/srcpkgs/img2pdf/template b/srcpkgs/img2pdf/template index 9b7cae08649..206bf3cbccc 100644 --- a/srcpkgs/img2pdf/template +++ b/srcpkgs/img2pdf/template @@ -12,4 +12,3 @@ license="GPL-3.0-or-later" homepage="https://gitlab.mister-muffin.de/josch/img2pdf" distfiles="${PYPI_SITE}/i/img2pdf/img2pdf-${version}.tar.gz" checksum=38a1229ca84b211d7782d1d65ad7251a9781bf24f6f6497c738c755fcfed5552 -patch_args=-Np0 diff --git a/srcpkgs/imgbrd-grabber/patches/QPainterPath.patch b/srcpkgs/imgbrd-grabber/patches/QPainterPath.patch index 80ca564df10..3b460c3386b 100644 --- a/srcpkgs/imgbrd-grabber/patches/QPainterPath.patch +++ b/srcpkgs/imgbrd-grabber/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- gui/src/ui/QBouton.cpp 2019-05-19 13:41:39.000000000 +0200 -+++ gui/src/ui/QBouton.cpp 2020-09-01 01:09:55.472537243 +0200 +--- a/gui/src/ui/QBouton.cpp 2019-05-19 13:41:39.000000000 +0200 ++++ b/gui/src/ui/QBouton.cpp 2020-09-01 01:09:55.472537243 +0200 @@ -1,5 +1,6 @@ #include "ui/QBouton.h" #include diff --git a/srcpkgs/imgbrd-grabber/template b/srcpkgs/imgbrd-grabber/template index 50232eb2998..d1e0ef6a517 100644 --- a/srcpkgs/imgbrd-grabber/template +++ b/srcpkgs/imgbrd-grabber/template @@ -14,7 +14,6 @@ homepage="https://bionus.github.io/imgbrd-grabber" changelog="https://github.com/Bionus/imgbrd-grabber/releases" distfiles="https://github.com/Bionus/imgbrd-grabber/archive/v${version}.tar.gz" checksum=4ecb247f92fb4ba7c3245439bcd221e8c64dd037c1761065a663adb6b4571740 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-qmake" diff --git a/srcpkgs/imwheel/patches/fix-jax-intptr_t.patch b/srcpkgs/imwheel/patches/fix-jax-intptr_t.patch index 0cacc7681bb..37cb64fd78a 100644 --- a/srcpkgs/imwheel/patches/fix-jax-intptr_t.patch +++ b/srcpkgs/imwheel/patches/fix-jax-intptr_t.patch @@ -1,5 +1,5 @@ ---- jax/jax.c 2004-06-10 03:41:50.000000000 +0200 -+++ jax/jax.c 2020-09-20 17:22:42.245080921 +0200 +--- a/jax/jax.c 2004-06-10 03:41:50.000000000 +0200 ++++ b/jax/jax.c 2020-09-20 17:22:42.245080921 +0200 @@ -1,4 +1,5 @@ #include +#include diff --git a/srcpkgs/imwheel/patches/no-imwheel-gpm.patch b/srcpkgs/imwheel/patches/no-imwheel-gpm.patch index d45ef5dd253..8c9e34ee321 100644 --- a/srcpkgs/imwheel/patches/no-imwheel-gpm.patch +++ b/srcpkgs/imwheel/patches/no-imwheel-gpm.patch @@ -1,5 +1,5 @@ ---- configure.in 2004-08-29 12:29:09.000000000 +0200 -+++ configure.in 2020-09-20 17:17:33.079064972 +0200 +--- a/configure.in 2004-08-29 12:29:09.000000000 +0200 ++++ b/configure.in 2020-09-20 17:17:33.079064972 +0200 @@ -206,66 +206,10 @@ AC_SUBST(extras) AC_SUBST(extras_dist) diff --git a/srcpkgs/imwheel/template b/srcpkgs/imwheel/template index 5da49f1e4ff..85496586c7d 100644 --- a/srcpkgs/imwheel/template +++ b/srcpkgs/imwheel/template @@ -13,7 +13,6 @@ license="GPL-2.0-only" homepage="http://imwheel.sourceforge.net/" distfiles="https://sourceforge.net/projects/${pkgname}/files/${pkgname}-source/${version}pre12/${pkgname}-${version}pre12.tar.gz" checksum=2320ed019c95ca4d922968e1e1cbf0c075a914e865e3965d2bd694ca3d57cfe3 -patch_args=-Np0 pre_configure() { mv configure.{in,ac} diff --git a/srcpkgs/indent/patches/fix-locale_h.patch b/srcpkgs/indent/patches/fix-locale_h.patch index 7b2dd0386b2..126adc24892 100644 --- a/srcpkgs/indent/patches/fix-locale_h.patch +++ b/srcpkgs/indent/patches/fix-locale_h.patch @@ -1,5 +1,5 @@ ---- src/indent.c -+++ src/indent.c +--- a/src/indent.c ++++ b/src/indent.c @@ -71,9 +71,7 @@ #include #include diff --git a/srcpkgs/indent/template b/srcpkgs/indent/template index 522b94c0e68..3616080326f 100644 --- a/srcpkgs/indent/template +++ b/srcpkgs/indent/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="http://www.gnu.org/s/indent/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=e77d68c0211515459b8812118d606812e300097cfac0b4e9fb3472664263bb8b -patch_args=-Np0 pre_configure() { sed -i 's#^docdir = .*$#docdir = @docdir@#' doc/Makefile.in diff --git a/srcpkgs/injeqt/patches/gcc7-fix.patch b/srcpkgs/injeqt/patches/gcc7-fix.patch index 2885a9d43ab..105f2372d38 100644 --- a/srcpkgs/injeqt/patches/gcc7-fix.patch +++ b/srcpkgs/injeqt/patches/gcc7-fix.patch @@ -10,8 +10,8 @@ Subject: [PATCH] fix compilation for GCC 7.1.0 diff --git src/internal/containers.h b/src/internal/containers.h index 8da4298..78dd212 100644 ---- src/internal/containers.h -+++ src/internal/containers.h +--- a/src/internal/containers.h ++++ b/src/internal/containers.h @@ -23,6 +23,7 @@ #include "internal.h" diff --git a/srcpkgs/injeqt/template b/srcpkgs/injeqt/template index 3159202729e..3efad365a49 100644 --- a/srcpkgs/injeqt/template +++ b/srcpkgs/injeqt/template @@ -12,7 +12,6 @@ license="LGPL-2.1-or-later" homepage="https://github.com/vogel/injeqt/" distfiles="https://github.com/vogel/${pkgname}/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" checksum=77540cedb0b26affe993dd18124d796059e34c80a51d9ae6433fdff1860db135 -patch_args=-Np0 CXXFLAGS="-fno-lifetime-dse -Wno-error=cast-align" diff --git a/srcpkgs/input-utils/patches/time64.patch b/srcpkgs/input-utils/patches/time64.patch index 72cf1b8d5da..42fd536c486 100644 --- a/srcpkgs/input-utils/patches/time64.patch +++ b/srcpkgs/input-utils/patches/time64.patch @@ -1,5 +1,5 @@ ---- input-recv.c 2017-02-22 10:45:30.000000000 +0100 -+++ input-recv.c 2020-12-14 15:37:54.879345114 +0100 +--- a/input-recv.c 2017-02-22 10:45:30.000000000 +0100 ++++ b/input-recv.c 2020-12-14 15:37:54.879345114 +0100 @@ -69,11 +69,11 @@ } @@ -17,8 +17,8 @@ print_event(&ev); } ---- input-send.c 2017-02-22 10:45:30.000000000 +0100 -+++ input-send.c 2020-12-14 15:37:43.180824790 +0100 +--- a/input-send.c 2017-02-22 10:45:30.000000000 +0100 ++++ b/input-send.c 2020-12-14 15:37:43.180824790 +0100 @@ -73,11 +73,11 @@ print_event(ev); @@ -36,8 +36,8 @@ /* send out */ list_for_each_safe(item,safe,&connections) { ---- input.c 2017-02-22 10:45:30.000000000 +0100 -+++ input.c 2020-12-14 15:40:13.783523241 +0100 +--- a/input.c 2017-02-22 10:45:30.000000000 +0100 ++++ b/input.c 2020-12-14 15:40:13.783523241 +0100 @@ -208,9 +208,9 @@ char ts[32]; time_t t; diff --git a/srcpkgs/input-utils/template b/srcpkgs/input-utils/template index 319161f0e5d..35b48c548e2 100644 --- a/srcpkgs/input-utils/template +++ b/srcpkgs/input-utils/template @@ -10,7 +10,6 @@ license="GPL-2" distfiles="https://www.kraxel.org/releases/input/input-${version}.tar.gz" checksum=9142c34d508f2da4cd53d6348fee77e30b69c35c8dabfadfc5a6db09c4bd8087 wrksrc="input-${version}" -patch_args=-Np0 do_install() { vman lsinput.man lsinput.8 diff --git a/srcpkgs/inspectrum/patches/QPainterPath.patch b/srcpkgs/inspectrum/patches/QPainterPath.patch index cd70cbab4b7..f2805298ce7 100644 --- a/srcpkgs/inspectrum/patches/QPainterPath.patch +++ b/srcpkgs/inspectrum/patches/QPainterPath.patch @@ -1,5 +1,5 @@ ---- traceplot.cpp 2018-06-03 12:12:59.000000000 +0200 -+++ traceplot.cpp 2020-09-01 14:49:36.422074448 +0200 +--- a/traceplot.cpp 2018-06-03 12:12:59.000000000 +0200 ++++ b/traceplot.cpp 2020-09-01 14:49:36.422074448 +0200 @@ -17,6 +17,7 @@ * along with this program. If not, see . */ diff --git a/srcpkgs/inspectrum/template b/srcpkgs/inspectrum/template index 232164d753f..83ba7b10095 100644 --- a/srcpkgs/inspectrum/template +++ b/srcpkgs/inspectrum/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/miek/inspectrum" distfiles="https://github.com/miek/inspectrum/archive/v${version}.tar.gz" checksum=7be5be96f50b0cea5b3dd647f06cc00adfa805a395484aa2ab84cf3e49b7227b -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-qmake qt5-host-tools" diff --git a/srcpkgs/intel-undervolt/patches/configurable-compiler.patch b/srcpkgs/intel-undervolt/patches/configurable-compiler.patch index 5f6cbc6e446..e01b5e31191 100644 --- a/srcpkgs/intel-undervolt/patches/configurable-compiler.patch +++ b/srcpkgs/intel-undervolt/patches/configurable-compiler.patch @@ -1,5 +1,5 @@ ---- Makefile.in -+++ Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -1,7 +1,7 @@ -CC = gcc -CFLAGS = diff --git a/srcpkgs/intel-undervolt/patches/fix-musl.patch b/srcpkgs/intel-undervolt/patches/fix-musl.patch index 8151271288a..41a3f6b353a 100644 --- a/srcpkgs/intel-undervolt/patches/fix-musl.patch +++ b/srcpkgs/intel-undervolt/patches/fix-musl.patch @@ -1,7 +1,7 @@ diff --git a/measure.c b/measure.c index e692ea6..7ce108e 100644 ---- measure.c -+++ measure.c +--- a/measure.c ++++ b/measure.c @@ -14,6 +14,7 @@ #include #include diff --git a/srcpkgs/intel-undervolt/template b/srcpkgs/intel-undervolt/template index e9d1bf651d0..d631eb2222a 100644 --- a/srcpkgs/intel-undervolt/template +++ b/srcpkgs/intel-undervolt/template @@ -10,4 +10,3 @@ license="GPL-3.0-or-later" homepage="https://github.com/kitsunyan/intel-undervolt" distfiles="https://github.com/kitsunyan/intel-undervolt/archive/${version}.tar.gz" checksum=29a7ebaee4830d65d0b5cefa6d497887d4f23f34659876dfe944f3a020cf33ff -patch_args=-Np0 diff --git a/srcpkgs/intltool/patches/avoid-process-race.patch b/srcpkgs/intltool/patches/avoid-process-race.patch index 3dbf82a455d..0b97ff99dbf 100644 --- a/srcpkgs/intltool/patches/avoid-process-race.patch +++ b/srcpkgs/intltool/patches/avoid-process-race.patch @@ -1,7 +1,7 @@ https://bazaar.launchpad.net/~intltool/intltool/trunk/revision/748?start_revid=748 === modified file 'intltool-merge.in' ---- intltool-merge.in 2014-11-24 02:37:01 +0000 -+++ intltool-merge.in 2017-05-18 19:09:18 +0000 +--- a/intltool-merge.in 2014-11-24 02:37:01 +0000 ++++ b/intltool-merge.in 2017-05-18 19:09:18 +0000 @@ -43,6 +43,7 @@ use Text::Wrap; use File::Basename; diff --git a/srcpkgs/intltool/patches/perl522.patch b/srcpkgs/intltool/patches/perl522.patch index fcb6b7cec0e..e04281959e5 100644 --- a/srcpkgs/intltool/patches/perl522.patch +++ b/srcpkgs/intltool/patches/perl522.patch @@ -1,8 +1,8 @@ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705 Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/bin/intltool-update line 1065. ---- intltool-update.in 2015-05-27 00:20:43.038379963 +0200 -+++ intltool-update.in 2015-05-27 00:23:53.309078052 +0200 +--- a/intltool-update.in 2015-05-27 00:20:43.038379963 +0200 ++++ b/intltool-update.in 2015-05-27 00:23:53.309078052 +0200 @@ -1062,7 +1062,7 @@ } } @@ -44,8 +44,8 @@ Unescaped left brace in regex is deprecated, passed through in regex; marked by } # \s makes this not work, why? ---- intltool-update.in 2015-05-27 00:20:43.038379963 +0200 -+++ intltool-update.in 2015-05-27 00:23:53.309078052 +0200 +--- a/intltool-update.in 2015-05-27 00:20:43.038379963 +0200 ++++ b/intltool-update.in 2015-05-27 00:23:53.309078052 +0200 @@ -1068,7 +1068,7 @@ sub SubstituteVariable my $untouched = $1; my $sub = ""; diff --git a/srcpkgs/intltool/template b/srcpkgs/intltool/template index b3b26d28ade..cfba730f2e6 100644 --- a/srcpkgs/intltool/template +++ b/srcpkgs/intltool/template @@ -12,4 +12,3 @@ license="GPL-2.0-or-later" homepage="https://edge.launchpad.net/intltool" distfiles="http://launchpad.net/intltool/trunk/$version/+download/$pkgname-$version.tar.gz" checksum=67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd -patch_args=-Np0 diff --git a/srcpkgs/invada-studio-plugins-lv2/patches/invada-studio-fixes.patch b/srcpkgs/invada-studio-plugins-lv2/patches/invada-studio-fixes.patch index 2d06f50b3fe..3e3baf57d3c 100644 --- a/srcpkgs/invada-studio-plugins-lv2/patches/invada-studio-fixes.patch +++ b/srcpkgs/invada-studio-plugins-lv2/patches/invada-studio-fixes.patch @@ -10,8 +10,8 @@ # add denormal handling diff -Naurd plugin/inv_delay.c plugin/inv_delay.c ---- plugin/inv_delay.c 2009-08-16 08:56:09.000000000 +0200 -+++ plugin/inv_delay.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugin/inv_delay.c 2009-08-16 08:56:09.000000000 +0200 ++++ b/plugin/inv_delay.c 2014-03-08 01:17:40.050457000 +0100 @@ -28,6 +28,8 @@ #include "library/common.h" #include "inv_delay.h" @@ -32,8 +32,8 @@ diff -Naurd plugin/inv_delay.c plugin/inv_delay.c HPF1 = ((fHPFsamples-1) * HPF1 + In1FB) / fHPFsamples; HPF2 = ((fHPFsamples-1) * HPF2 + In2FB) / fHPFsamples; diff -Naurd plugin/inv_input.h plugin/inv_input.h ---- plugin/inv_input.h 2009-05-09 08:17:48.000000000 +0200 -+++ plugin/inv_input.h 2014-03-08 01:17:40.050457000 +0100 +--- a/plugin/inv_input.h 2009-05-09 08:17:48.000000000 +0200 ++++ b/plugin/inv_input.h 2014-03-08 01:17:40.050457000 +0100 @@ -18,8 +18,8 @@ */ @@ -62,8 +62,8 @@ diff -Naurd plugin/inv_input.h plugin/inv_input.h /* control conversion function */ float convertParam(unsigned long param, float value, double sr); diff -Naurd plugin/inv_meter.c plugin/inv_meter.c ---- plugin/inv_meter.c 2009-08-09 08:57:23.000000000 +0200 -+++ plugin/inv_meter.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugin/inv_meter.c 2009-08-09 08:57:23.000000000 +0200 ++++ b/plugin/inv_meter.c 2014-03-08 01:17:40.050457000 +0100 @@ -320,7 +320,9 @@ plugin->EnvVuLLast = (fabs(EnvVuL)<1.0e-10) ? 0.f : EnvVuL; plugin->EnvVuRLast = (fabs(EnvVuR)<1.0e-10) ? 0.f : EnvVuR; @@ -75,8 +75,8 @@ diff -Naurd plugin/inv_meter.c plugin/inv_meter.c } diff -Naurd plugin/inv_meter.h plugin/inv_meter.h ---- plugin/inv_meter.h 2009-08-08 11:00:52.000000000 +0200 -+++ plugin/inv_meter.h 2014-03-08 01:17:40.050457000 +0100 +--- a/plugin/inv_meter.h 2009-08-08 11:00:52.000000000 +0200 ++++ b/plugin/inv_meter.h 2014-03-08 01:17:40.050457000 +0100 @@ -18,8 +18,8 @@ */ @@ -89,8 +89,8 @@ diff -Naurd plugin/inv_meter.h plugin/inv_meter.h #define IMETER_AUDIO_INL 1 #define IMETER_AUDIO_INR 2 diff -Naurd plugin/inv_testtone.h plugin/inv_testtone.h ---- plugin/inv_testtone.h 2009-06-30 00:37:22.000000000 +0200 -+++ plugin/inv_testtone.h 2014-03-08 01:17:40.050457000 +0100 +--- a/plugin/inv_testtone.h 2009-06-30 00:37:22.000000000 +0200 ++++ b/plugin/inv_testtone.h 2014-03-08 01:17:40.050457000 +0100 @@ -18,8 +18,8 @@ */ @@ -103,8 +103,8 @@ diff -Naurd plugin/inv_testtone.h plugin/inv_testtone.h #define ITONE_FREQ 1 #define ITONE_TRIM 2 diff -Naurd plugin/library/common.c plugin/library/common.c ---- plugin/library/common.c 2009-08-16 09:16:44.000000000 +0200 -+++ plugin/library/common.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugin/library/common.c 2009-08-16 09:16:44.000000000 +0200 ++++ b/plugin/library/common.c 2014-03-08 01:17:40.050457000 +0100 @@ -27,6 +27,7 @@ #include #include "common.h" @@ -140,8 +140,8 @@ diff -Naurd plugin/library/common.c plugin/library/common.c +} diff -Naurd plugin/library/common.h plugin/library/common.h ---- plugin/library/common.h 2009-08-16 09:16:57.000000000 +0200 -+++ plugin/library/common.h 2014-03-08 01:17:40.050457000 +0100 +--- a/plugin/library/common.h 2009-08-16 09:16:57.000000000 +0200 ++++ b/plugin/library/common.h 2014-03-08 01:17:40.050457000 +0100 @@ -109,5 +109,6 @@ /* Butterworth bandpass for spectral analysier */ void initBandpassFilter(struct FilterP *f, double sr, double cf, double bw); @@ -150,8 +150,8 @@ diff -Naurd plugin/library/common.h plugin/library/common.h #endif /*__INVADA_COMMON_H */ diff -Naurd plugingui/gtk/inv_input_gui.glade plugingui/gtk/inv_input_gui.glade ---- plugingui/gtk/inv_input_gui.glade 2009-05-09 13:03:37.000000000 +0200 -+++ plugingui/gtk/inv_input_gui.glade 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/gtk/inv_input_gui.glade 2009-05-09 13:03:37.000000000 +0200 ++++ b/plugingui/gtk/inv_input_gui.glade 2014-03-08 01:17:40.050457000 +0100 @@ -1,6 +1,6 @@ @@ -502,8 +502,8 @@ diff -Naurd plugingui/gtk/inv_input_gui.glade plugingui/gtk/inv_input_gui.glade GTK_FILL 2 diff -Naurd plugingui/gtk/inv_input_gui.xml plugingui/gtk/inv_input_gui.xml ---- plugingui/gtk/inv_input_gui.xml 2009-05-09 13:04:43.000000000 +0200 -+++ plugingui/gtk/inv_input_gui.xml 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/gtk/inv_input_gui.xml 2009-05-09 13:04:43.000000000 +0200 ++++ b/plugingui/gtk/inv_input_gui.xml 2014-03-08 01:17:40.050457000 +0100 @@ -1,5 +1,5 @@ - @@ -839,8 +839,8 @@ diff -Naurd plugingui/gtk/inv_input_gui.xml plugingui/gtk/inv_input_gui.xml GTK_FILL 2 diff -Naurd plugingui/gtk/inv_meter_gui.glade plugingui/gtk/inv_meter_gui.glade ---- plugingui/gtk/inv_meter_gui.glade 2009-08-22 09:36:39.000000000 +0200 -+++ plugingui/gtk/inv_meter_gui.glade 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/gtk/inv_meter_gui.glade 2009-08-22 09:36:39.000000000 +0200 ++++ b/plugingui/gtk/inv_meter_gui.glade 2014-03-08 01:17:40.050457000 +0100 @@ -1,6 +1,6 @@ @@ -859,8 +859,8 @@ diff -Naurd plugingui/gtk/inv_meter_gui.glade plugingui/gtk/inv_meter_gui.glade diff -Naurd plugingui/gtk/inv_meter_gui.xml plugingui/gtk/inv_meter_gui.xml ---- plugingui/gtk/inv_meter_gui.xml 2009-08-22 09:36:47.000000000 +0200 -+++ plugingui/gtk/inv_meter_gui.xml 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/gtk/inv_meter_gui.xml 2009-08-22 09:36:47.000000000 +0200 ++++ b/plugingui/gtk/inv_meter_gui.xml 2014-03-08 01:17:40.050457000 +0100 @@ -1,5 +1,5 @@ - @@ -878,8 +878,8 @@ diff -Naurd plugingui/gtk/inv_meter_gui.xml plugingui/gtk/inv_meter_gui.xml diff -Naurd plugingui/inv_compressor_gui.c plugingui/inv_compressor_gui.c ---- plugingui/inv_compressor_gui.c 2009-07-04 12:51:18.000000000 +0200 -+++ plugingui/inv_compressor_gui.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/inv_compressor_gui.c 2009-07-04 12:51:18.000000000 +0200 ++++ b/plugingui/inv_compressor_gui.c 2014-03-08 01:17:40.050457000 +0100 @@ -36,8 +36,6 @@ #include "inv_compressor_gui.h" @@ -965,8 +965,8 @@ diff -Naurd plugingui/inv_compressor_gui.c plugingui/inv_compressor_gui.c diff -Naurd plugingui/inv_delay_gui.c plugingui/inv_delay_gui.c ---- plugingui/inv_delay_gui.c 2009-07-04 12:51:38.000000000 +0200 -+++ plugingui/inv_delay_gui.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/inv_delay_gui.c 2009-07-04 12:51:38.000000000 +0200 ++++ b/plugingui/inv_delay_gui.c 2014-03-08 01:17:40.050457000 +0100 @@ -35,8 +35,6 @@ #include "inv_delay_gui.h" @@ -1053,8 +1053,8 @@ diff -Naurd plugingui/inv_delay_gui.c plugingui/inv_delay_gui.c diff -Naurd plugingui/inv_erreverb_gui.c plugingui/inv_erreverb_gui.c ---- plugingui/inv_erreverb_gui.c 2009-07-04 08:22:56.000000000 +0200 -+++ plugingui/inv_erreverb_gui.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/inv_erreverb_gui.c 2009-07-04 08:22:56.000000000 +0200 ++++ b/plugingui/inv_erreverb_gui.c 2014-03-08 01:17:40.050457000 +0100 @@ -35,8 +35,6 @@ #include "inv_erreverb_gui.h" @@ -1141,8 +1141,8 @@ diff -Naurd plugingui/inv_erreverb_gui.c plugingui/inv_erreverb_gui.c diff -Naurd plugingui/inv_filter_gui.c plugingui/inv_filter_gui.c ---- plugingui/inv_filter_gui.c 2009-07-04 12:57:42.000000000 +0200 -+++ plugingui/inv_filter_gui.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/inv_filter_gui.c 2009-07-04 12:57:42.000000000 +0200 ++++ b/plugingui/inv_filter_gui.c 2014-03-08 01:17:40.050457000 +0100 @@ -36,8 +36,6 @@ #include "inv_filter_gui.h" @@ -1229,8 +1229,8 @@ diff -Naurd plugingui/inv_filter_gui.c plugingui/inv_filter_gui.c diff -Naurd plugingui/inv_input_gui.c plugingui/inv_input_gui.c ---- plugingui/inv_input_gui.c 2009-07-04 12:52:02.000000000 +0200 -+++ plugingui/inv_input_gui.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/inv_input_gui.c 2009-07-04 12:52:02.000000000 +0200 ++++ b/plugingui/inv_input_gui.c 2014-03-08 01:17:40.050457000 +0100 @@ -36,8 +36,6 @@ #include "inv_input_gui.h" @@ -1317,8 +1317,8 @@ diff -Naurd plugingui/inv_input_gui.c plugingui/inv_input_gui.c diff -Naurd plugingui/inv_meter_gui.c plugingui/inv_meter_gui.c ---- plugingui/inv_meter_gui.c 2009-08-22 08:56:27.000000000 +0200 -+++ plugingui/inv_meter_gui.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/inv_meter_gui.c 2009-08-22 08:56:27.000000000 +0200 ++++ b/plugingui/inv_meter_gui.c 2014-03-08 01:17:40.050457000 +0100 @@ -36,8 +36,6 @@ #include "inv_meter_gui.h" @@ -1405,8 +1405,8 @@ diff -Naurd plugingui/inv_meter_gui.c plugingui/inv_meter_gui.c diff -Naurd plugingui/inv_phaser_gui.c plugingui/inv_phaser_gui.c ---- plugingui/inv_phaser_gui.c 2009-08-15 09:17:33.000000000 +0200 -+++ plugingui/inv_phaser_gui.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/inv_phaser_gui.c 2009-08-15 09:17:33.000000000 +0200 ++++ b/plugingui/inv_phaser_gui.c 2014-03-08 01:17:40.050457000 +0100 @@ -35,8 +35,6 @@ #include "inv_phaser_gui.h" @@ -1493,8 +1493,8 @@ diff -Naurd plugingui/inv_phaser_gui.c plugingui/inv_phaser_gui.c diff -Naurd plugingui/inv_testtone_gui.c plugingui/inv_testtone_gui.c ---- plugingui/inv_testtone_gui.c 2009-08-23 07:06:02.000000000 +0200 -+++ plugingui/inv_testtone_gui.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/inv_testtone_gui.c 2009-08-23 07:06:02.000000000 +0200 ++++ b/plugingui/inv_testtone_gui.c 2014-03-08 01:17:40.050457000 +0100 @@ -36,8 +36,6 @@ #include "inv_testtone_gui.h" @@ -1584,8 +1584,8 @@ diff -Naurd plugingui/inv_testtone_gui.c plugingui/inv_testtone_gui.c static gint diff -Naurd plugingui/inv_tube_gui.c plugingui/inv_tube_gui.c ---- plugingui/inv_tube_gui.c 2009-07-04 12:53:06.000000000 +0200 -+++ plugingui/inv_tube_gui.c 2014-03-08 01:17:40.050457000 +0100 +--- a/plugingui/inv_tube_gui.c 2009-07-04 12:53:06.000000000 +0200 ++++ b/plugingui/inv_tube_gui.c 2014-03-08 01:17:40.050457000 +0100 @@ -35,8 +35,6 @@ #include "inv_tube_gui.h" @@ -1672,8 +1672,8 @@ diff -Naurd plugingui/inv_tube_gui.c plugingui/inv_tube_gui.c diff -Naurd rdf/inv_compressor.ttl rdf/inv_compressor.ttl ---- rdf/inv_compressor.ttl 2009-08-23 08:51:51.000000000 +0200 -+++ rdf/inv_compressor.ttl 2014-03-08 01:17:40.050457000 +0100 +--- a/rdf/inv_compressor.ttl 2009-08-23 08:51:51.000000000 +0200 ++++ b/rdf/inv_compressor.ttl 2014-03-08 01:17:40.050457000 +0100 @@ -1,19 +1,18 @@ -@prefix lv2: . -@prefix foaf: . @@ -1765,8 +1765,8 @@ diff -Naurd rdf/inv_compressor.ttl rdf/inv_compressor.ttl a lv2:InputPort, lv2:ControlPort ; lv2:index 4 ; diff -Naurd rdf/inv_delay.ttl rdf/inv_delay.ttl ---- rdf/inv_delay.ttl 2009-08-23 08:52:29.000000000 +0200 -+++ rdf/inv_delay.ttl 2014-03-08 01:17:40.050457000 +0100 +--- a/rdf/inv_delay.ttl 2009-08-23 08:52:29.000000000 +0200 ++++ b/rdf/inv_delay.ttl 2014-03-08 01:17:40.050457000 +0100 @@ -1,17 +1,16 @@ -@prefix lv2: . -@prefix foaf: . @@ -1867,8 +1867,8 @@ diff -Naurd rdf/inv_delay.ttl rdf/inv_delay.ttl a lv2:InputPort, lv2:ControlPort ; lv2:index 11 ; diff -Naurd rdf/inv_erreverb.ttl rdf/inv_erreverb.ttl ---- rdf/inv_erreverb.ttl 2009-08-23 08:52:51.000000000 +0200 -+++ rdf/inv_erreverb.ttl 2014-03-08 01:17:40.050457000 +0100 +--- a/rdf/inv_erreverb.ttl 2009-08-23 08:52:51.000000000 +0200 ++++ b/rdf/inv_erreverb.ttl 2014-03-08 01:17:40.050457000 +0100 @@ -1,19 +1,18 @@ -@prefix lv2: . -@prefix foaf: . @@ -1942,8 +1942,8 @@ diff -Naurd rdf/inv_erreverb.ttl rdf/inv_erreverb.ttl a lv2:InputPort, lv2:ControlPort ; lv2:index 9 ; diff -Naurd rdf/inv_filter.ttl rdf/inv_filter.ttl ---- rdf/inv_filter.ttl 2009-08-23 08:53:27.000000000 +0200 -+++ rdf/inv_filter.ttl 2014-03-08 01:17:40.050457000 +0100 +--- a/rdf/inv_filter.ttl 2009-08-23 08:53:27.000000000 +0200 ++++ b/rdf/inv_filter.ttl 2014-03-08 01:17:40.050457000 +0100 @@ -1,19 +1,18 @@ -@prefix lv2: . -@prefix foaf: . @@ -2059,8 +2059,8 @@ diff -Naurd rdf/inv_filter.ttl rdf/inv_filter.ttl a lv2:InputPort, lv2:ControlPort ; lv2:index 2 ; diff -Naurd rdf/inv_input.ttl rdf/inv_input.ttl ---- rdf/inv_input.ttl 2009-08-23 08:53:43.000000000 +0200 -+++ rdf/inv_input.ttl 2014-03-08 01:17:40.050457000 +0100 +--- a/rdf/inv_input.ttl 2009-08-23 08:53:43.000000000 +0200 ++++ b/rdf/inv_input.ttl 2014-03-08 01:17:40.050457000 +0100 @@ -4,15 +4,14 @@ @prefix rdfs: . @prefix units: . @@ -2093,8 +2093,8 @@ diff -Naurd rdf/inv_input.ttl rdf/inv_input.ttl lv2:port [ a lv2:InputPort, lv2:ControlPort ; diff -Naurd rdf/inv_meter.ttl rdf/inv_meter.ttl ---- rdf/inv_meter.ttl 2009-08-23 08:54:48.000000000 +0200 -+++ rdf/inv_meter.ttl 2014-03-08 01:17:40.050457000 +0100 +--- a/rdf/inv_meter.ttl 2009-08-23 08:54:48.000000000 +0200 ++++ b/rdf/inv_meter.ttl 2014-03-08 01:17:40.050457000 +0100 @@ -4,14 +4,13 @@ @prefix rdfs: . @prefix units: . @@ -2122,8 +2122,8 @@ diff -Naurd rdf/inv_meter.ttl rdf/inv_meter.ttl lv2:port [ diff -Naurd rdf/inv_phaser.ttl rdf/inv_phaser.ttl ---- rdf/inv_phaser.ttl 2009-08-23 08:55:32.000000000 +0200 -+++ rdf/inv_phaser.ttl 2014-03-08 01:17:40.050457000 +0100 +--- a/rdf/inv_phaser.ttl 2009-08-23 08:55:32.000000000 +0200 ++++ b/rdf/inv_phaser.ttl 2014-03-08 01:17:40.050457000 +0100 @@ -1,17 +1,16 @@ -@prefix lv2: . -@prefix foaf: . @@ -2197,8 +2197,8 @@ diff -Naurd rdf/inv_phaser.ttl rdf/inv_phaser.ttl lv2:port [ diff -Naurd rdf/inv_testtone.ttl rdf/inv_testtone.ttl ---- rdf/inv_testtone.ttl 2009-08-23 08:55:47.000000000 +0200 -+++ rdf/inv_testtone.ttl 2014-03-08 01:17:40.050457000 +0100 +--- a/rdf/inv_testtone.ttl 2009-08-23 08:55:47.000000000 +0200 ++++ b/rdf/inv_testtone.ttl 2014-03-08 01:17:40.050457000 +0100 @@ -1,18 +1,17 @@ -@prefix lv2: . -@prefix foaf: . @@ -2246,8 +2246,8 @@ diff -Naurd rdf/inv_testtone.ttl rdf/inv_testtone.ttl a lv2:InputPort, lv2:ControlPort ; lv2:index 2 ; diff -Naurd rdf/inv_tube.ttl rdf/inv_tube.ttl ---- rdf/inv_tube.ttl 2009-08-23 08:56:08.000000000 +0200 -+++ rdf/inv_tube.ttl 2014-03-08 01:17:40.050457000 +0100 +--- a/rdf/inv_tube.ttl 2009-08-23 08:56:08.000000000 +0200 ++++ b/rdf/inv_tube.ttl 2014-03-08 01:17:40.050457000 +0100 @@ -4,15 +4,14 @@ @prefix rdfs: . @prefix units: . diff --git a/srcpkgs/invada-studio-plugins-lv2/template b/srcpkgs/invada-studio-plugins-lv2/template index ee7f7a8ffe2..6bd6ddf74a5 100644 --- a/srcpkgs/invada-studio-plugins-lv2/template +++ b/srcpkgs/invada-studio-plugins-lv2/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="https://launchpad.net/invada-studio/" distfiles="https://launchpad.net/invada-studio/lv2/1.2/+download/${pkgname}_${version}-nopkg.tgz" checksum=c6cac7c32effc6b3052e3b017133244f385ef8e053147859d88eae6facaf7d12 -patch_args=-Np0 post_patch() { find . -name Makefile -exec \ diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch index 09f1d169526..f85beca403f 100644 --- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch +++ b/srcpkgs/io.elementary.calendar/patches/00-musl.patch @@ -6,8 +6,8 @@ Date: Thu Oct 18 11:33:15 2018 -0700 diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala index 3e3b8cbd..b33f75f8 100644 ---- core/Model/CalendarModel.vala -+++ core/Model/CalendarModel.vala +--- a/core/Model/CalendarModel.vala ++++ b/core/Model/CalendarModel.vala @@ -68,7 +68,11 @@ public class Maya.Model.CalendarModel : Object { } @@ -22,8 +22,8 @@ index 3e3b8cbd..b33f75f8 100644 } diff --git meson.build meson.build index a0cd2dd7..02b4e1d1 100644 ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -31,7 +31,17 @@ folks_dep = dependency('folks') geocode_glib_dep = dependency('geocode-glib-1.0') gclue_dep = dependency('libgeoclue-2.0') diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template index 936700ba2cd..7ff446f97d1 100644 --- a/srcpkgs/io.elementary.calendar/template +++ b/srcpkgs/io.elementary.calendar/template @@ -17,7 +17,6 @@ license="GPL-3.0-only" homepage="https://github.com/elementary/calendar" distfiles="${homepage}/archive/${_git_commit}.tar.gz" checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345 -patch_args=-Np0 libio.elementary.calendar_package() { short_desc+=" - library" diff --git a/srcpkgs/io.elementary.code/patches/vala050.patch b/srcpkgs/io.elementary.code/patches/vala050.patch index 9eeee1fb664..ec3abb8fd9f 100644 --- a/srcpkgs/io.elementary.code/patches/vala050.patch +++ b/srcpkgs/io.elementary.code/patches/vala050.patch @@ -9,8 +9,8 @@ Subject: [PATCH] fix with vala-0.50 diff --git plugins/outline/Vala/ValaSymbolOutline.vala plugins/outline/Vala/ValaSymbolOutline.vala index c8db339..31386a6 100644 ---- plugins/outline/Vala/ValaSymbolOutline.vala -+++ plugins/outline/Vala/ValaSymbolOutline.vala +--- a/plugins/outline/Vala/ValaSymbolOutline.vala ++++ b/plugins/outline/Vala/ValaSymbolOutline.vala @@ -61,7 +61,7 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline public void parse_symbols () { diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template index c29de4c8c0b..8d43ad4130d 100644 --- a/srcpkgs/io.elementary.code/template +++ b/srcpkgs/io.elementary.code/template @@ -14,7 +14,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/elementary/code" distfiles="${homepage}/archive/${version}.tar.gz" checksum=d84b38193b72cd93995aae604358c83c5b6976d8472ce985027b947cfed990bf -patch_args=-Np0 libio.elementary.code_package() { short_desc+=" - library" diff --git a/srcpkgs/io.elementary.music/patches/vala-array-size.patch b/srcpkgs/io.elementary.music/patches/vala-array-size.patch index 436ad733ac8..2cc268cdae6 100644 --- a/srcpkgs/io.elementary.music/patches/vala-array-size.patch +++ b/srcpkgs/io.elementary.music/patches/vala-array-size.patch @@ -1,5 +1,5 @@ ---- core/GStrewamer/Equalizer.vala 2020-03-04 23:50:04.000000000 +0100 -+++ core/GStreamer/Equalizer.vala 2020-12-14 15:53:22.359597220 +0100 +--- a/core/GStrewamer/Equalizer.vala 2020-03-04 23:50:04.000000000 +0100 ++++ b/core/GStreamer/Equalizer.vala 2020-12-14 15:53:22.359597220 +0100 @@ -31,7 +31,7 @@ construct { element = Gst.ElementFactory.make ("equalizer-10bands", "equalizer"); diff --git a/srcpkgs/io.elementary.music/template b/srcpkgs/io.elementary.music/template index a4e05603f35..de6ae0f94d9 100644 --- a/srcpkgs/io.elementary.music/template +++ b/srcpkgs/io.elementary.music/template @@ -15,7 +15,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/elementary/music" distfiles="${homepage}/archive/${version}.tar.gz" checksum=ed7cba3b07189273890b321b21cda198f18b102e4466eb7207c0b5f27b31dfc9 -patch_args=-Np0 libio.elementary.music_package() { short_desc+=" - library" diff --git a/srcpkgs/io.elementary.photos/patches/fix-meson.patch b/srcpkgs/io.elementary.photos/patches/fix-meson.patch index 779b4dcdbaf..820e3b8ef96 100644 --- a/srcpkgs/io.elementary.photos/patches/fix-meson.patch +++ b/srcpkgs/io.elementary.photos/patches/fix-meson.patch @@ -10,8 +10,8 @@ Subject: [PATCH] meson: Properly include config.vapi and config.h (#578) diff --git meson.build meson.build index 5edb5314..9bebaca0 100644 ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -11,14 +11,33 @@ add_project_arguments([ '-Wno-unused', '-Wl,--enable-new-dtags', @@ -64,8 +64,8 @@ index 5edb5314..9bebaca0 100644 add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala') diff --git src/meson.build src/meson.build index 45bf4c1b..1215d778 100644 ---- src/meson.build -+++ src/meson.build +--- a/src/meson.build ++++ b/src/meson.build @@ -4,18 +4,6 @@ library_files = files( 'plugins/TransitionsInterfaces.vala' ) diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template index a07e9b5a491..81c1734164b 100644 --- a/srcpkgs/io.elementary.photos/template +++ b/srcpkgs/io.elementary.photos/template @@ -20,4 +20,3 @@ license="LGPL-2.1-or-later" homepage="https://github.com/elementary/photos" distfiles="https://github.com/elementary/photos/archive/${version}.tar.gz" checksum=9f6ad409d053e3239b9ec7fc59429afe9ce89e40878697a73c2c3f215556a074 -patch_args=-Np0 diff --git a/srcpkgs/iotop/patches/python3.patch b/srcpkgs/iotop/patches/python3.patch index c496b42532c..409fafadf0e 100644 --- a/srcpkgs/iotop/patches/python3.patch +++ b/srcpkgs/iotop/patches/python3.patch @@ -1,5 +1,5 @@ ---- setup.py.orig -+++ setup.py +--- a/setup.py ++++ b/setup.py @@ -1,16 +1,9 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template index 8af2af900ba..84a9f788616 100644 --- a/srcpkgs/iotop/template +++ b/srcpkgs/iotop/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://guichaz.free.fr/iotop" distfiles="http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2" checksum=3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b -patch_args=-Np0 post_install() { chmod 644 ${DESTDIR}/usr/share/man/man8/iotop.8 diff --git a/srcpkgs/iouyap/patches/musl.patch b/srcpkgs/iouyap/patches/musl.patch index 0526b5aee0a..04851fe1572 100644 --- a/srcpkgs/iouyap/patches/musl.patch +++ b/srcpkgs/iouyap/patches/musl.patch @@ -1,5 +1,5 @@ ---- iouyap.c.orig -+++ iouyap.c +--- a/iouyap.c ++++ b/iouyap.c @@ -35,7 +35,9 @@ #include #include @@ -10,8 +10,8 @@ #include #include #include ---- iouyap.h.orig -+++ iouyap.h +--- a/iouyap.h ++++ b/iouyap.h @@ -24,6 +24,7 @@ #include #include @@ -20,8 +20,8 @@ #define NAME "iouyap" #define VERSION "0.97.0" ---- netmap.c.orig -+++ netmap.c +--- a/netmap.c ++++ b/netmap.c @@ -28,6 +28,7 @@ #include #include diff --git a/srcpkgs/iouyap/template b/srcpkgs/iouyap/template index a7ddbbccf8c..09cd966c6e1 100644 --- a/srcpkgs/iouyap/template +++ b/srcpkgs/iouyap/template @@ -10,7 +10,6 @@ license="GPL-3" homepage="https://github.com/GNS3/iouyap" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" checksum=181850a4ce73a4d4035f9eb39b2656ae31d360f18b577ee65f5149132da3eccf -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch index 18dd076cbd9..60fdf3fe7d0 100644 --- a/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch +++ b/srcpkgs/ipmitool/patches/ipmitool-openssl-1.1.patch @@ -1,6 +1,6 @@ diff -urNp src/plugins/lanplus/lanplus_crypt_impl.c src/plugins/lanplus/lanplus_crypt_impl.c ---- src/plugins/lanplus/lanplus_crypt_impl.c 2016-05-28 10:20:20.000000000 +0200 -+++ src/plugins/lanplus/lanplus_crypt_impl.c 2017-02-21 10:50:21.634873466 +0100 +--- a/src/plugins/lanplus/lanplus_crypt_impl.c 2016-05-28 10:20:20.000000000 +0200 ++++ b/src/plugins/lanplus/lanplus_crypt_impl.c 2017-02-21 10:50:21.634873466 +0100 @@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_ uint8_t * output, uint32_t * bytes_written) diff --git a/srcpkgs/ipmitool/template b/srcpkgs/ipmitool/template index 7d48962c223..eab8e525c87 100644 --- a/srcpkgs/ipmitool/template +++ b/srcpkgs/ipmitool/template @@ -10,7 +10,6 @@ license="BSD" homepage="http://ipmitool.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/ipp-usb/patches/udev_runit.patch b/srcpkgs/ipp-usb/patches/udev_runit.patch index a4678d60973..79fd683a90a 100644 --- a/srcpkgs/ipp-usb/patches/udev_runit.patch +++ b/srcpkgs/ipp-usb/patches/udev_runit.patch @@ -1,5 +1,5 @@ ---- systemd-udev/71-ipp-usb.rules -+++ systemd-udev/71-ipp-usb.rules +--- a/systemd-udev/71-ipp-usb.rules ++++ b/systemd-udev/71-ipp-usb.rules @@ -1 +1 @@ -ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:070104:*", OWNER="root", GROUP="lp", MODE="0664", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ipp-usb.service" +ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ENV{ID_USB_INTERFACES}=="*:070104:*", OWNER="root", GROUP="lp", MODE="0664", RUN+="/usr/bin/sv o ipp-usb" diff --git a/srcpkgs/ipp-usb/template b/srcpkgs/ipp-usb/template index 79f18ba1d54..98b472d1599 100644 --- a/srcpkgs/ipp-usb/template +++ b/srcpkgs/ipp-usb/template @@ -14,7 +14,6 @@ license="BSD-2-Clause" homepage="https://github.com/OpenPrinting/ipp-usb" distfiles="https://github.com/OpenPrinting/ipp-usb/archive/$version.tar.gz" checksum=06855b4da0bcaad430a42534c117a3f3224c4f6b0f6321da898e3422ae97ae15 -patch_args=-Np0 post_install() { vsv ipp-usb diff --git a/srcpkgs/ippusbxd/patches/fix-cflags.patch b/srcpkgs/ippusbxd/patches/fix-cflags.patch index 5d36903c3ff..942723b2b72 100644 --- a/srcpkgs/ippusbxd/patches/fix-cflags.patch +++ b/srcpkgs/ippusbxd/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: src/CMakeLists.txt =================================================================== ---- src/CMakeLists.txt.orig -+++ src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 2.6) project(ippusbxd) diff --git a/srcpkgs/ippusbxd/template b/srcpkgs/ippusbxd/template index 0cf0278b951..e81064e8b91 100644 --- a/srcpkgs/ippusbxd/template +++ b/srcpkgs/ippusbxd/template @@ -14,7 +14,6 @@ homepage="https://github.com/OpenPrinting/ippusbxd" distfiles="${homepage}/archive/${version}.tar.gz" checksum=996a572c8f6d1426a58ad3b95c21fea7f5b64d5db34a825c543d7869b3c77891 conf_files="/etc/apparmor.d/usr.sbin.ippusbxd" -patch_args=-Np0 export CMAKE_GENERATOR="Unix Makefiles" diff --git a/srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch b/srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch index aa37afc3988..6721ee010fe 100644 --- a/srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch +++ b/srcpkgs/iptables/patches/0001-extentions-add-check-to-the-phony-targets.patch @@ -14,8 +14,8 @@ Signed-off-by: Anthony Iliopoulos diff --git extensions/GNUmakefile.in extensions/GNUmakefile.in index 956ccb3..78ce2ee 100644 ---- extensions/GNUmakefile.in -+++ extensions/GNUmakefile.in +--- a/extensions/GNUmakefile.in ++++ b/extensions/GNUmakefile.in @@ -79,7 +79,7 @@ targets_install := .SECONDARY: diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template index 3b0269d22f1..0d0ed43206d 100644 --- a/srcpkgs/iptables/template +++ b/srcpkgs/iptables/template @@ -20,7 +20,6 @@ alternatives=" iptables:iptables:/usr/bin/xtables-legacy-multi iptables:iptables-restore:/usr/bin/xtables-legacy-multi iptables:iptables-save:/usr/bin/xtables-legacy-multi" -patch_args=-Np0 pre_build() { rm include/linux/types.h diff --git a/srcpkgs/ipv6calc/patches/ipv6calc-db-update-download-fix.patch b/srcpkgs/ipv6calc/patches/ipv6calc-db-update-download-fix.patch index 3aadbf7ce35..b9d5ded86b7 100644 --- a/srcpkgs/ipv6calc/patches/ipv6calc-db-update-download-fix.patch +++ b/srcpkgs/ipv6calc/patches/ipv6calc-db-update-download-fix.patch @@ -1,7 +1,7 @@ Fix for https://github.com/pbiering/ipv6calc/issues/25 ---- tools/ipv6calc-db-update.sh.in~ 2021-05-18 20:42:27.000000000 +0200 -+++ tools/ipv6calc-db-update.sh.in 2021-05-21 09:30:39.913996788 +0200 +--- a/tools/ipv6calc-db-update.sh.in~ 2021-05-18 20:42:27.000000000 +0200 ++++ b/tools/ipv6calc-db-update.sh.in 2021-05-21 09:30:39.913996788 +0200 @@ -37,7 +37,7 @@ END } diff --git a/srcpkgs/ipv6calc/patches/use-bash-for-scripts.patch b/srcpkgs/ipv6calc/patches/use-bash-for-scripts.patch index 969285fbfc9..c90b0441022 100644 --- a/srcpkgs/ipv6calc/patches/use-bash-for-scripts.patch +++ b/srcpkgs/ipv6calc/patches/use-bash-for-scripts.patch @@ -1,13 +1,13 @@ ---- tools/ipv6calc-update-registries.sh~ 2019-10-11 07:15:53.000000000 +0200 -+++ tools/ipv6calc-update-registries.sh 2020-04-28 20:56:41.367743447 +0200 +--- a/tools/ipv6calc-update-registries.sh~ 2019-10-11 07:15:53.000000000 +0200 ++++ b/tools/ipv6calc-update-registries.sh 2020-04-28 20:56:41.367743447 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Project : ipv6calc/databases/registries # File : update-registries.sh ---- tools/ipv6calc-registries-check-run-create.sh~ 2019-10-11 07:15:53.000000000 +0200 -+++ tools/ipv6calc-registries-check-run-create.sh 2020-04-28 20:56:42.704763285 +0200 +--- a/tools/ipv6calc-registries-check-run-create.sh~ 2019-10-11 07:15:53.000000000 +0200 ++++ b/tools/ipv6calc-registries-check-run-create.sh 2020-04-28 20:56:42.704763285 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash diff --git a/srcpkgs/ipv6calc/template b/srcpkgs/ipv6calc/template index 7873da6a984..fdeb909b06e 100644 --- a/srcpkgs/ipv6calc/template +++ b/srcpkgs/ipv6calc/template @@ -12,4 +12,3 @@ license="GPL-2.0-only" homepage="https://www.deepspace6.net/projects/ipv6calc.html" distfiles="https://github.com/pbiering/ipv6calc/archive/${version}.tar.gz" checksum=db690da55a31db063f87af7731cf5c913d8622057fc6c9f66f879725b1540496 -patch_args=-Np0 diff --git a/srcpkgs/iscan/patches/jpegstream.cc.patch b/srcpkgs/iscan/patches/jpegstream.cc.patch index 28f2dd54af5..cf4ed1d32a7 100644 --- a/srcpkgs/iscan/patches/jpegstream.cc.patch +++ b/srcpkgs/iscan/patches/jpegstream.cc.patch @@ -1,5 +1,5 @@ ---- lib/jpegstream.cc.orig 2016-08-19 11:14:06.000000000 +0200 -+++ lib/jpegstream.cc 2017-11-12 08:37:36.999741006 +0100 +--- a/lib/jpegstream.cc 2016-08-19 11:14:06.000000000 +0200 ++++ b/lib/jpegstream.cc 2017-11-12 08:37:36.999741006 +0100 @@ -82,7 +82,7 @@ // only that _bits != 8. for (unsigned int i = 0; i < _h_sz; ++i) diff --git a/srcpkgs/iscan/patches/libpng15.patch b/srcpkgs/iscan/patches/libpng15.patch index 955433ec035..cde7ee3f63c 100644 --- a/srcpkgs/iscan/patches/libpng15.patch +++ b/srcpkgs/iscan/patches/libpng15.patch @@ -1,5 +1,5 @@ ---- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100 -+++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100 +--- a/lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100 ++++ b/lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100 @@ -83,7 +83,12 @@ #if HAVE_PNG_H set_error_handler (_png, _info); @@ -33,8 +33,8 @@ && lib->write_info && lib->write_row && lib->write_flush ---- lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100 -+++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100 +--- a/lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100 ++++ b/lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100 @@ -108,6 +108,10 @@ png_structp); fundecl (void, write_end, diff --git a/srcpkgs/iscan/patches/uchar.patch b/srcpkgs/iscan/patches/uchar.patch index 5699b71a1b5..1f30812664e 100644 --- a/srcpkgs/iscan/patches/uchar.patch +++ b/srcpkgs/iscan/patches/uchar.patch @@ -1,5 +1,5 @@ ---- sanei/sanei_pio.c.orig 2016-08-19 11:14:06.000000000 +0200 -+++ sanei/sanei_pio.c 2017-11-12 20:06:53.428389561 +0100 +--- a/sanei/sanei_pio.c 2016-08-19 11:14:06.000000000 +0200 ++++ b/sanei/sanei_pio.c 2017-11-12 20:06:53.428389561 +0100 @@ -61,6 +61,7 @@ #define STUBS #include "sane/sanei_debug.h" diff --git a/srcpkgs/iscan/template b/srcpkgs/iscan/template index c39d09a19fa..18c0d969766 100644 --- a/srcpkgs/iscan/template +++ b/srcpkgs/iscan/template @@ -17,7 +17,6 @@ distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version checksum=597b9913de42d7a27f95bc82e533cbe778121ba13e3a03bc037f8d09a43447d5 repository=nonfree LDFLAGS="-ldl -lpng16" -patch_args=-Np0 post_configure() { # fix wrongly created link diff --git a/srcpkgs/itstool/patches/fix-segfault.patch b/srcpkgs/itstool/patches/fix-segfault.patch index 48d35a1d42e..9a74ddc1314 100644 --- a/srcpkgs/itstool/patches/fix-segfault.patch +++ b/srcpkgs/itstool/patches/fix-segfault.patch @@ -2,8 +2,8 @@ Description: Be more careful about libxml2 memory management Author: Guido Trentalancia Origin: https://github.com/itstool/itstool/pull/18 ---- itstool.in 2018-11-08 19:11:00.000000000 +0100 -+++ itstool.in 2019-05-13 11:02:18.619090267 +0200 +--- a/itstool.in 2018-11-08 19:11:00.000000000 +0100 ++++ b/itstool.in 2019-05-13 11:02:18.619090267 +0200 @@ -1053,7 +1053,7 @@ else: ctxt.replaceEntities(1) diff --git a/srcpkgs/itstool/template b/srcpkgs/itstool/template index d83b9b2fe39..5618fa120ff 100644 --- a/srcpkgs/itstool/template +++ b/srcpkgs/itstool/template @@ -13,4 +13,3 @@ license="GPL-3.0-or-later" homepage="http://itstool.org/" distfiles="http://files.itstool.org/itstool/${pkgname}-${version}.tar.bz2" checksum=6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9 -patch_args=-Np0 diff --git a/srcpkgs/iucode-tool/patches/musl-limits_h.patch b/srcpkgs/iucode-tool/patches/musl-limits_h.patch index 470a261e096..bd4d5924abd 100644 --- a/srcpkgs/iucode-tool/patches/musl-limits_h.patch +++ b/srcpkgs/iucode-tool/patches/musl-limits_h.patch @@ -1,5 +1,5 @@ ---- iucode_tool.c 2017-08-28 02:20:36.000000000 +0200 -+++ iucode_tool.c 2017-12-22 18:11:59.195710726 +0100 +--- a/iucode_tool.c 2017-08-28 02:20:36.000000000 +0200 ++++ b/iucode_tool.c 2017-12-22 18:11:59.195710726 +0100 @@ -19,6 +19,7 @@ #include #include diff --git a/srcpkgs/iucode-tool/template b/srcpkgs/iucode-tool/template index 99a6f0f6b95..d28c1046105 100644 --- a/srcpkgs/iucode-tool/template +++ b/srcpkgs/iucode-tool/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="https://gitlab.com/iucode-tool/iucode-tool/wikis/home" distfiles="https://gitlab.com/iucode-tool/releases/raw/latest/iucode-tool_${version}.tar.xz" checksum=12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends="argp-standalone" ;; diff --git a/srcpkgs/iverilog/patches/lxt2.patch b/srcpkgs/iverilog/patches/lxt2.patch index ae1918a7138..73193969d3b 100644 --- a/srcpkgs/iverilog/patches/lxt2.patch +++ b/srcpkgs/iverilog/patches/lxt2.patch @@ -3,8 +3,8 @@ Do not call vcd_work_terminate() in close_dumpfile() because it was already called before, leading to a second call to pthread_join() on the same pthread, which is undefined behaviour. ---- vpi/sys_lxt2.c.orig 2020-05-13 00:25:45.070186668 +0200 -+++ vpi/sys_lxt2.c 2020-05-13 00:26:09.721185704 +0200 +--- a/vpi/sys_lxt2.c 2020-05-13 00:25:45.070186668 +0200 ++++ b/vpi/sys_lxt2.c 2020-05-13 00:26:09.721185704 +0200 @@ -472,7 +472,6 @@ static void *close_dumpfile(void) diff --git a/srcpkgs/iverilog/template b/srcpkgs/iverilog/template index 1159f49d35d..b0f12c03fa8 100644 --- a/srcpkgs/iverilog/template +++ b/srcpkgs/iverilog/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="http://iverilog.icarus.com/" distfiles="https://github.com/steveicarus/iverilog/archive/v${version/./_}.tar.gz" checksum=6327fb900e66b46803d928b7ca439409a0dc32731d82143b20387be0833f1c95 -patch_args=-Np0 nocross="draw_tt.exe: cannot execute binary file: Exec format error" diff --git a/srcpkgs/iwd/patches/fix-name-request.patch b/srcpkgs/iwd/patches/fix-name-request.patch index 3bad1201894..b6f3f3a6f5e 100644 --- a/srcpkgs/iwd/patches/fix-name-request.patch +++ b/srcpkgs/iwd/patches/fix-name-request.patch @@ -1,5 +1,5 @@ ---- Makefile.am 2019-10-30 06:50:34.000000000 -0400 -+++ Makefile.am 2019-10-30 09:10:08.542128891 -0400 +--- a/Makefile.am 2019-10-30 06:50:34.000000000 -0400 ++++ b/Makefile.am 2019-10-30 09:10:08.542128891 -0400 @@ -139,15 +139,15 @@ if DBUS_POLICY dbus_datadir = @DBUS_DATADIR@/dbus-1/system.d @@ -51,8 +51,8 @@ if MANUAL_PAGES diff --git configure.ac configure.ac index ec0619e..13d6de4 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -188,7 +188,7 @@ AM_CONDITIONAL(SYSTEMD_SERVICE, test "${enable_systemd_service}" != "no") AC_ARG_WITH([dbus-busdir], AC_HELP_STRING([--with-dbus-busdir=DIR], [path to D-Bus bus services directory]), diff --git a/srcpkgs/iwd/patches/resolvconf-default.patch b/srcpkgs/iwd/patches/resolvconf-default.patch index 3ee5b33924f..7e33bb36af0 100644 --- a/srcpkgs/iwd/patches/resolvconf-default.patch +++ b/srcpkgs/iwd/patches/resolvconf-default.patch @@ -1,5 +1,5 @@ ---- src/resolve.c -+++ src/resolve.c +--- a/src/resolve.c ++++ b/src/resolve.c @@ -596,7 +596,7 @@ static int resolve_init(void) method_name = l_settings_get_value(iwd_get_config(), "Network", "NameResolvingService"); @@ -9,8 +9,8 @@ for (i = 0; resolve_method_ops_list[i].name; i++) { if (strcmp(resolve_method_ops_list[i].name, method_name)) ---- src/iwd.config.rst -+++ src/iwd.config.rst +--- a/src/iwd.config.rst ++++ b/src/iwd.config.rst @@ -194,7 +194,7 @@ The group ``[Network]`` contains network configuration related settings. by default. This setting can also be overriden on a per-network basis. diff --git a/srcpkgs/iwd/template b/srcpkgs/iwd/template index c6b0f6fc503..3a1c0fc2312 100644 --- a/srcpkgs/iwd/template +++ b/srcpkgs/iwd/template @@ -21,7 +21,6 @@ make_dirs="/var/lib/iwd 0600 root root /etc/iwd 755 root root" # tests depend on kernel features make_check=extended -patch_args=-Np0 do_check() { dbus-run-session make check diff --git a/srcpkgs/iwgtk/patches/fix-makefile.patch b/srcpkgs/iwgtk/patches/fix-makefile.patch index 0ce589d04e9..bd81d95b590 100644 --- a/srcpkgs/iwgtk/patches/fix-makefile.patch +++ b/srcpkgs/iwgtk/patches/fix-makefile.patch @@ -1,7 +1,7 @@ https://patch-diff.githubusercontent.com/raw/J-Lentz/iwgtk/pull/14.patch ---- Makefile.orig -+++ Makefile +--- a/Makefile ++++ b/Makefile @@ -1,8 +1,8 @@ -CC=gcc -CFLAGS=`pkg-config --cflags gtk+-3.0` diff --git a/srcpkgs/iwgtk/template b/srcpkgs/iwgtk/template index a4461b5602a..a9b23b80f0c 100644 --- a/srcpkgs/iwgtk/template +++ b/srcpkgs/iwgtk/template @@ -12,4 +12,3 @@ license="GPL-3.0-or-later" homepage="https://github.com/J-Lentz/iwgtk/" distfiles="https://github.com/J-Lentz/iwgtk/archive/refs/tags/v${version}.tar.gz" checksum=71bb85546a55bf710052d4947f6be5f5a01033d04d2d14a85a7e734dd570657d -patch_args=-Np0