From 8b524a4bd3fab11b4c1feead552b8650eeeda99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:24:35 -0300 Subject: [PATCH 01/17] argp-standalone: update to 1.4.0. Revbumping most dependants after this will be necessary, because there is a very visible bug where " --usage" or " --help" segfaults. Forking and switching upstream has been done because the project isn't active and no one has forked it themselves yet, at least that I could find. --- .../patches/fix-no_use_inline.patch | 32 ------------------- srcpkgs/argp-standalone/template | 20 +++++++----- 2 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 srcpkgs/argp-standalone/patches/fix-no_use_inline.patch diff --git a/srcpkgs/argp-standalone/patches/fix-no_use_inline.patch b/srcpkgs/argp-standalone/patches/fix-no_use_inline.patch deleted file mode 100644 index a76bba8000f..00000000000 --- a/srcpkgs/argp-standalone/patches/fix-no_use_inline.patch +++ /dev/null @@ -1,32 +0,0 @@ -Effectively disable inlining of functions which are defined -in argp-fmtstream.c because of name space conflicts when -including argp-namefrob.h - ---- argp-fmtstream.h 2003-12-11 09:37:05.000000000 +0100 -+++ argp-fmtstream.h 2016-09-27 09:19:48.891000000 +0200 -@@ -192,6 +192,7 @@ - extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); - extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); - -+#ifdef ARGP_USE_INLINE - #ifdef __OPTIMIZE__ - /* Inline versions of above routines. */ - -@@ -208,7 +209,7 @@ - #endif - - #ifndef ARGP_FS_EI --#define ARGP_FS_EI extern inline -+#define ARGP_FS_EI static inline - #endif - - ARGP_FS_EI size_t -@@ -306,6 +307,8 @@ - - #endif /* __OPTIMIZE__ */ - -+#endif /* ARGP_USE_INLINE */ -+ - #endif /* ARGP_FMTSTREAM_USE_LINEWRAP */ - - #endif /* argp-fmtstream.h */ diff --git a/srcpkgs/argp-standalone/template b/srcpkgs/argp-standalone/template index 061fbf5330f..afd43bda273 100644 --- a/srcpkgs/argp-standalone/template +++ b/srcpkgs/argp-standalone/template @@ -1,20 +1,24 @@ # Template file for 'argp-standalone' pkgname=argp-standalone -version=1.3 -revision=2 +version=1.4.0 +revision=1 archs="*-musl" build_style=gnu-configure +hostmakedepends="autoconf automake" short_desc="Implementation of ARGP" -maintainer="John Regan " -homepage="https://www.freshports.org/devel/argp-standalone/" -license="Public Domain" -distfiles="http://www.lysator.liu.se/~nisse/misc/argp-standalone-${version}.tar.gz" -checksum=dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be +maintainer="Érico Nogueira " +license="LGPL-2.1-or-later" +homepage="https://github.com/ericonr/argp-standalone" +distfiles="https://github.com/ericonr/argp-standalone/archive/${version}.tar.gz" +checksum=0bacce3dcdd887fcb9e76597ec667d26821f4c268bd5ae08afeb78e58189c089 CFLAGS="-fPIC" +pre_configure() { + autoreconf -fi +} + do_install() { vinstall ${wrksrc}/libargp.a 644 usr/lib vinstall ${wrksrc}/argp.h 644 usr/include } - From 4863fba7207781ab58e59771f7315ae1c913abcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 18:33:44 -0300 Subject: [PATCH 02/17] elfutils: revbump for new argp-standalone version. --- srcpkgs/elfutils/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index 86e47a3e339..ee2bb254040 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -1,7 +1,7 @@ # Template file for 'elfutils' pkgname=elfutils version=0.183 -revision=1 +revision=2 build_style=gnu-configure configure_args="--program-prefix=eu-" hostmakedepends="automake libtool pkg-config" From 7f8ed8f1be19adeb4419fb7871e8a471b9c9c53c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:38 -0300 Subject: [PATCH 03/17] pahole: revbump for new argp-standalone version. --- srcpkgs/pahole/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pahole/template b/srcpkgs/pahole/template index a2fc8f2023e..184b67b9528 100644 --- a/srcpkgs/pahole/template +++ b/srcpkgs/pahole/template @@ -1,7 +1,7 @@ # Template file for 'pahole' pkgname=pahole version=1.20 -revision=1 +revision=2 wrksrc="dwarves-${version}" build_style=cmake configure_args="-D__LIB=lib" From 04f214a7e3131c4814e3e95db21bfcb894fa7197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:38 -0300 Subject: [PATCH 04/17] yoshimi: revbump for new argp-standalone version. --- srcpkgs/yoshimi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/yoshimi/template b/srcpkgs/yoshimi/template index 1c4bcb51949..0096f7f0571 100644 --- a/srcpkgs/yoshimi/template +++ b/srcpkgs/yoshimi/template @@ -1,7 +1,7 @@ # Template file for 'yoshimi' pkgname=yoshimi version=1.7.4 -revision=1 +revision=2 build_wrksrc=src build_style=cmake hostmakedepends="pkg-config fltk" From dc180961f1918881752bc2f5e240fc2250a40955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:38 -0300 Subject: [PATCH 05/17] libavc1394: revbump for new argp-standalone version. Also xlint. --- srcpkgs/libavc1394/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libavc1394/template b/srcpkgs/libavc1394/template index b4cd911e917..1a81842b9a8 100644 --- a/srcpkgs/libavc1394/template +++ b/srcpkgs/libavc1394/template @@ -1,13 +1,13 @@ # Template file for 'libavc1394' pkgname=libavc1394 version=0.5.4 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libraw1394-devel" -short_desc="A library to control A/V devices using the 1394ta AV/C commands" +short_desc="Library to control A/V devices using the 1394ta AV/C commands" maintainer="Duncaen " -license="LGPL-2" +license="LGPL-2.1-or-later" homepage="http://sourceforge.net/projects/libavc1394/" distfiles="${SOURCEFORGE_SITE}/libavc1394/${pkgname}-${version}.tar.gz" checksum=7cb1ff09506ae911ca9860bef4af08c2403f3e131f6c913a2cbd6ddca4215b53 From 3770eb8334722ecc8b8da4281860d24685a99116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:38 -0300 Subject: [PATCH 06/17] qv4l2: revbump for new argp-standalone version. --- srcpkgs/qv4l2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qv4l2/template b/srcpkgs/qv4l2/template index 30929bd2c60..292be169c20 100644 --- a/srcpkgs/qv4l2/template +++ b/srcpkgs/qv4l2/template @@ -1,7 +1,7 @@ # Template file for 'qv4l2' pkgname=qv4l2 version=1.18.0 -revision=1 +revision=2 wrksrc="v4l-utils-${version}" build_style=gnu-configure configure_args="--enable-qv4l2 --with-udevdir=/usr/lib/udev" From 0e502191bf9c79dea638d82b54e371de38660a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:39 -0300 Subject: [PATCH 07/17] libffado: revbump for new argp-standalone version. --- srcpkgs/libffado/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libffado/template b/srcpkgs/libffado/template index 2783042b492..cadd335b30e 100644 --- a/srcpkgs/libffado/template +++ b/srcpkgs/libffado/template @@ -1,7 +1,7 @@ # Template file for 'libffado' pkgname=libffado version=2.4.4 -revision=2 +revision=3 build_style=scons make_build_args="PREFIX=/usr MANDIR=/usr/share/man UDEVDIR=/usr/lib/udev/rules.d CUSTOM_ENV=1 BUILD_TESTS=0 From 441c100417ae1b8209630be642cf56bd9362dc42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:39 -0300 Subject: [PATCH 08/17] iucode-tool: revbump for new argp-standalone version. Also xlint. --- srcpkgs/iucode-tool/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/iucode-tool/template b/srcpkgs/iucode-tool/template index 277773a1e06..d28c1046105 100644 --- a/srcpkgs/iucode-tool/template +++ b/srcpkgs/iucode-tool/template @@ -1,16 +1,16 @@ # Template file for 'iucode-tool' pkgname=iucode-tool version=2.3.1 -revision=1 +revision=2 archs="i686* x86_64*" build_style=gnu-configure short_desc="Program to manipulate microcode update collections for Intel" maintainer="Vintodrimmer " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://gitlab.com/iucode-tool/iucode-tool/wikis/home" distfiles="https://gitlab.com/iucode-tool/releases/raw/latest/iucode-tool_${version}.tar.xz" checksum=12b88efa4d0d95af08db05a50b3dcb217c0eb2bfc67b483779e33d498ddb2f95 case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" argp-standalone" ;; + *-musl) makedepends="argp-standalone" ;; esac From a818f2e02bfb826275c1affc82904e51c8cf3a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:39 -0300 Subject: [PATCH 09/17] rng-tools: revbump for new argp-standalone version. --- srcpkgs/rng-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rng-tools/template b/srcpkgs/rng-tools/template index 8f8c9dc4748..4279e97ad64 100644 --- a/srcpkgs/rng-tools/template +++ b/srcpkgs/rng-tools/template @@ -1,7 +1,7 @@ # Template file for 'rng-tools' pkgname=rng-tools version=6.11 -revision=1 +revision=2 wrksrc=${pkgname}-${version} build_style=gnu-configure configure_args="--sbindir=/usr/bin --without-pkcs11 --without-rtlsdr" From 59cd65fbeee88d543db6a788863dc78bd4da9ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:39 -0300 Subject: [PATCH 10/17] incron: revbump for new argp-standalone version. Also xlint. --- srcpkgs/incron/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/incron/template b/srcpkgs/incron/template index 4bb9549b003..19c08b4befa 100644 --- a/srcpkgs/incron/template +++ b/srcpkgs/incron/template @@ -1,8 +1,8 @@ # Template file for 'incron' pkgname=incron version=0.5.12 -revision=1 -short_desc="A daemon that executes commands due to inotify events" +revision=2 +short_desc="Daemon that executes commands due to inotify events" maintainer="allan " license="X11" homepage="https://github.com/ar-/incron" From 582c7dc7871f0a71c85734e60a9a3c153c3e8c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:40 -0300 Subject: [PATCH 11/17] crun: revbump for new argp-standalone version. --- srcpkgs/crun/template | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template index 2dc3f46e47f..e5415d3ee10 100644 --- a/srcpkgs/crun/template +++ b/srcpkgs/crun/template @@ -1,7 +1,7 @@ # Template file for 'crun' pkgname=crun version=0.16 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-systemd" hostmakedepends="pkg-config libtool python3 $(vopt_if man go-md2man)" @@ -25,6 +25,13 @@ case "$XBPS_MACHINE" in *) ;; esac +do_check() { + if [ "$XBPS_CHECK_PKGS" = full ]; then + # most of the tests don't work inside a container + make check ${makejobs} + fi +} + post_install() { rm -f ${DESTDIR}/usr/lib/*.a } From 045d033916becf77f9382b50ddcb95d7e4893ae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:40 -0300 Subject: [PATCH 12/17] zchunk: revbump for new argp-standalone version. --- srcpkgs/zchunk/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template index aca7fe5b760..876a896bbef 100644 --- a/srcpkgs/zchunk/template +++ b/srcpkgs/zchunk/template @@ -1,7 +1,7 @@ # Template file for 'zchunk' pkgname=zchunk version=1.1.9 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config" makedepends="libcurl-devel libzstd-devel" From 471ecc63d09ad225a0e397e6743311038b43d276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:40 -0300 Subject: [PATCH 13/17] v4l-utils: revbump for new argp-standalone version. --- srcpkgs/v4l-utils/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template index 123ea76f183..6ef76bb1e90 100644 --- a/srcpkgs/v4l-utils/template +++ b/srcpkgs/v4l-utils/template @@ -1,7 +1,7 @@ # Template file for 'v4l-utils' pkgname=v4l-utils version=1.20.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-qv4l2 --with-udevdir=/usr/lib/udev" hostmakedepends="automake libtool pkg-config gettext-devel" From 67868732ca0a8c91e45c766e766c0eaa5aec736b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:40 -0300 Subject: [PATCH 14/17] prelink-cross: revbump for new argp-standalone version. --- srcpkgs/prelink-cross/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/prelink-cross/template b/srcpkgs/prelink-cross/template index 163666e8006..dfa989429aa 100644 --- a/srcpkgs/prelink-cross/template +++ b/srcpkgs/prelink-cross/template @@ -1,7 +1,7 @@ # Template file for 'prelink-cross' pkgname=prelink-cross version=20180128 -revision=1 +revision=2 _githash=ca213abd9ebfd77a04e3a967bf9f7bc1ef832087 wrksrc="prelink-cross-${_githash}" build_style=gnu-configure @@ -21,6 +21,10 @@ pre_configure() { autoreconf -fi } +do_check() { + : # multiple test failures, can't find the binaries for the tests +} + post_install() { # We don't want the tools that are on prelink # just prelink-rltd From 93a1838ce292b869e7a5d0a8d21babfc3338c321 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:40 -0300 Subject: [PATCH 15/17] f3: revbump for new argp-standalone version. --- srcpkgs/f3/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/f3/template b/srcpkgs/f3/template index 7697a1687dd..cb95e071e45 100644 --- a/srcpkgs/f3/template +++ b/srcpkgs/f3/template @@ -1,7 +1,7 @@ # Template file for 'f3' pkgname=f3 version=7.2 -revision=1 +revision=2 build_style=gnu-makefile make_build_target="all extra" make_install_target="install install-extra" From 5b8e8387c898a9809509c821a8fb73ae25f4ee1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:40 -0300 Subject: [PATCH 16/17] uftrace: revbump for new argp-standalone version. --- srcpkgs/uftrace/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/uftrace/template b/srcpkgs/uftrace/template index eb9c7141c90..1c4d54a5bcb 100644 --- a/srcpkgs/uftrace/template +++ b/srcpkgs/uftrace/template @@ -1,7 +1,7 @@ # Template file for 'uftrace' pkgname=uftrace version=0.9.4 -revision=1 +revision=2 archs="x86_64* i686* aarch64* arm*" build_style=gnu-configure hostmakedepends="pandoc pkg-config" From 0122f181e4fa4bc2ce34b62fce06eb219b3fe880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 10 Feb 2021 19:21:41 -0300 Subject: [PATCH 17/17] tmines: revbump for new argp-standalone version. --- srcpkgs/tmines/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tmines/template b/srcpkgs/tmines/template index 568faea6a46..7669477aea9 100644 --- a/srcpkgs/tmines/template +++ b/srcpkgs/tmines/template @@ -1,7 +1,7 @@ # Template file for 'tmines' pkgname=tmines version=1.0 -revision=1 +revision=2 build_style=cmake makedepends="ncurses-devel" short_desc="Terminal minesweeper clone"