From c621c444deb36f20e8b406c2f455ecb31e01d1e5 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Fri, 1 Dec 2023 01:29:42 -0600 Subject: user/libcdio-paranoia: Fix version string in .pc Ref: #1132 --- user/libcdio-paranoia/APKBUILD | 14 +++++++++++--- user/libcdio-paranoia/pkg-version-format.patch | 14 ++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 user/libcdio-paranoia/pkg-version-format.patch (limited to 'user') diff --git a/user/libcdio-paranoia/APKBUILD b/user/libcdio-paranoia/APKBUILD index 4fc2e1167..fbe9cd0d1 100644 --- a/user/libcdio-paranoia/APKBUILD +++ b/user/libcdio-paranoia/APKBUILD @@ -9,11 +9,18 @@ arch="all" license="GPL-2.0+ AND LGPL-2.0+" depends="" depends_dev="ncurses-dev" -makedepends="$depends_dev libcdio-dev" +makedepends="$depends_dev libcdio-dev autoconf automake" subpackages="$pkgname-dev $pkgname-doc" -source="https://ftp.gnu.org/gnu/libcdio/$pkgname-$_pkgver.tar.bz2" +source="https://ftp.gnu.org/gnu/libcdio/$pkgname-$_pkgver.tar.bz2 + pkg-version-format.patch + " builddir="$srcdir/$pkgname-$_pkgver" +prepare() { + default_prepare + autoreconf -vif +} + build() { ./configure \ --build=$CBUILD \ @@ -35,4 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0 libcdio-paranoia-10.2+2.0.1.tar.bz2" +sha512sums="c4a768d11e9f62038ca8081316596c89c7fee6a314229fb42e3999757fae172a5dc167175f60d555c2442266d34fce6ce627f4124e9f3a93d0456adb09ca91f0 libcdio-paranoia-10.2+2.0.1.tar.bz2 +addcc8c2b6f62218c855d1d2ce71406626ece0a669bad89a1375d32de3991b7496b53b196d7754e75382d297b860a6c3dc1305d32aa94073eb827848d5d01c6c pkg-version-format.patch" diff --git a/user/libcdio-paranoia/pkg-version-format.patch b/user/libcdio-paranoia/pkg-version-format.patch new file mode 100644 index 000000000..5dc7cd286 --- /dev/null +++ b/user/libcdio-paranoia/pkg-version-format.patch @@ -0,0 +1,14 @@ +Upstream-Status: Not appropriate (apk bustage) +See-also: https://git.adelielinux.org/adelie/packages/-/issues/1132 + +--- libcdio-paranoia-10.2+2.0.1/configure.ac.old 2019-09-16 09:30:01.000000000 -0500 ++++ libcdio-paranoia-10.2+2.0.1/configure.ac 2023-12-01 01:24:10.923099071 -0600 +@@ -16,7 +16,7 @@ + + define(RELEASE_NUM, 2.0.1) + define(PARANOIA_VERSION, 10.2) +-define(LIBCDIO_PARANOIA_VERSION_STR, $1+$2) ++define(LIBCDIO_PARANOIA_VERSION_STR, $1.$2) + + AC_DEFINE([PACKAGE], [libcdio-paranoia], [cdparanoia using libcdio]) + -- cgit v1.2.3-70-g09d2