From 01db05244d6498692eb53bbcc59af853dc265fd1 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Wed, 2 Aug 2023 15:08:35 +0200 Subject: [PATCH] chafa: update to 1.12.5, fix missing libchafa --- common/shlibs | 1 + srcpkgs/chafa/patches/fix-libwebp.patch | 13 +++++++++++++ srcpkgs/chafa/template | 22 +++++++++++++++++----- srcpkgs/libchafa | 1 + 4 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/chafa/patches/fix-libwebp.patch create mode 120000 srcpkgs/libchafa diff --git a/common/shlibs b/common/shlibs index 2d528aa798ee5..ee67ac571dfc5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4326,3 +4326,4 @@ libtext-engine-0.1.so.0 text-engine-0.1.1_1 libvmaf.so.1 vmaf-2.3.1_1 liblc3.so.1 liblc3-1.0.3_1 libmimalloc.so.2 mimalloc-2.1.2_1 +libchafa.so.0 libchafa-1.12.5_1 diff --git a/srcpkgs/chafa/patches/fix-libwebp.patch b/srcpkgs/chafa/patches/fix-libwebp.patch new file mode 100644 index 0000000000000..f690790c4e7a2 --- /dev/null +++ b/srcpkgs/chafa/patches/fix-libwebp.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 733535a..20dfb50 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -150,7 +150,7 @@ AS_IF([test "$with_tools" != no], [ + , + with_webp=yes) + AS_IF([test "$with_webp" != no], [ +- PKG_CHECK_MODULES(WEBP, [libwebpdemux],, ++ PKG_CHECK_MODULES(WEBP, [libwebp libwebpdemux],, + missing_rpms="$missing_rpms libwebp-devel" + missing_debs="$missing_debs libwebp-dev" + with_webp=no)]) diff --git a/srcpkgs/chafa/template b/srcpkgs/chafa/template index 81c1e068ee99c..16842b37b5d60 100644 --- a/srcpkgs/chafa/template +++ b/srcpkgs/chafa/template @@ -1,10 +1,10 @@ # Template file for 'chafa' pkgname=chafa -version=1.12.4 -revision=2 +version=1.12.5 +revision=1 build_style=gnu-configure configure_args="--enable-man" -hostmakedepends="docbook-xml docbook-xsl libxslt pkg-config" +hostmakedepends="automake libtool gtk-doc docbook-xml docbook-xsl libxslt pkg-config" makedepends="libglib-devel libmagick-devel librsvg-devel libwebp-devel libXext-devel libxml2-devel" short_desc="Versatile and fast Unicode/ASCII/ANSI graphics renderer" maintainer="Christian Buschau " @@ -12,7 +12,7 @@ license="LGPL-3.0-or-later" homepage="https://hpjansson.org/chafa/" changelog="https://raw.githubusercontent.com/hpjansson/chafa/master/NEWS" distfiles="https://hpjansson.org/chafa/releases/chafa-${version}.tar.xz" -checksum=9774bd1a7076ea3124f7fea811e371d0e1da2e76b7ac06260d63a86c7b1a573f +checksum=0f5490d52a500a6b386f15cc04c6e8702afd0285d422b9575b332e0c683957f2 case "$XBPS_TARGET_MACHINE" in x86_64*|i686*) ;; @@ -20,13 +20,25 @@ case "$XBPS_TARGET_MACHINE" in ax_cv_gcc_check_x86_cpu_supports=no" ;; esac +pre_configure() { + autoreconf -fi +} + +libchafa_package() { + short_desc+=" - shared library" + pkg_install() { + vmove "usr/lib/*.so.*" + } +} + chafa-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + depends="${makedepends} libchafa>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove "usr/lib/*.so" + vmove usr/lib/chafa/include vmove usr/lib/pkgconfig vmove usr/share/gtk-doc } diff --git a/srcpkgs/libchafa b/srcpkgs/libchafa new file mode 120000 index 0000000000000..de0ee36284210 --- /dev/null +++ b/srcpkgs/libchafa @@ -0,0 +1 @@ +chafa \ No newline at end of file