diff --git a/srcpkgs/gamin/patches/0001-Poll-files-on-nfs4.patch b/srcpkgs/gamin/patches/0001-Poll-files-on-nfs4.patch index 3aebbd6a382..b730e1c2f44 100644 --- a/srcpkgs/gamin/patches/0001-Poll-files-on-nfs4.patch +++ b/srcpkgs/gamin/patches/0001-Poll-files-on-nfs4.patch @@ -12,8 +12,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=693006 server/gam_fs.c | 1 + 1 file changed, 1 insertion(+) ---- server/gam_fs.c.orig -+++ server/gam_fs.c +--- a/server/gam_fs.c ++++ b/server/gam_fs.c @@ -178,6 +178,7 @@ gam_fs_init (void) gam_fs_set ("reiserfs", GFS_MT_DEFAULT, 0); gam_fs_set ("novfs", GFS_MT_POLL, 30); diff --git a/srcpkgs/gamin/patches/0002-Fix-compilation-of-recent-glib-removing-G_CONST_RETU.patch b/srcpkgs/gamin/patches/0002-Fix-compilation-of-recent-glib-removing-G_CONST_RETU.patch index caf627ef553..e8749876b57 100644 --- a/srcpkgs/gamin/patches/0002-Fix-compilation-of-recent-glib-removing-G_CONST_RETU.patch +++ b/srcpkgs/gamin/patches/0002-Fix-compilation-of-recent-glib-removing-G_CONST_RETU.patch @@ -13,8 +13,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658884 server/gam_subscription.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---- server/gam_node.c.orig -+++ server/gam_node.c +--- a/server/gam_node.c ++++ b/server/gam_node.c @@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboolean is_dir) * it has finished with the string. If it must keep it longer, it * should makes its own copy. The returned string must not be freed. @@ -24,8 +24,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658884 gam_node_get_path(GamNode * node) { g_assert(node); ---- server/gam_node.h.orig -+++ server/gam_node.h +--- a/server/gam_node.h ++++ b/server/gam_node.h @@ -58,7 +58,7 @@ gboolean gam_node_is_dir (GamNode *node); void gam_node_set_is_dir (GamNode *node, gboolean is_dir); @@ -35,8 +35,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658884 GList *gam_node_get_subscriptions (GamNode *node); ---- server/gam_subscription.c.orig -+++ server/gam_subscription.c +--- a/server/gam_subscription.c ++++ b/server/gam_subscription.c @@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription * sub) * @param sub the GamSubscription * @returns The path being monitored. It should not be freed. @@ -46,8 +46,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=658884 gam_subscription_get_path(GamSubscription * sub) { if (sub == NULL) ---- server/gam_subscription.h.orig -+++ server/gam_subscription.h +--- a/server/gam_subscription.h ++++ b/server/gam_subscription.h @@ -21,7 +21,7 @@ int gam_subscription_pathlen (GamSubscription *sub); int gam_subscription_get_reqno (GamSubscription *sub); diff --git a/srcpkgs/gamin/patches/0004-fix-possible-server-deadlock-in-ih_sub_cancel.patch b/srcpkgs/gamin/patches/0004-fix-possible-server-deadlock-in-ih_sub_cancel.patch index d738b7b3fb0..eadd54e2f6d 100644 --- a/srcpkgs/gamin/patches/0004-fix-possible-server-deadlock-in-ih_sub_cancel.patch +++ b/srcpkgs/gamin/patches/0004-fix-possible-server-deadlock-in-ih_sub_cancel.patch @@ -22,8 +22,8 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361 server/inotify-helper.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) ---- server/inotify-helper.c.orig -+++ server/inotify-helper.c +--- a/server/inotify-helper.c ++++ b/server/inotify-helper.c @@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub) /** @@ -48,8 +48,8 @@ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361 return TRUE; } ---- server/inotify-helper.h.orig -+++ server/inotify-helper.h +--- a/server/inotify-helper.h ++++ b/server/inotify-helper.h @@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb, found_callback_t fcb); gboolean ih_running (void); diff --git a/srcpkgs/gamin/patches/disable-tests-for-cross-build.patch b/srcpkgs/gamin/patches/disable-tests-for-cross-build.patch index 91c8ae83611..f27ec08efab 100644 --- a/srcpkgs/gamin/patches/disable-tests-for-cross-build.patch +++ b/srcpkgs/gamin/patches/disable-tests-for-cross-build.patch @@ -1,6 +1,6 @@ Disable abstract socket namespace test since can't be achieved while cross-building. ---- configure.in.ORIG -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -388,47 +388,9 @@ #### Abstract sockets diff --git a/srcpkgs/gamin/patches/gamin-manape.patch b/srcpkgs/gamin/patches/gamin-manape.patch index 68e0f870533..012a027378a 100644 --- a/srcpkgs/gamin/patches/gamin-manape.patch +++ b/srcpkgs/gamin/patches/gamin-manape.patch @@ -2,8 +2,8 @@ Don't try to build with -DG_DISABLE_DEPRECATED - glib has moved on source: https://src.fedoraproject.org/cgit/rpms/gamin.git/plain/gamin-manape.patch ---- server/Makefile.am.manape 2008-11-12 15:45:28.000000000 -0500 -+++ server/Makefile.am 2011-07-20 21:06:37.465307638 -0400 +--- a/server/Makefile.am.manape 2008-11-12 15:45:28.000000000 -0500 ++++ b/server/Makefile.am 2011-07-20 21:06:37.465307638 -0400 @@ -6,8 +6,7 @@ INCLUDES = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/libgamin \ diff --git a/srcpkgs/gamin/patches/musl.patch b/srcpkgs/gamin/patches/musl.patch index 30d78387666..0f60f8c96e9 100644 --- a/srcpkgs/gamin/patches/musl.patch +++ b/srcpkgs/gamin/patches/musl.patch @@ -3,8 +3,8 @@ source: https://mail.gnome.org/archives/gamin-list/2016-April/msg00000.html The musl C library does not provide the non portable PTHREAD_MUTEX_RECURSIVE_NP. Test for PTHREAD_MUTEX_RECURSIVE_NP only. ---- libgamin/gam_data.c.orig -+++ libgamin/gam_data.c +--- a/libgamin/gam_data.c ++++ b/libgamin/gam_data.c @@ -470,7 +470,7 @@ gamin_data_new(void) } if (is_threaded > 0) { diff --git a/srcpkgs/gamin/template b/srcpkgs/gamin/template index bc4b244b575..3ed85f0bb6f 100644 --- a/srcpkgs/gamin/template +++ b/srcpkgs/gamin/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="http://www.gnome.org/~veillard/gamin/" distfiles="$GNOME_SITE/gamin/0.1/gamin-${version}.tar.bz2" checksum=a59948b20ce2f14136c013f155abb8c8d51db2ea167c063ff33461e453fec10a -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/gammu/patches/fix-musl.patch b/srcpkgs/gammu/patches/fix-musl.patch index 58ecfb7ae12..65c798fec30 100644 --- a/srcpkgs/gammu/patches/fix-musl.patch +++ b/srcpkgs/gammu/patches/fix-musl.patch @@ -1,7 +1,7 @@ diff --git a/libgammu/device/devfunc.c b/libgammu/device/devfunc.c index e751cd3..631afb5 100644 ---- libgammu/device/devfunc.c -+++ libgammu/device/devfunc.c +--- a/libgammu/device/devfunc.c ++++ b/libgammu/device/devfunc.c @@ -24,6 +24,7 @@ # include # include @@ -12,8 +12,8 @@ index e751cd3..631afb5 100644 #include "devfunc.h" diff --git a/libgammu/device/proxy/proxy.c b/libgammu/device/proxy/proxy.c index c68e00e..57f3c4d 100644 ---- libgammu/device/proxy/proxy.c -+++ libgammu/device/proxy/proxy.c +--- a/libgammu/device/proxy/proxy.c ++++ b/libgammu/device/proxy/proxy.c @@ -10,6 +10,7 @@ #include #include @@ -24,8 +24,8 @@ index c68e00e..57f3c4d 100644 #include "../../gsmcomon.h" diff --git a/libgammu/device/serial/ser_unx.c b/libgammu/device/serial/ser_unx.c index c0fbd57..5699238 100644 ---- libgammu/device/serial/ser_unx.c -+++ libgammu/device/serial/ser_unx.c +--- a/libgammu/device/serial/ser_unx.c ++++ b/libgammu/device/serial/ser_unx.c @@ -28,6 +28,7 @@ #include #include diff --git a/srcpkgs/gammu/template b/srcpkgs/gammu/template index 71ebeecdab9..bb5d54bcfe9 100644 --- a/srcpkgs/gammu/template +++ b/srcpkgs/gammu/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="https://wammu.eu" distfiles="https://dl.cihar.com/gammu/releases/gammu-${version}.tar.bz2" checksum=6197f8b4d35746d31567e61880121def676f225eba05276648410eaa6ce60c9f -patch_args=-Np0 gammu-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/gatling/patches/gatling.c.patch b/srcpkgs/gatling/patches/gatling.c.patch index ab2a0bb6c68..1f0e9e32dc0 100644 --- a/srcpkgs/gatling/patches/gatling.c.patch +++ b/srcpkgs/gatling/patches/gatling.c.patch @@ -1,6 +1,6 @@ # patch gatling.c to use capability headers from the kernel instead of libcap ---- gatling.c.orig 2021-04-04 21:51:17.641001871 +0000 -+++ gatling.c 2021-04-04 21:51:49.798095616 +0000 +--- a/gatling.c 2021-04-04 21:51:17.641001871 +0000 ++++ b/gatling.c 2021-04-04 21:51:49.798095616 +0000 @@ -62,7 +62,7 @@ #ifdef __linux__ diff --git a/srcpkgs/gatling/template b/srcpkgs/gatling/template index 15aefdfd53d..9993c3a0cd6 100644 --- a/srcpkgs/gatling/template +++ b/srcpkgs/gatling/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="http://www.fefe.de/gatling" distfiles="https://www.fefe.de/gatling/$pkgname-$version.tar.xz" checksum=5f96438ee201d7f1f6c2e0849ff273b196bdc7493f29a719ce8ed08c8be6365b -patch_args=-Np0 CFLAGS="-std=c99 -I${XBPS_CROSS_BASE}/usr/include/libowfat -fcommon" diff --git a/srcpkgs/gavl/patches/cross-test.patch b/srcpkgs/gavl/patches/cross-test.patch index 81a81a2f167..86eab310655 100644 --- a/srcpkgs/gavl/patches/cross-test.patch +++ b/srcpkgs/gavl/patches/cross-test.patch @@ -1,7 +1,7 @@ diff --git configure configure index d3702c3..79a958b 100755 ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -11188,7 +11188,7 @@ LIBS=$RT_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLOCK_MONOTONIC" >&5 $as_echo_n "checking for CLOCK_MONOTONIC... " >&6; } diff --git a/srcpkgs/gavl/patches/musl-sched_h.patch b/srcpkgs/gavl/patches/musl-sched_h.patch index 9584e38bae0..c27989c98e5 100644 --- a/srcpkgs/gavl/patches/musl-sched_h.patch +++ b/srcpkgs/gavl/patches/musl-sched_h.patch @@ -1,5 +1,5 @@ ---- src/benchmark.c 2012-06-08 13:49:30.000000000 +0200 -+++ src/benchmark.c 2015-10-03 13:23:43.279324001 +0200 +--- a/src/benchmark.c 2012-06-08 13:49:30.000000000 +0200 ++++ b/src/benchmark.c 2015-10-03 13:23:43.279324001 +0200 @@ -21,6 +21,8 @@ diff --git a/srcpkgs/gavl/template b/srcpkgs/gavl/template index 8abcc051e74..0f5f50d9356 100644 --- a/srcpkgs/gavl/template +++ b/srcpkgs/gavl/template @@ -11,7 +11,6 @@ homepage="http://gmerlin.sourceforge.net/gavl.html" distfiles="${SOURCEFORGE_SITE}/gmerlin/gavl/${version}/gavl-${version}.tar.gz" checksum=51aaac41391a915bd9bad07710957424b046410a276e7deaff24a870929d33ce CFLAGS="-lm" -patch_args=-Np0 gavl-devel_package() { depends="gavl>=${version}_${revision}" diff --git a/srcpkgs/gbdfed/patches/Makefile.in.patch b/srcpkgs/gbdfed/patches/Makefile.in.patch index ca73a9f64bb..881f9b17696 100644 --- a/srcpkgs/gbdfed/patches/Makefile.in.patch +++ b/srcpkgs/gbdfed/patches/Makefile.in.patch @@ -1,5 +1,5 @@ ---- Makefile.in- 2010-04-16 16:38:59.000000000 +0200 -+++ Makefile.in 2014-07-06 19:01:18.669249288 +0200 +--- a/Makefile.in- 2010-04-16 16:38:59.000000000 +0200 ++++ b/Makefile.in 2014-07-06 19:01:18.669249288 +0200 @@ -27,9 +27,9 @@ CC = @CC@ CFLAGS = @XX_CFLAGS@ @CFLAGS@ diff --git a/srcpkgs/gbdfed/patches/num_signals.patch b/srcpkgs/gbdfed/patches/num_signals.patch index dab27f330fd..0ef4032a588 100644 --- a/srcpkgs/gbdfed/patches/num_signals.patch +++ b/srcpkgs/gbdfed/patches/num_signals.patch @@ -1,5 +1,5 @@ ---- glyphedit.c 2010-04-16 16:39:04.000000000 +0200 -+++ glyphedit.c 2011-11-23 21:30:25.479413052 +0100 +--- a/glyphedit.c 2010-04-16 16:39:04.000000000 +0200 ++++ b/glyphedit.c 2011-11-23 21:30:25.479413052 +0100 @@ -104,7 +104,8 @@ GLYPH_MODIFIED = 0, POINTER_MOVED, diff --git a/srcpkgs/gbdfed/template b/srcpkgs/gbdfed/template index 55de7fabe98..788a9abab08 100644 --- a/srcpkgs/gbdfed/template +++ b/srcpkgs/gbdfed/template @@ -12,7 +12,6 @@ license="BSD-2-Clause, MIT" homepage="http://sofia.nmsu.edu/~mleisher/Software/gbdfed/" distfiles="https://src.fedoraproject.org/repo/pkgs/gbdfed/gbdfed-${version}.tar.bz2/2a2e1cbfe8566db6d302f0b9ab79b8dd/gbdfed-${version}.tar.bz2" checksum=5db25d4ce688dcb188dee056e58614a94a5e4fce4b6066fbb310951ab999093c -patch_args=-Np0 post_install() { sed '/^$/q' LICENSE diff --git a/srcpkgs/gcal/patches/fseeko.patch b/srcpkgs/gcal/patches/fseeko.patch index c75e65eaa1f..5d2b76a6355 100644 --- a/srcpkgs/gcal/patches/fseeko.patch +++ b/srcpkgs/gcal/patches/fseeko.patch @@ -1,7 +1,7 @@ diff --git lib/fseeko.c lib/fseeko.c index 5ae106f..d47481d 100644 ---- lib/fseeko.c -+++ lib/fseeko.c +--- a/lib/fseeko.c ++++ b/lib/fseeko.c @@ -1,9 +1,9 @@ /* An fseeko() function that, together with fflush(), is POSIX compliant. - Copyright (C) 2007-2017 Free Software Foundation, Inc. diff --git a/srcpkgs/gcal/template b/srcpkgs/gcal/template index 7107cee8ef5..3c535d1c099 100644 --- a/srcpkgs/gcal/template +++ b/srcpkgs/gcal/template @@ -11,4 +11,3 @@ license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/gcal/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" checksum=91b56c40b93eee9bda27ec63e95a6316d848e3ee047b5880ed71e5e8e60f61ab -patch_args=-Np0 diff --git a/srcpkgs/gcc-multilib/patches/fix-inline_vfprintf.patch b/srcpkgs/gcc-multilib/patches/fix-inline_vfprintf.patch index 029584cf90a..db4edd898e1 100644 --- a/srcpkgs/gcc-multilib/patches/fix-inline_vfprintf.patch +++ b/srcpkgs/gcc-multilib/patches/fix-inline_vfprintf.patch @@ -5,8 +5,8 @@ not guarantee inlined code for _FORTIFY_SOURCE=2. Here we just don't include and declare the required types and functions locally. ---- libitm/util.cc 2015-09-02 17:19:01.176016940 +0200 -+++ libitm/util.cc 2015-09-02 17:20:03.045016757 +0200 +--- a/libitm/util.cc 2015-09-02 17:19:01.176016940 +0200 ++++ b/libitm/util.cc 2015-09-02 17:20:03.045016757 +0200 @@ -24,10 +24,15 @@ #include "libitm_i.h" diff --git a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch index 54259bc2bb5..f43dd62f15d 100644 --- a/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch +++ b/srcpkgs/gcc-multilib/patches/fix-libiberty_pic.patch @@ -1,5 +1,5 @@ ---- libiberty/Makefile.in 2020-12-03 20:45:14.000000000 +0100 -+++ libiberty/Makefile.in 2021-01-23 18:39:45.891324445 +0100 +--- a/libiberty/Makefile.in 2020-12-03 20:45:14.000000000 +0100 ++++ b/libiberty/Makefile.in 2021-01-23 18:39:45.891324445 +0100 @@ -111,7 +111,7 @@ INCDIR=$(srcdir)/$(MULTISRCTOP)../include diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template index ade2f5007df..07ceeccc93d 100644 --- a/srcpkgs/gcc-multilib/template +++ b/srcpkgs/gcc-multilib/template @@ -2,7 +2,6 @@ archs="x86_64" _triplet="x86_64-unknown-linux-gnu" _majorver=10.2 -patch_args=-Np0 pkgname=gcc-multilib version=${_majorver}.1pre1 diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index 4de5faa93f5..ba708493485 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -8,7 +8,6 @@ _gmp_version=6.2.0 _mpfr_version=4.1.0 _mpc_version=1.1.0 _isl_version=0.21 -patch_args=-Np0 pkgname=gcc # we are using a 10-stable git snapshot alpine is using in order diff --git a/srcpkgs/gcolor2/patches/gcolor2-0.4-amd64.patch b/srcpkgs/gcolor2/patches/gcolor2-0.4-amd64.patch index 7c967c4584b..f9fd8dcceb7 100644 --- a/srcpkgs/gcolor2/patches/gcolor2-0.4-amd64.patch +++ b/srcpkgs/gcolor2/patches/gcolor2-0.4-amd64.patch @@ -1,5 +1,5 @@ ---- src/callbacks.c 2005-07-12 14:06:12.000000000 -0400 -+++ src/callbacks.c 2007-02-17 19:19:38.000000000 -0500 +--- a/src/callbacks.c 2005-07-12 14:06:12.000000000 -0400 ++++ b/src/callbacks.c 2007-02-17 19:19:38.000000000 -0500 @@ -4,6 +4,9 @@ #include @@ -29,8 +29,8 @@ void add_color_to_treeview () { GtkTreeView *treeview; ---- src/main.c 2005-07-11 10:55:49.000000000 -0400 -+++ src/main.c 2007-02-17 19:18:23.000000000 -0500 +--- a/src/main.c 2005-07-11 10:55:49.000000000 -0400 ++++ b/src/main.c 2007-02-17 19:18:23.000000000 -0500 @@ -4,6 +4,10 @@ #include diff --git a/srcpkgs/gcolor2/template b/srcpkgs/gcolor2/template index 7a3eaeb093a..4aec89567aa 100644 --- a/srcpkgs/gcolor2/template +++ b/srcpkgs/gcolor2/template @@ -11,7 +11,6 @@ license="GPL-2.0-only" homepage="http://gcolor2.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=89bd6c6d27ba5a679ec60057de8497855072f520515b490e5986fc3509774f23 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/gdm/patches/take-out-the-trash.patch b/srcpkgs/gdm/patches/take-out-the-trash.patch index 6927c7277b1..03e7e6a3dec 100644 --- a/srcpkgs/gdm/patches/take-out-the-trash.patch +++ b/srcpkgs/gdm/patches/take-out-the-trash.patch @@ -1,5 +1,5 @@ ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -94,19 +94,8 @@ if xdmcp_dep.found() and get_option('tcp-wrappers') libwrap_dep = cc.find_library('libwrap') endif diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 371445e58e2..c76e13c2de1 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -24,7 +24,6 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/GDM" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=5ed74b739d3a232ffb1e4a132bcf965bdfe955d995b528773588775b02f2950e -patch_args=-Np0 conf_files=" /etc/gdm/custom.conf diff --git a/srcpkgs/gdmap/patches/gtk-fix.patch b/srcpkgs/gdmap/patches/gtk-fix.patch index 65b4c7f2df8..614f8f03141 100644 --- a/srcpkgs/gdmap/patches/gtk-fix.patch +++ b/srcpkgs/gdmap/patches/gtk-fix.patch @@ -1,5 +1,5 @@ ---- src/gui_support.c 2008/05/23 14:54:28 1.2 -+++ src/gui_support.c 2012/01/06 13:51:36 1.3 +--- a/src/gui_support.c 2008/05/23 14:54:28 1.2 ++++ b/src/gui_support.c 2012/01/06 13:51:36 1.3 @@ -85,7 +85,11 @@ const char* text; diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template index 7b321c76487..47b0105feb3 100644 --- a/srcpkgs/gdmap/template +++ b/srcpkgs/gdmap/template @@ -12,7 +12,6 @@ license="GPL-2.0-only" homepage="http://gdmap.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b -patch_args=-Np0 post_patch() { vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure diff --git a/srcpkgs/geary/patches/libucontext.patch b/srcpkgs/geary/patches/libucontext.patch index 9e375550367..fccf8dca8bc 100644 --- a/srcpkgs/geary/patches/libucontext.patch +++ b/srcpkgs/geary/patches/libucontext.patch @@ -1,8 +1,8 @@ For whatever reason they don't use pkg-config for this. We will substitute this as needed from the template. ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -138,7 +138,8 @@ if libunwind_dep.found() dependencies: [ valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]), diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template index 17c2c0af317..a74b1ff16cd 100644 --- a/srcpkgs/geary/template +++ b/srcpkgs/geary/template @@ -20,7 +20,6 @@ homepage="https://wiki.gnome.org/Apps/Geary" _series=${version%.${version#*.*.}} distfiles="${GNOME_SITE}/${pkgname}/${_series}/geary-${version}.tar.xz" checksum=e72e212798536657d5100e1e1a4a67f3836d6f0235340aae53e576f2a774e812 -patch_args=-Np0 post_patch() { case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/geda/patches/snarf_cpp_opts.patch b/srcpkgs/geda/patches/snarf_cpp_opts.patch index 733caa319a6..e9eeb495887 100644 --- a/srcpkgs/geda/patches/snarf_cpp_opts.patch +++ b/srcpkgs/geda/patches/snarf_cpp_opts.patch @@ -1,5 +1,5 @@ ---- gschem/src/Makefile.am 2020-12-12 16:20:18.000000000 +0100 -+++ gschem/src/Makefile.am 2020-12-20 12:55:06.921054480 +0100 +--- a/gschem/src/Makefile.am 2020-12-12 16:20:18.000000000 +0100 ++++ b/gschem/src/Makefile.am 2020-12-20 12:55:06.921054480 +0100 @@ -152,12 +152,12 @@ $(AM_V_SNARF)CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts) diff --git a/srcpkgs/geda/template b/srcpkgs/geda/template index 32afaf0681b..6626bc91fd9 100644 --- a/srcpkgs/geda/template +++ b/srcpkgs/geda/template @@ -18,7 +18,6 @@ distfiles="http://ftp.geda-project.org/geda-gaf/stable/v${version%.*}/${version} checksum=e862ab241528538fa3bee2739261f568011102b60c5e39a2f0358663c042c8a4 python_version=2 replaces="geda-data>=0" -patch_args=-Np0 CFLAGS="-Wno-deprecated-declarations -fcommon -Wno-unused-function" diff --git a/srcpkgs/geis/patches/fix-gcc6-indentation.patch b/srcpkgs/geis/patches/fix-gcc6-indentation.patch index 5c191984e1e..fd1a7c20fe6 100644 --- a/srcpkgs/geis/patches/fix-gcc6-indentation.patch +++ b/srcpkgs/geis/patches/fix-gcc6-indentation.patch @@ -1,5 +1,5 @@ ---- libgeis/geis_subscription.c 2013-05-29 13:24:59.000000000 +0200 -+++ libgeis/geis_subscription.c 2016-10-04 10:50:16.159001608 +0200 +--- a/libgeis/geis_subscription.c 2013-05-29 13:24:59.000000000 +0200 ++++ b/libgeis/geis_subscription.c 2016-10-04 10:50:16.159001608 +0200 @@ -239,7 +239,7 @@ { if (bag->sub_store[i]) diff --git a/srcpkgs/geis/patches/gcc-7.patch b/srcpkgs/geis/patches/gcc-7.patch index f206f79dc9b..6a58bf87fb2 100644 --- a/srcpkgs/geis/patches/gcc-7.patch +++ b/srcpkgs/geis/patches/gcc-7.patch @@ -16,8 +16,8 @@ Bug-Debian: https://bugs.debian.org/853415 --- ---- libgeis/geis_v1.c -+++ libgeis/geis_v1.c +--- a/libgeis/geis_v1.c ++++ b/libgeis/geis_v1.c @@ -610,7 +610,7 @@ _v1_subscribe_device(GeisInstance instan const char **gesture_list) { diff --git a/srcpkgs/geis/template b/srcpkgs/geis/template index 3f3b40e5231..ddad320d93a 100644 --- a/srcpkgs/geis/template +++ b/srcpkgs/geis/template @@ -12,7 +12,6 @@ license="GPL-3.0-only" homepage="https://launchpad.net/geis" distfiles="https://launchpad.net/geis/trunk/$version/+download/geis-$version.tar.xz" checksum=8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb -patch_args=-Np0 if [ -n "$CROSS_BUILD" ]; then configure_args+=" --enable-integration-tests=no" diff --git a/srcpkgs/geos/patches/geos-arm.patch b/srcpkgs/geos/patches/geos-arm.patch index 5b6a7c6c7da..c4c0e6cec02 100644 --- a/srcpkgs/geos/patches/geos-arm.patch +++ b/srcpkgs/geos/patches/geos-arm.patch @@ -1,7 +1,7 @@ see http://trac.osgeo.org/geos/ticket/222 ---- src/inlines.cpp 2020-12-09 18:17:36.000000000 +0100 -+++ src/inlines.cpp 2021-02-02 09:57:11.270098998 +0100 +--- a/src/inlines.cpp 2020-12-09 18:17:36.000000000 +0100 ++++ b/src/inlines.cpp 2021-02-02 09:57:11.270098998 +0100 @@ -62,7 +62,9 @@ #include #include diff --git a/srcpkgs/geos/template b/srcpkgs/geos/template index bd7f56da854..efc698ab3dc 100644 --- a/srcpkgs/geos/template +++ b/srcpkgs/geos/template @@ -9,7 +9,6 @@ license="LGPL-2.1-or-later" homepage="https://trac.osgeo.org/geos" distfiles="https://download.osgeo.org/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a -patch_args=-Np0 geos-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}" diff --git a/srcpkgs/gfm/patches/no-kde.patch b/srcpkgs/gfm/patches/no-kde.patch index 146bdac8ed1..3a53028bbc8 100644 --- a/srcpkgs/gfm/patches/no-kde.patch +++ b/srcpkgs/gfm/patches/no-kde.patch @@ -1,5 +1,5 @@ ---- src/Makefile.am.orig -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -8,18 +8,18 @@ # build instructions gfm_CPPFLAGS = @TIFILES_CFLAGS@ @TICONV_CFLAGS@ @TICALCS_CFLAGS@ \ @@ -22,8 +22,8 @@ # automake wants all .c files listed explicitly. This sucks. qmake does the # right thing with just "*.c". ---- configure.ac.orig -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -90,22 +90,23 @@ AC_CHECK_FUNCS([getcwd memset mkdir strcasecmp strchr strdup strrchr strstr]) diff --git a/srcpkgs/gfm/template b/srcpkgs/gfm/template index 950339e880e..a2166105374 100644 --- a/srcpkgs/gfm/template +++ b/srcpkgs/gfm/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later" homepage="https://www.ticalc.org" distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${_tilpver}/${pkgname}-${version}.tar.bz2" checksum=09031ac0abf686b6a8bc9935f331ef460415783a1057f11b0af993526b52017f -patch_args=-Np0 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" gettext-devel" diff --git a/srcpkgs/gftp/patches/cross.patch b/srcpkgs/gftp/patches/cross.patch index cc74e2a6f72..795216c43f2 100644 --- a/srcpkgs/gftp/patches/cross.patch +++ b/srcpkgs/gftp/patches/cross.patch @@ -1,5 +1,5 @@ ---- configure.orig -+++ configure +--- a/configure ++++ b/configure @@ -5967,77 +5967,9 @@ ;; esac diff --git a/srcpkgs/gftp/patches/ftbfs.patch b/srcpkgs/gftp/patches/ftbfs.patch index f362063c48a..79b39c5a9dc 100644 --- a/srcpkgs/gftp/patches/ftbfs.patch +++ b/srcpkgs/gftp/patches/ftbfs.patch @@ -1,8 +1,8 @@ We need sysmacros.h for major/minor. Also, stropts.h has been removed from glibc in the 2.30 version and is actually not used. ---- lib/gftp.h -+++ lib/gftp.h +--- a/lib/gftp.h ++++ b/lib/gftp.h @@ -48,6 +48,7 @@ #endif #include @@ -11,8 +11,8 @@ removed from glibc in the 2.30 version and is actually not used. #include #include #include ---- lib/pty.c -+++ lib/pty.c +--- a/lib/pty.c ++++ b/lib/pty.c @@ -61,10 +61,6 @@ _gftp_ptys_open (int fdm, int fds, char *pts_name) #elif HAVE_GRANTPT diff --git a/srcpkgs/gftp/patches/musl.patch b/srcpkgs/gftp/patches/musl.patch index 8b7384cec5c..171af36e78d 100644 --- a/srcpkgs/gftp/patches/musl.patch +++ b/srcpkgs/gftp/patches/musl.patch @@ -1,5 +1,5 @@ ---- lib/fsplib/fsplib.h.orig -+++ lib/fsplib/fsplib.h +--- a/lib/fsplib/fsplib.h ++++ b/lib/fsplib/fsplib.h @@ -3,6 +3,7 @@ #include #include diff --git a/srcpkgs/gftp/template b/srcpkgs/gftp/template index 30a3556d628..0820b29da2d 100644 --- a/srcpkgs/gftp/template +++ b/srcpkgs/gftp/template @@ -11,4 +11,3 @@ license="GPL-2.0-or-later" homepage="https://www.gftp.org" distfiles="https://sources.voidlinux.org/gftp-${version}/gftp-${version}.tar.bz2" checksum=5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd -patch_args=-Np0 diff --git a/srcpkgs/gfuzz/patches/helper-gofuzz.patch b/srcpkgs/gfuzz/patches/helper-gofuzz.patch index 83c8d775753..70f611c7bd1 100644 --- a/srcpkgs/gfuzz/patches/helper-gofuzz.patch +++ b/srcpkgs/gfuzz/patches/helper-gofuzz.patch @@ -1,5 +1,5 @@ ---- libgrequest/helper.go -+++ libgrequest/helper.go +--- a/libgrequest/helper.go ++++ b/libgrequest/helper.go @@ -123,9 +123,9 @@ // PrintHelp : cli help info diff --git a/srcpkgs/gfuzz/patches/main-gofuzz.patch b/srcpkgs/gfuzz/patches/main-gofuzz.patch index 0db31b1b0ab..ed56a3d2f7b 100644 --- a/srcpkgs/gfuzz/patches/main-gofuzz.patch +++ b/srcpkgs/gfuzz/patches/main-gofuzz.patch @@ -1,5 +1,5 @@ ---- main.go -+++ main.go +--- a/main.go ++++ b/main.go @@ -7,7 +7,7 @@ "strings" "time" diff --git a/srcpkgs/gfuzz/template b/srcpkgs/gfuzz/template index 31faee7c4a9..3925f06c950 100644 --- a/srcpkgs/gfuzz/template +++ b/srcpkgs/gfuzz/template @@ -12,4 +12,3 @@ license="Apache-2.0" homepage="https://github.com/braaaax/gfz" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=8b6a3df0c385fe993ead673df53daa290943220f2cde73e6b1c706ef94aa4e5f -patch_args=-Np0 diff --git a/srcpkgs/giac/patches/fgamma.patch b/srcpkgs/giac/patches/fgamma.patch index c291edfe64b..665803db13f 100644 --- a/srcpkgs/giac/patches/fgamma.patch +++ b/srcpkgs/giac/patches/fgamma.patch @@ -1,5 +1,5 @@ ---- src/first.h.orig 2017-09-22 20:44:12.000000000 +0200 -+++ src/first.h 2017-11-14 15:26:53.529711489 +0100 +--- a/src/first.h 2017-09-22 20:44:12.000000000 +0200 ++++ b/src/first.h 2017-11-14 15:26:53.529711489 +0100 @@ -503,7 +503,7 @@ #if defined(__MINGW_H) || defined(VISUALC) // FIXME gamma, not used inline float fgamma(float f1){ return f1; } diff --git a/srcpkgs/giac/patches/invmod.patch b/srcpkgs/giac/patches/invmod.patch index 6aab28d7253..1d87fff8ea0 100644 --- a/srcpkgs/giac/patches/invmod.patch +++ b/srcpkgs/giac/patches/invmod.patch @@ -1,5 +1,5 @@ ---- src/modpoly.cc.orig 2020-02-18 10:07:10.000000000 -0300 -+++ src/modpoly.cc 2021-03-08 02:18:09.443740199 -0300 +--- a/src/modpoly.cc 2020-02-18 10:07:10.000000000 -0300 ++++ b/src/modpoly.cc 2021-03-08 02:18:09.443740199 -0300 @@ -92,7 +92,10 @@ gen invenv(const gen & g,environment * env){ if (g.type==_USER) diff --git a/srcpkgs/giac/patches/malloc.patch b/srcpkgs/giac/patches/malloc.patch index 3f2b05b37d0..fed46d63d73 100644 --- a/srcpkgs/giac/patches/malloc.patch +++ b/srcpkgs/giac/patches/malloc.patch @@ -1,5 +1,5 @@ ---- src/History.cc.orig 2017-10-02 10:23:46.000000000 +0200 -+++ src/History.cc 2017-11-14 15:42:12.119849965 +0100 +--- a/src/History.cc 2017-10-02 10:23:46.000000000 +0200 ++++ b/src/History.cc 2017-11-14 15:42:12.119849965 +0100 @@ -3828,7 +3828,7 @@ // mode_s += "Time: "; // double t=double(clock()); diff --git a/srcpkgs/giac/patches/pari_2_11.patch b/srcpkgs/giac/patches/pari_2_11.patch index 7bd12dd1ce7..24142257a34 100644 --- a/srcpkgs/giac/patches/pari_2_11.patch +++ b/srcpkgs/giac/patches/pari_2_11.patch @@ -4,8 +4,8 @@ See https://trac.sagemath.org/ticket/25567 and https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102 diff -ru a/check/TP11-sol.cas.out1 b/check/TP11-sol.cas.out1 ---- check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200 -+++ check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200 +--- a/check/TP11-sol.cas.out1 2014-10-21 10:51:48.000000000 +0200 ++++ b/check/TP11-sol.cas.out1 2018-08-07 17:04:12.528052773 +0200 @@ -10,7 +10,7 @@ 1073741824000000000000000000061203284109000000000000000000000000008409, 2^3*3*389*733*156904374622257604823879982847602392900751802349981470895277241, diff --git a/srcpkgs/giac/template b/srcpkgs/giac/template index 1e87c15d2b3..ca95534498f 100644 --- a/srcpkgs/giac/template +++ b/srcpkgs/giac/template @@ -13,7 +13,6 @@ license="GPL-3.0-or-later" homepage="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html" distfiles="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version%.*}-${version##*.}.tar.gz" checksum=bbd6f0aafe373de3c9ed53d21878224e847359fdd9a7cdf9e9096e7c960f10b4 -patch_args=-Np0 # need more than 4*65536 stack, see try_parse() in gen.cc line 11812 LDFLAGS="-Wl,-z,stack-size=2097152" diff --git a/srcpkgs/giflib/patches/restore-deprecated-utility-functions.patch b/srcpkgs/giflib/patches/restore-deprecated-utility-functions.patch index d2b349f68a2..ee05915a53a 100644 --- a/srcpkgs/giflib/patches/restore-deprecated-utility-functions.patch +++ b/srcpkgs/giflib/patches/restore-deprecated-utility-functions.patch @@ -1,8 +1,8 @@ Source: Gentoo, written by Gary Stein Upstream: No Reason: restores deprecated GifQuantizeBuffer which some packages (notably libgdiplus) still use ---- Makefile 2019-03-28 14:57:23.000000000 -0400 -+++ Makefile 2019-03-31 23:38:20.700603561 -0400 +--- a/Makefile 2019-03-28 14:57:23.000000000 -0400 ++++ b/Makefile 2019-03-31 23:38:20.700603561 -0400 @@ -67,8 +67,8 @@ $(UTILS):: libgif.a libutil.a diff --git a/srcpkgs/giflib/template b/srcpkgs/giflib/template index 9f3d399c6a5..4f01f28e079 100644 --- a/srcpkgs/giflib/template +++ b/srcpkgs/giflib/template @@ -10,7 +10,6 @@ license="MIT" homepage="https://sourceforge.net/projects/giflib/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd -patch_args=-Np0 CFLAGS="-fPIC" diff --git a/srcpkgs/giggle/patches/0001-Fix-628184-Giggle-does-not-display-diff-for-files-th.patch b/srcpkgs/giggle/patches/0001-Fix-628184-Giggle-does-not-display-diff-for-files-th.patch index 9fe8e967c5b..eb486bdc6e5 100644 --- a/srcpkgs/giggle/patches/0001-Fix-628184-Giggle-does-not-display-diff-for-files-th.patch +++ b/srcpkgs/giggle/patches/0001-Fix-628184-Giggle-does-not-display-diff-for-files-th.patch @@ -15,8 +15,8 @@ Signed-off-by: Guilhem Bonnefille diff --git src/giggle-diff-view.c src/giggle-diff-view.c index ff6bbe3..2fbb8eb 100644 ---- src/giggle-diff-view.c -+++ src/giggle-diff-view.c +--- a/src/giggle-diff-view.c ++++ b/src/giggle-diff-view.c @@ -665,6 +665,11 @@ diff_view_parse_patch (GiggleDiffView *view) } } else if (g_str_has_prefix (line, "--- a/") || g_str_has_prefix (line, "+++ b/")) { diff --git a/srcpkgs/giggle/patches/0002-include-gtksource.h-instead-of-gtksourceview.h.patch b/srcpkgs/giggle/patches/0002-include-gtksource.h-instead-of-gtksourceview.h.patch index ddce15f4897..7a21610eae7 100644 --- a/srcpkgs/giggle/patches/0002-include-gtksource.h-instead-of-gtksourceview.h.patch +++ b/srcpkgs/giggle/patches/0002-include-gtksource.h-instead-of-gtksourceview.h.patch @@ -14,8 +14,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=697220 diff --git configure.ac configure.ac index a7011f8..3e47b48 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -54,7 +54,7 @@ dnl ------------------ GLIB_REQUIRED_VERSION=2.30 GDK_PIXBUF_REQUIRED_VERSION=2.22 @@ -27,8 +27,8 @@ index a7011f8..3e47b48 100644 diff --git src/giggle-diff-view.h src/giggle-diff-view.h index 74fb983..28266e3 100644 ---- src/giggle-diff-view.h -+++ src/giggle-diff-view.h +--- a/src/giggle-diff-view.h ++++ b/src/giggle-diff-view.h @@ -21,8 +21,7 @@ #include @@ -41,8 +41,8 @@ index 74fb983..28266e3 100644 diff --git src/giggle-view-file.c src/giggle-view-file.c index 130af4a..94c6c76 100644 ---- src/giggle-view-file.c -+++ src/giggle-view-file.c +--- a/src/giggle-view-file.c ++++ b/src/giggle-view-file.c @@ -38,8 +38,7 @@ #include #include diff --git a/srcpkgs/giggle/patches/0004-Port-to-vte-2.91-API.patch b/srcpkgs/giggle/patches/0004-Port-to-vte-2.91-API.patch index a278397c044..90f8e38cc42 100644 --- a/srcpkgs/giggle/patches/0004-Port-to-vte-2.91-API.patch +++ b/srcpkgs/giggle/patches/0004-Port-to-vte-2.91-API.patch @@ -11,8 +11,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=743537 diff --git configure.ac configure.ac index 6e27733..72e7bd1 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -106,7 +106,7 @@ AC_ARG_ENABLE([terminal], AS_IF([test "x$enable_terminal" = "xyes"], [ @@ -24,8 +24,8 @@ index 6e27733..72e7bd1 100644 [Use features from vte]) diff --git plugins/giggle-view-terminal.c plugins/giggle-view-terminal.c index 06a9a50..cd107f2 100644 ---- plugins/giggle-view-terminal.c -+++ plugins/giggle-view-terminal.c +--- a/plugins/giggle-view-terminal.c ++++ b/plugins/giggle-view-terminal.c @@ -186,15 +186,16 @@ giggle_view_terminal_append_tab (GiggleViewTerminal *view, real_argv[1] = NULL; spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO; diff --git a/srcpkgs/giggle/patches/0005-Fixed-bug-of-GUI-not-remembering-settings.patch b/srcpkgs/giggle/patches/0005-Fixed-bug-of-GUI-not-remembering-settings.patch index 1f83d51b710..37506027e85 100644 --- a/srcpkgs/giggle/patches/0005-Fixed-bug-of-GUI-not-remembering-settings.patch +++ b/srcpkgs/giggle/patches/0005-Fixed-bug-of-GUI-not-remembering-settings.patch @@ -12,8 +12,8 @@ This patch replaces "git repo-config" with "git config". diff --git libgiggle-git/giggle-git-config-read.c libgiggle-git/giggle-git-config-read.c index 7b4fdb9..7f24e1d 100644 ---- libgiggle-git/giggle-git-config-read.c -+++ libgiggle-git/giggle-git-config-read.c +--- a/libgiggle-git/giggle-git-config-read.c ++++ b/libgiggle-git/giggle-git-config-read.c @@ -120,7 +120,7 @@ static gboolean git_config_read_get_command_line (GiggleJob *job, gchar **command_line) @@ -25,8 +25,8 @@ index 7b4fdb9..7f24e1d 100644 diff --git libgiggle-git/giggle-git-config-write.c libgiggle-git/giggle-git-config-write.c index e026e4f..7fd2b07 100644 ---- libgiggle-git/giggle-git-config-write.c -+++ libgiggle-git/giggle-git-config-write.c +--- a/libgiggle-git/giggle-git-config-write.c ++++ b/libgiggle-git/giggle-git-config-write.c @@ -184,13 +184,13 @@ git_config_write_get_command_line (GiggleJob *job, if (priv->value) { value = g_shell_quote (priv->value); diff --git a/srcpkgs/giggle/patches/cross.patch b/srcpkgs/giggle/patches/cross.patch index c985b4acdf2..ea8af6e84c0 100644 --- a/srcpkgs/giggle/patches/cross.patch +++ b/srcpkgs/giggle/patches/cross.patch @@ -1,7 +1,7 @@ diff --git configure.ac configure.ac index a7011f8..1ab7a52 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -125,30 +125,6 @@ dnl ---------------------- AC_DEFINE(_GNU_SOURCE, 1, [Enable GNU Extensions]) @@ -34,8 +34,8 @@ index a7011f8..1ab7a52 100644 dnl | Language Support |--------------------------------------- dnl ------------------ diff --git libgiggle-git/giggle-git-revisions.c libgiggle-git/giggle-git-revisions.c ---- libgiggle-git/giggle-git-revisions.c -+++ libgiggle-git/giggle-git-revisions.c +--- a/libgiggle-git/giggle-git-revisions.c ++++ b/libgiggle-git/giggle-git-revisions.c @@ -130,7 +130,7 @@ git_revisions_get_command_line (GiggleJob *job, static struct tm * git_revisions_get_time (const gchar *date) diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template index 91eee3d7d91..8240dd9afcd 100644 --- a/srcpkgs/giggle/template +++ b/srcpkgs/giggle/template @@ -14,7 +14,6 @@ homepage="https://wiki.gnome.org/Apps/giggle" distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" checksum=ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59 lib32disabled=yes -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/gimp/patches/fix-cross.patch b/srcpkgs/gimp/patches/fix-cross.patch index f34a5484036..0ffcf9b650b 100644 --- a/srcpkgs/gimp/patches/fix-cross.patch +++ b/srcpkgs/gimp/patches/fix-cross.patch @@ -1,5 +1,5 @@ ---- plug-ins/script-fu/Makefile.am.orig 2018-05-18 00:03:53.095184079 +0200 -+++ plug-ins/script-fu/Makefile.am 2018-05-18 00:04:50.184762769 +0200 +--- a/plug-ins/script-fu/Makefile.am 2018-05-18 00:03:53.095184079 +0200 ++++ b/plug-ins/script-fu/Makefile.am 2018-05-18 00:04:50.184762769 +0200 @@ -14,6 +14,7 @@ else libm = -lm endif diff --git a/srcpkgs/gimp/patches/fix-segfault.patch b/srcpkgs/gimp/patches/fix-segfault.patch index a1954de2103..5f1a6a6d3fe 100644 --- a/srcpkgs/gimp/patches/fix-segfault.patch +++ b/srcpkgs/gimp/patches/fix-segfault.patch @@ -1,7 +1,7 @@ diff --git app/dialogs/dialogs.c app/dialogs/dialogs.c index 064f2c4..b17d82f 100644 ---- app/dialogs/dialogs.c -+++ app/dialogs/dialogs.c +--- a/app/dialogs/dialogs.c ++++ b/app/dialogs/dialogs.c @@ -534,11 +534,15 @@ dialogs_init (Gimp *gimp, menu_factory); gimp_dialog_factory_set_singleton (factory); @@ -31,8 +31,8 @@ index 064f2c4..b17d82f 100644 } diff --git app/widgets/gimpactiongroup.c app/widgets/gimpactiongroup.c index 04bd1b6..12eff51 100644 ---- app/widgets/gimpactiongroup.c -+++ app/widgets/gimpactiongroup.c +--- a/app/widgets/gimpactiongroup.c ++++ b/app/widgets/gimpactiongroup.c @@ -393,7 +393,7 @@ gimp_action_group_add_actions (GimpActionGroup *group, for (i = 0; i < n_entries; i++) { diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index 45a894853d3..999c9a6f46f 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -23,7 +23,6 @@ checksum=bd1bb762368c0dd3175cf05006812dd676949c3707e21f4e6857435cb435989e python_version=2 lib32disabled=yes no_generic_pkgconfig_link=yes -patch_args=-Np0 pre_configure() { NOCONFIGURE=1 autoreconf -fi diff --git a/srcpkgs/git-annex/patches/ghc8.8.3.patch b/srcpkgs/git-annex/patches/ghc8.8.3.patch index 9422ed3e0de..27a1739c111 100644 --- a/srcpkgs/git-annex/patches/ghc8.8.3.patch +++ b/srcpkgs/git-annex/patches/ghc8.8.3.patch @@ -1,5 +1,5 @@ ---- git-annex.cabal 2020-04-01 21:09:23.653315424 +0200 -+++ git-annex.cabal 2020-04-01 20:50:23.080838029 +0200 +--- a/git-annex.cabal 2020-04-01 21:09:23.653315424 +0200 ++++ b/git-annex.cabal 2020-04-01 20:50:23.080838029 +0200 @@ -304,6 +304,7 @@ Build-Depends: base (>= 4.11.1.0 && < 5.0), diff --git a/srcpkgs/git-annex/template b/srcpkgs/git-annex/template index 25f8338e683..cdcd6bb0f83 100644 --- a/srcpkgs/git-annex/template +++ b/srcpkgs/git-annex/template @@ -15,7 +15,6 @@ distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}- checksum=17109144b2aadfab79fa0e193df3e0c02fd80f738a5ed6eccb0d11692bedb01d nopie_files="/usr/bin/git-annex" nocross=yes -patch_args=-Np0 # These install steps are pulled from the install target in the # git-annex Makefile. The target can't be called directly because it is diff --git a/srcpkgs/git-mediate/patches/ghc8.8.3.patch b/srcpkgs/git-mediate/patches/ghc8.8.3.patch index 7928b61ef3a..5920ea01474 100644 --- a/srcpkgs/git-mediate/patches/ghc8.8.3.patch +++ b/srcpkgs/git-mediate/patches/ghc8.8.3.patch @@ -1,5 +1,5 @@ ---- git-mediate.cabal 2001-09-09 03:46:40.000000000 +0200 -+++ git-mediate.cabal 2020-03-30 15:32:48.959537620 +0200 +--- a/git-mediate.cabal 2001-09-09 03:46:40.000000000 +0200 ++++ b/git-mediate.cabal 2020-03-30 15:32:48.959537620 +0200 @@ -72,7 +72,7 @@ ghc-options: -O2 -Wall -- other-extensions: diff --git a/srcpkgs/git-mediate/template b/srcpkgs/git-mediate/template index 7923a1743d9..aa3979d3435 100644 --- a/srcpkgs/git-mediate/template +++ b/srcpkgs/git-mediate/template @@ -13,4 +13,3 @@ distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}- checksum=81220f7e20a3913bc147b69681666ad22e60e5b759a1becad78ee28dcad8013d nocross=yes nopie_files="/usr/bin/git-mediate" -patch_args=-Np0 diff --git a/srcpkgs/gitea/patches/config.patch b/srcpkgs/gitea/patches/config.patch index 0b8fae00393..77168cb3937 100644 --- a/srcpkgs/gitea/patches/config.patch +++ b/srcpkgs/gitea/patches/config.patch @@ -1,5 +1,5 @@ ---- custom/conf/app.example.ini 2021-04-22 15:48:34.959214467 +0300 -+++ custom/conf/app.example.ini 2021-04-22 15:48:25.414266118 +0300 +--- a/custom/conf/app.example.ini 2021-04-22 15:48:34.959214467 +0300 ++++ b/custom/conf/app.example.ini 2021-04-22 15:48:25.414266118 +0300 @@ -9,7 +9,7 @@ ; App name that shows in every page title APP_NAME = Gitea: Git with a cup of tea diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index eae2e61b681..f375d2dcfa1 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -33,7 +33,6 @@ homepage="https://gitea.io" changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md" distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz" checksum=d04bca934feba35600aaf739c82b7cbe7d8b911a086d7ac54f0710b689a85ac3 -patch_args=-Np0 system_accounts="_gitea" _gitea_homedir="/var/lib/gitea" diff --git a/srcpkgs/gitg/patches/vala.patch b/srcpkgs/gitg/patches/vala.patch index 15cefa49445..bd0f51eb239 100644 --- a/srcpkgs/gitg/patches/vala.patch +++ b/srcpkgs/gitg/patches/vala.patch @@ -1,5 +1,5 @@ ---- libgitg/gitg-diff-view-file-selectable.vala 2019-07-25 13:13:01.000000000 +0200 -+++ libgitg/gitg-diff-view-file-selectable.vala 2020-09-06 14:36:26.374965220 +0200 +--- a/libgitg/gitg-diff-view-file-selectable.vala 2019-07-25 13:13:01.000000000 +0200 ++++ b/libgitg/gitg-diff-view-file-selectable.vala 2020-09-06 14:36:26.374965220 +0200 @@ -54,7 +54,7 @@ buffer.get_start_iter(out iter); diff --git a/srcpkgs/gitg/patches/vapi.patch b/srcpkgs/gitg/patches/vapi.patch index 5fb234b453d..d07b8c09967 100644 --- a/srcpkgs/gitg/patches/vapi.patch +++ b/srcpkgs/gitg/patches/vapi.patch @@ -21,7 +21,7 @@ Subject: [PATCH] vala: Remove obsolete vapi files diff --git a/vapi/gio-windows-2.0.vapi b/vapi/gio-windows-2.0.vapi deleted file mode 100644 index 39c9da28..00000000 ---- vapi/gio-windows-2.0.vapi +--- a/vapi/gio-windows-2.0.vapi +++ /dev/null @@ -1,21 +0,0 @@ -[CCode (cprefix = "G", lower_case_cprefix = "g_")] @@ -48,7 +48,7 @@ index 39c9da28..00000000 diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi deleted file mode 100644 index 37de9592..00000000 ---- vapi/glib-2.0.vapi +--- a/vapi/glib-2.0.vapi +++ /dev/null @@ -1,6173 +0,0 @@ -/* glib-2.0.vala @@ -6227,7 +6227,7 @@ index 37de9592..00000000 diff --git a/vapi/gtksourceview-3.0.deps b/vapi/gtksourceview-3.0.deps deleted file mode 100644 index 1306ac49..00000000 ---- vapi/gtksourceview-3.0.deps +--- a/vapi/gtksourceview-3.0.deps +++ /dev/null @@ -1,7 +0,0 @@ -atk @@ -6240,7 +6240,7 @@ index 1306ac49..00000000 diff --git a/vapi/gtksourceview-3.0.vapi b/vapi/gtksourceview-3.0.vapi deleted file mode 100644 index f1b8f66e..00000000 ---- vapi/gtksourceview-3.0.vapi +--- a/vapi/gtksourceview-3.0.vapi +++ /dev/null @@ -1,937 +0,0 @@ -/* gtksourceview-3.0.vapi generated by vapigen-0.28, do not modify. */ @@ -7183,14 +7183,14 @@ index f1b8f66e..00000000 diff --git a/vapi/libsoup-2.4.deps b/vapi/libsoup-2.4.deps deleted file mode 100644 index cd10dfde..00000000 ---- vapi/libsoup-2.4.deps +--- a/vapi/libsoup-2.4.deps +++ /dev/null @@ -1 +0,0 @@ -gio-2.0 diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi deleted file mode 100644 index bcbe7d00..00000000 ---- vapi/libsoup-2.4.vapi +--- a/vapi/libsoup-2.4.vapi +++ /dev/null @@ -1,1396 +0,0 @@ -/* libsoup-2.4.vapi generated by vapigen, do not modify. */ diff --git a/srcpkgs/gitg/template b/srcpkgs/gitg/template index 87376f22160..e309a6a1462 100644 --- a/srcpkgs/gitg/template +++ b/srcpkgs/gitg/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Gitg" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=24a4aabf8a42aa2e783e1fb5996ebb3c2a82a01b9689269f1329517ef124ef5a -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args+=" -Dexe_wrapper=qemu-${XBPS_TARGET_QEMU_MACHINE}-static" diff --git a/srcpkgs/gkrellm/patches/libressl.patch b/srcpkgs/gkrellm/patches/libressl.patch index f744c9e5a66..f37a2d00f9f 100644 --- a/srcpkgs/gkrellm/patches/libressl.patch +++ b/srcpkgs/gkrellm/patches/libressl.patch @@ -1,7 +1,7 @@ diff --git src/mail.c src/mail.c index 6615f31..205b56f 100644 ---- src/mail.c -+++ src/mail.c +--- a/src/mail.c ++++ b/src/mail.c -#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L) +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER < 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) static void diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template index 59a20ddb0b9..f2c1721ac5e 100644 --- a/srcpkgs/gkrellm/template +++ b/srcpkgs/gkrellm/template @@ -11,7 +11,6 @@ license="GPL-3.0.or-later" homepage="http://gkrellm.srcbox.net" distfiles="${homepage}/releases/gkrellm-${version}.tar.bz2" checksum=1ee0643ed9ed99f88c1504c89d9ccb20780cf29319c904b68e80a8e7c8678c06 -patch_args=-Np0 do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} STRIP= install diff --git a/srcpkgs/glances/patches/no-check-update.patch b/srcpkgs/glances/patches/no-check-update.patch index 513369afdb7..d7d3a149fc1 100644 --- a/srcpkgs/glances/patches/no-check-update.patch +++ b/srcpkgs/glances/patches/no-check-update.patch @@ -1,5 +1,5 @@ ---- glances/main.py -+++ glances/main.py +--- a/glances/main.py ++++ b/glances/main.py @@ -109,6 +109,7 @@ """Manage the command line arguments.""" # Read the command line arguments diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template index daf47f64f7a..29bc7790e11 100644 --- a/srcpkgs/glances/template +++ b/srcpkgs/glances/template @@ -12,7 +12,6 @@ license="LGPL-3.0-or-later" homepage="https://github.com/nicolargo/glances" distfiles="https://github.com/nicolargo/glances/archive/v${version}.tar.gz" checksum=5839a110af35af35b7a1d30c15e59c59359480c2eaec852d30480c96b8cf8d76 -patch_args=-Np0 post_install() { vsconf conf/glances.conf diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch index 2108faeeda4..9fd27bb105a 100644 --- a/srcpkgs/glib/patches/disable-broken-tests.patch +++ b/srcpkgs/glib/patches/disable-broken-tests.patch @@ -1,7 +1,7 @@ diff --git gio/tests/meson.build gio/tests/meson.build index a926ae01a..c2093cf4e 100644 ---- gio/tests/meson.build -+++ gio/tests/meson.build +--- a/gio/tests/meson.build ++++ b/gio/tests/meson.build @@ -50,7 +50,6 @@ gio_tests = { 'cancellable' : {}, 'contexts' : {}, @@ -29,8 +29,8 @@ index a926ae01a..c2093cf4e 100644 input : 'test4.gresource.xml', diff --git glib/tests/meson.build glib/tests/meson.build index c77ccdd14..b0dab692a 100644 ---- glib/tests/meson.build -+++ glib/tests/meson.build +--- a/glib/tests/meson.build ++++ b/glib/tests/meson.build @@ -11,21 +11,13 @@ glib_tests = { 'cache' : {}, 'charset' : {}, diff --git a/srcpkgs/glib/patches/gobject_init_on_demand.patch b/srcpkgs/glib/patches/gobject_init_on_demand.patch index bcc3cabfbcd..024e588f8a9 100644 --- a/srcpkgs/glib/patches/gobject_init_on_demand.patch +++ b/srcpkgs/glib/patches/gobject_init_on_demand.patch @@ -2,8 +2,8 @@ Initialize the gobject system on demand, i.e. before it is expected to be initialized. Do this only once by checking a local static variable gobject_initialized. ---- gobject/gtype.c 2016-08-17 17:20:47.000000000 +0200 -+++ gobject/gtype.c 2016-09-01 21:56:31.777406646 +0200 +--- a/gobject/gtype.c 2016-08-17 17:20:47.000000000 +0200 ++++ b/gobject/gtype.c 2016-09-01 21:56:31.777406646 +0200 @@ -209,6 +209,9 @@ static gboolean type_node_is_a_L (TypeNode *node, TypeNode *iface_node); diff --git a/srcpkgs/glib/patches/quark_init_on_demand.patch b/srcpkgs/glib/patches/quark_init_on_demand.patch index 458a2adab43..af060b7a1d5 100644 --- a/srcpkgs/glib/patches/quark_init_on_demand.patch +++ b/srcpkgs/glib/patches/quark_init_on_demand.patch @@ -2,8 +2,8 @@ musl does not run ctors in the assumed order that glib-2.46 expects. Call g_quark_init() where it is expected to have been called. ---- glib/gquark.c 2016-08-17 17:20:47.000000000 +0200 -+++ glib/gquark.c 2016-08-30 07:49:13.298234757 +0200 +--- a/glib/gquark.c 2016-08-17 17:20:47.000000000 +0200 ++++ b/glib/gquark.c 2016-08-30 07:49:13.298234757 +0200 @@ -57,6 +57,9 @@ void g_quark_init (void) diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 9538134e3b3..855a55856b3 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -17,7 +17,6 @@ homepage="https://wiki.gnome.org/Projects/GLib" changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" checksum=ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb -patch_args=-Np0 build_options="gtk_doc" desc_option_gtk_doc="Build GTK API docs" diff --git a/srcpkgs/gloox/patches/gloox-musl.patch b/srcpkgs/gloox/patches/gloox-musl.patch index a052ad1cdc3..0c423f76c47 100644 --- a/srcpkgs/gloox/patches/gloox-musl.patch +++ b/srcpkgs/gloox/patches/gloox-musl.patch @@ -1,5 +1,5 @@ ---- src/connectiontcpserver.cpp.orig 2017-02-21 13:32:58.000000000 +0100 -+++ src/connectiontcpserver.cpp 2018-01-03 08:38:57.121764510 +0100 +--- a/src/connectiontcpserver.cpp 2017-02-21 13:32:58.000000000 +0100 ++++ b/src/connectiontcpserver.cpp 2018-01-03 08:38:57.121764510 +0100 @@ -51,7 +51,7 @@ #endif diff --git a/srcpkgs/gloox/template b/srcpkgs/gloox/template index f56bd162123..0099876f5b2 100644 --- a/srcpkgs/gloox/template +++ b/srcpkgs/gloox/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="https://camaya.net/gloox" distfiles="https://camaya.net/download/gloox-${version}.tar.bz2" checksum=4ade1b14848ccfcd89a505a4fff05116c24f13cef8d02fab0ade2717117ec964 -patch_args=-Np0 gloox-devel_package() { depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/gltron/patches/gltron-0.70-configure.patch b/srcpkgs/gltron/patches/gltron-0.70-configure.patch index 91414b3956e..5bdef979a57 100644 --- a/srcpkgs/gltron/patches/gltron-0.70-configure.patch +++ b/srcpkgs/gltron/patches/gltron-0.70-configure.patch @@ -1,7 +1,7 @@ configure.in is written poorly so it just stomps all over CFLAGS ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -2805,7 +2805,7 @@ RANLIB="$ac_cv_prog_RANLIB" fi diff --git a/srcpkgs/gltron/patches/gltron-0.70-debian.patch b/srcpkgs/gltron/patches/gltron-0.70-debian.patch index 464cf592820..4e25618ce9b 100644 --- a/srcpkgs/gltron/patches/gltron-0.70-debian.patch +++ b/srcpkgs/gltron/patches/gltron-0.70-debian.patch @@ -1,7 +1,7 @@ Ripped from Debian patchset 6 ---- src/include/game/game_data.h -+++ src/include/game/game_data.h +--- a/src/include/game/game_data.h ++++ b/src/include/game/game_data.h @@ -71,7 +71,7 @@ typedef struct AI { int active; @@ -11,8 +11,8 @@ Ripped from Debian patchset 6 segment2 left, right, front, backleft; } AI; ---- src/include/video/fonttex.h -+++ src/include/video/fonttex.h +--- a/src/include/video/fonttex.h ++++ b/src/include/video/fonttex.h @@ -10,7 +10,7 @@ int lower; /* lowest ascii character (normally: 32) */ int upper; /* highest ascii character (normally: 126) */ @@ -22,8 +22,8 @@ Ripped from Debian patchset 6 char *fontname; char *bitmapname; ---- src/video/trail.c -+++ src/video/trail.c +--- a/src/video/trail.c ++++ b/src/video/trail.c @@ -19,7 +19,7 @@ n[1] = s->vStart.v[1] - s->vDirection.v[0]; tmp[0] = eye[0] - s->vStart.v[0]; diff --git a/srcpkgs/gltron/patches/gltron-0.70-prototypes.patch b/srcpkgs/gltron/patches/gltron-0.70-prototypes.patch index d697f1ad59a..621963aeb68 100644 --- a/srcpkgs/gltron/patches/gltron-0.70-prototypes.patch +++ b/srcpkgs/gltron/patches/gltron-0.70-prototypes.patch @@ -1,7 +1,7 @@ scripting.h declares these params as const so make sure they're the same. ---- nebu/scripting/scripting.c -+++ nebu/scripting/scripting.c +--- a/nebu/scripting/scripting.c ++++ b/nebu/scripting/scripting.c @@ -169,16 +169,16 @@ return status; } diff --git a/srcpkgs/gltron/patches/stdint.patch b/srcpkgs/gltron/patches/stdint.patch index 17a091359c0..ed03de16574 100644 --- a/srcpkgs/gltron/patches/stdint.patch +++ b/srcpkgs/gltron/patches/stdint.patch @@ -1,5 +1,5 @@ ---- lua/src/lib/liolib.c 2003-06-30 21:15:26.000000000 +0200 -+++ lua/src/lib/liolib.c.new 2020-02-04 23:08:47.840943907 +0100 +--- a/lua/src/lib/liolib.c 2003-06-30 21:15:26.000000000 +0200 ++++ b/lua/src/lib/liolib.c.new 2020-02-04 23:08:47.840943907 +0100 @@ -6,6 +6,7 @@ */ diff --git a/srcpkgs/gltron/template b/srcpkgs/gltron/template index 4aad84aeb45..1239a1742e5 100644 --- a/srcpkgs/gltron/template +++ b/srcpkgs/gltron/template @@ -12,4 +12,3 @@ license="GPL-2.0-only" homepage="http://gltron.org/" distfiles="${SOURCEFORGE_SITE}/gltron/gltron-${version}-source.tar.gz" checksum="e0c8ebb41a18a1f8d7302a9c2cb466f5b1dd63e9a9966c769075e6b6bdad8bb0" -patch_args=-Np0 diff --git a/srcpkgs/glusterfs/patches/patch-xlators_cloudsync_ssl.patch b/srcpkgs/glusterfs/patches/patch-xlators_cloudsync_ssl.patch index c1dc3c2a4de..d2598e371b5 100644 --- a/srcpkgs/glusterfs/patches/patch-xlators_cloudsync_ssl.patch +++ b/srcpkgs/glusterfs/patches/patch-xlators_cloudsync_ssl.patch @@ -1,5 +1,5 @@ ---- xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c.orig 2019-04-01 11:59:35.934987018 -0400 -+++ xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c 2019-04-01 12:01:04.701774641 -0400 +--- a/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c 2019-04-01 11:59:35.934987018 -0400 ++++ b/xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c 2019-04-01 12:01:04.701774641 -0400 @@ -300,7 +300,7 @@ char * aws_sign_request(char *const str, char *awssekey) diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index ec10ef21466..93fd87eeda7 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -18,7 +18,6 @@ license="GPL-2.0-or-later, LGPL-3.0-only" homepage="https://www.gluster.org/" distfiles="https://download.gluster.org/pub/gluster/glusterfs/${version%.*}/${version}/${pkgname}-${version}.tar.gz" checksum=6f29ae4ab2c270ade0cd14a3f733d7d33fda78e79e81b148cd50711f65069d87 -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) broken="not yet supported";; diff --git a/srcpkgs/glyr/patches/fix-cflags.patch b/srcpkgs/glyr/patches/fix-cflags.patch index 498ffe09a38..6e8b178fcd8 100644 --- a/srcpkgs/glyr/patches/fix-cflags.patch +++ b/srcpkgs/glyr/patches/fix-cflags.patch @@ -1,7 +1,7 @@ Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -60,7 +60,6 @@ exec_program( IF(CMAKE_BUILD_TYPE STREQUAL "debug") SET(GLYR_DEBUG TRUE) diff --git a/srcpkgs/glyr/patches/musl-execinfo.patch b/srcpkgs/glyr/patches/musl-execinfo.patch index 67f62674566..9ff601f70d5 100644 --- a/srcpkgs/glyr/patches/musl-execinfo.patch +++ b/srcpkgs/glyr/patches/musl-execinfo.patch @@ -1,5 +1,5 @@ ---- src/glyrc/glyrc.c.original -+++ src/glyrc/glyrc.c +--- a/src/glyrc/glyrc.c.original ++++ b/src/glyrc/glyrc.c @@ -24,7 +24,7 @@ #include #include diff --git a/srcpkgs/glyr/template b/srcpkgs/glyr/template index 6055834d3fb..30dbe4e87f8 100644 --- a/srcpkgs/glyr/template +++ b/srcpkgs/glyr/template @@ -11,7 +11,6 @@ license="LGPL-3.0-or-later" homepage="https://github.com/sahib/glyr" distfiles="https://github.com/sahib/glyr/archive/${version}.tar.gz" checksum=77e8da60221c8d27612e4a36482069f26f8ed74a1b2768ebc373c8144ca806e8 -patch_args=-Np0 glyr-devel_package() { depends="glyr>=${version}_${revision}" diff --git a/srcpkgs/gmrun/patches/00_gcc43_fix.patch b/srcpkgs/gmrun/patches/00_gcc43_fix.patch index 6f79591f69d..3509087cb58 100644 --- a/srcpkgs/gmrun/patches/00_gcc43_fix.patch +++ b/srcpkgs/gmrun/patches/00_gcc43_fix.patch @@ -1,5 +1,5 @@ ---- src/gtkcompletionline.cc.orig 2003-11-16 11:55:07.000000000 +0100 -+++ src/gtkcompletionline.cc 2008-05-08 08:51:22.000000000 +0200 +--- a/src/gtkcompletionline.cc 2003-11-16 11:55:07.000000000 +0100 ++++ b/src/gtkcompletionline.cc 2008-05-08 08:51:22.000000000 +0200 @@ -29,6 +29,7 @@ #include #include @@ -8,8 +8,8 @@ #include using namespace std; ---- src/ci_string.h.orig 2001-05-16 16:39:31.000000000 +0200 -+++ src/ci_string.h 2008-05-08 08:51:33.000000000 +0200 +--- a/src/ci_string.h 2001-05-16 16:39:31.000000000 +0200 ++++ b/src/ci_string.h 2008-05-08 08:51:33.000000000 +0200 @@ -7,6 +7,7 @@ #define __CI_STRING_H__ @@ -18,8 +18,8 @@ #include struct ci_char_traits : public std::char_traits ---- src/prefs.cc.orig 2002-08-16 12:48:22.000000000 +0200 -+++ src/prefs.cc 2008-05-08 08:51:54.000000000 +0200 +--- a/src/prefs.cc 2002-08-16 12:48:22.000000000 +0200 ++++ b/src/prefs.cc 2008-05-08 08:51:54.000000000 +0200 @@ -13,6 +13,7 @@ #include #include @@ -28,8 +28,8 @@ #include ---- src/main.cc.orig 2003-11-16 11:55:07.000000000 +0100 -+++ src/main.cc 2008-05-08 09:03:11.000000000 +0200 +--- a/src/main.cc 2003-11-16 11:55:07.000000000 +0100 ++++ b/src/main.cc 2008-05-08 09:03:11.000000000 +0200 @@ -14,6 +14,7 @@ #include @@ -39,8 +39,8 @@ #include #include ---- src/gtkcompletionline.cc.orig 2009-06-19 22:38:14.000000000 +0400 -+++ src/gtkcompletionline.cc 2009-06-19 22:37:14.000000000 +0400 +--- a/src/gtkcompletionline.cc 2009-06-19 22:38:14.000000000 +0400 ++++ b/src/gtkcompletionline.cc 2009-06-19 22:37:14.000000000 +0400 @@ -376,7 +377,7 @@ return 0; } diff --git a/srcpkgs/gmrun/patches/6a0ea012a7f51fdc5639bedabe446c9035461cda.diff b/srcpkgs/gmrun/patches/6a0ea012a7f51fdc5639bedabe446c9035461cda.diff index 9030b55b7db..2898446c69e 100644 --- a/srcpkgs/gmrun/patches/6a0ea012a7f51fdc5639bedabe446c9035461cda.diff +++ b/srcpkgs/gmrun/patches/6a0ea012a7f51fdc5639bedabe446c9035461cda.diff @@ -14,8 +14,8 @@ https://launchpadlibrarian.net/295253441/gmrun-tdp-patch.diff diff --git src/gtkcompletionline.cc src/gtkcompletionline.cc index c21f7e3..5211a87 100644 ---- src/gtkcompletionline.cc -+++ src/gtkcompletionline.cc +--- a/src/gtkcompletionline.cc ++++ b/src/gtkcompletionline.cc @@ -77,22 +77,26 @@ static gboolean on_key_press(GtkCompletionLine *cl, GdkEventKey *event, gpointer data); @@ -64,8 +64,8 @@ index c21f7e3..5211a87 100644 static void diff --git src/gtkcompletionline.h src/gtkcompletionline.h index 5e14cd7..0d7f2dc 100644 ---- src/gtkcompletionline.h -+++ src/gtkcompletionline.h +--- a/src/gtkcompletionline.h ++++ b/src/gtkcompletionline.h @@ -76,7 +76,7 @@ extern "C++" { void (* cancel)(GtkCompletionLine *cl); }; diff --git a/srcpkgs/gmrun/template b/srcpkgs/gmrun/template index 4e6727f20d0..b3565fa4929 100644 --- a/srcpkgs/gmrun/template +++ b/srcpkgs/gmrun/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://sf.net/projects/gmrun" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=17297bce53249ccc7145931db22251b47f77ac355f78cf8abf1e87ae16341fa0 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch b/srcpkgs/gnome-authenticator/patches/fix-zbar.patch index 78049006ddb..8683ff6129b 100644 --- a/srcpkgs/gnome-authenticator/patches/fix-zbar.patch +++ b/srcpkgs/gnome-authenticator/patches/fix-zbar.patch @@ -1,7 +1,7 @@ diff --git meson.build meson.build index 8eed8f8..a1e38ab 100644 ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -24,7 +24,7 @@ dependency('gobject-2.0') dependency('gobject-introspection-1.0') dependency('gtk+-3.0', version: '>=3.16') diff --git a/srcpkgs/gnome-authenticator/template b/srcpkgs/gnome-authenticator/template index ceca3efe857..e1bd1ee9e44 100644 --- a/srcpkgs/gnome-authenticator/template +++ b/srcpkgs/gnome-authenticator/template @@ -15,7 +15,6 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/World/Authenticator" distfiles="${homepage}/-/archive/${version}/Authenticator-${version}.tar.gz" checksum="d7250fbef1de2dcb599a55ff3d40dcc6ed5618fe89d50ec795281d8ba3123d5b" -patch_args=-Np0 post_patch() { find src/Authenticator/widgets -type f -exec \ diff --git a/srcpkgs/gnome-desktop/patches/build.patch b/srcpkgs/gnome-desktop/patches/build.patch index efed00a25dd..1f3acd965fe 100644 --- a/srcpkgs/gnome-desktop/patches/build.patch +++ b/srcpkgs/gnome-desktop/patches/build.patch @@ -6,8 +6,8 @@ Date: Wed Aug 12 05:26:00 2020 +0200 diff --git libgnome-desktop/gnome-rr.h libgnome-desktop/gnome-rr.h index 111bab3..7698672 100644 ---- libgnome-desktop/gnome-rr.h -+++ libgnome-desktop/gnome-rr.h +--- a/libgnome-desktop/gnome-rr.h ++++ b/libgnome-desktop/gnome-rr.h @@ -28,6 +28,7 @@ #error GnomeRR is unstable API. You must define GNOME_DESKTOP_USE_UNSTABLE_API before including gnomerr.h #endif diff --git a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch index 2d25e87b0b6..ea4da3efc08 100644 --- a/srcpkgs/gnome-desktop/patches/optionalise-gir.patch +++ b/srcpkgs/gnome-desktop/patches/optionalise-gir.patch @@ -1,7 +1,7 @@ diff --git a/libgnome-desktop/meson.build b/libgnome-desktop/meson.build index c365b44..33af6f4 100644 ---- libgnome-desktop/meson.build -+++ libgnome-desktop/meson.build +--- a/libgnome-desktop/meson.build ++++ b/libgnome-desktop/meson.build @@ -96,17 +96,19 @@ libgnome_desktop_dep = declare_dependency( link_with: libgnome_desktop ) @@ -35,8 +35,8 @@ index c365b44..33af6f4 100644 libraries: libgnome_desktop, diff --git a/meson_options.txt b/meson_options.txt index e3402a1..1dbaf5d 100644 ---- meson_options.txt -+++ meson_options.txt +--- a/meson_options.txt ++++ b/meson_options.txt @@ -28,3 +28,7 @@ option('gtk_doc', option('installed_tests', type: 'boolean', value: false, description: 'Enable installed tests' diff --git a/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch b/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch index 9b53c755dab..5bc4a7ea46e 100644 --- a/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch +++ b/srcpkgs/gnome-desktop/patches/thumbnail-bwrap-musl.patch @@ -1,7 +1,7 @@ diff --git libgnome-desktop/gnome-desktop-thumbnail-script.c libgnome-desktop/gnome-desktop-thumbnail-script.c index cfbbad0..efad40b 100644 ---- libgnome-desktop/gnome-desktop-thumbnail-script.c -+++ libgnome-desktop/gnome-desktop-thumbnail-script.c +--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c @@ -532,7 +532,7 @@ add_bwrap (GPtrArray *array, add_args (array, "bwrap", diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 72565e7b28e..b92478185d6 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -17,7 +17,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=02dd6e5860e90395b5d88745ee30239a919285afbb7a22cf17e3be25e9abfbf6 -patch_args=-Np0 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/gnome-keyring/patches/sys-select-h.patch b/srcpkgs/gnome-keyring/patches/sys-select-h.patch index 036341e4660..af4e2a1268a 100644 --- a/srcpkgs/gnome-keyring/patches/sys-select-h.patch +++ b/srcpkgs/gnome-keyring/patches/sys-select-h.patch @@ -1,7 +1,7 @@ Add include of sys/select.h for FD_ISSET definition ---- pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c 2015-06-01 08:19:06.507624249 +0200 -+++ pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c 2015-06-01 08:19:45.070624135 +0200 +--- a/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c 2015-06-01 08:19:06.507624249 +0200 ++++ b/pkcs11/rpc-layer/gkm-rpc-daemon-standalone.c 2015-06-01 08:19:45.070624135 +0200 @@ -31,6 +31,7 @@ #include #include diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template index 6ec17559c86..b8defd1997d 100644 --- a/srcpkgs/gnome-keyring/template +++ b/srcpkgs/gnome-keyring/template @@ -17,7 +17,6 @@ homepage="https://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=a3d24db08ee2fdf240fbbf0971a98c8ee295aa0e1a774537f4ea938038a3b931 lib32disabled=yes -patch_args=-Np0 do_check() { # Requires X11 server diff --git a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch index 9c00fa75e89..db767a514a1 100644 --- a/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch +++ b/srcpkgs/gnome-latex/patches/00-port-to-tepl-6.patch @@ -13,8 +13,8 @@ Subject: [PATCH] Port to Tepl 6 (currently 5.99.0, from git master) diff --git README README index ed0faf7..0dc67d9 100644 ---- README -+++ README +--- a/README ++++ b/README @@ -21,7 +21,7 @@ Dependencies * GLib >= 2.56 * GTK >= 3.22 @@ -26,8 +26,8 @@ index ed0faf7..0dc67d9 100644 * gsettings-desktop-schemas diff --git configure.ac configure.ac index 743a7da..66d5719 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -32,7 +32,7 @@ GLIB_REQUIRED_VERSION="2.56" GTK_REQUIRED_VERSION="3.22" GTKSOURCEVIEW_REQUIRED_VERSION="4.0" @@ -48,8 +48,8 @@ index 743a7da..66d5719 100644 gsettings-desktop-schemas diff --git src/Makefile.am src/Makefile.am index 636ca25..73f5a9a 100644 ---- src/Makefile.am -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -8,7 +8,7 @@ AM_VALAFLAGS = \ --disable-since-check \ --pkg gtk+-3.0 \ @@ -61,8 +61,8 @@ index 636ca25..73f5a9a 100644 --pkg posix \ diff --git src/document.vala src/document.vala index 520945d..f3afa35 100644 ---- src/document.vala -+++ src/document.vala +--- a/src/document.vala ++++ b/src/document.vala @@ -224,7 +224,7 @@ public class Document : Tepl.Buffer string primary_msg = _("Impossible to save the file."); Tepl.InfoBar infobar = new Tepl.InfoBar.simple (MessageType.ERROR, @@ -74,8 +74,8 @@ index 520945d..f3afa35 100644 } diff --git src/liblatexila/Makefile.am src/liblatexila/Makefile.am index b4e53b5..25c20a9 100644 ---- src/liblatexila/Makefile.am -+++ src/liblatexila/Makefile.am +--- a/src/liblatexila/Makefile.am ++++ b/src/liblatexila/Makefile.am @@ -135,7 +135,7 @@ INTROSPECTION_GIRS = Latexila.gir Latexila.gir: liblatexila.la diff --git a/srcpkgs/gnome-latex/template b/srcpkgs/gnome-latex/template index f1c5f3c7c3c..4739891c8ff 100644 --- a/srcpkgs/gnome-latex/template +++ b/srcpkgs/gnome-latex/template @@ -16,7 +16,6 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/GNOME-LaTeX" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=a82a9fc6f056929ea18d6dffd121e71b2c21768808c86ef1f34da0f86e220d77 -patch_args=-Np0 # for 00-port-to-tepl-6.patch hostmakedepends+=" automake gettext-devel-tools libtool" diff --git a/srcpkgs/gnome-photos/patches/fix-double-declaration.diff b/srcpkgs/gnome-photos/patches/fix-double-declaration.diff index 0162e13db42..d11d0e0fdeb 100644 --- a/srcpkgs/gnome-photos/patches/fix-double-declaration.diff +++ b/srcpkgs/gnome-photos/patches/fix-double-declaration.diff @@ -1,5 +1,5 @@ ---- src/photos-base-manager.h.orig 2021-04-20 13:16:07.042348375 +0200 -+++ src/photos-base-manager.h 2021-04-20 13:16:16.974347953 +0200 +--- a/src/photos-base-manager.h 2021-04-20 13:16:07.042348375 +0200 ++++ b/src/photos-base-manager.h 2021-04-20 13:16:16.974347953 +0200 @@ -78,8 +78,6 @@ guint photos_base_manager_ GObject *photos_base_manager_get_previous_object (PhotosBaseManager *self, GObject *object); diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template index 57280f65379..fee19723ed8 100644 --- a/srcpkgs/gnome-photos/template +++ b/srcpkgs/gnome-photos/template @@ -17,7 +17,6 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Photos" distfiles="${GNOME_SITE}/gnome-photos/${version%.*}/gnome-photos-${version}.tar.xz" checksum=e02d73e138af8b2868b5cad7faa1bdd278aeade3b6c3c92836511a4e6f3af1af -patch_args=-Np0 build_options="gir" build_options_default="gir" diff --git a/srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch b/srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch index cbd239f7de8..7792b5c2bc0 100644 --- a/srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch +++ b/srcpkgs/gnome-recipes/patches/gnome-recipes-fix-cross.patch @@ -1,5 +1,5 @@ ---- tools/meson.build -+++ tools/meson.build +--- a/tools/meson.build ++++ b/tools/meson.build @@ -1,3 +1,5 @@ recipe_extract = executable('recipe-extract', 'recipe-extract.c', include_directories : top_inc, diff --git a/srcpkgs/gnome-recipes/template b/srcpkgs/gnome-recipes/template index 847e736a484..30f81ab265b 100644 --- a/srcpkgs/gnome-recipes/template +++ b/srcpkgs/gnome-recipes/template @@ -13,4 +13,3 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Recipes" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=1be9d2fcb7404a97aa029d2409880643f15071c37039247a6a4320e7478cd5fb -patch_args=-Np0 diff --git a/srcpkgs/gnome-screensaver/patches/build.patch b/srcpkgs/gnome-screensaver/patches/build.patch index 6dcdbe7dd7e..a510118461b 100644 --- a/srcpkgs/gnome-screensaver/patches/build.patch +++ b/srcpkgs/gnome-screensaver/patches/build.patch @@ -1,5 +1,5 @@ ---- src/gs-manager.c -+++ src/gs-manager.c +--- a/src/gs-manager.c ++++ b/src/gs-manager.c @@ -820,8 +820,7 @@ apply_background_to_window (GSManager *manager, surface = gnome_bg_create_surface (manager->priv->bg, gdk_window, diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template index d0a3a8968ce..1a23f6dcfb0 100644 --- a/srcpkgs/gnome-screensaver/template +++ b/srcpkgs/gnome-screensaver/template @@ -13,7 +13,6 @@ license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeScreensaver" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0 -patch_args=-Np0 post_patch() { vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure diff --git a/srcpkgs/gnome-session/patches/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch b/srcpkgs/gnome-session/patches/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch index cfd9f4ba6cf..af8350b8d93 100644 --- a/srcpkgs/gnome-session/patches/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch +++ b/srcpkgs/gnome-session/patches/0001-revert-autostart-app-Strip-blacklisted-variables-fro.patch @@ -15,8 +15,8 @@ https://gitlab.gnome.org/GNOME/gnome-session/issues/44 diff --git a/gnome-session/gsm-autostart-app.c b/gnome-session/gsm-autostart-app.c index 6fd5915..01ba5f9 100644 ---- gnome-session/gsm-autostart-app.c -+++ gnome-session/gsm-autostart-app.c +--- a/gnome-session/gsm-autostart-app.c ++++ b/gnome-session/gsm-autostart-app.c @@ -997,7 +997,6 @@ autostart_app_start_spawn (GsmAutostartApp *app, gboolean success; GError *local_error; @@ -38,8 +38,8 @@ index 6fd5915..01ba5f9 100644 char **environment_tuple; diff --git a/gnome-session/gsm-util.c b/gnome-session/gsm-util.c index 02bc4a5..ada1225 100644 ---- gnome-session/gsm-util.c -+++ gnome-session/gsm-util.c +--- a/gnome-session/gsm-util.c ++++ b/gnome-session/gsm-util.c @@ -808,9 +808,3 @@ gsm_util_listenv (void) return (const char * const *) child_environment; @@ -52,8 +52,8 @@ index 02bc4a5..ada1225 100644 -} diff --git a/gnome-session/gsm-util.h b/gnome-session/gsm-util.h index bd7b698..8bca5f4 100644 ---- gnome-session/gsm-util.h -+++ gnome-session/gsm-util.h +--- a/gnome-session/gsm-util.h ++++ b/gnome-session/gsm-util.h @@ -50,7 +50,6 @@ char * gsm_util_generate_startup_id (void); void gsm_util_setenv (const char *variable, const char *value); diff --git a/srcpkgs/gnome-session/patches/include-profile-env-variables.patch b/srcpkgs/gnome-session/patches/include-profile-env-variables.patch index 09b87bbbce7..2e06bddecb1 100644 --- a/srcpkgs/gnome-session/patches/include-profile-env-variables.patch +++ b/srcpkgs/gnome-session/patches/include-profile-env-variables.patch @@ -4,8 +4,8 @@ specific /etc/environment.d to set environment variables. With this patch we just force gnome-session's hand to include the env variables of /etc/profile. ---- gnome-session/gnome-session.in -+++ gnome-session/gnome-session.in +--- a/gnome-session/gnome-session.in ++++ b/gnome-session/gnome-session.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash diff --git a/srcpkgs/gnome-session/patches/no-systemd-dep.patch b/srcpkgs/gnome-session/patches/no-systemd-dep.patch index 8e55a0f7987..8292d60d5a9 100644 --- a/srcpkgs/gnome-session/patches/no-systemd-dep.patch +++ b/srcpkgs/gnome-session/patches/no-systemd-dep.patch @@ -1,5 +1,5 @@ ---- meson.build -+++ meson.build +--- a/meson.build ++++ b/meson.build @@ -130,10 +130,7 @@ if enable_systemd or enable_consolekit # Check for systemd diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index ff7a0d03e67..e5bc350e66f 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -16,7 +16,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-session" distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" checksum=9c787829ee32e13e1508b9aee2b1d9ba42a02c48e6c8094e34f3e7f92af4df82 -patch_args=-Np0 post_install() { rm -rf ${DESTDIR}/tmp diff --git a/srcpkgs/gnome-settings-daemon/patches/logind-backlight.patch b/srcpkgs/gnome-settings-daemon/patches/logind-backlight.patch index e5ca6bd43dd..1225f0df506 100644 --- a/srcpkgs/gnome-settings-daemon/patches/logind-backlight.patch +++ b/srcpkgs/gnome-settings-daemon/patches/logind-backlight.patch @@ -10,8 +10,8 @@ https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/cd051e6c7ccfb7e7b0 diff --git plugins/power/gsd-backlight.c plugins/power/gsd-backlight.c index ca5f272..4acc2e5 100644 ---- plugins/power/gsd-backlight.c -+++ plugins/power/gsd-backlight.c +--- a/plugins/power/gsd-backlight.c ++++ b/plugins/power/gsd-backlight.c @@ -40,8 +40,6 @@ struct _GsdBacklight gint brightness_step; diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index f6d6acf73f2..081c88ebfd7 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -20,7 +20,6 @@ license="GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-settings-daemon" distfiles="${GNOME_SITE}/${pkgname}/${version%.*.*}/${pkgname}-${version}.tar.xz" checksum=37dfac1b69a53e2e499228420259d6e134c1c06b74530af88fa855bda1187b21 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" polkit" diff --git a/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch b/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch index 47f906e2997..6eda24ae7ee 100644 --- a/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch +++ b/srcpkgs/gnome-terminal/patches/fix-W_EXITCODE.patch @@ -2,8 +2,8 @@ Source: https://mail-archives.apache.org/mod_mbox/mesos-reviews/201610.mbox/%3C2 Upstream: No Reason: fixes compilation with musl that doesn't define W* macros. ---- src/terminal.c -+++ src/terminal.c +--- a/src/terminal.c ++++ b/src/terminal.c @@ -47,6 +47,10 @@ GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free) #define gs_free_options __attribute__ ((cleanup(gs_local_options_free))) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index 89ddda4dfea..4a397445dd1 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -15,7 +15,6 @@ homepage="https://wiki.gnome.org/Apps/Terminal" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=4c79af8ffe8bd3a5daca1911ea2c0acd6872860a1dd5d7eea219f4ab4ae556ac lib32disabled=yes -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then configure_args+=" --disable-search-provider" diff --git a/srcpkgs/gnu-efi-libs/patches/no-werror.patch b/srcpkgs/gnu-efi-libs/patches/no-werror.patch index 38a947603cf..f6cc95bdccf 100644 --- a/srcpkgs/gnu-efi-libs/patches/no-werror.patch +++ b/srcpkgs/gnu-efi-libs/patches/no-werror.patch @@ -2,8 +2,8 @@ Source: Alpine Linux (adapted) Upstream: No Reason: Fixes compilation on i686 ---- Make.defaults -+++ Make.defaults +--- a/Make.defaults ++++ b/Make.defaults @@ -156,11 +156,11 @@ ifneq (mingw32,$(findstring mingw32, $(GCCMACHINE))) endif diff --git a/srcpkgs/gnu-efi-libs/template b/srcpkgs/gnu-efi-libs/template index e85a677cbae..0b8c679b522 100644 --- a/srcpkgs/gnu-efi-libs/template +++ b/srcpkgs/gnu-efi-libs/template @@ -12,7 +12,6 @@ homepage="https://sourceforge.net/projects/gnu-efi/" distfiles="${SOURCEFORGE_SITE}/gnu-efi/gnu-efi-${version}.tar.bz2" checksum=0196f2e1fd3c334b66e610a608a0e59233474c7a01bec7bc53989639aa327669 nostrip=yes -patch_args=-Np0 # If we are cross-building we need to pass the cross-compilation triplet # to the CROSS_COMPILE environment variable so the build system uses diff --git a/srcpkgs/gnucash/patches/disabletests.patch b/srcpkgs/gnucash/patches/disabletests.patch index fe18e21f1f1..2172c2d2c0b 100644 --- a/srcpkgs/gnucash/patches/disabletests.patch +++ b/srcpkgs/gnucash/patches/disabletests.patch @@ -1,5 +1,5 @@ ---- libgnucash/engine/test/CMakeLists.txt 2020-07-11 01:39:03.000000000 +0200 -+++ libgnucash/engine/test/CMakeLists.txt 2021-01-31 22:22:19.782029671 +0100 +--- a/libgnucash/engine/test/CMakeLists.txt 2020-07-11 01:39:03.000000000 +0200 ++++ b/libgnucash/engine/test/CMakeLists.txt 2021-01-31 22:22:19.782029671 +0100 @@ -49,3 +49,3 @@ if (NOT WIN32) - set(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/common/test-core/unittest-support.c) - add_engine_test(test-qof "${SOURCES}") diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template index 084157bb473..fa8bd17d09a 100644 --- a/srcpkgs/gnucash/template +++ b/srcpkgs/gnucash/template @@ -18,7 +18,6 @@ homepage="http://www.gnucash.org" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" #distfiles="https://sources.voidlinux.org/gnucash-${version}/gnucash-${version}.tar.bz2" checksum=bc1f48a8453488a2e9f6b83b68613aa55caebe4d2983460bdac7e084b46cffdc -patch_args=-Np0 pycompile_dirs="usr/share/gnucash/python" conf_files="/etc/gnucash/environment" diff --git a/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch b/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch index 0f12e5f446f..6a9c70d1b10 100644 --- a/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch +++ b/srcpkgs/gnupg2/patches/use-versioned-pcsclite.patch @@ -1,5 +1,5 @@ ---- scd/scdaemon.c.orig 2019-09-29 12:18:47.810111976 +0700 -+++ scd/scdaemon.c 2019-09-29 12:20:38.079117234 +0700 +--- a/scd/scdaemon.c 2019-09-29 12:18:47.810111976 +0700 ++++ b/scd/scdaemon.c 2019-09-29 12:20:38.079117234 +0700 @@ -189,7 +189,7 @@ #define DEFAULT_PCSC_DRIVER "winscard.dll" #elif defined(__APPLE__) diff --git a/srcpkgs/gnupg2/template b/srcpkgs/gnupg2/template index 0d7118e83c3..36fba35e68b 100644 --- a/srcpkgs/gnupg2/template +++ b/srcpkgs/gnupg2/template @@ -22,7 +22,6 @@ distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2" checksum=6ff891fc7583a9c3fb9f097ee0d1de0a12469d4b53997e7ba5064950637dfaec build_options="ldap" build_options_default="ldap" -patch_args=-Np0 post_patch() { # On at least aarch64, configure sets this even though it doesn't exist diff --git a/srcpkgs/gnupod/patches/incdir.patch b/srcpkgs/gnupod/patches/incdir.patch index deee55e342d..615ee058f97 100644 --- a/srcpkgs/gnupod/patches/incdir.patch +++ b/srcpkgs/gnupod/patches/incdir.patch @@ -1,5 +1,5 @@ ---- tools/gnupod_install.pl.orig -+++ tools/gnupod_install.pl +--- a/tools/gnupod_install.pl ++++ b/tools/gnupod_install.pl @@ -7,6 +7,9 @@ use strict; #of course :) diff --git a/srcpkgs/gnupod/patches/perl-5.22.patch b/srcpkgs/gnupod/patches/perl-5.22.patch index fcd293aeb1c..6aaaabf2a24 100644 --- a/srcpkgs/gnupod/patches/perl-5.22.patch +++ b/srcpkgs/gnupod/patches/perl-5.22.patch @@ -1,6 +1,6 @@ diff -ur src.orig/ext/FileMagic.pm src/ext/FileMagic.pm ---- src.orig/ext/FileMagic.pm 2015-09-10 18:04:14.915008340 -0700 -+++ src/ext/FileMagic.pm 2015-09-10 18:06:08.313011035 -0700 +--- a/src/ext/FileMagic.pm 2015-09-10 18:04:14.915008340 -0700 ++++ b/src/ext/FileMagic.pm 2015-09-10 18:06:08.313011035 -0700 @@ -362,7 +362,7 @@ foreach (keys(%{$in})) { my $kvp = __flatten($_, $exclude); # key @@ -24,8 +24,8 @@ diff -ur src.orig/ext/FileMagic.pm src/ext/FileMagic.pm my $merged = ""; diff -ur src.orig/ext/XMLhelper.pm src/ext/XMLhelper.pm ---- src.orig/ext/XMLhelper.pm 2015-09-10 18:04:14.916008340 -0700 -+++ src/ext/XMLhelper.pm 2015-09-10 18:04:47.753009121 -0700 +--- a/src/ext/XMLhelper.pm 2015-09-10 18:04:14.916008340 -0700 ++++ b/src/ext/XMLhelper.pm 2015-09-10 18:04:47.753009121 -0700 @@ -359,7 +359,7 @@ print OUT " \n"; } diff --git a/srcpkgs/gnupod/template b/srcpkgs/gnupod/template index 6515b87aa61..09c35988a9d 100644 --- a/srcpkgs/gnupod/template +++ b/srcpkgs/gnupod/template @@ -12,4 +12,3 @@ license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/gnupod/" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tgz" checksum=bd566295a2e14352e6d05f5c816cab36b0e80d3ab36d29c4bbb45c581d3f3c31 -patch_args=-Np0 diff --git a/srcpkgs/gnuradio-nrsc5/patches/py3.8.patch b/srcpkgs/gnuradio-nrsc5/patches/py3.8.patch index 54f3bb59b33..902a0de4355 100644 --- a/srcpkgs/gnuradio-nrsc5/patches/py3.8.patch +++ b/srcpkgs/gnuradio-nrsc5/patches/py3.8.patch @@ -137,8 +137,8 @@ Subject: [PATCH] GNU Radio 3.8 support. diff --git a/CMakeLists.txt b/CMakeLists.txt index 1beb55f..dd5c257 100644 ---- CMakeLists.txt -+++ CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -1,6 +1,7 @@ -# Copyright 2011,2012,2014,2016 Free Software Foundation, Inc. +# Copyright 2011,2012,2014,2016,2018 Free Software Foundation, Inc. @@ -367,8 +367,8 @@ index 1beb55f..dd5c257 100644 DESTINATION ${CMAKE_MODULES_DIR}/nrsc5 diff --git a/README.md b/README.md index 366f5a7..c11286a 100644 ---- README.md -+++ README.md +--- a/README.md ++++ b/README.md @@ -84,7 +84,6 @@ The output bytes map to symbols as follows: Several sample flowgraphs are available in the apps folder: @@ -379,8 +379,8 @@ index 366f5a7..c11286a 100644 These flowgraphs read a WAV file named sample.wav, which must be encoded at 44,100 samples per second. The license for the supplied sample.wav file is as follows: diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index c837d77..408bf6a 100644 ---- apps/CMakeLists.txt -+++ apps/CMakeLists.txt +--- a/apps/CMakeLists.txt ++++ b/apps/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2011 Free Software Foundation, Inc. # @@ -393,7 +393,7 @@ index c837d77..408bf6a 100644 diff --git a/apps/hd_tx_hackrf.grc b/apps/hd_tx_hackrf.grc deleted file mode 100644 index 7f93279..0000000 ---- apps/hd_tx_hackrf.grc +--- a/apps/hd_tx_hackrf.grc +++ /dev/null @@ -1,2679 +0,0 @@ - @@ -3078,7 +3078,7 @@ index 7f93279..0000000 diff --git a/apps/hd_tx_hackrf.py b/apps/hd_tx_hackrf.py deleted file mode 100755 index ab96f73..0000000 ---- apps/hd_tx_hackrf.py +--- a/apps/hd_tx_hackrf.py +++ /dev/null @@ -1,157 +0,0 @@ -#!/usr/bin/env python2 @@ -3240,8 +3240,8 @@ index ab96f73..0000000 - main() diff --git a/apps/hd_tx_rtl_file.grc b/apps/hd_tx_rtl_file.grc index 2994383..92f5351 100644 ---- apps/hd_tx_rtl_file.grc -+++ apps/hd_tx_rtl_file.grc +--- a/apps/hd_tx_rtl_file.grc ++++ b/apps/hd_tx_rtl_file.grc @@ -1,1420 +1,488 @@ - - @@ -5153,8 +5153,8 @@ index 2994383..92f5351 100644 + file_format: 1 diff --git a/apps/hd_tx_rtl_file.py b/apps/hd_tx_rtl_file.py index 41d19b1..77e7eb0 100755 ---- apps/hd_tx_rtl_file.py -+++ apps/hd_tx_rtl_file.py +--- a/apps/hd_tx_rtl_file.py ++++ b/apps/hd_tx_rtl_file.py @@ -1,25 +1,28 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 @@ -5261,8 +5261,8 @@ index 41d19b1..77e7eb0 100755 diff --git a/apps/hd_tx_usrp.grc b/apps/hd_tx_usrp.grc index fc6fc4e..8e34368 100644 ---- apps/hd_tx_usrp.grc -+++ apps/hd_tx_usrp.grc +--- a/apps/hd_tx_usrp.grc ++++ b/apps/hd_tx_usrp.grc @@ -1,2487 +1,846 @@ - - @@ -8599,8 +8599,8 @@ index fc6fc4e..8e34368 100644 + file_format: 1 diff --git a/apps/hd_tx_usrp.py b/apps/hd_tx_usrp.py index 45c7145..37426ab 100755 ---- apps/hd_tx_usrp.py -+++ apps/hd_tx_usrp.py +--- a/apps/hd_tx_usrp.py ++++ b/apps/hd_tx_usrp.py @@ -1,27 +1,30 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 @@ -8774,8 +8774,8 @@ index 45c7145..37426ab 100755 tb.stop() diff --git a/cmake/Modules/CMakeParseArgumentsCopy.cmake b/cmake/Modules/CMakeParseArgumentsCopy.cmake index 7ce4c49..66016cb 100644 ---- cmake/Modules/CMakeParseArgumentsCopy.cmake -+++ cmake/Modules/CMakeParseArgumentsCopy.cmake +--- a/cmake/Modules/CMakeParseArgumentsCopy.cmake ++++ b/cmake/Modules/CMakeParseArgumentsCopy.cmake @@ -58,7 +58,7 @@ # the new option. # E.g. my_install(TARGETS foo DESTINATION OPTIONAL) would result in @@ -8788,7 +8788,7 @@ index 7ce4c49..66016cb 100644 diff --git a/cmake/Modules/FindCppUnit.cmake b/cmake/Modules/FindCppUnit.cmake deleted file mode 100644 index f93ade3..0000000 ---- cmake/Modules/FindCppUnit.cmake +--- a/cmake/Modules/FindCppUnit.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# http://www.cmake.org/pipermail/cmake/2006-October/011446.html @@ -8833,7 +8833,7 @@ index f93ade3..0000000 diff --git a/cmake/Modules/FindGnuradioRuntime.cmake b/cmake/Modules/FindGnuradioRuntime.cmake deleted file mode 100644 index afed684..0000000 ---- cmake/Modules/FindGnuradioRuntime.cmake +--- a/cmake/Modules/FindGnuradioRuntime.cmake +++ /dev/null @@ -1,36 +0,0 @@ -INCLUDE(FindPkgConfig) @@ -8875,7 +8875,7 @@ index afed684..0000000 diff --git a/cmake/Modules/GrMiscUtils.cmake b/cmake/Modules/GrMiscUtils.cmake deleted file mode 100644 index 5bad57c..0000000 ---- cmake/Modules/GrMiscUtils.cmake +--- a/cmake/Modules/GrMiscUtils.cmake +++ /dev/null @@ -1,528 +0,0 @@ -# Copyright 2010-2011,2014 Free Software Foundation, Inc. @@ -9409,7 +9409,7 @@ index 5bad57c..0000000 diff --git a/cmake/Modules/GrPlatform.cmake b/cmake/Modules/GrPlatform.cmake deleted file mode 100644 index 00a53d0..0000000 ---- cmake/Modules/GrPlatform.cmake +--- a/cmake/Modules/GrPlatform.cmake +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 2011 Free Software Foundation, Inc. @@ -9477,7 +9477,7 @@ index 00a53d0..0000000 diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake deleted file mode 100644 index 06e061e..0000000 ---- cmake/Modules/GrPython.cmake +--- a/cmake/Modules/GrPython.cmake +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 2010-2011 Free Software Foundation, Inc. @@ -9724,7 +9724,7 @@ index 06e061e..0000000 diff --git a/cmake/Modules/GrSwig.cmake b/cmake/Modules/GrSwig.cmake deleted file mode 100644 index 33f37d2..0000000 ---- cmake/Modules/GrSwig.cmake +--- a/cmake/Modules/GrSwig.cmake +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 2010-2011 Free Software Foundation, Inc. @@ -9986,7 +9986,7 @@ index 33f37d2..0000000 diff --git a/cmake/Modules/GrTest.cmake b/cmake/Modules/GrTest.cmake deleted file mode 100644 index 62caab4..0000000 ---- cmake/Modules/GrTest.cmake +--- a/cmake/Modules/GrTest.cmake +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 2010-2011 Free Software Foundation, Inc. @@ -10135,7 +10135,7 @@ index 62caab4..0000000 diff --git a/cmake/Modules/UseSWIG.cmake b/cmake/Modules/UseSWIG.cmake deleted file mode 100644 index b7e3e05..0000000 ---- cmake/Modules/UseSWIG.cmake +--- a/cmake/Modules/UseSWIG.cmake +++ /dev/null @@ -1,304 +0,0 @@ -# - SWIG module for CMake @@ -10444,8 +10444,8 @@ index b7e3e05..0000000 -endmacro() diff --git a/cmake/Modules/nrsc5Config.cmake b/cmake/Modules/nrsc5Config.cmake index 2cd34a4..0911a25 100644 ---- cmake/Modules/nrsc5Config.cmake -+++ cmake/Modules/nrsc5Config.cmake +--- a/cmake/Modules/nrsc5Config.cmake ++++ b/cmake/Modules/nrsc5Config.cmake @@ -22,9 +22,10 @@ FIND_LIBRARY( /usr/local/lib64 /usr/lib @@ -10464,8 +10464,8 @@ similarity index 52% rename from python/build_utils_codes.py rename to cmake/Modules/targetConfig.cmake.in index 9ea96ba..79e4a28 100644 ---- python/build_utils_codes.py -+++ cmake/Modules/targetConfig.cmake.in +--- a/python/build_utils_codes.py ++++ b/cmake/Modules/targetConfig.cmake.in @@ -1,5 +1,4 @@ -# -# Copyright 2004 Free Software Foundation, Inc. @@ -10518,8 +10518,8 @@ index 9ea96ba..79e4a28 100644 +include("${CMAKE_CURRENT_LIST_DIR}/@TARGET@Targets.cmake") diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index f16fbf6..2c318ee 100644 ---- docs/CMakeLists.txt -+++ docs/CMakeLists.txt +--- a/docs/CMakeLists.txt ++++ b/docs/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2011 Free Software Foundation, Inc. # @@ -10531,8 +10531,8 @@ index f16fbf6..2c318ee 100644 # it under the terms of the GNU General Public License as published by diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt index 1b44799..d5d98b8 100644 ---- docs/doxygen/CMakeLists.txt -+++ docs/doxygen/CMakeLists.txt +--- a/docs/doxygen/CMakeLists.txt ++++ b/docs/doxygen/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2011 Free Software Foundation, Inc. # @@ -10544,8 +10544,8 @@ index 1b44799..d5d98b8 100644 # it under the terms of the GNU General Public License as published by diff --git a/docs/doxygen/Doxyfile.in b/docs/doxygen/Doxyfile.in index 3ad1a67..20dfc97 100644 ---- docs/doxygen/Doxyfile.in -+++ docs/doxygen/Doxyfile.in +--- a/docs/doxygen/Doxyfile.in ++++ b/docs/doxygen/Doxyfile.in @@ -654,8 +654,8 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. @@ -10586,8 +10586,8 @@ index 3ad1a67..20dfc97 100644 # documentation will contain sections that can be hidden and shown after the diff --git a/docs/doxygen/Doxyfile.swig_doc.in b/docs/doxygen/Doxyfile.swig_doc.in index 19e17dc..cbe06d6 100644 ---- docs/doxygen/Doxyfile.swig_doc.in -+++ docs/doxygen/Doxyfile.swig_doc.in +--- a/docs/doxygen/Doxyfile.swig_doc.in ++++ b/docs/doxygen/Doxyfile.swig_doc.in @@ -54,7 +54,7 @@ PROJECT_LOGO = # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. @@ -10626,8 +10626,8 @@ index 19e17dc..cbe06d6 100644 # documentation will contain sections that can be hidden and shown after the diff --git a/docs/doxygen/doxyxml/__init__.py b/docs/doxygen/doxyxml/__init__.py index 5cd0b3c..5145b54 100644 ---- docs/doxygen/doxyxml/__init__.py -+++ docs/doxygen/doxyxml/__init__.py +--- a/docs/doxygen/doxyxml/__init__.py ++++ b/docs/doxygen/doxyxml/__init__.py @@ -1,7 +1,8 @@ # # Copyright 2010 Free Software Foundation, Inc. @@ -10651,8 +10651,8 @@ index 5cd0b3c..5145b54 100644 import os diff --git a/docs/doxygen/doxyxml/base.py b/docs/doxygen/doxyxml/base.py index e8f026a..4404c97 100644 ---- docs/doxygen/doxyxml/base.py -+++ docs/doxygen/doxyxml/base.py +--- a/docs/doxygen/doxyxml/base.py ++++ b/docs/doxygen/doxyxml/base.py @@ -1,7 +1,8 @@ # # Copyright 2010 Free Software Foundation, Inc. @@ -10720,8 +10720,8 @@ index e8f026a..4404c97 100644 def includes(cls, inst): diff --git a/docs/doxygen/doxyxml/doxyindex.py b/docs/doxygen/doxyxml/doxyindex.py index 78e8153..30baf12 100644 ---- docs/doxygen/doxyxml/doxyindex.py -+++ docs/doxygen/doxyxml/doxyindex.py +--- a/docs/doxygen/doxyxml/doxyindex.py ++++ b/docs/doxygen/doxyxml/doxyindex.py @@ -1,7 +1,8 @@ # # Copyright 2010 Free Software Foundation, Inc. @@ -10752,8 +10752,8 @@ index 78e8153..30baf12 100644 """ diff --git a/docs/doxygen/doxyxml/generated/__init__.py b/docs/doxygen/doxyxml/generated/__init__.py index 3982397..23095c1 100644 ---- docs/doxygen/doxyxml/generated/__init__.py -+++ docs/doxygen/doxyxml/generated/__init__.py +--- a/docs/doxygen/doxyxml/generated/__init__.py ++++ b/docs/doxygen/doxyxml/generated/__init__.py @@ -5,3 +5,4 @@ resultant classes are not very friendly to navigate so the rest of the doxyxml module processes them further. @@ -10761,8 +10761,8 @@ index 3982397..23095c1 100644 +from __future__ import unicode_literals diff --git a/docs/doxygen/doxyxml/generated/compound.py b/docs/doxygen/doxyxml/generated/compound.py index 1522ac2..acfa0dd 100644 ---- docs/doxygen/doxyxml/generated/compound.py -+++ docs/doxygen/doxyxml/generated/compound.py +--- a/docs/doxygen/doxyxml/generated/compound.py ++++ b/docs/doxygen/doxyxml/generated/compound.py @@ -3,15 +3,17 @@ """ Generated Mon Feb 9 19:08:05 2009 by generateDS.py. @@ -10786,8 +10786,8 @@ index 1522ac2..acfa0dd 100644 class DoxygenTypeSub(supermod.DoxygenType): diff --git a/docs/doxygen/doxyxml/generated/compoundsuper.py b/docs/doxygen/doxyxml/generated/compoundsuper.py index 6255dda..6e984e1 100644 ---- docs/doxygen/doxyxml/generated/compoundsuper.py -+++ docs/doxygen/doxyxml/generated/compoundsuper.py +--- a/docs/doxygen/doxyxml/generated/compoundsuper.py ++++ b/docs/doxygen/doxyxml/generated/compoundsuper.py @@ -4,12 +4,17 @@ # Generated Thu Jun 11 18:44:25 2009 by generateDS.py. # @@ -10932,8 +10932,8 @@ index 6255dda..6e984e1 100644 - diff --git a/docs/doxygen/doxyxml/generated/index.py b/docs/doxygen/doxyxml/generated/index.py index 7a70e14..0c63512 100644 ---- docs/doxygen/doxyxml/generated/index.py -+++ docs/doxygen/doxyxml/generated/index.py +--- a/docs/doxygen/doxyxml/generated/index.py ++++ b/docs/doxygen/doxyxml/generated/index.py @@ -3,14 +3,16 @@ """ Generated Mon Feb 9 19:08:05 2009 by generateDS.py. @@ -10955,8 +10955,8 @@ index 7a70e14..0c63512 100644 def __init__(self, version=None, compound=None): diff --git a/docs/doxygen/doxyxml/generated/indexsuper.py b/docs/doxygen/doxyxml/generated/indexsuper.py index a991530..11312db 100644 ---- docs/doxygen/doxyxml/generated/indexsuper.py -+++ docs/doxygen/doxyxml/generated/indexsuper.py +--- a/docs/doxygen/doxyxml/generated/indexsuper.py ++++ b/docs/doxygen/doxyxml/generated/indexsuper.py @@ -4,12 +4,16 @@ # Generated Thu Jun 11 18:43:54 2009 by generateDS.py. # @@ -11031,8 +11031,8 @@ index a991530..11312db 100644 - diff --git a/docs/doxygen/doxyxml/text.py b/docs/doxygen/doxyxml/text.py index 629edd1..e7066ba 100644 ---- docs/doxygen/doxyxml/text.py -+++ docs/doxygen/doxyxml/text.py +--- a/docs/doxygen/doxyxml/text.py ++++ b/docs/doxygen/doxyxml/text.py @@ -1,7 +1,8 @@ # # Copyright 2010 Free Software Foundation, Inc. @@ -11069,8 +11069,8 @@ index 629edd1..e7066ba 100644 result += "\n\n" diff --git a/docs/doxygen/swig_doc.py b/docs/doxygen/swig_doc.py index d3536db..c127b9e 100644 ---- docs/doxygen/swig_doc.py -+++ docs/doxygen/swig_doc.py +--- a/docs/doxygen/swig_doc.py ++++ b/docs/doxygen/swig_doc.py @@ -1,7 +1,8 @@ # # Copyright 2010-2012 Free Software Foundation, Inc. @@ -11154,8 +11154,8 @@ index d3536db..c127b9e 100644 di = DoxyIndex(xml_path) diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 1b5c801..8bc75e4 100644 ---- grc/CMakeLists.txt -+++ grc/CMakeLists.txt +--- a/grc/CMakeLists.txt ++++ b/grc/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2011 Free Software Foundation, Inc. # @@ -11198,7 +11198,7 @@ diff --git a/grc/nrsc5_hdc_encoder.block.yml b/grc/nrsc5_hdc_encoder.block.yml new file mode 100644 index 0000000..520dcbe --- /dev/null -+++ grc/nrsc5_hdc_encoder.block.yml ++++ b/grc/nrsc5_hdc_encoder.block.yml @@ -0,0 +1,33 @@ +# auto-generated by grc.converter + @@ -11236,7 +11236,7 @@ index 0000000..520dcbe diff --git a/grc/nrsc5_hdc_encoder.xml b/grc/nrsc5_hdc_encoder.xml deleted file mode 100644 index b4e472e..0000000 ---- grc/nrsc5_hdc_encoder.xml +--- a/grc/nrsc5_hdc_encoder.xml +++ /dev/null @@ -1,31 +0,0 @@ - @@ -11274,7 +11274,7 @@ diff --git a/grc/nrsc5_l1_fm_encoder_mp1.block.yml b/grc/nrsc5_l1_fm_encoder_mp1 new file mode 100644 index 0000000..2b69d4c --- /dev/null -+++ grc/nrsc5_l1_fm_encoder_mp1.block.yml ++++ b/grc/nrsc5_l1_fm_encoder_mp1.block.yml @@ -0,0 +1,26 @@ +# auto-generated by grc.converter + @@ -11305,7 +11305,7 @@ index 0000000..2b69d4c diff --git a/grc/nrsc5_l1_fm_encoder_mp1.xml b/grc/nrsc5_l1_fm_encoder_mp1.xml deleted file mode 100644 index 46714a7..0000000 ---- grc/nrsc5_l1_fm_encoder_mp1.xml +--- a/grc/nrsc5_l1_fm_encoder_mp1.xml +++ /dev/null @@ -1,23 +0,0 @@ - @@ -11335,7 +11335,7 @@ diff --git a/grc/nrsc5_l1_fm_encoder_mp11.block.yml b/grc/nrsc5_l1_fm_encoder_mp new file mode 100644 index 0000000..8c109f3 --- /dev/null -+++ grc/nrsc5_l1_fm_encoder_mp11.block.yml ++++ b/grc/nrsc5_l1_fm_encoder_mp11.block.yml @@ -0,0 +1,34 @@ +# auto-generated by grc.converter + @@ -11374,7 +11374,7 @@ index 0000000..8c109f3 diff --git a/grc/nrsc5_l1_fm_encoder_mp11.xml b/grc/nrsc5_l1_fm_encoder_mp11.xml deleted file mode 100644 index cba0837..0000000 ---- grc/nrsc5_l1_fm_encoder_mp11.xml +--- a/grc/nrsc5_l1_fm_encoder_mp11.xml +++ /dev/null @@ -1,33 +0,0 @@ - @@ -11414,7 +11414,7 @@ diff --git a/grc/nrsc5_l1_fm_encoder_mp2.block.yml b/grc/nrsc5_l1_fm_encoder_mp2 new file mode 100644 index 0000000..6e049b5 --- /dev/null -+++ grc/nrsc5_l1_fm_encoder_mp2.block.yml ++++ b/grc/nrsc5_l1_fm_encoder_mp2.block.yml @@ -0,0 +1,30 @@ +# auto-generated by grc.converter + @@ -11449,7 +11449,7 @@ index 0000000..6e049b5 diff --git a/grc/nrsc5_l1_fm_encoder_mp2.xml b/grc/nrsc5_l1_fm_encoder_mp2.xml deleted file mode 100644 index a176309..0000000 ---- grc/nrsc5_l1_fm_encoder_mp2.xml +--- a/grc/nrsc5_l1_fm_encoder_mp2.xml +++ /dev/null @@ -1,28 +0,0 @@ - @@ -11484,7 +11484,7 @@ diff --git a/grc/nrsc5_l1_fm_encoder_mp3.block.yml b/grc/nrsc5_l1_fm_encoder_mp3 new file mode 100644 index 0000000..e5077ca --- /dev/null -+++ grc/nrsc5_l1_fm_encoder_mp3.block.yml ++++ b/grc/nrsc5_l1_fm_encoder_mp3.block.yml @@ -0,0 +1,30 @@ +# auto-generated by grc.converter + @@ -11519,7 +11519,7 @@ index 0000000..e5077ca diff --git a/grc/nrsc5_l1_fm_encoder_mp3.xml b/grc/nrsc5_l1_fm_encoder_mp3.xml deleted file mode 100644 index 11af89a..0000000 ---- grc/nrsc5_l1_fm_encoder_mp3.xml +--- a/grc/nrsc5_l1_fm_encoder_mp3.xml +++ /dev/null @@ -1,28 +0,0 @@ - @@ -11554,7 +11554,7 @@ diff --git a/grc/nrsc5_l1_fm_encoder_mp5.block.yml b/grc/nrsc5_l1_fm_encoder_mp5 new file mode 100644 index 0000000..5a79a23 --- /dev/null -+++ grc/nrsc5_l1_fm_encoder_mp5.block.yml ++++ b/grc/nrsc5_l1_fm_encoder_mp5.block.yml @@ -0,0 +1,34 @@ +# auto-generated by grc.converter + @@ -11593,7 +11593,7 @@ index 0000000..5a79a23 diff --git a/grc/nrsc5_l1_fm_encoder_mp5.xml b/grc/nrsc5_l1_fm_encoder_mp5.xml deleted file mode 100644 index e5b5209..0000000 ---- grc/nrsc5_l1_fm_encoder_mp5.xml +--- a/grc/nrsc5_l1_fm_encoder_mp5.xml +++ /dev/null @@ -1,33 +0,0 @@ - @@ -11633,7 +11633,7 @@ diff --git a/grc/nrsc5_l1_fm_encoder_mp5_ms1.block.yml b/grc/nrsc5_l1_fm_encoder new file mode 100644 index 0000000..34f9d93 --- /dev/null -+++ grc/nrsc5_l1_fm_encoder_mp5_ms1.block.yml ++++ b/grc/nrsc5_l1_fm_encoder_mp5_ms1.block.yml @@ -0,0 +1,46 @@ +# auto-generated by grc.converter + @@ -11684,7 +11684,7 @@ index 0000000..34f9d93 diff --git a/grc/nrsc5_l1_fm_encoder_mp5_ms1.xml b/grc/nrsc5_l1_fm_encoder_mp5_ms1.xml deleted file mode 100644 index fd66e29..0000000 ---- grc/nrsc5_l1_fm_encoder_mp5_ms1.xml +--- a/grc/nrsc5_l1_fm_encoder_mp5_ms1.xml +++ /dev/null @@ -1,48 +0,0 @@ - @@ -11739,7 +11739,7 @@ diff --git a/grc/nrsc5_l1_fm_encoder_mp6.block.yml b/grc/nrsc5_l1_fm_encoder_mp6 new file mode 100644 index 0000000..32ee051 --- /dev/null -+++ grc/nrsc5_l1_fm_encoder_mp6.block.yml ++++ b/grc/nrsc5_l1_fm_encoder_mp6.block.yml @@ -0,0 +1,30 @@ +# auto-generated by grc.converter + @@ -11774,7 +11774,7 @@ index 0000000..32ee051 diff --git a/grc/nrsc5_l1_fm_encoder_mp6.xml b/grc/nrsc5_l1_fm_encoder_mp6.xml deleted file mode 100644 index b1b3f07..0000000 ---- grc/nrsc5_l1_fm_encoder_mp6.xml +--- a/grc/nrsc5_l1_fm_encoder_mp6.xml +++ /dev/null @@ -1,28 +0,0 @@ - @@ -11809,7 +11809,7 @@ diff --git a/grc/nrsc5_l1_fm_encoder_mp6_ms1.block.yml b/grc/nrsc5_l1_fm_encoder new file mode 100644 index 0000000..fe35996 --- /dev/null -+++ grc/nrsc5_l1_fm_encoder_mp6_ms1.block.yml ++++ b/grc/nrsc5_l1_fm_encoder_mp6_ms1.block.yml @@ -0,0 +1,42 @@ +# auto-generated by grc.converter + @@ -11856,7 +11856,7 @@ index 0000000..fe35996 diff --git a/grc/nrsc5_l1_fm_encoder_mp6_ms1.xml b/grc/nrsc5_l1_fm_encoder_mp6_ms1.xml deleted file mode 100644 index 2302341..0000000 ---- grc/nrsc5_l1_fm_encoder_mp6_ms1.xml +--- a/grc/nrsc5_l1_fm_encoder_mp6_ms1.xml +++ /dev/null @@ -1,43 +0,0 @@ - @@ -11906,7 +11906,7 @@ diff --git a/grc/nrsc5_l2_encoder.block.yml b/grc/nrsc5_l2_encoder.block.yml new file mode 100644 index 0000000..f946b2a --- /dev/null -+++ grc/nrsc5_l2_encoder.block.yml ++++ b/grc/nrsc5_l2_encoder.block.yml @@ -0,0 +1,44 @@ +# auto-generated by grc.converter + @@ -11955,7 +11955,7 @@ index 0000000..f946b2a diff --git a/grc/nrsc5_l2_encoder.xml b/grc/nrsc5_l2_encoder.xml deleted file mode 100644 index 216969a..0000000 ---- grc/nrsc5_l2_encoder.xml +--- a/grc/nrsc5_l2_encoder.xml +++ /dev/null @@ -1,71 +0,0 @@ - @@ -12033,7 +12033,7 @@ diff --git a/grc/nrsc5_psd_encoder.block.yml b/grc/nrsc5_psd_encoder.block.yml new file mode 100644 index 0000000..b0d25ea --- /dev/null -+++ grc/nrsc5_psd_encoder.block.yml ++++ b/grc/nrsc5_psd_encoder.block.yml @@ -0,0 +1,31 @@ +# auto-generated by grc.converter + @@ -12069,7 +12069,7 @@ index 0000000..b0d25ea diff --git a/grc/nrsc5_psd_encoder.xml b/grc/nrsc5_psd_encoder.xml deleted file mode 100644 index 8828da4..0000000 ---- grc/nrsc5_psd_encoder.xml +--- a/grc/nrsc5_psd_encoder.xml +++ /dev/null @@ -1,31 +0,0 @@ - @@ -12107,7 +12107,7 @@ diff --git a/grc/nrsc5_sis_encoder.block.yml b/grc/nrsc5_sis_encoder.block.yml new file mode 100644 index 0000000..448a753 --- /dev/null -+++ grc/nrsc5_sis_encoder.block.yml ++++ b/grc/nrsc5_sis_encoder.block.yml @@ -0,0 +1,24 @@ +# auto-generated by grc.converter + @@ -12136,7 +12136,7 @@ index 0000000..448a753 diff --git a/grc/nrsc5_sis_encoder.xml b/grc/nrsc5_sis_encoder.xml deleted file mode 100644 index 2bd6f1a..0000000 ---- grc/nrsc5_sis_encoder.xml +--- a/grc/nrsc5_sis_encoder.xml +++ /dev/null @@ -1,20 +0,0 @@ - @@ -12161,8 +12161,8 @@ index 2bd6f1a..0000000 - diff --git a/include/nrsc5/CMakeLists.txt b/include/nrsc5/CMakeLists.txt index b3c2c5d..04c74c3 100644 ---- include/nrsc5/CMakeLists.txt -+++ include/nrsc5/CMakeLists.txt +--- a/include/nrsc5/CMakeLists.txt ++++ b/include/nrsc5/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2011,2012 Free Software Foundation, Inc. # @@ -12187,8 +12187,8 @@ index b3c2c5d..04c74c3 100644 ) diff --git a/include/nrsc5/api.h b/include/nrsc5/api.h index f0e8af7..449b586 100644 ---- include/nrsc5/api.h -+++ include/nrsc5/api.h +--- a/include/nrsc5/api.h ++++ b/include/nrsc5/api.h @@ -1,7 +1,8 @@ /* * Copyright 2011 Free Software Foundation, Inc. @@ -12201,8 +12201,8 @@ index f0e8af7..449b586 100644 * it under the terms of the GNU General Public License as published by diff --git a/include/nrsc5/hdc_encoder.h b/include/nrsc5/hdc_encoder.h index 5de1490..4b40b14 100644 ---- include/nrsc5/hdc_encoder.h -+++ include/nrsc5/hdc_encoder.h +--- a/include/nrsc5/hdc_encoder.h ++++ b/include/nrsc5/hdc_encoder.h @@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ @@ -12213,8 +12213,8 @@ index 5de1490..4b40b14 100644 diff --git a/include/nrsc5/l1_fm_encoder.h b/include/nrsc5/l1_fm_encoder.h index 9cebec6..52df09d 100644 ---- include/nrsc5/l1_fm_encoder.h -+++ include/nrsc5/l1_fm_encoder.h +--- a/include/nrsc5/l1_fm_encoder.h ++++ b/include/nrsc5/l1_fm_encoder.h @@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ @@ -12225,8 +12225,8 @@ index 9cebec6..52df09d 100644 diff --git a/include/nrsc5/l2_encoder.h b/include/nrsc5/l2_encoder.h index 935f3b6..4a3bac0 100644 ---- include/nrsc5/l2_encoder.h -+++ include/nrsc5/l2_encoder.h +--- a/include/nrsc5/l2_encoder.h ++++ b/include/nrsc5/l2_encoder.h @@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ @@ -12237,8 +12237,8 @@ index 935f3b6..4a3bac0 100644 diff --git a/include/nrsc5/psd_encoder.h b/include/nrsc5/psd_encoder.h index f916c71..d6cbca5 100644 ---- include/nrsc5/psd_encoder.h -+++ include/nrsc5/psd_encoder.h +--- a/include/nrsc5/psd_encoder.h ++++ b/include/nrsc5/psd_encoder.h @@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ @@ -12249,8 +12249,8 @@ index f916c71..d6cbca5 100644 diff --git a/include/nrsc5/sis_encoder.h b/include/nrsc5/sis_encoder.h index ae65c2f..73e26de 100644 ---- include/nrsc5/sis_encoder.h -+++ include/nrsc5/sis_encoder.h +--- a/include/nrsc5/sis_encoder.h ++++ b/include/nrsc5/sis_encoder.h @@ -18,7 +18,6 @@ * Boston, MA 02110-1301, USA. */ @@ -12261,8 +12261,8 @@ index ae65c2f..73e26de 100644 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 9f87e20..a23aef5 100644 ---- lib/CMakeLists.txt -+++ lib/CMakeLists.txt +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt @@ -1,6 +1,7 @@ -# Copyright 2011,2012,2016 Free Software Foundation, Inc. +# Copyright 2011,2012,2016,2018,2019 Free Software Foundation, Inc. @@ -12366,8 +12366,8 @@ index 9f87e20..a23aef5 100644 +endforeach(qa_file) diff --git a/lib/hdc_encoder_impl.cc b/lib/hdc_encoder_impl.cc index 706c2ac..89b1374 100644 ---- lib/hdc_encoder_impl.cc -+++ lib/hdc_encoder_impl.cc +--- a/lib/hdc_encoder_impl.cc ++++ b/lib/hdc_encoder_impl.cc @@ -35,6 +35,7 @@ namespace gr { (new hdc_encoder_impl(channels, bitrate)); } @@ -12378,8 +12378,8 @@ index 706c2ac..89b1374 100644 */ diff --git a/lib/hdc_encoder_impl.h b/lib/hdc_encoder_impl.h index ff6b1d2..aa5a5a6 100644 ---- lib/hdc_encoder_impl.h -+++ lib/hdc_encoder_impl.h +--- a/lib/hdc_encoder_impl.h ++++ b/lib/hdc_encoder_impl.h @@ -54,6 +54,7 @@ namespace gr { gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, @@ -12390,8 +12390,8 @@ index ff6b1d2..aa5a5a6 100644 } // namespace nrsc5 diff --git a/lib/l1_fm_encoder_impl.cc b/lib/l1_fm_encoder_impl.cc index 6861700..bef95ea 100644 ---- lib/l1_fm_encoder_impl.cc -+++ lib/l1_fm_encoder_impl.cc +--- a/lib/l1_fm_encoder_impl.cc ++++ b/lib/l1_fm_encoder_impl.cc @@ -105,6 +105,7 @@ namespace gr { (new l1_fm_encoder_impl(psm, ssm)); } @@ -12402,8 +12402,8 @@ index 6861700..bef95ea 100644 */ diff --git a/lib/l1_fm_encoder_impl.h b/lib/l1_fm_encoder_impl.h index e0bba24..a1db3c2 100644 ---- lib/l1_fm_encoder_impl.h -+++ lib/l1_fm_encoder_impl.h +--- a/lib/l1_fm_encoder_impl.h ++++ b/lib/l1_fm_encoder_impl.h @@ -105,6 +105,7 @@ namespace gr { gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, @@ -12414,8 +12414,8 @@ index e0bba24..a1db3c2 100644 } // namespace nrsc5 diff --git a/lib/l2_encoder_impl.cc b/lib/l2_encoder_impl.cc index ce14714..2ef81c8 100644 ---- lib/l2_encoder_impl.cc -+++ lib/l2_encoder_impl.cc +--- a/lib/l2_encoder_impl.cc ++++ b/lib/l2_encoder_impl.cc @@ -41,6 +41,7 @@ namespace gr { (new l2_encoder_impl(num_progs, first_prog, size)); } @@ -12426,8 +12426,8 @@ index ce14714..2ef81c8 100644 */ diff --git a/lib/l2_encoder_impl.h b/lib/l2_encoder_impl.h index 9fa9494..084395a 100644 ---- lib/l2_encoder_impl.h -+++ lib/l2_encoder_impl.h +--- a/lib/l2_encoder_impl.h ++++ b/lib/l2_encoder_impl.h @@ -85,6 +85,7 @@ namespace gr { gr_vector_int &ninput_items, gr_vector_const_void_star &input_items, @@ -12438,8 +12438,8 @@ index 9fa9494..084395a 100644 } // namespace nrsc5 diff --git a/lib/psd_encoder_impl.cc b/lib/psd_encoder_impl.cc index acb4010..29c9ed7 100644 ---- lib/psd_encoder_impl.cc -+++ lib/psd_encoder_impl.cc +--- a/lib/psd_encoder_impl.cc ++++ b/lib/psd_encoder_impl.cc @@ -35,6 +35,7 @@ namespace gr { (new psd_encoder_impl(prog_num, title, artist)); } @@ -12451,7 +12451,7 @@ index acb4010..29c9ed7 100644 diff --git a/lib/qa_nrsc5.cc b/lib/qa_nrsc5.cc deleted file mode 100644 index b523eb2..0000000 ---- lib/qa_nrsc5.cc +--- a/lib/qa_nrsc5.cc +++ /dev/null @@ -1,36 +0,0 @@ -/* @@ -12493,7 +12493,7 @@ index b523eb2..0000000 diff --git a/lib/qa_nrsc5.h b/lib/qa_nrsc5.h deleted file mode 100644 index 8ccf0f5..0000000 ---- lib/qa_nrsc5.h +--- a/lib/qa_nrsc5.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- c++ -*- */ @@ -12536,8 +12536,8 @@ index 8ccf0f5..0000000 -#endif /* _QA_NRSC5_H_ */ diff --git a/lib/sis_encoder_impl.cc b/lib/sis_encoder_impl.cc index 2e1cb19..714bfb0 100644 ---- lib/sis_encoder_impl.cc -+++ lib/sis_encoder_impl.cc +--- a/lib/sis_encoder_impl.cc ++++ b/lib/sis_encoder_impl.cc @@ -35,6 +35,7 @@ namespace gr { (new sis_encoder_impl(short_name)); } @@ -12549,7 +12549,7 @@ index 2e1cb19..714bfb0 100644 diff --git a/lib/test_nrsc5.cc b/lib/test_nrsc5.cc deleted file mode 100644 index 59bd57c..0000000 ---- lib/test_nrsc5.cc +--- a/lib/test_nrsc5.cc +++ /dev/null @@ -1,48 +0,0 @@ -/* -*- c++ -*- */ @@ -12602,8 +12602,8 @@ index 59bd57c..0000000 -} diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index d0b133e..9b25913 100644 ---- python/CMakeLists.txt -+++ python/CMakeLists.txt +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2011 Free Software Foundation, Inc. # @@ -12626,8 +12626,8 @@ index d0b133e..9b25913 100644 +GR_ADD_TEST(qa_sis_encoder ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_sis_encoder.py) diff --git a/python/__init__.py b/python/__init__.py index f192a2d..476fb00 100644 ---- python/__init__.py -+++ python/__init__.py +--- a/python/__init__.py ++++ b/python/__init__.py @@ -22,13 +22,14 @@ This is the GNU Radio NRSC5 module. Place your Python package description here (python/__init__.py). @@ -12649,7 +12649,7 @@ index f192a2d..476fb00 100644 diff --git a/python/build_utils.py b/python/build_utils.py deleted file mode 100644 index cf58a97..0000000 ---- python/build_utils.py +--- a/python/build_utils.py +++ /dev/null @@ -1,226 +0,0 @@ -# @@ -12880,8 +12880,8 @@ index cf58a97..0000000 - return d diff --git a/python/qa_hdc_encoder.py b/python/qa_hdc_encoder.py index b57d841..7266aa9 100755 ---- python/qa_hdc_encoder.py -+++ python/qa_hdc_encoder.py +--- a/python/qa_hdc_encoder.py ++++ b/python/qa_hdc_encoder.py @@ -23,19 +23,19 @@ from gnuradio import blocks import nrsc5_swig as nrsc5 @@ -12911,8 +12911,8 @@ index b57d841..7266aa9 100755 + gr_unittest.run(qa_hdc_encoder) diff --git a/python/qa_l1_fm_encoder.py b/python/qa_l1_fm_encoder.py index 9b22e0e..3ebd761 100755 ---- python/qa_l1_fm_encoder.py -+++ python/qa_l1_fm_encoder.py +--- a/python/qa_l1_fm_encoder.py ++++ b/python/qa_l1_fm_encoder.py @@ -23,19 +23,19 @@ from gnuradio import blocks import nrsc5_swig as nrsc5 @@ -12942,8 +12942,8 @@ index 9b22e0e..3ebd761 100755 + gr_unittest.run(qa_l1_fm_encoder) diff --git a/python/qa_l2_encoder.py b/python/qa_l2_encoder.py index cb71f27..cb48bd2 100755 ---- python/qa_l2_encoder.py -+++ python/qa_l2_encoder.py +--- a/python/qa_l2_encoder.py ++++ b/python/qa_l2_encoder.py @@ -23,19 +23,19 @@ from gnuradio import blocks import nrsc5_swig as nrsc5 @@ -12973,8 +12973,8 @@ index cb71f27..cb48bd2 100755 + gr_unittest.run(qa_l2_encoder) diff --git a/python/qa_psd_encoder.py b/python/qa_psd_encoder.py index a274a9c..944240d 100755 ---- python/qa_psd_encoder.py -+++ python/qa_psd_encoder.py +--- a/python/qa_psd_encoder.py ++++ b/python/qa_psd_encoder.py @@ -23,19 +23,19 @@ from gnuradio import blocks import nrsc5_swig as nrsc5 @@ -13004,8 +13004,8 @@ index a274a9c..944240d 100755 + gr_unittest.run(qa_psd_encoder) diff --git a/python/qa_sis_encoder.py b/python/qa_sis_encoder.py index 96a83cd..485ab68 100755 ---- python/qa_sis_encoder.py -+++ python/qa_sis_encoder.py +--- a/python/qa_sis_encoder.py ++++ b/python/qa_sis_encoder.py @@ -23,19 +23,19 @@ from gnuradio import blocks import nrsc5_swig as nrsc5 @@ -13035,8 +13035,8 @@ index 96a83cd..485ab68 100755 + gr_unittest.run(qa_sis_encoder) diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index 06747c5..351aa9b 100644 ---- swig/CMakeLists.txt -+++ swig/CMakeLists.txt +--- a/swig/CMakeLists.txt ++++ b/swig/CMakeLists.txt @@ -1,6 +1,7 @@ # Copyright 2011 Free Software Foundation, Inc. # @@ -13082,8 +13082,8 @@ index 06747c5..351aa9b 100644 diff --git a/swig/nrsc5_swig.i b/swig/nrsc5_swig.i index 99841a3..4b75b62 100644 ---- swig/nrsc5_swig.i -+++ swig/nrsc5_swig.i +--- a/swig/nrsc5_swig.i ++++ b/swig/nrsc5_swig.i @@ -2,27 +2,26 @@ #define NRSC5_API diff --git a/srcpkgs/gnuradio-nrsc5/template b/srcpkgs/gnuradio-nrsc5/template index 0f7ad2134ac..6299e7c90b0 100644 --- a/srcpkgs/gnuradio-nrsc5/template +++ b/srcpkgs/gnuradio-nrsc5/template @@ -14,7 +14,6 @@ license="GPL-3.0-or-later" homepage="https://github.com/argilo/gr-nrsc5/" distfiles="https://github.com/argilo/gr-nrsc5/archive/v${version}.tar.gz" checksum=d736c4cb1104254d07296d2a61880e07149c9bfd1a49aed504215672d4e09485 -patch_args=-Np0 export CMAKE_GENERATOR="Unix Makefiles" diff --git a/srcpkgs/gnustep-base/patches/use-va_copy.patch b/srcpkgs/gnustep-base/patches/use-va_copy.patch index 2d5ea727cc3..0e8e0ff468e 100644 --- a/srcpkgs/gnustep-base/patches/use-va_copy.patch +++ b/srcpkgs/gnustep-base/patches/use-va_copy.patch @@ -1,5 +1,5 @@ ---- Source/GSFormat.m.orig -+++ Source/GSFormat.m +--- a/Source/GSFormat.m ++++ b/Source/GSFormat.m @@ -884,10 +884,10 @@ /* Initialize local variables. */ done = 0; diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template index aaf01eaaf64..483dd8011be 100644 --- a/srcpkgs/gnustep-base/template +++ b/srcpkgs/gnustep-base/template @@ -13,7 +13,6 @@ homepage="http://www.gnustep.org/" distfiles="http://ftp.gnustep.org/pub/gnustep/core/gnustep-base-${version}.tar.gz" checksum=c7d7c6e64ac5f5d0a4d5c4369170fc24ed503209e91935eb0e2979d1601039ed make_check=extended -patch_args=-Np0 nocross="objc doesn't get cross build at present within gcc" case "$XBPS_TARGET_MACHINE" in diff --git a/srcpkgs/gnustep-make/patches/musl.patch b/srcpkgs/gnustep-make/patches/musl.patch index 24e532d3412..2163a842295 100644 --- a/srcpkgs/gnustep-make/patches/musl.patch +++ b/srcpkgs/gnustep-make/patches/musl.patch @@ -1,5 +1,5 @@ ---- target.make.orig -+++ target.make +--- a/target.make ++++ b/target.make @@ -553,7 +553,7 @@ # The following ifeq matches both 'linux-gnu' (which is GNU/Linux ELF) # and 'gnu0.3' (I've been told GNUSTEP_TARGET_OS is 'gnu0.3' on diff --git a/srcpkgs/gnustep-make/template b/srcpkgs/gnustep-make/template index 4c6407db9f5..e77d199252d 100644 --- a/srcpkgs/gnustep-make/template +++ b/srcpkgs/gnustep-make/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="http://www.gnustep.org" distfiles="http://ftp.gnustep.org/pub/gnustep/core/${pkgname}-${version}.tar.gz" checksum=a0b066c11257879c7c85311dea69c67f6dc741ef339db6514f85b64992c40d2a -patch_args=-Np0 post_install() { sed -i 's,/builddir/.xbps-gnustep-make/wrappers,/usr/bin,g' ${DESTDIR}/usr/share/GNUstep/Makefiles/config.make diff --git a/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch b/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch index 6625c25ff58..28fdf69446a 100644 --- a/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch +++ b/srcpkgs/gnutls/patches/tests-certtool-no-prompt.patch @@ -1,8 +1,8 @@ upstream: no reason: don't prompt for password, don't assume it has been asked for ---- tests/cert-tests/certtool -+++ tests/cert-tests/certtool +--- a/tests/cert-tests/certtool ++++ b/tests/cert-tests/certtool @@ -26,6 +26,7 @@ TMPFILE1=certtool-file1.$$.tmp TMPFILE2=certtool-file2.$$.tmp diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index fc1a507c8b1..3f02c29d3b2 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -22,7 +22,6 @@ license="GPL-3.0-only, LGPL-2.1-or-later" homepage="https://gnutls.org" distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz" checksum=1b79b381ac283d8b054368b335c408fedcb9b7144e0c07f531e3537d4328f3b3 -patch_args=-Np0 pre_check() { # same as $PASS in tests/cert-tests/certtool diff --git a/srcpkgs/goaccess/patches/cross.patch b/srcpkgs/goaccess/patches/cross.patch index d12bfac248b..f4a85fc50db 100644 --- a/srcpkgs/goaccess/patches/cross.patch +++ b/srcpkgs/goaccess/patches/cross.patch @@ -1,5 +1,5 @@ ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -107,6 +107,10 @@ if HAS_SEDTR else ./bin2c resources/js/app.js src/appjs.h app_js diff --git a/srcpkgs/goaccess/template b/srcpkgs/goaccess/template index 2dec69e429b..ce6231cc025 100644 --- a/srcpkgs/goaccess/template +++ b/srcpkgs/goaccess/template @@ -12,7 +12,6 @@ license="MIT" homepage="https://goaccess.io" distfiles="http://tar.goaccess.io/goaccess-${version}.tar.gz" checksum=c4820e781f75d9446f6b1be5fc8d11c6ec94a47fa8dd523001698c589f46c1ba -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/godot/patches/10-fix-musl.patch b/srcpkgs/godot/patches/10-fix-musl.patch index 535d9594106..ed32914e070 100644 --- a/srcpkgs/godot/patches/10-fix-musl.patch +++ b/srcpkgs/godot/patches/10-fix-musl.patch @@ -1,5 +1,5 @@ ---- joystick_linux.cpp 2017-12-12 21:28:08.263329050 +0100 -+++ platform/x11/joypad_linux.cpp 2017-12-12 21:29:25.500336429 +0100 +--- a/joystick_linux.cpp 2017-12-12 21:28:08.263329050 +0100 ++++ b/platform/x11/joypad_linux.cpp 2017-12-12 21:29:25.500336429 +0100 @@ -42,6 +42,10 @@ #include #endif diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index 134880e902c..aa63677d6d8 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -29,7 +29,6 @@ homepage="https://www.godotengine.org/" distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz" checksum=595ff16eaef3d0b6c030575f4b7fcae8b805e407b90a2f71af3e4142362c1794 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio -patch_args=-Np0 CFLAGS+=" -fPIE -fPIC" LDFLAGS+=" -pie" diff --git a/srcpkgs/gogglesmm/patches/endian.patch b/srcpkgs/gogglesmm/patches/endian.patch index 17d98f44e2a..12cf73a7b46 100644 --- a/srcpkgs/gogglesmm/patches/endian.patch +++ b/srcpkgs/gogglesmm/patches/endian.patch @@ -6,8 +6,8 @@ Date: Sat Jan 4 18:04:43 2020 +0100 diff --git src/GMCover.cpp src/GMCover.cpp index bbebd6a..2796360 100644 ---- src/GMCover.cpp -+++ src/GMCover.cpp +--- a/src/GMCover.cpp ++++ b/src/GMCover.cpp @@ -26,8 +26,8 @@ #define MSB_UINT(x) ((x)[3]) | ((x)[2]<<8) | ((x)[1]<<16) | ((x)[0]<<24) #define MSB_SHORT(x) ((x)[0]<<8) | ((x)[1]) diff --git a/srcpkgs/gogglesmm/template b/srcpkgs/gogglesmm/template index 0b4c48ad6b2..29579786726 100644 --- a/srcpkgs/gogglesmm/template +++ b/srcpkgs/gogglesmm/template @@ -17,7 +17,6 @@ distfiles="https://github.com/gogglesmm/gogglesmm/archive/${version}.tar.gz" checksum=f068667e0a825ac792eda344cbe94c29fe8668ddbdd269c094e5bf168acd2380 python_version=2 #unverified nocross="Tries to execute compiled code" -patch_args=-Np0 case "$XBPS_TARGET_MACHINE" in *-musl) broken="PTHREAD_RWLOCK_PREFER_WRITER_NP usage" ;; diff --git a/srcpkgs/goldendict/patches/QAction.patch b/srcpkgs/goldendict/patches/QAction.patch index 146fe34e2fa..1fe228d74a9 100644 --- a/srcpkgs/goldendict/patches/QAction.patch +++ b/srcpkgs/goldendict/patches/QAction.patch @@ -1,5 +1,5 @@ ---- fulltextsearch.hh 2016-04-26 18:32:50.000000000 +0200 -+++ - 2019-07-02 21:27:37.881036339 +0200 +--- a/fulltextsearch.hh 2016-04-26 18:32:50.000000000 +0200 ++++ b/fulltextsearch.hh 2016-04-26 18:32:50.000000000 +0200 @@ -1,6 +1,7 @@ #ifndef __FULLTEXTSEARCH_HH_INCLUDED__ #define __FULLTEXTSEARCH_HH_INCLUDED__ @@ -8,8 +8,8 @@ #include #include #include ---- groups_widgets.hh 2016-04-26 18:32:50.000000000 +0200 -+++ - 2019-07-02 21:31:52.350308868 +0200 +--- a/groups_widgets.hh 2016-04-26 18:32:50.000000000 +0200 ++++ b/groups_widgets.hh 2016-04-26 18:32:50.000000000 +0200 @@ -10,6 +10,7 @@ #include diff --git a/srcpkgs/goldendict/patches/QIcon.patch b/srcpkgs/goldendict/patches/QIcon.patch index ea066d1946f..d9f932db86c 100644 --- a/srcpkgs/goldendict/patches/QIcon.patch +++ b/srcpkgs/goldendict/patches/QIcon.patch @@ -1,5 +1,5 @@ ---- initializing.cc 2016-04-26 18:32:50.000000000 +0200 -+++ - 2019-07-02 21:26:19.088317401 +0200 +--- a/initializing.cc 2016-04-26 18:32:50.000000000 +0200 ++++ b/initializing.cc 2016-04-26 18:32:50.000000000 +0200 @@ -3,6 +3,7 @@ #include "initializing.hh" diff --git a/srcpkgs/goldendict/patches/endian.patch b/srcpkgs/goldendict/patches/endian.patch index 16b9914f0b8..2f7264d003e 100644 --- a/srcpkgs/goldendict/patches/endian.patch +++ b/srcpkgs/goldendict/patches/endian.patch @@ -12,8 +12,8 @@ Date: Sat Jan 4 23:12:59 2020 +0100 diff --git ripemd.cc ripemd.cc index bad8fc7..24ac811 100644 ---- ripemd.cc -+++ ripemd.cc +--- a/ripemd.cc ++++ b/ripemd.cc @@ -173,7 +173,7 @@ void RIPEMD128::update( const uint8_t * data, size_t len ) void RIPEMD128::digest( uint8_t * digest ) diff --git a/srcpkgs/goldendict/patches/ffmpeg4.patch b/srcpkgs/goldendict/patches/ffmpeg4.patch index 5b102c7b654..f045fa27f54 100644 --- a/srcpkgs/goldendict/patches/ffmpeg4.patch +++ b/srcpkgs/goldendict/patches/ffmpeg4.patch @@ -1,5 +1,5 @@ ---- ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200 -+++ ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200 +--- a/ffmpegaudio.cc.orig 2018-05-09 22:16:13.480659958 +0200 ++++ b/ffmpegaudio.cc 2018-05-09 22:16:50.748322790 +0200 @@ -143,7 +143,7 @@ return false; } diff --git a/srcpkgs/goldendict/patches/musl.patch b/srcpkgs/goldendict/patches/musl.patch index c67968f2bfc..efe9f50df8f 100644 --- a/srcpkgs/goldendict/patches/musl.patch +++ b/srcpkgs/goldendict/patches/musl.patch @@ -1,5 +1,5 @@ ---- termination.cc.old 2017-06-24 15:00:21.287094332 +0200 -+++ termination.cc 2017-06-24 15:01:12.717096292 +0200 +--- a/termination.cc.old 2017-06-24 15:00:21.287094332 +0200 ++++ b/termination.cc 2017-06-24 15:01:12.717096292 +0200 @@ -11,7 +11,7 @@ #include diff --git a/srcpkgs/goldendict/template b/srcpkgs/goldendict/template index c987fefdac4..7553e408d1a 100644 --- a/srcpkgs/goldendict/template +++ b/srcpkgs/goldendict/template @@ -16,7 +16,6 @@ license="GPL-3.0-or-later" homepage="http://goldendict.org/" distfiles="https://github.com/goldendict/goldendict/archive/${version/RC/-RC}.tar.gz" checksum=bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde -patch_args=-Np0 CXXFLAGS="-Wno-deprecated" diff --git a/srcpkgs/gosu/patches/stdexcept.patch b/srcpkgs/gosu/patches/stdexcept.patch index f865b18de15..d19fa748da0 100644 --- a/srcpkgs/gosu/patches/stdexcept.patch +++ b/srcpkgs/gosu/patches/stdexcept.patch @@ -1,7 +1,7 @@ diff --git src/DrawOpQueue.hpp src/DrawOpQueue.hpp index 3a463ce..b06515f 100644 ---- src/DrawOpQueue.hpp -+++ src/DrawOpQueue.hpp +--- a/src/DrawOpQueue.hpp ++++ b/src/DrawOpQueue.hpp @@ -10,6 +10,7 @@ #include #include @@ -12,8 +12,8 @@ index 3a463ce..b06515f 100644 { diff --git src/Font.cpp src/Font.cpp index b2c0152..5bcacad 100644 ---- src/Font.cpp -+++ src/Font.cpp +--- a/src/Font.cpp ++++ b/src/Font.cpp @@ -10,6 +10,7 @@ #include #include @@ -24,8 +24,8 @@ index b2c0152..5bcacad 100644 static const int FONT_RENDER_SCALE = 2; diff --git src/Graphics.cpp src/Graphics.cpp index 0028269..db03fb2 100644 ---- src/Graphics.cpp -+++ src/Graphics.cpp +--- a/src/Graphics.cpp ++++ b/src/Graphics.cpp @@ -13,6 +13,7 @@ #include #include @@ -36,8 +36,8 @@ index 0028269..db03fb2 100644 namespace Gosu diff --git src/LargeImageData.cpp src/LargeImageData.cpp index c0cbe0d..568a126 100644 ---- src/LargeImageData.cpp -+++ src/LargeImageData.cpp +--- a/src/LargeImageData.cpp ++++ b/src/LargeImageData.cpp @@ -3,6 +3,7 @@ #include #include @@ -48,8 +48,8 @@ index c0cbe0d..568a126 100644 Gosu::LargeImageData::LargeImageData(const Bitmap& source, int tile_width, int tile_height, diff --git src/OffScreenTarget.cpp src/OffScreenTarget.cpp index 7044777..0ec7625 100644 ---- src/OffScreenTarget.cpp -+++ src/OffScreenTarget.cpp +--- a/src/OffScreenTarget.cpp ++++ b/src/OffScreenTarget.cpp @@ -5,6 +5,7 @@ #ifndef GOSU_IS_IPHONE #include @@ -60,8 +60,8 @@ index 7044777..0ec7625 100644 #ifdef GOSU_IS_OPENGLES diff --git src/RubyGosu.cxx src/RubyGosu.cxx index 1825875..ae66a71 100644 ---- src/RubyGosu.cxx -+++ src/RubyGosu.cxx +--- a/src/RubyGosu.cxx ++++ b/src/RubyGosu.cxx @@ -17,6 +17,7 @@ @@ -72,8 +72,8 @@ index 1825875..ae66a71 100644 struct SwigMovePointer { diff --git src/SndFile.hpp src/SndFile.hpp index 11e06c1..df17785 100644 ---- src/SndFile.hpp -+++ src/SndFile.hpp +--- a/src/SndFile.hpp ++++ b/src/SndFile.hpp @@ -9,6 +9,7 @@ #define NOMINMAX #include @@ -84,8 +84,8 @@ index 11e06c1..df17785 100644 { diff --git src/Text.cpp src/Text.cpp index 3641fad..f874b03 100644 ---- src/Text.cpp -+++ src/Text.cpp +--- a/src/Text.cpp ++++ b/src/Text.cpp @@ -7,6 +7,7 @@ #include #include @@ -96,8 +96,8 @@ index 3641fad..f874b03 100644 double Gosu::text_width(const u32string& text, diff --git src/TrueTypeFont.cpp src/TrueTypeFont.cpp index e891015..40ed6b6 100644 ---- src/TrueTypeFont.cpp -+++ src/TrueTypeFont.cpp +--- a/src/TrueTypeFont.cpp ++++ b/src/TrueTypeFont.cpp @@ -17,6 +17,7 @@ #include @@ -108,8 +108,8 @@ index e891015..40ed6b6 100644 struct Gosu::TrueTypeFont::Impl diff --git src/WindowUIKit.cpp src/WindowUIKit.cpp index fc5060c..14ea73f 100644 ---- src/WindowUIKit.cpp -+++ src/WindowUIKit.cpp +--- a/src/WindowUIKit.cpp ++++ b/src/WindowUIKit.cpp @@ -3,6 +3,7 @@ #include "GosuViewController.hpp" diff --git a/srcpkgs/gosu/template b/srcpkgs/gosu/template index 9bc74859e37..1dffcc0a766 100644 --- a/srcpkgs/gosu/template +++ b/srcpkgs/gosu/template @@ -13,7 +13,6 @@ license="MIT" homepage="https://www.libgosu.org" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" checksum=4dbc4998e2c630ee7758544de4286c70c68e639524b6088ccdc7b5487c928695 -patch_args=-Np0 CXXFLAGS+=" -D_GLIBCXX_USE_C99_STDIO=1" diff --git a/srcpkgs/goxel/patches/musl.patch b/srcpkgs/goxel/patches/musl.patch index ac05383fabb..de4a2299a12 100644 --- a/srcpkgs/goxel/patches/musl.patch +++ b/srcpkgs/goxel/patches/musl.patch @@ -1,5 +1,5 @@ ---- ext_src/yocto/ext/filesystem.hpp 2020-01-04 07:42:25.000000000 +0100 -+++ - 2020-01-09 03:58:05.975080525 +0100 +--- a/ext_src/yocto/ext/filesystem.hpp 2020-01-04 07:42:25.000000000 +0100 ++++ b/ext_src/yocto/ext/filesystem.hpp 2020-01-04 07:42:25.000000000 +0100 @@ -1525,7 +1525,7 @@ std::string msg = toUtf8(std::wstring((LPWSTR)msgBuf)); LocalFree(msgBuf); diff --git a/srcpkgs/goxel/template b/srcpkgs/goxel/template index ee3c31ace46..e731c606727 100644 --- a/srcpkgs/goxel/template +++ b/srcpkgs/goxel/template @@ -12,7 +12,6 @@ license="GPL-3.0-or-later" homepage="https://guillaumechereau.github.io/goxel/" distfiles="https://github.com/guillaumechereau/goxel/archive/v${version}.tar.gz" checksum=dfb91e62bdd5332e3938923db924bae43f12eaa181040d16e4cc7082316adf1c -patch_args=-Np0 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" diff --git a/srcpkgs/gpart/patches/0001-Fix-crash-on-a-non-disk-device.patch b/srcpkgs/gpart/patches/0001-Fix-crash-on-a-non-disk-device.patch index f5b213f7930..dd21b6c940e 100644 --- a/srcpkgs/gpart/patches/0001-Fix-crash-on-a-non-disk-device.patch +++ b/srcpkgs/gpart/patches/0001-Fix-crash-on-a-non-disk-device.patch @@ -10,8 +10,8 @@ Closes #9 diff --git src/disku.c src/disku.c index b918147..b33ba91 100644 ---- src/disku.c -+++ src/disku.c +--- a/src/disku.c ++++ b/src/disku.c @@ -36,66 +36,33 @@ #include diff --git a/srcpkgs/gpart/patches/0002-gpart-avoid-superfluous-seek-calls.patch b/srcpkgs/gpart/patches/0002-gpart-avoid-superfluous-seek-calls.patch index 7c91cce1c5f..f44719f2272 100644 --- a/srcpkgs/gpart/patches/0002-gpart-avoid-superfluous-seek-calls.patch +++ b/srcpkgs/gpart/patches/0002-gpart-avoid-superfluous-seek-calls.patch @@ -12,8 +12,8 @@ seek() call. diff --git src/gpart.c src/gpart.c index 8555f66..bd3806a 100644 ---- src/gpart.c -+++ src/gpart.c +--- a/src/gpart.c ++++ b/src/gpart.c @@ -13,7 +13,7 @@ * Modified: 11.06.1999 * Handle disk read errors. diff --git a/srcpkgs/gpart/patches/0003-gpart-use-posix_fadvise-to-increase-reading-speed.patch b/srcpkgs/gpart/patches/0003-gpart-use-posix_fadvise-to-increase-reading-speed.patch index c562e5a560c..08bbdaf27ab 100644 --- a/srcpkgs/gpart/patches/0003-gpart-use-posix_fadvise-to-increase-reading-speed.patch +++ b/srcpkgs/gpart/patches/0003-gpart-use-posix_fadvise-to-increase-reading-speed.patch @@ -11,8 +11,8 @@ Use fadvise to tell the OS to try readahead. diff --git configure.ac configure.ac index 6eca1de..21dfc00 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -26,7 +26,7 @@ AC_TYPE_UINT8_T # Checks for library functions. @@ -24,8 +24,8 @@ index 6eca1de..21dfc00 100644 AC_SYS_LARGEFILE diff --git src/gpart.c src/gpart.c index bd3806a..63b36a5 100644 ---- src/gpart.c -+++ src/gpart.c +--- a/src/gpart.c ++++ b/src/gpart.c @@ -949,6 +949,10 @@ static void do_guess_loop(disk_desc *d) if ((d->d_fd = open(d->d_dev,O_RDONLY)) == -1) pr(FATAL,EM_OPENFAIL,d->d_dev,strerror(errno)); diff --git a/srcpkgs/gpart/patches/0004-Speed-up-by-reading-larger-chunks.patch b/srcpkgs/gpart/patches/0004-Speed-up-by-reading-larger-chunks.patch index f83932c3235..5cd5656df41 100644 --- a/srcpkgs/gpart/patches/0004-Speed-up-by-reading-larger-chunks.patch +++ b/srcpkgs/gpart/patches/0004-Speed-up-by-reading-larger-chunks.patch @@ -10,8 +10,8 @@ Based on work initiated by mwilck diff --git src/gpart.c src/gpart.c index 63b36a5..d530547 100644 ---- src/gpart.c -+++ src/gpart.c +--- a/src/gpart.c ++++ b/src/gpart.c @@ -163,20 +163,25 @@ byte_t *alloc(ssize_t s) ssize_t bread(int fd,byte_t *buf,size_t ssize,size_t nsecs) diff --git a/srcpkgs/gpart/patches/0005-Add-LVM2-and-btrfs-to-list-of-supported-modules.patch b/srcpkgs/gpart/patches/0005-Add-LVM2-and-btrfs-to-list-of-supported-modules.patch index cc7c6d76bfa..87e78b653de 100644 --- a/srcpkgs/gpart/patches/0005-Add-LVM2-and-btrfs-to-list-of-supported-modules.patch +++ b/srcpkgs/gpart/patches/0005-Add-LVM2-and-btrfs-to-list-of-supported-modules.patch @@ -9,8 +9,8 @@ Subject: [PATCH 5/5] Add LVM2 and btrfs to list of supported modules diff --git README.md README.md index 7cd3e2d..330821b 100644 ---- README.md -+++ README.md +--- a/README.md ++++ b/README.md @@ -41,7 +41,8 @@ See file *INSTALL*. qnx4 | 0x4F | QNX 4.x beos | 0xEB | BeOS fs diff --git a/srcpkgs/gpart/patches/musl_loff_t.patch b/srcpkgs/gpart/patches/musl_loff_t.patch index dfd86854b01..63481608b26 100644 --- a/srcpkgs/gpart/patches/musl_loff_t.patch +++ b/srcpkgs/gpart/patches/musl_loff_t.patch @@ -1,5 +1,5 @@ ---- src/l64seek.h 2015-03-12 16:41:49.000000000 +0100 -+++ src/l64seek.h 2015-08-03 15:02:33.656446144 +0200 +--- a/src/l64seek.h 2015-03-12 16:41:49.000000000 +0100 ++++ b/src/l64seek.h 2015-08-03 15:02:33.656446144 +0200 @@ -20,6 +20,10 @@ #include #include diff --git a/srcpkgs/gpart/template b/srcpkgs/gpart/template index 3c733243002..d222fbf9a78 100644 --- a/srcpkgs/gpart/template +++ b/srcpkgs/gpart/template @@ -10,7 +10,6 @@ license="GPL-2.0-or-later" homepage="https://github.com/baruch/gpart" distfiles="https://github.com/baruch/gpart/archive/${version}.tar.gz" checksum=ec56d12ec9ffdb9877c12692ea6e51620b1ae44473d3d253b27fc31ed9ebb4dd -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/gperftools/patches/armv6.patch b/srcpkgs/gperftools/patches/armv6.patch index 14b97529cf8..ef3fa918187 100644 --- a/srcpkgs/gperftools/patches/armv6.patch +++ b/srcpkgs/gperftools/patches/armv6.patch @@ -1,6 +1,6 @@ diff -urN src/base/atomicops.h src/base/atomicops.h ---- src/base/atomicops.h 2013-07-30 03:12:11.000000000 -0600 -+++ src/base/atomicops.h 2013-08-22 16:40:55.204885730 -0600 +--- a/src/base/atomicops.h 2013-07-30 03:12:11.000000000 -0600 ++++ b/src/base/atomicops.h 2013-08-22 16:40:55.204885730 -0600 @@ -101,7 +101,7 @@ // TODO(csilvers): match piii, not just __i386. Also, match k8 #if defined(__MACH__) && defined(__APPLE__) diff --git a/srcpkgs/gperftools/patches/elf-mem-image-musl.patch b/srcpkgs/gperftools/patches/elf-mem-image-musl.patch index 541cde28b2b..dba8b3d9ea7 100644 --- a/srcpkgs/gperftools/patches/elf-mem-image-musl.patch +++ b/srcpkgs/gperftools/patches/elf-mem-image-musl.patch @@ -1,7 +1,7 @@ This relies on link.h, which is present in musl as well as glibc. ---- src/base/elf_mem_image.h -+++ src/base/elf_mem_image.h +--- a/src/base/elf_mem_image.h ++++ b/src/base/elf_mem_image.h @@ -43,7 +43,7 @@ // Maybe one day we can rewrite this file not to require the elf diff --git a/srcpkgs/gperftools/patches/ppc-musl.patch b/srcpkgs/gperftools/patches/ppc-musl.patch index d7a3645d6d7..bbeb4cd3931 100644 --- a/srcpkgs/gperftools/patches/ppc-musl.patch +++ b/srcpkgs/gperftools/patches/ppc-musl.patch @@ -1,7 +1,7 @@ Compatibility fixes for musl. ---- m4/pc_from_ucontext.m4 -+++ m4/pc_from_ucontext.m4 +--- a/m4/pc_from_ucontext.m4 ++++ b/m4/pc_from_ucontext.m4 @@ -31,6 +31,7 @@ AC_DEFUN([AC_PC_FROM_UCONTEXT], pc_fields="$pc_fields uc_mcontext.gregs[[R15]]" # Linux (arm old [untested]) pc_fields="$pc_fields uc_mcontext.arm_pc" # Linux (arm arch 5) @@ -30,8 +30,8 @@ Compatibility fixes for musl. [ucontext_t u; return u.$pc_field == 0;], AC_DEFINE_UNQUOTED(PC_FROM_UCONTEXT, $pc_field, How to access the PC from a struct ucontext) ---- src/getpc.h -+++ src/getpc.h +--- a/src/getpc.h ++++ b/src/getpc.h @@ -65,6 +65,9 @@ typedef ucontext ucontext_t; #endif @@ -42,8 +42,8 @@ Compatibility fixes for musl. // Take the example where function Foo() calls function Bar(). For // many architectures, Bar() is responsible for setting up and tearing ---- src/stacktrace_powerpc-linux-inl.h -+++ src/stacktrace_powerpc-linux-inl.h +--- a/src/stacktrace_powerpc-linux-inl.h ++++ b/src/stacktrace_powerpc-linux-inl.h @@ -186,7 +186,7 @@ static int GET_STACK_TRACE_OR_FRAMES { ucontext_t uc; // We don't care about the rest, since the IP value is at 'uc' field. diff --git a/srcpkgs/gperftools/patches/sigev_notify_thread_id.patch b/srcpkgs/gperftools/patches/sigev_notify_thread_id.patch index 131e06a3f9f..a275eb59bbe 100644 --- a/srcpkgs/gperftools/patches/sigev_notify_thread_id.patch +++ b/srcpkgs/gperftools/patches/sigev_notify_thread_id.patch @@ -23,8 +23,8 @@ Signed-off-by: Aliaksey Kandratsenka diff --git src/profile-handler.cc src/profile-handler.cc index 7fdcb693..fe3715b1 100644 ---- src/profile-handler.cc -+++ src/profile-handler.cc +--- a/src/profile-handler.cc ++++ b/src/profile-handler.cc @@ -49,6 +49,9 @@ #if HAVE_LINUX_SIGEV_THREAD_ID // for timer_{create,settime} and associated typedefs & constants diff --git a/srcpkgs/gperftools/template b/srcpkgs/gperftools/template index 859e6a4e874..de7e9423d34 100644 --- a/srcpkgs/gperftools/template +++ b/srcpkgs/gperftools/template @@ -12,7 +12,6 @@ license="BSD-3-Clause" homepage="https://github.com/gperftools/gperftools" distfiles="${homepage}/releases/download/${pkgname}-${version}/${pkgname}-${version}.tar.gz" checksum=240deacdd628b6459671b83eb0c4db8e97baadf659f25b92e9a078d536bd513e -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then # needed by some newly enabled code diff --git a/srcpkgs/gpgme/patches/cmake-crossbuild-support.patch b/srcpkgs/gpgme/patches/cmake-crossbuild-support.patch index 702f050345b..328a13e5b64 100644 --- a/srcpkgs/gpgme/patches/cmake-crossbuild-support.patch +++ b/srcpkgs/gpgme/patches/cmake-crossbuild-support.patch @@ -1,7 +1,7 @@ diff --git lang/cpp/src/GpgmeppConfig.cmake.in.in lang/cpp/src/GpgmeppConfig.cmake.in.in index 73f5eaad..019de555 100644 ---- lang/cpp/src/GpgmeppConfig.cmake.in.in -+++ lang/cpp/src/GpgmeppConfig.cmake.in.in +--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in ++++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in @@ -58,19 +58,41 @@ unset(_targetsDefined) unset(_targetsNotDefined) unset(_expectedTargets) @@ -49,8 +49,8 @@ index 73f5eaad..019de555 100644 foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) diff --git lang/qt/src/QGpgmeConfig.cmake.in.in lang/qt/src/QGpgmeConfig.cmake.in.in index a17a19fd..29a6b87a 100644 ---- lang/qt/src/QGpgmeConfig.cmake.in.in -+++ lang/qt/src/QGpgmeConfig.cmake.in.in +--- a/lang/qt/src/QGpgmeConfig.cmake.in.in ++++ b/lang/qt/src/QGpgmeConfig.cmake.in.in @@ -58,19 +58,41 @@ unset(_targetsDefined) unset(_targetsNotDefined) unset(_expectedTargets) diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index 62f7384c0bf..072da12708d 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.gnupg.org/software/gpgme/index.html" distfiles="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${version}.tar.bz2" checksum=eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then configure_args+=" ac_cv_sys_file_offset_bits=no" diff --git a/srcpkgs/gpick/patches/cmake.patch b/srcpkgs/gpick/patches/cmake.patch index 1426ce09592..222c22df2d5 100644 --- a/srcpkgs/gpick/patches/cmake.patch +++ b/srcpkgs/gpick/patches/cmake.patch @@ -11,8 +11,8 @@ It's a CMake weirdness, sometimes it can't find files when cross compiling unles diff --git a/cmake/Version.cmake b/cmake/Version.cmake index fd0487d..8cbf3c0 100644 ---- cmake/Version.cmake -+++ cmake/Version.cmake +--- a/cmake/Version.cmake ++++ b/cmake/Version.cmake @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 2.8) find_program(GIT_EXECUTABLE git DOC "Git version control") diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template index aad5569a332..b3010833414 100644 --- a/srcpkgs/gpick/template +++ b/srcpkgs/gpick/template @@ -12,7 +12,6 @@ license="BSD-3-Clause" homepage="https://github.com/thezbyg/gpick" distfiles="https://github.com/thezbyg/gpick/archive/${pkgname}-${version}.tar.gz" checksum=7d02be171cc88c44ad3e3572c0922bbabedc9d542b989f324fca9d5db3161e9c -patch_args=-Np0 post_install() { rm -rf ${DESTDIR}/usr/share/doc diff --git a/srcpkgs/gpm/patches/musl-fcntl.patch b/srcpkgs/gpm/patches/musl-fcntl.patch index 8c5e8fa69bb..3117476f5c8 100644 --- a/srcpkgs/gpm/patches/musl-fcntl.patch +++ b/srcpkgs/gpm/patches/musl-fcntl.patch @@ -1,7 +1,7 @@ The location is wrong, it is just ---- src/lib/liblow.c 2012-10-26 23:21:38.000000000 +0200 -+++ src/lib/liblow.c 2015-06-22 15:36:38.956046661 +0200 +--- a/src/lib/liblow.c 2012-10-26 23:21:38.000000000 +0200 ++++ b/src/lib/liblow.c 2015-06-22 15:36:38.956046661 +0200 @@ -33,7 +33,7 @@ #include /* socket() */ #include /* socket() */ @@ -11,8 +11,8 @@ The location is wrong, it is just #include /* stat() */ #ifdef SIGTSTP /* true if BSD system */ ---- src/daemon/gpm.c 2012-10-26 23:21:38.000000000 +0200 -+++ src/daemon/gpm.c 2015-06-22 15:44:46.825020280 +0200 +--- a/src/daemon/gpm.c 2012-10-26 23:21:38.000000000 +0200 ++++ b/src/daemon/gpm.c 2015-06-22 15:44:46.825020280 +0200 @@ -29,7 +29,7 @@ #include /* SIGPIPE */ #include /* time() */ diff --git a/srcpkgs/gpm/patches/musl-gpm_h.patch b/srcpkgs/gpm/patches/musl-gpm_h.patch index 9ba322c4f4c..0549ba4db45 100644 --- a/srcpkgs/gpm/patches/musl-gpm_h.patch +++ b/srcpkgs/gpm/patches/musl-gpm_h.patch @@ -1,7 +1,7 @@ There is no -Isrc/headers, thus specify gpm.h relative location ---- src/prog/get-versions.c 2012-10-26 23:21:38.000000000 +0200 -+++ src/prog/get-versions.c 2015-06-22 15:49:30.536004939 +0200 +--- a/src/prog/get-versions.c 2012-10-26 23:21:38.000000000 +0200 ++++ b/src/prog/get-versions.c 2015-06-22 15:49:30.536004939 +0200 @@ -22,7 +22,7 @@ ********/ diff --git a/srcpkgs/gpm/patches/musl-linux_major_h.patch b/srcpkgs/gpm/patches/musl-linux_major_h.patch index d2671102c69..582a1c57201 100644 --- a/srcpkgs/gpm/patches/musl-linux_major_h.patch +++ b/srcpkgs/gpm/patches/musl-linux_major_h.patch @@ -1,7 +1,7 @@ The macro major() is defined in sys/sysmacros.h ---- src/daemon/open_console.c 2012-10-26 23:21:38.000000000 +0200 -+++ src/daemon/open_console.c 2015-06-22 16:13:14.921927918 +0200 +--- a/src/daemon/open_console.c 2012-10-26 23:21:38.000000000 +0200 ++++ b/src/daemon/open_console.c 2015-06-22 16:13:14.921927918 +0200 @@ -25,6 +25,7 @@ /* Linux specific (to be outsourced in gpm2 */ diff --git a/srcpkgs/gpm/patches/musl-select.patch b/srcpkgs/gpm/patches/musl-select.patch index 02f8d1b8af9..3a57ee3355b 100644 --- a/srcpkgs/gpm/patches/musl-select.patch +++ b/srcpkgs/gpm/patches/musl-select.patch @@ -1,7 +1,7 @@ The FD_ISSET macro and fd_set are defined in sys/select.h ---- src/prog/display-buttons.c 2012-10-26 23:21:38.000000000 +0200 -+++ src/prog/display-buttons.c 2015-06-22 15:40:19.594034730 +0200 +--- a/src/prog/display-buttons.c 2012-10-26 23:21:38.000000000 +0200 ++++ b/src/prog/display-buttons.c 2015-06-22 15:40:19.594034730 +0200 @@ -36,7 +36,8 @@ #include /* printf() */ #include /* time() */ @@ -12,8 +12,8 @@ The FD_ISSET macro and fd_set are defined in sys/select.h /* display resulting data */ int display_data(Gpm_Event *event, void *data) ---- src/prog/display-coords.c 2012-10-26 23:21:38.000000000 +0200 -+++ src/prog/display-coords.c 2015-06-22 15:41:05.433032252 +0200 +--- a/src/prog/display-coords.c 2012-10-26 23:21:38.000000000 +0200 ++++ b/src/prog/display-coords.c 2015-06-22 15:41:05.433032252 +0200 @@ -37,7 +37,8 @@ #include /* printf() */ #include /* time() */ @@ -24,8 +24,8 @@ The FD_ISSET macro and fd_set are defined in sys/select.h /* display resulting data */ int display_data(Gpm_Event *event, void *data) ---- src/prog/open_console.c 2012-10-26 23:21:38.000000000 +0200 -+++ src/prog/open_console.c 2015-06-22 15:40:35.002033897 +0200 +--- a/src/prog/open_console.c 2012-10-26 23:21:38.000000000 +0200 ++++ b/src/prog/open_console.c 2015-06-22 15:40:35.002033897 +0200 @@ -22,6 +22,7 @@ #include "headers/message.h" /* messaging in gpm */ #include "headers/daemon.h" /* daemon internals */ diff --git a/srcpkgs/gpm/patches/musl-sigaction.patch b/srcpkgs/gpm/patches/musl-sigaction.patch index b5a0f043912..40dae7f45dd 100644 --- a/srcpkgs/gpm/patches/musl-sigaction.patch +++ b/srcpkgs/gpm/patches/musl-sigaction.patch @@ -2,8 +2,8 @@ Use the generic sigemptyset() available on both, glibc and musl libc The SA_INTERRUPT is not defined in musl libc. Copy the (unused?) definition from glibc's header bits/sigaction.h ---- src/prog/gpm-root.y 2012-10-26 23:21:38.000000000 +0200 -+++ src/prog/gpm-root.y 2015-06-22 15:56:19.167982843 +0200 +--- a/src/prog/gpm-root.y 2012-10-26 23:21:38.000000000 +0200 ++++ b/src/prog/gpm-root.y 2015-06-22 15:56:19.167982843 +0200 @@ -56,6 +56,9 @@ #define minor(dev) ((dev)&0xff) #endif diff --git a/srcpkgs/gpm/template b/srcpkgs/gpm/template index 534422693fe..360f58668c5 100644 --- a/srcpkgs/gpm/template +++ b/srcpkgs/gpm/template @@ -11,7 +11,6 @@ license="GPL-2.0-or-later" homepage="http://www.nico.schottelius.org/software/gpm/" distfiles="http://www.nico.schottelius.org/software/gpm/archives/gpm-${version}.tar.lzma" checksum=a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/gpsbabel/patches/configure.patch b/srcpkgs/gpsbabel/patches/configure.patch index ddfa5b73c0d..d971470d4fd 100644 --- a/srcpkgs/gpsbabel/patches/configure.patch +++ b/srcpkgs/gpsbabel/patches/configure.patch @@ -1,5 +1,5 @@ ---- configure -+++ configure +--- a/configure ++++ b/configure @@ -6401,4 +6401,2 @@ $as_echo_n "checking loader paths for Qt - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} diff --git a/srcpkgs/gpsbabel/patches/enigma.patch b/srcpkgs/gpsbabel/patches/enigma.patch index dabb7220af5..ef50308e462 100644 --- a/srcpkgs/gpsbabel/patches/enigma.patch +++ b/srcpkgs/gpsbabel/patches/enigma.patch @@ -1,5 +1,5 @@ ---- enigma.cc -+++ enigma.cc +--- a/enigma.cc ++++ b/enigma.cc @@ -23,0 +24,7 @@ +#include // for fabs, lround +#include // for int32_t, uint8_t, uint32_t diff --git a/srcpkgs/gpsbabel/template b/srcpkgs/gpsbabel/template index 12305e0fe6e..24c0a420e09 100644 --- a/srcpkgs/gpsbabel/template +++ b/srcpkgs/gpsbabel/template @@ -13,7 +13,6 @@ license="GPL-2.0-or-later" homepage="https://www.gpsbabel.org/" distfiles="https://github.com/gpsbabel/${pkgname}/archive/${pkgname}_${version//./_}.tar.gz" checksum=30b186631fb43db576b8177385ed5c31a5a15c02a6bc07bae1e0d7af9058a797 -patch_args=-Np0 replaces="gpsbabel-gui>=0" diff --git a/srcpkgs/gpsd/patches/SConstruct-cross.patch b/srcpkgs/gpsd/patches/SConstruct-cross.patch index 42b0748209e..9d64d2a3fa5 100644 --- a/srcpkgs/gpsd/patches/SConstruct-cross.patch +++ b/srcpkgs/gpsd/patches/SConstruct-cross.patch @@ -1,5 +1,5 @@ ---- SConstruct~ 2020-01-01 02:31:27.000000000 +0100 -+++ SConstruct 2020-05-17 11:20:07.334411693 +0200 +--- a/SConstruct~ 2020-01-01 02:31:27.000000000 +0100 ++++ b/SConstruct 2020-05-17 11:20:07.334411693 +0200 @@ -629,6 +629,10 @@ # run it diff --git a/srcpkgs/gpsd/template b/srcpkgs/gpsd/template index 6d76d341736..4198bf21493 100644 --- a/srcpkgs/gpsd/template +++ b/srcpkgs/gpsd/template @@ -18,7 +18,6 @@ distfiles="http://download-mirror.savannah.gnu.org/releases/gpsd/gpsd-${version} checksum=3998a5cbb728e97f896f46c3c83301b1e6c5d859393e58c2fad8c5426774d571 python_version=3 # Must be same version as scons system_accounts="gpsd" -patch_args=-Np0 subpackages="gpsd-devel gpsd-qt gpsd-qt-devel" if [ -z "$CROSS_BUILD" ]; then diff --git a/srcpkgs/grpc/patches/google-sucks.patch b/srcpkgs/grpc/patches/google-sucks.patch index 5284398f4ae..0eb8a7c3d36 100644 --- a/srcpkgs/grpc/patches/google-sucks.patch +++ b/srcpkgs/grpc/patches/google-sucks.patch @@ -5,8 +5,8 @@ An all-in-one patch that fixes several issues: 3) powerpc stacktrace implementation has ppc64 assumptions (fixed) 4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) ---- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -+++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc +--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc ++++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc @@ -20,7 +20,7 @@ #include #endif @@ -25,8 +25,8 @@ An all-in-one patch that fixes several issues: int64_t UnscaledCycleClock::Now() { #ifdef __GLIBC__ ---- third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h -+++ third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h +--- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h ++++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.h @@ -46,7 +46,7 @@ // The following platforms have an implementation of a hardware counter. @@ -36,8 +36,8 @@ An all-in-one patch that fixes several issues: defined(_M_IX86) || defined(_M_X64) #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 #else ---- third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc -+++ third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc +--- a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc ++++ b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc @@ -63,8 +63,10 @@ void* GetProgramCounter(void* vuc) { return reinterpret_cast(context->uc_mcontext.pc); #elif defined(__powerpc64__) @@ -50,8 +50,8 @@ An all-in-one patch that fixes several issues: #elif defined(__riscv) return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); #elif defined(__s390__) && !defined(__s390x__) ---- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h -+++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h +--- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h ++++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h @@ -64,7 +64,7 @@ #elif defined(__i386__) || defined(__x86_64__) #define ABSL_STACKTRACE_INL_HEADER \ diff --git a/srcpkgs/grpc/patches/private-abseil.patch b/srcpkgs/grpc/patches/private-abseil.patch index 031d6b89f83..4e215820fab 100644 --- a/srcpkgs/grpc/patches/private-abseil.patch +++ b/srcpkgs/grpc/patches/private-abseil.patch @@ -4,8 +4,8 @@ include absl headers, so these need to be installed. Put them in a private location because the full abseil installation is not provided. diff -ur third_party/abseil-cpp/CMakeLists.txt third_party/abseil-cpp/CMakeLists.txt ---- third_party/abseil-cpp/CMakeLists.txt -+++ third_party/abseil-cpp/CMakeLists.txt +--- a/third_party/abseil-cpp/CMakeLists.txt ++++ b/third_party/abseil-cpp/CMakeLists.txt @@ -46,6 +46,7 @@ OPTION(BUILD_TESTING "Build tests" OFF) diff --git a/srcpkgs/grpc/template b/srcpkgs/grpc/template index d0763bb7db4..60677cf4f68 100644 --- a/srcpkgs/grpc/template +++ b/srcpkgs/grpc/template @@ -20,7 +20,6 @@ distfiles="${homepage}/archive/v${version}/${pkgname}-${version}.tar.gz https://github.com/abseil/abseil-cpp/archive/${_abseilver}/abseil-cpp-${_abseilver}.tar.gz" checksum="abd9e52c69000f2c051761cfa1f12d52d8b7647b6c66828a91d462e796f2aede 35f22ef5cb286f09954b7cc4c85b5a3f6221c9d4df6b8c4a1e9d399555b366ee" -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then # need host grpc_cpp_plugin diff --git a/srcpkgs/grub-customizer/patches/musl-string.patch b/srcpkgs/grub-customizer/patches/musl-string.patch index e0de2de7de3..751eb2239b7 100644 --- a/srcpkgs/grub-customizer/patches/musl-string.patch +++ b/srcpkgs/grub-customizer/patches/musl-string.patch @@ -1,5 +1,5 @@ ---- src/lib/Helper.hpp 2016-04-21 21:35:42.000000000 +0200 -+++ src/lib/Helper.hpp 2017-12-31 14:17:46.039358681 +0100 +--- a/src/lib/Helper.hpp 2016-04-21 21:35:42.000000000 +0200 ++++ b/src/lib/Helper.hpp 2017-12-31 14:17:46.039358681 +0100 @@ -26,6 +26,10 @@ # define ASSERT_VOID_CAST static_cast diff --git a/srcpkgs/grub-customizer/template b/srcpkgs/grub-customizer/template index f0ead5f9e0e..67f3cfb3e7e 100644 --- a/srcpkgs/grub-customizer/template +++ b/srcpkgs/grub-customizer/template @@ -14,7 +14,6 @@ license="GPL-3.0-or-later" homepage="https://launchpad.net/grub-customizer/" distfiles="https://launchpad.net/${pkgname}/${version%.*}/${version}/+download/${pkgname}_${version}.tar.gz" checksum=532f793eea4c6ee6cde4bc987966fa1924946c1da5e3c7b4d4a97f2689661ee0 -patch_args=-Np0 pre_configure() { # Modify desktop file for Void Linux diff --git a/srcpkgs/gscan2pdf/patches/tesseract.patch b/srcpkgs/gscan2pdf/patches/tesseract.patch index b9450e03654..2fa62f5f073 100644 --- a/srcpkgs/gscan2pdf/patches/tesseract.patch +++ b/srcpkgs/gscan2pdf/patches/tesseract.patch @@ -1,5 +1,5 @@ ---- lib/Gscan2pdf/Tesseract.pm.orig 2020-09-21 18:00:10.368568923 +0200 -+++ lib/Gscan2pdf/Tesseract.pm 2020-09-21 18:02:36.797305878 +0200 +--- a/lib/Gscan2pdf/Tesseract.pm 2020-09-21 18:00:10.368568923 +0200 ++++ b/lib/Gscan2pdf/Tesseract.pm 2020-09-21 18:02:36.797305878 +0200 @@ -52,25 +52,25 @@ return $installed if $setup; diff --git a/srcpkgs/gscan2pdf/template b/srcpkgs/gscan2pdf/template index 28cb1dd9013..9c137da14b8 100644 --- a/srcpkgs/gscan2pdf/template +++ b/srcpkgs/gscan2pdf/template @@ -18,7 +18,6 @@ homepage="http://gscan2pdf.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz" checksum=e5c10a9e695674308d29fe8661c5bb7230e25dfbc098716c26a3188ef1e54074 nocross=yes -patch_args=-Np0 do_check() { # Tests require a Display server diff --git a/srcpkgs/gscope3/patches/musl.patch b/srcpkgs/gscope3/patches/musl.patch index 895f82fa382..bcabb842bf1 100644 --- a/srcpkgs/gscope3/patches/musl.patch +++ b/srcpkgs/gscope3/patches/musl.patch @@ -1,5 +1,5 @@ ---- packages/gscope/src/auto_gen.c.bak 2017-08-19 00:44:22.000000000 +0200 -+++ packages/gscope/src/auto_gen.c 2017-08-20 18:23:02.247830491 +0200 +--- a/packages/gscope/src/auto_gen.c.bak 2017-08-19 00:44:22.000000000 +0200 ++++ b/packages/gscope/src/auto_gen.c 2017-08-20 18:23:02.247830491 +0200 @@ -3,6 +3,10 @@ #include "config.h" #endif diff --git a/srcpkgs/gscope3/template b/srcpkgs/gscope3/template index 2a2d58f2f6f..ff6db18c2d4 100644 --- a/srcpkgs/gscope3/template +++ b/srcpkgs/gscope3/template @@ -14,7 +14,6 @@ license="MIT" homepage="https://github.com/tefletch/gscope" distfiles="https://github.com/tefletch/gscope/archive/${_release}.tar.gz" checksum=06d0fd4351b4f8dc1850c81b07c112b0974bfb140f9fe56f8af6f865be3e0a2a -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/gsl/patches/ppc-musl.patch b/srcpkgs/gsl/patches/ppc-musl.patch index 807ae163675..4bc6b233d31 100644 --- a/srcpkgs/gsl/patches/ppc-musl.patch +++ b/srcpkgs/gsl/patches/ppc-musl.patch @@ -1,7 +1,7 @@ fpu_control.h is glibc specific, but we only need some bits from it. ---- ieee-utils/fp-gnuppc.c -+++ ieee-utils/fp-gnuppc.c +--- a/ieee-utils/fp-gnuppc.c ++++ b/ieee-utils/fp-gnuppc.c @@ -18,7 +18,31 @@ */ diff --git a/srcpkgs/gsl/template b/srcpkgs/gsl/template index c11a13e203b..1d6677032a3 100644 --- a/srcpkgs/gsl/template +++ b/srcpkgs/gsl/template @@ -9,7 +9,6 @@ license="GPL-3.0-or-later" homepage="http://www.gnu.org/software/gsl/gsl.html" distfiles="${GNU_SITE}/gsl/${pkgname}-${version}.tar.gz" checksum=b782339fc7a38fe17689cb39966c4d821236c28018b6593ddb6fd59ee40786a8 -patch_args=-Np0 gsl-devel_package() { depends="gsl>=${version}_${revision}" diff --git a/srcpkgs/gsoap/patches/libressl.patch b/srcpkgs/gsoap/patches/libressl.patch index d8eb91a0227..e725fb30d74 100644 --- a/srcpkgs/gsoap/patches/libressl.patch +++ b/srcpkgs/gsoap/patches/libressl.patch @@ -1,7 +1,7 @@ diff --git a/gsoap/stdsoap2.cpp b/gsoap/stdsoap2.cpp index cd48626..8bbf676 100644 ---- gsoap/stdsoap2.cpp -+++ gsoap/stdsoap2.cpp +--- a/gsoap/stdsoap2.cpp ++++ b/gsoap/stdsoap2.cpp @@ -4453,7 +4453,7 @@ ssl_auth_init(struct soap *soap) /* enable all TSLv1 protocols and disable SSLv3 by default if no SSL/TLS flags are set */ if ((soap->ssl_flags & SOAP_SSLv3_TLSv1) == 0) diff --git a/srcpkgs/gsoap/template b/srcpkgs/gsoap/template index 132f058dfe9..c0cf0340566 100644 --- a/srcpkgs/gsoap/template +++ b/srcpkgs/gsoap/template @@ -14,7 +14,6 @@ homepage="http://www.cs.fsu.edu/~engelen/soap.html" distfiles="${SOURCEFORGE_SITE}/gsoap2/gsoap_${version}.zip" checksum=2ca21b5ab2b40d899566c559f71a1d51ed7eac3f00160ab78060027a3ee6488f disable_parallel_build=yes -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/gst-plugins-bad1/patches/faac_cfg_105.patch b/srcpkgs/gst-plugins-bad1/patches/faac_cfg_105.patch index adef2d40cb5..b2b0f3a32c0 100644 --- a/srcpkgs/gst-plugins-bad1/patches/faac_cfg_105.patch +++ b/srcpkgs/gst-plugins-bad1/patches/faac_cfg_105.patch @@ -1,5 +1,5 @@ ---- ext/faac/gstfaac.c 2017-05-15 17:46:30.000000000 +0200 -+++ ext/faac/gstfaac.c 2017-11-06 11:40:30.458137107 +0100 +--- a/ext/faac/gstfaac.c 2017-05-15 17:46:30.000000000 +0200 ++++ b/ext/faac/gstfaac.c 2017-11-06 11:40:30.458137107 +0100 @@ -490,7 +490,9 @@ conf = faacEncGetCurrentConfiguration (faac->handle); conf->mpegVersion = (faac->mpegversion == 4) ? MPEG4 : MPEG2; diff --git a/srcpkgs/gst-plugins-bad1/patches/libressl.patch b/srcpkgs/gst-plugins-bad1/patches/libressl.patch index b0921ee7721..cc947c9f69b 100644 --- a/srcpkgs/gst-plugins-bad1/patches/libressl.patch +++ b/srcpkgs/gst-plugins-bad1/patches/libressl.patch @@ -1,5 +1,5 @@ ---- ext/dtls/gstdtlsagent.c 2018-03-23 21:45:15.000000000 +0100 -+++ - 2018-09-09 14:05:57.663350425 +0200 +--- a/ext/dtls/gstdtlsagent.c 2018-03-23 21:45:15.000000000 +0100 ++++ b/ext/dtls/gstdtlsagent.c 2018-03-23 21:45:15.000000000 +0100 @@ -176,7 +176,7 @@ ERR_clear_error (); diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 0cf2cdc941f..7b97a3e3184 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -37,7 +37,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" checksum=74e806bc5595b18c70e9ca93571e27e79dfb808e5d2e7967afa952b52e99c85f -patch_args=-Np0 build_options="gir gme" build_options_default="gir" diff --git a/srcpkgs/gst-plugins-base1/patches/sndio.patch b/srcpkgs/gst-plugins-base1/patches/sndio.patch index fe61fb88e67..e411eec8e49 100644 --- a/srcpkgs/gst-plugins-base1/patches/sndio.patch +++ b/srcpkgs/gst-plugins-base1/patches/sndio.patch @@ -4,8 +4,8 @@ Reason: sndio support diff --git ext/meson.build ext/meson.build index d984b50..5f0becc 100644 ---- ext/meson.build -+++ ext/meson.build +--- a/ext/meson.build ++++ b/ext/meson.build @@ -5,5 +5,6 @@ subdir('libvisual') subdir('ogg') subdir('opus') @@ -17,7 +17,7 @@ diff --git ext/sndio/gstsndio.c ext/sndio/gstsndio.c new file mode 100644 index 0000000..2321dc2 --- /dev/null -+++ ext/sndio/gstsndio.c ++++ b/ext/sndio/gstsndio.c @@ -0,0 +1,401 @@ +/* + * Copyright (C) 2008 Jacob Meuser @@ -424,7 +424,7 @@ diff --git ext/sndio/gstsndio.h ext/sndio/gstsndio.h new file mode 100644 index 0000000..77ec4e6 --- /dev/null -+++ ext/sndio/gstsndio.h ++++ b/ext/sndio/gstsndio.h @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2012 Alexandre Ratchov @@ -508,7 +508,7 @@ diff --git ext/sndio/meson.build ext/sndio/meson.build new file mode 100644 index 0000000..3f9a9fe --- /dev/null -+++ ext/sndio/meson.build ++++ b/ext/sndio/meson.build @@ -0,0 +1,21 @@ +sndio_sources = [ + 'gstsndio.c', @@ -535,7 +535,7 @@ diff --git ext/sndio/sndiosink.c ext/sndio/sndiosink.c new file mode 100644 index 0000000..cc68bd2 --- /dev/null -+++ ext/sndio/sndiosink.c ++++ b/ext/sndio/sndiosink.c @@ -0,0 +1,226 @@ +/* + * Copyright (C) 2008 Jacob Meuser @@ -767,7 +767,7 @@ diff --git ext/sndio/sndiosink.h ext/sndio/sndiosink.h new file mode 100644 index 0000000..314e622 --- /dev/null -+++ ext/sndio/sndiosink.h ++++ b/ext/sndio/sndiosink.h @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2008 Jacob Meuser @@ -830,7 +830,7 @@ diff --git ext/sndio/sndiosrc.c ext/sndio/sndiosrc.c new file mode 100644 index 0000000..5b6d787 --- /dev/null -+++ ext/sndio/sndiosrc.c ++++ b/ext/sndio/sndiosrc.c @@ -0,0 +1,225 @@ +/* + * Copyright (C) 2008 Jacob Meuser @@ -1061,7 +1061,7 @@ diff --git ext/sndio/sndiosrc.h ext/sndio/sndiosrc.h new file mode 100644 index 0000000..83fd29c --- /dev/null -+++ ext/sndio/sndiosrc.h ++++ b/ext/sndio/sndiosrc.h @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2008 Jacob Meuser @@ -1122,8 +1122,8 @@ index 0000000..83fd29c +#endif /* __GST_SNDIOSRC_H__ */ diff --git meson_options.txt meson_options.txt index e7af4dd..827507f 100644 ---- meson_options.txt -+++ meson_options.txt +--- a/meson_options.txt ++++ b/meson_options.txt @@ -58,6 +58,7 @@ option('libvisual', type : 'feature', value : 'auto', description : 'libvisual a option('ogg', type : 'feature', value : 'auto', description : 'ogg parser, muxer, demuxer plugin') option('opus', type : 'feature', value : 'auto', description : 'OPUS audio codec plugin') diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index ca6cdbf62db..050521f071c 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -23,7 +23,6 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" checksum=29e53229a84d01d722f6f6db13087231cdf6113dd85c25746b9b58c3d68e8323 -patch_args=-Np0 build_options="cdparanoia gir sndio" build_options_default="cdparanoia gir" diff --git a/srcpkgs/gst123/patches/fix-configure_ac.patch b/srcpkgs/gst123/patches/fix-configure_ac.patch index 1c61735226c..de9685d3df2 100644 --- a/srcpkgs/gst123/patches/fix-configure_ac.patch +++ b/srcpkgs/gst123/patches/fix-configure_ac.patch @@ -1,5 +1,5 @@ ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -102,7 +102,7 @@ dnl We need libncurses dnl AC_DEFUN([AC_NCURSES_REQUIREMENTS], diff --git a/srcpkgs/gst123/template b/srcpkgs/gst123/template index fa17cc86b1f..f3a2d41316b 100644 --- a/srcpkgs/gst123/template +++ b/srcpkgs/gst123/template @@ -12,7 +12,6 @@ license="LGPL-2.1-or-later" homepage="http://space.twc.de/~stefan/gst123.php/" distfiles="http://space.twc.de/~stefan/gst123/gst123-$version.tar.bz2" checksum=c7b4729773f66cc679e94df76bcc6a95a2222192730f906e527e72624f084a7d -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/gstreamermm/patches/fix-build-with-gstreamer1.12.patch b/srcpkgs/gstreamermm/patches/fix-build-with-gstreamer1.12.patch index 405d9865da2..92988c36470 100644 --- a/srcpkgs/gstreamermm/patches/fix-build-with-gstreamer1.12.patch +++ b/srcpkgs/gstreamermm/patches/fix-build-with-gstreamer1.12.patch @@ -3,8 +3,8 @@ Description: Gst::AudioClock: auto generate some audioclock methods Origin: https://bugzilla.gnome.org/show_bug.cgi?id=783628 Last-update: 2017-07-01 ---- gstreamer/gstreamermm/audioclock.cc -+++ gstreamer/gstreamermm/audioclock.cc +--- a/gstreamer/gstreamermm/audioclock.cc ++++ b/gstreamer/gstreamermm/audioclock.cc @@ -2,6 +2,7 @@ diff --git a/srcpkgs/gstreamermm/template b/srcpkgs/gstreamermm/template index 54bec6d8dc2..863e982f34e 100644 --- a/srcpkgs/gstreamermm/template +++ b/srcpkgs/gstreamermm/template @@ -12,7 +12,6 @@ homepage="https://gstreamer.freedesktop.org/bindings/cplusplus.html" license="GPL-2, GPL-2.1" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=be58fe9ef7d7e392568ec85e80a84f4730adbf91fb0355ff7d7c616675ea8d60 -patch_args=-Np0 post_install() { vlicense COPYING diff --git a/srcpkgs/gthumb/patches/build-order.patch b/srcpkgs/gthumb/patches/build-order.patch index ceab3d3537f..9e8208d88cb 100644 --- a/srcpkgs/gthumb/patches/build-order.patch +++ b/srcpkgs/gthumb/patches/build-order.patch @@ -1,7 +1,7 @@ diff --git a/gthumb/meson.build b/gthumb/meson.build index 64c93578..c348af81 100644 ---- gthumb/meson.build -+++ gthumb/meson.build +--- a/gthumb/meson.build ++++ b/gthumb/meson.build @@ -311,6 +311,7 @@ gthumb_exe = executable('gthumb', ], dependencies : [ diff --git a/srcpkgs/gthumb/template b/srcpkgs/gthumb/template index e383495da80..ed6afee1b83 100644 --- a/srcpkgs/gthumb/template +++ b/srcpkgs/gthumb/template @@ -15,7 +15,6 @@ license="GPL-2.0-or-later" homepage="http://live.gnome.org/gthumb" distfiles="${GNOME_SITE}/gthumb/${version%.*}/gthumb-${version}.tar.xz" checksum=fdeae42818378f9b3cab00604eeeb5b7c0a7a5ecfe69de08b993867746435c93 -patch_args=-Np0 LDFLAGS="-fPIC" diff --git a/srcpkgs/gtk-sharp/patches/ftbfs.patch b/srcpkgs/gtk-sharp/patches/ftbfs.patch index 6d95ed1a8fd..497be06a0e1 100644 --- a/srcpkgs/gtk-sharp/patches/ftbfs.patch +++ b/srcpkgs/gtk-sharp/patches/ftbfs.patch @@ -1,5 +1,5 @@ ---- sample/test/TestRange.cs -+++ sample/test/TestRange.cs +--- a/sample/test/TestRange.cs ++++ b/sample/test/TestRange.cs @@ -9,6 +9,8 @@ using System; diff --git a/srcpkgs/gtk-sharp/template b/srcpkgs/gtk-sharp/template index d20183b8daa..f3125a45788 100644 --- a/srcpkgs/gtk-sharp/template +++ b/srcpkgs/gtk-sharp/template @@ -13,7 +13,6 @@ license="LGPL-2.1-or-later" short_desc="Graphical User Interface Toolkit for mono and .Net (Gtk#)" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=6440f571416267ae0cb5698071d087b31e3084693fa2c829b1db37ca7ea2c3a2 -patch_args=-Np0 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then _have_mdoc="no" diff --git a/srcpkgs/gtk-sharp2/patches/ftbfs.patch b/srcpkgs/gtk-sharp2/patches/ftbfs.patch index 6d95ed1a8fd..497be06a0e1 100644 --- a/srcpkgs/gtk-sharp2/patches/ftbfs.patch +++ b/srcpkgs/gtk-sharp2/patches/ftbfs.patch @@ -1,5 +1,5 @@ ---- sample/test/TestRange.cs -+++ sample/test/TestRange.cs +--- a/sample/test/TestRange.cs ++++ b/sample/test/TestRange.cs @@ -9,6 +9,8 @@ using System; diff --git a/srcpkgs/gtk-sharp2/template b/srcpkgs/gtk-sharp2/template index 07e49e956fe..3137a6310b2 100644 --- a/srcpkgs/gtk-sharp2/template +++ b/srcpkgs/gtk-sharp2/template @@ -13,7 +13,6 @@ license="LGPL-2.1-only" homepage="https://www.mono-project.com/docs/gui/gtksharp/" distfiles="https://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-${version}.tar.gz" checksum=02680578e4535441064aac21d33315daa009d742cab8098ac8b2749d86fffb6a -patch_args=-Np0 if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then _have_mdoc="no" diff --git a/srcpkgs/gtk-theme-config/patches/no_cc_for_vala.patch b/srcpkgs/gtk-theme-config/patches/no_cc_for_vala.patch index e9ee4059963..ce3753b23c0 100644 --- a/srcpkgs/gtk-theme-config/patches/no_cc_for_vala.patch +++ b/srcpkgs/gtk-theme-config/patches/no_cc_for_vala.patch @@ -1,5 +1,5 @@ ---- Makefile.orig 2015-07-25 21:11:40.397311183 +0200 -+++ Makefile 2015-07-25 21:11:59.561311865 +0200 +--- a/Makefile 2015-07-25 21:11:40.397311183 +0200 ++++ b/Makefile 2015-07-25 21:11:59.561311865 +0200 @@ -1,5 +1,5 @@ -CC=valac -CFLAGS=--pkg gtk+-3.0 diff --git a/srcpkgs/gtk-theme-config/template b/srcpkgs/gtk-theme-config/template index 66ce7d1851f..6dd97132c14 100644 --- a/srcpkgs/gtk-theme-config/template +++ b/srcpkgs/gtk-theme-config/template @@ -13,7 +13,6 @@ license="GPL-3.0-only" homepage="https://github.com/satya164/gtk-theme-config" distfiles="$homepage/archive/v$version.tar.gz" checksum=174aac3ea43966168d120dbd9e0f23d7900d095ee1b0cf32472d59b0fdea8448 -patch_args=-Np0 pre_build() { local _p _cflags _ldflags diff --git a/srcpkgs/gtkglext/patches/Removing_deprecated_flags.patch b/srcpkgs/gtkglext/patches/Removing_deprecated_flags.patch index bb426be46be..ff70be556cb 100644 --- a/srcpkgs/gtkglext/patches/Removing_deprecated_flags.patch +++ b/srcpkgs/gtkglext/patches/Removing_deprecated_flags.patch @@ -1,5 +1,5 @@ ---- examples/Makefile.am.orig 2003-09-09 11:50:04.000000000 +0200 -+++ examples/Makefile.am 2014-04-30 20:40:58.471481327 +0200 +--- a/examples/Makefile.am 2003-09-09 11:50:04.000000000 +0200 ++++ b/examples/Makefile.am 2014-04-30 20:40:58.471481327 +0200 @@ -17,11 +17,7 @@ INCLUDES = \ -I$(top_builddir)/gdk \ -I$(top_builddir)/gtk \ @@ -14,8 +14,8 @@ DEPS = \ $(top_builddir)/gdk/$(gdkglext_targetlib) \ ---- examples/Makefile.in.orig 2006-02-05 04:17:39.000000000 +0100 -+++ examples/Makefile.in 2014-04-30 20:41:15.559479928 +0200 +--- a/examples/Makefile.in 2006-02-05 04:17:39.000000000 +0100 ++++ b/examples/Makefile.in 2014-04-30 20:41:15.559479928 +0200 @@ -233,11 +233,7 @@ INCLUDES = \ -I$(top_builddir)/gdk \ -I$(top_builddir)/gtk \ @@ -30,8 +30,8 @@ DEPS = \ ---- gdk/Makefile.am.orig 2003-08-15 11:10:38.000000000 +0200 -+++ gdk/Makefile.am 2014-04-30 20:41:45.415477484 +0200 +--- a/gdk/Makefile.am 2003-08-15 11:10:38.000000000 +0200 ++++ b/gdk/Makefile.am 2014-04-30 20:41:45.415477484 +0200 @@ -43,10 +43,7 @@ common_includes = \ -DGDK_GL_COMPILATION \ -I$(top_srcdir) \ @@ -45,8 +45,8 @@ common_ldflags = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ---- gdk/Makefile.in.orig 2006-02-05 04:17:40.000000000 +0100 -+++ gdk/Makefile.in 2014-04-30 20:41:55.816476633 +0200 +--- a/gdk/Makefile.in 2006-02-05 04:17:40.000000000 +0100 ++++ b/gdk/Makefile.in 2014-04-30 20:41:55.816476633 +0200 @@ -238,10 +238,7 @@ common_includes = \ -DGDK_GL_COMPILATION \ -I$(top_srcdir) \ @@ -60,8 +60,8 @@ common_ldflags = \ ---- gdk/x11/Makefile.am.orig 2003-05-07 20:18:42.000000000 +0200 -+++ gdk/x11/Makefile.am 2014-04-30 20:42:26.856474092 +0200 +--- a/gdk/x11/Makefile.am 2003-05-07 20:18:42.000000000 +0200 ++++ b/gdk/x11/Makefile.am 2014-04-30 20:42:26.856474092 +0200 @@ -10,10 +10,7 @@ INCLUDES = \ -I$(top_builddir)/gdk \ $(GTKGLEXT_DEBUG_FLAGS) \ @@ -75,8 +75,8 @@ LDADDS = \ $(GDKGLEXT_DEP_LIBS) ---- gdk/x11/Makefile.in.orig 2006-02-05 04:17:42.000000000 +0100 -+++ gdk/x11/Makefile.in 2014-04-30 20:42:37.128473251 +0200 +--- a/gdk/x11/Makefile.in 2006-02-05 04:17:42.000000000 +0100 ++++ b/gdk/x11/Makefile.in 2014-04-30 20:42:37.128473251 +0200 @@ -225,10 +225,7 @@ INCLUDES = \ -I$(top_builddir)/gdk \ $(GTKGLEXT_DEBUG_FLAGS) \ @@ -90,8 +90,8 @@ LDADDS = \ ---- gtk/Makefile.am.orig 2003-05-09 15:55:05.000000000 +0200 -+++ gtk/Makefile.am 2014-04-30 20:43:04.456471014 +0200 +--- a/gtk/Makefile.am 2003-05-09 15:55:05.000000000 +0200 ++++ b/gtk/Makefile.am 2014-04-30 20:43:04.456471014 +0200 @@ -36,11 +36,7 @@ common_includes = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ @@ -106,8 +106,8 @@ common_ldflags = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ ---- gtk/Makefile.in.orig 2006-02-05 04:17:42.000000000 +0100 -+++ gtk/Makefile.in 2014-04-30 20:43:16.224470051 +0200 +--- a/gtk/Makefile.in 2006-02-05 04:17:42.000000000 +0100 ++++ b/gtk/Makefile.in 2014-04-30 20:43:16.224470051 +0200 @@ -234,11 +234,7 @@ common_includes = \ -I$(top_srcdir) \ -I$(top_builddir)/gdk \ diff --git a/srcpkgs/gtkglext/patches/kill-pangox.patch b/srcpkgs/gtkglext/patches/kill-pangox.patch index 5f68c77e5e6..66a4101f221 100644 --- a/srcpkgs/gtkglext/patches/kill-pangox.patch +++ b/srcpkgs/gtkglext/patches/kill-pangox.patch @@ -1,7 +1,7 @@ diff --git configure.in configure.in index e5b678c..f4937d0 100644 ---- configure.in -+++ configure.in +--- a/configure.in ++++ b/configure.in @@ -59,10 +59,6 @@ m4_define([gmodule_required_version], [2.0.0]) m4_define([pango_pkg], [pango]) m4_define([pango_required_version], [1.0.0]) @@ -32,8 +32,8 @@ index e5b678c..f4937d0 100644 GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`" diff --git gdk/Makefile.am gdk/Makefile.am index 700213e..09f6ba7 100644 ---- gdk/Makefile.am -+++ gdk/Makefile.am +--- a/gdk/Makefile.am ++++ b/gdk/Makefile.am @@ -73,7 +73,6 @@ gdkglext_public_h_sources = \ gdkgldrawable.h \ gdkglpixmap.h \ @@ -44,8 +44,8 @@ index 700213e..09f6ba7 100644 diff --git gdk/gdkgl.h gdk/gdkgl.h index f22a31c..fc80db3 100644 ---- gdk/gdkgl.h -+++ gdk/gdkgl.h +--- a/gdk/gdkgl.h ++++ b/gdk/gdkgl.h @@ -33,7 +33,6 @@ #include #include @@ -56,8 +56,8 @@ index f22a31c..fc80db3 100644 #endif /* __GDK_GL_H__ */ diff --git gdk/x11/Makefile.am gdk/x11/Makefile.am index a7fb6f6..526b7cc 100644 ---- gdk/x11/Makefile.am -+++ gdk/x11/Makefile.am +--- a/gdk/x11/Makefile.am ++++ b/gdk/x11/Makefile.am @@ -35,7 +35,6 @@ gdkglext_x11_c_sources = \ gdkgldrawable-x11.c \ gdkglpixmap-x11.c \ diff --git a/srcpkgs/gtkglext/patches/name_conflict.patch b/srcpkgs/gtkglext/patches/name_conflict.patch index 5295e9e026d..e2939198ba2 100644 --- a/srcpkgs/gtkglext/patches/name_conflict.patch +++ b/srcpkgs/gtkglext/patches/name_conflict.patch @@ -1,5 +1,5 @@ ---- gdk/gdkglshapes.c 2004-02-20 10:38:12.000000000 +0100 -+++ gdk/gdkglshapes.c 2018-05-11 00:46:24.461433041 +0200 +--- a/gdk/gdkglshapes.c 2004-02-20 10:38:12.000000000 +0100 ++++ b/gdk/gdkglshapes.c 2018-05-11 00:46:24.461433041 +0200 @@ -544,7 +544,7 @@ {-Z, -X, 0} }; diff --git a/srcpkgs/gtkglext/template b/srcpkgs/gtkglext/template index 640d422140c..737a9741598 100644 --- a/srcpkgs/gtkglext/template +++ b/srcpkgs/gtkglext/template @@ -12,7 +12,6 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://projects.gnome.org/gtkglext" distfiles="${SOURCEFORGE_SITE}/gtkglext/gtkglext/${version}/gtkglext-${version}.tar.gz" checksum=e5073f3c6b816e7fa67d359d9745a5bb5de94a628ac85f624c992925a46844f9 -patch_args=-Np0 pre_configure() { autoreconf -fi diff --git a/srcpkgs/gtkpod/patches/musl.patch b/srcpkgs/gtkpod/patches/musl.patch index ce441743dba..d1f54144ba6 100644 --- a/srcpkgs/gtkpod/patches/musl.patch +++ b/srcpkgs/gtkpod/patches/musl.patch @@ -1,7 +1,7 @@ This is an awful hack done by inspecting what musl does. ---- libs/atomic-parsley/AtomicParsley.cpp -+++ libs/atomic-parsley/AtomicParsley.cpp +--- a/libs/atomic-parsley/AtomicParsley.cpp ++++ b/libs/atomic-parsley/AtomicParsley.cpp @@ -4935,7 +4935,8 @@ void APar_MergeTempFile(FILE* dest_file, FILE *src_file, uint32_t src_file_size, { 0 }; file_offset.__pos = dest_position + file_pos; diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template index 5cb367989c0..bfcb41e6219 100644 --- a/srcpkgs/gtkpod/template +++ b/srcpkgs/gtkpod/template @@ -16,7 +16,6 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76 # Line 55: print in python 2 style python_version=2 -patch_args=-Np0 CFLAGS="-fcommon" diff --git a/srcpkgs/gtkspell/patches/enchant-2.patch b/srcpkgs/gtkspell/patches/enchant-2.patch index e36159ed0c4..e818c189d3a 100644 --- a/srcpkgs/gtkspell/patches/enchant-2.patch +++ b/srcpkgs/gtkspell/patches/enchant-2.patch @@ -2,8 +2,8 @@ Source: Arch Linux Upstream: Unknown Reason: Fixes compilation with enchant-2 ---- gtkspell/gtkspell.c -+++ gtkspell/gtkspell.c +--- a/gtkspell/gtkspell.c ++++ b/gtkspell/gtkspell.c @@ -277,7 +277,7 @@ get_word_extents_from_mark(spell->buffer, &start, &end, spell->mark_click); word = gtk_text_buffer_get_text(spell->buffer, &start, &end, FALSE); diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template index 3b95f95dfed..bf480eaae32 100644 --- a/srcpkgs/gtkspell/template +++ b/srcpkgs/gtkspell/template @@ -12,7 +12,6 @@ license="LGPL-2.1-or-later" homepage="http://gtkspell.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02 -patch_args=-Np0 post_patch() { vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \ diff --git a/srcpkgs/gtypist/patches/ncurses.patch b/srcpkgs/gtypist/patches/ncurses.patch index 1e535006b1c..cec10f3deb2 100644 --- a/srcpkgs/gtypist/patches/ncurses.patch +++ b/srcpkgs/gtypist/patches/ncurses.patch @@ -1,7 +1,7 @@ diff --git configure.ac configure.ac index 8742d93..cb0c62c 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -44,20 +44,20 @@ AC_TYPE_SIGNAL AC_FUNC_STRTOD AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify dcgettext getcwd getwd mempcpy memset munmap nl_langinfo setlocale stpcpy strcasecmp strchr strcspn strdup strstr strtoul]) @@ -31,8 +31,8 @@ index 8742d93..cb0c62c 100644 # iconv diff --git src/cursmenu.c src/cursmenu.c index 1c3990e..f0fc21a 100644 ---- src/cursmenu.c -+++ src/cursmenu.c +--- a/src/cursmenu.c ++++ b/src/cursmenu.c @@ -24,7 +24,7 @@ #ifdef HAVE_PDCURSES #include @@ -44,8 +44,8 @@ index 1c3990e..f0fc21a 100644 #include "error.h" diff --git src/error.c src/error.c index 2022f2b..4ab6741 100644 ---- src/error.c -+++ src/error.c +--- a/src/error.c ++++ b/src/error.c @@ -25,7 +25,7 @@ #ifdef HAVE_PDCURSES #include @@ -57,8 +57,8 @@ index 2022f2b..4ab6741 100644 #include diff --git src/gtypist.c src/gtypist.c index 7328ac6..cb9dd61 100644 ---- src/gtypist.c -+++ src/gtypist.c +--- a/src/gtypist.c ++++ b/src/gtypist.c @@ -32,7 +32,7 @@ #ifdef HAVE_PDCURSES #include @@ -70,8 +70,8 @@ index 7328ac6..cb9dd61 100644 #include diff --git src/script.c src/script.c index ce04d68..f4032e2 100644 ---- src/script.c -+++ src/script.c +--- a/src/script.c ++++ b/src/script.c @@ -24,7 +24,7 @@ #ifdef HAVE_PDCURSES #include @@ -83,8 +83,8 @@ index ce04d68..f4032e2 100644 #include "error.h" diff --git src/utf8.c src/utf8.c index 8eab3d3..e3194df 100644 ---- src/utf8.c -+++ src/utf8.c +--- a/src/utf8.c ++++ b/src/utf8.c @@ -23,7 +23,7 @@ #ifdef HAVE_PDCURSES #include diff --git a/srcpkgs/gtypist/template b/srcpkgs/gtypist/template index f9e1bd30635..d4bf9dc4184 100644 --- a/srcpkgs/gtypist/template +++ b/srcpkgs/gtypist/template @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" homepage="https://www.gnu.org/software/gtypist/" distfiles="$GNU_SITE/gtypist/gtypist-${version}.tar.xz" checksum="c13af40b12479f8219ffa6c66020618c0ce305ad305590fde02d2c20eb9cf977" -patch_args=-Np0 pre_configure() { autoreconf diff --git a/srcpkgs/guake/patches/Makefile.patch b/srcpkgs/guake/patches/Makefile.patch index 0954d42ddf4..20047909c1e 100644 --- a/srcpkgs/guake/patches/Makefile.patch +++ b/srcpkgs/guake/patches/Makefile.patch @@ -1,5 +1,5 @@ ---- Makefile 2019-05-13 11:17:56.000000000 +0200 -+++ - 2019-05-16 12:20:46.201213757 +0200 +--- a/Makefile 2019-05-13 11:17:56.000000000 +0200 ++++ b/Makefile 2019-05-13 11:17:56.000000000 +0200 @@ -86,7 +86,7 @@ @if [ -f guake/paths.py.dev ]; then rm -f guake/paths.py.dev; fi diff --git a/srcpkgs/guake/template b/srcpkgs/guake/template index c31b734bc58..9fbc1895da9 100644 --- a/srcpkgs/guake/template +++ b/srcpkgs/guake/template @@ -14,7 +14,6 @@ license="GPL-2.0-or-later" homepage="http://guake-project.org/" distfiles="${PYPI_SITE}/g/guake/guake-${version}.tar.gz" checksum=31fd7d6f62aa0a5e0121e240682e6a9e5ce61cdb266f9438987837f52d552e47 -patch_args=-Np0 pre_build() { GUAKE_SCHEMA_DIR="/usr/share/glib-2.0/schemas" diff --git a/srcpkgs/guile/patches/musl-longlong.patch b/srcpkgs/guile/patches/musl-longlong.patch index 0e968058a09..06449cc1fc4 100644 --- a/srcpkgs/guile/patches/musl-longlong.patch +++ b/srcpkgs/guile/patches/musl-longlong.patch @@ -1,5 +1,5 @@ ---- libguile/fports.c.orig 2017-02-12 22:06:33.000000000 +0100 -+++ libguile/fports.c 2017-10-26 19:09:26.425213055 +0200 +--- a/libguile/fports.c 2017-02-12 22:06:33.000000000 +0100 ++++ b/libguile/fports.c 2017-10-26 19:09:26.425213055 +0200 @@ -66,8 +66,8 @@ #define OFF_T_MAX LONG_MAX #define OFF_T_MIN LONG_MIN diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template index 60eaa34eb6e..f9ce43c0670 100644 --- a/srcpkgs/guile/template +++ b/srcpkgs/guile/template @@ -14,7 +14,6 @@ homepage="http://www.gnu.org/software/guile" distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007 subpackages="libguile guile-devel" -patch_args=-Np0 if [ "$XBPS_ENDIAN" != "$XBPS_TARGET_ENDIAN" ]; then broken="opposite-endian host generates broken files" diff --git a/srcpkgs/guile1.8/patches/cross.patch b/srcpkgs/guile1.8/patches/cross.patch index 0b51020c911..9e0540741bf 100644 --- a/srcpkgs/guile1.8/patches/cross.patch +++ b/srcpkgs/guile1.8/patches/cross.patch @@ -2,8 +2,8 @@ Configure cannot execute built binary when cross compiling. The patch skips the test and assumes "no". This is how it is done in version 2.0.14's configure script. ---- configure.orig 2017-09-15 11:14:54.427295947 +0200 -+++ configure 2017-09-15 14:11:07.253528181 +0200 +--- a/configure 2017-09-15 11:14:54.427295947 +0200 ++++ b/configure 2017-09-15 14:11:07.253528181 +0200 @@ -19802,6 +19802,7 @@ $as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; } old_CFLAGS="$CFLAGS" diff --git a/srcpkgs/guile1.8/patches/musl-longlong.patch b/srcpkgs/guile1.8/patches/musl-longlong.patch index 96109cf6fa3..3a19617d50c 100644 --- a/srcpkgs/guile1.8/patches/musl-longlong.patch +++ b/srcpkgs/guile1.8/patches/musl-longlong.patch @@ -1,5 +1,5 @@ ---- libguile/fports.c.orig 2010-12-13 18:24:40.000000000 +0100 -+++ libguile/fports.c 2017-10-25 21:51:07.234942515 +0200 +--- a/libguile/fports.c 2010-12-13 18:24:40.000000000 +0100 ++++ b/libguile/fports.c 2017-10-25 21:51:07.234942515 +0200 @@ -78,8 +78,8 @@ #define OFF_T_MAX LONG_MAX #define OFF_T_MIN LONG_MIN diff --git a/srcpkgs/guile1.8/patches/musl-sigcontext.patch b/srcpkgs/guile1.8/patches/musl-sigcontext.patch index 74cfdebe258..9fa3279fc34 100644 --- a/srcpkgs/guile1.8/patches/musl-sigcontext.patch +++ b/srcpkgs/guile1.8/patches/musl-sigcontext.patch @@ -4,8 +4,8 @@ which leads to a sigcontext redefinition error when using the musl libc. The patch simply removes the misleading checks since we're way beyond those versions anyway. ---- libguile/gc_os_dep.c.orig 2010-12-13 18:25:01.000000000 +0100 -+++ libguile/gc_os_dep.c 2017-09-17 23:01:55.494204333 +0200 +--- a/libguile/gc_os_dep.c 2010-12-13 18:25:01.000000000 +0100 ++++ b/libguile/gc_os_dep.c 2017-09-17 23:01:55.494204333 +0200 @@ -1445,40 +1445,6 @@ /* include assembly code to do it well. */ # endif diff --git a/srcpkgs/guile1.8/template b/srcpkgs/guile1.8/template index 47192116554..2f575000cbf 100644 --- a/srcpkgs/guile1.8/template +++ b/srcpkgs/guile1.8/template @@ -14,7 +14,6 @@ license="LGPL-2.1-or-later" homepage="https://www.gnu.org/software/guile/guile.html" distfiles="${GNU_SITE}/${pkgname/1.8/}/${pkgname/1.8/}-${version}.tar.gz" checksum=c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 -patch_args=-Np0 post_install() { # conflicts with guile-2.0 diff --git a/srcpkgs/guitarix2/patches/boost-1.69.patch b/srcpkgs/guitarix2/patches/boost-1.69.patch index a63e522a929..6e24b5637a2 100644 --- a/srcpkgs/guitarix2/patches/boost-1.69.patch +++ b/srcpkgs/guitarix2/patches/boost-1.69.patch @@ -1,5 +1,5 @@ ---- src/headers/gx_parameter.h 2018-07-22 06:24:50.000000000 +0200 -+++ - 2018-12-18 17:29:34.195703527 +0100 +--- a/src/headers/gx_parameter.h 2018-07-22 06:24:50.000000000 +0200 ++++ b/src/headers/gx_parameter.h 2018-07-22 06:24:50.000000000 +0200 @@ -28,6 +28,8 @@ #ifndef SRC_HEADERS_GX_PARAMETER_H_ #define SRC_HEADERS_GX_PARAMETER_H_ @@ -9,8 +9,8 @@ namespace gx_system { class JsonWriter; class JsonParser; } namespace gx_engine { ---- src/headers/gx_system.h 2018-07-22 06:24:50.000000000 +0200 -+++ - 2018-12-18 17:30:23.620272223 +0100 +--- a/src/headers/gx_system.h 2018-07-22 06:24:50.000000000 +0200 ++++ b/src/headers/gx_system.h 2018-07-22 06:24:50.000000000 +0200 @@ -25,6 +25,8 @@ #ifndef SRC_HEADERS_GX_SYSTEM_H_ #define SRC_HEADERS_GX_SYSTEM_H_ diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template index 8435021d0db..2d066a454c3 100644 --- a/srcpkgs/guitarix2/template +++ b/srcpkgs/guitarix2/template @@ -19,7 +19,6 @@ license="GPL-3.0-or-later" homepage="http://guitarix.org" distfiles="${SOURCEFORGE_SITE}/guitarix/guitarix/guitarix2-${version}.tar.xz" checksum=797e46e07148fba89e46fac4efe73a5b3a98f070bca85db3d143de781b142c80 -patch_args=-Np0 build_options="avahi bluez" desc_option_avahi="Build with avahi support" diff --git a/srcpkgs/gummiboot/patches/aarch64-support.patch b/srcpkgs/gummiboot/patches/aarch64-support.patch index 1a54aa1a18d..df57fdabc46 100644 --- a/srcpkgs/gummiboot/patches/aarch64-support.patch +++ b/srcpkgs/gummiboot/patches/aarch64-support.patch @@ -15,8 +15,8 @@ Signed-off-by: Koen Kooi diff --git a/Makefile.am b/Makefile.am index 6568a35..2cca313 100644 ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -94,17 +94,23 @@ efi_cflags = \ -ffreestanding \ -fno-strict-aliasing \ @@ -64,8 +64,8 @@ Signed-off-by: Koen Kooi diff --git a/src/efi/util.c b/src/efi/util.c index ba5ed7d..689bc7c 100644 ---- src/efi/util.c -+++ src/efi/util.c +--- a/src/efi/util.c ++++ b/src/efi/util.c @@ -33,7 +33,9 @@ UINT64 ticks_read(VOID) { __asm__ volatile ("rdtsc" : "=a" (a), "=d" (d)); return (d << 32) | a; @@ -100,8 +100,8 @@ Signed-off-by: Koen Kooi diff --git a/configure.ac b/configure.ac index 27bbe1d..c2077b1 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -51,6 +51,7 @@ dnl Define ARCH_ conditionals SET_ARCH(IA32, i*86*) SET_ARCH(X86_64, x86_64*) @@ -142,8 +142,8 @@ Signed-off-by: Koen Kooi diff --git a/src/efi/util.c b/src/efi/util.c index 689bc7c..6ce1f18 100644 ---- src/efi/util.c -+++ src/efi/util.c +--- a/src/efi/util.c ++++ b/src/efi/util.c @@ -33,14 +33,17 @@ UINT64 ticks_read(VOID) { __asm__ volatile ("rdtsc" : "=a" (a), "=d" (d)); return (d << 32) | a; @@ -188,8 +188,8 @@ Signed-off-by: Koen Kooi diff --git a/Makefile.am b/Makefile.am index 2cca313..eba5ec4 100644 ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -121,6 +121,17 @@ efi_ldflags = \ -L $(EFI_LIB_DIR) \ $(EFI_LDS_DIR)/crt0-efi-$(ARCH).o diff --git a/srcpkgs/gummiboot/patches/cross-support.patch b/srcpkgs/gummiboot/patches/cross-support.patch index 709213b5ab8..b9069232074 100644 --- a/srcpkgs/gummiboot/patches/cross-support.patch +++ b/srcpkgs/gummiboot/patches/cross-support.patch @@ -1,7 +1,7 @@ diff --git a/Makefile.am b/Makefile.am index eba5ec4..46c1728 100644 ---- Makefile.am -+++ Makefile.am +--- a/Makefile.am ++++ b/Makefile.am @@ -165,7 +165,7 @@ $(gummiboot_solib): $(gummiboot_objects) .DELETE_ON_ERROR: $(gummboot_solib) diff --git a/srcpkgs/gummiboot/patches/fix-glibc.patch b/srcpkgs/gummiboot/patches/fix-glibc.patch index cd6dbdec6ba..40df794a632 100644 --- a/srcpkgs/gummiboot/patches/fix-glibc.patch +++ b/srcpkgs/gummiboot/patches/fix-glibc.patch @@ -1,7 +1,7 @@ diff --git a/src/setup/setup.c b/src/setup/setup.c index 6a4275a..5342937 100644 ---- src/setup/setup.c -+++ src/setup/setup.c +--- a/src/setup/setup.c ++++ b/src/setup/setup.c @@ -37,6 +37,7 @@ #include #include diff --git a/srcpkgs/gummiboot/patches/fix-waitforkey.patch b/srcpkgs/gummiboot/patches/fix-waitforkey.patch index 8993bbfd449..55ec3895fff 100644 --- a/srcpkgs/gummiboot/patches/fix-waitforkey.patch +++ b/srcpkgs/gummiboot/patches/fix-waitforkey.patch @@ -6,8 +6,8 @@ systemd-boot (gummiboot's mainstream counterpart): see and . ---- src/efi/console.c 2015-03-11 16:50:35.000000000 -0700 -+++ src/efi/console.c 2020-12-09 15:41:19.837704801 -0800 +--- a/src/efi/console.c 2015-03-11 16:50:35.000000000 -0700 ++++ b/src/efi/console.c 2020-12-09 15:41:19.837704801 -0800 @@ -96,10 +96,7 @@ /* wait until key is pressed */ diff --git a/srcpkgs/gummiboot/patches/stub.patch b/srcpkgs/gummiboot/patches/stub.patch index a986190c1e2..1b0e3aab400 100644 --- a/srcpkgs/gummiboot/patches/stub.patch +++ b/srcpkgs/gummiboot/patches/stub.patch @@ -1,5 +1,5 @@ ---- src/efi/stub.c 2015-03-12 00:50:35.000000000 +0100 -+++ src/efi/stub.c 2020-07-06 12:32:55.985327487 +0200 +--- a/src/efi/stub.c 2015-03-12 00:50:35.000000000 +0100 ++++ b/src/efi/stub.c 2020-07-06 12:32:55.985327487 +0200 @@ -83,7 +83,7 @@ cmdline_len = szs[0]; diff --git a/srcpkgs/gummiboot/template b/srcpkgs/gummiboot/template index 966eae785ea..68e6f5be926 100644 --- a/srcpkgs/gummiboot/template +++ b/srcpkgs/gummiboot/template @@ -15,7 +15,6 @@ license="LGPL-2.0-or-later" homepage="https://pkgs.alpinelinux.org/package/edge/main/x86/gummiboot" distfiles="https://dev.alpinelinux.org/archive/gummiboot/gummiboot-${version}.tar.gz" checksum=2b649a6eb22007cd34bb355ba4ca6c1a8058e115c13048985f09a0f11f3d5295 -patch_args=-Np0 CFLAGS="-std=gnu89" diff --git a/srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch b/srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch index 4874a064c73..248e9704f8c 100644 --- a/srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch +++ b/srcpkgs/gupnp-igd/patches/port-to-new-gssdp-and-gupnp-api.patch @@ -13,8 +13,8 @@ Subject: [PATCH] Swtich to new GUPnP API diff --git a/configure.ac b/configure.ac index f03921f..aa7f0ca 100644 ---- configure.ac -+++ configure.ac +--- a/configure.ac ++++ b/configure.ac @@ -11,7 +11,7 @@ AC_STDC_HEADERS AC_PROG_LIBTOOL AC_FUNC_MMAP @@ -26,8 +26,8 @@ index f03921f..aa7f0ca 100644 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in index 483956f..6db3bee 100644 ---- gupnp-igd-1.0-uninstalled.pc.in -+++ gupnp-igd-1.0-uninstalled.pc.in +--- a/gupnp-igd-1.0-uninstalled.pc.in ++++ b/gupnp-igd-1.0-uninstalled.pc.in @@ -5,7 +5,7 @@ includedir=${pcfiledir}/ Name: gupnp-igd-1.0 @@ -39,8 +39,8 @@ index 483956f..6db3bee 100644 Cflags: -I${includedir} diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in index 6660d63..aa74ed3 100644 ---- gupnp-igd-1.0.pc.in -+++ gupnp-igd-1.0.pc.in +--- a/gupnp-igd-1.0.pc.in ++++ b/gupnp-igd-1.0.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: gupnp-igd-1.0 @@ -52,8 +52,8 @@ index 6660d63..aa74ed3 100644 Cflags: -I${includedir}/gupnp-igd-1.0 diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am index fe020b5..e10d857 100644 ---- libgupnp-igd/Makefile.am -+++ libgupnp-igd/Makefile.am +--- a/libgupnp-igd/Makefile.am ++++ b/libgupnp-igd/Makefile.am @@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0 GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES) GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS) @@ -65,8 +65,8 @@ index fe020b5..e10d857 100644 if HAVE_INTROSPECTION diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c index 9b32b2a..d051d13 100644 ---- tests/gtest/gupnp-simple-igd.c -+++ tests/gtest/gupnp-simple-igd.c +--- a/tests/gtest/gupnp-simple-igd.c ++++ b/tests/gtest/gupnp-simple-igd.c @@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, GUPnPDeviceInfo *subdev1; GUPnPDeviceInfo *subdev2; diff --git a/srcpkgs/gupnp-igd/template b/srcpkgs/gupnp-igd/template index 416943f715b..314a36472b8 100644 --- a/srcpkgs/gupnp-igd/template +++ b/srcpkgs/gupnp-igd/template @@ -13,7 +13,6 @@ license="LGPL-2.1-or-later" homepage="http://gupnp.org" distfiles="${GNOME_SITE}/${pkgname}/0.2/${pkgname}-${version}.tar.xz" checksum=8b4a1aa38bacbcac2c1755153147ead7ee9af7d4d1f544b6577cfc35e10e3b20 -patch_args=-Np0 # Package build options build_options="gir" diff --git a/srcpkgs/gupnp-tools/patches/fix-ftbfs.patch b/srcpkgs/gupnp-tools/patches/fix-ftbfs.patch index 0a1b1bbc297..0bf80fb5cd8 100644 --- a/srcpkgs/gupnp-tools/patches/fix-ftbfs.patch +++ b/srcpkgs/gupnp-tools/patches/fix-ftbfs.patch @@ -10,8 +10,8 @@ Fixes #3 diff --git a/src/common/meson.build b/src/common/meson.build index 68b1ca5..75b82db 100644 ---- src/common/meson.build -+++ src/common/meson.build +--- a/src/common/meson.build ++++ b/src/common/meson.build @@ -1,7 +1,9 @@ util_resource = gnome.compile_resources('common-resource', join_paths(resource_data, 'org.gupnp.Tools.Common.gresource.xml'), diff --git a/srcpkgs/gupnp-tools/template b/srcpkgs/gupnp-tools/template index 6c02534f045..09507922f46 100644 --- a/srcpkgs/gupnp-tools/template +++ b/srcpkgs/gupnp-tools/template @@ -12,4 +12,3 @@ license="GPL-2.0-or-later" homepage="http://gupnp.org/" distfiles="${GNOME_SITE}/gupnp-tools/${version%.*}/gupnp-tools-${version}.tar.xz" checksum=41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d -patch_args=-Np0 diff --git a/srcpkgs/guvcview/patches/0001-fix-building-with-musl-libc.patch b/srcpkgs/guvcview/patches/0001-fix-building-with-musl-libc.patch index 53d77cbeb51..654f992b5d4 100644 --- a/srcpkgs/guvcview/patches/0001-fix-building-with-musl-libc.patch +++ b/srcpkgs/guvcview/patches/0001-fix-building-with-musl-libc.patch @@ -15,8 +15,8 @@ libc so we avoid using them diff --git a/gview_audio/gviewaudio.h b/gview_audio/gviewaudio.h index 0cc6f70..5cae68b 100644 ---- gview_audio/gviewaudio.h -+++ gview_audio/gviewaudio.h +--- a/gview_audio/gviewaudio.h ++++ b/gview_audio/gviewaudio.h @@ -38,7 +38,9 @@ #include @@ -41,8 +41,8 @@ index 0cc6f70..5cae68b 100644 #endif diff --git a/gview_encoder/gviewencoder.h b/gview_encoder/gviewencoder.h index 2bc3586..aeff883 100644 ---- gview_encoder/gviewencoder.h -+++ gview_encoder/gviewencoder.h +--- a/gview_encoder/gviewencoder.h ++++ b/gview_encoder/gviewencoder.h @@ -38,7 +38,9 @@ #include @@ -66,8 +66,8 @@ index 2bc3586..aeff883 100644 #endif diff --git a/gview_render/gviewrender.h b/gview_render/gviewrender.h index e6cedfa..73c3b2c 100644 ---- gview_render/gviewrender.h -+++ gview_render/gviewrender.h +--- a/gview_render/gviewrender.h ++++ b/gview_render/gviewrender.h @@ -38,7 +38,9 @@ #include @@ -91,8 +91,8 @@ index e6cedfa..73c3b2c 100644 #endif diff --git a/gview_v4l2core/gviewv4l2core.h b/gview_v4l2core/gviewv4l2core.h index e9d5d53..35f075f 100644 ---- gview_v4l2core/gviewv4l2core.h -+++ gview_v4l2core/gviewv4l2core.h +--- a/gview_v4l2core/gviewv4l2core.h ++++ b/gview_v4l2core/gviewv4l2core.h @@ -33,7 +33,9 @@ #include diff --git a/srcpkgs/guvcview/template b/srcpkgs/guvcview/template index be0eba3ceed..447b27aecf5 100644 --- a/srcpkgs/guvcview/template +++ b/srcpkgs/guvcview/template @@ -15,7 +15,6 @@ license="GPL-3.0-or-later" homepage="http://guvcview.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-src-${version}.tar.gz" checksum=95381cef5ee139e15f90b79d1425cc22bbaae43f87452cdce6674636aff37e85 -patch_args=-Np0 post_extract() { sed '31a#include ' -i guvcview/guvcview.c diff --git a/srcpkgs/gwenhywfar/patches/cmake-prefix.patch b/srcpkgs/gwenhywfar/patches/cmake-prefix.patch index b1684c5cb1f..8b241e282fe 100644 --- a/srcpkgs/gwenhywfar/patches/cmake-prefix.patch +++ b/srcpkgs/gwenhywfar/patches/cmake-prefix.patch @@ -1,5 +1,5 @@ ---- gwenhywfar-config.cmake.in 2018-01-10 14:46:29.110367258 +0100 -+++ gwenhywfar-config.cmake.in 2018-01-10 15:00:33.544490115 +0100 +--- a/gwenhywfar-config.cmake.in 2018-01-10 14:46:29.110367258 +0100 ++++ b/gwenhywfar-config.cmake.in 2018-01-10 15:00:33.544490115 +0100 @@ -19,7 +19,18 @@ endforeach() endmacro() @@ -21,8 +21,8 @@ set_and_check(includedir "@includedir@") set_and_check(GWENHYWFAR_INCLUDE_DIRS "@gwenhywfar_headerdir@") ---- gui/qt4/gwengui-qt4-config.cmake.in 2018-01-10 16:45:24.121341582 +0100 -+++ gui/qt4/gwengui-qt4-config.cmake.in 2018-01-10 16:48:25.082803122 +0100 +--- a/gui/qt4/gwengui-qt4-config.cmake.in 2018-01-10 16:45:24.121341582 +0100 ++++ b/gui/qt4/gwengui-qt4-config.cmake.in 2018-01-10 16:48:25.082803122 +0100 @@ -40,7 +40,18 @@ return() endif() @@ -44,8 +44,8 @@ set_and_check(includedir "@includedir@") set_and_check(${CMAKE_FIND_PACKAGE_NAME}_INCLUDE_DIRS "@gwenhywfar_headerdir@") ---- gui/cpp/gwengui-cpp-config.cmake.in 2018-01-10 16:45:30.860247916 +0100 -+++ gui/cpp/gwengui-cpp-config.cmake.in 2018-01-10 16:47:54.086241064 +0100 +--- a/gui/cpp/gwengui-cpp-config.cmake.in 2018-01-10 16:45:30.860247916 +0100 ++++ b/gui/cpp/gwengui-cpp-config.cmake.in 2018-01-10 16:47:54.086241064 +0100 @@ -21,7 +21,18 @@ include(CMakeFindDependencyMacro) find_dependency(gwenhywfar "@GWENHYWFAR_VERSION_STRING@") @@ -67,8 +67,8 @@ set_and_check(includedir "@includedir@") set_and_check(GWENGUI_CPP_INCLUDE_DIRS "@gwenhywfar_headerdir@") ---- gui/qt5/gwengui-qt5-config.cmake.in 2018-01-10 16:45:39.551127015 +0100 -+++ gui/qt5/gwengui-qt5-config.cmake.in 2018-01-10 16:48:51.927422936 +0100 +--- a/gui/qt5/gwengui-qt5-config.cmake.in 2018-01-10 16:45:39.551127015 +0100 ++++ b/gui/qt5/gwengui-qt5-config.cmake.in 2018-01-10 16:48:51.927422936 +0100 @@ -23,8 +23,18 @@ find_dependency(Qt5Core) find_dependency(Qt5Widgets) diff --git a/srcpkgs/gwenhywfar/patches/qt5-cross.patch b/srcpkgs/gwenhywfar/patches/qt5-cross.patch index 41b447e2b73..3488200908f 100644 --- a/srcpkgs/gwenhywfar/patches/qt5-cross.patch +++ b/srcpkgs/gwenhywfar/patches/qt5-cross.patch @@ -1,5 +1,5 @@ ---- m4/ax_have_qt.m4.ORIG 2020-01-16 19:40:22.927813462 +0100 -+++ m4/ax_have_qt.m4 2020-01-16 19:42:12.106436543 +0100 +--- a/m4/ax_have_qt.m4 2020-01-16 19:40:22.927813462 +0100 ++++ b/m4/ax_have_qt.m4 2020-01-16 19:42:12.106436543 +0100 @@ -74,6 +74,12 @@ [QT_QMAKE="qmake"] ) diff --git a/srcpkgs/gwenhywfar/template b/srcpkgs/gwenhywfar/template index fb27f03a88f..c6e01f4bea8 100644 --- a/srcpkgs/gwenhywfar/template +++ b/srcpkgs/gwenhywfar/template @@ -13,7 +13,6 @@ license="LGPL-2.1-or-later" homepage="https://github.com/aqbanking/gwenhywfar" distfiles="https://github.com/aqbanking/gwenhywfar/archive/${version}.tar.gz" checksum=9f2876770824a283d02fd730bb1f7a98970fa6f20121f4af433d6698831c3a84 -patch_args=-Np0 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-host-tools qt5-devel" diff --git a/srcpkgs/gxemul/patches/patch-src_include_refcount__ptr.h.patch b/srcpkgs/gxemul/patches/patch-src_include_refcount__ptr.h.patch index 909536ffa5e..5e1f9699662 100644 --- a/srcpkgs/gxemul/patches/patch-src_include_refcount__ptr.h.patch +++ b/srcpkgs/gxemul/patches/patch-src_include_refcount__ptr.h.patch @@ -1,7 +1,7 @@ $NetBSD: patch-src_include_refcount__ptr.h,v 1.1 2012/11/23 22:43:09 alnsn Exp $ ---- src/include/refcount_ptr.h.orig 2010-02-14 09:33:54.000000000 +0000 -+++ src/include/refcount_ptr.h +--- a/src/include/refcount_ptr.h 2010-02-14 09:33:54.000000000 +0000 ++++ b/src/include/refcount_ptr.h @@ -28,6 +28,8 @@ * SUCH DAMAGE. */ diff --git a/srcpkgs/gxemul/template b/srcpkgs/gxemul/template index ea1ffa47d80..dabacd79492 100644 --- a/srcpkgs/gxemul/template +++ b/srcpkgs/gxemul/template @@ -11,7 +11,6 @@ changelog="http://gavare.se/gxemul/gxemul-stable/HISTORY.html" distfiles="http://gavare.se/gxemul/src/gxemul-${version}.tar.gz" checksum=a703ac7965feb3c701c7677d78c353f0efa1af4d36a9508fb045eb63dd571547 nocross="./_testpri: cannot execute binary file: Exec format error" -patch_args=-Np0 do_configure() { PREFIX=/usr MANDIR=${DESTDIR}/usr/share/man ./configure diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch index b66d70db512..14914b3a5a5 100644 --- a/srcpkgs/gzdoom/patches/fix-i686.patch +++ b/srcpkgs/gzdoom/patches/fix-i686.patch @@ -1,7 +1,7 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 26c617e..e162638 100644 ---- src/CMakeLists.txt -+++ src/CMakeLists.txt +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt @@ -1361,11 +1361,11 @@ endif() if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) # Need to enable intrinsics for these files. @@ -19,8 +19,8 @@ index 26c617e..e162638 100644 endif() diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp index f2a2987..b8de208 100644 ---- src/common/utility/palette.cpp -+++ src/common/utility/palette.cpp +--- a/src/common/utility/palette.cpp ++++ b/src/common/utility/palette.cpp @@ -33,6 +33,8 @@ */ diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template index 1ecb236fea6..ce1204db0d0 100644 --- a/srcpkgs/gzdoom/template +++ b/srcpkgs/gzdoom/template @@ -22,7 +22,6 @@ checksum="21eb1a221dae532a6c29f243584be3d5454f8eb4da85a67e405115f89666611d e0b85ca089a3714968f56acc9525f352dbec14f15e88e0aef1cdece64c4f3cbf" skip_extraction="${pkgname}_${version}_amd64.deb" nocross=yes -patch_args=-Np0 if [ "$XBPS_TARGET_LIBC" = musl ]; then makedepends+=" musl-fts-devel libexecinfo-devel"