* [PR PATCH] chafa: update to 1.12.5, fix missing libchafa
@ 2023-08-02 13:09 tranzystorek-io
2023-08-02 13:27 ` tranzystorek-io
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: tranzystorek-io @ 2023-08-02 13:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]
There is a new pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages chafa
https://github.com/void-linux/void-packages/pull/45391
chafa: update to 1.12.5, fix missing libchafa
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/45391.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chafa-45391.patch --]
[-- Type: text/x-diff, Size: 3433 bytes --]
From 2673318864aa63d2b157ce09477179189fcec0c7 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 21 ++++++++++++++++-----
srcpkgs/libchafa | 1 +
4 files changed, 31 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..36a75ee262205 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 <christian.buschau@mailbox.org>"
@@ -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,8 +20,19 @@ 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
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: chafa: update to 1.12.5, fix missing libchafa
2023-08-02 13:09 [PR PATCH] chafa: update to 1.12.5, fix missing libchafa tranzystorek-io
@ 2023-08-02 13:27 ` tranzystorek-io
2023-08-02 13:59 ` [PR PATCH] [Updated] [NOMERGE] " tranzystorek-io
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: tranzystorek-io @ 2023-08-02 13:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
New comment by tranzystorek-io on void-packages repository
https://github.com/void-linux/void-packages/pull/45391#issuecomment-1662213485
Comment:
The manual `autoreconf` seems to be breaking the pkgconfig file - the libdir variable gets set to `/usr/lib64`
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] chafa: update to 1.12.5, fix missing libchafa
2023-08-02 13:09 [PR PATCH] chafa: update to 1.12.5, fix missing libchafa tranzystorek-io
2023-08-02 13:27 ` tranzystorek-io
@ 2023-08-02 13:59 ` tranzystorek-io
2023-08-02 14:25 ` tranzystorek-io
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: tranzystorek-io @ 2023-08-02 13:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages chafa
https://github.com/void-linux/void-packages/pull/45391
[NOMERGE] chafa: update to 1.12.5, fix missing libchafa
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/45391.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chafa-45391.patch --]
[-- Type: text/x-diff, Size: 3571 bytes --]
From 01db05244d6498692eb53bbcc59af853dc265fd1 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 <christian.buschau@mailbox.org>"
@@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] [NOMERGE] chafa: update to 1.12.5, fix missing libchafa
2023-08-02 13:09 [PR PATCH] chafa: update to 1.12.5, fix missing libchafa tranzystorek-io
2023-08-02 13:27 ` tranzystorek-io
2023-08-02 13:59 ` [PR PATCH] [Updated] [NOMERGE] " tranzystorek-io
@ 2023-08-02 14:25 ` tranzystorek-io
2023-08-02 14:26 ` tranzystorek-io
2023-08-09 17:28 ` [PR PATCH] [Closed]: " Duncaen
4 siblings, 0 replies; 6+ messages in thread
From: tranzystorek-io @ 2023-08-02 14:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages chafa
https://github.com/void-linux/void-packages/pull/45391
[NOMERGE] chafa: update to 1.12.5, fix missing libchafa
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/45391.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chafa-45391.patch --]
[-- Type: text/x-diff, Size: 3598 bytes --]
From c0d65d3912142343073658fe9b1e13b36d9bad24 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
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 | 23 ++++++++++++++++++-----
srcpkgs/libchafa | 1 +
4 files changed, 33 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..7b0f4c2c7a945 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 <christian.buschau@mailbox.org>"
@@ -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,26 @@ case "$XBPS_TARGET_MACHINE" in
ax_cv_gcc_check_x86_cpu_supports=no" ;;
esac
+pre_configure() {
+ # needed for the libwebp patch to work
+ autoreconf -fi
+}
+
+libchafa_package() {
+ short_desc+=" - shared library"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ }
+}
+
chafa-devel_package() {
- depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ depends="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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [NOMERGE] chafa: update to 1.12.5, fix missing libchafa
2023-08-02 13:09 [PR PATCH] chafa: update to 1.12.5, fix missing libchafa tranzystorek-io
` (2 preceding siblings ...)
2023-08-02 14:25 ` tranzystorek-io
@ 2023-08-02 14:26 ` tranzystorek-io
2023-08-09 17:28 ` [PR PATCH] [Closed]: " Duncaen
4 siblings, 0 replies; 6+ messages in thread
From: tranzystorek-io @ 2023-08-02 14:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 398 bytes --]
New comment by tranzystorek-io on void-packages repository
https://github.com/void-linux/void-packages/pull/45391#issuecomment-1662213485
Comment:
The manual `autoreconf` seems to be breaking the pkgconfig file - the libdir variable gets set to `/usr/lib64`
EDIT: turns out the libdir is correct, but chafa-devel needs `/usr/lib/chafa/include/chafaconfig.h` to work now that libchafa is split
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Closed]: chafa: update to 1.12.5, fix missing libchafa
2023-08-02 13:09 [PR PATCH] chafa: update to 1.12.5, fix missing libchafa tranzystorek-io
` (3 preceding siblings ...)
2023-08-02 14:26 ` tranzystorek-io
@ 2023-08-09 17:28 ` Duncaen
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2023-08-09 17:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1110 bytes --]
There's a closed pull request on the void-packages repository
chafa: update to 1.12.5, fix missing libchafa
https://github.com/void-linux/void-packages/pull/45391
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-08-09 17:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-02 13:09 [PR PATCH] chafa: update to 1.12.5, fix missing libchafa tranzystorek-io
2023-08-02 13:27 ` tranzystorek-io
2023-08-02 13:59 ` [PR PATCH] [Updated] [NOMERGE] " tranzystorek-io
2023-08-02 14:25 ` tranzystorek-io
2023-08-02 14:26 ` tranzystorek-io
2023-08-09 17:28 ` [PR PATCH] [Closed]: " Duncaen
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).