* [PR PATCH] gimp: put locale data in /usr/share/locale.
@ 2020-12-28 22:58 ericonr
2020-12-30 17:45 ` [PR PATCH] [Updated] " ericonr
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: ericonr @ 2020-12-28 22:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gimp
https://github.com/void-linux/void-packages/pull/27511
gimp: put locale data in /usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
A patch file from https://github.com/void-linux/void-packages/pull/27511.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gimp-27511.patch --]
[-- Type: text/x-diff, Size: 1453 bytes --]
From b3039347dd7104db736ff01704bd59555db3fd84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 28 Dec 2020 19:50:50 -0300
Subject: [PATCH] gimp: put locale data in /usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
---
srcpkgs/gimp/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 61ae1ad1752..9f98c7aa63c 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,9 +1,9 @@
# Template file for 'gimp'
pkgname=gimp
version=2.10.20
-revision=3
+revision=4
build_style=gnu-configure
-configure_args="--disable-check-update"
+configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
@@ -28,6 +28,8 @@ pre_configure() {
if [ "$CROSS_BUILD" ]; then
vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
fi
+ # don't allow configure to set DATADIRNAME=lib
+ vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
libgimp_package() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] gimp: put locale data in /usr/share/locale.
2020-12-28 22:58 [PR PATCH] gimp: put locale data in /usr/share/locale ericonr
@ 2020-12-30 17:45 ` ericonr
2020-12-30 17:46 ` ericonr
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-30 17:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gimp
https://github.com/void-linux/void-packages/pull/27511
gimp: put locale data in /usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
A patch file from https://github.com/void-linux/void-packages/pull/27511.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gimp-27511.patch --]
[-- Type: text/x-diff, Size: 3645 bytes --]
From 19f7e9b722a7bb02154ecb1429291e0a6f8ea38c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Dec 2020 14:43:50 -0300
Subject: [PATCH 1/2] gegl: update to 0.4.26.
---
srcpkgs/gegl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 961686af6b9..e8223edc74f 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,6 +1,6 @@
# Template file for 'gegl'
pkgname=gegl
-version=0.4.24
+version=0.4.26
revision=1
build_style=meson
build_helper="gir"
@@ -18,7 +18,7 @@ license="GPL-3.0-only, LGPL-3.0-only"
homepage="https://www.gimp.org"
changelog="https://gitlab.gnome.org/GNOME/gegl/raw/master/docs/NEWS.txt"
distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz"
-checksum=7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a
+checksum=0f371e2ed2b92162fefd3dde743e648ca08a6a1b2b05004867fbddc7e211e424
build_options="gir"
build_options_default="gir"
From 303dce7c99a8be30455c4fc3ed9294251a621619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 28 Dec 2020 19:50:50 -0300
Subject: [PATCH 2/2] gimp: update to 2.10.22, add HEIF support, locale data in
/usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
Update and HEIF based on
https://github.com/anddam/void-packages/commit/9202f62e3c9925fbdbbfc1e5415327afbd728c2a
---
srcpkgs/gimp/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 61ae1ad1752..332fb0b12e4 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,16 +1,17 @@
# Template file for 'gimp'
pkgname=gimp
-version=2.10.20
-revision=3
+version=2.10.22
+revision=1
build_style=gnu-configure
-configure_args="--disable-check-update"
+configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
- poppler-glib-devel pygtk-devel glib-networking libwebp-devel"
+ poppler-glib-devel pygtk-devel glib-networking libwebp-devel
+ libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
short_desc="GNU image manipulation program"
conf_files="/etc/gimp/${version%%.*}.0/*"
@@ -18,7 +19,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
-checksum=e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c
+checksum=2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb
python_version=2
lib32disabled=yes
no_generic_pkgconfig_link=yes
@@ -28,6 +29,8 @@ pre_configure() {
if [ "$CROSS_BUILD" ]; then
vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
fi
+ # don't allow configure to set DATADIRNAME=lib
+ vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
libgimp_package() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: gimp: put locale data in /usr/share/locale.
2020-12-28 22:58 [PR PATCH] gimp: put locale data in /usr/share/locale ericonr
2020-12-30 17:45 ` [PR PATCH] [Updated] " ericonr
@ 2020-12-30 17:46 ` ericonr
2021-02-01 4:04 ` [PR PATCH] [Updated] " ericonr
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2020-12-30 17:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 185 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27511#issuecomment-752703788
Comment:
Supersedes #25504, but is waiting for #27558
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] gimp: put locale data in /usr/share/locale.
2020-12-28 22:58 [PR PATCH] gimp: put locale data in /usr/share/locale ericonr
2020-12-30 17:45 ` [PR PATCH] [Updated] " ericonr
2020-12-30 17:46 ` ericonr
@ 2021-02-01 4:04 ` ericonr
2021-02-01 4:07 ` ericonr
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-02-01 4:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gimp
https://github.com/void-linux/void-packages/pull/27511
gimp: put locale data in /usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
A patch file from https://github.com/void-linux/void-packages/pull/27511.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gimp-27511.patch --]
[-- Type: text/x-diff, Size: 5350 bytes --]
From 7d38e05771c169f08cb2e10445a5005bbffb9c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 01:02:17 -0300
Subject: [PATCH 1/3] babl: update to 0.1.84.
- fix vala detection for cross
- remove manual disabling of build options, now that the meson build
style defaults features to "auto" instead of "enabled"
---
srcpkgs/babl/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 747bad3e40c..0a64f116a71 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,27 +1,19 @@
# Template file for 'babl'
pkgname=babl
-version=0.1.78
+version=0.1.84
revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-docs=false"
hostmakedepends="pkg-config vala-devel gobject-introspection"
-makedepends="lcms2-devel"
+makedepends="lcms2-devel vala-devel"
short_desc="Dynamic pixel format translation library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-only"
homepage="http://gegl.org/babl/"
changelog="https://raw.githubusercontent.com/GNOME/babl/master/NEWS"
distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz"
-checksum=17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a
-
-case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) ;;
- *)
- configure_args+=" -Denable-sse=false -Denable-sse2=false
- -Denable-sse3=false -Denable-sse4_1=false -Denable-avx2=false
- -Denable-f16c=false -Denable-mmx=false";;
-esac
+checksum=e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea
babl-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 613226d41b8659df9298d4dd8262b3b9133730fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Dec 2020 14:43:50 -0300
Subject: [PATCH 2/3] gegl: update to 0.4.26.
---
srcpkgs/gegl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 961686af6b9..e8223edc74f 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,6 +1,6 @@
# Template file for 'gegl'
pkgname=gegl
-version=0.4.24
+version=0.4.26
revision=1
build_style=meson
build_helper="gir"
@@ -18,7 +18,7 @@ license="GPL-3.0-only, LGPL-3.0-only"
homepage="https://www.gimp.org"
changelog="https://gitlab.gnome.org/GNOME/gegl/raw/master/docs/NEWS.txt"
distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz"
-checksum=7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a
+checksum=0f371e2ed2b92162fefd3dde743e648ca08a6a1b2b05004867fbddc7e211e424
build_options="gir"
build_options_default="gir"
From 169f3ef5d2b5324f259b765c9e078b3e6d9b07a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 28 Dec 2020 19:50:50 -0300
Subject: [PATCH 3/3] gimp: update to 2.10.22, add HEIF support, locale data in
/usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
Update and HEIF based on
https://github.com/anddam/void-packages/commit/9202f62e3c9925fbdbbfc1e5415327afbd728c2a
---
srcpkgs/gimp/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 61ae1ad1752..332fb0b12e4 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,16 +1,17 @@
# Template file for 'gimp'
pkgname=gimp
-version=2.10.20
-revision=3
+version=2.10.22
+revision=1
build_style=gnu-configure
-configure_args="--disable-check-update"
+configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
- poppler-glib-devel pygtk-devel glib-networking libwebp-devel"
+ poppler-glib-devel pygtk-devel glib-networking libwebp-devel
+ libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
short_desc="GNU image manipulation program"
conf_files="/etc/gimp/${version%%.*}.0/*"
@@ -18,7 +19,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
-checksum=e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c
+checksum=2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb
python_version=2
lib32disabled=yes
no_generic_pkgconfig_link=yes
@@ -28,6 +29,8 @@ pre_configure() {
if [ "$CROSS_BUILD" ]; then
vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
fi
+ # don't allow configure to set DATADIRNAME=lib
+ vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
libgimp_package() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] gimp: put locale data in /usr/share/locale.
2020-12-28 22:58 [PR PATCH] gimp: put locale data in /usr/share/locale ericonr
` (2 preceding siblings ...)
2021-02-01 4:04 ` [PR PATCH] [Updated] " ericonr
@ 2021-02-01 4:07 ` ericonr
2021-02-01 4:16 ` ericonr
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-02-01 4:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gimp
https://github.com/void-linux/void-packages/pull/27511
gimp: put locale data in /usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
A patch file from https://github.com/void-linux/void-packages/pull/27511.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gimp-27511.patch --]
[-- Type: text/x-diff, Size: 5350 bytes --]
From 7d38e05771c169f08cb2e10445a5005bbffb9c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 01:02:17 -0300
Subject: [PATCH 1/3] babl: update to 0.1.84.
- fix vala detection for cross
- remove manual disabling of build options, now that the meson build
style defaults features to "auto" instead of "enabled"
---
srcpkgs/babl/template | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 747bad3e40c..0a64f116a71 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,27 +1,19 @@
# Template file for 'babl'
pkgname=babl
-version=0.1.78
+version=0.1.84
revision=1
build_style=meson
build_helper=gir
configure_args="-Dwith-docs=false"
hostmakedepends="pkg-config vala-devel gobject-introspection"
-makedepends="lcms2-devel"
+makedepends="lcms2-devel vala-devel"
short_desc="Dynamic pixel format translation library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-only"
homepage="http://gegl.org/babl/"
changelog="https://raw.githubusercontent.com/GNOME/babl/master/NEWS"
distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz"
-checksum=17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a
-
-case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) ;;
- *)
- configure_args+=" -Denable-sse=false -Denable-sse2=false
- -Denable-sse3=false -Denable-sse4_1=false -Denable-avx2=false
- -Denable-f16c=false -Denable-mmx=false";;
-esac
+checksum=e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea
babl-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 5f55b2cc43a673fe73bcd4a6e86930c599e78600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Dec 2020 14:43:50 -0300
Subject: [PATCH 2/3] gegl: update to 0.4.28.
---
srcpkgs/gegl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 961686af6b9..9fd0ed2f99a 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,6 +1,6 @@
# Template file for 'gegl'
pkgname=gegl
-version=0.4.24
+version=0.4.28
revision=1
build_style=meson
build_helper="gir"
@@ -18,7 +18,7 @@ license="GPL-3.0-only, LGPL-3.0-only"
homepage="https://www.gimp.org"
changelog="https://gitlab.gnome.org/GNOME/gegl/raw/master/docs/NEWS.txt"
distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz"
-checksum=7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a
+checksum=1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900
build_options="gir"
build_options_default="gir"
From 6e074105f7fb8fbb9c70abfa1f7ffc19e02c8950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 28 Dec 2020 19:50:50 -0300
Subject: [PATCH 3/3] gimp: update to 2.10.22, add HEIF support, locale data in
/usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
Update and HEIF based on
https://github.com/anddam/void-packages/commit/9202f62e3c9925fbdbbfc1e5415327afbd728c2a
---
srcpkgs/gimp/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 61ae1ad1752..332fb0b12e4 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,16 +1,17 @@
# Template file for 'gimp'
pkgname=gimp
-version=2.10.20
-revision=3
+version=2.10.22
+revision=1
build_style=gnu-configure
-configure_args="--disable-check-update"
+configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
- poppler-glib-devel pygtk-devel glib-networking libwebp-devel"
+ poppler-glib-devel pygtk-devel glib-networking libwebp-devel
+ libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
short_desc="GNU image manipulation program"
conf_files="/etc/gimp/${version%%.*}.0/*"
@@ -18,7 +19,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
-checksum=e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c
+checksum=2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb
python_version=2
lib32disabled=yes
no_generic_pkgconfig_link=yes
@@ -28,6 +29,8 @@ pre_configure() {
if [ "$CROSS_BUILD" ]; then
vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
fi
+ # don't allow configure to set DATADIRNAME=lib
+ vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
libgimp_package() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] gimp: put locale data in /usr/share/locale.
2020-12-28 22:58 [PR PATCH] gimp: put locale data in /usr/share/locale ericonr
` (3 preceding siblings ...)
2021-02-01 4:07 ` ericonr
@ 2021-02-01 4:16 ` ericonr
2021-02-01 4:20 ` ericonr
2021-02-01 4:45 ` [PR PATCH] [Merged]: " ericonr
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-02-01 4:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gimp
https://github.com/void-linux/void-packages/pull/27511
gimp: put locale data in /usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
A patch file from https://github.com/void-linux/void-packages/pull/27511.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gimp-27511.patch --]
[-- Type: text/x-diff, Size: 5406 bytes --]
From ea5144c9be7e0a77b9a558aa41b6c8e5c82afc9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 01:02:17 -0300
Subject: [PATCH 1/3] babl: update to 0.1.84.
- fix vala detection for cross
- remove manual disabling of build options, now that the meson build
style defaults features to "auto" instead of "enabled"
---
srcpkgs/babl/template | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 747bad3e40c..4f3c155c995 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,27 +1,19 @@
# Template file for 'babl'
pkgname=babl
-version=0.1.78
+version=0.1.84
revision=1
build_style=meson
build_helper=gir
-configure_args="-Dwith-docs=false"
+configure_args="-Dwith-docs=false -Denable-gir=true"
hostmakedepends="pkg-config vala-devel gobject-introspection"
-makedepends="lcms2-devel"
+makedepends="lcms2-devel vala-devel"
short_desc="Dynamic pixel format translation library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-only"
homepage="http://gegl.org/babl/"
changelog="https://raw.githubusercontent.com/GNOME/babl/master/NEWS"
distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz"
-checksum=17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a
-
-case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) ;;
- *)
- configure_args+=" -Denable-sse=false -Denable-sse2=false
- -Denable-sse3=false -Denable-sse4_1=false -Denable-avx2=false
- -Denable-f16c=false -Denable-mmx=false";;
-esac
+checksum=e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea
babl-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 79200f20b3d9b2d0da51c24a05adddb53469d841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Dec 2020 14:43:50 -0300
Subject: [PATCH 2/3] gegl: update to 0.4.28.
---
srcpkgs/gegl/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 961686af6b9..9fd0ed2f99a 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,6 +1,6 @@
# Template file for 'gegl'
pkgname=gegl
-version=0.4.24
+version=0.4.28
revision=1
build_style=meson
build_helper="gir"
@@ -18,7 +18,7 @@ license="GPL-3.0-only, LGPL-3.0-only"
homepage="https://www.gimp.org"
changelog="https://gitlab.gnome.org/GNOME/gegl/raw/master/docs/NEWS.txt"
distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz"
-checksum=7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a
+checksum=1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900
build_options="gir"
build_options_default="gir"
From a965d25c89fba22430f311403ef74edb28119f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 28 Dec 2020 19:50:50 -0300
Subject: [PATCH 3/3] gimp: update to 2.10.22, add HEIF support, locale data in
/usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
Update and HEIF based on
https://github.com/anddam/void-packages/commit/9202f62e3c9925fbdbbfc1e5415327afbd728c2a
---
srcpkgs/gimp/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 61ae1ad1752..332fb0b12e4 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,16 +1,17 @@
# Template file for 'gimp'
pkgname=gimp
-version=2.10.20
-revision=3
+version=2.10.22
+revision=1
build_style=gnu-configure
-configure_args="--disable-check-update"
+configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
- poppler-glib-devel pygtk-devel glib-networking libwebp-devel"
+ poppler-glib-devel pygtk-devel glib-networking libwebp-devel
+ libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
short_desc="GNU image manipulation program"
conf_files="/etc/gimp/${version%%.*}.0/*"
@@ -18,7 +19,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
-checksum=e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c
+checksum=2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb
python_version=2
lib32disabled=yes
no_generic_pkgconfig_link=yes
@@ -28,6 +29,8 @@ pre_configure() {
if [ "$CROSS_BUILD" ]; then
vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
fi
+ # don't allow configure to set DATADIRNAME=lib
+ vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
libgimp_package() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] gimp: put locale data in /usr/share/locale.
2020-12-28 22:58 [PR PATCH] gimp: put locale data in /usr/share/locale ericonr
` (4 preceding siblings ...)
2021-02-01 4:16 ` ericonr
@ 2021-02-01 4:20 ` ericonr
2021-02-01 4:45 ` [PR PATCH] [Merged]: " ericonr
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-02-01 4:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages gimp
https://github.com/void-linux/void-packages/pull/27511
gimp: put locale data in /usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
A patch file from https://github.com/void-linux/void-packages/pull/27511.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gimp-27511.patch --]
[-- Type: text/x-diff, Size: 5890 bytes --]
From ea5144c9be7e0a77b9a558aa41b6c8e5c82afc9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 1 Feb 2021 01:02:17 -0300
Subject: [PATCH 1/3] babl: update to 0.1.84.
- fix vala detection for cross
- remove manual disabling of build options, now that the meson build
style defaults features to "auto" instead of "enabled"
---
srcpkgs/babl/template | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 747bad3e40c..4f3c155c995 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,27 +1,19 @@
# Template file for 'babl'
pkgname=babl
-version=0.1.78
+version=0.1.84
revision=1
build_style=meson
build_helper=gir
-configure_args="-Dwith-docs=false"
+configure_args="-Dwith-docs=false -Denable-gir=true"
hostmakedepends="pkg-config vala-devel gobject-introspection"
-makedepends="lcms2-devel"
+makedepends="lcms2-devel vala-devel"
short_desc="Dynamic pixel format translation library"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-3.0-only"
homepage="http://gegl.org/babl/"
changelog="https://raw.githubusercontent.com/GNOME/babl/master/NEWS"
distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz"
-checksum=17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a
-
-case "$XBPS_TARGET_MACHINE" in
- x86_64*|i686*) ;;
- *)
- configure_args+=" -Denable-sse=false -Denable-sse2=false
- -Denable-sse3=false -Denable-sse4_1=false -Denable-avx2=false
- -Denable-f16c=false -Denable-mmx=false";;
-esac
+checksum=e7e38b8441f77feb9dc8231cb434a86190a21f2f3692c281457e99d35e9c34ea
babl-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 404a9047eccfaad3dbbb3f392e40669f443bb90c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Dec 2020 14:43:50 -0300
Subject: [PATCH 2/3] gegl: update to 0.4.28.
Introspection should always be enabled, since other packages depend on
it.
---
srcpkgs/gegl/template | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index 961686af6b9..417a91034a5 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,10 +1,10 @@
# Template file for 'gegl'
pkgname=gegl
-version=0.4.24
+version=0.4.28
revision=1
build_style=meson
build_helper="gir"
-configure_args="-Ddocs=false -Dintrospection=$(vopt_if gir true false)
+configure_args="-Ddocs=false -Dintrospection=true
-Dlibspiro=disabled -Dlibv4l=disabled -Dlibv4l2=disabled -Dlua=disabled
-Dmrg=disabled -Dopenexr=disabled -Dsdl2=disabled -Dvapigen=disabled
-Dlibav=disabled -Dumfpack=disabled"
@@ -18,10 +18,7 @@ license="GPL-3.0-only, LGPL-3.0-only"
homepage="https://www.gimp.org"
changelog="https://gitlab.gnome.org/GNOME/gegl/raw/master/docs/NEWS.txt"
distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz"
-checksum=7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a
-
-build_options="gir"
-build_options_default="gir"
+checksum=1d110d8577d54cca3b34239315bd37c57ccb27dd4355655074a2d2b3fd897900
gegl-devel_package() {
depends="json-glib-devel babl-devel gegl>=${version}_${revision}"
From 9879c972aa5700d043daa1a7aacdce703a68984e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 28 Dec 2020 19:50:50 -0300
Subject: [PATCH 3/3] gimp: update to 2.10.22, add HEIF support, locale data in
/usr/share/locale.
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
Update and HEIF based on
https://github.com/anddam/void-packages/commit/9202f62e3c9925fbdbbfc1e5415327afbd728c2a
---
srcpkgs/gimp/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template
index 61ae1ad1752..332fb0b12e4 100644
--- a/srcpkgs/gimp/template
+++ b/srcpkgs/gimp/template
@@ -1,16 +1,17 @@
# Template file for 'gimp'
pkgname=gimp
-version=2.10.20
-revision=3
+version=2.10.22
+revision=1
build_style=gnu-configure
-configure_args="--disable-check-update"
+configure_args="--disable-check-update --datadir=/usr/share"
hostmakedepends="automake gegl gettext-devel glib-devel gtk+-devel intltool
libtool pkg-config pygtk-devel perl-XML-Parser gtk-doc iso-codes"
makedepends="aalib-devel alsa-lib-devel babl-devel dbus-glib-devel gegl-devel
ghostscript-devel jasper-devel lcms2-devel libXcursor-devel libXpm-devel
libgexiv2-devel libgudev-devel libmng-devel libmypaint-devel
libopenexr-devel librsvg-devel libwmf-devel mypaint-brushes1
- poppler-glib-devel pygtk-devel glib-networking libwebp-devel"
+ poppler-glib-devel pygtk-devel glib-networking libwebp-devel
+ libheif-devel libopenjpeg2-devel x265-devel"
depends="desktop-file-utils hicolor-icon-theme iso-codes mypaint-brushes1"
short_desc="GNU image manipulation program"
conf_files="/etc/gimp/${version%%.*}.0/*"
@@ -18,7 +19,7 @@ maintainer="fosslinux <fosslinux@aussies.space>"
license="GPL-3.0-only"
homepage="https://www.gimp.org"
distfiles="https://download.gimp.org/pub/gimp/v${version%.*}/gimp-${version}.tar.bz2"
-checksum=e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c
+checksum=2db84b57f3778d80b3466d7c21a21d22e315c7b062de2883cbaaeda9a0f618bb
python_version=2
lib32disabled=yes
no_generic_pkgconfig_link=yes
@@ -28,6 +29,8 @@ pre_configure() {
if [ "$CROSS_BUILD" ]; then
vsed -i 's:^py_prefix=`:py_prefix='"$XBPS_CROSS_BASE"'`:' configure
fi
+ # don't allow configure to set DATADIRNAME=lib
+ vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
}
libgimp_package() {
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: gimp: put locale data in /usr/share/locale.
2020-12-28 22:58 [PR PATCH] gimp: put locale data in /usr/share/locale ericonr
` (5 preceding siblings ...)
2021-02-01 4:20 ` ericonr
@ 2021-02-01 4:45 ` ericonr
6 siblings, 0 replies; 8+ messages in thread
From: ericonr @ 2021-02-01 4:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 432 bytes --]
There's a merged pull request on the void-packages repository
gimp: put locale data in /usr/share/locale.
https://github.com/void-linux/void-packages/pull/27511
Description:
Their gettext version check tries to link _nl_msg_cat_cntr, which is
available only in GNU gettext. This breaks when using musl's built-in
gettext impl, and leads to DATADIRNAME=lib being set, which is then used
to set gimplocaledir to /usr/lib/locale.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-02-01 4:45 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-28 22:58 [PR PATCH] gimp: put locale data in /usr/share/locale ericonr
2020-12-30 17:45 ` [PR PATCH] [Updated] " ericonr
2020-12-30 17:46 ` ericonr
2021-02-01 4:04 ` [PR PATCH] [Updated] " ericonr
2021-02-01 4:07 ` ericonr
2021-02-01 4:16 ` ericonr
2021-02-01 4:20 ` ericonr
2021-02-01 4:45 ` [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).