[PR PATCH] Fix l10n dir

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] Fix l10n dir
@ 2020-12-30 16:45 sgn
  2020-12-30 17:37 ` q66
                   ` (93 more replies)
  0 siblings, 94 replies; 95+ messages in thread
From: sgn @ 2020-12-30 16:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 306 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 6950 bytes --]

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?=
 <congdanhqx@gmail.com>
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?=
 <congdanhqx@gmail.com>
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?=
 <congdanhqx@gmail.com>
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?=
 <congdanhqx@gmail.com>
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?=
 <congdanhqx@gmail.com>
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?=
 <congdanhqx@gmail.com>
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?=
 <congdanhqx@gmail.com>
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)"

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
@ 2020-12-30 17:37 ` q66
  2020-12-30 17:37 ` q66
                   ` (92 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-30 17:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752701197

Comment:
let's not put `--with-locales-dir` into default `gnu-configure-args` since that's xfce specific

also let's properly patch the xfce m4 files as well

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
  2020-12-30 17:37 ` q66
@ 2020-12-30 17:37 ` q66
  2020-12-30 17:38 ` q66
                   ` (91 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-30 17:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752701197

Comment:
let's not put `--with-locales-dir` into default `gnu-configure-args` since that's xfce specific (should be put into each template individually instead)

also let's properly patch the xfce m4 files as well

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
  2020-12-30 17:37 ` q66
  2020-12-30 17:37 ` q66
@ 2020-12-30 17:38 ` q66
  2020-12-30 17:39 ` q66
                   ` (90 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-30 17:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 523 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752701197

Comment:
let's not put `--with-locales-dir` into default `gnu-configure-args` since that's xfce specific (should be put into each template individually instead)

also let's properly patch the xfce m4 files as well

also the pkglint hook is incorrect since for `glibc-locales` it should still be allowed (and also let's not make a new hook for it, let's just extend the existing pkglint hook)

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (2 preceding siblings ...)
  2020-12-30 17:38 ` q66
@ 2020-12-30 17:39 ` q66
  2020-12-30 20:37 ` [PR REVIEW] " Chocimier
                   ` (89 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-30 17:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752701197

Comment:
let's not put `--with-locales-dir` into default `gnu-configure-args` since that's xfce specific (should be put into each template individually instead)

also let's properly patch the xfce m4 files as well

~~also the pkglint hook is incorrect since for `glibc-locales` it should still be allowed~~this appears to be generated files so it's okay i guess (but also let's not make a new hook for it, let's just extend the existing pkglint hook)

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR REVIEW] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (3 preceding siblings ...)
  2020-12-30 17:39 ` q66
@ 2020-12-30 20:37 ` Chocimier
  2020-12-30 21:53 ` ericonr
                   ` (88 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: Chocimier @ 2020-12-30 20:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#discussion_r550320469

Comment:
Message would be more helpful with tip how to proceed, eg. _l10n files found in /usr/lib; use /usr/share_

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR REVIEW] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (4 preceding siblings ...)
  2020-12-30 20:37 ` [PR REVIEW] " Chocimier
@ 2020-12-30 21:53 ` ericonr
  2020-12-30 21:59 ` q66
                   ` (87 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: ericonr @ 2020-12-30 21:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#discussion_r550337347

Comment:
Maybe mention `locale` explicitly? So `/usr/lib/locale` and `/usr/share/locale`.

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR REVIEW] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (5 preceding siblings ...)
  2020-12-30 21:53 ` ericonr
@ 2020-12-30 21:59 ` q66
  2020-12-31  0:12 ` [PR PATCH] [Updated] " sgn
                   ` (86 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-30 21:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New review comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#discussion_r550338806

Comment:
just put it in the same hook that checks other banned directories...

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (6 preceding siblings ...)
  2020-12-30 21:59 ` q66
@ 2020-12-31  0:12 ` sgn
  2020-12-31  0:14 ` sgn
                   ` (85 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  0:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 44080 bytes --]

From 517503d264432b86e4b17917a1993997e2cfdcbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/45] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From 3a746ad34f6d178d10678af7ac5bd2588bf7d697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/45] 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 e34aa3d46dcdd00ad395f697e10fd90e8078e82e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/45] 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 3212f25824877d135d850a920d203a0eb4a0906e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/45] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From e632aeeb480782f17a18b742e81b8cd2c6899e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/45] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From fc03a6b1a8895195c4045d58255b4ebab838e038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/45] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From 9720ffe7d5c967120ddce9445e45db1b77554a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/45] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From c4ecda25a6309bb7b142bc52e1a027f2585a032d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/45] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 67ac90c148f56b9a21327027dc0ec396171466d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/45] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 53a5cb8d77722ecea08bf6568df0cee4fbc5d650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/45] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From 6c8152810f49d6ef41c96315b414e7b1e41b4dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/45] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 6a135555b1b05b63f2fdf517e31ec3087013389f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/45] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 7ec078de67b5e45e9e81470fee40b76c569e7641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/45] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 0be0de9fc8faa28b365909111194f001a520a20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/45] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 25c7af7de4fc1fff2b8aeb3d60d9106b4754e95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/45] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 8ba3153392b9b1cf8c88ac69c3c93e0d1fc90039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/45] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From d4af972ed790700967c810e8141eb6903995313f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/45] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 7839ecb4dd6173c235e7970f867ab5a8bcfbc82a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/45] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 38d680adc1e8f45c2b402d242f13541b881cca8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/45] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From 591085f6fbd1d53cc4ab52880dad74170c616823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/45] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From cb8ae283ec2bff912a4ef0ddf34371dad5bb11b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/45] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From ecc06a6d263fa7257278d06b84344e2d964b3289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/45] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From b5e1ff96d730dd371be518bf47a002a5b9627a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/45] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 90480d847c63d69fe5fca16dff815798160ed894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/45] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From 30a9503175583e4e94a3d106d85b14ae03977db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/45] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From f90b5c2bb9fc5cac6742ffc48c9e721e4a0a327b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/45] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 9f1a6707a5e12a8df425a340aae98dca78796863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/45] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From 8a41a3680462335d225733f3240aca6c2746078d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/45] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From c835d29a15febec2be8019b081ca1936ffcc951a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/45] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 4b682efca0f3c1632b11f936f7a344b2446110ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/45] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From c4d6b43bb7d80e58396249fe114c5a64cb3bde45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/45] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From a4cc1b22ed229cd3897bfeb5ae62f613f2064656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/45] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From adbe6cd79d68c14f853ac3d9d0627f877b00367c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/45] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From 642b1e2412d3a3a4ffff16a3fcd8c446ff3e7a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/45] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..e7e93e4f129 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="A system load plugin for the Xfce4 panel"

From 1918bbd79e4664287376ad4afd995c536fb8dc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/45] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 385775bff78a559f7414fe82241369f1be007885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/45] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 9eca5af77a3efb60be7ebf67cf473b6627e51e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/45] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 17847cac7c2c8912bee2db1fe89c766ad5f4d5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/45] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8382fca0b304907035be0ac1dde043cc0ed8b40b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/45] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bd6af19cb0be010708b15694ba03df4b80664c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/45] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index ba1609d2693..b9de98de9c6 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From a5f27583182a2b3c8d3f0c5a52cbf993b82e5ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/45] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From dcc554347c41bb12ebde50bc07cda172aa32dbf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/45] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From dd516efa4c3e4d9568c89d42904bbea75e7cb2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/45] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From a106f971046879e6d423f5f331fe158dbd9c0e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/45] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From fddf3ad7c5aad924d183363b5937aecaded146bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/45] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (7 preceding siblings ...)
  2020-12-31  0:12 ` [PR PATCH] [Updated] " sgn
@ 2020-12-31  0:14 ` sgn
  2020-12-31  0:15 ` sgn
                   ` (84 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  0:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 44997 bytes --]

From 517503d264432b86e4b17917a1993997e2cfdcbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/46] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From 3a746ad34f6d178d10678af7ac5bd2588bf7d697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/46] 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 e34aa3d46dcdd00ad395f697e10fd90e8078e82e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/46] 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 3212f25824877d135d850a920d203a0eb4a0906e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/46] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From e632aeeb480782f17a18b742e81b8cd2c6899e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/46] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From fc03a6b1a8895195c4045d58255b4ebab838e038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/46] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From 9720ffe7d5c967120ddce9445e45db1b77554a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/46] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From c4ecda25a6309bb7b142bc52e1a027f2585a032d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/46] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 67ac90c148f56b9a21327027dc0ec396171466d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/46] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 53a5cb8d77722ecea08bf6568df0cee4fbc5d650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/46] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From 6c8152810f49d6ef41c96315b414e7b1e41b4dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/46] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 6a135555b1b05b63f2fdf517e31ec3087013389f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/46] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 7ec078de67b5e45e9e81470fee40b76c569e7641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/46] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 0be0de9fc8faa28b365909111194f001a520a20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/46] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 25c7af7de4fc1fff2b8aeb3d60d9106b4754e95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/46] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 8ba3153392b9b1cf8c88ac69c3c93e0d1fc90039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/46] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From d4af972ed790700967c810e8141eb6903995313f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/46] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 7839ecb4dd6173c235e7970f867ab5a8bcfbc82a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/46] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 38d680adc1e8f45c2b402d242f13541b881cca8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/46] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From 591085f6fbd1d53cc4ab52880dad74170c616823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/46] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From cb8ae283ec2bff912a4ef0ddf34371dad5bb11b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/46] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From ecc06a6d263fa7257278d06b84344e2d964b3289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/46] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From b5e1ff96d730dd371be518bf47a002a5b9627a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/46] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 90480d847c63d69fe5fca16dff815798160ed894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/46] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From 30a9503175583e4e94a3d106d85b14ae03977db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/46] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From f90b5c2bb9fc5cac6742ffc48c9e721e4a0a327b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/46] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 9f1a6707a5e12a8df425a340aae98dca78796863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/46] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From 8a41a3680462335d225733f3240aca6c2746078d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/46] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From c835d29a15febec2be8019b081ca1936ffcc951a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/46] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 4b682efca0f3c1632b11f936f7a344b2446110ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/46] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From c4d6b43bb7d80e58396249fe114c5a64cb3bde45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/46] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From a4cc1b22ed229cd3897bfeb5ae62f613f2064656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/46] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From adbe6cd79d68c14f853ac3d9d0627f877b00367c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/46] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From 642b1e2412d3a3a4ffff16a3fcd8c446ff3e7a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/46] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..e7e93e4f129 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="A system load plugin for the Xfce4 panel"

From 1918bbd79e4664287376ad4afd995c536fb8dc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/46] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 385775bff78a559f7414fe82241369f1be007885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/46] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 9eca5af77a3efb60be7ebf67cf473b6627e51e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/46] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 17847cac7c2c8912bee2db1fe89c766ad5f4d5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/46] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8382fca0b304907035be0ac1dde043cc0ed8b40b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/46] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bd6af19cb0be010708b15694ba03df4b80664c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/46] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index ba1609d2693..b9de98de9c6 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From a5f27583182a2b3c8d3f0c5a52cbf993b82e5ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/46] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From dcc554347c41bb12ebde50bc07cda172aa32dbf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/46] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From dd516efa4c3e4d9568c89d42904bbea75e7cb2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/46] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From a106f971046879e6d423f5f331fe158dbd9c0e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/46] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From fddf3ad7c5aad924d183363b5937aecaded146bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/46] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 35a951200e45d546c1aa1bc6f370cf92ef4763b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/46] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (8 preceding siblings ...)
  2020-12-31  0:14 ` sgn
@ 2020-12-31  0:15 ` sgn
  2020-12-31  1:00 ` sgn
                   ` (83 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  0:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 45810 bytes --]

From 517503d264432b86e4b17917a1993997e2cfdcbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/47] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From 3a746ad34f6d178d10678af7ac5bd2588bf7d697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/47] 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 e34aa3d46dcdd00ad395f697e10fd90e8078e82e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/47] 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 3212f25824877d135d850a920d203a0eb4a0906e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/47] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From e632aeeb480782f17a18b742e81b8cd2c6899e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/47] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From fc03a6b1a8895195c4045d58255b4ebab838e038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/47] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From 9720ffe7d5c967120ddce9445e45db1b77554a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/47] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From c4ecda25a6309bb7b142bc52e1a027f2585a032d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/47] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 67ac90c148f56b9a21327027dc0ec396171466d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/47] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 53a5cb8d77722ecea08bf6568df0cee4fbc5d650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/47] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From 6c8152810f49d6ef41c96315b414e7b1e41b4dc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/47] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 6a135555b1b05b63f2fdf517e31ec3087013389f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/47] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 7ec078de67b5e45e9e81470fee40b76c569e7641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/47] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 0be0de9fc8faa28b365909111194f001a520a20d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/47] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 25c7af7de4fc1fff2b8aeb3d60d9106b4754e95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/47] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 8ba3153392b9b1cf8c88ac69c3c93e0d1fc90039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/47] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From d4af972ed790700967c810e8141eb6903995313f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/47] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 7839ecb4dd6173c235e7970f867ab5a8bcfbc82a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/47] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 38d680adc1e8f45c2b402d242f13541b881cca8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/47] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From 591085f6fbd1d53cc4ab52880dad74170c616823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/47] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From cb8ae283ec2bff912a4ef0ddf34371dad5bb11b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/47] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From ecc06a6d263fa7257278d06b84344e2d964b3289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/47] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From b5e1ff96d730dd371be518bf47a002a5b9627a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/47] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 90480d847c63d69fe5fca16dff815798160ed894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/47] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From 30a9503175583e4e94a3d106d85b14ae03977db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/47] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From f90b5c2bb9fc5cac6742ffc48c9e721e4a0a327b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/47] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 9f1a6707a5e12a8df425a340aae98dca78796863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/47] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From 8a41a3680462335d225733f3240aca6c2746078d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/47] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From c835d29a15febec2be8019b081ca1936ffcc951a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/47] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 4b682efca0f3c1632b11f936f7a344b2446110ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/47] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From c4d6b43bb7d80e58396249fe114c5a64cb3bde45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/47] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From a4cc1b22ed229cd3897bfeb5ae62f613f2064656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/47] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From adbe6cd79d68c14f853ac3d9d0627f877b00367c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/47] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From 642b1e2412d3a3a4ffff16a3fcd8c446ff3e7a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/47] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..e7e93e4f129 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="A system load plugin for the Xfce4 panel"

From 1918bbd79e4664287376ad4afd995c536fb8dc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/47] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 385775bff78a559f7414fe82241369f1be007885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/47] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 9eca5af77a3efb60be7ebf67cf473b6627e51e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/47] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 17847cac7c2c8912bee2db1fe89c766ad5f4d5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/47] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8382fca0b304907035be0ac1dde043cc0ed8b40b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/47] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bd6af19cb0be010708b15694ba03df4b80664c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/47] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index ba1609d2693..b9de98de9c6 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From a5f27583182a2b3c8d3f0c5a52cbf993b82e5ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/47] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From dcc554347c41bb12ebde50bc07cda172aa32dbf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/47] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From dd516efa4c3e4d9568c89d42904bbea75e7cb2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/47] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From a106f971046879e6d423f5f331fe158dbd9c0e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/47] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From fddf3ad7c5aad924d183363b5937aecaded146bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/47] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 35a951200e45d546c1aa1bc6f370cf92ef4763b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/47] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From d8e0471347cedfa1f40c68e216fb41e524da9cf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/47] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (9 preceding siblings ...)
  2020-12-31  0:15 ` sgn
@ 2020-12-31  1:00 ` sgn
  2020-12-31  1:02 ` sgn
                   ` (82 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  1:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 55590 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/57] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From be800875f86d81687a35e70a75d3c926ec93172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/57] 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 23e6535832716401d2d5b5d49b02fa0e129fdeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/57] 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 368cf8afb8d770bad1e1ff6ba64dc2d7b604179e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/57] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 69d5078bc5006d7121b8f74d1f35e466310ea004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/57] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 1949b5ffdf673df3051eaf5db63d6c313976bd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/57] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From b586ef08049e68f45f1ea19a404dda29fe06d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/57] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 901fe6f4786eaf2eb64caa3ac9bfaf842c6a61a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/57] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From b3889fa7f583cc154ec6add07f99995f8697549b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/57] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8639a942dd75e2bd151abbb3a37c0370b5db9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/57] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From be19e10f06d3ee14bc1ab63684089d048b7a4fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/57] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 62f5a5215acf5e9ada730649a7cc169452538589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/57] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 5428a15fe3f66005e0054c5e985edd7faf0aba5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/57] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From a36c662c47c733655d1032c8e9159720d032ae58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/57] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 2f9f95ff704416c54531da043d866b3b5966a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/57] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 3466eba76cbdc0068640a89f7dbb71a2215a0217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/57] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From f2a8c6714fdeb8838910b1b385e9e89adbbf63a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/57] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 2177b8ff481819b5a801b2317fe635e5a174f592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/57] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 8a629d23eb67dcf44267c4a16ebf3031c316cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/57] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From bbf48589690df4db0d5f55826b7df0da216f3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/57] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From 82c6882d0685943b2a3f8cf7abd49ec9e5f52da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/57] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From c5338fae35bc0869b6f8c924fbb3ac343885e2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/57] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From 524da49364d2b4c49ec5d457ceea56c4acaa3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/57] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 38a1033888eba5a85014aeaf06e00163ae39c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/57] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From d719850a63b4b908c044d4d7f8fc99f86d79dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/57] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 39d51762df92298ff0c72256506c09cdbb9852af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/57] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 3c54ec26fe6bb3a43101dd90325ed412806ca157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/57] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From d851eb84645dc6ff1c03e7c2ef40e36e0c4eac61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/57] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 41336c9ae052daf4825c199063649733bdcb2674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/57] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 37b3423d6754f01c99013ac73bf3db30aa81b433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/57] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 368f20655d18750096ab32325bd580ec42fd2549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/57] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc1b38183261aee6796f47c03c610f443fd20e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/57] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 2aa156b263fb6df33941047d5b293653525f2240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/57] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From f8b47b085aa276d4915a72f2826d1705b4b5ff34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/57] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From b8c0ee70214dc80352b0223c0043c7720a77fba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/57] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 44af0e8fe707f40c34ee0bf916ff92b920555b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/57] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 0fa505e437d50bb5fbf9af9593d4764d5b206ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/57] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 7d6d05a1e2b925750d4121cfddfad255e767473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/57] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8669e5935f9e895191cf2e4a6b3e955a2aaa4683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/57] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bfbf936e821d49104e6b6cc53fc034c47783f343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/57] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From 0612f242a5711649a94c2b2fba5bda0eb14ffcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/57] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 3c6444e4bb88cac5ef97f313457aa582979f2176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/57] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 61f7c728daa8b9f0eba2cf2cb1809e6d16e96c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/57] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 9972d43bd4f15ca8ba0afbadf4c7a147e2a754c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/57] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 45183f057e33b5dda5fd953fe3ef715040948d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/57] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 6351261875ef23a31c6823ec19f7e1d05359d4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/57] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 3b417c95851e35ed8aec31a85cecfd1cfab1caa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/57] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From 96402f56c3ba15d5a64235834b568212e8557fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/57] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..e404de06828 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_patch() {
+	vsed -i -e '/^DATADIRNAME =/s,=.*,= share,' po/Makefile.in.in
+}

From fe52abed2c357bd2971085718950b98873dc66d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/57] ario: fix l10n dir

---
 srcpkgs/ario/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..ea29441ab22 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,12 +10,13 @@ makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	vsed -i '/DATADIRNAME =/s,=.*/= share' po/Makefile.in.in
 }

From 1e5339070cbaedf1abff30a226c869159b586bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/57] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..ca48dd7137d 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e '/localedir =/s,=.*,= /usr/share/locale,' po/Makefile.in.in
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 289ef1b667ed82c7e83eccc787db995e447df075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/57] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From c074613e75ad5994be9c6e9864741645bee919d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/57] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From b4f4c5d89e303cbe0a09124afe94aedd1b5dfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/57] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 702a5d0b6d256cf7b1f604de39a350d01d20af4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/57] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 71dea3e2e6d3a45b3ff5e126597ce3504b938623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/57] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From eec3caff51ddf2cfb523c85e9635136e8241db2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/57] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 1be92144a1402e85511fe2d9e563bccc3e01fce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/57] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..a42b8ab50ce 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (10 preceding siblings ...)
  2020-12-31  1:00 ` sgn
@ 2020-12-31  1:02 ` sgn
  2020-12-31  1:25 ` sgn
                   ` (81 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  1:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 56825 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/58] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From be800875f86d81687a35e70a75d3c926ec93172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/58] 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 23e6535832716401d2d5b5d49b02fa0e129fdeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/58] 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 368cf8afb8d770bad1e1ff6ba64dc2d7b604179e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/58] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 69d5078bc5006d7121b8f74d1f35e466310ea004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/58] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 1949b5ffdf673df3051eaf5db63d6c313976bd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/58] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From b586ef08049e68f45f1ea19a404dda29fe06d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/58] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 901fe6f4786eaf2eb64caa3ac9bfaf842c6a61a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/58] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From b3889fa7f583cc154ec6add07f99995f8697549b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/58] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8639a942dd75e2bd151abbb3a37c0370b5db9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/58] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From be19e10f06d3ee14bc1ab63684089d048b7a4fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/58] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 62f5a5215acf5e9ada730649a7cc169452538589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/58] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 5428a15fe3f66005e0054c5e985edd7faf0aba5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/58] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From a36c662c47c733655d1032c8e9159720d032ae58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/58] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 2f9f95ff704416c54531da043d866b3b5966a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/58] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 3466eba76cbdc0068640a89f7dbb71a2215a0217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/58] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From f2a8c6714fdeb8838910b1b385e9e89adbbf63a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/58] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 2177b8ff481819b5a801b2317fe635e5a174f592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/58] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 8a629d23eb67dcf44267c4a16ebf3031c316cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/58] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From bbf48589690df4db0d5f55826b7df0da216f3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/58] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From 82c6882d0685943b2a3f8cf7abd49ec9e5f52da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/58] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From c5338fae35bc0869b6f8c924fbb3ac343885e2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/58] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From 524da49364d2b4c49ec5d457ceea56c4acaa3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/58] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 38a1033888eba5a85014aeaf06e00163ae39c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/58] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From d719850a63b4b908c044d4d7f8fc99f86d79dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/58] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 39d51762df92298ff0c72256506c09cdbb9852af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/58] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 3c54ec26fe6bb3a43101dd90325ed412806ca157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/58] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From d851eb84645dc6ff1c03e7c2ef40e36e0c4eac61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/58] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 41336c9ae052daf4825c199063649733bdcb2674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/58] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 37b3423d6754f01c99013ac73bf3db30aa81b433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/58] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 368f20655d18750096ab32325bd580ec42fd2549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/58] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc1b38183261aee6796f47c03c610f443fd20e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/58] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 2aa156b263fb6df33941047d5b293653525f2240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/58] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From f8b47b085aa276d4915a72f2826d1705b4b5ff34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/58] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From b8c0ee70214dc80352b0223c0043c7720a77fba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/58] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 44af0e8fe707f40c34ee0bf916ff92b920555b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/58] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 0fa505e437d50bb5fbf9af9593d4764d5b206ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/58] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 7d6d05a1e2b925750d4121cfddfad255e767473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/58] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8669e5935f9e895191cf2e4a6b3e955a2aaa4683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/58] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bfbf936e821d49104e6b6cc53fc034c47783f343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/58] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From 0612f242a5711649a94c2b2fba5bda0eb14ffcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/58] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 3c6444e4bb88cac5ef97f313457aa582979f2176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/58] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 61f7c728daa8b9f0eba2cf2cb1809e6d16e96c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/58] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 9972d43bd4f15ca8ba0afbadf4c7a147e2a754c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/58] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 45183f057e33b5dda5fd953fe3ef715040948d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/58] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 6351261875ef23a31c6823ec19f7e1d05359d4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/58] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 3b417c95851e35ed8aec31a85cecfd1cfab1caa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/58] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From 96402f56c3ba15d5a64235834b568212e8557fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/58] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..e404de06828 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_patch() {
+	vsed -i -e '/^DATADIRNAME =/s,=.*,= share,' po/Makefile.in.in
+}

From fe52abed2c357bd2971085718950b98873dc66d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/58] ario: fix l10n dir

---
 srcpkgs/ario/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..ea29441ab22 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,12 +10,13 @@ makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	vsed -i '/DATADIRNAME =/s,=.*/= share' po/Makefile.in.in
 }

From 1e5339070cbaedf1abff30a226c869159b586bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/58] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..ca48dd7137d 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e '/localedir =/s,=.*,= /usr/share/locale,' po/Makefile.in.in
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 289ef1b667ed82c7e83eccc787db995e447df075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/58] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From c074613e75ad5994be9c6e9864741645bee919d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/58] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From b4f4c5d89e303cbe0a09124afe94aedd1b5dfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/58] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 702a5d0b6d256cf7b1f604de39a350d01d20af4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/58] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 71dea3e2e6d3a45b3ff5e126597ce3504b938623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/58] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From eec3caff51ddf2cfb523c85e9635136e8241db2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/58] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 1be92144a1402e85511fe2d9e563bccc3e01fce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/58] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..a42b8ab50ce 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"

From 981c843548b8e4dfd7c329b5fb8a27759fb63c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 58/58] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (11 preceding siblings ...)
  2020-12-31  1:02 ` sgn
@ 2020-12-31  1:25 ` sgn
  2020-12-31  1:28 ` sgn
                   ` (80 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  1:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 58009 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/59] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From be800875f86d81687a35e70a75d3c926ec93172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/59] 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 23e6535832716401d2d5b5d49b02fa0e129fdeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/59] 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 368cf8afb8d770bad1e1ff6ba64dc2d7b604179e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/59] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 69d5078bc5006d7121b8f74d1f35e466310ea004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/59] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 1949b5ffdf673df3051eaf5db63d6c313976bd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/59] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From b586ef08049e68f45f1ea19a404dda29fe06d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/59] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 901fe6f4786eaf2eb64caa3ac9bfaf842c6a61a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/59] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From b3889fa7f583cc154ec6add07f99995f8697549b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/59] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8639a942dd75e2bd151abbb3a37c0370b5db9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/59] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From be19e10f06d3ee14bc1ab63684089d048b7a4fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/59] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 62f5a5215acf5e9ada730649a7cc169452538589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/59] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 5428a15fe3f66005e0054c5e985edd7faf0aba5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/59] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From a36c662c47c733655d1032c8e9159720d032ae58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/59] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 2f9f95ff704416c54531da043d866b3b5966a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/59] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 3466eba76cbdc0068640a89f7dbb71a2215a0217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/59] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From f2a8c6714fdeb8838910b1b385e9e89adbbf63a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/59] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 2177b8ff481819b5a801b2317fe635e5a174f592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/59] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 8a629d23eb67dcf44267c4a16ebf3031c316cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/59] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From bbf48589690df4db0d5f55826b7df0da216f3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/59] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From 82c6882d0685943b2a3f8cf7abd49ec9e5f52da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/59] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From c5338fae35bc0869b6f8c924fbb3ac343885e2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/59] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From 524da49364d2b4c49ec5d457ceea56c4acaa3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/59] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 38a1033888eba5a85014aeaf06e00163ae39c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/59] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From d719850a63b4b908c044d4d7f8fc99f86d79dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/59] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 39d51762df92298ff0c72256506c09cdbb9852af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/59] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 3c54ec26fe6bb3a43101dd90325ed412806ca157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/59] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From d851eb84645dc6ff1c03e7c2ef40e36e0c4eac61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/59] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 41336c9ae052daf4825c199063649733bdcb2674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/59] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 37b3423d6754f01c99013ac73bf3db30aa81b433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/59] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 368f20655d18750096ab32325bd580ec42fd2549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/59] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc1b38183261aee6796f47c03c610f443fd20e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/59] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 2aa156b263fb6df33941047d5b293653525f2240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/59] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From f8b47b085aa276d4915a72f2826d1705b4b5ff34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/59] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From b8c0ee70214dc80352b0223c0043c7720a77fba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/59] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 44af0e8fe707f40c34ee0bf916ff92b920555b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/59] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 0fa505e437d50bb5fbf9af9593d4764d5b206ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/59] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 7d6d05a1e2b925750d4121cfddfad255e767473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/59] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8669e5935f9e895191cf2e4a6b3e955a2aaa4683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/59] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bfbf936e821d49104e6b6cc53fc034c47783f343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/59] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From 0612f242a5711649a94c2b2fba5bda0eb14ffcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/59] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 3c6444e4bb88cac5ef97f313457aa582979f2176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/59] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 61f7c728daa8b9f0eba2cf2cb1809e6d16e96c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/59] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 9972d43bd4f15ca8ba0afbadf4c7a147e2a754c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/59] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 45183f057e33b5dda5fd953fe3ef715040948d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/59] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 6351261875ef23a31c6823ec19f7e1d05359d4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/59] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 3b417c95851e35ed8aec31a85cecfd1cfab1caa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/59] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From 96402f56c3ba15d5a64235834b568212e8557fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/59] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..e404de06828 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_patch() {
+	vsed -i -e '/^DATADIRNAME =/s,=.*,= share,' po/Makefile.in.in
+}

From fe52abed2c357bd2971085718950b98873dc66d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/59] ario: fix l10n dir

---
 srcpkgs/ario/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..ea29441ab22 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,12 +10,13 @@ makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	vsed -i '/DATADIRNAME =/s,=.*/= share' po/Makefile.in.in
 }

From 1e5339070cbaedf1abff30a226c869159b586bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/59] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..ca48dd7137d 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e '/localedir =/s,=.*,= /usr/share/locale,' po/Makefile.in.in
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 289ef1b667ed82c7e83eccc787db995e447df075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/59] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From c074613e75ad5994be9c6e9864741645bee919d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/59] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From b4f4c5d89e303cbe0a09124afe94aedd1b5dfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/59] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 702a5d0b6d256cf7b1f604de39a350d01d20af4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/59] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 71dea3e2e6d3a45b3ff5e126597ce3504b938623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/59] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From eec3caff51ddf2cfb523c85e9635136e8241db2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/59] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 1be92144a1402e85511fe2d9e563bccc3e01fce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/59] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..a42b8ab50ce 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"

From 72b64490bba68388e30daf8ba8ad6736a3dbb661 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/59] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From 78fd82b202781655ea26b272e616b59ff305d90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 59/59] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (12 preceding siblings ...)
  2020-12-31  1:25 ` sgn
@ 2020-12-31  1:28 ` sgn
  2020-12-31  2:06 ` q66
                   ` (79 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  1:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 61792 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/62] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From be800875f86d81687a35e70a75d3c926ec93172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/62] 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 23e6535832716401d2d5b5d49b02fa0e129fdeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/62] 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 368cf8afb8d770bad1e1ff6ba64dc2d7b604179e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/62] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 69d5078bc5006d7121b8f74d1f35e466310ea004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/62] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 1949b5ffdf673df3051eaf5db63d6c313976bd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/62] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From b586ef08049e68f45f1ea19a404dda29fe06d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/62] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 901fe6f4786eaf2eb64caa3ac9bfaf842c6a61a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/62] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From b3889fa7f583cc154ec6add07f99995f8697549b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/62] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8639a942dd75e2bd151abbb3a37c0370b5db9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/62] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From be19e10f06d3ee14bc1ab63684089d048b7a4fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/62] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 62f5a5215acf5e9ada730649a7cc169452538589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/62] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 5428a15fe3f66005e0054c5e985edd7faf0aba5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/62] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From a36c662c47c733655d1032c8e9159720d032ae58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/62] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 2f9f95ff704416c54531da043d866b3b5966a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/62] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 3466eba76cbdc0068640a89f7dbb71a2215a0217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/62] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From f2a8c6714fdeb8838910b1b385e9e89adbbf63a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/62] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 2177b8ff481819b5a801b2317fe635e5a174f592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/62] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 8a629d23eb67dcf44267c4a16ebf3031c316cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/62] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From bbf48589690df4db0d5f55826b7df0da216f3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/62] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From 82c6882d0685943b2a3f8cf7abd49ec9e5f52da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/62] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From c5338fae35bc0869b6f8c924fbb3ac343885e2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/62] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From 524da49364d2b4c49ec5d457ceea56c4acaa3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/62] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 38a1033888eba5a85014aeaf06e00163ae39c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/62] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From d719850a63b4b908c044d4d7f8fc99f86d79dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/62] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 39d51762df92298ff0c72256506c09cdbb9852af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/62] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 3c54ec26fe6bb3a43101dd90325ed412806ca157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/62] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From d851eb84645dc6ff1c03e7c2ef40e36e0c4eac61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/62] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 41336c9ae052daf4825c199063649733bdcb2674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/62] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 37b3423d6754f01c99013ac73bf3db30aa81b433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/62] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 368f20655d18750096ab32325bd580ec42fd2549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/62] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc1b38183261aee6796f47c03c610f443fd20e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/62] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 2aa156b263fb6df33941047d5b293653525f2240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/62] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From f8b47b085aa276d4915a72f2826d1705b4b5ff34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/62] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From b8c0ee70214dc80352b0223c0043c7720a77fba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/62] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 44af0e8fe707f40c34ee0bf916ff92b920555b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/62] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 0fa505e437d50bb5fbf9af9593d4764d5b206ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/62] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 7d6d05a1e2b925750d4121cfddfad255e767473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/62] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8669e5935f9e895191cf2e4a6b3e955a2aaa4683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/62] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bfbf936e821d49104e6b6cc53fc034c47783f343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/62] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From 0612f242a5711649a94c2b2fba5bda0eb14ffcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/62] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 3c6444e4bb88cac5ef97f313457aa582979f2176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/62] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 61f7c728daa8b9f0eba2cf2cb1809e6d16e96c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/62] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 9972d43bd4f15ca8ba0afbadf4c7a147e2a754c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/62] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 45183f057e33b5dda5fd953fe3ef715040948d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/62] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 6351261875ef23a31c6823ec19f7e1d05359d4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/62] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 3b417c95851e35ed8aec31a85cecfd1cfab1caa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/62] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From 96402f56c3ba15d5a64235834b568212e8557fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/62] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..e404de06828 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_patch() {
+	vsed -i -e '/^DATADIRNAME =/s,=.*,= share,' po/Makefile.in.in
+}

From fe52abed2c357bd2971085718950b98873dc66d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/62] ario: fix l10n dir

---
 srcpkgs/ario/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..ea29441ab22 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,12 +10,13 @@ makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	vsed -i '/DATADIRNAME =/s,=.*/= share' po/Makefile.in.in
 }

From 1e5339070cbaedf1abff30a226c869159b586bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/62] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..ca48dd7137d 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e '/localedir =/s,=.*,= /usr/share/locale,' po/Makefile.in.in
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 289ef1b667ed82c7e83eccc787db995e447df075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/62] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From c074613e75ad5994be9c6e9864741645bee919d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/62] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From b4f4c5d89e303cbe0a09124afe94aedd1b5dfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/62] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 702a5d0b6d256cf7b1f604de39a350d01d20af4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/62] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 71dea3e2e6d3a45b3ff5e126597ce3504b938623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/62] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From eec3caff51ddf2cfb523c85e9635136e8241db2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/62] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 1be92144a1402e85511fe2d9e563bccc3e01fce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/62] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..a42b8ab50ce 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"

From 72b64490bba68388e30daf8ba8ad6736a3dbb661 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/62] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From 78fd82b202781655ea26b272e616b59ff305d90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 59/62] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From 64579d42c38e7a04c3ce19dff03f4da5e0c9a62f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:56:43 +0100
Subject: [PATCH 60/62] xfce4-sensors-plugin: update to 1.3.95.

---
 srcpkgs/xfce4-sensors-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 8ee54701882..2ad44227da8 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.92
-revision=3
+version=1.3.95
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
 
 CFLAGS="-fcommon"
 

From 64f4971814ecf0b3e5be22a67f36024c19d70161 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:54:08 +0100
Subject: [PATCH 61/62] xfce4-diskperf-plugin: update to 2.6.3.

---
 srcpkgs/xfce4-diskperf-plugin/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index c5ada149537..8b9a62941de 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,6 @@
 # Template file for 'xfce4-diskperf-plugin'
-pkgname=xfce4-diskperf-plugin
-version=2.6.2
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
 
 post_install() {
 	vlicense COPYING

From 2209f9747a0c8381e820f843359b2982f4ca894c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:48:40 +0100
Subject: [PATCH 62/62] xfce4-taskmanager: update to 1.4.0.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 1594aa22336..c8e3ea4b130 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.2.3
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4
+checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (13 preceding siblings ...)
  2020-12-31  1:28 ` sgn
@ 2020-12-31  2:06 ` q66
  2020-12-31  2:07 ` [PR PATCH] [Updated] " sgn
                   ` (78 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-31  2:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752816704

Comment:
what's up with that github workflows commit? also did you patch the xfce4-dev-tools m4 file? I don't see that in the commits

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (14 preceding siblings ...)
  2020-12-31  2:06 ` q66
@ 2020-12-31  2:07 ` sgn
  2020-12-31  2:09 ` sgn
                   ` (77 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  2:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 63062 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/63] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From be800875f86d81687a35e70a75d3c926ec93172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/63] 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 23e6535832716401d2d5b5d49b02fa0e129fdeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/63] 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 368cf8afb8d770bad1e1ff6ba64dc2d7b604179e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/63] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 69d5078bc5006d7121b8f74d1f35e466310ea004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/63] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 1949b5ffdf673df3051eaf5db63d6c313976bd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/63] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From b586ef08049e68f45f1ea19a404dda29fe06d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/63] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 901fe6f4786eaf2eb64caa3ac9bfaf842c6a61a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/63] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From b3889fa7f583cc154ec6add07f99995f8697549b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/63] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8639a942dd75e2bd151abbb3a37c0370b5db9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/63] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From be19e10f06d3ee14bc1ab63684089d048b7a4fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/63] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 62f5a5215acf5e9ada730649a7cc169452538589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/63] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 5428a15fe3f66005e0054c5e985edd7faf0aba5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/63] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From a36c662c47c733655d1032c8e9159720d032ae58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/63] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 2f9f95ff704416c54531da043d866b3b5966a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/63] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 3466eba76cbdc0068640a89f7dbb71a2215a0217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/63] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From f2a8c6714fdeb8838910b1b385e9e89adbbf63a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/63] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 2177b8ff481819b5a801b2317fe635e5a174f592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/63] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 8a629d23eb67dcf44267c4a16ebf3031c316cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/63] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From bbf48589690df4db0d5f55826b7df0da216f3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/63] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From 82c6882d0685943b2a3f8cf7abd49ec9e5f52da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/63] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From c5338fae35bc0869b6f8c924fbb3ac343885e2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/63] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From 524da49364d2b4c49ec5d457ceea56c4acaa3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/63] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 38a1033888eba5a85014aeaf06e00163ae39c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/63] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From d719850a63b4b908c044d4d7f8fc99f86d79dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/63] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 39d51762df92298ff0c72256506c09cdbb9852af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/63] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 3c54ec26fe6bb3a43101dd90325ed412806ca157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/63] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From d851eb84645dc6ff1c03e7c2ef40e36e0c4eac61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/63] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 41336c9ae052daf4825c199063649733bdcb2674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/63] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 37b3423d6754f01c99013ac73bf3db30aa81b433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/63] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 368f20655d18750096ab32325bd580ec42fd2549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/63] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc1b38183261aee6796f47c03c610f443fd20e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/63] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 2aa156b263fb6df33941047d5b293653525f2240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/63] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From f8b47b085aa276d4915a72f2826d1705b4b5ff34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/63] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From b8c0ee70214dc80352b0223c0043c7720a77fba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/63] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 44af0e8fe707f40c34ee0bf916ff92b920555b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/63] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 0fa505e437d50bb5fbf9af9593d4764d5b206ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/63] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 7d6d05a1e2b925750d4121cfddfad255e767473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/63] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8669e5935f9e895191cf2e4a6b3e955a2aaa4683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/63] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bfbf936e821d49104e6b6cc53fc034c47783f343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/63] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From 0612f242a5711649a94c2b2fba5bda0eb14ffcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/63] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 3c6444e4bb88cac5ef97f313457aa582979f2176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/63] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 61f7c728daa8b9f0eba2cf2cb1809e6d16e96c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/63] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 9972d43bd4f15ca8ba0afbadf4c7a147e2a754c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/63] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 45183f057e33b5dda5fd953fe3ef715040948d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/63] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 6351261875ef23a31c6823ec19f7e1d05359d4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/63] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 3b417c95851e35ed8aec31a85cecfd1cfab1caa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/63] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From 96402f56c3ba15d5a64235834b568212e8557fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/63] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..e404de06828 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_patch() {
+	vsed -i -e '/^DATADIRNAME =/s,=.*,= share,' po/Makefile.in.in
+}

From fe52abed2c357bd2971085718950b98873dc66d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/63] ario: fix l10n dir

---
 srcpkgs/ario/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..ea29441ab22 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,12 +10,13 @@ makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	vsed -i '/DATADIRNAME =/s,=.*/= share' po/Makefile.in.in
 }

From 1e5339070cbaedf1abff30a226c869159b586bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/63] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..ca48dd7137d 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e '/localedir =/s,=.*,= /usr/share/locale,' po/Makefile.in.in
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 289ef1b667ed82c7e83eccc787db995e447df075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/63] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From c074613e75ad5994be9c6e9864741645bee919d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/63] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From b4f4c5d89e303cbe0a09124afe94aedd1b5dfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/63] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 702a5d0b6d256cf7b1f604de39a350d01d20af4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/63] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 71dea3e2e6d3a45b3ff5e126597ce3504b938623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/63] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From eec3caff51ddf2cfb523c85e9635136e8241db2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/63] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 1be92144a1402e85511fe2d9e563bccc3e01fce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/63] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..a42b8ab50ce 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"

From 72b64490bba68388e30daf8ba8ad6736a3dbb661 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/63] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From 78fd82b202781655ea26b272e616b59ff305d90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 59/63] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From 64579d42c38e7a04c3ce19dff03f4da5e0c9a62f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:56:43 +0100
Subject: [PATCH 60/63] xfce4-sensors-plugin: update to 1.3.95.

---
 srcpkgs/xfce4-sensors-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 8ee54701882..2ad44227da8 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.92
-revision=3
+version=1.3.95
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
 
 CFLAGS="-fcommon"
 

From 64f4971814ecf0b3e5be22a67f36024c19d70161 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:54:08 +0100
Subject: [PATCH 61/63] xfce4-diskperf-plugin: update to 2.6.3.

---
 srcpkgs/xfce4-diskperf-plugin/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index c5ada149537..8b9a62941de 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,6 @@
 # Template file for 'xfce4-diskperf-plugin'
-pkgname=xfce4-diskperf-plugin
-version=2.6.2
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
 
 post_install() {
 	vlicense COPYING

From 2209f9747a0c8381e820f843359b2982f4ca894c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:48:40 +0100
Subject: [PATCH 62/63] xfce4-taskmanager: update to 1.4.0.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 1594aa22336..c8e3ea4b130 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.2.3
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4
+checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43

From 647c36759a9bdbfb54dfb7682f1105bbbb2fdb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:05:47 +0700
Subject: [PATCH 63/63] xfce4-verve-plugin: update to 2.0.1.

---
 srcpkgs/xfce4-verve-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 601043610f3..fe00e5a0bea 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2
+checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (15 preceding siblings ...)
  2020-12-31  2:07 ` [PR PATCH] [Updated] " sgn
@ 2020-12-31  2:09 ` sgn
  2020-12-31  2:13 ` [PR PATCH] [Updated] " sgn
                   ` (76 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  2:09 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 472 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752817035

Comment:
> what's up with that github workflows commit?

I would like to turn it off to let the build finish, I'll remove it before pushing.

> also did you patch the xfce4-dev-tools m4 file? I don't see that in the commits.

I supposed we can just add `--with-locales-dir=...` into all xfce4 packages instead of patching its m4 file.



^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (16 preceding siblings ...)
  2020-12-31  2:09 ` sgn
@ 2020-12-31  2:13 ` sgn
  2020-12-31  2:35 ` q66
                   ` (75 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  2:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 64788 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/64] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From be800875f86d81687a35e70a75d3c926ec93172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/64] 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 23e6535832716401d2d5b5d49b02fa0e129fdeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/64] 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 368cf8afb8d770bad1e1ff6ba64dc2d7b604179e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/64] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 69d5078bc5006d7121b8f74d1f35e466310ea004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/64] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 1949b5ffdf673df3051eaf5db63d6c313976bd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/64] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From b586ef08049e68f45f1ea19a404dda29fe06d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/64] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 901fe6f4786eaf2eb64caa3ac9bfaf842c6a61a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/64] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From b3889fa7f583cc154ec6add07f99995f8697549b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/64] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8639a942dd75e2bd151abbb3a37c0370b5db9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/64] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From be19e10f06d3ee14bc1ab63684089d048b7a4fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/64] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 62f5a5215acf5e9ada730649a7cc169452538589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/64] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 5428a15fe3f66005e0054c5e985edd7faf0aba5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/64] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From a36c662c47c733655d1032c8e9159720d032ae58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/64] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 2f9f95ff704416c54531da043d866b3b5966a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/64] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 3466eba76cbdc0068640a89f7dbb71a2215a0217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/64] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From f2a8c6714fdeb8838910b1b385e9e89adbbf63a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/64] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 2177b8ff481819b5a801b2317fe635e5a174f592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/64] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 8a629d23eb67dcf44267c4a16ebf3031c316cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/64] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From bbf48589690df4db0d5f55826b7df0da216f3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/64] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From 82c6882d0685943b2a3f8cf7abd49ec9e5f52da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/64] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From c5338fae35bc0869b6f8c924fbb3ac343885e2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/64] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From 524da49364d2b4c49ec5d457ceea56c4acaa3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/64] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 38a1033888eba5a85014aeaf06e00163ae39c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/64] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From d719850a63b4b908c044d4d7f8fc99f86d79dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/64] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 39d51762df92298ff0c72256506c09cdbb9852af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/64] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 3c54ec26fe6bb3a43101dd90325ed412806ca157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/64] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From d851eb84645dc6ff1c03e7c2ef40e36e0c4eac61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/64] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 41336c9ae052daf4825c199063649733bdcb2674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/64] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 37b3423d6754f01c99013ac73bf3db30aa81b433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/64] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 368f20655d18750096ab32325bd580ec42fd2549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/64] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc1b38183261aee6796f47c03c610f443fd20e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/64] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 2aa156b263fb6df33941047d5b293653525f2240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/64] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From f8b47b085aa276d4915a72f2826d1705b4b5ff34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/64] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From b8c0ee70214dc80352b0223c0043c7720a77fba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/64] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 44af0e8fe707f40c34ee0bf916ff92b920555b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/64] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 0fa505e437d50bb5fbf9af9593d4764d5b206ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/64] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 7d6d05a1e2b925750d4121cfddfad255e767473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/64] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8669e5935f9e895191cf2e4a6b3e955a2aaa4683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/64] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bfbf936e821d49104e6b6cc53fc034c47783f343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/64] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From 0612f242a5711649a94c2b2fba5bda0eb14ffcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/64] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 3c6444e4bb88cac5ef97f313457aa582979f2176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/64] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 61f7c728daa8b9f0eba2cf2cb1809e6d16e96c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/64] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 9972d43bd4f15ca8ba0afbadf4c7a147e2a754c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/64] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 45183f057e33b5dda5fd953fe3ef715040948d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/64] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 6351261875ef23a31c6823ec19f7e1d05359d4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/64] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 3b417c95851e35ed8aec31a85cecfd1cfab1caa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/64] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From 96402f56c3ba15d5a64235834b568212e8557fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/64] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..e404de06828 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_patch() {
+	vsed -i -e '/^DATADIRNAME =/s,=.*,= share,' po/Makefile.in.in
+}

From fe52abed2c357bd2971085718950b98873dc66d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/64] ario: fix l10n dir

---
 srcpkgs/ario/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..ea29441ab22 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,12 +10,13 @@ makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	vsed -i '/DATADIRNAME =/s,=.*/= share' po/Makefile.in.in
 }

From 1e5339070cbaedf1abff30a226c869159b586bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/64] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..ca48dd7137d 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e '/localedir =/s,=.*,= /usr/share/locale,' po/Makefile.in.in
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 289ef1b667ed82c7e83eccc787db995e447df075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/64] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From c074613e75ad5994be9c6e9864741645bee919d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/64] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From b4f4c5d89e303cbe0a09124afe94aedd1b5dfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/64] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 702a5d0b6d256cf7b1f604de39a350d01d20af4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/64] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 71dea3e2e6d3a45b3ff5e126597ce3504b938623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/64] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From eec3caff51ddf2cfb523c85e9635136e8241db2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/64] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 1be92144a1402e85511fe2d9e563bccc3e01fce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/64] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..a42b8ab50ce 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"

From 72b64490bba68388e30daf8ba8ad6736a3dbb661 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/64] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From 78fd82b202781655ea26b272e616b59ff305d90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 59/64] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From 64579d42c38e7a04c3ce19dff03f4da5e0c9a62f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:56:43 +0100
Subject: [PATCH 60/64] xfce4-sensors-plugin: update to 1.3.95.

---
 srcpkgs/xfce4-sensors-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 8ee54701882..2ad44227da8 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.92
-revision=3
+version=1.3.95
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
 
 CFLAGS="-fcommon"
 

From 64f4971814ecf0b3e5be22a67f36024c19d70161 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:54:08 +0100
Subject: [PATCH 61/64] xfce4-diskperf-plugin: update to 2.6.3.

---
 srcpkgs/xfce4-diskperf-plugin/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index c5ada149537..8b9a62941de 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,6 @@
 # Template file for 'xfce4-diskperf-plugin'
-pkgname=xfce4-diskperf-plugin
-version=2.6.2
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
 
 post_install() {
 	vlicense COPYING

From 2209f9747a0c8381e820f843359b2982f4ca894c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:48:40 +0100
Subject: [PATCH 62/64] xfce4-taskmanager: update to 1.4.0.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 1594aa22336..c8e3ea4b130 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.2.3
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4
+checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43

From 647c36759a9bdbfb54dfb7682f1105bbbb2fdb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:05:47 +0700
Subject: [PATCH 63/64] xfce4-verve-plugin: update to 2.0.1.

---
 srcpkgs/xfce4-verve-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 601043610f3..fe00e5a0bea 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2
+checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825

From 61dcf5a6ed0e1b2172e31d40830a80a2657ca690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 64/64] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (17 preceding siblings ...)
  2020-12-31  2:13 ` [PR PATCH] [Updated] " sgn
@ 2020-12-31  2:35 ` q66
  2020-12-31  2:43 ` [PR PATCH] [Updated] " sgn
                   ` (74 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-31  2:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752821647

Comment:
as I said, we still need to patch the file, so that when people build things on their system without xbps-src it still builds correctly

it's a bug and still needs to be fixed either way

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (18 preceding siblings ...)
  2020-12-31  2:35 ` q66
@ 2020-12-31  2:43 ` sgn
  2020-12-31  2:55 ` sgn
                   ` (73 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  2:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 66138 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/65] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From be800875f86d81687a35e70a75d3c926ec93172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/65] 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 23e6535832716401d2d5b5d49b02fa0e129fdeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/65] 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 368cf8afb8d770bad1e1ff6ba64dc2d7b604179e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/65] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 69d5078bc5006d7121b8f74d1f35e466310ea004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/65] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 1949b5ffdf673df3051eaf5db63d6c313976bd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/65] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From b586ef08049e68f45f1ea19a404dda29fe06d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/65] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 901fe6f4786eaf2eb64caa3ac9bfaf842c6a61a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/65] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From b3889fa7f583cc154ec6add07f99995f8697549b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/65] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8639a942dd75e2bd151abbb3a37c0370b5db9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/65] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From be19e10f06d3ee14bc1ab63684089d048b7a4fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/65] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 62f5a5215acf5e9ada730649a7cc169452538589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/65] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 5428a15fe3f66005e0054c5e985edd7faf0aba5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/65] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From a36c662c47c733655d1032c8e9159720d032ae58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/65] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 2f9f95ff704416c54531da043d866b3b5966a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/65] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 3466eba76cbdc0068640a89f7dbb71a2215a0217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/65] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From f2a8c6714fdeb8838910b1b385e9e89adbbf63a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/65] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 2177b8ff481819b5a801b2317fe635e5a174f592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/65] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 8a629d23eb67dcf44267c4a16ebf3031c316cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/65] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From bbf48589690df4db0d5f55826b7df0da216f3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/65] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From 82c6882d0685943b2a3f8cf7abd49ec9e5f52da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/65] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From c5338fae35bc0869b6f8c924fbb3ac343885e2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/65] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From 524da49364d2b4c49ec5d457ceea56c4acaa3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/65] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 38a1033888eba5a85014aeaf06e00163ae39c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/65] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From d719850a63b4b908c044d4d7f8fc99f86d79dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/65] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 39d51762df92298ff0c72256506c09cdbb9852af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/65] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 3c54ec26fe6bb3a43101dd90325ed412806ca157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/65] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From d851eb84645dc6ff1c03e7c2ef40e36e0c4eac61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/65] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 41336c9ae052daf4825c199063649733bdcb2674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/65] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 37b3423d6754f01c99013ac73bf3db30aa81b433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/65] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 368f20655d18750096ab32325bd580ec42fd2549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/65] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc1b38183261aee6796f47c03c610f443fd20e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/65] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 2aa156b263fb6df33941047d5b293653525f2240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/65] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From f8b47b085aa276d4915a72f2826d1705b4b5ff34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/65] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From b8c0ee70214dc80352b0223c0043c7720a77fba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/65] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 44af0e8fe707f40c34ee0bf916ff92b920555b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/65] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 0fa505e437d50bb5fbf9af9593d4764d5b206ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/65] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 7d6d05a1e2b925750d4121cfddfad255e767473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/65] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8669e5935f9e895191cf2e4a6b3e955a2aaa4683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/65] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bfbf936e821d49104e6b6cc53fc034c47783f343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/65] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From 0612f242a5711649a94c2b2fba5bda0eb14ffcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/65] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 3c6444e4bb88cac5ef97f313457aa582979f2176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/65] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 61f7c728daa8b9f0eba2cf2cb1809e6d16e96c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/65] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 9972d43bd4f15ca8ba0afbadf4c7a147e2a754c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/65] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 45183f057e33b5dda5fd953fe3ef715040948d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/65] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 6351261875ef23a31c6823ec19f7e1d05359d4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/65] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 3b417c95851e35ed8aec31a85cecfd1cfab1caa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/65] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From 96402f56c3ba15d5a64235834b568212e8557fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/65] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..e404de06828 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_patch() {
+	vsed -i -e '/^DATADIRNAME =/s,=.*,= share,' po/Makefile.in.in
+}

From fe52abed2c357bd2971085718950b98873dc66d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/65] ario: fix l10n dir

---
 srcpkgs/ario/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..ea29441ab22 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,12 +10,13 @@ makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	vsed -i '/DATADIRNAME =/s,=.*/= share' po/Makefile.in.in
 }

From 1e5339070cbaedf1abff30a226c869159b586bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/65] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..ca48dd7137d 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e '/localedir =/s,=.*,= /usr/share/locale,' po/Makefile.in.in
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 289ef1b667ed82c7e83eccc787db995e447df075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/65] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From c074613e75ad5994be9c6e9864741645bee919d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/65] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From b4f4c5d89e303cbe0a09124afe94aedd1b5dfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/65] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 702a5d0b6d256cf7b1f604de39a350d01d20af4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/65] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 71dea3e2e6d3a45b3ff5e126597ce3504b938623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/65] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From eec3caff51ddf2cfb523c85e9635136e8241db2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/65] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 1be92144a1402e85511fe2d9e563bccc3e01fce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/65] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..a42b8ab50ce 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"

From 72b64490bba68388e30daf8ba8ad6736a3dbb661 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/65] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From 78fd82b202781655ea26b272e616b59ff305d90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 59/65] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From 64579d42c38e7a04c3ce19dff03f4da5e0c9a62f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:56:43 +0100
Subject: [PATCH 60/65] xfce4-sensors-plugin: update to 1.3.95.

---
 srcpkgs/xfce4-sensors-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 8ee54701882..2ad44227da8 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.92
-revision=3
+version=1.3.95
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
 
 CFLAGS="-fcommon"
 

From 64f4971814ecf0b3e5be22a67f36024c19d70161 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:54:08 +0100
Subject: [PATCH 61/65] xfce4-diskperf-plugin: update to 2.6.3.

---
 srcpkgs/xfce4-diskperf-plugin/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index c5ada149537..8b9a62941de 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,6 @@
 # Template file for 'xfce4-diskperf-plugin'
-pkgname=xfce4-diskperf-plugin
-version=2.6.2
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
 
 post_install() {
 	vlicense COPYING

From 2209f9747a0c8381e820f843359b2982f4ca894c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:48:40 +0100
Subject: [PATCH 62/65] xfce4-taskmanager: update to 1.4.0.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 1594aa22336..c8e3ea4b130 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.2.3
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4
+checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43

From 647c36759a9bdbfb54dfb7682f1105bbbb2fdb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:05:47 +0700
Subject: [PATCH 63/65] xfce4-verve-plugin: update to 2.0.1.

---
 srcpkgs/xfce4-verve-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 601043610f3..fe00e5a0bea 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2
+checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825

From 61dcf5a6ed0e1b2172e31d40830a80a2657ca690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 64/65] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 0d5d423750f5a4727f3afe3bb56d4258920ca3d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:43:14 +0700
Subject: [PATCH 65/65] xfce4-systemload-plugin: update to 1.2.4.

---
 srcpkgs/xfce4-systemload-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index 45a06a6f34b..269ef5374d7 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
-version=1.2.3
-revision=3
+version=1.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775
+checksum=0531b8df923cba3be8d064cb8b638b954df74915e5a447228999517847789835
 
 post_install() {
 	vlicense COPYING

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (19 preceding siblings ...)
  2020-12-31  2:43 ` [PR PATCH] [Updated] " sgn
@ 2020-12-31  2:55 ` sgn
  2020-12-31  3:37 ` sgn
                   ` (72 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  2:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 70093 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/68] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From be800875f86d81687a35e70a75d3c926ec93172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/68] 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 23e6535832716401d2d5b5d49b02fa0e129fdeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/68] 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 368cf8afb8d770bad1e1ff6ba64dc2d7b604179e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/68] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 69d5078bc5006d7121b8f74d1f35e466310ea004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/68] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 1949b5ffdf673df3051eaf5db63d6c313976bd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/68] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From b586ef08049e68f45f1ea19a404dda29fe06d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/68] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 901fe6f4786eaf2eb64caa3ac9bfaf842c6a61a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/68] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From b3889fa7f583cc154ec6add07f99995f8697549b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/68] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8639a942dd75e2bd151abbb3a37c0370b5db9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/68] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From be19e10f06d3ee14bc1ab63684089d048b7a4fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/68] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 62f5a5215acf5e9ada730649a7cc169452538589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/68] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 5428a15fe3f66005e0054c5e985edd7faf0aba5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/68] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From a36c662c47c733655d1032c8e9159720d032ae58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/68] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 2f9f95ff704416c54531da043d866b3b5966a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/68] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 3466eba76cbdc0068640a89f7dbb71a2215a0217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/68] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From f2a8c6714fdeb8838910b1b385e9e89adbbf63a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/68] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 2177b8ff481819b5a801b2317fe635e5a174f592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/68] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 8a629d23eb67dcf44267c4a16ebf3031c316cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/68] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From bbf48589690df4db0d5f55826b7df0da216f3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/68] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From 82c6882d0685943b2a3f8cf7abd49ec9e5f52da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/68] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From c5338fae35bc0869b6f8c924fbb3ac343885e2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/68] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From 524da49364d2b4c49ec5d457ceea56c4acaa3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/68] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 38a1033888eba5a85014aeaf06e00163ae39c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/68] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From d719850a63b4b908c044d4d7f8fc99f86d79dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/68] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 39d51762df92298ff0c72256506c09cdbb9852af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/68] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 3c54ec26fe6bb3a43101dd90325ed412806ca157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/68] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From d851eb84645dc6ff1c03e7c2ef40e36e0c4eac61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/68] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 41336c9ae052daf4825c199063649733bdcb2674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/68] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 37b3423d6754f01c99013ac73bf3db30aa81b433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/68] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 368f20655d18750096ab32325bd580ec42fd2549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/68] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc1b38183261aee6796f47c03c610f443fd20e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/68] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 2aa156b263fb6df33941047d5b293653525f2240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/68] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From f8b47b085aa276d4915a72f2826d1705b4b5ff34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/68] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From b8c0ee70214dc80352b0223c0043c7720a77fba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/68] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 44af0e8fe707f40c34ee0bf916ff92b920555b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/68] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 0fa505e437d50bb5fbf9af9593d4764d5b206ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/68] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 7d6d05a1e2b925750d4121cfddfad255e767473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/68] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8669e5935f9e895191cf2e4a6b3e955a2aaa4683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/68] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bfbf936e821d49104e6b6cc53fc034c47783f343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/68] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From 0612f242a5711649a94c2b2fba5bda0eb14ffcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/68] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 3c6444e4bb88cac5ef97f313457aa582979f2176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/68] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 61f7c728daa8b9f0eba2cf2cb1809e6d16e96c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/68] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 9972d43bd4f15ca8ba0afbadf4c7a147e2a754c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/68] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 45183f057e33b5dda5fd953fe3ef715040948d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/68] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 6351261875ef23a31c6823ec19f7e1d05359d4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/68] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 3b417c95851e35ed8aec31a85cecfd1cfab1caa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/68] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From 96402f56c3ba15d5a64235834b568212e8557fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/68] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..e404de06828 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_patch() {
+	vsed -i -e '/^DATADIRNAME =/s,=.*,= share,' po/Makefile.in.in
+}

From fe52abed2c357bd2971085718950b98873dc66d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/68] ario: fix l10n dir

---
 srcpkgs/ario/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..ea29441ab22 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,12 +10,13 @@ makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	vsed -i '/DATADIRNAME =/s,=.*/= share' po/Makefile.in.in
 }

From 1e5339070cbaedf1abff30a226c869159b586bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/68] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..ca48dd7137d 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e '/localedir =/s,=.*,= /usr/share/locale,' po/Makefile.in.in
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 289ef1b667ed82c7e83eccc787db995e447df075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/68] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From c074613e75ad5994be9c6e9864741645bee919d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/68] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From b4f4c5d89e303cbe0a09124afe94aedd1b5dfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/68] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 702a5d0b6d256cf7b1f604de39a350d01d20af4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/68] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 71dea3e2e6d3a45b3ff5e126597ce3504b938623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/68] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From eec3caff51ddf2cfb523c85e9635136e8241db2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/68] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 1be92144a1402e85511fe2d9e563bccc3e01fce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/68] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..a42b8ab50ce 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"

From 72b64490bba68388e30daf8ba8ad6736a3dbb661 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/68] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From 78fd82b202781655ea26b272e616b59ff305d90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 59/68] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From 64579d42c38e7a04c3ce19dff03f4da5e0c9a62f Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:56:43 +0100
Subject: [PATCH 60/68] xfce4-sensors-plugin: update to 1.3.95.

---
 srcpkgs/xfce4-sensors-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 8ee54701882..2ad44227da8 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.92
-revision=3
+version=1.3.95
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
 
 CFLAGS="-fcommon"
 

From 64f4971814ecf0b3e5be22a67f36024c19d70161 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:54:08 +0100
Subject: [PATCH 61/68] xfce4-diskperf-plugin: update to 2.6.3.

---
 srcpkgs/xfce4-diskperf-plugin/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index c5ada149537..8b9a62941de 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,6 @@
 # Template file for 'xfce4-diskperf-plugin'
-pkgname=xfce4-diskperf-plugin
-version=2.6.2
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
 
 post_install() {
 	vlicense COPYING

From 2209f9747a0c8381e820f843359b2982f4ca894c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:48:40 +0100
Subject: [PATCH 62/68] xfce4-taskmanager: update to 1.4.0.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 1594aa22336..c8e3ea4b130 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.2.3
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4
+checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43

From 647c36759a9bdbfb54dfb7682f1105bbbb2fdb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:05:47 +0700
Subject: [PATCH 63/68] xfce4-verve-plugin: update to 2.0.1.

---
 srcpkgs/xfce4-verve-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 601043610f3..fe00e5a0bea 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2
+checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825

From 61dcf5a6ed0e1b2172e31d40830a80a2657ca690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 64/68] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 0d5d423750f5a4727f3afe3bb56d4258920ca3d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:43:14 +0700
Subject: [PATCH 65/68] xfce4-systemload-plugin: update to 1.2.4.

---
 srcpkgs/xfce4-systemload-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index 45a06a6f34b..269ef5374d7 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
-version=1.2.3
-revision=3
+version=1.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775
+checksum=0531b8df923cba3be8d064cb8b638b954df74915e5a447228999517847789835
 
 post_install() {
 	vlicense COPYING

From e73a4417c73afa9d72c92d8639a88f790e666840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:48:50 +0700
Subject: [PATCH 66/68] xfce4-genmon-plugin: update to 4.1.0.

---
 srcpkgs/xfce4-genmon-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 2beacdee729..096fbddb09b 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
-version=4.0.2
-revision=3
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa
+checksum=d1256b4b47545c7bdb16842b21eaf3ac167be443e8f2f1093cf4209e65c84e7d

From c1c9c075e868265ed43a240cc3442f857bbbfead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:24 +0700
Subject: [PATCH 67/68] xfce4-cpugraph-plugin: update to 1.2.0.

---
 srcpkgs/xfce4-cpugraph-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 7c755c97872..929d5573b45 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
-version=1.1.0
-revision=3
+version=1.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3ece0a24e55827e0d9b6314129906da60513acdc1748d9dece9f50526e906ba4
+checksum=7866dddbbe0557a9bfe603934e9ce82df968fe36e21533d05ee71704e6602da7
 
 post_install() {
 	vlicense COPYING

From d0a6dfc6c7e1cdbd01fdd743db9073d6d854d3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:56 +0700
Subject: [PATCH 68/68] xfce4-fsguard-plugin: update to 1.1.2.

---
 srcpkgs/xfce4-fsguard-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index dba4083f4be..89cbc3e12db 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
-version=1.1.1
-revision=3
+version=1.1.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
 	vlicense COPYING

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (20 preceding siblings ...)
  2020-12-31  2:55 ` sgn
@ 2020-12-31  3:37 ` sgn
  2020-12-31 11:49 ` sgn
                   ` (71 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31  3:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 70092 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/68] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From be800875f86d81687a35e70a75d3c926ec93172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/68] 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 23e6535832716401d2d5b5d49b02fa0e129fdeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/68] 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 368cf8afb8d770bad1e1ff6ba64dc2d7b604179e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/68] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 69d5078bc5006d7121b8f74d1f35e466310ea004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/68] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 1949b5ffdf673df3051eaf5db63d6c313976bd92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/68] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From b586ef08049e68f45f1ea19a404dda29fe06d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/68] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 901fe6f4786eaf2eb64caa3ac9bfaf842c6a61a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/68] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From b3889fa7f583cc154ec6add07f99995f8697549b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/68] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8639a942dd75e2bd151abbb3a37c0370b5db9665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/68] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From be19e10f06d3ee14bc1ab63684089d048b7a4fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/68] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 62f5a5215acf5e9ada730649a7cc169452538589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/68] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 5428a15fe3f66005e0054c5e985edd7faf0aba5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/68] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From a36c662c47c733655d1032c8e9159720d032ae58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/68] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 2f9f95ff704416c54531da043d866b3b5966a5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/68] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From 3466eba76cbdc0068640a89f7dbb71a2215a0217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/68] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From f2a8c6714fdeb8838910b1b385e9e89adbbf63a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/68] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 2177b8ff481819b5a801b2317fe635e5a174f592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/68] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 8a629d23eb67dcf44267c4a16ebf3031c316cc78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/68] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From bbf48589690df4db0d5f55826b7df0da216f3887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/68] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From 82c6882d0685943b2a3f8cf7abd49ec9e5f52da0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/68] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From c5338fae35bc0869b6f8c924fbb3ac343885e2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/68] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From 524da49364d2b4c49ec5d457ceea56c4acaa3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/68] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From 38a1033888eba5a85014aeaf06e00163ae39c7d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/68] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From d719850a63b4b908c044d4d7f8fc99f86d79dfe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/68] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 39d51762df92298ff0c72256506c09cdbb9852af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/68] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 3c54ec26fe6bb3a43101dd90325ed412806ca157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/68] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From d851eb84645dc6ff1c03e7c2ef40e36e0c4eac61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/68] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 41336c9ae052daf4825c199063649733bdcb2674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/68] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 37b3423d6754f01c99013ac73bf3db30aa81b433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/68] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 368f20655d18750096ab32325bd580ec42fd2549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/68] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc1b38183261aee6796f47c03c610f443fd20e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/68] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 2aa156b263fb6df33941047d5b293653525f2240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/68] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From f8b47b085aa276d4915a72f2826d1705b4b5ff34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/68] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From b8c0ee70214dc80352b0223c0043c7720a77fba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/68] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 44af0e8fe707f40c34ee0bf916ff92b920555b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/68] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 0fa505e437d50bb5fbf9af9593d4764d5b206ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/68] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From 7d6d05a1e2b925750d4121cfddfad255e767473e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/68] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From 8669e5935f9e895191cf2e4a6b3e955a2aaa4683 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/68] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From bfbf936e821d49104e6b6cc53fc034c47783f343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/68] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From 0612f242a5711649a94c2b2fba5bda0eb14ffcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/68] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 3c6444e4bb88cac5ef97f313457aa582979f2176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/68] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 61f7c728daa8b9f0eba2cf2cb1809e6d16e96c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/68] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 9972d43bd4f15ca8ba0afbadf4c7a147e2a754c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/68] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 45183f057e33b5dda5fd953fe3ef715040948d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/68] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 6351261875ef23a31c6823ec19f7e1d05359d4a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/68] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 3b417c95851e35ed8aec31a85cecfd1cfab1caa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/68] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From 96402f56c3ba15d5a64235834b568212e8557fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/68] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..e404de06828 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,17 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+post_patch() {
+	vsed -i -e '/^DATADIRNAME =/s,=.*,= share,' po/Makefile.in.in
+}

From fe52abed2c357bd2971085718950b98873dc66d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/68] ario: fix l10n dir

---
 srcpkgs/ario/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..ea29441ab22 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,7 +1,7 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,12 +10,13 @@ makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	vsed -i '/DATADIRNAME =/s,=.*/= share' po/Makefile.in.in
 }

From 1e5339070cbaedf1abff30a226c869159b586bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/68] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..ca48dd7137d 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e '/localedir =/s,=.*,= /usr/share/locale,' po/Makefile.in.in
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 289ef1b667ed82c7e83eccc787db995e447df075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/68] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From c074613e75ad5994be9c6e9864741645bee919d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/68] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From b4f4c5d89e303cbe0a09124afe94aedd1b5dfa17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/68] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 702a5d0b6d256cf7b1f604de39a350d01d20af4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/68] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 71dea3e2e6d3a45b3ff5e126597ce3504b938623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/68] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From eec3caff51ddf2cfb523c85e9635136e8241db2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/68] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 1be92144a1402e85511fe2d9e563bccc3e01fce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/68] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..a42b8ab50ce 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"

From 72b64490bba68388e30daf8ba8ad6736a3dbb661 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/68] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From 774f9e152dda683df9a650f3666155ccfc618f21 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:56:43 +0100
Subject: [PATCH 59/68] xfce4-sensors-plugin: update to 1.3.95.

---
 srcpkgs/xfce4-sensors-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 8ee54701882..2ad44227da8 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.92
-revision=3
+version=1.3.95
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
 
 CFLAGS="-fcommon"
 

From 077dd060bc4225714f69fd841078598beac1b2f0 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:54:08 +0100
Subject: [PATCH 60/68] xfce4-diskperf-plugin: update to 2.6.3.

---
 srcpkgs/xfce4-diskperf-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index c5ada149537..d57de65ca80 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
-version=2.6.2
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
 
 post_install() {
 	vlicense COPYING

From c28d5f1ee2239e4aa0e116a50ef441beb99b173d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:48:40 +0100
Subject: [PATCH 61/68] xfce4-taskmanager: update to 1.4.0.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 1594aa22336..c8e3ea4b130 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.2.3
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4
+checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43

From 0ab36553f854c6ac127398b5f545eab46520def8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:05:47 +0700
Subject: [PATCH 62/68] xfce4-verve-plugin: update to 2.0.1.

---
 srcpkgs/xfce4-verve-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 601043610f3..fe00e5a0bea 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2
+checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825

From 83d0adb2de66a92fe40abc9b8178bb76200b7293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 63/68] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 33c9eb84dcba3f36fa7040434328cd1029298e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:43:14 +0700
Subject: [PATCH 64/68] xfce4-systemload-plugin: update to 1.2.4.

---
 srcpkgs/xfce4-systemload-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index 45a06a6f34b..269ef5374d7 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
-version=1.2.3
-revision=3
+version=1.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775
+checksum=0531b8df923cba3be8d064cb8b638b954df74915e5a447228999517847789835
 
 post_install() {
 	vlicense COPYING

From f8038f3eb3284049a3622f71f6772c9a9646030e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:48:50 +0700
Subject: [PATCH 65/68] xfce4-genmon-plugin: update to 4.1.0.

---
 srcpkgs/xfce4-genmon-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 2beacdee729..096fbddb09b 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
-version=4.0.2
-revision=3
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa
+checksum=d1256b4b47545c7bdb16842b21eaf3ac167be443e8f2f1093cf4209e65c84e7d

From 964f41098d57af76c9f2c73696a297edd217f7a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:24 +0700
Subject: [PATCH 66/68] xfce4-cpugraph-plugin: update to 1.2.0.

---
 srcpkgs/xfce4-cpugraph-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 7c755c97872..929d5573b45 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
-version=1.1.0
-revision=3
+version=1.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3ece0a24e55827e0d9b6314129906da60513acdc1748d9dece9f50526e906ba4
+checksum=7866dddbbe0557a9bfe603934e9ce82df968fe36e21533d05ee71704e6602da7
 
 post_install() {
 	vlicense COPYING

From d1ffbf7addf5f06c4f63b68d24855da00510c5ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:56 +0700
Subject: [PATCH 67/68] xfce4-fsguard-plugin: update to 1.1.2.

---
 srcpkgs/xfce4-fsguard-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index dba4083f4be..89cbc3e12db 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
-version=1.1.1
-revision=3
+version=1.1.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
 	vlicense COPYING

From 94b6892ea05dd6513a703fd751689e0cfe437a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 68/68] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (21 preceding siblings ...)
  2020-12-31  3:37 ` sgn
@ 2020-12-31 11:49 ` sgn
  2020-12-31 12:49 ` sgn
                   ` (70 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31 11:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 71427 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/68] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From b5a894c02b2d3c5db86d8e5b4d804545bdd7c83c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/68] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 0c6789e0c8e69fe813c713585696d85d98daf2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/68] 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 8b393114964160373dd7c04e5b5bca03f5c4e9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/68] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From cff6efb11be55eb7e2a2bc31505ed3f3a731cfce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/68] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From bac1c041b5513489ad052bf43a02e935fe6d89f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/68] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From 61a315e178b6ef91bff3f42ebc68a9820de42d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/68] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 0b4e2e057eedae7e4842ac5ef918a92f7d378df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/68] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 9cba2e8224eab743f15860680d1c6a0192985c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/68] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8355f5da699c9e0d5a1c8cf7fc027b2ad14f810e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/68] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From 33288bac4f787065d835569559f87f59799675d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/68] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 37797c4d3aea181ecaebeaf5e2f7fa8c4edf1fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/68] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 0a45b14d262ada750df865a1c6c65052d03ac3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/68] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From bbc612427f5abb1adcb58d8a4e7c1c600e3e60e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/68] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 0f776f9ee4a212e80997f142c08b988ba54198b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/68] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From a3b31dff3d38ef1e3e529800f78580b9c3e3c360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/68] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From 810d042851f82220967c6131fcce012bcf54d053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/68] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 0793b4cfa1727cb9080b8e4edc3345bc37fdda77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/68] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 9c594e977cd5f0dd4cb449f2d794984d2dfbf968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/68] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From a41f73b98bd0157846b5c982f254d8083f48c6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/68] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From f61c11c2552d54c320db96812f75b00de5d97134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/68] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From f8c857ebd2c009b65b8663e9be0f54a7e0157037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/68] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From e033657fe27ad8027f82cb9ac1e2e239703ff0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/68] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From ac6acf1c9063a511011f09f7e54032b16f7f3498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/68] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From 57360c892b6fbae686e89cbe026df8063102fbc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/68] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From d073ffe104e00c4251a5c9b79a99deaa97c71990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/68] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 490813f2f733aff0f8cc6d968a6e702bf80fdf3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/68] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From a37d9b86683d8c14b5c3770f8a320f81ea6f3c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/68] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 2fe90ad28c6b9c1faeaa35cbf64e8a32449faf11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/68] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 2efd9bf3c7448dd32e8fca9fd2e2191b6e3a560d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/68] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From d609fa5d5d06e482da41e1a9727e31fe51e7176f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/68] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc18d6edb6f55b2d8af5635f62c9fd92ccb6242c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/68] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 856b714d821f09a7f90cdf429233253270b09a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/68] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From 94bb9d7e4596ba843f862fad651dc6e3fe633091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/68] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From 15c98dc364638b8d43baccf6cb62f74ddbdcbfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/68] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From df4f421707001ce62c647f8bb5d63bf9079f2511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/68] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 3c8aaa2107c957b329fc432c53689feaf2ccd276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/68] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From ec696cc1d081161cc390d985afb011b91319fdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/68] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From ca901ef49f0420e46f6ef7b54e64d6290ffcd1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/68] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From d3edd7c2894edeaf5383739b83c2397e0cd82e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/68] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From afdc74d78ef5252f53cbb5af7305118618eb2d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/68] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 2ad3ac25c00b2ec7be31cdc8fcb990541d8528b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/68] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 19876c869a21ea861ab1986d1defd54bf7c35ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/68] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 2e123e5aa4a01b85fb2b1bd278f1bc9cb2d2d5af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/68] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 99f0461817b3b6900548c88b075fdc88b5a53426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/68] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 62ec6e1c7424a861e90c6250cd4d76e6f961a6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/68] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From f5ffeefa3db5fea7bce69a662d708d64bbd692c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/68] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From e9813badb38fec75202e5e04a4dfc8dd6e9301cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/68] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 5ab56153c53ed35032e62134f2f7fce46531500d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/68] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From 12a73407de5ed24e7c3b63a0819a52df7ea9bbaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/68] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..1767068e722 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,11 +1,12 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
-hostmakedepends="pkg-config intltool cdrtools itstool"
+hostmakedepends="pkg-config intltool cdrtools itstool glib-devel
+ gettext-devel automake libtool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
  libburn-devel libSM-devel dconf-devel"
@@ -21,6 +22,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+pre_configure() {
+	autoreconf -fi
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 7c7dc1d7339b0cad85719116c7c6a8da55a39d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/68] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From 6c1962f90844872080b65c0c65acb2a88b1b7401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/68] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From ab3b8d98c6f22699aceeb07df454df751a1fc3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/68] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 2349594fdcf1eb89bccebec078105e8f744fbfae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/68] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 522380437fceebf05575983e821299a75bda0447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/68] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From dafeeb48f3fef3065fe0c317c30361eefa669a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/68] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 13541fdd807ad56db427523bf69b82ed103af924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/68] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From d26ef19f26bc5736c39b8816f36b2420233eb4ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/68] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From ca6bb6e8861b2f584bb239174fb648a29f9999ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:56:43 +0100
Subject: [PATCH 59/68] xfce4-sensors-plugin: update to 1.3.95.

---
 srcpkgs/xfce4-sensors-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 8ee54701882..2ad44227da8 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.92
-revision=3
+version=1.3.95
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
 
 CFLAGS="-fcommon"
 

From 30fe00a6cfe5f6d6ff704f6544209dd4c3e70c40 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:54:08 +0100
Subject: [PATCH 60/68] xfce4-diskperf-plugin: update to 2.6.3.

---
 srcpkgs/xfce4-diskperf-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index c5ada149537..d57de65ca80 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
-version=2.6.2
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
 
 post_install() {
 	vlicense COPYING

From 1c57fe0bb5114aa1061e911037d5248869b4fc3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:48:40 +0100
Subject: [PATCH 61/68] xfce4-taskmanager: update to 1.4.0.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 1594aa22336..c8e3ea4b130 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.2.3
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4
+checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43

From e34b307aa0ad9f8a61b742b20947f5bee0f532a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:05:47 +0700
Subject: [PATCH 62/68] xfce4-verve-plugin: update to 2.0.1.

---
 srcpkgs/xfce4-verve-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 601043610f3..fe00e5a0bea 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2
+checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825

From 89474dbaa3f453cec193b0172b1d8b3d7b6aa0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 63/68] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From a4e264ced72a835f4bcf44e59cfe22d4d36cf0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:43:14 +0700
Subject: [PATCH 64/68] xfce4-systemload-plugin: update to 1.2.4.

---
 srcpkgs/xfce4-systemload-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index 45a06a6f34b..269ef5374d7 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
-version=1.2.3
-revision=3
+version=1.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775
+checksum=0531b8df923cba3be8d064cb8b638b954df74915e5a447228999517847789835
 
 post_install() {
 	vlicense COPYING

From e6a6aa372c9e23f696c0c742d16392cd324d944e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:48:50 +0700
Subject: [PATCH 65/68] xfce4-genmon-plugin: update to 4.1.0.

---
 srcpkgs/xfce4-genmon-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 2beacdee729..096fbddb09b 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
-version=4.0.2
-revision=3
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa
+checksum=d1256b4b47545c7bdb16842b21eaf3ac167be443e8f2f1093cf4209e65c84e7d

From d86b18774c0ad06e9a9c4e8a27b076247a02819b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:24 +0700
Subject: [PATCH 66/68] xfce4-cpugraph-plugin: update to 1.2.0.

---
 srcpkgs/xfce4-cpugraph-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 7c755c97872..929d5573b45 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
-version=1.1.0
-revision=3
+version=1.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3ece0a24e55827e0d9b6314129906da60513acdc1748d9dece9f50526e906ba4
+checksum=7866dddbbe0557a9bfe603934e9ce82df968fe36e21533d05ee71704e6602da7
 
 post_install() {
 	vlicense COPYING

From 07e346b5b5345f35341a74a614372d3d85895351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:56 +0700
Subject: [PATCH 67/68] xfce4-fsguard-plugin: update to 1.1.2.

---
 srcpkgs/xfce4-fsguard-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index dba4083f4be..89cbc3e12db 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
-version=1.1.1
-revision=3
+version=1.1.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
 	vlicense COPYING

From 86ae3846058df39ccd4c0a72ade58f85c753eb3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 68/68] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (22 preceding siblings ...)
  2020-12-31 11:49 ` sgn
@ 2020-12-31 12:49 ` sgn
  2020-12-31 13:23 ` q66
                   ` (69 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31 12:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 72224 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/69] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From b5a894c02b2d3c5db86d8e5b4d804545bdd7c83c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/69] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 0c6789e0c8e69fe813c713585696d85d98daf2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/69] 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 8b393114964160373dd7c04e5b5bca03f5c4e9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/69] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From cff6efb11be55eb7e2a2bc31505ed3f3a731cfce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/69] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From bac1c041b5513489ad052bf43a02e935fe6d89f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/69] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From 61a315e178b6ef91bff3f42ebc68a9820de42d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/69] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 0b4e2e057eedae7e4842ac5ef918a92f7d378df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/69] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 9cba2e8224eab743f15860680d1c6a0192985c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/69] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8355f5da699c9e0d5a1c8cf7fc027b2ad14f810e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/69] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From 33288bac4f787065d835569559f87f59799675d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/69] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 37797c4d3aea181ecaebeaf5e2f7fa8c4edf1fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/69] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 0a45b14d262ada750df865a1c6c65052d03ac3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/69] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From bbc612427f5abb1adcb58d8a4e7c1c600e3e60e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/69] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 0f776f9ee4a212e80997f142c08b988ba54198b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/69] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From a3b31dff3d38ef1e3e529800f78580b9c3e3c360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/69] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From 810d042851f82220967c6131fcce012bcf54d053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/69] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 0793b4cfa1727cb9080b8e4edc3345bc37fdda77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/69] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 9c594e977cd5f0dd4cb449f2d794984d2dfbf968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/69] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From a41f73b98bd0157846b5c982f254d8083f48c6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/69] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From f61c11c2552d54c320db96812f75b00de5d97134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/69] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From f8c857ebd2c009b65b8663e9be0f54a7e0157037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/69] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From e033657fe27ad8027f82cb9ac1e2e239703ff0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/69] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From ac6acf1c9063a511011f09f7e54032b16f7f3498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/69] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From 57360c892b6fbae686e89cbe026df8063102fbc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/69] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From d073ffe104e00c4251a5c9b79a99deaa97c71990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/69] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 490813f2f733aff0f8cc6d968a6e702bf80fdf3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/69] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From a37d9b86683d8c14b5c3770f8a320f81ea6f3c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/69] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 2fe90ad28c6b9c1faeaa35cbf64e8a32449faf11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/69] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 2efd9bf3c7448dd32e8fca9fd2e2191b6e3a560d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/69] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From d609fa5d5d06e482da41e1a9727e31fe51e7176f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/69] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc18d6edb6f55b2d8af5635f62c9fd92ccb6242c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/69] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 856b714d821f09a7f90cdf429233253270b09a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/69] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From 94bb9d7e4596ba843f862fad651dc6e3fe633091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/69] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From 15c98dc364638b8d43baccf6cb62f74ddbdcbfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/69] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From df4f421707001ce62c647f8bb5d63bf9079f2511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/69] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 3c8aaa2107c957b329fc432c53689feaf2ccd276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/69] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From ec696cc1d081161cc390d985afb011b91319fdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/69] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From ca901ef49f0420e46f6ef7b54e64d6290ffcd1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/69] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From d3edd7c2894edeaf5383739b83c2397e0cd82e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/69] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From afdc74d78ef5252f53cbb5af7305118618eb2d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/69] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 2ad3ac25c00b2ec7be31cdc8fcb990541d8528b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/69] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 19876c869a21ea861ab1986d1defd54bf7c35ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/69] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 2e123e5aa4a01b85fb2b1bd278f1bc9cb2d2d5af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/69] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 99f0461817b3b6900548c88b075fdc88b5a53426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/69] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 62ec6e1c7424a861e90c6250cd4d76e6f961a6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/69] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From f5ffeefa3db5fea7bce69a662d708d64bbd692c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/69] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From e9813badb38fec75202e5e04a4dfc8dd6e9301cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/69] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 5ab56153c53ed35032e62134f2f7fce46531500d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/69] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From 12a73407de5ed24e7c3b63a0819a52df7ea9bbaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/69] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..1767068e722 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,11 +1,12 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
-hostmakedepends="pkg-config intltool cdrtools itstool"
+hostmakedepends="pkg-config intltool cdrtools itstool glib-devel
+ gettext-devel automake libtool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
  libburn-devel libSM-devel dconf-devel"
@@ -21,6 +22,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+pre_configure() {
+	autoreconf -fi
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 7c7dc1d7339b0cad85719116c7c6a8da55a39d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/69] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From 6c1962f90844872080b65c0c65acb2a88b1b7401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/69] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From ab3b8d98c6f22699aceeb07df454df751a1fc3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/69] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 2349594fdcf1eb89bccebec078105e8f744fbfae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/69] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 522380437fceebf05575983e821299a75bda0447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/69] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From dafeeb48f3fef3065fe0c317c30361eefa669a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/69] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 13541fdd807ad56db427523bf69b82ed103af924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/69] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From d26ef19f26bc5736c39b8816f36b2420233eb4ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/69] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From ca6bb6e8861b2f584bb239174fb648a29f9999ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:56:43 +0100
Subject: [PATCH 59/69] xfce4-sensors-plugin: update to 1.3.95.

---
 srcpkgs/xfce4-sensors-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 8ee54701882..2ad44227da8 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.92
-revision=3
+version=1.3.95
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
 
 CFLAGS="-fcommon"
 

From 30fe00a6cfe5f6d6ff704f6544209dd4c3e70c40 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:54:08 +0100
Subject: [PATCH 60/69] xfce4-diskperf-plugin: update to 2.6.3.

---
 srcpkgs/xfce4-diskperf-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index c5ada149537..d57de65ca80 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
-version=2.6.2
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
 
 post_install() {
 	vlicense COPYING

From 1c57fe0bb5114aa1061e911037d5248869b4fc3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:48:40 +0100
Subject: [PATCH 61/69] xfce4-taskmanager: update to 1.4.0.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 1594aa22336..c8e3ea4b130 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.2.3
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4
+checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43

From e34b307aa0ad9f8a61b742b20947f5bee0f532a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:05:47 +0700
Subject: [PATCH 62/69] xfce4-verve-plugin: update to 2.0.1.

---
 srcpkgs/xfce4-verve-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 601043610f3..fe00e5a0bea 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2
+checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825

From 89474dbaa3f453cec193b0172b1d8b3d7b6aa0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 63/69] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From a4e264ced72a835f4bcf44e59cfe22d4d36cf0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:43:14 +0700
Subject: [PATCH 64/69] xfce4-systemload-plugin: update to 1.2.4.

---
 srcpkgs/xfce4-systemload-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index 45a06a6f34b..269ef5374d7 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
-version=1.2.3
-revision=3
+version=1.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775
+checksum=0531b8df923cba3be8d064cb8b638b954df74915e5a447228999517847789835
 
 post_install() {
 	vlicense COPYING

From e6a6aa372c9e23f696c0c742d16392cd324d944e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:48:50 +0700
Subject: [PATCH 65/69] xfce4-genmon-plugin: update to 4.1.0.

---
 srcpkgs/xfce4-genmon-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 2beacdee729..096fbddb09b 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
-version=4.0.2
-revision=3
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa
+checksum=d1256b4b47545c7bdb16842b21eaf3ac167be443e8f2f1093cf4209e65c84e7d

From d86b18774c0ad06e9a9c4e8a27b076247a02819b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:24 +0700
Subject: [PATCH 66/69] xfce4-cpugraph-plugin: update to 1.2.0.

---
 srcpkgs/xfce4-cpugraph-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 7c755c97872..929d5573b45 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
-version=1.1.0
-revision=3
+version=1.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3ece0a24e55827e0d9b6314129906da60513acdc1748d9dece9f50526e906ba4
+checksum=7866dddbbe0557a9bfe603934e9ce82df968fe36e21533d05ee71704e6602da7
 
 post_install() {
 	vlicense COPYING

From 07e346b5b5345f35341a74a614372d3d85895351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:56 +0700
Subject: [PATCH 67/69] xfce4-fsguard-plugin: update to 1.1.2.

---
 srcpkgs/xfce4-fsguard-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index dba4083f4be..89cbc3e12db 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
-version=1.1.1
-revision=3
+version=1.1.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
 	vlicense COPYING

From 86ae3846058df39ccd4c0a72ade58f85c753eb3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 68/69] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From a99ddf849b199680ed8f1264c431c246d9c750e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 19:49:38 +0700
Subject: [PATCH 69/69] fixup! parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 16e4ced0249..b0f37057052 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -13,6 +13,8 @@ homepage="http://parcellite.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/parcellite/${version}/parcellite-${version}.tar.gz"
 checksum=aba1c7c56c7607e219ce9855723eefa552c5376982891aefbfb5a2d3297ef046
 
+export LIBS=-lgio-2.0
+
 pre_configure() {
 	autoreconf -fi
 }

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (23 preceding siblings ...)
  2020-12-31 12:49 ` sgn
@ 2020-12-31 13:23 ` q66
  2020-12-31 13:46 ` [PR PATCH] [Updated] " sgn
                   ` (68 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-31 13:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 460 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752957537

Comment:
also, I don't really like dumping everything into one big PR

things that are uncontroversial and not blocked on anything can be pushed separately (this applies to the xfce templates needing --with-locales-dir), I have some potential objections to how the m4 files are modified, but I need to look deeper into that first 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (24 preceding siblings ...)
  2020-12-31 13:23 ` q66
@ 2020-12-31 13:46 ` sgn
  2020-12-31 13:54 ` sgn
                   ` (67 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31 13:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 74127 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/71] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From b5a894c02b2d3c5db86d8e5b4d804545bdd7c83c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/71] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 0c6789e0c8e69fe813c713585696d85d98daf2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/71] 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 8b393114964160373dd7c04e5b5bca03f5c4e9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/71] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From cff6efb11be55eb7e2a2bc31505ed3f3a731cfce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/71] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From bac1c041b5513489ad052bf43a02e935fe6d89f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/71] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From 61a315e178b6ef91bff3f42ebc68a9820de42d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/71] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 0b4e2e057eedae7e4842ac5ef918a92f7d378df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/71] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 9cba2e8224eab743f15860680d1c6a0192985c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/71] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8355f5da699c9e0d5a1c8cf7fc027b2ad14f810e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/71] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From 33288bac4f787065d835569559f87f59799675d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/71] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 37797c4d3aea181ecaebeaf5e2f7fa8c4edf1fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/71] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 0a45b14d262ada750df865a1c6c65052d03ac3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/71] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From bbc612427f5abb1adcb58d8a4e7c1c600e3e60e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/71] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 0f776f9ee4a212e80997f142c08b988ba54198b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/71] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From a3b31dff3d38ef1e3e529800f78580b9c3e3c360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/71] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From 810d042851f82220967c6131fcce012bcf54d053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/71] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 0793b4cfa1727cb9080b8e4edc3345bc37fdda77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/71] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 9c594e977cd5f0dd4cb449f2d794984d2dfbf968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/71] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From a41f73b98bd0157846b5c982f254d8083f48c6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/71] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From f61c11c2552d54c320db96812f75b00de5d97134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/71] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From f8c857ebd2c009b65b8663e9be0f54a7e0157037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/71] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From e033657fe27ad8027f82cb9ac1e2e239703ff0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/71] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From ac6acf1c9063a511011f09f7e54032b16f7f3498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/71] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From 57360c892b6fbae686e89cbe026df8063102fbc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/71] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From d073ffe104e00c4251a5c9b79a99deaa97c71990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/71] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 490813f2f733aff0f8cc6d968a6e702bf80fdf3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/71] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From a37d9b86683d8c14b5c3770f8a320f81ea6f3c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/71] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 2fe90ad28c6b9c1faeaa35cbf64e8a32449faf11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/71] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 2efd9bf3c7448dd32e8fca9fd2e2191b6e3a560d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/71] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From d609fa5d5d06e482da41e1a9727e31fe51e7176f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/71] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc18d6edb6f55b2d8af5635f62c9fd92ccb6242c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/71] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 856b714d821f09a7f90cdf429233253270b09a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/71] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From 94bb9d7e4596ba843f862fad651dc6e3fe633091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/71] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From 15c98dc364638b8d43baccf6cb62f74ddbdcbfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/71] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From df4f421707001ce62c647f8bb5d63bf9079f2511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/71] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 3c8aaa2107c957b329fc432c53689feaf2ccd276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/71] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From ec696cc1d081161cc390d985afb011b91319fdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/71] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From ca901ef49f0420e46f6ef7b54e64d6290ffcd1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/71] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From d3edd7c2894edeaf5383739b83c2397e0cd82e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/71] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From afdc74d78ef5252f53cbb5af7305118618eb2d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/71] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 2ad3ac25c00b2ec7be31cdc8fcb990541d8528b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/71] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 19876c869a21ea861ab1986d1defd54bf7c35ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/71] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 2e123e5aa4a01b85fb2b1bd278f1bc9cb2d2d5af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/71] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 99f0461817b3b6900548c88b075fdc88b5a53426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/71] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 62ec6e1c7424a861e90c6250cd4d76e6f961a6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/71] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From f5ffeefa3db5fea7bce69a662d708d64bbd692c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/71] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From e9813badb38fec75202e5e04a4dfc8dd6e9301cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/71] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 5ab56153c53ed35032e62134f2f7fce46531500d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/71] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From 12a73407de5ed24e7c3b63a0819a52df7ea9bbaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/71] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..1767068e722 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,11 +1,12 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
-hostmakedepends="pkg-config intltool cdrtools itstool"
+hostmakedepends="pkg-config intltool cdrtools itstool glib-devel
+ gettext-devel automake libtool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
  libburn-devel libSM-devel dconf-devel"
@@ -21,6 +22,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+pre_configure() {
+	autoreconf -fi
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 7c7dc1d7339b0cad85719116c7c6a8da55a39d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/71] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From 6c1962f90844872080b65c0c65acb2a88b1b7401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/71] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From ab3b8d98c6f22699aceeb07df454df751a1fc3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/71] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 2349594fdcf1eb89bccebec078105e8f744fbfae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/71] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 522380437fceebf05575983e821299a75bda0447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/71] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From dafeeb48f3fef3065fe0c317c30361eefa669a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/71] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 13541fdd807ad56db427523bf69b82ed103af924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/71] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From d26ef19f26bc5736c39b8816f36b2420233eb4ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/71] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From ca6bb6e8861b2f584bb239174fb648a29f9999ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:56:43 +0100
Subject: [PATCH 59/71] xfce4-sensors-plugin: update to 1.3.95.

---
 srcpkgs/xfce4-sensors-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 8ee54701882..2ad44227da8 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.92
-revision=3
+version=1.3.95
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
 
 CFLAGS="-fcommon"
 

From 30fe00a6cfe5f6d6ff704f6544209dd4c3e70c40 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:54:08 +0100
Subject: [PATCH 60/71] xfce4-diskperf-plugin: update to 2.6.3.

---
 srcpkgs/xfce4-diskperf-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index c5ada149537..d57de65ca80 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
-version=2.6.2
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
 
 post_install() {
 	vlicense COPYING

From 1c57fe0bb5114aa1061e911037d5248869b4fc3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:48:40 +0100
Subject: [PATCH 61/71] xfce4-taskmanager: update to 1.4.0.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 1594aa22336..c8e3ea4b130 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.2.3
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4
+checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43

From e34b307aa0ad9f8a61b742b20947f5bee0f532a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:05:47 +0700
Subject: [PATCH 62/71] xfce4-verve-plugin: update to 2.0.1.

---
 srcpkgs/xfce4-verve-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 601043610f3..fe00e5a0bea 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2
+checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825

From 89474dbaa3f453cec193b0172b1d8b3d7b6aa0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 63/71] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From a4e264ced72a835f4bcf44e59cfe22d4d36cf0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:43:14 +0700
Subject: [PATCH 64/71] xfce4-systemload-plugin: update to 1.2.4.

---
 srcpkgs/xfce4-systemload-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index 45a06a6f34b..269ef5374d7 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
-version=1.2.3
-revision=3
+version=1.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775
+checksum=0531b8df923cba3be8d064cb8b638b954df74915e5a447228999517847789835
 
 post_install() {
 	vlicense COPYING

From e6a6aa372c9e23f696c0c742d16392cd324d944e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:48:50 +0700
Subject: [PATCH 65/71] xfce4-genmon-plugin: update to 4.1.0.

---
 srcpkgs/xfce4-genmon-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 2beacdee729..096fbddb09b 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
-version=4.0.2
-revision=3
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa
+checksum=d1256b4b47545c7bdb16842b21eaf3ac167be443e8f2f1093cf4209e65c84e7d

From d86b18774c0ad06e9a9c4e8a27b076247a02819b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:24 +0700
Subject: [PATCH 66/71] xfce4-cpugraph-plugin: update to 1.2.0.

---
 srcpkgs/xfce4-cpugraph-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 7c755c97872..929d5573b45 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
-version=1.1.0
-revision=3
+version=1.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3ece0a24e55827e0d9b6314129906da60513acdc1748d9dece9f50526e906ba4
+checksum=7866dddbbe0557a9bfe603934e9ce82df968fe36e21533d05ee71704e6602da7
 
 post_install() {
 	vlicense COPYING

From 07e346b5b5345f35341a74a614372d3d85895351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:56 +0700
Subject: [PATCH 67/71] xfce4-fsguard-plugin: update to 1.1.2.

---
 srcpkgs/xfce4-fsguard-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index dba4083f4be..89cbc3e12db 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
-version=1.1.1
-revision=3
+version=1.1.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
 	vlicense COPYING

From 86ae3846058df39ccd4c0a72ade58f85c753eb3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 68/71] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From a99ddf849b199680ed8f1264c431c246d9c750e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 19:49:38 +0700
Subject: [PATCH 69/71] fixup! parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 16e4ced0249..b0f37057052 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -13,6 +13,8 @@ homepage="http://parcellite.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/parcellite/${version}/parcellite-${version}.tar.gz"
 checksum=aba1c7c56c7607e219ce9855723eefa552c5376982891aefbfb5a2d3297ef046
 
+export LIBS=-lgio-2.0
+
 pre_configure() {
 	autoreconf -fi
 }

From 7395e90cf91ced85e613cf6e1e48c4ae54acbc37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 19:58:18 +0700
Subject: [PATCH 70/71] fixup! GConf: fix l10n dir

---
 srcpkgs/GConf/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index f3bcb7c3a65..467336b0f49 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -14,11 +14,10 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 267517483f02b5d8fce6fe13b1b5c992cf65b87e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 20:45:48 +0700
Subject: [PATCH 71/71] fixup! orage: fix l10n dir

---
 srcpkgs/orage/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index b04274d3773..fa79744cd36 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -14,3 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/apps/orage/${version%.*}/orage-$version.tar.bz2"
 checksum=3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062
+
+post_patch() {
+	vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (25 preceding siblings ...)
  2020-12-31 13:46 ` [PR PATCH] [Updated] " sgn
@ 2020-12-31 13:54 ` sgn
  2020-12-31 13:56 ` sgn
                   ` (66 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31 13:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 75459 bytes --]

From 7995dd422217a55df06da3d5b21dbbfd95cd2c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/72] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From b5a894c02b2d3c5db86d8e5b4d804545bdd7c83c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/72] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 0c6789e0c8e69fe813c713585696d85d98daf2b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/72] 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 8b393114964160373dd7c04e5b5bca03f5c4e9df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 04/72] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From cff6efb11be55eb7e2a2bc31505ed3f3a731cfce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:01 +0700
Subject: [PATCH 05/72] exo: fix l10n location

---
 srcpkgs/exo/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index c093120917c..52ba265d7f1 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,9 +1,9 @@
 # Template file for 'exo'
 pkgname=exo
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="gtk+-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From bac1c041b5513489ad052bf43a02e935fe6d89f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 06/72] parole: fix l10n location

---
 srcpkgs/parole/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/parole/template b/srcpkgs/parole/template
index 09f64dc8434..4df335ffc4d 100644
--- a/srcpkgs/parole/template
+++ b/srcpkgs/parole/template
@@ -1,8 +1,9 @@
 # Template file for 'parole'
 pkgname=parole
 version=4.15.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gst-plugins-base1-devel libnotify-devel taglib-devel libxfce4ui-devel"
 depends="hicolor-icon-theme gst-libav gst-plugins-good1

From 61a315e178b6ef91bff3f42ebc68a9820de42d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:44:02 +0700
Subject: [PATCH 07/72] garcon: fix l10n location

---
 srcpkgs/garcon/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index dca4a2b994f..327595a2f22 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,10 +1,11 @@
 # 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)"
+configure_args="--disable-static --with-locales-dir=/usr/share/locale
+ --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
 makedepends="libglib-devel libxfce4ui-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"

From 0b4e2e057eedae7e4842ac5ef918a92f7d378df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:58:45 +0700
Subject: [PATCH 08/72] mousepad: fix l10n dir

---
 srcpkgs/mousepad/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template
index 0f66a126d23..b774f2e7743 100644
--- a/srcpkgs/mousepad/template
+++ b/srcpkgs/mousepad/template
@@ -1,8 +1,9 @@
 # Template file for 'mousepad'
 pkgname=mousepad
 version=0.5.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool pkg-config"
 makedepends="gtksourceview-devel xfconf-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From 9cba2e8224eab743f15860680d1c6a0192985c44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:31 +0700
Subject: [PATCH 09/72] thunar-archive-plugin: fix l10n dir

---
 srcpkgs/thunar-archive-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/thunar-archive-plugin/template b/srcpkgs/thunar-archive-plugin/template
index 90610a5458b..906e2e956e4 100644
--- a/srcpkgs/thunar-archive-plugin/template
+++ b/srcpkgs/thunar-archive-plugin/template
@@ -1,10 +1,11 @@
 # Template file for 'thunar-archive-plugin'
 pkgname=thunar-archive-plugin
 version=0.4.0
-revision=1
+revision=2
 build_style=gnu-configure
-makedepends="Thunar-devel exo-devel"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config xfce4-dev-tools"
+makedepends="Thunar-devel exo-devel"
 short_desc="Create and extract archives in Thunar"
 maintainer="LockeAnarchist <emanuel@openmailbox.org>"
 license="GPL-2.0-or-later"

From 8355f5da699c9e0d5a1c8cf7fc027b2ad14f810e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 10/72] thunar-media-tags-plugin: fix l10n dir

---
 srcpkgs/thunar-media-tags-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-media-tags-plugin/template b/srcpkgs/thunar-media-tags-plugin/template
index 66f129031b2..b76107f472c 100644
--- a/srcpkgs/thunar-media-tags-plugin/template
+++ b/srcpkgs/thunar-media-tags-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-media-tags-plugin'
 pkgname=thunar-media-tags-plugin
 version=0.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="Thunar-devel exo-devel gtk+-devel taglib-devel"
 short_desc="Adds special features for media files to the Thunar File Manager"

From 33288bac4f787065d835569559f87f59799675d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 06:59:32 +0700
Subject: [PATCH 11/72] thunar-volman: fix l10n dir

---
 srcpkgs/thunar-volman/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 7f5e6af6505..1af74dea709 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,8 +1,9 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 37797c4d3aea181ecaebeaf5e2f7fa8c4edf1fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 12/72] tumbler: fix l10n dir

---
 srcpkgs/tumbler/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 8379815e02d..fe37a85871a 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,9 +1,9 @@
 # Template file for 'tumbler'
 pkgname=tumbler
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-gstreamer-thumbnailer"
+configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
 hostmakedepends="intltool pkg-config glib-devel"
 makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
  poppler-glib-devel"

From 0a45b14d262ada750df865a1c6c65052d03ac3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:01:42 +0700
Subject: [PATCH 13/72] xfce4-appfinder: fix l10n dir

---
 srcpkgs/xfce4-appfinder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index ff291e9080d..c15ca8b10a7 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From bbc612427f5abb1adcb58d8a4e7c1c600e3e60e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 14/72] xfce4-battery-plugin: fix l10n dir

---
 srcpkgs/xfce4-battery-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index 053abe5a7a1..cb06f004f21 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"

From 0f776f9ee4a212e80997f142c08b988ba54198b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:04 +0700
Subject: [PATCH 15/72] xfce4-clipman-plugin: fix l10n dir

---
 srcpkgs/xfce4-clipman-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 3f6743665f6..8cd63e07ceb 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"

From a3b31dff3d38ef1e3e529800f78580b9c3e3c360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 16/72] xfce4-cpufreq-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpufreq-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 79b11c41e2b..7d44f4ee244 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
 version=1.2.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"

From 810d042851f82220967c6131fcce012bcf54d053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 17/72] xfce4-cpugraph-plugin: fix l10n dir

---
 srcpkgs/xfce4-cpugraph-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 3ece809d5ab..7c755c97872 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.1.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"

From 0793b4cfa1727cb9080b8e4edc3345bc37fdda77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 18/72] xfce4-dict: fix l10n dir

---
 srcpkgs/xfce4-dict/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template
index fdaeac5d340..b2b02cd3424 100644
--- a/srcpkgs/xfce4-dict/template
+++ b/srcpkgs/xfce4-dict/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-dict'
 pkgname=xfce4-dict
 version=0.8.4
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Dictionary plugin for the Xfce panel"

From 9c594e977cd5f0dd4cb449f2d794984d2dfbf968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:05 +0700
Subject: [PATCH 19/72] xfce4-diskperf-plugin: fix l10n dir

---
 srcpkgs/xfce4-diskperf-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index 8081d616c37..c5ada149537 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.6.2
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"

From a41f73b98bd0157846b5c982f254d8083f48c6db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 20/72] xfce4-fsguard-plugin: fix l10n dir

---
 srcpkgs/xfce4-fsguard-plugin/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 60feab6e6ec..dba4083f4be 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,13 +1,18 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
-license="GPL-2"
+license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+
+post_install() {
+	vlicense COPYING
+}

From f61c11c2552d54c320db96812f75b00de5d97134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 21/72] xfce4-genmon-plugin: fix l10n dir

---
 srcpkgs/xfce4-genmon-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 00e8f521f9e..2beacdee729 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,13 +1,14 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
 version=4.0.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
-license="LGPL-2.1"
+license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa

From f8c857ebd2c009b65b8663e9be0f54a7e0157037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 22/72] xfce4-mailwatch-plugin: fix l10n dir

---
 srcpkgs/xfce4-mailwatch-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index 303441f19bf..d5067cd4ab1 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
  xfce4-panel-devel gnutls-devel libgcrypt-devel"

From e033657fe27ad8027f82cb9ac1e2e239703ff0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:06 +0700
Subject: [PATCH 23/72] xfce4-mpc-plugin: fix l10n dir

---
 srcpkgs/xfce4-mpc-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 05b9e282c5e..388fcf6eda0 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"

From ac6acf1c9063a511011f09f7e54032b16f7f3498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 24/72] xfce4-netload-plugin: fix l10n dir

---
 srcpkgs/xfce4-netload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index 6cb3967727b..6bc9cfb3aff 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.3.2
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A netload plugin for the Xfce panel"
+short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"

From 57360c892b6fbae686e89cbe026df8063102fbc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 25/72] xfce4-notifyd: fix l10n dir

---
 srcpkgs/xfce4-notifyd/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template
index 265ee451316..75138eec557 100644
--- a/srcpkgs/xfce4-notifyd/template
+++ b/srcpkgs/xfce4-notifyd/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-notifyd'
 pkgname=xfce4-notifyd
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-dbus-start-daemon"
+configure_args="--with-locales-dir=/usr/share/locale --enable-dbus-start-daemon"
 hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel"
 makedepends="libnotify-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From d073ffe104e00c4251a5c9b79a99deaa97c71990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 26/72] xfce4-panel: fix l10n dir

---
 srcpkgs/xfce4-panel/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 459d9b7300b..f96808ecb10 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,10 +1,11 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static --enable-gio-unix --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-static --enable-gio-unix --enable-gtk3"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel"
 short_desc="Next generation panel for the XFCE desktop environment"

From 490813f2f733aff0f8cc6d968a6e702bf80fdf3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 27/72] xfce4-places-plugin: fix l10n dir

---
 srcpkgs/xfce4-places-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 41ca9afa44f..59eb5f820e8 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"

From a37d9b86683d8c14b5c3770f8a320f81ea6f3c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:07 +0700
Subject: [PATCH 28/72] xfce4-power-manager: fix l10n dir

---
 srcpkgs/xfce4-power-manager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index f501ddb3d52..edc9a58e27b 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From 2fe90ad28c6b9c1faeaa35cbf64e8a32449faf11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 29/72] xfce4-pulseaudio-plugin: fix l10n dir

---
 srcpkgs/xfce4-pulseaudio-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index bd00b6a5d40..d4d594f0069 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
 makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel"
 depends="pavucontrol"

From 2efd9bf3c7448dd32e8fca9fd2e2191b6e3a560d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 30/72] xfce4-screenshooter: fix l10n dir

---
 srcpkgs/xfce4-screenshooter/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template
index 1024364c79b..aeccc8e9ae3 100644
--- a/srcpkgs/xfce4-screenshooter/template
+++ b/srcpkgs/xfce4-screenshooter/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-screenshooter'
 pkgname=xfce4-screenshooter
 version=1.9.8
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From d609fa5d5d06e482da41e1a9727e31fe51e7176f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 31/72] xfce4-sensors-plugin: fix l10n dir

---
 srcpkgs/xfce4-sensors-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 392432f83c3..8ee54701882 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.3.92
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libsensors-devel xfce4-panel-devel libnotify-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From cc18d6edb6f55b2d8af5635f62c9fd92ccb6242c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:08 +0700
Subject: [PATCH 32/72] xfce4-session: fix l10n dir

---
 srcpkgs/xfce4-session/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index 56b109ce92f..2c2bcb45dd3 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --enable-polkit"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
 makedepends="libxfce4ui-devel upower-devel
  libwnck-devel xfce4-panel-devel libSM-devel polkit-devel"

From 856b714d821f09a7f90cdf429233253270b09a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 33/72] xfce4-settings: fix l10n dir

---
 srcpkgs/xfce4-settings/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 49f78370413..90b07210e85 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,9 +1,10 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel
  libxklavier-devel upower-devel libXrandr-devel"

From 94bb9d7e4596ba843f862fad651dc6e3fe633091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 34/72] xfce4-systemload-plugin: fix l10n dir

---
 srcpkgs/xfce4-systemload-plugin/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index c19a75e226f..45a06a6f34b 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,11 +1,12 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
 version=1.2.3
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
-short_desc="A system load plugin for the Xfce4 panel"
+short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"

From 15c98dc364638b8d43baccf6cb62f74ddbdcbfb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 35/72] xfce4-taskmanager: fix l10n dir

---
 srcpkgs/xfce4-taskmanager/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index e7e8d46ddef..1594aa22336 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
 version=1.2.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel libwnck2-devel libXmu-devel gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"

From df4f421707001ce62c647f8bb5d63bf9079f2511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:09 +0700
Subject: [PATCH 36/72] xfce4-terminal: fix l10n dir

---
 srcpkgs/xfce4-terminal/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template
index 69bba2dd26b..475efb6ae6e 100644
--- a/srcpkgs/xfce4-terminal/template
+++ b/srcpkgs/xfce4-terminal/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-terminal'
 pkgname=xfce4-terminal
 version=0.8.10
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="exo-devel vte3-devel"
 depends="desktop-file-utils hicolor-icon-theme gsettings-desktop-schemas"

From 3c8aaa2107c957b329fc432c53689feaf2ccd276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 37/72] xfce4-time-out-plugin: fix l10n dir

---
 srcpkgs/xfce4-time-out-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index b7d58414a02..2a7e7089ab2 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-time-out-plugin'
 pkgname=xfce4-time-out-plugin
 version=1.1.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"

From ec696cc1d081161cc390d985afb011b91319fdd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 38/72] xfce4-timer-plugin: fix l10n dir

---
 srcpkgs/xfce4-timer-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index c7c9aea1941..3b2240a87ed 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"

From ca901ef49f0420e46f6ef7b54e64d6290ffcd1fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 39/72] xfce4-verve-plugin: fix l10n dir

---
 srcpkgs/xfce4-verve-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 0ee22148eb0..601043610f3 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
 version=2.0.0
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"

From d3edd7c2894edeaf5383739b83c2397e0cd82e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 40/72] xfce4-wavelan-plugin: fix l10n dir

---
 srcpkgs/xfce4-wavelan-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 287ca5b3620..68b7d78ce45 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-wavelan-plugin'
 pkgname=xfce4-wavelan-plugin
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"

From afdc74d78ef5252f53cbb5af7305118618eb2d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:10 +0700
Subject: [PATCH 41/72] xfce4-weather-plugin: fix l10n dir

---
 srcpkgs/xfce4-weather-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index 84e5ba9bc6a..cdc60bc529a 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.10.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup-devel upower-devel"
 depends="hicolor-icon-theme"

From 2ad3ac25c00b2ec7be31cdc8fcb990541d8528b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 42/72] xfce4-xkb-plugin: fix l10n dir

---
 srcpkgs/xfce4-xkb-plugin/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index eee39e63402..c4ce16b6ec0 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libwnck-devel"
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"

From 19876c869a21ea861ab1986d1defd54bf7c35ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 43/72] xfconf: fix l10n dir

---
 srcpkgs/xfconf/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 2c712efd3e2..3d4200c56a8 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,10 +1,10 @@
 # Template file for 'xfconf'
 pkgname=xfconf
 version=4.16.0
-revision=1
+revision=2
 build_helper=gir
 build_style=gnu-configure
-configure_args="--enable-gsettings-backend"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
 hostmakedepends="pkg-config intltool glib-devel vala-devel"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"

From 2e123e5aa4a01b85fb2b1bd278f1bc9cb2d2d5af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 44/72] xfdesktop: fix l10n dir

---
 srcpkgs/xfdesktop/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index ed5ac9cb623..8a818793d2f 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,8 +1,9 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool glib-devel Thunar-devel"
 makedepends="libxfce4ui-devel exo-devel garcon-devel
  libnotify-devel libwnck-devel"

From 99f0461817b3b6900548c88b075fdc88b5a53426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:02:11 +0700
Subject: [PATCH 45/72] xfwm4: fix l10n dir

---
 srcpkgs/xfwm4/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 646176a089c..2a3352d3c64 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,8 +1,9 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libxfce4ui-devel startup-notification-devel
  libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel

From 62ec6e1c7424a861e90c6250cd4d76e6f961a6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:08 +0700
Subject: [PATCH 46/72] xfburn: fix l10n dir

---
 srcpkgs/xfburn/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template
index 7272e46d352..cb9497f4e5b 100644
--- a/srcpkgs/xfburn/template
+++ b/srcpkgs/xfburn/template
@@ -1,9 +1,9 @@
 # Template file for 'xfburn'
 pkgname=xfburn
 version=0.6.2
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-gstreamer"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gstreamer"
 hostmakedepends="intltool pkg-config"
 makedepends="libburn-devel libisofs-devel exo-devel libxfce4ui-devel gst-plugins-base1-devel"
 depends="desktop-file-utils hicolor-icon-theme"

From f5ffeefa3db5fea7bce69a662d708d64bbd692c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:14:52 +0700
Subject: [PATCH 47/72] orage: fix l10n dir

---
 srcpkgs/orage/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 9d9cc53ca4a..b04274d3773 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,8 +1,9 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.12.1
-revision=6
+revision=7
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool flex"
 makedepends="libical-devel libnotify-devel gtk+3-devel
  popt-devel libxfce4util-devel gtk+-devel"

From e9813badb38fec75202e5e04a4dfc8dd6e9301cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 48/72] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 5ab56153c53ed35032e62134f2f7fce46531500d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 49/72] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From 12a73407de5ed24e7c3b63a0819a52df7ea9bbaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 50/72] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..1767068e722 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,11 +1,12 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
-hostmakedepends="pkg-config intltool cdrtools itstool"
+hostmakedepends="pkg-config intltool cdrtools itstool glib-devel
+ gettext-devel automake libtool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
  libburn-devel libSM-devel dconf-devel"
@@ -21,6 +22,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+pre_configure() {
+	autoreconf -fi
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 7c7dc1d7339b0cad85719116c7c6a8da55a39d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 51/72] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..f3bcb7c3a65 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service

From 6c1962f90844872080b65c0c65acb2a88b1b7401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 52/72] libxfce4ui: fix l10n dir

---
 srcpkgs/libxfce4ui/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 371bf1d0d32..27f88504e56 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,10 +1,10 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
 hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel"
 makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel

From ab3b8d98c6f22699aceeb07df454df751a1fc3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:16 +0700
Subject: [PATCH 53/72] libxfce4util: fix l10n dir

---
 srcpkgs/libxfce4util/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index 7be46403522..d7063292062 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,9 +1,10 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
 version=4.16.0
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper="gir"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"

From 2349594fdcf1eb89bccebec078105e8f744fbfae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:55:50 +0700
Subject: [PATCH 54/72] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 66b417cca77..16e4ced0249 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 522380437fceebf05575983e821299a75bda0447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 55/72] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From dafeeb48f3fef3065fe0c317c30361eefa669a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 56/72] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 13541fdd807ad56db427523bf69b82ed103af924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 57/72] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From d26ef19f26bc5736c39b8816f36b2420233eb4ca Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:59:52 +0100
Subject: [PATCH 58/72] xfce4-xkb-plugin: update to 0.8.2.

---
 srcpkgs/xfce4-xkb-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index c4ce16b6ec0..2498a8ab3f6 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
-version=0.8.1
-revision=4
+version=0.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=c19ecf126201deb6148741c521124771ad396adc874471512ab5ffe1946567a1
+checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {
 	vlicense COPYING

From ca6bb6e8861b2f584bb239174fb648a29f9999ba Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:56:43 +0100
Subject: [PATCH 59/72] xfce4-sensors-plugin: update to 1.3.95.

---
 srcpkgs/xfce4-sensors-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 8ee54701882..2ad44227da8 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.3.92
-revision=3
+version=1.3.95
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112
+checksum=83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c
 
 CFLAGS="-fcommon"
 

From 30fe00a6cfe5f6d6ff704f6544209dd4c3e70c40 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:54:08 +0100
Subject: [PATCH 60/72] xfce4-diskperf-plugin: update to 2.6.3.

---
 srcpkgs/xfce4-diskperf-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index c5ada149537..d57de65ca80 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
-version=2.6.2
-revision=4
+version=2.6.3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=fd2e9843da5822de96a7829e50ba496c34a50fb8492d5b5f792558c6b7ce9644
+checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59
 
 post_install() {
 	vlicense COPYING

From 1c57fe0bb5114aa1061e911037d5248869b4fc3e Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Wed, 30 Dec 2020 02:48:40 +0100
Subject: [PATCH 61/72] xfce4-taskmanager: update to 1.4.0.

---
 srcpkgs/xfce4-taskmanager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-taskmanager/template b/srcpkgs/xfce4-taskmanager/template
index 1594aa22336..c8e3ea4b130 100644
--- a/srcpkgs/xfce4-taskmanager/template
+++ b/srcpkgs/xfce4-taskmanager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-taskmanager'
 pkgname=xfce4-taskmanager
-version=1.2.3
-revision=2
+version=1.4.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-taskmanager"
 distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=dcfc44da7c1f61d03e2c4bd1cdc8f92ce0d48b013bd0d140b3745d79b75dc3c4
+checksum=655684ddfc15fc09071f78f9fce5439d20bbd2d80ecfc5ba0a08fb38313e7d43

From e34b307aa0ad9f8a61b742b20947f5bee0f532a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:05:47 +0700
Subject: [PATCH 62/72] xfce4-verve-plugin: update to 2.0.1.

---
 srcpkgs/xfce4-verve-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index 601043610f3..fe00e5a0bea 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-verve-plugin'
 pkgname=xfce4-verve-plugin
-version=2.0.0
-revision=3
+version=2.0.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=9e6510ba6c48fcfc60d1c6ab14613dd7b6ff095cabbf4746f82bf788d8ab4cd2
+checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825

From 89474dbaa3f453cec193b0172b1d8b3d7b6aa0e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 63/72] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From a4e264ced72a835f4bcf44e59cfe22d4d36cf0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:43:14 +0700
Subject: [PATCH 64/72] xfce4-systemload-plugin: update to 1.2.4.

---
 srcpkgs/xfce4-systemload-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index 45a06a6f34b..269ef5374d7 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
-version=1.2.3
-revision=3
+version=1.2.4
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=052407c575203da4de2db6f4a5e997220d95ec655d393dc3875a0d5a20520775
+checksum=0531b8df923cba3be8d064cb8b638b954df74915e5a447228999517847789835
 
 post_install() {
 	vlicense COPYING

From e6a6aa372c9e23f696c0c742d16392cd324d944e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:48:50 +0700
Subject: [PATCH 65/72] xfce4-genmon-plugin: update to 4.1.0.

---
 srcpkgs/xfce4-genmon-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index 2beacdee729..096fbddb09b 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-genmon-plugin'
 pkgname=xfce4-genmon-plugin
-version=4.0.2
-revision=3
+version=4.1.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -11,4 +11,4 @@ maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=256c22526f61aabf43b91b903b976c13e56198657667df443cdb06b31fbf23aa
+checksum=d1256b4b47545c7bdb16842b21eaf3ac167be443e8f2f1093cf4209e65c84e7d

From d86b18774c0ad06e9a9c4e8a27b076247a02819b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:24 +0700
Subject: [PATCH 66/72] xfce4-cpugraph-plugin: update to 1.2.0.

---
 srcpkgs/xfce4-cpugraph-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index 7c755c97872..929d5573b45 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
-version=1.1.0
-revision=3
+version=1.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=3ece0a24e55827e0d9b6314129906da60513acdc1748d9dece9f50526e906ba4
+checksum=7866dddbbe0557a9bfe603934e9ce82df968fe36e21533d05ee71704e6602da7
 
 post_install() {
 	vlicense COPYING

From 07e346b5b5345f35341a74a614372d3d85895351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:49:56 +0700
Subject: [PATCH 67/72] xfce4-fsguard-plugin: update to 1.1.2.

---
 srcpkgs/xfce4-fsguard-plugin/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index dba4083f4be..89cbc3e12db 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
-version=1.1.1
-revision=3
+version=1.1.2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
 distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d6d05d0a90a68453d65cdceec5ca7eeaef864393ab62eef532a7ba58f374d516
+checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
 	vlicense COPYING

From 86ae3846058df39ccd4c0a72ade58f85c753eb3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 68/72] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From a99ddf849b199680ed8f1264c431c246d9c750e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 19:49:38 +0700
Subject: [PATCH 69/72] fixup! parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index 16e4ced0249..b0f37057052 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -13,6 +13,8 @@ homepage="http://parcellite.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/parcellite/${version}/parcellite-${version}.tar.gz"
 checksum=aba1c7c56c7607e219ce9855723eefa552c5376982891aefbfb5a2d3297ef046
 
+export LIBS=-lgio-2.0
+
 pre_configure() {
 	autoreconf -fi
 }

From 7395e90cf91ced85e613cf6e1e48c4ae54acbc37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 19:58:18 +0700
Subject: [PATCH 70/72] fixup! GConf: fix l10n dir

---
 srcpkgs/GConf/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index f3bcb7c3a65..467336b0f49 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -14,11 +14,10 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 267517483f02b5d8fce6fe13b1b5c992cf65b87e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 20:45:48 +0700
Subject: [PATCH 71/72] fixup! orage: fix l10n dir

---
 srcpkgs/orage/template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index b04274d3773..fa79744cd36 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -14,3 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/apps/orage/${version%.*}/orage-$version.tar.bz2"
 checksum=3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062
+
+post_patch() {
+	vsed -i 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From af13fc00c4c0a023e4f9d23096e23c8ab84bb1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 20:53:54 +0700
Subject: [PATCH 72/72] fixup! brasero: fix l10n dir

---
 srcpkgs/brasero/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index 1767068e722..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -5,8 +5,7 @@ revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
-hostmakedepends="pkg-config intltool cdrtools itstool glib-devel
- gettext-devel automake libtool"
+hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
  libburn-devel libSM-devel dconf-devel"
@@ -22,8 +21,10 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
-pre_configure() {
-	autoreconf -fi
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
 }
 
 brasero-devel_package() {

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (26 preceding siblings ...)
  2020-12-31 13:54 ` sgn
@ 2020-12-31 13:56 ` sgn
  2020-12-31 15:10 ` [PR PATCH] [Updated] " sgn
                   ` (65 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31 13:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752964491

Comment:
I'll push xfce4 stuff out, now.

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (27 preceding siblings ...)
  2020-12-31 13:56 ` sgn
@ 2020-12-31 15:10 ` sgn
  2020-12-31 15:12 ` sgn
                   ` (64 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31 15:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 16278 bytes --]

From 1cc0f7ab4903054a377140842a00ddfb57e524a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 01/13] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From fb7eac394b733b4ce1c7fdd753aa6ef9eb112b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 02/13] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From d8f13b0d820c2df8e0d38991f978628f55db13e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 03/13] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 c1504944c1a6b3af278d617cc31ad016ed5c9f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 04/13] 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 ded5f0d803863a49950fcb59a2f5facad2a82e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 05/13] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 12d3dce3027fadc667be9056b6a25e5743f3fa09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 06/13] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 71e50a97ef0a0a5b2794cd3bce755fb0498651a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 07/13] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From 85a274b7f0da6a8c46ba09ce401907e387e1f8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 08/13] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 70df54a6830a7301e979509b43bfba8b870ec7c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 09/13] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..bcf803c3ae3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From b4659b3c27586475dc9e296be60c001be8618449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 10/13] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From 09e2cbccf07f45214d266ecf69a2f7a149099f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 11/13] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From af80407abe239c823538123f21739cfd4606cb2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 12/13] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From cea680b55691794459cddba5f35ec281ce172e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 13/13] GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (28 preceding siblings ...)
  2020-12-31 15:10 ` [PR PATCH] [Updated] " sgn
@ 2020-12-31 15:12 ` sgn
  2020-12-31 16:01 ` [PR PATCH] [Updated] " sgn
                   ` (63 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31 15:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752985020

Comment:
I think we should push the hook out now?

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (29 preceding siblings ...)
  2020-12-31 15:12 ` sgn
@ 2020-12-31 16:01 ` sgn
  2020-12-31 16:12 ` sgn
                   ` (62 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31 16:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 15043 bytes --]

From 57e83948c5c7f41cb04262dcecddd4543e5558c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 01/12] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From fd7f1629fcbba200d955eebbb2cc244f5a6829f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 02/12] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From b48b8359ae30481369c327e58761ae8e49794333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 03/12] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 dd6598d37feafe518b294b20d6be37d013ed7df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 04/12] 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 246c929cf017dcbcb87ab2ea1da78560ca60439a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 05/12] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 38b5bc8d2041826d3354750e4159a7858ffdf1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 06/12] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9de4562819fcc15a3a97a6be15ca75ba240e3ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 07/12] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From de9ef6e8a0f3f23710e2bc22584195dd8f3428ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 08/12] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 68b8b7635170b17b5c727774e7d3456bd46cee62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 09/12] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..bcf803c3ae3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 6289a4d9c980187b7085c4ffa73a2bffaff6c08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 10/12] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From c6430b430d8523a168f1fc94ce46fc0f2ce1c79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 11/12] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 5b35717b634fbf6a317789c73c72e0839c38bd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 12/12] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (30 preceding siblings ...)
  2020-12-31 16:01 ` [PR PATCH] [Updated] " sgn
@ 2020-12-31 16:12 ` sgn
  2020-12-31 16:15 ` q66
                   ` (61 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2020-12-31 16:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 17834 bytes --]

From 57e83948c5c7f41cb04262dcecddd4543e5558c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 01/14] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From fd7f1629fcbba200d955eebbb2cc244f5a6829f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 02/14] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From b48b8359ae30481369c327e58761ae8e49794333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 03/14] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 dd6598d37feafe518b294b20d6be37d013ed7df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 04/14] 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 246c929cf017dcbcb87ab2ea1da78560ca60439a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 05/14] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 38b5bc8d2041826d3354750e4159a7858ffdf1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 06/14] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9de4562819fcc15a3a97a6be15ca75ba240e3ba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 07/14] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From de9ef6e8a0f3f23710e2bc22584195dd8f3428ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 08/14] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 68b8b7635170b17b5c727774e7d3456bd46cee62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 09/14] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..bcf803c3ae3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 6289a4d9c980187b7085c4ffa73a2bffaff6c08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 10/14] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From c6430b430d8523a168f1fc94ce46fc0f2ce1c79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 11/14] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 5b35717b634fbf6a317789c73c72e0839c38bd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 12/14] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 3d59c453353f6eef1df0d2da4f99a51d0206ce20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 13/14] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..600c013736f 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
@@ -12,3 +12,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 2d092d5a1256ece3983e8c5fa6c369d5a35da046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 14/14] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..206a60de608 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (31 preceding siblings ...)
  2020-12-31 16:12 ` sgn
@ 2020-12-31 16:15 ` q66
  2020-12-31 16:55 ` ericonr
                   ` (60 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-31 16:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-752997271

Comment:
yeah, i guess let's push the hook

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (32 preceding siblings ...)
  2020-12-31 16:15 ` q66
@ 2020-12-31 16:55 ` ericonr
  2020-12-31 17:06 ` q66
                   ` (59 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: ericonr @ 2020-12-31 16:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-753005089

Comment:
This will break people trying to build stuff on musl in the meantime...

The hook shouldn't error out now, it should only warn.

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (33 preceding siblings ...)
  2020-12-31 16:55 ` ericonr
@ 2020-12-31 17:06 ` q66
  2020-12-31 17:06 ` q66
                   ` (58 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-31 17:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-753007214

Comment:
it's fine for it to error, i doubt anyone will run into it and we can fix it afterwards

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (34 preceding siblings ...)
  2020-12-31 17:06 ` q66
@ 2020-12-31 17:06 ` q66
  2021-01-01 13:10 ` [PR PATCH] [Updated] " sgn
                   ` (57 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2020-12-31 17:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 260 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-753007214

Comment:
it's fine for it to error, i doubt anyone will run into it (binary packages are built already) and we can fix it afterwards

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (35 preceding siblings ...)
  2020-12-31 17:06 ` q66
@ 2021-01-01 13:10 ` sgn
  2021-01-01 14:43 ` sgn
                   ` (56 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-01 13:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 30864 bytes --]

From ee6df2f76d79894e63451b05219ba7d41f73d320 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 01/25] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 01f878076f0fbeedac4a41e416a1819f37ebefdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 02/25] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From c9ec48b81fca2abca65ffdbe6d27e0801087c8bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 03/25] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 30b25a8a7e384584ecd6260855422ca075fb47c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 04/25] 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 bfe82bc03f514553e722f2760cc9b1300ec8ea91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 05/25] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 7f038ff657150a836438496098b893c70ec8f78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 06/25] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 5f67f1be7fd7c02d87eb8608ea5f3eaef33247a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 07/25] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From 285b08c77b63ff9a6fc03fabf69997970904a54e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 08/25] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 66a9f20b1a5ef08385d36d07b1e6582f15bed602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 09/25] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..bcf803c3ae3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From bba4e5e3799a7b225b494e61b0152f657da7b8ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 10/25] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From 325dbc3c00361ed0d3b03e777b7d1e842c692a7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 11/25] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 2bc311a493a31620400fcf4fce1f3caf2b80d254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 12/25] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From eb1e4bed765f4d55087d0f45890f30b93a2b40fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 13/25] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..600c013736f 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
@@ -12,3 +12,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 533df7e4f2011de8fc19cf68632a9d434fb967ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 14/25] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..206a60de608 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 177528838d27b313170983446710fe248c6267ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 15/25] desmume: fix l10n dir

---
 srcpkgs/desmume/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..ef306ffd375 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,7 +1,7 @@
 # Template file for 'desmume'
 pkgname=desmume
 version=0.9.11
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
 hostmakedepends="pkg-config intltool dos2unix"
@@ -9,7 +9,7 @@ makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +19,7 @@ post_extract() {
 	# convert the target file to LF-only.
 	dos2unix $wrksrc/src/MMU_timing.h
 }
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6302e101aee3d6cc7b59b7eeaefcbe9ef7b6c6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 16/25] dia: fix l10n dir

---
 srcpkgs/dia/template | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..52229cb6900 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,18 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
 distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a20d6acb8c7ad917174375a043aa99f7609f3e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 17/25] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..d4d9fa79bd2 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,7 +1,7 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
@@ -11,11 +11,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 919afbbfcd77ec9110d033218b66b24e3dd37aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 18/25] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..47b0105feb3 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,7 +1,7 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="LIBS=-lm"
 hostmakedepends="pkg-config intltool"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e4ecc14e73e639fc8e8cecf1eb83c361dab44d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 19/25] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..7878f6cb795 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
@@ -13,3 +13,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 452025a4696067946e3683b2128cb55b9e66ea26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 20/25] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..9993e6c49df 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,7 +1,7 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
@@ -16,6 +16,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From 7a9d5b334b8eb44b5ff4c647206d0a47cc3156b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 21/25] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..f846f0e6125 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 7dadd27dae5873bd8ce2006c8a4821fb9fe2e8bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 22/25] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..fdcd6137076 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
@@ -12,5 +12,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a1ec14332f9525a59d632de065d4ce4be986e55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 23/25] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..6a4eff424b3 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -18,3 +18,7 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 29ee1292acdad7ca69eb5b4d80cfcdf3ea114d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 24/25] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..2a0f0868fe6 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
@@ -14,3 +14,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 24c047a56a1e85910b9e4eb92fea498aefd280c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 25/25] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..469d3f7d41d 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (36 preceding siblings ...)
  2021-01-01 13:10 ` [PR PATCH] [Updated] " sgn
@ 2021-01-01 14:43 ` sgn
  2021-01-01 15:08 ` sgn
                   ` (55 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-01 14:43 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 45713 bytes --]

From ad65e619c4cc51b350b71b260d031c3ad3d31de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH 01/36] freetype: clean XBPS_CROSS_TRIPLET reference in
 freetype-config

* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
  $XBPS_CROSS_BASE will be prepended twice with current system,
  let's fix it.
---
 common/hooks/pre-configure/02-script-wrapper.sh |  9 ++++++++-
 srcpkgs/freetype/template                       | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..c3a0326027b 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
 	done
 }
 
+link_wrapper() {
+	local wrapper="$1"
+	[ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+	[ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+	ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
 hook() {
 	export PATH="$XBPS_WRAPPERDIR:$PATH"
 
@@ -186,9 +193,9 @@ hook() {
 	pkgconfig_wrapper
 	vapigen_wrapper
 	valac_wrapper
+	link_wrapper freetype-config
 	generic_wrapper icu-config
 	generic_wrapper libgcrypt-config
-	generic_wrapper freetype-config
 	generic_wrapper sdl-config
 	generic_wrapper sdl2-config
 	generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..12a15e8ce69 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
 # Template file for 'freetype'
 pkgname=freetype
 version=2.10.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-freetype-config"
 hostmakedepends="pkg-config"
@@ -16,10 +16,16 @@ checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
 post_install() {
 	vlicense docs/LICENSE.TXT
 	vlicense docs/FTL.TXT
+	if [ "$CROSS_BUILD" ]; then
+		sed -i -e "s/${XBPS_CROSS_TRIPLET}-pkg-config/pkg-config/" \
+			$DESTDIR/usr/bin/freetype-config
+	fi
 }
 
 freetype-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	# depends on pkg-config unconditionally to simplify our wrappers
+	depends="${makedepends} pkg-config
+	 ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		for f in bin include share; do

From 86f8edd26b1caf151824e1d0f56a847f0f3be70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 02/36] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From 2fd643182dfbc6300c39c8fe7783e796e522344b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 03/36] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 8c6b176d5ec3ca96a9a77fdea7ebc1e53700c0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 04/36] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 85f22d84eae14ee099a0e99f405539e1f8a39d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 05/36] 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 2f63e6327fd2a9b2565d5852e5c565273ee5b65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 06/36] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From e4ccffc668e96261d5a730809c52333373f91ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 07/36] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 927c776399e8edae492ff81581d734a08de69dec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 08/36] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From c9f9068dc62e8485635de88037f8b8abfbbc0354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 09/36] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 1934a29c5975e198971f78eb4aca5f394301ea0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 10/36] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..bcf803c3ae3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 141f6f770a73d3b6b8135a415db26eac7967838e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 11/36] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From 413cea75d7d3355f3f67fedccce0495bc59e33e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 12/36] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 0b9e852c6465f77cd0641652d2465a48a9089cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 13/36] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 33c29eb951bbc74858ad992e9868165db191b799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 14/36] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..600c013736f 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
@@ -12,3 +12,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 39f3a99c286f20b804af13083bb3b7fa4c3887b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 15/36] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..206a60de608 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 35a19bc4bd96227ceb29f51f02baab90d7895d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 16/36] desmume: fix l10n dir

---
 srcpkgs/desmume/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..ef306ffd375 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,7 +1,7 @@
 # Template file for 'desmume'
 pkgname=desmume
 version=0.9.11
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
 hostmakedepends="pkg-config intltool dos2unix"
@@ -9,7 +9,7 @@ makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +19,7 @@ post_extract() {
 	# convert the target file to LF-only.
 	dos2unix $wrksrc/src/MMU_timing.h
 }
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 97884225483f3b86759920e585d8810aaa279cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 17/36] dia: fix l10n dir

---
 srcpkgs/dia/template | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..45f48aab4dc 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,18 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From fc6899076ccc9e692c1656f87ac6bc3b1bf53b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 18/36] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..d4d9fa79bd2 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,7 +1,7 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
@@ -11,11 +11,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From b9373bd11eafc5a4a35a110bb2f94dfd68f1dc3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 19/36] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..47b0105feb3 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,7 +1,7 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="LIBS=-lm"
 hostmakedepends="pkg-config intltool"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From c05ab5635f71eb87a87847ae6cf4036fbd9f0fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 20/36] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..7878f6cb795 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
@@ -13,3 +13,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 87ff5c89fd1a0179c931c974c6b5de791085b5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 21/36] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..9993e6c49df 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,7 +1,7 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
@@ -16,6 +16,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From 711db313f49904d01268a199e692567daffc4137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 22/36] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..f846f0e6125 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4636a8e57e7e5717634659aa505405eea4f60612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 23/36] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..fdcd6137076 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
@@ -12,5 +12,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3d78a0d19255810a50fb77acdb1c4454f67e2ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 24/36] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..6a4eff424b3 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -18,3 +18,7 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 08061685a5ee7a9a5c28c8f948f1b4cb3db3fd99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 25/36] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..89f5705d629 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,20 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 649564c55ae83a9ddda940e77bb7127dc966fc90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 26/36] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..1a23f6dcfb0 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a651ea3041c55f3b799e2dd01fa7bd81a4d4c9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 27/36] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..7afbc3acc7c 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e1b5ffda254dd6aa526d898e4fd62c4b9547b3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 28/36] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From db2aaae0d41b0ed8a54cdc87466dd5ce0885d1fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 29/36] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..24ae856fa34 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,7 +1,7 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From f6f1f63dd0f0ee63304e5396eb54cd066c9c8ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 30/36] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..6b26226c19f 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
 configure_args="--enable-animation"
@@ -9,7 +9,11 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2b2d4df4bb101b4b35a08cc055af010e09f5fc39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 31/36] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..bfcb41e6219 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,7 +1,7 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="flex intltool pkg-config glib"
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From d6ee6cc278aaac7df27a5cd5d319341c9aa78b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 32/36] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..6857cc50b11 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,7 +1,7 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 051184298d4fc046cea433dd5c04e12a9f29727c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 33/36] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..bf480eaae32 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From af88240f39790b031e58b5bcfccd0a53dc2bb5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 34/36] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..76dffa85c97 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,17 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4d3ae66740e19014d68762efcf50bef0ac6a6597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 35/36] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..dad20250626 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -12,3 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4f5768d854903cb6819d2498d2215bd6e1ea76de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 36/36] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..f80347e452f 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,20 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (37 preceding siblings ...)
  2021-01-01 14:43 ` sgn
@ 2021-01-01 15:08 ` sgn
  2021-01-01 23:46 ` sgn
                   ` (54 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-01 15:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 48409 bytes --]

From ad65e619c4cc51b350b71b260d031c3ad3d31de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH 01/38] freetype: clean XBPS_CROSS_TRIPLET reference in
 freetype-config

* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
  $XBPS_CROSS_BASE will be prepended twice with current system,
  let's fix it.
---
 common/hooks/pre-configure/02-script-wrapper.sh |  9 ++++++++-
 srcpkgs/freetype/template                       | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..c3a0326027b 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
 	done
 }
 
+link_wrapper() {
+	local wrapper="$1"
+	[ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+	[ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+	ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
 hook() {
 	export PATH="$XBPS_WRAPPERDIR:$PATH"
 
@@ -186,9 +193,9 @@ hook() {
 	pkgconfig_wrapper
 	vapigen_wrapper
 	valac_wrapper
+	link_wrapper freetype-config
 	generic_wrapper icu-config
 	generic_wrapper libgcrypt-config
-	generic_wrapper freetype-config
 	generic_wrapper sdl-config
 	generic_wrapper sdl2-config
 	generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..12a15e8ce69 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
 # Template file for 'freetype'
 pkgname=freetype
 version=2.10.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-freetype-config"
 hostmakedepends="pkg-config"
@@ -16,10 +16,16 @@ checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
 post_install() {
 	vlicense docs/LICENSE.TXT
 	vlicense docs/FTL.TXT
+	if [ "$CROSS_BUILD" ]; then
+		sed -i -e "s/${XBPS_CROSS_TRIPLET}-pkg-config/pkg-config/" \
+			$DESTDIR/usr/bin/freetype-config
+	fi
 }
 
 freetype-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	# depends on pkg-config unconditionally to simplify our wrappers
+	depends="${makedepends} pkg-config
+	 ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		for f in bin include share; do

From 86f8edd26b1caf151824e1d0f56a847f0f3be70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 02/38] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From 2fd643182dfbc6300c39c8fe7783e796e522344b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 03/38] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 8c6b176d5ec3ca96a9a77fdea7ebc1e53700c0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 04/38] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 85f22d84eae14ee099a0e99f405539e1f8a39d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 05/38] 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 2f63e6327fd2a9b2565d5852e5c565273ee5b65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 06/38] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From e4ccffc668e96261d5a730809c52333373f91ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 07/38] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 927c776399e8edae492ff81581d734a08de69dec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 08/38] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From c9f9068dc62e8485635de88037f8b8abfbbc0354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 09/38] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 1934a29c5975e198971f78eb4aca5f394301ea0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 10/38] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..bcf803c3ae3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 141f6f770a73d3b6b8135a415db26eac7967838e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 11/38] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From 413cea75d7d3355f3f67fedccce0495bc59e33e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 12/38] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 0b9e852c6465f77cd0641652d2465a48a9089cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 13/38] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 33c29eb951bbc74858ad992e9868165db191b799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 14/38] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..600c013736f 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
@@ -12,3 +12,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 39f3a99c286f20b804af13083bb3b7fa4c3887b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 15/38] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..206a60de608 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 35a19bc4bd96227ceb29f51f02baab90d7895d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 16/38] desmume: fix l10n dir

---
 srcpkgs/desmume/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..ef306ffd375 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,7 +1,7 @@
 # Template file for 'desmume'
 pkgname=desmume
 version=0.9.11
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
 hostmakedepends="pkg-config intltool dos2unix"
@@ -9,7 +9,7 @@ makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +19,7 @@ post_extract() {
 	# convert the target file to LF-only.
 	dos2unix $wrksrc/src/MMU_timing.h
 }
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 97884225483f3b86759920e585d8810aaa279cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 17/38] dia: fix l10n dir

---
 srcpkgs/dia/template | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..45f48aab4dc 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,18 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From fc6899076ccc9e692c1656f87ac6bc3b1bf53b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 18/38] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..d4d9fa79bd2 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,7 +1,7 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
@@ -11,11 +11,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From b9373bd11eafc5a4a35a110bb2f94dfd68f1dc3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 19/38] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..47b0105feb3 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,7 +1,7 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="LIBS=-lm"
 hostmakedepends="pkg-config intltool"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From c05ab5635f71eb87a87847ae6cf4036fbd9f0fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 20/38] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..7878f6cb795 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
@@ -13,3 +13,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 87ff5c89fd1a0179c931c974c6b5de791085b5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 21/38] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..9993e6c49df 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,7 +1,7 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
@@ -16,6 +16,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From 711db313f49904d01268a199e692567daffc4137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 22/38] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..f846f0e6125 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4636a8e57e7e5717634659aa505405eea4f60612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 23/38] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..fdcd6137076 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
@@ -12,5 +12,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3d78a0d19255810a50fb77acdb1c4454f67e2ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 24/38] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..6a4eff424b3 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -18,3 +18,7 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 08061685a5ee7a9a5c28c8f948f1b4cb3db3fd99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 25/38] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..89f5705d629 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,20 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 649564c55ae83a9ddda940e77bb7127dc966fc90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 26/38] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..1a23f6dcfb0 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a651ea3041c55f3b799e2dd01fa7bd81a4d4c9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 27/38] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..7afbc3acc7c 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e1b5ffda254dd6aa526d898e4fd62c4b9547b3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 28/38] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From db2aaae0d41b0ed8a54cdc87466dd5ce0885d1fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 29/38] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..24ae856fa34 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,7 +1,7 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From f6f1f63dd0f0ee63304e5396eb54cd066c9c8ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 30/38] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..6b26226c19f 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
 configure_args="--enable-animation"
@@ -9,7 +9,11 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2b2d4df4bb101b4b35a08cc055af010e09f5fc39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 31/38] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..bfcb41e6219 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,7 +1,7 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="flex intltool pkg-config glib"
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From d6ee6cc278aaac7df27a5cd5d319341c9aa78b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 32/38] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..6857cc50b11 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,7 +1,7 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 051184298d4fc046cea433dd5c04e12a9f29727c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 33/38] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..bf480eaae32 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From af88240f39790b031e58b5bcfccd0a53dc2bb5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 34/38] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..76dffa85c97 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,17 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4d3ae66740e19014d68762efcf50bef0ac6a6597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 35/38] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..dad20250626 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -12,3 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4f5768d854903cb6819d2498d2215bd6e1ea76de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 36/38] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..f80347e452f 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,20 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From ea6a475411bcb133b775c6a25c54ffbe5384bb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 37/38] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..171300292e3 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,7 +1,7 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
@@ -22,6 +22,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From c5727ec73182e00755e33a0cd4e858193d8e848e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 38/38] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..83dc7323082 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,7 +5,7 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
 configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
@@ -20,6 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +30,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (38 preceding siblings ...)
  2021-01-01 15:08 ` sgn
@ 2021-01-01 23:46 ` sgn
  2021-01-03 13:07 ` sgn
                   ` (53 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-01 23:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 68414 bytes --]

From ce82b0430af64da0263849439d58ad63c84209f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH 01/55] freetype: clean XBPS_CROSS_TRIPLET reference in
 freetype-config

* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
  $XBPS_CROSS_BASE will be prepended twice with current system,
  let's fix it.
---
 common/hooks/pre-configure/02-script-wrapper.sh |  9 ++++++++-
 srcpkgs/freetype/template                       | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..c3a0326027b 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
 	done
 }
 
+link_wrapper() {
+	local wrapper="$1"
+	[ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+	[ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+	ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
 hook() {
 	export PATH="$XBPS_WRAPPERDIR:$PATH"
 
@@ -186,9 +193,9 @@ hook() {
 	pkgconfig_wrapper
 	vapigen_wrapper
 	valac_wrapper
+	link_wrapper freetype-config
 	generic_wrapper icu-config
 	generic_wrapper libgcrypt-config
-	generic_wrapper freetype-config
 	generic_wrapper sdl-config
 	generic_wrapper sdl2-config
 	generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..12a15e8ce69 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
 # Template file for 'freetype'
 pkgname=freetype
 version=2.10.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-freetype-config"
 hostmakedepends="pkg-config"
@@ -16,10 +16,16 @@ checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
 post_install() {
 	vlicense docs/LICENSE.TXT
 	vlicense docs/FTL.TXT
+	if [ "$CROSS_BUILD" ]; then
+		sed -i -e "s/${XBPS_CROSS_TRIPLET}-pkg-config/pkg-config/" \
+			$DESTDIR/usr/bin/freetype-config
+	fi
 }
 
 freetype-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	# depends on pkg-config unconditionally to simplify our wrappers
+	depends="${makedepends} pkg-config
+	 ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		for f in bin include share; do

From d4b421f95c788436bcb27f9af56931ed2f6209d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 02/55] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From d27baecf2904b1784043bd793cde80ce77f835a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 03/55] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 5dccc5bd32d73330e18b4029fecdeb8de71305f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 04/55] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From e8acffd2b9811d20c166b8caa01cd75bce70cca1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 05/55] 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 50739582b78d4f06509c057ab5502dd11f568c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 06/55] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From c27e4a7a56c9e872356f2869dc9a1f3fa2a93c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 07/55] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 2400d130fdddb94f3dec73a3a20fbfda1bf22c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 08/55] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From 9b50fad33397877e727020199da8c20cfa1623d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 09/55] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From da8f4e7e4bca10a3311997da534a996ad4bab7fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 10/55] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..bcf803c3ae3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From f0a9c65e7a643885671fd4b1e7f1ce769736c1f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 11/55] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From eaea83dca17f2062ec86dde4bfd79a2843e7ac8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 12/55] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From f39f4d8fd00068d86e2ffc3fdcbd07bc20ccb418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 13/55] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 728fb68a6ab9d82d23610ab9da774b7e169086a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 14/55] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..600c013736f 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
@@ -12,3 +12,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 5e4039000c50c478bf798e82912132cc0242d8e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 15/55] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..206a60de608 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 58fc6da5d59270c2c1a1e9140dcd0a24c03298c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 16/55] desmume: fix l10n dir

---
 srcpkgs/desmume/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..ef306ffd375 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,7 +1,7 @@
 # Template file for 'desmume'
 pkgname=desmume
 version=0.9.11
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
 hostmakedepends="pkg-config intltool dos2unix"
@@ -9,7 +9,7 @@ makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +19,7 @@ post_extract() {
 	# convert the target file to LF-only.
 	dos2unix $wrksrc/src/MMU_timing.h
 }
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e1c6379b5f02a53f9b786db8872a50a914aba802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 17/55] dia: fix l10n dir

---
 srcpkgs/dia/template | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..45f48aab4dc 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,18 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 101bbb3ca9249261fdf8d414e4a9513b49576304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 18/55] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..d4d9fa79bd2 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,7 +1,7 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
@@ -11,11 +11,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 28966462642aaf530eccae0e3d5f2f0274051d54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 19/55] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..47b0105feb3 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,7 +1,7 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="LIBS=-lm"
 hostmakedepends="pkg-config intltool"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4f55f12293b338e355307292262a25b0fda19f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 20/55] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..7878f6cb795 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
@@ -13,3 +13,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From f4a4682ac1271135e5d6308914c8351a7c037742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 21/55] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..9993e6c49df 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,7 +1,7 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
@@ -16,6 +16,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From c293a19184e04d6a9d1de2df29adaa9fdd7928a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 22/55] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..f846f0e6125 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2bad7c822dabebecd8b68c258235f94e11a4870f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 23/55] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..fdcd6137076 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
@@ -12,5 +12,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6da66c4c19d6bf2452de1d8e7834ae592faf072c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 24/55] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..6a4eff424b3 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -18,3 +18,7 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 660a65dbe0edf8ba25d300e6793768ea10e0e6a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 25/55] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..89f5705d629 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,20 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From bd10b1cba1be317a151e733d6e856622ad5c15c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 26/55] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..1a23f6dcfb0 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 15a4cf77ee65af83c090907ea4738c1dcb302178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 27/55] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..7afbc3acc7c 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From af30a78649a73c8e084452a20a8b1be4c93c7e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 28/55] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From f944969b1ed518392233732f7880280837db8d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 29/55] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..24ae856fa34 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,7 +1,7 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From aafebf9af350ec191d887f6dd1fcae713a0435fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 30/55] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..6b26226c19f 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
 configure_args="--enable-animation"
@@ -9,7 +9,11 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 89e9cade58dc8756c0216cc9cd73b47a1501da17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 31/55] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..bfcb41e6219 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,7 +1,7 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="flex intltool pkg-config glib"
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 896228d2f8fc53366a2698316073434b7bfcb889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 32/55] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..6857cc50b11 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,7 +1,7 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 04b0a05041a45b77c374d0816862620025daee50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 33/55] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..bf480eaae32 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 2433fc095dfaf3def3cf758dea3402679ea769ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 34/55] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..76dffa85c97 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,17 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 77543d1baed6129e686c2d87074f3fa468a6751a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 35/55] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..dad20250626 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -12,3 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a1ac4635343be69ae05ff5de7c9a3d0f4edcac45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 36/55] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..f80347e452f 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,20 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 765eebd4fe4a41385d0cfd8e3d2890e7f4e97185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 37/55] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..171300292e3 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,7 +1,7 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
@@ -22,6 +22,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From f12c6e401cd529969d76ee3118e4cc85c4ac5188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 38/55] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..83dc7323082 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,7 +5,7 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
 configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
@@ -20,6 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +30,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From 702d2c51146043769030c5cc9f925bea3cb83266 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 39/55] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..94f26d446f6 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,7 +1,7 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -10,9 +10,15 @@ short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 6bd05ce055e204af1ec12203542c843a3c8fdf47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 40/55] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..84418574389 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="$(vopt_enable gir introspection)"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 78c1783f6fb81d8f3dd03349cd295c5138b7cd48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 41/55] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..ebbb640ef11 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,7 +1,7 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"

From b8fb735b78a49ca4559c60dc91dec615858b1353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 42/55] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..08300d85b26 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From d28fce7b3611dccc8da61314b4280e0ca14c69ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 43/55] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 08300d85b26..9703dbe044a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From 3dbd5c0846ae9605b5624c14085a3923b8f11003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 44/55] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..063e6d0380a 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From ff378851588b553b761efbb361dbf3653b24ecf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 45/55] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..307d609f33d 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,7 +1,7 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From daa40cae7eddf0194aeb3814aeb82b58ac922f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 46/55] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..5b91dc9c720 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,7 +1,7 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 1494e290d6190bb32ee802a4fc4da92f6d6c49c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 47/55] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..0c3d0e3bbf8 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
@@ -10,7 +10,7 @@ makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From da199802d1cc2b0bcca25a028bd7cab2192622c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 48/55] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..66651a7af8a 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --with-gtk2
  --enable-compile-warnings=no"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 195292cb264cb4ac90ce6b418d2b082a9db7216e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 49/55] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..5a627f32383 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 564510217735405714153710e8f07cd63fb508c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 50/55] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..32d3be6623e 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,18 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 55c6652b3b35caeae14a984f25cb3ad2d6937e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 51/55] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..66f7edf6dde 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,11 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 8ee6c2808f3cde0deaf409b8a43e68432a51116b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 52/55] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..8a826f4e0fe 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,19 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 3f5d434da934f7a1aa75a19a5e2a560e85cdf887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 53/55] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..21841eebb2c 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
@@ -12,6 +12,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 10dd4d486f7ff0ad1bf40066d0fa224f72a4ec1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 54/55] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..88420e00409 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
@@ -11,7 +11,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From 4244855fd25e579d8aa1dd893279a362e3f7fde4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 55/55] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (39 preceding siblings ...)
  2021-01-01 23:46 ` sgn
@ 2021-01-03 13:07 ` sgn
  2021-01-03 23:38 ` sgn
                   ` (52 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-03 13:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 68241 bytes --]

From e141f445f90c14d3ca258fd2c7ff17d71741daf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH 01/55] freetype: clean XBPS_CROSS_TRIPLET reference in
 freetype-config

* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
  $XBPS_CROSS_BASE will be prepended twice with current system,
  let's fix it.
---
 common/hooks/pre-configure/02-script-wrapper.sh | 15 ++++++++++++++-
 srcpkgs/freetype/template                       |  6 +++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..9ca195d5a58 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
 	done
 }
 
+link_wrapper() {
+	local wrapper="$1"
+	[ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+	[ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+	ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
 hook() {
 	export PATH="$XBPS_WRAPPERDIR:$PATH"
 
@@ -186,9 +193,15 @@ hook() {
 	pkgconfig_wrapper
 	vapigen_wrapper
 	valac_wrapper
+
+	if [ -x /usr/bin/pkg-config ]; then
+		link_wrapper freetype-config
+	else
+		generic_wrapper freetype-config
+	fi
+
 	generic_wrapper icu-config
 	generic_wrapper libgcrypt-config
-	generic_wrapper freetype-config
 	generic_wrapper sdl-config
 	generic_wrapper sdl2-config
 	generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..ba4c6ad900c 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
 # Template file for 'freetype'
 pkgname=freetype
 version=2.10.4
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-freetype-config"
 hostmakedepends="pkg-config"
@@ -13,6 +13,10 @@ homepage="https://www.freetype.org/"
 distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
 checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
 
+post_patch() {
+	vsed -i -e "s/%PKG_CONFIG%/pkg-config/" builds/unix/freetype-config.in
+}
+
 post_install() {
 	vlicense docs/LICENSE.TXT
 	vlicense docs/FTL.TXT

From cd7ad897b4cf70ffbcf8d0e4c07b2c2b0b1e997a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 02/55] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From 21084af8ae75a398c58384d7a76cb112a919786c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 03/55] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 5f342c2ffc30ebc8709092d01a88766f9ae5dec2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 04/55] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From f93857d4d3983b587c42695899b13401b1146e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 05/55] 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 302b04112765f9a78a2698c55b8acceb66883250 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 06/55] gnu-configure-args: add --localedir

---
 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..345c0329d4a 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"
 
 . ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
 export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"

From 3c6292b8adee72f5df14e59269d678e15f3814be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 07/55] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 93f0f8ee2f761eee228a4bdbc2c3aebd15018735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 08/55] ario: fix l10n dir

---
 srcpkgs/ario/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From c169d123c4f28436b9ed52ea960e9293e8299b90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 09/55] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From ae571ab2132913315cc6f2a4544b70e60531f9c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 10/55] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..bcf803c3ae3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 89f044ecfdbb41d7d8403554474408653af842f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 11/55] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From 46d55593c1f1342a2cb1ad410db7b7babefd2820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 12/55] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel

From 6eb79fe9f394c5b79ab4dc1991fff3570d3357f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 13/55] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 29ea8b1cbeb51d0abab1d6bc96b650b22c8233ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 14/55] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..600c013736f 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
@@ -12,3 +12,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 558dd249f5c6c1b6040f25db14fc8bb542affa85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 15/55] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..206a60de608 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 6b7080c02f7c068ba3c5ed31eb2b68ebc285769b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 16/55] desmume: fix l10n dir

---
 srcpkgs/desmume/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..ef306ffd375 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,7 +1,7 @@
 # Template file for 'desmume'
 pkgname=desmume
 version=0.9.11
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
 hostmakedepends="pkg-config intltool dos2unix"
@@ -9,7 +9,7 @@ makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +19,7 @@ post_extract() {
 	# convert the target file to LF-only.
 	dos2unix $wrksrc/src/MMU_timing.h
 }
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From d0fcfa57380143167e5a4c055d5d30e8de518181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 17/55] dia: fix l10n dir

---
 srcpkgs/dia/template | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..45f48aab4dc 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,18 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From dcc0ae0fb4445b5d148c5e5508739c2cf2881e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 18/55] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..d4d9fa79bd2 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,7 +1,7 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
@@ -11,11 +11,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 6f59d7cd7c44b77eb085c95f49b43b40cf312cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 19/55] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..47b0105feb3 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,7 +1,7 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="LIBS=-lm"
 hostmakedepends="pkg-config intltool"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 7d49550de00c7636fb7f24833836cef9f6318ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 20/55] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..7878f6cb795 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
@@ -13,3 +13,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e1bce7399f324ed14f67ed7b6a4db6eeab4f3475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 21/55] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..9993e6c49df 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,7 +1,7 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
@@ -16,6 +16,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From e3464f9d91f3526573021b6067bb3f33ea412cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 22/55] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..f846f0e6125 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
 configure_args="--disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 56fa68f17f2ee4ffcadb0c5ee2723b4b8820fdec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 23/55] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..fdcd6137076 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
@@ -12,5 +12,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2f8369d3aeb9e884b91a30a7ad2c8c93290843bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 24/55] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..6a4eff424b3 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -18,3 +18,7 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 7885d30ee24e41d19180776934ec858dc62d7685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 25/55] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..89f5705d629 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,20 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2e97e9e33a764af973315178bc794cad5f40980f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 26/55] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..1a23f6dcfb0 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 1f170a19c85c956ece3176af0b84d1547f0cb0ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 27/55] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..7afbc3acc7c 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,7 +1,7 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 43aab1206541b5a17cddcabb07ec24caaf797adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 28/55] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 43c4628db224f1d2bf50019e7995a874a05fa83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 29/55] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..24ae856fa34 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,7 +1,7 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 5b5a0611b40ea4454d20b1a24e81b04d8a229059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 30/55] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..6b26226c19f 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
 configure_args="--enable-animation"
@@ -9,7 +9,11 @@ hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From f88d39c71251c767667a70a0d509cf17d8b1cf18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 31/55] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..bfcb41e6219 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,7 +1,7 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="flex intltool pkg-config glib"
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 7bdd02542d6c2e1dc0aa21a6c514b8999e86098a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 32/55] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..6857cc50b11 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,7 +1,7 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
 configure_args="--disable-static"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 20335850a35c8800b11057fdc8e52542dd3512b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 33/55] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..bf480eaae32 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 1798b3f2287f4746cb541291cc37b1905fd99910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 34/55] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..76dffa85c97 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,17 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From cc7f24a06b44b6de829a41c6c0fbad2d910078ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 35/55] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..dad20250626 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -12,3 +12,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 121dbca8c2807b788c6af6df5d272245cb700e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 36/55] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..f80347e452f 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,20 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 3da57457fe0834b356fef289ea7c14fe31557734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 37/55] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..171300292e3 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,7 +1,7 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
@@ -22,6 +22,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 76d48f0a3b8240d23f719a6849f5aadc1870ce36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 38/55] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..83dc7323082 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,7 +5,7 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
 configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
@@ -20,6 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +30,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From b9a95df680a668f40574d11dff608153d631478b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 39/55] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..94f26d446f6 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,7 +1,7 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
@@ -10,9 +10,15 @@ short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From fe6cbcc10a39b7d7896a72b6338d8c64667e28af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 40/55] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..84418574389 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,7 +1,7 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
 configure_args="$(vopt_enable gir introspection)"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 6a3f87816675760aeb1309e8b6f471a4f249beac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 41/55] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..ebbb640ef11 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,7 +1,7 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"

From 9dc31364fe86d74c61f3bf9e25816b57df63ed90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 42/55] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..08300d85b26 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From 4cc2fb5d57c906ffd54b662bed033f6621b1faa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 43/55] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 08300d85b26..9703dbe044a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From b9ea1a4afe39c9b0657f040c82abd3195a5da63a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 44/55] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..063e6d0380a 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 602c69c40556afe91fa443a7db650f44eca37b1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 45/55] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..307d609f33d 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,7 +1,7 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 5315b2837e276d5b3593efa16af76c9a367af17f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 46/55] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..5b91dc9c720 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,7 +1,7 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-gtk3"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From edf725f9479345e6aa445423b61feda41dbe3ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 47/55] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..0c3d0e3bbf8 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,7 +1,7 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
@@ -10,7 +10,7 @@ makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 2f9e1034e4c067d5125b474395aa78575bbbc76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 48/55] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..66651a7af8a 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,7 +1,7 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-static --with-gtk2
  --enable-compile-warnings=no"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3413b037884b5352f2d93d3a63775ac9f8183ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 49/55] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..5a627f32383 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From ddda5f432e0ee33e0470b9c072c5749dae79eb6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 50/55] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..32d3be6623e 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,18 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From af52b04cd4880b45e2b1ae8fd9ed52f5ba0bf716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 51/55] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..66f7edf6dde 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,11 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 060ba1e5b23ff4f8c96490b8729300f1b7e993af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 52/55] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..8a826f4e0fe 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,19 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 6152976ffa99742c9360ec8ccdf35684872cf16e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 53/55] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..21841eebb2c 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
@@ -12,6 +12,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 003099718c6b7ada948fb2436c2232b06bd94ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 54/55] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..88420e00409 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
@@ -11,7 +11,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From f275b2ee7f59e8034594425ef42d92efa1dfa3d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 55/55] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 72f2b3811a3..44aac7bada8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (40 preceding siblings ...)
  2021-01-03 13:07 ` sgn
@ 2021-01-03 23:38 ` sgn
  2021-01-04  0:35 ` q66
                   ` (51 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-03 23:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-753693288

Comment:
```
=> libmcrypt-2.5.8_3: running do_configure ...
configure: error: unrecognized option: --localedir=/usr/share/locale
```

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (41 preceding siblings ...)
  2021-01-03 23:38 ` sgn
@ 2021-01-04  0:35 ` q66
  2021-01-06 11:59 ` sgn
                   ` (50 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: q66 @ 2021-01-04  0:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-753701766

Comment:
let's just drop localedir from the defaults, since according to autoconf manual it already defaults to what we want either way, it's just glib and xfce that do things wrong

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (42 preceding siblings ...)
  2021-01-04  0:35 ` q66
@ 2021-01-06 11:59 ` sgn
  2021-01-07 13:52 ` [PR PATCH] [Updated] " sgn
                   ` (49 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-06 11:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-755259206

Comment:
> let's just drop localedir from the defaults, since according to autoconf manual it already defaults to what we want either way, it's just glib and xfce that do things wrong

I agree. Let's see if I could re-work on this weekend.

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (43 preceding siblings ...)
  2021-01-06 11:59 ` sgn
@ 2021-01-07 13:52 ` sgn
  2021-01-07 14:54 ` sgn
                   ` (48 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-07 13:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 72402 bytes --]

From c427ef9beaba9085010daedb27482d33f0e65488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/53] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From 6542bed17e6bd941f183f7d780a7cc0f87e978c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/53] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 215dba35eb8dacaab64478b6d495afc109cf0f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 03/53] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 28e3194e08828a157ced7aa25f9e8861032b61f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 04/53] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 4757a64e17aeaf79ef70b4a5f1e8f7252256b92c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 05/53] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 2d4e528335844106d43982d263d0fbf009e3d112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 06/53] ario: fix l10n dir

---
 srcpkgs/ario/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..b634acc8fda 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From 088edc01bc161442f377608fc8bb6fff1456f154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 07/53] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 97d4a300bc2e25c7b2075c7c3478cbc645bbc778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 08/53] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 8d1449665fc19222c7e5339feaf80825be66aada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 09/53] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 536c5ee3857ea7a898bf239807f10445ce97c386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/53] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 36aed9f0882696ad33b743ab0294ad0d585b1995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 11/53] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From a7c6c523f686b62682442e1265fc518046f5c0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 12/53] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From b0f1cd10c9fd839a246936d60ff8d69b74142008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 13/53] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 4588c682acae3b2c74f66955fc573c94a822b0c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 14/53] desmume: fix l10n dir

---
 srcpkgs/desmume/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..50d46ade7df 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,15 +1,16 @@
 # Template file for 'desmume'
 pkgname=desmume
 version=0.9.11
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-wifi --enable-hud --disable-openal --enable-glx"
 hostmakedepends="pkg-config intltool dos2unix"
 makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel agg-devel zziplib-devel glu-devel"
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +20,7 @@ post_extract() {
 	# convert the target file to LF-only.
 	dos2unix $wrksrc/src/MMU_timing.h
 }
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 7609079ffc68e3c90dbd889d30bab944835fe404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 15/53] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6ab0100b30ea85039117cff294863ea056490150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 16/53] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 77361b5b11c162985a0917a0d812f3cdcd3fcd81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 17/53] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 733f487f2888c2f85952f1d4fa50bd0a65a9a11e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 18/53] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From f9abc619d9fa99f6558419b48d34fc9d23feb211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 19/53] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From 9a869d71a32979bfbd0d95ce88cedf5af1277498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 20/53] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From c39a9f2208d02e848cc5c7f98343257d9458b80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 21/53] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From c1a7df13e3633c733ea499fc1bbe23ce99f558dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 22/53] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..51502970ea0 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +18,7 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 1d0fd4e74a362de3569117b6e5f360856d700037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 23/53] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 391be33ed96d4a1a0fbe2a51ae92e6188f14bd4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 24/53] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3791db999fff3c19ad3fc92d537116a7eec79738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 25/53] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 92ef43610b1002595612ed155e8cbf0b8158fdcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 26/53] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 31b58629973af2c655f49ec5cc4c18add07cf2ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 27/53] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 67a1df278384e13cac10a5248277c511ac918fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 28/53] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From d0772dc60d0f5ce991b39452bd067b3ec561449a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 29/53] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From dd06152cdaec7efa39d091932f131f6d0973c84f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 30/53] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 2ba3005232ff5bd97142043dcec183cbec776367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 31/53] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From a5cf6c340810552a9f0c76a8157d3b93b13bc753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 32/53] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 9333c620666918c5d04e9387911e210dfac907f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 33/53] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 9cbaad1cfc2f010fdceba30cc0cbba385a5d135e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 34/53] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From a7112231641f6223f462abff9073ee20d3c1fb5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 35/53] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 7e3af66792862d38454eae7efd95f1baad7924e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 36/53] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From d6579715596d40b8af3af1b21fec8b2772f3c82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 37/53] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 7ec6075e180b9b4c4b81691ee50e35b90cd673fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 38/53] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 58a9c7beeaba1dca6910acfb690763dd273e2db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 39/53] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From 8186e9bb6496750b2e8b3af9b110d496c4f1af4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 40/53] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 3 ++-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..34c9e6bc9c3 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,8 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="--locales-dir=/usr/share/locale
+ $(vopt_enable gir introspection)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From 86ab7e902fb658433b587ad43d5174de2955f351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 41/53] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From 4fb1c2487dee01b794946ef87110a811c697cb07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 42/53] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e7e1125a7a1868cc876d24860e159172db76e5c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 43/53] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4fa795343709225468990ee830552fb9ab9b36ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 44/53] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From eb6f7403380f5be006b01660abb4c13dbcdc33de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 45/53] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From ca3dd72f790d9825639b85c8c818e2b412a41236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 46/53] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From cf26568cc06659956547ffc0401627316e393d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 47/53] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0b3897cc441eab121dde5a20ae46818b972c5b9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 48/53] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 11f3bcb679c377593edbdd69f8b83c74d11cd57a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 49/53] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e7f75e02a0ae3c1d151cd60c9e6da179d3f1715e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 50/53] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 9e6afa1ea8067efc99736f0233a39ef4d256fdd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 51/53] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From d635bc34ba29cae352b20275526535dfe1d74ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 52/53] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From ca1a2ab30dca3908b6b1a6f7306b536ab3ca2520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 53/53] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (44 preceding siblings ...)
  2021-01-07 13:52 ` [PR PATCH] [Updated] " sgn
@ 2021-01-07 14:54 ` sgn
  2021-01-07 16:12 ` sgn
                   ` (47 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-07 14:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 72382 bytes --]

From 391c3fe13b422db7880dc45b6a0e568a40f984cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/53] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From 0ed5e36a684fbde1f1221c710765c0f4763bde11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/53] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 c0867c4de9a339d22c4619153b2f62c26364ec63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 03/53] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 7028084cb59462b15ba1e5dfd2c92feb4e1cfc25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 04/53] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 3d3eebce48c529625f35f6c35e35095129e75dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 05/53] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From a4f6cf44dceeeb78ff576f5278e9a4f1e8254f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 06/53] ario: fix l10n dir

---
 srcpkgs/ario/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..b634acc8fda 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From b409a0dc93d6fdd5bf3d23e10bcc46807261d8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 07/53] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 3b4ebd383ef390d7004d999ed51226317ec651ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 08/53] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From c16981caa2980402e0b616219cedddd58cef0571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 09/53] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 5473dc23d5b3e87ece220cc60ac54f11eaeaec9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/53] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 15181e120918fd690800c6b0a224acca52a29003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 11/53] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 3b2b6fa06e0e9ca5bc16e3d88de6a84d623f70d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 12/53] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 140b697627fe3e594607d4a2c498f03956955db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 13/53] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 76a81e54f3928336a13dc96acf007cfe03a2456f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 14/53] desmume: fix l10n dir

---
 srcpkgs/desmume/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..50d46ade7df 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,15 +1,16 @@
 # Template file for 'desmume'
 pkgname=desmume
 version=0.9.11
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-wifi --enable-hud --disable-openal --enable-glx"
 hostmakedepends="pkg-config intltool dos2unix"
 makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel agg-devel zziplib-devel glu-devel"
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +20,7 @@ post_extract() {
 	# convert the target file to LF-only.
 	dos2unix $wrksrc/src/MMU_timing.h
 }
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From d8556aaf392847864a08a806ed87905e7ffbc3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 15/53] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 908bafed90bf415723f7100d2ef4f7b6c4ac216b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 16/53] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 72644a2f792ecc49f114b6e65ea61d2ff98d9856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 17/53] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 8a2a3866f20bc399fb87e0f090c8b26ae167028a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 18/53] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2347eb168737afa6d18215f0a843f0900c259d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 19/53] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From e23f71558d558d98763175f06499322a9b478c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 20/53] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4d3568a294db820208bbf3f0caf2c1869d869e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 21/53] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0770dae46f610f31782f3a7029576d74715fd0a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 22/53] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..51502970ea0 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +18,7 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 23cfae0236f6a65d54c5d58cbca1061173e1dff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 23/53] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6d7777f6687ab9608f281fcfb3df04ffc23132bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 24/53] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 413a44e9b59b146b907b923e6f47043c057862da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 25/53] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From c906f0cd51ff78e3c96626f2fa3146435ab949a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 26/53] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 09ac730e621b47f407373a1b81cef43ac0ea540c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 27/53] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From c2c14776d0d104a042d540f670eccd9dfd18b833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 28/53] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4d650d37e773c2166f800547f2fae8faedfaf431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 29/53] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 849b0a3c16ee119542808d27ab06f325934658ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 30/53] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 041fa5a884993df8ea91183e7bcb7c481d7c15c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 31/53] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 29183aa3330adf652b59d3e0c3afa0b336d3f16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 32/53] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From fe5e92cccb70f729e1fb6d11a5aee529756584e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 33/53] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From bc89791bc8ad98e3e6892c24ebd048f5d4416772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 34/53] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 4217bd2cd634331415351da5eb687b1089bc25eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 35/53] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 122eee129ada3e0d85d01309723c8c64bfdc5eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 36/53] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From e87f7214641aca4ae6c4de164991045e696b7991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 37/53] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 936e9bd7f64d08b0b14e29c7e2bd01b7a6d4dbbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 38/53] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 000b626c01b959ce04eeb8696020cd450c6e785e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 39/53] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From b8fbce7d8961fc12511aaa9a94684c85e173d3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 40/53] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From 98a36728028605b98db8b21770fad937b101b7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 41/53] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From 0b43c8192c472a35b1fed30dec10bfdae8c5e25b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 42/53] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From beb6c3c32bd0976f793f0b070dbc2c1f1867cbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 43/53] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2062cf8b718623c94f52b5aa99ea697ca6c048a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 44/53] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e2248a758d419bc642acbf2068f6770a486c816d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 45/53] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 2cdfa30659a0866badcf1b549bae8d306f420660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 46/53] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 74c6066b0a73fb64d6075e6891849d5f5b78487c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 47/53] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From de318f50916a39439461f8e88e40d6cd429ccccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 48/53] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 026e55374cd91867d21d809aa2cf2211e0f1e3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 49/53] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From aba2f76bbc473a59493324416e9d2f0fad974ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 50/53] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From bb42b404ce7870dff87e68f5b51c654e986618f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 51/53] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 83fa92c59cf7f565b0fb2fcdd35ab7d633a4e235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 52/53] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From d37c7f7cf7a4f3d84ac5a9714dca62ba04802f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 53/53] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (45 preceding siblings ...)
  2021-01-07 14:54 ` sgn
@ 2021-01-07 16:12 ` sgn
  2021-01-09 11:04 ` sgn
                   ` (46 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-07 16:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 73503 bytes --]

From 391c3fe13b422db7880dc45b6a0e568a40f984cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 01/54] hooks: abort if l10n files found in /usr/lib

---
 common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
 		fi
 	done
 
+	# Check for l10n files in usr/lib/locale
+	if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+		msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+		error=1
+	fi
+
 	# Check for bash completions in etc/bash_completion.d
 	# should be on usr/share/bash-completion/completions
 	if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then

From 0ed5e36a684fbde1f1221c710765c0f4763bde11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 02/54] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 c0867c4de9a339d22c4619153b2f62c26364ec63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 03/54] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 7028084cb59462b15ba1e5dfd2c92feb4e1cfc25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 04/54] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 3d3eebce48c529625f35f6c35e35095129e75dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 05/54] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From a4f6cf44dceeeb78ff576f5278e9a4f1e8254f41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 06/54] ario: fix l10n dir

---
 srcpkgs/ario/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..b634acc8fda 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+	autoreconf -fi
 }

From b409a0dc93d6fdd5bf3d23e10bcc46807261d8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 07/54] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 3b4ebd383ef390d7004d999ed51226317ec651ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 08/54] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From c16981caa2980402e0b616219cedddd58cef0571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 09/54] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 5473dc23d5b3e87ece220cc60ac54f11eaeaec9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/54] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 15181e120918fd690800c6b0a224acca52a29003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 11/54] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 3b2b6fa06e0e9ca5bc16e3d88de6a84d623f70d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 12/54] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 140b697627fe3e594607d4a2c498f03956955db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 13/54] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 76a81e54f3928336a13dc96acf007cfe03a2456f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 14/54] desmume: fix l10n dir

---
 srcpkgs/desmume/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..50d46ade7df 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,15 +1,16 @@
 # Template file for 'desmume'
 pkgname=desmume
 version=0.9.11
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-wifi --enable-hud --disable-openal --enable-glx"
 hostmakedepends="pkg-config intltool dos2unix"
 makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel agg-devel zziplib-devel glu-devel"
 depends="desktop-file-utils"
 short_desc="Nintendo DS emulator"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.desmume.org"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +20,7 @@ post_extract() {
 	# convert the target file to LF-only.
 	dos2unix $wrksrc/src/MMU_timing.h
 }
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From d8556aaf392847864a08a806ed87905e7ffbc3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 15/54] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 908bafed90bf415723f7100d2ef4f7b6c4ac216b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 16/54] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 72644a2f792ecc49f114b6e65ea61d2ff98d9856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 17/54] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 8a2a3866f20bc399fb87e0f090c8b26ae167028a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 18/54] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2347eb168737afa6d18215f0a843f0900c259d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 19/54] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From e23f71558d558d98763175f06499322a9b478c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 20/54] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4d3568a294db820208bbf3f0caf2c1869d869e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 21/54] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0770dae46f610f31782f3a7029576d74715fd0a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 22/54] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..51502970ea0 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +18,7 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 23cfae0236f6a65d54c5d58cbca1061173e1dff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 23/54] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6d7777f6687ab9608f281fcfb3df04ffc23132bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 24/54] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 413a44e9b59b146b907b923e6f47043c057862da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 25/54] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From c906f0cd51ff78e3c96626f2fa3146435ab949a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 26/54] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 09ac730e621b47f407373a1b81cef43ac0ea540c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 27/54] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From c2c14776d0d104a042d540f670eccd9dfd18b833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 28/54] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4d650d37e773c2166f800547f2fae8faedfaf431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 29/54] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 849b0a3c16ee119542808d27ab06f325934658ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 30/54] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 041fa5a884993df8ea91183e7bcb7c481d7c15c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 31/54] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 29183aa3330adf652b59d3e0c3afa0b336d3f16d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 32/54] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From fe5e92cccb70f729e1fb6d11a5aee529756584e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 33/54] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From bc89791bc8ad98e3e6892c24ebd048f5d4416772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 34/54] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 4217bd2cd634331415351da5eb687b1089bc25eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 35/54] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 122eee129ada3e0d85d01309723c8c64bfdc5eae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 36/54] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From e87f7214641aca4ae6c4de164991045e696b7991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 37/54] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 936e9bd7f64d08b0b14e29c7e2bd01b7a6d4dbbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 38/54] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 000b626c01b959ce04eeb8696020cd450c6e785e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 39/54] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From b8fbce7d8961fc12511aaa9a94684c85e173d3b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 40/54] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From 98a36728028605b98db8b21770fad937b101b7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 41/54] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From 0b43c8192c472a35b1fed30dec10bfdae8c5e25b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 42/54] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From beb6c3c32bd0976f793f0b070dbc2c1f1867cbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 43/54] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2062cf8b718623c94f52b5aa99ea697ca6c048a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 44/54] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e2248a758d419bc642acbf2068f6770a486c816d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 45/54] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 2cdfa30659a0866badcf1b549bae8d306f420660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 46/54] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 74c6066b0a73fb64d6075e6891849d5f5b78487c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 47/54] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From de318f50916a39439461f8e88e40d6cd429ccccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 48/54] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 026e55374cd91867d21d809aa2cf2211e0f1e3b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 49/54] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From aba2f76bbc473a59493324416e9d2f0fad974ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 50/54] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From bb42b404ce7870dff87e68f5b51c654e986618f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 51/54] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 83fa92c59cf7f565b0fb2fcdd35ab7d633a4e235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 52/54] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From d37c7f7cf7a4f3d84ac5a9714dca62ba04802f13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 53/54] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From 0c170ab6609ed5fed4431d4bd6928a6d37f9c3a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 7 Jan 2021 23:11:52 +0700
Subject: [PATCH 54/54] fixup! gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index 51502970ea0..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -3,7 +3,8 @@ pkgname=gnome-mplayer
 version=1.0.9
 revision=5
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -21,4 +22,5 @@ CFLAGS="-fcommon"
 
 post_patch() {
 	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
 }

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (46 preceding siblings ...)
  2021-01-07 16:12 ` sgn
@ 2021-01-09 11:04 ` sgn
  2021-01-09 11:06 ` sgn
                   ` (45 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 11:04 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1230 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines
- [ ] gtkpod
- [ ] gtksourceview2
- [ ] homebank
- [ ] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [ ] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [ ] lxinput
- [ ] lxlauncher
- [ ] pcmanx-gtk2
- [ ] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [ ] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (47 preceding siblings ...)
  2021-01-09 11:04 ` sgn
@ 2021-01-09 11:06 ` sgn
  2021-01-09 11:29 ` sgn
                   ` (44 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 11:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [ ] gtkpod
- [ ] gtksourceview2
- [ ] homebank
- [ ] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [ ] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [ ] lxinput
- [ ] lxlauncher
- [ ] pcmanx-gtk2
- [ ] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [ ] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (48 preceding siblings ...)
  2021-01-09 11:06 ` sgn
@ 2021-01-09 11:29 ` sgn
  2021-01-09 11:29 ` sgn
                   ` (43 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 11:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [ ] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [ ] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [ ] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [ ] lxinput
- [ ] lxlauncher
- [ ] pcmanx-gtk2
- [ ] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [ ] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (49 preceding siblings ...)
  2021-01-09 11:29 ` sgn
@ 2021-01-09 11:29 ` sgn
  2021-01-09 11:33 ` sgn
                   ` (42 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 11:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [ ] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [ ] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [ ] lxinput
- [ ] lxlauncher
- [ ] pcmanx-gtk2
- [ ] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [ ] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (50 preceding siblings ...)
  2021-01-09 11:29 ` sgn
@ 2021-01-09 11:33 ` sgn
  2021-01-09 11:50 ` sgn
                   ` (41 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 11:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [ ] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [ ] lxinput
- [ ] lxlauncher
- [ ] pcmanx-gtk2
- [ ] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [ ] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (51 preceding siblings ...)
  2021-01-09 11:33 ` sgn
@ 2021-01-09 11:50 ` sgn
  2021-01-09 11:50 ` [PR PATCH] [Updated] " sgn
                   ` (40 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 11:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [ ] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [ ] lxinput
- [ ] lxlauncher
- [ ] pcmanx-gtk2
- [ ] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (52 preceding siblings ...)
  2021-01-09 11:50 ` sgn
@ 2021-01-09 11:50 ` sgn
  2021-01-09 11:52 ` sgn
                   ` (39 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 11:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 74094 bytes --]

From 99954dc11161ff3a15c4e9da6ed0a686e74eabde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/55] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 1f2af91881924523408a105c39583c7d03d3846b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/55] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 65da8b49db55ba288d3a90036c175add56014695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/55] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 a547ba12d6bab1f592eb80703b3158a3889fcdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/55] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9c52a0ad50df40f211626fdc46f2250e473dc0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/55] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 096eceaf1e6b00f1f77fa5752d9c4f18aae16433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 06/55] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 26365bd0b170e5d1aa6c7cbd3b0a3d0c63cfd3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 07/55] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From ae3227d27721f7c854ce131a9591e39642ea01dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 08/55] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 86114e334aa91f6e7b21b25204c8236d250b5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/55] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 4939062980bfe5f277f4292bf5aca95d145de129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/55] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 36a09089357bece1f903ea29291f9485472abf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 11/55] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 73ec50590ac511be5a01476fb24836230bbe1650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 12/55] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 6bda78717e99f1cdc0ba07e12b9d4a4c4a0a735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 13/55] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a7984dd0ee02c5627085123b03624611e0d4e612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 14/55] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 81c6b61bd6d1240a25541a67a70efff22224c771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 15/55] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 94d000c3d7333dfe2b7039f13872676d6462c5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 16/55] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3766280971e0c0254f469d0d378633261f7a3a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 17/55] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From ed34c38cb5831d87bd1c578e54ef53ffcde70093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 18/55] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4a11fc76c763b03366a49965b1e75df2af8267f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 19/55] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2a4a1c87f41fc2c0ab89c2de7e23a7cef21abe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 20/55] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From 4080ea8b97a8c5068c3c607dde301fdb034ce588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 21/55] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 62ad0e63957dea76be529ad686396d3d18dcbb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 22/55] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 03b7fb95e4dd567d02efdaaa69ef1b7989520b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 23/55] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 71124a308ba824b9db0b9f4bb86636794dfdc149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 24/55] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 571982d8805508fe3fcd2a3ea2b446461c7dc2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 25/55] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 8ec2de345bd4198b69d2ba44e6d6141e49e66b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 26/55] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b1b337518245fb6a36f234952d1880dca188fbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 27/55] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4bd7f9e4e67e5624eeb95804110b2d70863fd41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 28/55] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 40c127af02ff8237a412f3003d23271ecf39416d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 29/55] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 18395e0bf4b5a491be46d3e408b661503b016c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 30/55] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3389d9487ae4a5b81f9035c188e24054cf974331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 31/55] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2989aa55fa021405332d0033bd14d1b60f68681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 32/55] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 7dbcc6d1efdfc652af1f801ebff88e61a90c215b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 33/55] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From de4c3a87eff532f6bbdab3caf8b307ff07c40f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 34/55] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From d6f2c2b754f16af3ea04ec1a8fad4fd4cde7afdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 35/55] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 5874280dbc2129bc0d774bbeee3b8994e973c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 36/55] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 717e5d3904fe8f3cb696f073065f40225c808bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 37/55] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From e60400401d926cfe6d32ea6f51a0e5df9f1f8d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 38/55] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From bfb0dca7df337948e6aca8cc958c208e59ce309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 39/55] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From fcbac219821b0e5811527c56409be4c078c792cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 40/55] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 68396799ed920a77f361e5d2a704be23f7395c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 41/55] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6b094757ff804de3b30fff5707a3ac98f669a336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 42/55] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 02548c39118e0d8e01531b798b7c794809d64c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 43/55] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 0aa7bfeababcf50637be7d886b392940ea30b06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 44/55] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0a6276b84194be5788c7acdd8084480d3e1ae909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 45/55] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2de7daf58fc1334034c157e33bb9d59bc62612ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 46/55] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 529d143841146945cb7bb2161beddef3728e2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 47/55] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 84e6a1bead8f769da80bb8787a541084f6793c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 48/55] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 54ee2515b7c72595ad00c1d7f3a4fdb8fcbeee1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 49/55] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 7aeeda4e9cd34ebc78ff01ece4ee98d81abb48d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 50/55] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From dd286f5d0564a6a9e6928fe38067cd948ba60a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 51/55] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 6149201a28b54714d6680e2714790c7da78b9dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 52/55] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From e0c64d0b04b71a13c6c078c71a3f04b9110a842a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 17:42:13 +0700
Subject: [PATCH 53/55] fixup! glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch
index a666d8205c8..817a2cd1c47 100644
--- a/srcpkgs/glib/patches/honour-localedir.patch
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -6,7 +6,7 @@
  datarootdir=`eval echo "${datarootdir}"`
 -if test "x$CATOBJEXT" = "x.mo" ; then
 +if test "x$localedir" != "x" ; then
-+  :
++  localedir=`eval echo "${localedir}"`
 +elif test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else

From 9ee3bfc5914dd09b98f4022ebd9def77e8435cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 54/55] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 02d8c086104df01f6e2162b9c6eb7e01bf7a6ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 55/55] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (53 preceding siblings ...)
  2021-01-09 11:50 ` [PR PATCH] [Updated] " sgn
@ 2021-01-09 11:52 ` sgn
  2021-01-09 11:59 ` sgn
                   ` (38 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 11:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [ ] lxinput
- [ ] lxlauncher
- [ ] pcmanx-gtk2
- [ ] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (54 preceding siblings ...)
  2021-01-09 11:52 ` sgn
@ 2021-01-09 11:59 ` sgn
  2021-01-09 11:59 ` sgn
                   ` (37 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 11:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [ ] lxlauncher
- [ ] pcmanx-gtk2
- [ ] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (55 preceding siblings ...)
  2021-01-09 11:59 ` sgn
@ 2021-01-09 11:59 ` sgn
  2021-01-09 12:01 ` sgn
                   ` (36 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 11:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [ ] pcmanx-gtk2
- [ ] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (56 preceding siblings ...)
  2021-01-09 11:59 ` sgn
@ 2021-01-09 12:01 ` sgn
  2021-01-09 12:01 ` sgn
                   ` (35 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [ ] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (57 preceding siblings ...)
  2021-01-09 12:01 ` sgn
@ 2021-01-09 12:01 ` sgn
  2021-01-09 12:05 ` sgn
                   ` (34 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [ ] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (58 preceding siblings ...)
  2021-01-09 12:01 ` sgn
@ 2021-01-09 12:05 ` sgn
  2021-01-09 12:13 ` sgn
                   ` (33 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [ ] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (59 preceding siblings ...)
  2021-01-09 12:05 ` sgn
@ 2021-01-09 12:13 ` sgn
  2021-01-09 12:13 ` [PR PATCH] [Updated] " sgn
                   ` (32 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [ ] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (60 preceding siblings ...)
  2021-01-09 12:13 ` sgn
@ 2021-01-09 12:13 ` sgn
  2021-01-09 12:13 ` sgn
                   ` (31 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 75105 bytes --]

From 99954dc11161ff3a15c4e9da6ed0a686e74eabde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/56] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 1f2af91881924523408a105c39583c7d03d3846b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/56] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 65da8b49db55ba288d3a90036c175add56014695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/56] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 a547ba12d6bab1f592eb80703b3158a3889fcdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/56] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9c52a0ad50df40f211626fdc46f2250e473dc0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/56] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 096eceaf1e6b00f1f77fa5752d9c4f18aae16433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 06/56] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 26365bd0b170e5d1aa6c7cbd3b0a3d0c63cfd3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 07/56] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From ae3227d27721f7c854ce131a9591e39642ea01dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 08/56] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 86114e334aa91f6e7b21b25204c8236d250b5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/56] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 4939062980bfe5f277f4292bf5aca95d145de129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/56] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 36a09089357bece1f903ea29291f9485472abf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 11/56] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 73ec50590ac511be5a01476fb24836230bbe1650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 12/56] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 6bda78717e99f1cdc0ba07e12b9d4a4c4a0a735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 13/56] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a7984dd0ee02c5627085123b03624611e0d4e612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 14/56] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 81c6b61bd6d1240a25541a67a70efff22224c771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 15/56] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 94d000c3d7333dfe2b7039f13872676d6462c5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 16/56] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3766280971e0c0254f469d0d378633261f7a3a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 17/56] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From ed34c38cb5831d87bd1c578e54ef53ffcde70093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 18/56] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4a11fc76c763b03366a49965b1e75df2af8267f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 19/56] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2a4a1c87f41fc2c0ab89c2de7e23a7cef21abe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 20/56] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From 4080ea8b97a8c5068c3c607dde301fdb034ce588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 21/56] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 62ad0e63957dea76be529ad686396d3d18dcbb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 22/56] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 03b7fb95e4dd567d02efdaaa69ef1b7989520b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 23/56] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 71124a308ba824b9db0b9f4bb86636794dfdc149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 24/56] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 571982d8805508fe3fcd2a3ea2b446461c7dc2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 25/56] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 8ec2de345bd4198b69d2ba44e6d6141e49e66b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 26/56] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b1b337518245fb6a36f234952d1880dca188fbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 27/56] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4bd7f9e4e67e5624eeb95804110b2d70863fd41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 28/56] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 40c127af02ff8237a412f3003d23271ecf39416d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 29/56] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 18395e0bf4b5a491be46d3e408b661503b016c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 30/56] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3389d9487ae4a5b81f9035c188e24054cf974331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 31/56] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2989aa55fa021405332d0033bd14d1b60f68681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 32/56] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 7dbcc6d1efdfc652af1f801ebff88e61a90c215b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 33/56] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From de4c3a87eff532f6bbdab3caf8b307ff07c40f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 34/56] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From d6f2c2b754f16af3ea04ec1a8fad4fd4cde7afdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 35/56] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 5874280dbc2129bc0d774bbeee3b8994e973c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 36/56] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 717e5d3904fe8f3cb696f073065f40225c808bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 37/56] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From e60400401d926cfe6d32ea6f51a0e5df9f1f8d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 38/56] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From bfb0dca7df337948e6aca8cc958c208e59ce309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 39/56] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From fcbac219821b0e5811527c56409be4c078c792cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 40/56] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 68396799ed920a77f361e5d2a704be23f7395c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 41/56] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6b094757ff804de3b30fff5707a3ac98f669a336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 42/56] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 02548c39118e0d8e01531b798b7c794809d64c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 43/56] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 0aa7bfeababcf50637be7d886b392940ea30b06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 44/56] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0a6276b84194be5788c7acdd8084480d3e1ae909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 45/56] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2de7daf58fc1334034c157e33bb9d59bc62612ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 46/56] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 529d143841146945cb7bb2161beddef3728e2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 47/56] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 84e6a1bead8f769da80bb8787a541084f6793c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 48/56] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 54ee2515b7c72595ad00c1d7f3a4fdb8fcbeee1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 49/56] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 7aeeda4e9cd34ebc78ff01ece4ee98d81abb48d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 50/56] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From dd286f5d0564a6a9e6928fe38067cd948ba60a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 51/56] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 6149201a28b54714d6680e2714790c7da78b9dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 52/56] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From e0c64d0b04b71a13c6c078c71a3f04b9110a842a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 17:42:13 +0700
Subject: [PATCH 53/56] fixup! glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch
index a666d8205c8..817a2cd1c47 100644
--- a/srcpkgs/glib/patches/honour-localedir.patch
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -6,7 +6,7 @@
  datarootdir=`eval echo "${datarootdir}"`
 -if test "x$CATOBJEXT" = "x.mo" ; then
 +if test "x$localedir" != "x" ; then
-+  :
++  localedir=`eval echo "${localedir}"`
 +elif test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else

From 9ee3bfc5914dd09b98f4022ebd9def77e8435cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 54/56] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 02d8c086104df01f6e2162b9c6eb7e01bf7a6ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 55/56] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From edf6157075511a1cd4822b6817f5079dc27ae74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 56/56] lxappearance: load l10n from /usr/share

---
 srcpkgs/lxappearance/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (61 preceding siblings ...)
  2021-01-09 12:13 ` [PR PATCH] [Updated] " sgn
@ 2021-01-09 12:13 ` sgn
  2021-01-09 12:18 ` sgn
                   ` (30 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [ ] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (62 preceding siblings ...)
  2021-01-09 12:13 ` sgn
@ 2021-01-09 12:18 ` sgn
  2021-01-09 12:18 ` [PR PATCH] [Updated] " sgn
                   ` (29 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [ ] udisks
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (63 preceding siblings ...)
  2021-01-09 12:18 ` sgn
@ 2021-01-09 12:18 ` sgn
  2021-01-09 12:18 ` sgn
                   ` (28 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 77777 bytes --]

From 99954dc11161ff3a15c4e9da6ed0a686e74eabde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/58] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 1f2af91881924523408a105c39583c7d03d3846b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/58] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 65da8b49db55ba288d3a90036c175add56014695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/58] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 a547ba12d6bab1f592eb80703b3158a3889fcdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/58] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9c52a0ad50df40f211626fdc46f2250e473dc0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/58] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 096eceaf1e6b00f1f77fa5752d9c4f18aae16433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 06/58] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 26365bd0b170e5d1aa6c7cbd3b0a3d0c63cfd3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 07/58] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From ae3227d27721f7c854ce131a9591e39642ea01dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 08/58] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 86114e334aa91f6e7b21b25204c8236d250b5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/58] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 4939062980bfe5f277f4292bf5aca95d145de129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/58] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 36a09089357bece1f903ea29291f9485472abf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 11/58] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 73ec50590ac511be5a01476fb24836230bbe1650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 12/58] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 6bda78717e99f1cdc0ba07e12b9d4a4c4a0a735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 13/58] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a7984dd0ee02c5627085123b03624611e0d4e612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 14/58] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 81c6b61bd6d1240a25541a67a70efff22224c771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 15/58] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 94d000c3d7333dfe2b7039f13872676d6462c5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 16/58] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3766280971e0c0254f469d0d378633261f7a3a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 17/58] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From ed34c38cb5831d87bd1c578e54ef53ffcde70093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 18/58] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4a11fc76c763b03366a49965b1e75df2af8267f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 19/58] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2a4a1c87f41fc2c0ab89c2de7e23a7cef21abe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 20/58] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From 4080ea8b97a8c5068c3c607dde301fdb034ce588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 21/58] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 62ad0e63957dea76be529ad686396d3d18dcbb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 22/58] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 03b7fb95e4dd567d02efdaaa69ef1b7989520b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 23/58] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 71124a308ba824b9db0b9f4bb86636794dfdc149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 24/58] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 571982d8805508fe3fcd2a3ea2b446461c7dc2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 25/58] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 8ec2de345bd4198b69d2ba44e6d6141e49e66b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 26/58] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b1b337518245fb6a36f234952d1880dca188fbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 27/58] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4bd7f9e4e67e5624eeb95804110b2d70863fd41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 28/58] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 40c127af02ff8237a412f3003d23271ecf39416d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 29/58] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 18395e0bf4b5a491be46d3e408b661503b016c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 30/58] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3389d9487ae4a5b81f9035c188e24054cf974331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 31/58] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2989aa55fa021405332d0033bd14d1b60f68681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 32/58] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 7dbcc6d1efdfc652af1f801ebff88e61a90c215b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 33/58] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From de4c3a87eff532f6bbdab3caf8b307ff07c40f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 34/58] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From d6f2c2b754f16af3ea04ec1a8fad4fd4cde7afdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 35/58] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 5874280dbc2129bc0d774bbeee3b8994e973c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 36/58] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 717e5d3904fe8f3cb696f073065f40225c808bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 37/58] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From e60400401d926cfe6d32ea6f51a0e5df9f1f8d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 38/58] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From bfb0dca7df337948e6aca8cc958c208e59ce309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 39/58] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From fcbac219821b0e5811527c56409be4c078c792cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 40/58] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 68396799ed920a77f361e5d2a704be23f7395c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 41/58] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6b094757ff804de3b30fff5707a3ac98f669a336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 42/58] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 02548c39118e0d8e01531b798b7c794809d64c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 43/58] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 0aa7bfeababcf50637be7d886b392940ea30b06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 44/58] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0a6276b84194be5788c7acdd8084480d3e1ae909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 45/58] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2de7daf58fc1334034c157e33bb9d59bc62612ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 46/58] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 529d143841146945cb7bb2161beddef3728e2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 47/58] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 84e6a1bead8f769da80bb8787a541084f6793c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 48/58] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 54ee2515b7c72595ad00c1d7f3a4fdb8fcbeee1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 49/58] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 7aeeda4e9cd34ebc78ff01ece4ee98d81abb48d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 50/58] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From dd286f5d0564a6a9e6928fe38067cd948ba60a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 51/58] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 6149201a28b54714d6680e2714790c7da78b9dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 52/58] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From e0c64d0b04b71a13c6c078c71a3f04b9110a842a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 17:42:13 +0700
Subject: [PATCH 53/58] fixup! glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch
index a666d8205c8..817a2cd1c47 100644
--- a/srcpkgs/glib/patches/honour-localedir.patch
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -6,7 +6,7 @@
  datarootdir=`eval echo "${datarootdir}"`
 -if test "x$CATOBJEXT" = "x.mo" ; then
 +if test "x$localedir" != "x" ; then
-+  :
++  localedir=`eval echo "${localedir}"`
 +elif test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else

From 9ee3bfc5914dd09b98f4022ebd9def77e8435cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 54/58] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 02d8c086104df01f6e2162b9c6eb7e01bf7a6ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 55/58] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From edf6157075511a1cd4822b6817f5079dc27ae74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 56/58] lxappearance: load l10n from /usr/share

---
 srcpkgs/lxappearance/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 9b81dd8bf73b7e3c33bfbb3b5f6a151c11ae2b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 57/58] spacefm: fix l10n dir

---
 srcpkgs/spacefm/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 05c5e0dd6369f71e74dbf3c3b41992e305bf9d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 58/58] udevil: fix l10n dir

---
 srcpkgs/udevil/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (64 preceding siblings ...)
  2021-01-09 12:18 ` [PR PATCH] [Updated] " sgn
@ 2021-01-09 12:18 ` sgn
  2021-01-09 12:20 ` sgn
                   ` (27 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [ ] ufraw
- [ ] uget
- [ ] vte
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (65 preceding siblings ...)
  2021-01-09 12:18 ` sgn
@ 2021-01-09 12:20 ` sgn
  2021-01-09 12:27 ` [PR PATCH] [Updated] " sgn
                   ` (26 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [ ] ufraw
- [ ] uget
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (66 preceding siblings ...)
  2021-01-09 12:20 ` sgn
@ 2021-01-09 12:27 ` sgn
  2021-01-09 12:28 ` sgn
                   ` (25 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 78984 bytes --]

From 99954dc11161ff3a15c4e9da6ed0a686e74eabde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/59] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 1f2af91881924523408a105c39583c7d03d3846b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/59] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 65da8b49db55ba288d3a90036c175add56014695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/59] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 a547ba12d6bab1f592eb80703b3158a3889fcdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/59] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9c52a0ad50df40f211626fdc46f2250e473dc0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/59] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 096eceaf1e6b00f1f77fa5752d9c4f18aae16433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 06/59] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 26365bd0b170e5d1aa6c7cbd3b0a3d0c63cfd3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 07/59] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From ae3227d27721f7c854ce131a9591e39642ea01dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 08/59] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 86114e334aa91f6e7b21b25204c8236d250b5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/59] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 4939062980bfe5f277f4292bf5aca95d145de129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/59] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 36a09089357bece1f903ea29291f9485472abf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 11/59] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 73ec50590ac511be5a01476fb24836230bbe1650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 12/59] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 6bda78717e99f1cdc0ba07e12b9d4a4c4a0a735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 13/59] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a7984dd0ee02c5627085123b03624611e0d4e612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 14/59] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 81c6b61bd6d1240a25541a67a70efff22224c771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 15/59] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 94d000c3d7333dfe2b7039f13872676d6462c5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 16/59] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3766280971e0c0254f469d0d378633261f7a3a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 17/59] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From ed34c38cb5831d87bd1c578e54ef53ffcde70093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 18/59] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4a11fc76c763b03366a49965b1e75df2af8267f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 19/59] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2a4a1c87f41fc2c0ab89c2de7e23a7cef21abe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 20/59] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From 4080ea8b97a8c5068c3c607dde301fdb034ce588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 21/59] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 62ad0e63957dea76be529ad686396d3d18dcbb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 22/59] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 03b7fb95e4dd567d02efdaaa69ef1b7989520b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 23/59] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 71124a308ba824b9db0b9f4bb86636794dfdc149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 24/59] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 571982d8805508fe3fcd2a3ea2b446461c7dc2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 25/59] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 8ec2de345bd4198b69d2ba44e6d6141e49e66b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 26/59] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b1b337518245fb6a36f234952d1880dca188fbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 27/59] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4bd7f9e4e67e5624eeb95804110b2d70863fd41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 28/59] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 40c127af02ff8237a412f3003d23271ecf39416d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 29/59] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 18395e0bf4b5a491be46d3e408b661503b016c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 30/59] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3389d9487ae4a5b81f9035c188e24054cf974331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 31/59] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2989aa55fa021405332d0033bd14d1b60f68681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 32/59] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 7dbcc6d1efdfc652af1f801ebff88e61a90c215b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 33/59] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From de4c3a87eff532f6bbdab3caf8b307ff07c40f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 34/59] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From d6f2c2b754f16af3ea04ec1a8fad4fd4cde7afdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 35/59] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 5874280dbc2129bc0d774bbeee3b8994e973c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 36/59] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 717e5d3904fe8f3cb696f073065f40225c808bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 37/59] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From e60400401d926cfe6d32ea6f51a0e5df9f1f8d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 38/59] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From bfb0dca7df337948e6aca8cc958c208e59ce309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 39/59] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From fcbac219821b0e5811527c56409be4c078c792cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 40/59] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 68396799ed920a77f361e5d2a704be23f7395c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 41/59] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6b094757ff804de3b30fff5707a3ac98f669a336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 42/59] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 02548c39118e0d8e01531b798b7c794809d64c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 43/59] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 0aa7bfeababcf50637be7d886b392940ea30b06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 44/59] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0a6276b84194be5788c7acdd8084480d3e1ae909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 45/59] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2de7daf58fc1334034c157e33bb9d59bc62612ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 46/59] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 529d143841146945cb7bb2161beddef3728e2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 47/59] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 84e6a1bead8f769da80bb8787a541084f6793c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 48/59] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 54ee2515b7c72595ad00c1d7f3a4fdb8fcbeee1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 49/59] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 7aeeda4e9cd34ebc78ff01ece4ee98d81abb48d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 50/59] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From dd286f5d0564a6a9e6928fe38067cd948ba60a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 51/59] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 6149201a28b54714d6680e2714790c7da78b9dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 52/59] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From e0c64d0b04b71a13c6c078c71a3f04b9110a842a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 17:42:13 +0700
Subject: [PATCH 53/59] fixup! glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch
index a666d8205c8..817a2cd1c47 100644
--- a/srcpkgs/glib/patches/honour-localedir.patch
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -6,7 +6,7 @@
  datarootdir=`eval echo "${datarootdir}"`
 -if test "x$CATOBJEXT" = "x.mo" ; then
 +if test "x$localedir" != "x" ; then
-+  :
++  localedir=`eval echo "${localedir}"`
 +elif test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else

From 9ee3bfc5914dd09b98f4022ebd9def77e8435cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 54/59] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 02d8c086104df01f6e2162b9c6eb7e01bf7a6ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 55/59] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From edf6157075511a1cd4822b6817f5079dc27ae74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 56/59] lxappearance: load l10n from /usr/share

---
 srcpkgs/lxappearance/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 9b81dd8bf73b7e3c33bfbb3b5f6a151c11ae2b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 57/59] spacefm: fix l10n dir

---
 srcpkgs/spacefm/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 05c5e0dd6369f71e74dbf3c3b41992e305bf9d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 58/59] udevil: fix l10n dir

---
 srcpkgs/udevil/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From ff9293e8e1cd4c02ef29bd28b8a6078d268cf887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:27:05 +0700
Subject: [PATCH 59/59] ufraw: fix l10n dir

---
 srcpkgs/ufraw/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index c238ef73f56..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -1,11 +1,11 @@
 # Template file for 'ufraw'
 pkgname=ufraw
 version=0.22
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
  $(vopt_enable extras)"
-hostmakedepends="pkg-config dcraw"
+hostmakedepends="pkg-config dcraw gettext"
 makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel
  jasper-devel"
 depends="desktop-file-utils"
@@ -24,6 +24,9 @@ post_patch() {
 		-i dcraw_api.cc \
 		-i ufraw_ufraw.c \
 		-i ufraw_developer.c
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
 }
 
 ufraw-gimp_package() {

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (67 preceding siblings ...)
  2021-01-09 12:27 ` [PR PATCH] [Updated] " sgn
@ 2021-01-09 12:28 ` sgn
  2021-01-09 12:28 ` sgn
                   ` (24 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [ ] uget
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [ ] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (68 preceding siblings ...)
  2021-01-09 12:28 ` sgn
@ 2021-01-09 12:28 ` sgn
  2021-01-09 12:29 ` sgn
                   ` (23 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [ ] uget
- [ ] vte290
- [ ] viking
- [ ] volumeicon
- [x] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (69 preceding siblings ...)
  2021-01-09 12:28 ` sgn
@ 2021-01-09 12:29 ` sgn
  2021-01-09 16:06 ` [PR PATCH] [Updated] " sgn
                   ` (22 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 12:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [ ] uget
- [ ] vte290
- [ ] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (70 preceding siblings ...)
  2021-01-09 12:29 ` sgn
@ 2021-01-09 16:06 ` sgn
  2021-01-09 16:07 ` sgn
                   ` (21 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 80021 bytes --]

From 99954dc11161ff3a15c4e9da6ed0a686e74eabde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/60] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 1f2af91881924523408a105c39583c7d03d3846b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/60] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 65da8b49db55ba288d3a90036c175add56014695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/60] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 a547ba12d6bab1f592eb80703b3158a3889fcdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/60] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9c52a0ad50df40f211626fdc46f2250e473dc0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/60] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 096eceaf1e6b00f1f77fa5752d9c4f18aae16433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 06/60] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 26365bd0b170e5d1aa6c7cbd3b0a3d0c63cfd3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 07/60] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From ae3227d27721f7c854ce131a9591e39642ea01dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 08/60] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 86114e334aa91f6e7b21b25204c8236d250b5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/60] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 4939062980bfe5f277f4292bf5aca95d145de129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/60] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 36a09089357bece1f903ea29291f9485472abf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 11/60] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 73ec50590ac511be5a01476fb24836230bbe1650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 12/60] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 6bda78717e99f1cdc0ba07e12b9d4a4c4a0a735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 13/60] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a7984dd0ee02c5627085123b03624611e0d4e612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 14/60] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 81c6b61bd6d1240a25541a67a70efff22224c771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 15/60] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 94d000c3d7333dfe2b7039f13872676d6462c5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 16/60] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3766280971e0c0254f469d0d378633261f7a3a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 17/60] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From ed34c38cb5831d87bd1c578e54ef53ffcde70093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 18/60] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4a11fc76c763b03366a49965b1e75df2af8267f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 19/60] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2a4a1c87f41fc2c0ab89c2de7e23a7cef21abe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 20/60] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From 4080ea8b97a8c5068c3c607dde301fdb034ce588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 21/60] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 62ad0e63957dea76be529ad686396d3d18dcbb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 22/60] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 03b7fb95e4dd567d02efdaaa69ef1b7989520b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 23/60] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 71124a308ba824b9db0b9f4bb86636794dfdc149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 24/60] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 571982d8805508fe3fcd2a3ea2b446461c7dc2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 25/60] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 8ec2de345bd4198b69d2ba44e6d6141e49e66b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 26/60] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b1b337518245fb6a36f234952d1880dca188fbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 27/60] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4bd7f9e4e67e5624eeb95804110b2d70863fd41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 28/60] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 40c127af02ff8237a412f3003d23271ecf39416d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 29/60] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 18395e0bf4b5a491be46d3e408b661503b016c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 30/60] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3389d9487ae4a5b81f9035c188e24054cf974331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 31/60] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2989aa55fa021405332d0033bd14d1b60f68681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 32/60] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 7dbcc6d1efdfc652af1f801ebff88e61a90c215b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 33/60] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From de4c3a87eff532f6bbdab3caf8b307ff07c40f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 34/60] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From d6f2c2b754f16af3ea04ec1a8fad4fd4cde7afdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 35/60] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 5874280dbc2129bc0d774bbeee3b8994e973c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 36/60] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 717e5d3904fe8f3cb696f073065f40225c808bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 37/60] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From e60400401d926cfe6d32ea6f51a0e5df9f1f8d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 38/60] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From bfb0dca7df337948e6aca8cc958c208e59ce309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 39/60] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From fcbac219821b0e5811527c56409be4c078c792cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 40/60] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 68396799ed920a77f361e5d2a704be23f7395c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 41/60] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6b094757ff804de3b30fff5707a3ac98f669a336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 42/60] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 02548c39118e0d8e01531b798b7c794809d64c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 43/60] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 0aa7bfeababcf50637be7d886b392940ea30b06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 44/60] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0a6276b84194be5788c7acdd8084480d3e1ae909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 45/60] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2de7daf58fc1334034c157e33bb9d59bc62612ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 46/60] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 529d143841146945cb7bb2161beddef3728e2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 47/60] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 84e6a1bead8f769da80bb8787a541084f6793c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 48/60] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 54ee2515b7c72595ad00c1d7f3a4fdb8fcbeee1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 49/60] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 7aeeda4e9cd34ebc78ff01ece4ee98d81abb48d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 50/60] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From dd286f5d0564a6a9e6928fe38067cd948ba60a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 51/60] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 6149201a28b54714d6680e2714790c7da78b9dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 52/60] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From e0c64d0b04b71a13c6c078c71a3f04b9110a842a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 17:42:13 +0700
Subject: [PATCH 53/60] fixup! glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch
index a666d8205c8..817a2cd1c47 100644
--- a/srcpkgs/glib/patches/honour-localedir.patch
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -6,7 +6,7 @@
  datarootdir=`eval echo "${datarootdir}"`
 -if test "x$CATOBJEXT" = "x.mo" ; then
 +if test "x$localedir" != "x" ; then
-+  :
++  localedir=`eval echo "${localedir}"`
 +elif test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else

From 9ee3bfc5914dd09b98f4022ebd9def77e8435cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 54/60] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 02d8c086104df01f6e2162b9c6eb7e01bf7a6ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 55/60] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From edf6157075511a1cd4822b6817f5079dc27ae74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 56/60] lxappearance: load l10n from /usr/share

---
 srcpkgs/lxappearance/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 9b81dd8bf73b7e3c33bfbb3b5f6a151c11ae2b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 57/60] spacefm: fix l10n dir

---
 srcpkgs/spacefm/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 05c5e0dd6369f71e74dbf3c3b41992e305bf9d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 58/60] udevil: fix l10n dir

---
 srcpkgs/udevil/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From ff9293e8e1cd4c02ef29bd28b8a6078d268cf887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:27:05 +0700
Subject: [PATCH 59/60] ufraw: fix l10n dir

---
 srcpkgs/ufraw/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index c238ef73f56..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -1,11 +1,11 @@
 # Template file for 'ufraw'
 pkgname=ufraw
 version=0.22
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
  $(vopt_enable extras)"
-hostmakedepends="pkg-config dcraw"
+hostmakedepends="pkg-config dcraw gettext"
 makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel
  jasper-devel"
 depends="desktop-file-utils"
@@ -24,6 +24,9 @@ post_patch() {
 		-i dcraw_api.cc \
 		-i ufraw_ufraw.c \
 		-i ufraw_developer.c
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
 }
 
 ufraw-gimp_package() {

From 499385f11ce14d85cd32add6e8aaf474b04ee983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:06:35 +0700
Subject: [PATCH 60/60] uget: fix l10n dir

---
 srcpkgs/uget/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index 050eb3a9790..e82aa99ea34 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -13,3 +13,9 @@ distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
 checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (71 preceding siblings ...)
  2021-01-09 16:06 ` [PR PATCH] [Updated] " sgn
@ 2021-01-09 16:07 ` sgn
  2021-01-09 16:10 ` sgn
                   ` (20 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [ ] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [x] uget
- [ ] vte290
- [ ] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (72 preceding siblings ...)
  2021-01-09 16:07 ` sgn
@ 2021-01-09 16:10 ` sgn
  2021-01-09 16:11 ` sgn
                   ` (19 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [x] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [ ] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [x] uget
- [ ] vte290
- [ ] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (73 preceding siblings ...)
  2021-01-09 16:10 ` sgn
@ 2021-01-09 16:11 ` sgn
  2021-01-09 16:11 ` sgn
                   ` (18 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [x] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [x] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [ ] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [x] uget
- [ ] vte290
- [ ] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (74 preceding siblings ...)
  2021-01-09 16:11 ` sgn
@ 2021-01-09 16:11 ` sgn
  2021-01-09 16:11 ` sgn
                   ` (17 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [x] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [x] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [x] pidgin-libnotify
- [ ] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [x] uget
- [ ] vte290
- [ ] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (75 preceding siblings ...)
  2021-01-09 16:11 ` sgn
@ 2021-01-09 16:11 ` sgn
  2021-01-09 16:11 ` sgn
                   ` (16 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [x] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [x] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [x] pidgin-libnotify
- [x] pidgin-otr
- [ ] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [x] uget
- [ ] vte290
- [ ] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (76 preceding siblings ...)
  2021-01-09 16:11 ` sgn
@ 2021-01-09 16:11 ` sgn
  2021-01-09 16:20 ` sgn
                   ` (15 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [x] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [x] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [x] pidgin-libnotify
- [x] pidgin-otr
- [x] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [x] uget
- [ ] vte290
- [ ] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (77 preceding siblings ...)
  2021-01-09 16:11 ` sgn
@ 2021-01-09 16:20 ` sgn
  2021-01-09 16:20 ` [PR PATCH] [Updated] " sgn
                   ` (14 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [x] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [x] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [x] pidgin-libnotify
- [x] pidgin-otr
- [x] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [x] uget
- [ ] vte290
- [x] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [ ] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (78 preceding siblings ...)
  2021-01-09 16:20 ` sgn
@ 2021-01-09 16:20 ` sgn
  2021-01-09 16:23 ` sgn
                   ` (13 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 81037 bytes --]

From 99954dc11161ff3a15c4e9da6ed0a686e74eabde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/61] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 1f2af91881924523408a105c39583c7d03d3846b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/61] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 65da8b49db55ba288d3a90036c175add56014695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/61] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 a547ba12d6bab1f592eb80703b3158a3889fcdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/61] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9c52a0ad50df40f211626fdc46f2250e473dc0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/61] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 096eceaf1e6b00f1f77fa5752d9c4f18aae16433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 06/61] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 26365bd0b170e5d1aa6c7cbd3b0a3d0c63cfd3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 07/61] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From ae3227d27721f7c854ce131a9591e39642ea01dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 08/61] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 86114e334aa91f6e7b21b25204c8236d250b5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/61] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 4939062980bfe5f277f4292bf5aca95d145de129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/61] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 36a09089357bece1f903ea29291f9485472abf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 11/61] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 73ec50590ac511be5a01476fb24836230bbe1650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 12/61] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 6bda78717e99f1cdc0ba07e12b9d4a4c4a0a735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 13/61] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a7984dd0ee02c5627085123b03624611e0d4e612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 14/61] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 81c6b61bd6d1240a25541a67a70efff22224c771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 15/61] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 94d000c3d7333dfe2b7039f13872676d6462c5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 16/61] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3766280971e0c0254f469d0d378633261f7a3a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 17/61] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From ed34c38cb5831d87bd1c578e54ef53ffcde70093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 18/61] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4a11fc76c763b03366a49965b1e75df2af8267f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 19/61] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2a4a1c87f41fc2c0ab89c2de7e23a7cef21abe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 20/61] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From 4080ea8b97a8c5068c3c607dde301fdb034ce588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 21/61] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 62ad0e63957dea76be529ad686396d3d18dcbb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 22/61] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 03b7fb95e4dd567d02efdaaa69ef1b7989520b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 23/61] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 71124a308ba824b9db0b9f4bb86636794dfdc149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 24/61] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 571982d8805508fe3fcd2a3ea2b446461c7dc2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 25/61] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 8ec2de345bd4198b69d2ba44e6d6141e49e66b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 26/61] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b1b337518245fb6a36f234952d1880dca188fbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 27/61] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4bd7f9e4e67e5624eeb95804110b2d70863fd41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 28/61] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 40c127af02ff8237a412f3003d23271ecf39416d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 29/61] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 18395e0bf4b5a491be46d3e408b661503b016c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 30/61] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3389d9487ae4a5b81f9035c188e24054cf974331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 31/61] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2989aa55fa021405332d0033bd14d1b60f68681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 32/61] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 7dbcc6d1efdfc652af1f801ebff88e61a90c215b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 33/61] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From de4c3a87eff532f6bbdab3caf8b307ff07c40f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 34/61] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From d6f2c2b754f16af3ea04ec1a8fad4fd4cde7afdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 35/61] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 5874280dbc2129bc0d774bbeee3b8994e973c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 36/61] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 717e5d3904fe8f3cb696f073065f40225c808bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 37/61] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From e60400401d926cfe6d32ea6f51a0e5df9f1f8d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 38/61] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From bfb0dca7df337948e6aca8cc958c208e59ce309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 39/61] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From fcbac219821b0e5811527c56409be4c078c792cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 40/61] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 68396799ed920a77f361e5d2a704be23f7395c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 41/61] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6b094757ff804de3b30fff5707a3ac98f669a336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 42/61] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 02548c39118e0d8e01531b798b7c794809d64c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 43/61] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 0aa7bfeababcf50637be7d886b392940ea30b06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 44/61] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0a6276b84194be5788c7acdd8084480d3e1ae909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 45/61] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2de7daf58fc1334034c157e33bb9d59bc62612ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 46/61] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 529d143841146945cb7bb2161beddef3728e2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 47/61] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 84e6a1bead8f769da80bb8787a541084f6793c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 48/61] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 54ee2515b7c72595ad00c1d7f3a4fdb8fcbeee1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 49/61] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 7aeeda4e9cd34ebc78ff01ece4ee98d81abb48d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 50/61] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From dd286f5d0564a6a9e6928fe38067cd948ba60a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 51/61] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 6149201a28b54714d6680e2714790c7da78b9dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 52/61] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From e0c64d0b04b71a13c6c078c71a3f04b9110a842a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 17:42:13 +0700
Subject: [PATCH 53/61] fixup! glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch
index a666d8205c8..817a2cd1c47 100644
--- a/srcpkgs/glib/patches/honour-localedir.patch
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -6,7 +6,7 @@
  datarootdir=`eval echo "${datarootdir}"`
 -if test "x$CATOBJEXT" = "x.mo" ; then
 +if test "x$localedir" != "x" ; then
-+  :
++  localedir=`eval echo "${localedir}"`
 +elif test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else

From 9ee3bfc5914dd09b98f4022ebd9def77e8435cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 54/61] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 02d8c086104df01f6e2162b9c6eb7e01bf7a6ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 55/61] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From edf6157075511a1cd4822b6817f5079dc27ae74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 56/61] lxappearance: load l10n from /usr/share

---
 srcpkgs/lxappearance/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 9b81dd8bf73b7e3c33bfbb3b5f6a151c11ae2b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 57/61] spacefm: fix l10n dir

---
 srcpkgs/spacefm/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 05c5e0dd6369f71e74dbf3c3b41992e305bf9d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 58/61] udevil: fix l10n dir

---
 srcpkgs/udevil/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From ff9293e8e1cd4c02ef29bd28b8a6078d268cf887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:27:05 +0700
Subject: [PATCH 59/61] ufraw: fix l10n dir

---
 srcpkgs/ufraw/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index c238ef73f56..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -1,11 +1,11 @@
 # Template file for 'ufraw'
 pkgname=ufraw
 version=0.22
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
  $(vopt_enable extras)"
-hostmakedepends="pkg-config dcraw"
+hostmakedepends="pkg-config dcraw gettext"
 makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel
  jasper-devel"
 depends="desktop-file-utils"
@@ -24,6 +24,9 @@ post_patch() {
 		-i dcraw_api.cc \
 		-i ufraw_ufraw.c \
 		-i ufraw_developer.c
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
 }
 
 ufraw-gimp_package() {

From 499385f11ce14d85cd32add6e8aaf474b04ee983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:06:35 +0700
Subject: [PATCH 60/61] uget: fix l10n dir

---
 srcpkgs/uget/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index 050eb3a9790..e82aa99ea34 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -13,3 +13,9 @@ distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
 checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From 99dc3178175cfc8a3afdc5f24b9fb4aca7b8783d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:19:48 +0700
Subject: [PATCH 61/61] viking: fix l10n dir

---
 srcpkgs/viking/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index e0807418eca..6f7a469c204 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,7 +1,7 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
@@ -20,3 +20,9 @@ checksum=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8
 patch_args="-Np1"
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (79 preceding siblings ...)
  2021-01-09 16:20 ` [PR PATCH] [Updated] " sgn
@ 2021-01-09 16:23 ` sgn
  2021-01-09 16:23 ` [PR PATCH] [Updated] " sgn
                   ` (12 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [x] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [x] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [x] pidgin-libnotify
- [x] pidgin-otr
- [x] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [x] uget
- [ ] vte290
- [x] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [x] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (80 preceding siblings ...)
  2021-01-09 16:23 ` sgn
@ 2021-01-09 16:23 ` sgn
  2021-01-09 16:37 ` sgn
                   ` (11 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 81725 bytes --]

From 99954dc11161ff3a15c4e9da6ed0a686e74eabde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/62] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 1f2af91881924523408a105c39583c7d03d3846b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/62] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 65da8b49db55ba288d3a90036c175add56014695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/62] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 a547ba12d6bab1f592eb80703b3158a3889fcdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/62] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9c52a0ad50df40f211626fdc46f2250e473dc0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/62] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 096eceaf1e6b00f1f77fa5752d9c4f18aae16433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 06/62] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 26365bd0b170e5d1aa6c7cbd3b0a3d0c63cfd3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 07/62] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From ae3227d27721f7c854ce131a9591e39642ea01dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 08/62] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 86114e334aa91f6e7b21b25204c8236d250b5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/62] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 4939062980bfe5f277f4292bf5aca95d145de129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/62] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 36a09089357bece1f903ea29291f9485472abf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 11/62] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 73ec50590ac511be5a01476fb24836230bbe1650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 12/62] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 6bda78717e99f1cdc0ba07e12b9d4a4c4a0a735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 13/62] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a7984dd0ee02c5627085123b03624611e0d4e612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 14/62] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 81c6b61bd6d1240a25541a67a70efff22224c771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 15/62] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 94d000c3d7333dfe2b7039f13872676d6462c5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 16/62] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3766280971e0c0254f469d0d378633261f7a3a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 17/62] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From ed34c38cb5831d87bd1c578e54ef53ffcde70093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 18/62] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4a11fc76c763b03366a49965b1e75df2af8267f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 19/62] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2a4a1c87f41fc2c0ab89c2de7e23a7cef21abe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 20/62] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From 4080ea8b97a8c5068c3c607dde301fdb034ce588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 21/62] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 62ad0e63957dea76be529ad686396d3d18dcbb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 22/62] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 03b7fb95e4dd567d02efdaaa69ef1b7989520b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 23/62] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 71124a308ba824b9db0b9f4bb86636794dfdc149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 24/62] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 571982d8805508fe3fcd2a3ea2b446461c7dc2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 25/62] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 8ec2de345bd4198b69d2ba44e6d6141e49e66b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 26/62] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b1b337518245fb6a36f234952d1880dca188fbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 27/62] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4bd7f9e4e67e5624eeb95804110b2d70863fd41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 28/62] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 40c127af02ff8237a412f3003d23271ecf39416d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 29/62] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 18395e0bf4b5a491be46d3e408b661503b016c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 30/62] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3389d9487ae4a5b81f9035c188e24054cf974331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 31/62] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2989aa55fa021405332d0033bd14d1b60f68681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 32/62] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 7dbcc6d1efdfc652af1f801ebff88e61a90c215b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 33/62] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From de4c3a87eff532f6bbdab3caf8b307ff07c40f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 34/62] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From d6f2c2b754f16af3ea04ec1a8fad4fd4cde7afdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 35/62] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 5874280dbc2129bc0d774bbeee3b8994e973c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 36/62] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 717e5d3904fe8f3cb696f073065f40225c808bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 37/62] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From e60400401d926cfe6d32ea6f51a0e5df9f1f8d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 38/62] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From bfb0dca7df337948e6aca8cc958c208e59ce309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 39/62] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From fcbac219821b0e5811527c56409be4c078c792cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 40/62] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 68396799ed920a77f361e5d2a704be23f7395c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 41/62] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6b094757ff804de3b30fff5707a3ac98f669a336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 42/62] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 02548c39118e0d8e01531b798b7c794809d64c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 43/62] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 0aa7bfeababcf50637be7d886b392940ea30b06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 44/62] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0a6276b84194be5788c7acdd8084480d3e1ae909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 45/62] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2de7daf58fc1334034c157e33bb9d59bc62612ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 46/62] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 529d143841146945cb7bb2161beddef3728e2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 47/62] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 84e6a1bead8f769da80bb8787a541084f6793c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 48/62] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 54ee2515b7c72595ad00c1d7f3a4fdb8fcbeee1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 49/62] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 7aeeda4e9cd34ebc78ff01ece4ee98d81abb48d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 50/62] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From dd286f5d0564a6a9e6928fe38067cd948ba60a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 51/62] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 6149201a28b54714d6680e2714790c7da78b9dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 52/62] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From e0c64d0b04b71a13c6c078c71a3f04b9110a842a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 17:42:13 +0700
Subject: [PATCH 53/62] fixup! glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch
index a666d8205c8..817a2cd1c47 100644
--- a/srcpkgs/glib/patches/honour-localedir.patch
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -6,7 +6,7 @@
  datarootdir=`eval echo "${datarootdir}"`
 -if test "x$CATOBJEXT" = "x.mo" ; then
 +if test "x$localedir" != "x" ; then
-+  :
++  localedir=`eval echo "${localedir}"`
 +elif test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else

From 9ee3bfc5914dd09b98f4022ebd9def77e8435cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 54/62] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 02d8c086104df01f6e2162b9c6eb7e01bf7a6ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 55/62] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From edf6157075511a1cd4822b6817f5079dc27ae74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 56/62] lxappearance: load l10n from /usr/share

---
 srcpkgs/lxappearance/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 9b81dd8bf73b7e3c33bfbb3b5f6a151c11ae2b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 57/62] spacefm: fix l10n dir

---
 srcpkgs/spacefm/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 05c5e0dd6369f71e74dbf3c3b41992e305bf9d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 58/62] udevil: fix l10n dir

---
 srcpkgs/udevil/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From ff9293e8e1cd4c02ef29bd28b8a6078d268cf887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:27:05 +0700
Subject: [PATCH 59/62] ufraw: fix l10n dir

---
 srcpkgs/ufraw/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index c238ef73f56..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -1,11 +1,11 @@
 # Template file for 'ufraw'
 pkgname=ufraw
 version=0.22
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
  $(vopt_enable extras)"
-hostmakedepends="pkg-config dcraw"
+hostmakedepends="pkg-config dcraw gettext"
 makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel
  jasper-devel"
 depends="desktop-file-utils"
@@ -24,6 +24,9 @@ post_patch() {
 		-i dcraw_api.cc \
 		-i ufraw_ufraw.c \
 		-i ufraw_developer.c
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
 }
 
 ufraw-gimp_package() {

From 499385f11ce14d85cd32add6e8aaf474b04ee983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:06:35 +0700
Subject: [PATCH 60/62] uget: fix l10n dir

---
 srcpkgs/uget/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index 050eb3a9790..e82aa99ea34 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -13,3 +13,9 @@ distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
 checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From 99dc3178175cfc8a3afdc5f24b9fb4aca7b8783d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:19:48 +0700
Subject: [PATCH 61/62] viking: fix l10n dir

---
 srcpkgs/viking/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index e0807418eca..6f7a469c204 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,7 +1,7 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
@@ -20,3 +20,9 @@ checksum=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8
 patch_args="-Np1"
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From d4380320a07436fc7fca22f9c599883048716b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:23:03 +0700
Subject: [PATCH 62/62] xsane: fix l10n dir

---
 srcpkgs/xsane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e946..8a2fbfe7c81 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,7 +1,7 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=3
+revision=4
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (81 preceding siblings ...)
  2021-01-09 16:23 ` [PR PATCH] [Updated] " sgn
@ 2021-01-09 16:37 ` sgn
  2021-01-09 16:37 ` sgn
                   ` (10 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 83059 bytes --]

From 99954dc11161ff3a15c4e9da6ed0a686e74eabde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/63] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 1f2af91881924523408a105c39583c7d03d3846b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/63] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 65da8b49db55ba288d3a90036c175add56014695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/63] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 a547ba12d6bab1f592eb80703b3158a3889fcdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/63] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9c52a0ad50df40f211626fdc46f2250e473dc0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/63] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 096eceaf1e6b00f1f77fa5752d9c4f18aae16433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 06/63] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 26365bd0b170e5d1aa6c7cbd3b0a3d0c63cfd3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 07/63] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From ae3227d27721f7c854ce131a9591e39642ea01dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 08/63] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 86114e334aa91f6e7b21b25204c8236d250b5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/63] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 4939062980bfe5f277f4292bf5aca95d145de129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/63] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 36a09089357bece1f903ea29291f9485472abf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 11/63] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 73ec50590ac511be5a01476fb24836230bbe1650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 12/63] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 6bda78717e99f1cdc0ba07e12b9d4a4c4a0a735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 13/63] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a7984dd0ee02c5627085123b03624611e0d4e612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 14/63] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 81c6b61bd6d1240a25541a67a70efff22224c771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 15/63] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 94d000c3d7333dfe2b7039f13872676d6462c5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 16/63] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3766280971e0c0254f469d0d378633261f7a3a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 17/63] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From ed34c38cb5831d87bd1c578e54ef53ffcde70093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 18/63] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4a11fc76c763b03366a49965b1e75df2af8267f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 19/63] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2a4a1c87f41fc2c0ab89c2de7e23a7cef21abe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 20/63] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From 4080ea8b97a8c5068c3c607dde301fdb034ce588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 21/63] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 62ad0e63957dea76be529ad686396d3d18dcbb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 22/63] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 03b7fb95e4dd567d02efdaaa69ef1b7989520b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 23/63] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 71124a308ba824b9db0b9f4bb86636794dfdc149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 24/63] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 571982d8805508fe3fcd2a3ea2b446461c7dc2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 25/63] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 8ec2de345bd4198b69d2ba44e6d6141e49e66b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 26/63] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b1b337518245fb6a36f234952d1880dca188fbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 27/63] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4bd7f9e4e67e5624eeb95804110b2d70863fd41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 28/63] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 40c127af02ff8237a412f3003d23271ecf39416d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 29/63] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 18395e0bf4b5a491be46d3e408b661503b016c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 30/63] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3389d9487ae4a5b81f9035c188e24054cf974331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 31/63] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2989aa55fa021405332d0033bd14d1b60f68681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 32/63] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 7dbcc6d1efdfc652af1f801ebff88e61a90c215b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 33/63] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From de4c3a87eff532f6bbdab3caf8b307ff07c40f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 34/63] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From d6f2c2b754f16af3ea04ec1a8fad4fd4cde7afdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 35/63] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 5874280dbc2129bc0d774bbeee3b8994e973c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 36/63] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 717e5d3904fe8f3cb696f073065f40225c808bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 37/63] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From e60400401d926cfe6d32ea6f51a0e5df9f1f8d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 38/63] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From bfb0dca7df337948e6aca8cc958c208e59ce309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 39/63] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From fcbac219821b0e5811527c56409be4c078c792cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 40/63] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 68396799ed920a77f361e5d2a704be23f7395c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 41/63] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6b094757ff804de3b30fff5707a3ac98f669a336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 42/63] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 02548c39118e0d8e01531b798b7c794809d64c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 43/63] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 0aa7bfeababcf50637be7d886b392940ea30b06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 44/63] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0a6276b84194be5788c7acdd8084480d3e1ae909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 45/63] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2de7daf58fc1334034c157e33bb9d59bc62612ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 46/63] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 529d143841146945cb7bb2161beddef3728e2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 47/63] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 84e6a1bead8f769da80bb8787a541084f6793c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 48/63] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 54ee2515b7c72595ad00c1d7f3a4fdb8fcbeee1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 49/63] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 7aeeda4e9cd34ebc78ff01ece4ee98d81abb48d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 50/63] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From dd286f5d0564a6a9e6928fe38067cd948ba60a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 51/63] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 6149201a28b54714d6680e2714790c7da78b9dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 52/63] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From e0c64d0b04b71a13c6c078c71a3f04b9110a842a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 17:42:13 +0700
Subject: [PATCH 53/63] fixup! glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch
index a666d8205c8..817a2cd1c47 100644
--- a/srcpkgs/glib/patches/honour-localedir.patch
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -6,7 +6,7 @@
  datarootdir=`eval echo "${datarootdir}"`
 -if test "x$CATOBJEXT" = "x.mo" ; then
 +if test "x$localedir" != "x" ; then
-+  :
++  localedir=`eval echo "${localedir}"`
 +elif test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else

From 9ee3bfc5914dd09b98f4022ebd9def77e8435cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 54/63] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 02d8c086104df01f6e2162b9c6eb7e01bf7a6ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 55/63] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From edf6157075511a1cd4822b6817f5079dc27ae74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 56/63] lxappearance: load l10n from /usr/share

---
 srcpkgs/lxappearance/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 9b81dd8bf73b7e3c33bfbb3b5f6a151c11ae2b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 57/63] spacefm: fix l10n dir

---
 srcpkgs/spacefm/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 05c5e0dd6369f71e74dbf3c3b41992e305bf9d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 58/63] udevil: fix l10n dir

---
 srcpkgs/udevil/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From ff9293e8e1cd4c02ef29bd28b8a6078d268cf887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:27:05 +0700
Subject: [PATCH 59/63] ufraw: fix l10n dir

---
 srcpkgs/ufraw/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index c238ef73f56..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -1,11 +1,11 @@
 # Template file for 'ufraw'
 pkgname=ufraw
 version=0.22
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
  $(vopt_enable extras)"
-hostmakedepends="pkg-config dcraw"
+hostmakedepends="pkg-config dcraw gettext"
 makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel
  jasper-devel"
 depends="desktop-file-utils"
@@ -24,6 +24,9 @@ post_patch() {
 		-i dcraw_api.cc \
 		-i ufraw_ufraw.c \
 		-i ufraw_developer.c
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
 }
 
 ufraw-gimp_package() {

From 499385f11ce14d85cd32add6e8aaf474b04ee983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:06:35 +0700
Subject: [PATCH 60/63] uget: fix l10n dir

---
 srcpkgs/uget/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index 050eb3a9790..e82aa99ea34 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -13,3 +13,9 @@ distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
 checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From 99dc3178175cfc8a3afdc5f24b9fb4aca7b8783d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:19:48 +0700
Subject: [PATCH 61/63] viking: fix l10n dir

---
 srcpkgs/viking/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index e0807418eca..6f7a469c204 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,7 +1,7 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
@@ -20,3 +20,9 @@ checksum=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8
 patch_args="-Np1"
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From d4380320a07436fc7fca22f9c599883048716b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:23:03 +0700
Subject: [PATCH 62/63] xsane: fix l10n dir

---
 srcpkgs/xsane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e946..8a2fbfe7c81 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,7 +1,7 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=3
+revision=4
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"

From feec760c280a4446aa50d6206485a388ce857b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:31:52 +0700
Subject: [PATCH 63/63] xnoise: fix l10n dir

---
 srcpkgs/xnoise/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xnoise/template b/srcpkgs/xnoise/template
index 61cc909b6ad..1cc3aae4079 100644
--- a/srcpkgs/xnoise/template
+++ b/srcpkgs/xnoise/template
@@ -1,7 +1,7 @@
 # Template file for 'xnoise'
 pkgname=xnoise
 version=0.2.21
-revision=4
+revision=5
 lib32disabled=yes
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
@@ -11,11 +11,15 @@ makedepends="gtk+3-devel libtaginfo-devel sqlite-devel
 depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1"
 short_desc="Media player for GTK+ with a slick GUI"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.xnoise-media-player.com/"
 distfiles="https://bitbucket.org/shuerhaaken/xnoise/downloads/xnoise-${version}.tar.gz"
 checksum=6c501091ac5a59aa0596978aa8d4750cc12d6bc9a823fd57542d9ab8e3366681
 
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+}
+
 libxnoise_package() {
 	short_desc+=" - shared library"
 	pkg_install() {

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (82 preceding siblings ...)
  2021-01-09 16:37 ` sgn
@ 2021-01-09 16:37 ` sgn
  2021-01-10 11:24 ` [PR PATCH] [Updated] " sgn
                   ` (9 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-09 16:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [x] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [x] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [x] pidgin-libnotify
- [x] pidgin-otr
- [x] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [x] uget
- [ ] vte290
- [x] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [x] xsane
- [x] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (83 preceding siblings ...)
  2021-01-09 16:37 ` sgn
@ 2021-01-10 11:24 ` sgn
  2021-01-10 14:47 ` sgn
                   ` (8 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-10 11:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 311 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 81725 bytes --]

From 99954dc11161ff3a15c4e9da6ed0a686e74eabde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/62] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 1f2af91881924523408a105c39583c7d03d3846b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/62] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 65da8b49db55ba288d3a90036c175add56014695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/62] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 a547ba12d6bab1f592eb80703b3158a3889fcdf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/62] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 9c52a0ad50df40f211626fdc46f2250e473dc0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/62] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 096eceaf1e6b00f1f77fa5752d9c4f18aae16433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 06/62] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 26365bd0b170e5d1aa6c7cbd3b0a3d0c63cfd3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 07/62] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From ae3227d27721f7c854ce131a9591e39642ea01dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 08/62] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 86114e334aa91f6e7b21b25204c8236d250b5f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/62] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 4939062980bfe5f277f4292bf5aca95d145de129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/62] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 36a09089357bece1f903ea29291f9485472abf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 11/62] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 73ec50590ac511be5a01476fb24836230bbe1650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 12/62] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 6bda78717e99f1cdc0ba07e12b9d4a4c4a0a735e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 13/62] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From a7984dd0ee02c5627085123b03624611e0d4e612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 14/62] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 81c6b61bd6d1240a25541a67a70efff22224c771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 15/62] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 94d000c3d7333dfe2b7039f13872676d6462c5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 16/62] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3766280971e0c0254f469d0d378633261f7a3a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 17/62] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From ed34c38cb5831d87bd1c578e54ef53ffcde70093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 18/62] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4a11fc76c763b03366a49965b1e75df2af8267f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 19/62] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2a4a1c87f41fc2c0ab89c2de7e23a7cef21abe59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 20/62] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From 4080ea8b97a8c5068c3c607dde301fdb034ce588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 21/62] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 62ad0e63957dea76be529ad686396d3d18dcbb1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 22/62] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 03b7fb95e4dd567d02efdaaa69ef1b7989520b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 23/62] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 71124a308ba824b9db0b9f4bb86636794dfdc149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 24/62] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 571982d8805508fe3fcd2a3ea2b446461c7dc2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 25/62] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From 8ec2de345bd4198b69d2ba44e6d6141e49e66b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 26/62] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b1b337518245fb6a36f234952d1880dca188fbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 27/62] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4bd7f9e4e67e5624eeb95804110b2d70863fd41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 28/62] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 40c127af02ff8237a412f3003d23271ecf39416d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 29/62] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 18395e0bf4b5a491be46d3e408b661503b016c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 30/62] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3389d9487ae4a5b81f9035c188e24054cf974331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 31/62] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2989aa55fa021405332d0033bd14d1b60f68681c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 32/62] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 7dbcc6d1efdfc652af1f801ebff88e61a90c215b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 33/62] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From de4c3a87eff532f6bbdab3caf8b307ff07c40f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 34/62] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From d6f2c2b754f16af3ea04ec1a8fad4fd4cde7afdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 35/62] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 5874280dbc2129bc0d774bbeee3b8994e973c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 36/62] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 717e5d3904fe8f3cb696f073065f40225c808bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 37/62] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From e60400401d926cfe6d32ea6f51a0e5df9f1f8d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 38/62] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From bfb0dca7df337948e6aca8cc958c208e59ce309e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:28:38 +0700
Subject: [PATCH 39/62] libwnck2: fix l10n dir

---
 srcpkgs/libwnck2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index 313ce31e34a..e95a1133b4f 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,7 +1,7 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=8
+revision=9
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"

From fcbac219821b0e5811527c56409be4c078c792cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 40/62] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 68396799ed920a77f361e5d2a704be23f7395c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 41/62] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6b094757ff804de3b30fff5707a3ac98f669a336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 42/62] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 02548c39118e0d8e01531b798b7c794809d64c7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 43/62] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 0aa7bfeababcf50637be7d886b392940ea30b06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 44/62] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 0a6276b84194be5788c7acdd8084480d3e1ae909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 45/62] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2de7daf58fc1334034c157e33bb9d59bc62612ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 46/62] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 529d143841146945cb7bb2161beddef3728e2b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 47/62] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 84e6a1bead8f769da80bb8787a541084f6793c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 48/62] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 54ee2515b7c72595ad00c1d7f3a4fdb8fcbeee1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 49/62] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 7aeeda4e9cd34ebc78ff01ece4ee98d81abb48d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 50/62] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From dd286f5d0564a6a9e6928fe38067cd948ba60a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 51/62] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 6149201a28b54714d6680e2714790c7da78b9dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 52/62] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

From e0c64d0b04b71a13c6c078c71a3f04b9110a842a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 17:42:13 +0700
Subject: [PATCH 53/62] fixup! glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch
index a666d8205c8..817a2cd1c47 100644
--- a/srcpkgs/glib/patches/honour-localedir.patch
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -6,7 +6,7 @@
  datarootdir=`eval echo "${datarootdir}"`
 -if test "x$CATOBJEXT" = "x.mo" ; then
 +if test "x$localedir" != "x" ; then
-+  :
++  localedir=`eval echo "${localedir}"`
 +elif test "x$CATOBJEXT" = "x.mo" ; then
    localedir=`eval echo "${libdir}/locale"`
  else

From 9ee3bfc5914dd09b98f4022ebd9def77e8435cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 54/62] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From 02d8c086104df01f6e2162b9c6eb7e01bf7a6ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 55/62] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From edf6157075511a1cd4822b6817f5079dc27ae74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 56/62] lxappearance: load l10n from /usr/share

---
 srcpkgs/lxappearance/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 9b81dd8bf73b7e3c33bfbb3b5f6a151c11ae2b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 57/62] spacefm: fix l10n dir

---
 srcpkgs/spacefm/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 05c5e0dd6369f71e74dbf3c3b41992e305bf9d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 58/62] udevil: fix l10n dir

---
 srcpkgs/udevil/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From ff9293e8e1cd4c02ef29bd28b8a6078d268cf887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:27:05 +0700
Subject: [PATCH 59/62] ufraw: fix l10n dir

---
 srcpkgs/ufraw/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index c238ef73f56..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -1,11 +1,11 @@
 # Template file for 'ufraw'
 pkgname=ufraw
 version=0.22
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
  $(vopt_enable extras)"
-hostmakedepends="pkg-config dcraw"
+hostmakedepends="pkg-config dcraw gettext"
 makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel
  jasper-devel"
 depends="desktop-file-utils"
@@ -24,6 +24,9 @@ post_patch() {
 		-i dcraw_api.cc \
 		-i ufraw_ufraw.c \
 		-i ufraw_developer.c
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
 }
 
 ufraw-gimp_package() {

From 499385f11ce14d85cd32add6e8aaf474b04ee983 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:06:35 +0700
Subject: [PATCH 60/62] uget: fix l10n dir

---
 srcpkgs/uget/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index 050eb3a9790..e82aa99ea34 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -13,3 +13,9 @@ distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
 checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From 99dc3178175cfc8a3afdc5f24b9fb4aca7b8783d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:19:48 +0700
Subject: [PATCH 61/62] viking: fix l10n dir

---
 srcpkgs/viking/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index e0807418eca..6f7a469c204 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,7 +1,7 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
@@ -20,3 +20,9 @@ checksum=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8
 patch_args="-Np1"
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From d4380320a07436fc7fca22f9c599883048716b5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:23:03 +0700
Subject: [PATCH 62/62] xsane: fix l10n dir

---
 srcpkgs/xsane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e946..8a2fbfe7c81 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,7 +1,7 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=3
+revision=4
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (84 preceding siblings ...)
  2021-01-10 11:24 ` [PR PATCH] [Updated] " sgn
@ 2021-01-10 14:47 ` sgn
  2021-01-10 14:53 ` [PR PATCH] [Updated] " sgn
                   ` (7 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-10 14:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1215 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-757132965

Comment:
Tested:
- [x] GConf
- [x] ario
- [x] appdata-tools
- [x] brasero
- [x] dia
- [x] desmume
- [x] gdmap
- [x] gconf-editor
- [x] gimp-lqr-plugin
- [x] gmpc
- [x] geeqie
- [x] gnome-system-log
- [x] gnome-mime-data
- [x] gnumeric
- [x] gnome-mplayer
- [x] gnome-nettool
- [ ] gnome-doc-utils
- [x] gpicview
- [ ] gnome-screensaver
- [ ] gtk+
- [x] gtkspell
- [x] gxmessage
- [ ] gtk2-engines (remove?)
- [x] gtkpod
- [ ] gtksourceview2
- [x] homebank
- [x] leafpad
- [ ] libcryptui
- [ ] libgpod
- [ ] libglib-static
- [ ] libgnome-keyring
- [ ] libgnomecanvas
- [x] libwnck2
- [ ] lightdm-gtk-greeter
- [ ] lxappearance-obconf
- [x] lxinput
- [x] lxlauncher
- [x] pcmanx-gtk2
- [x] parcellite
- [ ] pmount
- [x] pidgin-libnotify
- [x] pidgin-otr
- [x] pidgin-privacy-please
- [ ] polkit-gnome
- [x] pragha
- [ ] seahorse-nautilus
- [ ] seahorse-sharing
- [x] spacefm
- [x] tilp2
- [x] udevil
- [x] ufraw
- [x] uget
- [ ] vte290
- [x] viking
- [x] volumeicon
- [x] xdg-user-dirs-gtk
- [x] xsane
- [ ] xnoise
- [x] xournal


^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (85 preceding siblings ...)
  2021-01-10 14:47 ` sgn
@ 2021-01-10 14:53 ` sgn
  2021-01-12  1:27 ` sgn
                   ` (6 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-10 14:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 80173 bytes --]

From 44cfdc0ca440db70f11fd23755dcdd35e0c3c793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/60] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..817a2cd1c47
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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
++  localedir=`eval echo "${localedir}"`
++elif test "x$CATOBJEXT" = "x.mo" ; then
+   localedir=`eval echo "${libdir}/locale"`
+ else
+   localedir=`eval echo "${datadir}/locale"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 489cd8fbc53fe8dafdc5e1f8f0a257be533b5a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/60] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From 685ce1f25b5c250eeea0ead1b55a7880b40d80d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/60] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 8548e340dcde60adc105df63b054e40263feceb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/60] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 5511d3f60663f644ad7eef361f5005c626417aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/60] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From c32bf4705244282dfbfaa34f2dd413c4c1a35a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 06/60] brasero: fix l10n dir

---
 srcpkgs/brasero/template | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9ff2a6468ea 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,10 +1,11 @@
 # Template file for 'brasero'
 pkgname=brasero
 version=3.12.2
-revision=5
+revision=6
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--disable-schemas-compile --disable-caches"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-compile --disable-caches"
 hostmakedepends="pkg-config intltool cdrtools itstool"
 makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel
  libcanberra-devel nautilus-devel libisofs-devel
@@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 brasero-devel_package() {
 	depends="gtk+3-devel brasero>=${version}_${revision}"
 	short_desc+=" - development files"

From 6f8282b987e0aed7ff98fb2b2bc8cf968af2d554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 07/60] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From d5d0ae4f391042f4fb87bd45fc470e51bb381fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 08/60] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 2f8999d7e2f08bc2b49138eeefc2bb6fd4e2bd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/60] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..3fa52ae695c 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,8 +1,9 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
@@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
 if [ -n "$CROSS_BUILD" ]; then
+configure_args="--with-locales-dir=/usr/share/locale"
 	hostmakedepends+=" gettext-devel glib-devel"
 fi
 

From 3cd71f560647aa5d3198914b5ff979c2cb4987f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 10/60] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 1419bed7f2b982fa849afbf4ea3203010d088508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 11/60] xdg-user-dirs-gtk: fix l10n dir

---
 srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..b89f1e28d63 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,8 +1,9 @@
 # Template file for 'xdg-user-dirs-gtk'
 pkgname=xdg-user-dirs-gtk
 version=0.10
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool xdg-user-dirs"
 makedepends="gtk+3-devel xdg-user-dirs"
 depends="xdg-user-dirs"
@@ -12,3 +13,9 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
 checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From ae93e220f375fca196d80afb38acc18a9275d02a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 12/60] dia: fix l10n dir

---
 srcpkgs/dia/template | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..4a4037c9cc4 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,19 @@
 # Template file for 'dia'
 pkgname=dia
 version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
 short_desc="GTK+ based diagram creation program"
 maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
 checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b6894a6b735941cc5c930e013ae8bb10d2720a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 13/60] gconf-editor: fix l10n dir

---
 srcpkgs/gconf-editor/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..4046a204711 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,9 +1,10 @@
 # Template file for 'gconf-editor'
 pkgname=gconf-editor
 version=3.0.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
+ --with-locales-dir=/usr/share/locale
  --with-gconf-schema-file-dir=/usr/share/gconf/schemas"
 hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which"
 makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
@@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
 depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
 short_desc="Graphical editor to maintain the Gnome registry"
 maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
-license="GPL-2"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
 	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \

From 3d9cbb2d837cec26f7e23d5ca0d6385c6347e2b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 14/60] gdmap: fix l10n dir

---
 srcpkgs/gdmap/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..2dc46b6e074 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,9 +1,9 @@
 # Template file for 'gdmap'
 pkgname=gdmap
 version=0.8.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="LIBS=-lm"
+configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Graphical Disk Map"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
 homepage="http://gdmap.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e9416d00175a9a30af100684362575a44e3b28fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 15/60] gimp-lqr-plugin: fix l10n dir

---
 srcpkgs/gimp-lqr-plugin/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..45d8ce44f05 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,8 +1,9 @@
 # Template file for 'gimp-lqr-plugin'
 pkgname=gimp-lqr-plugin
 version=0.7.2
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake intltool pkg-config"
 makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
 short_desc="Gimp plugins for image resizing through seam carving"
@@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
 checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From bce2d2dd23510db55f5bc9c4dcdf7bf09651f2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 16/60] gmpc: fix l10n dir

---
 srcpkgs/gmpc/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..f3283baafb8 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,8 +1,9 @@
 # Template file for 'gmpc'
 pkgname=gmpc
 version=11.8.16
-revision=2
+revision=3
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config gob2 intltool vala"
 makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
 depends="xdg-utils hicolor-icon-theme"
@@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
 
 LDFLAGS="-lm"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gmpc-devel_package() {
 	short_desc+=" - development files"
 	depends="gtk+-devel libmpd-devel"

From fa02b132122e272bcbe43d55724e08fb90de8c21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 17/60] gnome-mime-data: fix l10n dir

---
 srcpkgs/gnome-mime-data/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..4bb4769baa2 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,8 +1,9 @@
 # Template file for 'gnome-mime-data'
 pkgname=gnome-mime-data
 version=2.18.0
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool shared-mime-info"
 makedepends="shared-mime-info"
 depends="shared-mime-info"
@@ -12,5 +13,8 @@ license="GPL-2.0-only"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
 checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
 conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 91e7b8769cc9e5abb1f68458209a78d041e73c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 18/60] gnome-mplayer: fix l10n dir

---
 srcpkgs/gnome-mplayer/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..1ec69337940 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,9 +1,10 @@
 # Template file for 'gnome-mplayer'
 pkgname=gnome-mplayer
 version=1.0.9
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-schemas-install"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-schemas-install"
 hostmakedepends="pkg-config intltool glib-devel"
 # XXX missing libgpod
 makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel
@@ -18,3 +19,8 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
 checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+}

From c6c6b98a40b7f1341e4b8e558eff110c320df738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 19/60] gnome-nettool: fix l10n dir

---
 srcpkgs/gnome-nettool/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..fad533c4901 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,21 @@
 # Template file for 'gnome-nettool'
 pkgname=gnome-nettool
 version=3.8.1
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="glib-devel intltool itstool pkg-config"
 makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
  gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
 depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
  traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 62b109cccfede3128479a27835d83efa0de2f5d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 20/60] gnome-system-log: fix l10n dir

---
 srcpkgs/gnome-system-log/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..653a2a94fce 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-system-log'
 pkgname=gnome-system-log
 version=3.9.90
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-schemas-compile"
+configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile"
 hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel"
 depends="hicolor-icon-theme desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
 checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 9402ae21e47beb6c2efeea64e0c85ffadf5eb082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 21/60] gnumeric: fix l10n dir

---
 srcpkgs/gnumeric/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
 # Template file for 'gnumeric'
 pkgname=gnumeric
 version=1.12.48
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
 makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --without-perl"
 fi
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 gnumeric-devel_package() {
 	depends="gnumeric>=${version}_${revision}"
 	short_desc+=" - development files"

From 79030c8128f956d8461f60713dc79b2a3a0990b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 22/60] gpicview: fix l10n dir

---
 srcpkgs/gpicview/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..be07a3dc96d 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,9 +1,9 @@
 # Template file for 'gpicview'
 pkgname=gpicview
 version=0.2.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils"
 depends="desktop-file-utils"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
 patch_args="-Np1"
 
-pre_configure() {
-	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }

From c6b41d0a2791dc1e2a938dd7cd8498068e713b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 23/60] gtkpod: fix l10n dir

---
 srcpkgs/gtkpod/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..15c75642635 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,9 +1,9 @@
 # Template file for 'gtkpod'
 pkgname=gtkpod
 version=2.1.5
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="flex intltool pkg-config glib"
 makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel
  libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
 python_version=2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3379a12065d72ae81aa54003578f3e2ea0ce17db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 24/60] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 3e1e0e7447b5f994f9cb8ce6bde6f4018b2b291a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 25/60] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 235cbc795cc4d733661e184d587398e01d02610f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 26/60] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2cf7f05e3b4313d4cd16182efd366272f67ad0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 27/60] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From e2ca7147350a390ac61d945afd6e1eb9b4dc22be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 28/60] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From 6dbf03da37a1f5f41af7012d1ece14bc574f5f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 29/60] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From 186db1d256ac5d77b6f307366aa756ba15c5016d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 30/60] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From ef866311a5ad626a54f8496685591494bcfaf4d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 31/60] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From c154876c6e1bed2a239e702d5ac584ed0d225a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 32/60] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 1f315b40028fb8a1cfd0c3c1f9bf8e1894cd76f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 33/60] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From a022dc784c2990b6ebc7496a8b5583529c980753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 34/60] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 5261dbf28ede99945da17c3457f79356a8e3265e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 35/60] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 049f3b5b10f529ba6db2d609dc3feb11a614c6d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 36/60] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 97b543d943cb49212d0a237a02ee87c9023a5cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 37/60] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From de8b09ae279ff111af2611b9d08b55db1dcb83f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 38/60] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 5d5c2f571187a6c3df718b84949c511225aea498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:28:21 +0700
Subject: [PATCH 39/60] genius: load l10n from /usr/share

---
 srcpkgs/genius/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/genius/template b/srcpkgs/genius/template
index 395d5c530a0..2434a9d3d2a 100644
--- a/srcpkgs/genius/template
+++ b/srcpkgs/genius/template
@@ -1,7 +1,7 @@
 # Template file for 'genius'
 pkgname=genius
 version=1.0.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-update-mimedb ac_cv_file__proc_self_maps=yes
  GTK_UPDATE_ICON_CACHE=gtk-update-icon-cache"
@@ -20,4 +20,5 @@ nocross="run the binaries"
 post_patch() {
 	vsed -i -e '/PKG_CHECK_MODULES/s/ncurses/ncursesw/' configure.ac
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }

From ebdb757eb90b9ee120b234fdf570e86d17c743e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 40/60] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From f9089c033d217f787bdd957f2122c46d07d14539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:56:47 +0700
Subject: [PATCH 41/60] lxappearance: load l10n from /usr/share

---
 srcpkgs/lxappearance/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template
index 33b739278c4..33d768aeb94 100644
--- a/srcpkgs/lxappearance/template
+++ b/srcpkgs/lxappearance/template
@@ -1,7 +1,7 @@
 # Template file for 'lxappearance'
 pkgname=lxappearance
 version=0.6.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="$(vopt_enable dbus) $(vopt_enable gtk3)"
 hostmakedepends="pkg-config intltool"
@@ -16,3 +16,7 @@ checksum=7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38
 
 build_options="gtk3 dbus"
 build_options_default="dbus gtk3"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From da4b55d5225cad29fad57db1f0b749f69c0b4587 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 42/60] spacefm: fix l10n dir

---
 srcpkgs/spacefm/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From f1e51abea96bf56fa70e207630acad1116d0ecae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 43/60] udevil: fix l10n dir

---
 srcpkgs/udevil/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From b791b6e735b248f4785324961431ed5d014d7ce7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:27:05 +0700
Subject: [PATCH 44/60] ufraw: fix l10n dir

---
 srcpkgs/ufraw/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index c238ef73f56..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -1,11 +1,11 @@
 # Template file for 'ufraw'
 pkgname=ufraw
 version=0.22
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
  $(vopt_enable extras)"
-hostmakedepends="pkg-config dcraw"
+hostmakedepends="pkg-config dcraw gettext"
 makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel
  jasper-devel"
 depends="desktop-file-utils"
@@ -24,6 +24,9 @@ post_patch() {
 		-i dcraw_api.cc \
 		-i ufraw_ufraw.c \
 		-i ufraw_developer.c
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
 }
 
 ufraw-gimp_package() {

From 3a28f99c7fbbe32479da7b372a13041052545acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:06:35 +0700
Subject: [PATCH 45/60] uget: fix l10n dir

---
 srcpkgs/uget/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index 050eb3a9790..e82aa99ea34 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -13,3 +13,9 @@ distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
 checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From b4f81f8260c3a9185b98341cb62428e0da4de93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:19:48 +0700
Subject: [PATCH 46/60] viking: fix l10n dir

---
 srcpkgs/viking/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index e0807418eca..6f7a469c204 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,7 +1,7 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
@@ -20,3 +20,9 @@ checksum=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8
 patch_args="-Np1"
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From 044be992095100aaf40551d140f563ffb7dc3c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:23:03 +0700
Subject: [PATCH 47/60] xsane: fix l10n dir

---
 srcpkgs/xsane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e946..8a2fbfe7c81 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,7 +1,7 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=3
+revision=4
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"

From dca2c18ceab3958ffd09c6bf4f6a9fab03914a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 48/60] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From b872d676b3f6c4c18ffcea4bc3dc4e79df2afec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 49/60] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 5121e9ef12d4a85007154056094e95310b6b406a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 50/60] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 2ddcd1f276b6f5294209a2d4cc85f52b11bf3407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 51/60] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 6703f195453add3ca01869339c3c25d6a46ada0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 52/60] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 6825f0b49368fba6ef0bd1380a357d8115d7038e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 53/60] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 8f927509f6e7361525851d0fa401aa2bfa0063ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 54/60] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3c39614805d9ca455ecc404a3b8274b9b9d92ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 55/60] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From fcc2b4a6be7fde29d58917ed075f98a7cb4c0a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 56/60] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 793d076337657bd0eecd61b893ae741caf1f69b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 57/60] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From bdcbb28319d78dbd453ec4f08e32e752a11241a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 58/60] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From 6b4c324b62a6e19231e2bfc0e598d5b8c912137e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 59/60] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From bef8f70b902e6f030a754d0ead0c8b849e4b90d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 60/60] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (86 preceding siblings ...)
  2021-01-10 14:53 ` [PR PATCH] [Updated] " sgn
@ 2021-01-12  1:27 ` sgn
  2021-01-12 15:33 ` sgn
                   ` (5 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-12  1:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 60231 bytes --]

From cebb598f0297db9a27c54300f262cb8f5c2b442f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/44] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..817a2cd1c47
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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
++  localedir=`eval echo "${localedir}"`
++elif test "x$CATOBJEXT" = "x.mo" ; then
+   localedir=`eval echo "${libdir}/locale"`
+ else
+   localedir=`eval echo "${datadir}/locale"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 d5ebd73514388cd554f01431a359c2f142323bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/44] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From d6b2c5ad2bf0fe8fb504a68934c7124bee9efb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/44] geeqie: fix localedir

---
 srcpkgs/geeqie/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..b82ec9f14e4 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"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+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 032817495b6bde1d55b55cb91f91474dc24b8093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/44] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..7e46118f652 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,19 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 739ee6542817e1a6db465ac82d621574f73ac4d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/44] ario: fix l10n dir

---
 srcpkgs/ario/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c6c25dc8251 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 0a22fd4ffba2d74b7606f1511c8bfbae48b5bdb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 06/44] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..b38fe7df570 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,10 +1,11 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
+ --with-locales-dir=/usr/share/locale
  --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html
  $(vopt_enable gir introspection)"
 conf_files="/etc/gconf/2/path"
@@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 99dd6cb207b93cc591a376ce53e2f6347923609b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 07/44] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..281d12393b6 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,8 +1,9 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"
 makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel

From 846ea00308c4c438856ff1eae6b6fe32a9b7f107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 08/44] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..b832fa32d3a 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,9 +1,11 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake bison groff intltool libtool pkg-config
+ texinfo gettext-devel glib-devel"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
  libticalcs2-devel"
@@ -15,10 +17,6 @@ homepage="https://www.ticalc.org"
 distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${version}.tar.bz2"
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" gettext-devel glib-devel"
-fi
-
 pre_configure() {
 	mkdir -p m4
 	autoreconf -i -v -f

From adead20885419ed7236f5f38055b65ed12b52ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/44] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..8c13bec2d12 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,16 +1,16 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-notify"
+configure_args="--with-locales-dir=/usr/share/locale --enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
 makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From afd049585e7d4ecf38a6317f24eaddec85848115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 10/44] gtkspell: fix l10n dir

---
 srcpkgs/gtkspell/template | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..2b185f6ee9a 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
 # Template file for 'gtkspell'
 pkgname=gtkspell
 version=2.0.16
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="enchant2-devel gtk+-devel"
 short_desc="Provides word-processor-style highlighting"
 maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
 license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
 
-pre_configure() {
-	sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's/enchant/enchant-2/g' \
+		configure
 }
 
 gtkspell-devel_package() {

From 2f5965e85c3f1901954a75254910ffc9739e87c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 11/44] gxmessage: fix l10n dir

---
 srcpkgs/gxmessage/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..0d349d8bbe5 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,18 @@
 # Template file for 'gxmessage'
 pkgname=gxmessage
 version=3.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
 maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
 checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 8244d105e95b69fe7f35e1d40daf49c73a39af08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 12/44] homebank: fix l10n dir

---
 srcpkgs/homebank/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..c987e54e0e7 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,8 +1,9 @@
 # Template file for 'homebank'
 pkgname=homebank
 version=5.4.3
-revision=1
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
 depends="shared-mime-info hicolor-icon-theme desktop-file-utils"
@@ -12,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://homebank.free.fr/"
 distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
 checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From ba1eb04d49c0130ab53faf07da7eb2939e280e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 13/44] leafpad: fix l10n dir

---
 srcpkgs/leafpad/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..bd613e392ae 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,21 @@
 # Template file for 'leafpad'
 pkgname=leafpad
 version=0.8.18.1
-revision=4
+revision=5
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
 makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
 license="GPL-2.0-or-later"
 homepage="http://tarot.freeshell.org/leafpad/"
 distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
 checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}

From 962c00d33a69e82ae0f913f3c5085abe9e8c24b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:24:46 +0700
Subject: [PATCH 14/44] libgnome-keyring: fix l10n dir

---
 srcpkgs/libgnome-keyring/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template
index 41c6b31f4f3..193b8b21994 100644
--- a/srcpkgs/libgnome-keyring/template
+++ b/srcpkgs/libgnome-keyring/template
@@ -1,10 +1,10 @@
 # Template file for 'libgnome-keyring'
 pkgname=libgnome-keyring
 version=3.12.0
-revision=4
+revision=5
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool"
 makedepends="dbus-devel libglib-devel libgcrypt-devel"
 checkdepends="glib-devel"
@@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libgnome-keyring-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From b9c29ac6fb7384afb4c2a32029dc33a00ac8c413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 15/44] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..bbd4fc3ad5b 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,9 +1,9 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
+configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
 makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel"
 short_desc="Shared library to access the contents of an iPod"

From 53e71aba7867a041461ab7ed2af484b444cde90b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:27:53 +0700
Subject: [PATCH 16/44] libwnck2: fix l10n dir

---
 srcpkgs/libwnck/template  | 2 +-
 srcpkgs/libwnck2/template | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template
index 07068c2b5f9..1033388b4d4 100644
--- a/srcpkgs/libwnck/template
+++ b/srcpkgs/libwnck/template
@@ -4,7 +4,7 @@ version=3.36.0
 revision=1
 build_style=meson
 build_helper="gir"
-#configure_args="$(vopt_enable gir introspection)"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
 hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel
  $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel gtk+3-devel libXres-devel"
diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template
index eff87a30f29..313ce31e34a 100644
--- a/srcpkgs/libwnck2/template
+++ b/srcpkgs/libwnck2/template
@@ -1,11 +1,11 @@
 # Template file for 'libwnck2'
 pkgname=libwnck2
 version=2.30.7
-revision=7
+revision=8
 wrksrc="${pkgname/2/}-${version}"
 build_style=gnu-configure
 build_helper="gir"
-configure_args="$(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)"
 makedepends="startup-notification-devel libXres-devel gtk+-devel"
 short_desc="Library for layout and rendering of text (GTK+2)"
@@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	rm -rf ${DESTDIR}/usr/bin
 }

From 39cfc5a778101a782b2a07531b1c80ff36e4f439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:30:30 +0700
Subject: [PATCH 17/44] lxinput: fix l10n dir

---
 srcpkgs/lxinput/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template
index f5689634fb8..8736f3f854a 100644
--- a/srcpkgs/lxinput/template
+++ b/srcpkgs/lxinput/template
@@ -1,9 +1,9 @@
 # Template file for 'lxinput'
 pkgname=lxinput
 version=0.3.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel"
 depends="desktop-file-utils"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From d03ebf970f5380bc20611662213512c40bc2ed66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:31:14 +0700
Subject: [PATCH 18/44] lxlauncher: fix l10n dir

---
 srcpkgs/lxlauncher/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template
index d9817999fb3..44f7b806ea5 100644
--- a/srcpkgs/lxlauncher/template
+++ b/srcpkgs/lxlauncher/template
@@ -1,9 +1,9 @@
 # Template file for 'lxlauncher'
 pkgname=lxlauncher
 version=0.2.5
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+3-devel startup-notification-devel menu-cache-devel"
 conf_files="
@@ -17,3 +17,7 @@ homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From fbad48244bedf1ae7044766b406a39a6b69baff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:33:19 +0700
Subject: [PATCH 19/44] pcmanx-gtk2: fix l10n dir

---
 srcpkgs/pcmanx-gtk2/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template
index 18951baf76c..68269d5fea0 100644
--- a/srcpkgs/pcmanx-gtk2/template
+++ b/srcpkgs/pcmanx-gtk2/template
@@ -1,16 +1,16 @@
 # Template file for 'pcmanx-gtk2'
 pkgname=pcmanx-gtk2
 version=1.3
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--enable-iplookup --enable-proxy
+configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy
  $(vopt_enable libnotify) $(vopt_enable wget)"
 hostmakedepends="pkg-config intltool gettext"
 makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)"
 depends="$(vopt_if wget wget)"
 short_desc="Easy-to-use telnet client mainly for BBS users"
 maintainer="Casper Ti. Vector <caspervector@gmail.com>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="https://github.com/pcman-bbs/pcmanx"
 distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz"
 checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a
@@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency"
 desc_option_wget="Enable wget dependency"
 build_options_default="libnotify wget"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vdoc README
 	vdoc TODO

From 71280277531a901999fa5c6675ccd43db1b0602a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:41 +0700
Subject: [PATCH 20/44] pidgin-libnotify: fix l10n dir

---
 srcpkgs/pidgin-libnotify/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template
index 2dfbcdf5db1..bc71b0e602c 100644
--- a/srcpkgs/pidgin-libnotify/template
+++ b/srcpkgs/pidgin-libnotify/template
@@ -1,15 +1,20 @@
 # Template file for 'pidgin-libnotify'
 pkgname=pidgin-libnotify
 version=0.14
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-deprecated --disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static"
 hostmakedepends="intltool pkg-config"
 makedepends="pidgin-devel libnotify-devel"
 short_desc="Pidgin plugin that enables popups when someone logs in or messages you"
 maintainer="Kharlamov Alexey <der@2-47.ru>"
-license="GPL-3.0-or-later"
+# See its only source file pidgin-libnotify.c
+license="GPL-2.0-or-later"
 homepage="http://gaim-libnotify.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz"
 checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe
 lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From e055bcd10f736d0d700f9c24c3f257f768e6f0c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:36:45 +0700
Subject: [PATCH 21/44] pidgin-otr: fix l10n dir

---
 srcpkgs/pidgin-otr/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template
index 0cda9a5b705..1ec42101f17 100644
--- a/srcpkgs/pidgin-otr/template
+++ b/srcpkgs/pidgin-otr/template
@@ -1,14 +1,19 @@
 # Template file for 'pidgin-otr'
 pkgname=pidgin-otr
 version=4.0.2
-revision=1
-lib32disabled=yes
+revision=2
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="pidgin-devel libgcrypt-devel libotr-devel"
 short_desc="Off-the-Record Messaging plugin for Pidgin IM"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
 homepage="http://www.cypherpunks.ca/otr/"
 distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz"
 checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4
+lib32disabled=yes
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 4625735236c1f20981008257fad6331070acacdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:38:20 +0700
Subject: [PATCH 22/44] pidgin-privacy-please: fix l10n dir

---
 srcpkgs/pidgin-privacy-please/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template
index 6b9c1d15be0..18499372923 100644
--- a/srcpkgs/pidgin-privacy-please/template
+++ b/srcpkgs/pidgin-privacy-please/template
@@ -1,10 +1,12 @@
 # Template file for 'pidgin-privacy-please'
 pkgname=pidgin-privacy-please
 version=0.7.1
-revision=3
+revision=4
 build_style=gnu-configure
-makedepends="libpurple-devel pidgin-devel glib-devel"
-hostmakedepends="automake intltool libtool pkg-config $makedepends"
+configure_args="--with-locales-dir=/usr/share/locale"
+hostmakedepends="automake intltool libtool pkg-config libpurple-devel
+ pidgin-devel glib-devel"
+makedepends="libpurple-devel pidgin-devel libglib-devel"
 depends="pidgin"
 short_desc="Pidgin plugin to stop spam"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -12,3 +14,7 @@ license="GPL-3.0-or-later"
 homepage="https://packages.debian.org/sid/pidgin-privacy-please"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 533b4364c87d87d89a0f622f4929b220ef048a54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 23/44] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2322a5037c9 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,8 +1,9 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
@@ -11,7 +12,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From f765bacf01953fe762ed7665e4d5ce30a1576e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 24/44] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From 12cfde77bf169ad387d48f34a40f47201290e515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 18:50:07 +0700
Subject: [PATCH 25/44] xournal: fix l10n dir

---
 srcpkgs/xournal/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
index 80c842876de..08e01c3cd9a 100644
--- a/srcpkgs/xournal/template
+++ b/srcpkgs/xournal/template
@@ -1,12 +1,12 @@
 # Template file for 'xournal'
 pkgname=xournal
 version=0.4.8.2016
-revision=3
+revision=4
 build_style=gnu-configure
 make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel zlib-devel ghostscript-devel"
-makedepends+=" hicolor-icon-theme desktop-file-utils"
+hostmakedepends="autoconf automake pkg-config gettext"
+makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
+ zlib-devel ghostscript-devel"
 depends="hicolor-icon-theme desktop-file-utils ghostscript"
 short_desc="GPL Notetaking, sketching, and journal-keeping"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -14,3 +14,9 @@ homepage="http://xournal.sourceforge.net/"
 license="GPL-2"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
+
+post_patch() {
+	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}

From bcf35dcd35a68344d743d357547758578692b695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:16:55 +0700
Subject: [PATCH 26/44] spacefm: fix l10n dir

---
 srcpkgs/spacefm/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template
index d0b2d831418..f89a4cd5ad5 100644
--- a/srcpkgs/spacefm/template
+++ b/srcpkgs/spacefm/template
@@ -1,13 +1,12 @@
 # Template file for 'spacefm'
 pkgname=spacefm
 version=1.0.6
-revision=1
-build_options="gtk3"
+revision=2
 build_style=gnu-configure
-conf_files="/etc/spacefm/spacefm.conf"
-hostmakedepends="pkg-config intltool"
-makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel) startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 configure_args="$(vopt_with gtk3)"
+hostmakedepends="pkg-config intltool"
+makedepends="$(vopt_if gtk3 gtk+3-devel gtk+-devel)
+ startup-notification-devel eudev-libudev-devel ffmpegthumbnailer-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Multi-panel tabbed file manager"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -15,5 +14,12 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/spacefm/"
 distfiles="https://github.com/IgnorantGuru/spacefm/archive/${version}.tar.gz"
 checksum=fedea9fcad776e0af4b8d90c5a1c86684a9c96ef1cdd4e959530ce93bdebe7c9
+conf_files="/etc/spacefm/spacefm.conf"
 
+build_options="gtk3"
+build_options_default="gtk3"
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 57d1a3811b13fcf45d825a80c7a96020aca178d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:17:08 +0700
Subject: [PATCH 27/44] udevil: fix l10n dir

---
 srcpkgs/udevil/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template
index 699017010d2..b560bdf7589 100644
--- a/srcpkgs/udevil/template
+++ b/srcpkgs/udevil/template
@@ -1,7 +1,7 @@
 # Template file for 'udevil'
 pkgname=udevil
 version=0.4.4
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--disable-systemd"
 conf_files="/etc/udevil/udevil.conf"
@@ -13,3 +13,7 @@ license="GPL-3.0-or-later"
 homepage="http://ignorantguru.github.io/udevil/"
 distfiles="https://github.com/IgnorantGuru/udevil/archive/${version}.tar.gz"
 checksum=ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+}

From 96670e4aab05b9223d582f5317e3d82f66ed2c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 19:27:05 +0700
Subject: [PATCH 28/44] ufraw: fix l10n dir

---
 srcpkgs/ufraw/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ufraw/template b/srcpkgs/ufraw/template
index c238ef73f56..476435c6aba 100644
--- a/srcpkgs/ufraw/template
+++ b/srcpkgs/ufraw/template
@@ -1,11 +1,11 @@
 # Template file for 'ufraw'
 pkgname=ufraw
 version=0.22
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-contrast --enable-mime --enable-openmp --with-gimp
  $(vopt_enable extras)"
-hostmakedepends="pkg-config dcraw"
+hostmakedepends="pkg-config dcraw gettext"
 makedepends="exiv2-devel gimp-devel glib-devel gtkimageview-devel lcms2-devel lensfun-devel
  jasper-devel"
 depends="desktop-file-utils"
@@ -24,6 +24,9 @@ post_patch() {
 		-i dcraw_api.cc \
 		-i ufraw_ufraw.c \
 		-i ufraw_developer.c
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
 }
 
 ufraw-gimp_package() {

From 1bacb44f225bf3025074900ae3c98ff65463630c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:06:35 +0700
Subject: [PATCH 29/44] uget: fix l10n dir

---
 srcpkgs/uget/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/uget/template b/srcpkgs/uget/template
index 050eb3a9790..e82aa99ea34 100644
--- a/srcpkgs/uget/template
+++ b/srcpkgs/uget/template
@@ -1,7 +1,7 @@
 # Template file for 'uget'
 pkgname=uget
 version=2.2.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
 makedepends="libnotify-devel gtk+3-devel libcurl-devel gstreamer1-devel"
@@ -13,3 +13,9 @@ distfiles="${SOURCEFORGE_SITE}/urlget/${pkgname}-${version}.tar.gz"
 checksum=5cf7f311ef59bd02b71e0ce750dd37a0299ef15f9f6c6e7e60ffd175409abfc2
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From b6eaee5d5b24666e643a2fd670dfc8f008dd5dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:19:48 +0700
Subject: [PATCH 30/44] viking: fix l10n dir

---
 srcpkgs/viking/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/viking/template b/srcpkgs/viking/template
index e0807418eca..6f7a469c204 100644
--- a/srcpkgs/viking/template
+++ b/srcpkgs/viking/template
@@ -1,7 +1,7 @@
 # Template file for 'viking'
 pkgname=viking
 version=1.8
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-realtime-gps-tracking --disable-bluemarble
  --disable-bing --disable-terraserver --disable-spotmaps
@@ -20,3 +20,9 @@ checksum=855cbccd5f17ef0dc6d7e2d080a4b20383a079dfb882edd04dba602297030fa8
 patch_args="-Np1"
 
 CFLAGS="-fcommon"
+
+post_patch() {
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/localedir=.*eval/s,=.*,=/usr/share/locale,' \
+		configure
+}

From 11536a81068a2c305dadd0d9bb260ee8ba800a83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:23:03 +0700
Subject: [PATCH 31/44] xsane: fix l10n dir

---
 srcpkgs/xsane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e946..8a2fbfe7c81 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,7 +1,7 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=3
+revision=4
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"

From 06de04708e8e148f6a826b39978ff0984c6d2a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 32/44] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..b43a693c05a 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,8 +1,9 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
 short_desc="PolicyKit integration for the GNOME desktop"
@@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From 7d2166eda563c602c254ea13976f22369edc6100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:29:34 +0700
Subject: [PATCH 33/44] lxappearance-obconf: fix l10n dir

---
 srcpkgs/lxappearance-obconf/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template
index 33b0be4f0a4..46c4734a0c3 100644
--- a/srcpkgs/lxappearance-obconf/template
+++ b/srcpkgs/lxappearance-obconf/template
@@ -1,9 +1,9 @@
 # Template file for 'lxappearance-obconf'
 pkgname=lxappearance-obconf
 version=0.2.3
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="--disable-static --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3"
 hostmakedepends="pkg-config intltool"
 makedepends="
  openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel
@@ -15,3 +15,7 @@ license="GPL-2.0-or-later"
 homepage="http://lxde.org/"
 distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
 checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 1f0c5189b4c2206d1f3671d8c605f28c7589610a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:35:26 +0700
Subject: [PATCH 34/44] lightdm-gtk-greeter: fix l10n dir

---
 srcpkgs/lightdm-gtk-greeter/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template
index 574877b6369..30d7ac5d401 100644
--- a/srcpkgs/lightdm-gtk-greeter/template
+++ b/srcpkgs/lightdm-gtk-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-gtk-greeter'
 pkgname=lightdm-gtk-greeter
 version=1.8.5
-revision=4
+revision=5
 build_style=gnu-configure
-configure_args="--disable-static --with-gtk2
+configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2
  --enable-compile-warnings=no"
 conf_files="/etc/lightdm/lightdm-gtk-greeter.conf"
 hostmakedepends="pkg-config intltool"
@@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}.
 checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68
 conflicts="lightdm-gtk3-greeter>=0"
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 258615062c98fe783e113b65e95be81ab799d50a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:39:41 +0700
Subject: [PATCH 35/44] pmount: fix l10n dir

---
 srcpkgs/pmount/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template
index b95f2690b6b..b840e762971 100644
--- a/srcpkgs/pmount/template
+++ b/srcpkgs/pmount/template
@@ -1,18 +1,20 @@
 # Template file for 'pmount'
 pkgname=pmount
 version=0.9.23
-revision=6
-conf_files="/etc/pmount.allow"
+revision=7
 build_style=gnu-configure
-short_desc="Permits normal users to mount removable devices"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool"
 makedepends="libblkid-devel"
+short_desc="Permits normal users to mount removable devices"
+maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-3.0-only"
 homepage="http://pmount.alioth.debian.org/"
 distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2"
 checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036
+conf_files="/etc/pmount.allow"
 
-pre_configure() {
-	sed -i -e 's/-o root -g root //' src/Makefile.in
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+	vsed -i -e 's/-o root -g root //' src/Makefile.in
 }

From 12d542d90a07d1d48ae00e4954b77507a98c54f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 36/44] gnome-doc-utils: fix l10n dir

---
 srcpkgs/gnome-doc-utils/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..eb75c72bebf 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,9 +1,9 @@
 # Template file for 'gnome-doc-utils'
 pkgname=gnome-doc-utils
 version=0.20.10
-revision=7
+revision=8
 build_style=gnu-configure
-configure_args="--disable-scrollkeeper"
+configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper"
 hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
  gsettings-desktop-schemas"
 makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
 distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
 checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
 patch_args="-Np1"
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From b2fff652adb0699b3beb979efebed6305e3304cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 37/44] gtksourceview2: fix l10n dir

---
 srcpkgs/gtksourceview2/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..c16d57ba73f 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,10 +1,10 @@
 # Template file for 'gtksourceview2'
 pkgname=gtksourceview2
 version=2.10.5
-revision=6
+revision=7
 wrksrc="gtksourceview-${version}"
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libxml2-devel"
 short_desc="Text widget that extends GTK+ GtkTextView widget"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
 homepage="http://www.gnome.org"
 distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
 checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
 
 do_check() {
 	: #requires xserver

From 8f8fa6d1b39ee29e1081183c20562ef41ce62557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 38/44] gtk2-engines: fix l10n dir

---
 srcpkgs/gtk2-engines/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..b0afbc7b65e 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,15 +1,19 @@
 # Template file for 'gtk2-engines'
 pkgname=gtk2-engines
 version=2.21.0
-revision=4
+revision=5
 wrksrc=gtk-engines-${version}
 build_style=gnu-configure
-configure_args="--enable-animation"
+configure_args="--with-locales-dir=/usr/share/locale --enable-animation"
 hostmakedepends="pkg-config intltool"
 makedepends="gtk+-devel"
 short_desc="GTK+2 Theme engines"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/GnomeArt"
 distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
 checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From c3f130bb8d13e8e85edc57d58ad15dc074f07b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 39/44] gnome-screensaver: fix l10n dir

---
 srcpkgs/gnome-screensaver/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..6ee40a2ad5f 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
 # Template file for 'gnome-screensaver'
 pkgname=gnome-screensaver
 version=3.6.1
-revision=3
+revision=4
 build_style=gnu-configure
-configure_args="--enable-compile-warnings=minimum"
+configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum"
 hostmakedepends="pkg-config automake intltool glib-devel"
 makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
 depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
 maintainer="shizonic <realtiaz@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
 checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}

From 3dfbf845d44900607273c807f81bc53e8d916e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 40/44] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..9f6e50a1e42 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,10 +1,11 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
-configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
+configure_args="--with-locales-dir=/usr/share/locale --enable-man
+ $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)"
 makedepends="libglib-devel libXcursor-devel
  libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel
@@ -18,7 +19,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +29,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 592a595c8e20ed3eeff4e7990c345dd7b0728f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 41/44] libcryptui: fix l10n dir

---
 srcpkgs/libcryptui/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..922427179c2 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,11 +1,12 @@
 # Template file for 'libcryptui'
 pkgname=libcryptui
 version=3.12.2
-revision=2
+revision=3
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--disable-static --disable-update-mime-database
---disable-schemas-compile $(vopt_enable gir introspection)"
+ --with-locales-dir=/usr/share/locale
+ --disable-schemas-compile $(vopt_enable gir introspection)"
 hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg
  $(vopt_if gir gobject-introspection)"
 makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel
@@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
 build_options="gir"
 build_options_default="gir"
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 libcryptui-devel_package() {
 	depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"

From e35569ffaa15e61280625ba71f219e53738ed207 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 42/44] libglib-static: fix l10n dir, conflicts with
 libglib-devel

---
 srcpkgs/libglib-static/template | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..e3ff6e7ffc6 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,10 +5,11 @@
 #
 pkgname=libglib-static
 version=2.58.3
-revision=4
+revision=5
 wrksrc="glib-${version}"
 build_style=gnu-configure
-configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
+configure_args="--with-locales-dir=/usr/share/locale
+ --enable-libelf --disable-fam --disable-shared --with-pcre=system
  --enable-static"
 hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
@@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
 checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" glib-devel"
@@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then
 	esac
 fi
 
+post_patch() {
+	# Better to just rm -rf /usr/lib/locale in post_install?
+	vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+		-e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+		m4macros/glib-gettext.m4
+	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+		po/Makefile.in.in
+}
+
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
 }

From 6d6721ba7e8a781e457ae31ba7bfadd4bb29293e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:23:37 +0700
Subject: [PATCH 43/44] libgnomecanvas: fix l10n dir

---
 srcpkgs/libgnomecanvas/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template
index 53d66f4f5d1..10ceb3d3c0d 100644
--- a/srcpkgs/libgnomecanvas/template
+++ b/srcpkgs/libgnomecanvas/template
@@ -1,18 +1,24 @@
 # Template file for 'libgnomecanvas'
 pkgname=libgnomecanvas
 version=2.30.3
-revision=9
+revision=10
 build_style=gnu-configure
-configure_args="--disable-static"
+configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool glib-devel"
 makedepends="gtk+-devel libart-devel"
 short_desc="GNOME Canvas library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="http://gnome.org/"
-distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
+distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
 checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+		-e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+		configure
+}
+
 libgnomecanvas-devel_package() {
 	depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" -- development files"

From 729b87d0d8c7ba7c1e9a8d3d1503f8b2db67e461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 08:01:55 +0700
Subject: [PATCH 44/44] DO NOT MERGE GitHub Workflows: turn off do_check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d8328911eec..e1c142f738c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -41,11 +41,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (87 preceding siblings ...)
  2021-01-12  1:27 ` sgn
@ 2021-01-12 15:33 ` sgn
  2021-01-30  7:27 ` sgn
                   ` (4 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-12 15:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 18606 bytes --]

From 5370ca579b3db7a0dc739afd13b9b9cf82ceaf6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 01/15] glib: patch m4 files to honour --localedir

---
 srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
 srcpkgs/glib/template                       |  2 +-
 2 files changed, 25 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..817a2cd1c47
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- 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
++  localedir=`eval echo "${localedir}"`
++elif test "x$CATOBJEXT" = "x.mo" ; then
+   localedir=`eval echo "${libdir}/locale"`
+ else
+   localedir=`eval echo "${datadir}/locale"`
+--- m4macros/glib-gettext.m4.orig	2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4	2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ 	    ;;
+ 	    *)
+ 	    CATOBJEXT=.mo
+-            DATADIRNAME=lib
++            DATADIRNAME=share
+ 	    ;;
+ 	    esac])
+           LIBS="$glib_save_LIBS"
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 ae23eca0bab4890c4c870c62663c0b88af56ab63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 02/15] xfce4-dev-tools: patch m4 file for i18n

---
 .../patches/i18n-goes-to-usr-share.patch           | 14 ++++++++++++++
 srcpkgs/xfce4-dev-tools/template                   |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch

diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig	2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4	2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+     AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+   ], [localedir=$withval],
+   [
+-    if test x"$CATOBJEXT" = x".mo"; then
+-      localedir=$libdir/locale
+-    else
+       localedir=$datarootdir/locale
+-    fi
+   ])
+   AC_MSG_RESULT([$localedir])
+   AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
 version=4.16.0
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"

From f99ba32cbe84bebba5690d7371f812645abc6a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 03/15] 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 aa49ad27ed1cab5dea9304604e10324d0c890ee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 04/15] appdata-tools: fix l10n dir

---
 srcpkgs/appdata-tools/template | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
 pkgname=appdata-tools
 version=0.1.8
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
 makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
 short_desc="Tools to handle the AppData files"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://people.freedesktop.org/~hughsient/appdata"
 distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
 checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+	autoreconf -fi
+}

From 48bf12bbf7192642043385b63a3e9e4ef3f9786a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 05/15] ario: fix l10n dir

---
 srcpkgs/ario/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..52fee779ee5 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,22 @@
 # Template file for 'ario'
 pkgname=ario
 version=1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
 makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
  libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
  libunique1-devel taglib-devel"
 short_desc="GTK client for MPD"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://ario-player.sourceforge.net/?en"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
 checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
 
-post_extract() {
-	sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
-	sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+	vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+	autoreconf -fi
 }

From 7bc61bfa7a534a6bd6c5fc32a04d95425ce28256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 06/15] GConf: fix l10n dir

---
 srcpkgs/GConf/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..bcf803c3ae3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
 # Template file for 'GConf'
 pkgname=GConf
 version=3.2.6
-revision=9
+revision=10
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
 depends="dconf"
 short_desc="Process-transparent configuration system"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://projects.gnome.org/gconf"
 distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
 checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
 make_dirs="/usr/share/gconf/schemas 0755 root root
  /etc/gconf/gconf.xml.defaults 0755 root root
  /etc/gconf/gconf.xml.mandatory 0755 root root

From 8641789a643b1d6ea5cbca69be3129512f59e7b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 07/15] seahorse-sharing: fix l10n dir

---
 srcpkgs/seahorse-sharing/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
 # Template file for 'seahorse-sharing'
 pkgname=seahorse-sharing
 version=3.8.0
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
  gpgme-devel gnupg"

From da168bb88b30738eca9ab1af88a20dd8b491456d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 08/15] tilp2: fix l10n dir

---
 srcpkgs/tilp2/template | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..99e6324c7a4 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,9 +1,10 @@
 # Template file for 'tilp2'
 pkgname=tilp2
 version=1.18
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
+hostmakedepends="automake bison groff intltool libtool pkg-config
+ texinfo gettext-devel glib-devel"
 makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
  gettext-devel libticonv-devel libtifiles2-devel libticables2-devel
  libticalcs2-devel"
@@ -15,10 +16,6 @@ homepage="https://www.ticalc.org"
 distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${version}.tar.bz2"
 checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47
 
-if [ -n "$CROSS_BUILD" ]; then
-	hostmakedepends+=" gettext-devel glib-devel"
-fi
-
 pre_configure() {
 	mkdir -p m4
 	autoreconf -i -v -f

From d3123e6058ca4da2c982d8003bceb07a260ef7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 09/15] volumeicon: fix l10n dir

---
 srcpkgs/volumeicon/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
 # Template file for 'volumeicon'
 pkgname=volumeicon
 version=0.5.1
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--enable-notify"
 hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
 short_desc="Lightweight volume control that sits in your systray"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
 checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 
 post_patch() {

From 1fbb7c52fe5501fdb02d5cfd535cf2c50bcec27f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:26:24 +0700
Subject: [PATCH 10/15] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..ebbb640ef11 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,7 +1,7 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"

From d6c6263086c02425d4629028b5a160b2b8593114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:42:31 +0700
Subject: [PATCH 11/15] pragha: fix l10n dir

---
 srcpkgs/pragha/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..88420e00409 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,7 +1,7 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
 makedepends="
@@ -11,7 +11,7 @@ makedepends="
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
 short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8

From 5a301d585b52177c83550e26dc98f7faa84e362e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 16:31:31 +0700
Subject: [PATCH 12/15] parcellite: fix l10n dir

---
 srcpkgs/parcellite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template
index b0f37057052..ac93df741dc 100644
--- a/srcpkgs/parcellite/template
+++ b/srcpkgs/parcellite/template
@@ -1,7 +1,7 @@
 # Template file for 'parcellite'
 pkgname=parcellite
 version=1.2.1
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="automake intltool gettext-devel glib-devel pkg-config"
 makedepends="gtk+-devel"

From ad7ff270b39cbd1d5789dc4c5a6973b4aeb8e47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 9 Jan 2021 23:23:03 +0700
Subject: [PATCH 13/15] xsane: fix l10n dir

---
 srcpkgs/xsane/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e946..8a2fbfe7c81 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,7 +1,7 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=3
+revision=4
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"

From 2a03c3f5194152c84d91b4c7f2e78f524cca93e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 2 Jan 2021 06:40:55 +0700
Subject: [PATCH 14/15] polkit-gnome: fix l10n dir

---
 srcpkgs/polkit-gnome/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template
index a12599dcad8..21841eebb2c 100644
--- a/srcpkgs/polkit-gnome/template
+++ b/srcpkgs/polkit-gnome/template
@@ -1,7 +1,7 @@
 # Template file for 'polkit-gnome'
 pkgname=polkit-gnome
 version=0.105
-revision=7
+revision=8
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool gobject-introspection"
 makedepends="polkit-devel gtk+3-devel"
@@ -12,6 +12,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit"
 distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz"
 checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369
 
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
 post_install() {
 	vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications
 }

From dcd790013345532e3792713e5c569d2ea80431ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 15/15] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..206a60de608 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,16 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	else
+		vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+	fi
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (88 preceding siblings ...)
  2021-01-12 15:33 ` sgn
@ 2021-01-30  7:27 ` sgn
  2021-01-30  7:30 ` sgn
                   ` (3 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-30  7:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 324 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 7957 bytes --]

From c8251e9570bf22d8770b0c4551653b0b174eb4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 09:43:02 +0700
Subject: [PATCH 1/5] geeqie: fix l10n dir

---
 srcpkgs/geeqie/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..efc425e9d83 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -1,7 +1,7 @@
 # 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"
@@ -25,6 +25,11 @@ post_extract() {
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
+	# The shipped configure doesn't have the code path
+	# for generating gtk+3 cflags and ldflags
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/CATOBJEXT=/s/\.mo/.gmo/' \
+		configure
 }
 
 do_build() {

From 516c762b4cff2a469bc50bed37f09a06386828c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 09:50:10 +0700
Subject: [PATCH 2/5] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..8e547f1f9eb 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,7 +1,7 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
@@ -19,6 +19,7 @@ post_patch() {
 
 pre_configure() {
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }
 
 libgpod-devel_package() {

From e6512ef5a934491081aadafb694d5c268fb7f93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 13:40:19 +0700
Subject: [PATCH 3/5] pragha: fix l10n dir, remove build_options

---
 srcpkgs/pragha/template | 44 ++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2069b22b1ef 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,41 +1,35 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
-hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
+hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
+ pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
- $(vopt_if peas libpeas-devel) libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel
+ libpeas-devel libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel
  libnotify-devel libcdio-devel libcdio-paranoia-devel libcddb-devel
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
-short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
+short_desc="Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8
 
-build_options="peas"
-desc_option_peas="Enable libpeas plugin library"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="peas"
-fi
-
-pre_configure() {
-	CPP=$CPP ./autogen.sh
+do_configure() {
+	CFLAGS+=" $($PKG_CONFIG --cflags gupnp-1.2)"
+	CPP=$CPP ./autogen.sh \
+		$configure_args \
+		--disable-maintainer-mode \
+		--with-locales-dir=/usr/share/locale
 }
 
-if [ -z "$CROSS_BUILD" ]; then
-
-	pragha-devel_package() {
-		short_desc+=" - development files"
-		depends="${sourcepkg}>=${version}_${revision}"
-		pkg_install() {
-			vmove usr/include/pragha/plugins
-			vmove usr/lib/pragha/plugins/devices/libdeviceclient.so
-		}
+pragha-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/pragha/plugins
+		vmove usr/lib/pragha/plugins/devices/libdeviceclient.so
 	}
-
-fi
+}

From b548913652b00cf304932d58bd6b7ff0590c8494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 13:59:01 +0700
Subject: [PATCH 4/5] xsane: fix l10n dir

---
 srcpkgs/xsane/template | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e946..d637963bcba 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,8 +1,9 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=3
-hostmakedepends="pkg-config"
+revision=4
+build_style=gnu-configure
+hostmakedepends="pkg-config sane-devel gettext"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"
 short_desc="GTK-based X11 frontend for SANE"
@@ -12,21 +13,19 @@ homepage="http://www.xsane.org"
 distfiles="${DEBIAN_SITE}/main/x/xsane/xsane_${version}.orig.tar.gz"
 checksum=5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" sane-devel"
-fi
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \
+		-e '/^ac_default_prefix=/s,=.*,=/usr,' \
+		configure
+}
 
 do_build() {
-	local _args="--prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man
-	 --target=${XBPS_CROSS_TRIPLET} --host=${XBPS_CROSS_TRIPLET}
-	 --build=${XBPS_TRIPLET}"
-	./configure ${_args} --enable-gimp
+	./configure ${configure_args} --enable-gimp
 	make ${makejobs}
 	mv src/xsane{,-gimp}
 	make clean
-	echo "=== ./configure ${_args} --disable-gimp"
-	./configure ${_args} --disable-gimp
-	sed -i 's;/usr/local;/usr;g' src/Makefile
+	echo "=== ./configure ${configure_args} --disable-gimp"
+	./configure ${configure_args} --disable-gimp
 	make ${makejobs}
 }
 

From b3963b3aac777f91e0178f32ba7c7cca18e12e93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 5/5] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..8c6bc811502 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,17 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/CATOBJEXT=/s/\.mo/.gmo/' \
+		configure
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (89 preceding siblings ...)
  2021-01-30  7:27 ` sgn
@ 2021-01-30  7:30 ` sgn
  2021-01-30  7:31 ` sgn
                   ` (2 subsequent siblings)
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-30  7:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 


A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 7957 bytes --]

From c8251e9570bf22d8770b0c4551653b0b174eb4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 09:43:02 +0700
Subject: [PATCH 1/5] geeqie: fix l10n dir

---
 srcpkgs/geeqie/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..efc425e9d83 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -1,7 +1,7 @@
 # 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"
@@ -25,6 +25,11 @@ post_extract() {
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
+	# The shipped configure doesn't have the code path
+	# for generating gtk+3 cflags and ldflags
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/CATOBJEXT=/s/\.mo/.gmo/' \
+		configure
 }
 
 do_build() {

From 516c762b4cff2a469bc50bed37f09a06386828c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 09:50:10 +0700
Subject: [PATCH 2/5] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..8e547f1f9eb 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,7 +1,7 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
@@ -19,6 +19,7 @@ post_patch() {
 
 pre_configure() {
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }
 
 libgpod-devel_package() {

From e6512ef5a934491081aadafb694d5c268fb7f93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 13:40:19 +0700
Subject: [PATCH 3/5] pragha: fix l10n dir, remove build_options

---
 srcpkgs/pragha/template | 44 ++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2069b22b1ef 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,41 +1,35 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
-hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
+hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
+ pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
- $(vopt_if peas libpeas-devel) libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel
+ libpeas-devel libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel
  libnotify-devel libcdio-devel libcdio-paranoia-devel libcddb-devel
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
-short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
+short_desc="Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8
 
-build_options="peas"
-desc_option_peas="Enable libpeas plugin library"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="peas"
-fi
-
-pre_configure() {
-	CPP=$CPP ./autogen.sh
+do_configure() {
+	CFLAGS+=" $($PKG_CONFIG --cflags gupnp-1.2)"
+	CPP=$CPP ./autogen.sh \
+		$configure_args \
+		--disable-maintainer-mode \
+		--with-locales-dir=/usr/share/locale
 }
 
-if [ -z "$CROSS_BUILD" ]; then
-
-	pragha-devel_package() {
-		short_desc+=" - development files"
-		depends="${sourcepkg}>=${version}_${revision}"
-		pkg_install() {
-			vmove usr/include/pragha/plugins
-			vmove usr/lib/pragha/plugins/devices/libdeviceclient.so
-		}
+pragha-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/pragha/plugins
+		vmove usr/lib/pragha/plugins/devices/libdeviceclient.so
 	}
-
-fi
+}

From b548913652b00cf304932d58bd6b7ff0590c8494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 13:59:01 +0700
Subject: [PATCH 4/5] xsane: fix l10n dir

---
 srcpkgs/xsane/template | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e946..d637963bcba 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,8 +1,9 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=3
-hostmakedepends="pkg-config"
+revision=4
+build_style=gnu-configure
+hostmakedepends="pkg-config sane-devel gettext"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"
 short_desc="GTK-based X11 frontend for SANE"
@@ -12,21 +13,19 @@ homepage="http://www.xsane.org"
 distfiles="${DEBIAN_SITE}/main/x/xsane/xsane_${version}.orig.tar.gz"
 checksum=5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" sane-devel"
-fi
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \
+		-e '/^ac_default_prefix=/s,=.*,=/usr,' \
+		configure
+}
 
 do_build() {
-	local _args="--prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man
-	 --target=${XBPS_CROSS_TRIPLET} --host=${XBPS_CROSS_TRIPLET}
-	 --build=${XBPS_TRIPLET}"
-	./configure ${_args} --enable-gimp
+	./configure ${configure_args} --enable-gimp
 	make ${makejobs}
 	mv src/xsane{,-gimp}
 	make clean
-	echo "=== ./configure ${_args} --disable-gimp"
-	./configure ${_args} --disable-gimp
-	sed -i 's;/usr/local;/usr;g' src/Makefile
+	echo "=== ./configure ${configure_args} --disable-gimp"
+	./configure ${configure_args} --disable-gimp
 	make ${makejobs}
 }
 

From a8bad22bf266a9ad92644825c362064830bb2eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 14:29:51 +0700
Subject: [PATCH 5/5] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..8c6bc811502 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,17 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/CATOBJEXT=/s/\.mo/.gmo/' \
+		configure
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (90 preceding siblings ...)
  2021-01-30  7:30 ` sgn
@ 2021-01-30  7:31 ` sgn
  2021-01-30  8:35 ` [PR PATCH] [Updated] " sgn
  2021-01-30  9:38 ` [PR PATCH] [Merged]: " sgn
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-30  7:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/27558#issuecomment-770172099

Comment:
The last batch. I'm not touching glib and xfce-dev-tools since q66 had expressed intends to fix them.

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Updated] Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (91 preceding siblings ...)
  2021-01-30  7:31 ` sgn
@ 2021-01-30  8:35 ` sgn
  2021-01-30  9:38 ` [PR PATCH] [Merged]: " sgn
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-30  8:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558

Fix l10n dir
See  #27491 


A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 7628 bytes --]

From c8251e9570bf22d8770b0c4551653b0b174eb4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 09:43:02 +0700
Subject: [PATCH 1/5] geeqie: fix l10n dir

---
 srcpkgs/geeqie/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..efc425e9d83 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -1,7 +1,7 @@
 # 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"
@@ -25,6 +25,11 @@ post_extract() {
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
+	# The shipped configure doesn't have the code path
+	# for generating gtk+3 cflags and ldflags
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/CATOBJEXT=/s/\.mo/.gmo/' \
+		configure
 }
 
 do_build() {

From 516c762b4cff2a469bc50bed37f09a06386828c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 09:50:10 +0700
Subject: [PATCH 2/5] libgpod: fix l10n dir

---
 srcpkgs/libgpod/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template
index c990c094bc2..8e547f1f9eb 100644
--- a/srcpkgs/libgpod/template
+++ b/srcpkgs/libgpod/template
@@ -1,7 +1,7 @@
 # Template file for 'libgpod'
 pkgname=libgpod
 version=0.8.3
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-udev-dir=/usr/lib/udev --enable-udev"
 hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool"
@@ -19,6 +19,7 @@ post_patch() {
 
 pre_configure() {
 	autoreconf -fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure
 }
 
 libgpod-devel_package() {

From e6512ef5a934491081aadafb694d5c268fb7f93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 13:40:19 +0700
Subject: [PATCH 3/5] pragha: fix l10n dir, remove build_options

---
 srcpkgs/pragha/template | 44 ++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template
index fef3510d75c..2069b22b1ef 100644
--- a/srcpkgs/pragha/template
+++ b/srcpkgs/pragha/template
@@ -1,41 +1,35 @@
 # Template file for 'pragha'
 pkgname=pragha
 version=1.3.3
-revision=5
+revision=6
 build_style=gnu-configure
-hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config"
+hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel
+ pkg-config"
 makedepends="
  gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel
- $(vopt_if peas libpeas-devel) libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel
+ libpeas-devel libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel
  libnotify-devel libcdio-devel libcdio-paranoia-devel libcddb-devel
  libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel"
-short_desc="Pragha is a Lightweight Music Player for GNU/Linux"
+short_desc="Lightweight Music Player for GNU/Linux"
 maintainer="VargMon <vargmon98@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://pragha-music-player.github.io/"
 distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz"
 checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8
 
-build_options="peas"
-desc_option_peas="Enable libpeas plugin library"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="peas"
-fi
-
-pre_configure() {
-	CPP=$CPP ./autogen.sh
+do_configure() {
+	CFLAGS+=" $($PKG_CONFIG --cflags gupnp-1.2)"
+	CPP=$CPP ./autogen.sh \
+		$configure_args \
+		--disable-maintainer-mode \
+		--with-locales-dir=/usr/share/locale
 }
 
-if [ -z "$CROSS_BUILD" ]; then
-
-	pragha-devel_package() {
-		short_desc+=" - development files"
-		depends="${sourcepkg}>=${version}_${revision}"
-		pkg_install() {
-			vmove usr/include/pragha/plugins
-			vmove usr/lib/pragha/plugins/devices/libdeviceclient.so
-		}
+pragha-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/pragha/plugins
+		vmove usr/lib/pragha/plugins/devices/libdeviceclient.so
 	}
-
-fi
+}

From 7ec70da7a0f52d3ec3ff23626843056993a063ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 14:29:51 +0700
Subject: [PATCH 4/5] gtk+: fix l10n dir

---
 srcpkgs/gtk+/template | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..8c6bc811502 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
 # Template file for 'gtk+'
 pkgname=gtk+
 version=2.24.32
-revision=3
+revision=4
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
 homepage="http://www.gtk.org"
 distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
 checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
 
 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
 # Package build options
@@ -27,11 +28,17 @@ build_options_default="gir cups"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
-	pre_configure() {
-		autoreconf -if
-	}
 fi
 
+pre_configure() {
+	if [ "$CROSS_BUILD" ]; then
+		autoreconf -if
+	fi
+	vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \
+		-e '/CATOBJEXT=/s/\.mo/.gmo/' \
+		configure
+}
+
 post_install() {
 	# Provide a default (icon)theme and font.
 	vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0

From 0420efafff27af085f8c73cf1b8c455233ed05f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 30 Jan 2021 13:59:01 +0700
Subject: [PATCH 5/5] xsane: fix l10n dir

---
 srcpkgs/xsane/template | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template
index 022eae8e946..65c6fd79288 100644
--- a/srcpkgs/xsane/template
+++ b/srcpkgs/xsane/template
@@ -1,8 +1,8 @@
 # Template file for 'xsane'
 pkgname=xsane
 version=0.999
-revision=3
-hostmakedepends="pkg-config"
+revision=4
+hostmakedepends="pkg-config sane-devel gettext"
 makedepends="gtk+-devel lcms-devel sane-devel gimp-devel"
 depends="sane"
 short_desc="GTK-based X11 frontend for SANE"
@@ -12,9 +12,11 @@ homepage="http://www.xsane.org"
 distfiles="${DEBIAN_SITE}/main/x/xsane/xsane_${version}.orig.tar.gz"
 checksum=5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" sane-devel"
-fi
+post_patch() {
+	vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \
+		-e 's,/usr/local/include,/usr/include,' \
+		configure
+}
 
 do_build() {
 	local _args="--prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man
@@ -26,7 +28,6 @@ do_build() {
 	make clean
 	echo "=== ./configure ${_args} --disable-gimp"
 	./configure ${_args} --disable-gimp
-	sed -i 's;/usr/local;/usr;g' src/Makefile
 	make ${makejobs}
 }
 

^ permalink raw reply	[flat|nested] 95+ messages in thread

* Re: [PR PATCH] [Merged]: Fix l10n dir
  2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
                   ` (92 preceding siblings ...)
  2021-01-30  8:35 ` [PR PATCH] [Updated] " sgn
@ 2021-01-30  9:38 ` sgn
  93 siblings, 0 replies; 95+ messages in thread
From: sgn @ 2021-01-30  9:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

There's a merged pull request on the void-packages repository

Fix l10n dir
https://github.com/void-linux/void-packages/pull/27558

Description:
See  #27491 


^ permalink raw reply	[flat|nested] 95+ messages in thread

end of thread, other threads:[~2021-01-30  9:38 UTC | newest]

Thread overview: 95+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-30 16:45 [PR PATCH] Fix l10n dir sgn
2020-12-30 17:37 ` q66
2020-12-30 17:37 ` q66
2020-12-30 17:38 ` q66
2020-12-30 17:39 ` q66
2020-12-30 20:37 ` [PR REVIEW] " Chocimier
2020-12-30 21:53 ` ericonr
2020-12-30 21:59 ` q66
2020-12-31  0:12 ` [PR PATCH] [Updated] " sgn
2020-12-31  0:14 ` sgn
2020-12-31  0:15 ` sgn
2020-12-31  1:00 ` sgn
2020-12-31  1:02 ` sgn
2020-12-31  1:25 ` sgn
2020-12-31  1:28 ` sgn
2020-12-31  2:06 ` q66
2020-12-31  2:07 ` [PR PATCH] [Updated] " sgn
2020-12-31  2:09 ` sgn
2020-12-31  2:13 ` [PR PATCH] [Updated] " sgn
2020-12-31  2:35 ` q66
2020-12-31  2:43 ` [PR PATCH] [Updated] " sgn
2020-12-31  2:55 ` sgn
2020-12-31  3:37 ` sgn
2020-12-31 11:49 ` sgn
2020-12-31 12:49 ` sgn
2020-12-31 13:23 ` q66
2020-12-31 13:46 ` [PR PATCH] [Updated] " sgn
2020-12-31 13:54 ` sgn
2020-12-31 13:56 ` sgn
2020-12-31 15:10 ` [PR PATCH] [Updated] " sgn
2020-12-31 15:12 ` sgn
2020-12-31 16:01 ` [PR PATCH] [Updated] " sgn
2020-12-31 16:12 ` sgn
2020-12-31 16:15 ` q66
2020-12-31 16:55 ` ericonr
2020-12-31 17:06 ` q66
2020-12-31 17:06 ` q66
2021-01-01 13:10 ` [PR PATCH] [Updated] " sgn
2021-01-01 14:43 ` sgn
2021-01-01 15:08 ` sgn
2021-01-01 23:46 ` sgn
2021-01-03 13:07 ` sgn
2021-01-03 23:38 ` sgn
2021-01-04  0:35 ` q66
2021-01-06 11:59 ` sgn
2021-01-07 13:52 ` [PR PATCH] [Updated] " sgn
2021-01-07 14:54 ` sgn
2021-01-07 16:12 ` sgn
2021-01-09 11:04 ` sgn
2021-01-09 11:06 ` sgn
2021-01-09 11:29 ` sgn
2021-01-09 11:29 ` sgn
2021-01-09 11:33 ` sgn
2021-01-09 11:50 ` sgn
2021-01-09 11:50 ` [PR PATCH] [Updated] " sgn
2021-01-09 11:52 ` sgn
2021-01-09 11:59 ` sgn
2021-01-09 11:59 ` sgn
2021-01-09 12:01 ` sgn
2021-01-09 12:01 ` sgn
2021-01-09 12:05 ` sgn
2021-01-09 12:13 ` sgn
2021-01-09 12:13 ` [PR PATCH] [Updated] " sgn
2021-01-09 12:13 ` sgn
2021-01-09 12:18 ` sgn
2021-01-09 12:18 ` [PR PATCH] [Updated] " sgn
2021-01-09 12:18 ` sgn
2021-01-09 12:20 ` sgn
2021-01-09 12:27 ` [PR PATCH] [Updated] " sgn
2021-01-09 12:28 ` sgn
2021-01-09 12:28 ` sgn
2021-01-09 12:29 ` sgn
2021-01-09 16:06 ` [PR PATCH] [Updated] " sgn
2021-01-09 16:07 ` sgn
2021-01-09 16:10 ` sgn
2021-01-09 16:11 ` sgn
2021-01-09 16:11 ` sgn
2021-01-09 16:11 ` sgn
2021-01-09 16:11 ` sgn
2021-01-09 16:20 ` sgn
2021-01-09 16:20 ` [PR PATCH] [Updated] " sgn
2021-01-09 16:23 ` sgn
2021-01-09 16:23 ` [PR PATCH] [Updated] " sgn
2021-01-09 16:37 ` sgn
2021-01-09 16:37 ` sgn
2021-01-10 11:24 ` [PR PATCH] [Updated] " sgn
2021-01-10 14:47 ` sgn
2021-01-10 14:53 ` [PR PATCH] [Updated] " sgn
2021-01-12  1:27 ` sgn
2021-01-12 15:33 ` sgn
2021-01-30  7:27 ` sgn
2021-01-30  7:30 ` sgn
2021-01-30  7:31 ` sgn
2021-01-30  8:35 ` [PR PATCH] [Updated] " sgn
2021-01-30  9:38 ` [PR PATCH] [Merged]: " sgn

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).