Re: [PR PATCH] [Updated] gimp: put locale data in /usr/share/locale.

[ericonr <ericonr@users.noreply.github.com>]

[-- 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() {