Re: [PR PATCH] [Updated] Fix l10n dir

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

[-- 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"