From 178c5bc8ff3a6ec4cee5411ed959af9ce09e7bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:32:47 +0700 Subject: [PATCH 1/7] hooks: abort if l10n files found in /usr/lib --- .../hooks/post-install/14-pkglint-locale-in-usr-lib.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/hooks/post-install/14-pkglint-locale-in-usr-lib.sh diff --git a/common/hooks/post-install/14-pkglint-locale-in-usr-lib.sh b/common/hooks/post-install/14-pkglint-locale-in-usr-lib.sh new file mode 100644 index 00000000000..0eb2af90986 --- /dev/null +++ b/common/hooks/post-install/14-pkglint-locale-in-usr-lib.sh @@ -0,0 +1,10 @@ +# vim: set ts=4 sw=4 et: +# +# This hook executes the following tasks: +# - Looks on all packages for l10n files being installed to /usr/share + +hook() { + if [ -d $PKGDESTDIR/usr/lib/locale ]; then + msg_error "${pkgver}: l10n files found in /usr/lib\n" + fi +} From dcc09cb9ca38335b05d496da923d1b934f2bf5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:33:16 +0700 Subject: [PATCH 2/7] glib: patch m4 files to honour --localedir --- srcpkgs/glib/patches/honour-localedir.patch | 13 +++++++++++++ srcpkgs/glib/template | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/glib/patches/honour-localedir.patch diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch new file mode 100644 index 00000000000..83cfcd55247 --- /dev/null +++ b/srcpkgs/glib/patches/honour-localedir.patch @@ -0,0 +1,13 @@ +--- m4macros/glib-gettext.m4.orig 2020-10-19 22:05:31.339006200 +0700 ++++ m4macros/glib-gettext.m4 2020-12-30 23:27:56.555000405 +0700 +@@ -448,7 +448,9 @@ + test "x$prefix" = xNONE && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix=$prefix + datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then ++if test "x$localedir" != "x" ; then ++ : ++elif test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` + else + localedir=`eval echo "${datadir}/locale"` diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 0d6de76ea88..bb28c7f1246 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,7 +1,7 @@ # Template file for 'glib' pkgname=glib version=2.66.2 -revision=1 +revision=2 build_style=meson configure_args="-Dfam=false -Dman=true -Dselinux=disabled $(vopt_bool gtk_doc gtk_doc)" From cf0146789cc6d5b44d76135d65887c1b8cf9ce5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:33:59 +0700 Subject: [PATCH 3/7] geeqie: fix localedir --- srcpkgs/geeqie/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template index 2681f31e3ef..3eb2cda003f 100644 --- a/srcpkgs/geeqie/template +++ b/srcpkgs/geeqie/template @@ -1,10 +1,11 @@ # Template file for 'geeqie' pkgname=geeqie version=1.5.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-gtk3" -hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel" +hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel + gettext-devel" makedepends="gtk+3-devel exiv2-devel lcms2-devel librsvg-devel lua51-devel ffmpegthumbnailer-devel" depends="desktop-file-utils" From b1dd8eb9197031a963bbad2ab6c6406f60b25ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:41:55 +0700 Subject: [PATCH 4/7] gnu-configure-args: add --localedir --with-locales-dir --- common/environment/configure/gnu-configure-args.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh index c0a2f4602b9..3fec2a77f68 100644 --- a/common/environment/configure/gnu-configure-args.sh +++ b/common/environment/configure/gnu-configure-args.sh @@ -9,7 +9,8 @@ fi TEMPLATE_CONFIGURE_ARGS="${configure_args}" export configure_args="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bindir=/usr/bin - --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var" + --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var + --localedir=/usr/share/locale --with-locales-dir=/usr/share/locale" . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET" From 4b0420f899fcac50a0daa1b810b075a74125ea2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:44:01 +0700 Subject: [PATCH 5/7] exo: fix l10n location --- srcpkgs/exo/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template index c093120917c..1545b833ee5 100644 --- a/srcpkgs/exo/template +++ b/srcpkgs/exo/template @@ -1,7 +1,7 @@ # Template file for 'exo' pkgname=exo version=4.16.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel" From b58ae9bc9dad9e8beb8b0caca7ebe189185892b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:44:02 +0700 Subject: [PATCH 6/7] parole: fix l10n location --- srcpkgs/parole/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template index 09f64dc8434..9083180568b 100644 --- a/srcpkgs/parole/template +++ b/srcpkgs/parole/template @@ -1,7 +1,7 @@ # Template file for 'parole' pkgname=parole version=4.15.0 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool glib-devel" makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel" From b2f9f1dadc7f08ec908552c8d78358dc0bc24dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:44:02 +0700 Subject: [PATCH 7/7] garcon: fix l10n location --- srcpkgs/garcon/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template index dca4a2b994f..42be282aeed 100644 --- a/srcpkgs/garcon/template +++ b/srcpkgs/garcon/template @@ -1,7 +1,7 @@ # Template file for 'garcon' pkgname=garcon version=0.8.0 -revision=2 +revision=3 build_style=gnu-configure build_helper=gir configure_args="--disable-static --enable-introspection=$(vopt_if gir yes no)"