* [PR PATCH] argp-standalone 1.4.0
@ 2021-02-10 22:34 ericonr
2021-02-10 22:37 ` [PR PATCH] [Updated] " ericonr
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: ericonr @ 2021-02-10 22:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1913 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages argp
https://github.com/void-linux/void-packages/pull/28655
argp-standalone 1.4.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Revbumping most dependants after this will be necessary, because there
is a very visible bug where "<program> --usage" or "<program> --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.
A patch file from https://github.com/void-linux/void-packages/pull/28655.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-argp-28655.patch --]
[-- Type: text/x-diff, Size: 15176 bytes --]
From 1d9b335b41a7f78650521bb5aa47d36416a3e407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:24:35 -0300
Subject: [PATCH 01/18] argp-standalone: update to 1.4.0.
Revbumping most dependants after this will be necessary, because there
is a very visible bug where "<program> --usage" or "<program> --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);
- \f
-+#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 <john@jrjrtech.com>"
-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 <ericonr@disroot.org>"
+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 cb5fa2b400cffa8cfe6ed09a909d7da2cd5e311a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 18:33:44 -0300
Subject: [PATCH 02/18] 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 750266271248f9918979a3bdbba32cd9c706042d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:38 -0300
Subject: [PATCH 03/18] 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 8b56c28da00fbd06d3ac8c4ad20bde83f6d9e00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:38 -0300
Subject: [PATCH 04/18] 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 4c255c66109fe9d83bb16a9dfeb08de3080c4b0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:38 -0300
Subject: [PATCH 05/18] libavc1394: revbump for new argp-standalone version.
---
srcpkgs/libavc1394/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libavc1394/template b/srcpkgs/libavc1394/template
index b4cd911e917..3c44e597fba 100644
--- a/srcpkgs/libavc1394/template
+++ b/srcpkgs/libavc1394/template
@@ -1,7 +1,7 @@
# Template file for 'libavc1394'
pkgname=libavc1394
version=0.5.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="libraw1394-devel"
From 41f99a258707a9bfc87208edbd6a1e1a426471a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:38 -0300
Subject: [PATCH 06/18] 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 60059b143b048de9e7c3fa522299b7d92198b51c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:39 -0300
Subject: [PATCH 07/18] 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 f1c4aeb782c6fc0f5832fe2218e0b4fa8f403663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:39 -0300
Subject: [PATCH 08/18] xen: revbump for new argp-standalone version.
---
srcpkgs/xen/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index bc00c7cc8e0..31ebe047c4c 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,7 +1,7 @@
# Template file for 'xen'
pkgname=xen
version=4.14.1
-revision=2
+revision=3
# grep -R IPXE_GIT_TAG src/xen-*/tools/firmware/etherboot
_git_tag_ipxe=4bd064de239dab2426b31c9789a1f4d78087dc63
# TODO: arm / aarch64
From e7a1215ab1e95b0af80c4b6cf777e03080176e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:39 -0300
Subject: [PATCH 09/18] iucode-tool: revbump for new argp-standalone version.
---
srcpkgs/iucode-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/iucode-tool/template b/srcpkgs/iucode-tool/template
index 277773a1e06..afe76be5783 100644
--- a/srcpkgs/iucode-tool/template
+++ b/srcpkgs/iucode-tool/template
@@ -1,7 +1,7 @@
# 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"
From abc05f676e957756a50c97575c63fb266ba437f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:39 -0300
Subject: [PATCH 10/18] 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 8438961317c306dcb20991bc9685287f6bccccb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:39 -0300
Subject: [PATCH 11/18] incron: revbump for new argp-standalone version.
---
srcpkgs/incron/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/incron/template b/srcpkgs/incron/template
index 4bb9549b003..e7379f375e9 100644
--- a/srcpkgs/incron/template
+++ b/srcpkgs/incron/template
@@ -1,7 +1,7 @@
# Template file for 'incron'
pkgname=incron
version=0.5.12
-revision=1
+revision=2
short_desc="A daemon that executes commands due to inotify events"
maintainer="allan <mail@may.mooo.com>"
license="X11"
From cc4d2cf30a0dcafddbd4f551fcbed8a85d9ad78c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 12/18] crun: revbump for new argp-standalone version.
---
srcpkgs/crun/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 2dc3f46e47f..c665e405537 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)"
From c9522a616005d53261a9a2211f8b0aebb054d24c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 13/18] 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 0ebf1aede87796ebb587fd325b78e6e9bea234e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 14/18] 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 cbe0b40d6ca25b623d33c1c954609952a98d3e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 15/18] prelink-cross: revbump for new argp-standalone version.
---
srcpkgs/prelink-cross/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/prelink-cross/template b/srcpkgs/prelink-cross/template
index 163666e8006..b02ae75056f 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
From 44e643040021b52924e936a836ab33b634d4d1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 16/18] 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 f068ca8fa68ecc6f47631c9d060d73c51dd9b9e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 17/18] 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 0e7c7cd37092f80c425b327adc18faf0b230f250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:41 -0300
Subject: [PATCH 18/18] 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"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] argp-standalone 1.4.0
2021-02-10 22:34 [PR PATCH] argp-standalone 1.4.0 ericonr
@ 2021-02-10 22:37 ` ericonr
2021-02-10 23:03 ` ericonr
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-10 22:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1918 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages argp
https://github.com/void-linux/void-packages/pull/28655
argp-standalone 1.4.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Revbumping most dependants after this will be necessary, because there
is a very visible bug where "<program> --usage" or "<program> --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.
A patch file from https://github.com/void-linux/void-packages/pull/28655.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-argp-28655.patch --]
[-- Type: text/x-diff, Size: 15068 bytes --]
From 1d9b335b41a7f78650521bb5aa47d36416a3e407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 "<program> --usage" or "<program> --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);
- \f
-+#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 <john@jrjrtech.com>"
-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 <ericonr@disroot.org>"
+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 cb5fa2b400cffa8cfe6ed09a909d7da2cd5e311a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 750266271248f9918979a3bdbba32cd9c706042d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 8b56c28da00fbd06d3ac8c4ad20bde83f6d9e00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 8168034d4aa8a073c19ecc69eef616174afb58fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <duncaen@voidlinux.org>"
-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 5f289c558f1e92842e93f75b34055fe163927886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 fadd7283bd22d716f2dceaf4f99a8852b225ad9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 b5f31ecd65551bb4ea7ef443470c17c19da1a523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:39 -0300
Subject: [PATCH 08/17] iucode-tool: revbump for new argp-standalone version.
---
srcpkgs/iucode-tool/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/iucode-tool/template b/srcpkgs/iucode-tool/template
index 277773a1e06..afe76be5783 100644
--- a/srcpkgs/iucode-tool/template
+++ b/srcpkgs/iucode-tool/template
@@ -1,7 +1,7 @@
# 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"
From f4096831f580d98df26e74eb9806b022382142d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 86035a1edcf76562b771c59d8824df0e928358fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <mail@may.mooo.com>"
license="X11"
homepage="https://github.com/ar-/incron"
From d654d06c8203b389039f7218a7c2b9aa6699b5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 11/17] crun: revbump for new argp-standalone version.
---
srcpkgs/crun/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 2dc3f46e47f..c665e405537 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)"
From 110b50f667b4c13c209cc2ae182086660fe83219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 55453ed5a541a0eb1948b25640becca005217c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 e19b9e3ca78ecdd994f44b76d8b60d5dd8126c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/prelink-cross/template b/srcpkgs/prelink-cross/template
index 163666e8006..b02ae75056f 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
From be846aee32848cf464d2c980e56ec80aa701195e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 d4043c694b035119f2c02a05f9d0658d161a42cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 0103f3c0e1add52441f635a13171b8243c2170c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] argp-standalone 1.4.0
2021-02-10 22:34 [PR PATCH] argp-standalone 1.4.0 ericonr
2021-02-10 22:37 ` [PR PATCH] [Updated] " ericonr
@ 2021-02-10 23:03 ` ericonr
2021-02-10 23:26 ` ericonr
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-10 23:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1918 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages argp
https://github.com/void-linux/void-packages/pull/28655
argp-standalone 1.4.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Revbumping most dependants after this will be necessary, because there
is a very visible bug where "<program> --usage" or "<program> --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.
A patch file from https://github.com/void-linux/void-packages/pull/28655.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-argp-28655.patch --]
[-- Type: text/x-diff, Size: 15644 bytes --]
From 1d9b335b41a7f78650521bb5aa47d36416a3e407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 "<program> --usage" or "<program> --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);
- \f
-+#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 <john@jrjrtech.com>"
-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 <ericonr@disroot.org>"
+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 cb5fa2b400cffa8cfe6ed09a909d7da2cd5e311a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 750266271248f9918979a3bdbba32cd9c706042d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 8b56c28da00fbd06d3ac8c4ad20bde83f6d9e00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 8168034d4aa8a073c19ecc69eef616174afb58fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <duncaen@voidlinux.org>"
-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 5f289c558f1e92842e93f75b34055fe163927886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 fadd7283bd22d716f2dceaf4f99a8852b225ad9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 22b0c5171b2fb7a12857c611724da5c2a25d5af9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/iucode-tool/template b/srcpkgs/iucode-tool/template
index 277773a1e06..1c7180eaa9a 100644
--- a/srcpkgs/iucode-tool/template
+++ b/srcpkgs/iucode-tool/template
@@ -1,16 +1,20 @@
# 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 <vintodrimmer@protonmail.ch>"
-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
+
+do_check() {
+ : # multiple test failures, can't find the binaries for the tests
+}
From b639065d635126c95791ac97bf36f5f779a46654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 3b21beea903c1aa47d1120015b792cc1667bfe1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <mail@may.mooo.com>"
license="X11"
homepage="https://github.com/ar-/incron"
From 12e978321e15d4705ced3c1fe52679f15e9dc583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 11/17] crun: revbump for new argp-standalone version.
---
srcpkgs/crun/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 2dc3f46e47f..c665e405537 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)"
From d03cdce8aae7047487a422ea4e5623bb8c3a7859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 c2cbf4f598dadb525b67a1da2a854dddef3aa2d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 ae9c8bf3f31778c85450a54d6918b04c55bbd70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/prelink-cross/template b/srcpkgs/prelink-cross/template
index 163666e8006..b02ae75056f 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
From fd90b7efb5533b6b453d9cd720e7377ba9904048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 e62815b3b5f1076e973b54350dbd17da8952f954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 07af0d5ac3b8e72eff3dd39c3eacedf960568b1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] argp-standalone 1.4.0
2021-02-10 22:34 [PR PATCH] argp-standalone 1.4.0 ericonr
2021-02-10 22:37 ` [PR PATCH] [Updated] " ericonr
2021-02-10 23:03 ` ericonr
@ 2021-02-10 23:26 ` ericonr
2021-02-10 23:54 ` ericonr
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-10 23:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1918 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages argp
https://github.com/void-linux/void-packages/pull/28655
argp-standalone 1.4.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Revbumping most dependants after this will be necessary, because there
is a very visible bug where "<program> --usage" or "<program> --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.
A patch file from https://github.com/void-linux/void-packages/pull/28655.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-argp-28655.patch --]
[-- Type: text/x-diff, Size: 15791 bytes --]
From 1d9b335b41a7f78650521bb5aa47d36416a3e407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 "<program> --usage" or "<program> --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);
- \f
-+#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 <john@jrjrtech.com>"
-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 <ericonr@disroot.org>"
+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 cb5fa2b400cffa8cfe6ed09a909d7da2cd5e311a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 750266271248f9918979a3bdbba32cd9c706042d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 8b56c28da00fbd06d3ac8c4ad20bde83f6d9e00d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 8168034d4aa8a073c19ecc69eef616174afb58fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <duncaen@voidlinux.org>"
-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 5f289c558f1e92842e93f75b34055fe163927886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 fadd7283bd22d716f2dceaf4f99a8852b225ad9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 309f2b6537f385390a13a6051abd2b3c5d4bbcc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <vintodrimmer@protonmail.ch>"
-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 7038f9d03468d33da81e2f0c172074f025f383de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 909223211b34279811e5c72d62148eede034ee8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <mail@may.mooo.com>"
license="X11"
homepage="https://github.com/ar-/incron"
From 8afe05fd1ef4c223c5e5a0597136cf2097a47c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:21:40 -0300
Subject: [PATCH 11/17] crun: revbump for new argp-standalone version.
---
srcpkgs/crun/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/crun/template b/srcpkgs/crun/template
index 2dc3f46e47f..c665e405537 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)"
From 3ad3bd553733fc453468817158267e9ed99206a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 6865673da65965d25643c2f1452270ee91590f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 b44fd4afd775bacb4224b14e2cb25a4fa51eb995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 4d3bfad3d2e0a7ab266db47fc2a0cdd2a85eb8ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 2f0701360583042c6458cb80777d899bef4ddeca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 bca1306d3a85a9b9d9899975f76e1ee6c12bd87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] argp-standalone 1.4.0
2021-02-10 22:34 [PR PATCH] argp-standalone 1.4.0 ericonr
` (2 preceding siblings ...)
2021-02-10 23:26 ` ericonr
@ 2021-02-10 23:54 ` ericonr
2021-02-16 4:55 ` ericonr
2021-02-16 5:32 ` [PR PATCH] [Merged]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-10 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1918 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages argp
https://github.com/void-linux/void-packages/pull/28655
argp-standalone 1.4.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Revbumping most dependants after this will be necessary, because there
is a very visible bug where "<program> --usage" or "<program> --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.
A patch file from https://github.com/void-linux/void-packages/pull/28655.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-argp-28655.patch --]
[-- Type: text/x-diff, Size: 16054 bytes --]
From 8b524a4bd3fab11b4c1feead552b8650eeeda99c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 "<program> --usage" or "<program> --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);
- \f
-+#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 <john@jrjrtech.com>"
-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 <ericonr@disroot.org>"
+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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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 <duncaen@voidlinux.org>"
-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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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 <vintodrimmer@protonmail.ch>"
-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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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 <mail@may.mooo.com>"
license="X11"
homepage="https://github.com/ar-/incron"
From 582c7dc7871f0a71c85734e60a9a3c153c3e8c8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] argp-standalone 1.4.0
2021-02-10 22:34 [PR PATCH] argp-standalone 1.4.0 ericonr
` (3 preceding siblings ...)
2021-02-10 23:54 ` ericonr
@ 2021-02-16 4:55 ` ericonr
2021-02-16 5:32 ` [PR PATCH] [Merged]: " ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-16 4:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1918 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages argp
https://github.com/void-linux/void-packages/pull/28655
argp-standalone 1.4.0
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Revbumping most dependants after this will be necessary, because there
is a very visible bug where "<program> --usage" or "<program> --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.
A patch file from https://github.com/void-linux/void-packages/pull/28655.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-argp-28655.patch --]
[-- Type: text/x-diff, Size: 16076 bytes --]
From e6f905d543f617232fc556f8cad8086d46d9cb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 10 Feb 2021 19:24:35 -0300
Subject: [PATCH 01/17] argp-standalone: update to 1.4.1.
Revbumping most dependants after this will be necessary, because there
is a very visible bug where "<program> --usage" or "<program> --help"
segfaults for some applications.
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);
- \f
-+#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..55983b8b3d0 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.1
+revision=1
archs="*-musl"
build_style=gnu-configure
+hostmakedepends="autoconf automake"
short_desc="Implementation of ARGP"
-maintainer="John Regan <john@jrjrtech.com>"
-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 <ericonr@disroot.org>"
+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=879d76374424dce051b812f16f43c6d16de8dbaddd76002f83fd1b6e57d39e0b
CFLAGS="-fPIC"
+pre_configure() {
+ autoreconf -fi
+}
+
do_install() {
vinstall ${wrksrc}/libargp.a 644 usr/lib
vinstall ${wrksrc}/argp.h 644 usr/include
}
-
From 4a7737ff4aa575c2012383dfeca577a366560bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 dae89e1e558eee15eb766b9fb06a743262f445c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 80a8a8b3eba202787debc2631c0614096357e4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 4bda5cf56e87355b10d67c2f9f2eb570b76b96b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <duncaen@voidlinux.org>"
-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 95681589bbc2f5cfe67229ef611e7abb85ca75c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 de077bed856b97cc2d7e394e8bece4a36dccf361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 df9a376293e22b61c22fd367d630023c19304c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <vintodrimmer@protonmail.ch>"
-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 3fc6caab75e50ad19241f86989cac66f4e6b74ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 f9388115c848d6a3d7abac4911a325ae10876378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <mail@may.mooo.com>"
license="X11"
homepage="https://github.com/ar-/incron"
From 4287b5ba25aea84e5bab2fb6d7f00bf63a1d56ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 cc8bfb26317d4a055523026d8730f5a8e332e1c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 b598e1d31fbb8eac36a587d94fb1c62d7b4c04be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 3f27c67f05faa2e8fdbff7093d4f95710e25e53a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 7fbdb223578b4e99e59f60d2851d7857d06f81a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 2c1ce992e4e8bfd272f482dc985a8149875a4f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 e0937f74da9fa8cbcfcc7be5b03cb9353719c93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: argp-standalone 1.4.0
2021-02-10 22:34 [PR PATCH] argp-standalone 1.4.0 ericonr
` (4 preceding siblings ...)
2021-02-16 4:55 ` ericonr
@ 2021-02-16 5:32 ` ericonr
5 siblings, 0 replies; 7+ messages in thread
From: ericonr @ 2021-02-16 5:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1765 bytes --]
There's a merged pull request on the void-packages repository
argp-standalone 1.4.0
https://github.com/void-linux/void-packages/pull/28655
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Revbumping most dependants after this will be necessary, because there
is a very visible bug where "<program> --usage" or "<program> --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.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-02-16 5:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-10 22:34 [PR PATCH] argp-standalone 1.4.0 ericonr
2021-02-10 22:37 ` [PR PATCH] [Updated] " ericonr
2021-02-10 23:03 ` ericonr
2021-02-10 23:26 ` ericonr
2021-02-10 23:54 ` ericonr
2021-02-16 4:55 ` ericonr
2021-02-16 5:32 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).