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