From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] gimp: put locale data in /usr/share/locale.
Date: Mon, 28 Dec 2020 23:58:09 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27511@inbox.vuxu.org> (raw)
[-- 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() {
next reply other threads:[~2020-12-28 22:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 22:58 ericonr [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27511@inbox.vuxu.org \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).