From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Fix l10n dir
Date: Fri, 01 Jan 2021 16:08:58 +0100 [thread overview]
Message-ID: <20210101150858.ICFIxHeooVRNfFNgHhCLFpi8b1OJexJUYM9BHF6uJkc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-27558@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages fix-l10n-dir
https://github.com/void-linux/void-packages/pull/27558
Fix l10n dir
See #27491
A patch file from https://github.com/void-linux/void-packages/pull/27558.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-l10n-dir-27558.patch --]
[-- Type: text/x-diff, Size: 48409 bytes --]
From ad65e619c4cc51b350b71b260d031c3ad3d31de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:27:02 +0700
Subject: [PATCH 01/38] freetype: clean XBPS_CROSS_TRIPLET reference in
freetype-config
* $XBPS_CROSS_TRIPLET-pkg-config is our wrapper not a real executable
* In a build that have both freetype-config and pkg-config,
$XBPS_CROSS_BASE will be prepended twice with current system,
let's fix it.
---
common/hooks/pre-configure/02-script-wrapper.sh | 9 ++++++++-
srcpkgs/freetype/template | 10 ++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/common/hooks/pre-configure/02-script-wrapper.sh b/common/hooks/pre-configure/02-script-wrapper.sh
index fe2000af11e..c3a0326027b 100644
--- a/common/hooks/pre-configure/02-script-wrapper.sh
+++ b/common/hooks/pre-configure/02-script-wrapper.sh
@@ -175,6 +175,13 @@ install_cross_wrappers() {
done
}
+link_wrapper() {
+ local wrapper="$1"
+ [ ! -x "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" ] && return 0
+ [ -L "${XBPS_WRAPPERDIR}/${wrapper}" ] && return 0
+ ln -sf "${XBPS_CROSS_BASE}/usr/bin/${wrapper}" "${XBPS_WRAPPERDIR}"
+}
+
hook() {
export PATH="$XBPS_WRAPPERDIR:$PATH"
@@ -186,9 +193,9 @@ hook() {
pkgconfig_wrapper
vapigen_wrapper
valac_wrapper
+ link_wrapper freetype-config
generic_wrapper icu-config
generic_wrapper libgcrypt-config
- generic_wrapper freetype-config
generic_wrapper sdl-config
generic_wrapper sdl2-config
generic_wrapper gpgme-config
diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template
index 9727cbb153f..12a15e8ce69 100644
--- a/srcpkgs/freetype/template
+++ b/srcpkgs/freetype/template
@@ -1,7 +1,7 @@
# Template file for 'freetype'
pkgname=freetype
version=2.10.4
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-freetype-config"
hostmakedepends="pkg-config"
@@ -16,10 +16,16 @@ checksum=86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784
post_install() {
vlicense docs/LICENSE.TXT
vlicense docs/FTL.TXT
+ if [ "$CROSS_BUILD" ]; then
+ sed -i -e "s/${XBPS_CROSS_TRIPLET}-pkg-config/pkg-config/" \
+ $DESTDIR/usr/bin/freetype-config
+ fi
}
freetype-devel_package() {
- depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ # depends on pkg-config unconditionally to simplify our wrappers
+ depends="${makedepends} pkg-config
+ ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
for f in bin include share; do
From 86f8edd26b1caf151824e1d0f56a847f0f3be70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:32:47 +0700
Subject: [PATCH 02/38] hooks: abort if l10n files found in /usr/lib
---
common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 834bdb0a682..ada06c485ea 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -68,6 +68,12 @@ hook() {
fi
done
+ # Check for l10n files in usr/lib/locale
+ if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then
+ msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n"
+ error=1
+ fi
+
# Check for bash completions in etc/bash_completion.d
# should be on usr/share/bash-completion/completions
if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then
From 2fd643182dfbc6300c39c8fe7783e796e522344b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:16 +0700
Subject: [PATCH 03/38] glib: patch m4 files to honour --localedir
---
srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++
srcpkgs/glib/template | 2 +-
2 files changed, 25 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/glib/patches/honour-localedir.patch
diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch
new file mode 100644
index 00000000000..a666d8205c8
--- /dev/null
+++ b/srcpkgs/glib/patches/honour-localedir.patch
@@ -0,0 +1,24 @@
+--- m4macros/glib-gettext.m4.orig 2020-10-19 22:05:31.339006200 +0700
++++ m4macros/glib-gettext.m4 2020-12-30 23:27:56.555000405 +0700
+@@ -448,7 +448,9 @@
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+ datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
++if test "x$localedir" != "x" ; then
++ :
++elif test "x$CATOBJEXT" = "x.mo" ; then
+ localedir=`eval echo "${libdir}/locale"`
+ else
+ localedir=`eval echo "${datadir}/locale"`
+--- m4macros/glib-gettext.m4.orig 2020-12-31 18:10:40.213812919 +0700
++++ m4macros/glib-gettext.m4 2020-12-31 18:12:31.005850695 +0700
+@@ -295,7 +295,7 @@
+ ;;
+ *)
+ CATOBJEXT=.mo
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ ;;
+ esac])
+ LIBS="$glib_save_LIBS"
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0d6de76ea88..bb28c7f1246 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
version=2.66.2
-revision=1
+revision=2
build_style=meson
configure_args="-Dfam=false -Dman=true -Dselinux=disabled
$(vopt_bool gtk_doc gtk_doc)"
From 8c6b176d5ec3ca96a9a77fdea7ebc1e53700c0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 09:12:29 +0700
Subject: [PATCH 04/38] xfce4-dev-tools: patch m4 file for i18n
---
.../patches/i18n-goes-to-usr-share.patch | 14 ++++++++++++++
srcpkgs/xfce4-dev-tools/template | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
new file mode 100644
index 00000000000..dc864920c8c
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch
@@ -0,0 +1,14 @@
+--- m4macros/xdt-i18n.m4.orig 2020-07-08 02:16:08.000000000 +0700
++++ m4macros/xdt-i18n.m4 2020-12-31 09:10:37.664036285 +0700
+@@ -59,11 +59,7 @@
+ AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR])
+ ], [localedir=$withval],
+ [
+- if test x"$CATOBJEXT" = x".mo"; then
+- localedir=$libdir/locale
+- else
+ localedir=$datarootdir/locale
+- fi
+ ])
+ AC_MSG_RESULT([$localedir])
+ AC_SUBST([localedir])
diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index d993eb5e0a3..e3835fea52f 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
# Template file for 'xfce4-dev-tools'
pkgname=xfce4-dev-tools
version=4.16.0
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
makedepends="libglib-devel"
From 85f22d84eae14ee099a0e99f405539e1f8a39d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:33:59 +0700
Subject: [PATCH 05/38] geeqie: fix localedir
---
srcpkgs/geeqie/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template
index 2681f31e3ef..3eb2cda003f 100644
--- a/srcpkgs/geeqie/template
+++ b/srcpkgs/geeqie/template
@@ -1,10 +1,11 @@
# Template file for 'geeqie'
pkgname=geeqie
version=1.5.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-gtk3"
-hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel"
+hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel
+ gettext-devel"
makedepends="gtk+3-devel exiv2-devel lcms2-devel librsvg-devel lua51-devel
ffmpegthumbnailer-devel"
depends="desktop-file-utils"
From 2f63e6327fd2a9b2565d5852e5c565273ee5b65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Wed, 30 Dec 2020 23:41:55 +0700
Subject: [PATCH 06/38] gnu-configure-args: add --localedir
---
common/environment/configure/gnu-configure-args.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/common/environment/configure/gnu-configure-args.sh b/common/environment/configure/gnu-configure-args.sh
index c0a2f4602b9..345c0329d4a 100644
--- a/common/environment/configure/gnu-configure-args.sh
+++ b/common/environment/configure/gnu-configure-args.sh
@@ -9,7 +9,8 @@ fi
TEMPLATE_CONFIGURE_ARGS="${configure_args}"
export configure_args="--prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --bindir=/usr/bin
- --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var"
+ --mandir=/usr/share/man --infodir=/usr/share/info --localstatedir=/var
+ --localedir=/usr/share/locale"
. ${XBPS_COMMONDIR}/build-profiles/${XBPS_MACHINE}.sh
export configure_args+=" --host=$XBPS_TRIPLET --build=$XBPS_TRIPLET"
From e4ccffc668e96261d5a730809c52333373f91ea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:35:46 +0700
Subject: [PATCH 07/38] appdata-tools: fix l10n dir
---
srcpkgs/appdata-tools/template | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template
index e1fe4419587..dc9e9ae16e4 100644
--- a/srcpkgs/appdata-tools/template
+++ b/srcpkgs/appdata-tools/template
@@ -1,13 +1,18 @@
-# Template build file for 'appdata-tools'.
+# Template file for 'appdata-tools'
pkgname=appdata-tools
version=0.1.8
-revision=1
+revision=2
build_style=gnu-configure
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool automake libtool glib-devel
+ gettext-devel"
makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel"
short_desc="Tools to handle the AppData files"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://people.freedesktop.org/~hughsient/appdata"
distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz"
checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461
+
+pre_configure() {
+ autoreconf -fi
+}
From 927c776399e8edae492ff81581d734a08de69dec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:39:57 +0700
Subject: [PATCH 08/38] ario: fix l10n dir
---
srcpkgs/ario/template | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template
index e57c07d2101..c147c877f46 100644
--- a/srcpkgs/ario/template
+++ b/srcpkgs/ario/template
@@ -1,21 +1,23 @@
# Template file for 'ario'
pkgname=ario
version=1.6
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool glib-devel automake libtool
+ gettext-devel"
makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel
libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel
libunique1-devel taglib-devel"
short_desc="GTK client for MPD"
maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://ario-player.sourceforge.net/?en"
distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz"
checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a
-post_extract() {
- sed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
- sed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+post_patch() {
+ vsed -i 's,<glib/gi18n.h>,<glib.h>,g' src/ario-profiles.c
+ vsed -i 's,<glib/gslist.h>,<glib.h>,g' src/ario-profiles.h
+ autoreconf -fi
}
From c9f9068dc62e8485635de88037f8b8abfbbc0354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:48:52 +0700
Subject: [PATCH 09/38] brasero: fix l10n dir
---
srcpkgs/brasero/template | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template
index b1cc79d8027..9083a2ccb68 100644
--- a/srcpkgs/brasero/template
+++ b/srcpkgs/brasero/template
@@ -1,7 +1,7 @@
# Template file for 'brasero'
pkgname=brasero
version=3.12.2
-revision=5
+revision=6
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-schemas-compile --disable-caches"
@@ -21,6 +21,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041
build_options="gir"
build_options_default="gir"
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+ -e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+ configure
+}
+
brasero-devel_package() {
depends="gtk+3-devel brasero>=${version}_${revision}"
short_desc+=" - development files"
From 1934a29c5975e198971f78eb4aca5f394301ea0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:51:12 +0700
Subject: [PATCH 10/38] GConf: fix l10n dir
---
srcpkgs/GConf/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template
index 677fff7efc5..bcf803c3ae3 100644
--- a/srcpkgs/GConf/template
+++ b/srcpkgs/GConf/template
@@ -1,7 +1,7 @@
# Template file for 'GConf'
pkgname=GConf
version=3.2.6
-revision=9
+revision=10
build_style=gnu-configure
build_helper="gir"
configure_args="--without-openldap --enable-gtk --enable-defaults-service
@@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel"
depends="dconf"
short_desc="Process-transparent configuration system"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://projects.gnome.org/gconf"
distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz"
checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
-python_version=2 #unverified
+# Line 606
+python_version=2
make_dirs="/usr/share/gconf/schemas 0755 root root
/etc/gconf/gconf.xml.defaults 0755 root root
/etc/gconf/gconf.xml.mandatory 0755 root root
From 141f6f770a73d3b6b8135a415db26eac7967838e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:58:18 +0700
Subject: [PATCH 11/38] seahorse-sharing: fix l10n dir
---
srcpkgs/seahorse-sharing/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template
index a1883d54423..69be19c778d 100644
--- a/srcpkgs/seahorse-sharing/template
+++ b/srcpkgs/seahorse-sharing/template
@@ -1,7 +1,7 @@
# Template file for 'seahorse-sharing'
pkgname=seahorse-sharing
version=3.8.0
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel
gpgme-devel gnupg"
From 413cea75d7d3355f3f67fedccce0495bc59e33e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 12/38] tilp2: fix l10n dir
---
srcpkgs/tilp2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template
index e6f6335e53d..2acf54b5e51 100644
--- a/srcpkgs/tilp2/template
+++ b/srcpkgs/tilp2/template
@@ -1,7 +1,7 @@
# Template file for 'tilp2'
pkgname=tilp2
version=1.18
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake bison groff intltool libtool pkg-config texinfo"
makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel
From 0b9e852c6465f77cd0641652d2465a48a9089cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 07:59:15 +0700
Subject: [PATCH 13/38] volumeicon: fix l10n dir
---
srcpkgs/volumeicon/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template
index bd79cabe1f3..64daf7a0949 100644
--- a/srcpkgs/volumeicon/template
+++ b/srcpkgs/volumeicon/template
@@ -1,7 +1,7 @@
# Template file for 'volumeicon'
pkgname=volumeicon
version=0.5.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--enable-notify"
hostmakedepends="pkg-config intltool automake glib-devel gettext-devel"
@@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel"
short_desc="Lightweight volume control that sits in your systray"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only, ISC, MIT"
-homepage="http://softwarebakery.com/maato/volumeicon.html"
-distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz"
+homepage="http://nullwise.com/volumeicon.html"
+distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz"
checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
post_patch() {
From 33c29eb951bbc74858ad992e9868165db191b799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:33:53 +0700
Subject: [PATCH 14/38] xdg-user-dirs-gtk: fix l10n dir
---
srcpkgs/xdg-user-dirs-gtk/template | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template
index 4f6a3e03549..600c013736f 100644
--- a/srcpkgs/xdg-user-dirs-gtk/template
+++ b/srcpkgs/xdg-user-dirs-gtk/template
@@ -1,7 +1,7 @@
# Template file for 'xdg-user-dirs-gtk'
pkgname=xdg-user-dirs-gtk
version=0.10
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="pkg-config intltool xdg-user-dirs"
makedepends="gtk+3-devel xdg-user-dirs"
@@ -12,3 +12,9 @@ license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz"
checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+ -e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+ configure
+}
From 39f3a99c286f20b804af13083bb3b7fa4c3887b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 31 Dec 2020 22:54:06 +0700
Subject: [PATCH 15/38] gtk+: fix l10n dir
---
srcpkgs/gtk+/template | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template
index 39883068d06..206a60de608 100644
--- a/srcpkgs/gtk+/template
+++ b/srcpkgs/gtk+/template
@@ -1,7 +1,7 @@
# Template file for 'gtk+'
pkgname=gtk+
version=2.24.32
-revision=3
+revision=4
build_style=gnu-configure
build_helper="gir"
configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)"
@@ -18,7 +18,8 @@ license="LGPL-2.1-or-later"
homepage="http://www.gtk.org"
distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz"
checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
-python_version=2 #unverified
+# gtk-builder-convert:794
+python_version=2
CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED"
# Package build options
@@ -27,11 +28,16 @@ build_options_default="gir cups"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache"
- pre_configure() {
- autoreconf -if
- }
fi
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ autoreconf -if
+ else
+ vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in
+ fi
+}
+
post_install() {
# Provide a default (icon)theme and font.
vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0
From 35a19bc4bd96227ceb29f51f02baab90d7895d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:45:00 +0700
Subject: [PATCH 16/38] desmume: fix l10n dir
---
srcpkgs/desmume/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template
index 71ab6d9feca..ef306ffd375 100644
--- a/srcpkgs/desmume/template
+++ b/srcpkgs/desmume/template
@@ -1,7 +1,7 @@
# Template file for 'desmume'
pkgname=desmume
version=0.9.11
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx"
hostmakedepends="pkg-config intltool dos2unix"
@@ -9,7 +9,7 @@ makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel
depends="desktop-file-utils"
short_desc="Nintendo DS emulator"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="http://www.desmume.org"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896
@@ -19,3 +19,7 @@ post_extract() {
# convert the target file to LF-only.
dos2unix $wrksrc/src/MMU_timing.h
}
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From 97884225483f3b86759920e585d8810aaa279cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:52:46 +0700
Subject: [PATCH 17/38] dia: fix l10n dir
---
srcpkgs/dia/template | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template
index 31766322c4c..45f48aab4dc 100644
--- a/srcpkgs/dia/template
+++ b/srcpkgs/dia/template
@@ -1,13 +1,18 @@
# Template file for 'dia'
pkgname=dia
version=0.97.3
-revision=3
+revision=4
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel
+ libart-devel libxslt-devel"
short_desc="GTK+ based diagram creation program"
maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-2"
+license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Dia"
-distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz"
+distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz"
checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34
-build_style=gnu-configure
-hostmakedepends="pkg-config intltool freetype-devel libxml2-devel"
-makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel"
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From fc6899076ccc9e692c1656f87ac6bc3b1bf53b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:57:00 +0700
Subject: [PATCH 18/38] gconf-editor: fix l10n dir
---
srcpkgs/gconf-editor/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template
index 9a22cc53d23..d4d9fa79bd2 100644
--- a/srcpkgs/gconf-editor/template
+++ b/srcpkgs/gconf-editor/template
@@ -1,7 +1,7 @@
# Template file for 'gconf-editor'
pkgname=gconf-editor
version=3.0.1
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-schemas-install --disable-scrollkeeper
--with-gconf-schema-file-dir=/usr/share/gconf/schemas"
@@ -11,11 +11,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel
depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils"
short_desc="Graphical editor to maintain the Gnome registry"
maintainer="Enno Boland <gottox@voidlinux.org>"
+license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
-license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
post_install() {
mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \
From b9373bd11eafc5a4a35a110bb2f94dfd68f1dc3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 19:58:42 +0700
Subject: [PATCH 19/38] gdmap: fix l10n dir
---
srcpkgs/gdmap/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template
index 3e43a2446b5..47b0105feb3 100644
--- a/srcpkgs/gdmap/template
+++ b/srcpkgs/gdmap/template
@@ -1,7 +1,7 @@
# Template file for 'gdmap'
pkgname=gdmap
version=0.8.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="LIBS=-lm"
hostmakedepends="pkg-config intltool"
@@ -12,3 +12,7 @@ license="GPL-2.0-only"
homepage="http://gdmap.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From c05ab5635f71eb87a87847ae6cf4036fbd9f0fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:00:34 +0700
Subject: [PATCH 20/38] gimp-lqr-plugin: fix l10n dir
---
srcpkgs/gimp-lqr-plugin/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template
index 6a49a881e8f..7878f6cb795 100644
--- a/srcpkgs/gimp-lqr-plugin/template
+++ b/srcpkgs/gimp-lqr-plugin/template
@@ -1,7 +1,7 @@
# Template file for 'gimp-lqr-plugin'
pkgname=gimp-lqr-plugin
version=0.7.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake intltool pkg-config"
makedepends="gimp-devel glib-devel gettext-devel liblqr-devel"
@@ -13,3 +13,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source
checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a
CFLAGS="-fcommon"
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From 87ff5c89fd1a0179c931c974c6b5de791085b5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:01:48 +0700
Subject: [PATCH 21/38] gmpc: fix l10n dir
---
srcpkgs/gmpc/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template
index 7e2dcf1d506..9993e6c49df 100644
--- a/srcpkgs/gmpc/template
+++ b/srcpkgs/gmpc/template
@@ -1,7 +1,7 @@
# Template file for 'gmpc'
pkgname=gmpc
version=11.8.16
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config gob2 intltool vala"
makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel"
@@ -16,6 +16,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c
LDFLAGS="-lm"
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
gmpc-devel_package() {
short_desc+=" - development files"
depends="gtk+-devel libmpd-devel"
From 711db313f49904d01268a199e692567daffc4137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:03:42 +0700
Subject: [PATCH 22/38] gnome-doc-utils: fix l10n dir
---
srcpkgs/gnome-doc-utils/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template
index f2dbf6db8f4..f846f0e6125 100644
--- a/srcpkgs/gnome-doc-utils/template
+++ b/srcpkgs/gnome-doc-utils/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-doc-utils'
pkgname=gnome-doc-utils
version=0.20.10
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--disable-scrollkeeper"
hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt
@@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils"
distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz"
checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6
patch_args="-Np1"
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From 4636a8e57e7e5717634659aa505405eea4f60612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:06:30 +0700
Subject: [PATCH 23/38] gnome-mime-data: fix l10n dir
---
srcpkgs/gnome-mime-data/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template
index 937e9dad473..fdcd6137076 100644
--- a/srcpkgs/gnome-mime-data/template
+++ b/srcpkgs/gnome-mime-data/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-mime-data'
pkgname=gnome-mime-data
version=2.18.0
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="intltool shared-mime-info"
makedepends="shared-mime-info"
@@ -12,5 +12,8 @@ license="GPL-2.0-only"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2"
checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7
-
conf_files="/etc/gnome-vfs-mime-magic"
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From 3d78a0d19255810a50fb77acdb1c4454f67e2ce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:07:41 +0700
Subject: [PATCH 24/38] gnome-mplayer: fix l10n dir
---
srcpkgs/gnome-mplayer/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template
index c965aad6e0b..6a4eff424b3 100644
--- a/srcpkgs/gnome-mplayer/template
+++ b/srcpkgs/gnome-mplayer/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-mplayer'
pkgname=gnome-mplayer
version=1.0.9
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-schemas-install"
hostmakedepends="pkg-config intltool glib-devel"
@@ -18,3 +18,7 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz"
checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde
CFLAGS="-fcommon"
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From 08061685a5ee7a9a5c28c8f948f1b4cb3db3fd99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:08:55 +0700
Subject: [PATCH 25/38] gnome-nettool: fix l10n dir
---
srcpkgs/gnome-nettool/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template
index d9769176514..89f5705d629 100644
--- a/srcpkgs/gnome-nettool/template
+++ b/srcpkgs/gnome-nettool/template
@@ -1,16 +1,20 @@
# Template file for 'gnome-nettool'
pkgname=gnome-nettool
version=3.8.1
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="glib-devel intltool itstool pkg-config"
makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel
gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute"
depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools
traceroute"
-short_desc="A Collection of GNOME3 Networking Tools"
+short_desc="Collection of GNOME3 Networking Tools"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From 649564c55ae83a9ddda940e77bb7127dc966fc90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:09:48 +0700
Subject: [PATCH 26/38] gnome-screensaver: fix l10n dir
---
srcpkgs/gnome-screensaver/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template
index c3a70cfef7c..1a23f6dcfb0 100644
--- a/srcpkgs/gnome-screensaver/template
+++ b/srcpkgs/gnome-screensaver/template
@@ -1,15 +1,19 @@
# Template file for 'gnome-screensaver'
pkgname=gnome-screensaver
version=3.6.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--enable-compile-warnings=minimum"
hostmakedepends="pkg-config automake intltool glib-devel"
makedepends="gnome-desktop-devel dbus-glib-devel pam-devel"
depends="gnome-desktop libgnomekbd dbus"
-short_desc="A new screensaver that can replace xscreensaver"
+short_desc="GNOME's screensaver that can replace xscreensaver"
maintainer="shizonic <realtiaz@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://wiki.gnome.org/Projects/GnomeScreensaver"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From a651ea3041c55f3b799e2dd01fa7bd81a4d4c9bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:33:45 +0700
Subject: [PATCH 27/38] gnome-system-log: fix l10n dir
---
srcpkgs/gnome-system-log/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template
index 92fd318ffbd..7afbc3acc7c 100644
--- a/srcpkgs/gnome-system-log/template
+++ b/srcpkgs/gnome-system-log/template
@@ -1,7 +1,7 @@
# Template file for 'gnome-system-log'
pkgname=gnome-system-log
version=3.9.90
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-schemas-compile"
hostmakedepends="pkg-config intltool itstool glib-devel"
@@ -13,3 +13,7 @@ license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From e1b5ffda254dd6aa526d898e4fd62c4b9547b3e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:35:12 +0700
Subject: [PATCH 28/38] gnumeric: fix l10n dir
---
srcpkgs/gnumeric/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template
index 0a753798b09..1328f77d55c 100644
--- a/srcpkgs/gnumeric/template
+++ b/srcpkgs/gnumeric/template
@@ -1,7 +1,7 @@
# Template file for 'gnumeric'
pkgname=gnumeric
version=1.12.48
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config "
makedepends="goffice-devel librsvg-devel libxslt-devel"
@@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" --without-perl"
fi
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
gnumeric-devel_package() {
depends="gnumeric>=${version}_${revision}"
short_desc+=" - development files"
From db2aaae0d41b0ed8a54cdc87466dd5ce0885d1fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:36:33 +0700
Subject: [PATCH 29/38] gpicview: fix l10n dir
---
srcpkgs/gpicview/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template
index 217df197ff1..24ae856fa34 100644
--- a/srcpkgs/gpicview/template
+++ b/srcpkgs/gpicview/template
@@ -1,7 +1,7 @@
# Template file for 'gpicview'
pkgname=gpicview
version=0.2.5
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--enable-gtk3"
hostmakedepends="pkg-config intltool"
@@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz"
checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942
patch_args="-Np1"
-pre_configure() {
- sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+ vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in
}
From f6f1f63dd0f0ee63304e5396eb54cd066c9c8ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:37:42 +0700
Subject: [PATCH 30/38] gtk2-engines: fix l10n dir
---
srcpkgs/gtk2-engines/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template
index c272d525cc0..6b26226c19f 100644
--- a/srcpkgs/gtk2-engines/template
+++ b/srcpkgs/gtk2-engines/template
@@ -1,7 +1,7 @@
# Template file for 'gtk2-engines'
pkgname=gtk2-engines
version=2.21.0
-revision=4
+revision=5
wrksrc=gtk-engines-${version}
build_style=gnu-configure
configure_args="--enable-animation"
@@ -9,7 +9,11 @@ hostmakedepends="pkg-config intltool"
makedepends="gtk+-devel"
short_desc="GTK+2 Theme engines"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="LGPL-2.1-or-later"
homepage="http://live.gnome.org/GnomeArt"
distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz"
checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From 2b2d4df4bb101b4b35a08cc055af010e09f5fc39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:39:26 +0700
Subject: [PATCH 31/38] gtkpod: fix l10n dir
---
srcpkgs/gtkpod/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template
index 0057900580b..bfcb41e6219 100644
--- a/srcpkgs/gtkpod/template
+++ b/srcpkgs/gtkpod/template
@@ -1,7 +1,7 @@
# Template file for 'gtkpod'
pkgname=gtkpod
version=2.1.5
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="flex intltool pkg-config glib"
@@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76
python_version=2
CFLAGS="-fcommon"
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From d6ee6cc278aaac7df27a5cd5d319341c9aa78b47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:44:09 +0700
Subject: [PATCH 32/38] gtksourceview2: fix l10n dir
---
srcpkgs/gtksourceview2/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template
index 7b2df2006fe..6857cc50b11 100644
--- a/srcpkgs/gtksourceview2/template
+++ b/srcpkgs/gtksourceview2/template
@@ -1,7 +1,7 @@
# Template file for 'gtksourceview2'
pkgname=gtksourceview2
version=2.10.5
-revision=6
+revision=7
wrksrc="gtksourceview-${version}"
build_style=gnu-configure
configure_args="--disable-static"
@@ -13,7 +13,12 @@ license="GPL-2.0-or-later"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2"
checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
-python_version=2 #unverified
+# convert.py:178
+python_version=2
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
do_check() {
: #requires xserver
From 051184298d4fc046cea433dd5c04e12a9f29727c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:45:43 +0700
Subject: [PATCH 33/38] gtkspell: fix l10n dir
---
srcpkgs/gtkspell/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template
index e7369063b2b..bf480eaae32 100644
--- a/srcpkgs/gtkspell/template
+++ b/srcpkgs/gtkspell/template
@@ -1,20 +1,22 @@
# Template file for 'gtkspell'
pkgname=gtkspell
version=2.0.16
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-static"
hostmakedepends="intltool pkg-config"
makedepends="enchant2-devel gtk+-devel"
short_desc="Provides word-processor-style highlighting"
maintainer="Orphaned <orphan@voidlinux.org>"
-homepage="http://gtkspell.sourceforge.net/"
license="LGPL-2.1-or-later"
+homepage="http://gtkspell.sourceforge.net/"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02
-pre_configure() {
- sed -i 's/enchant/enchant-2/g' configure
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+ -e 's/enchant/enchant-2/g' \
+ configure
}
gtkspell-devel_package() {
From af88240f39790b031e58b5bcfccd0a53dc2bb5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:49:03 +0700
Subject: [PATCH 34/38] gxmessage: fix l10n dir
---
srcpkgs/gxmessage/template | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template
index 8263304878a..76dffa85c97 100644
--- a/srcpkgs/gxmessage/template
+++ b/srcpkgs/gxmessage/template
@@ -1,13 +1,17 @@
# Template file for 'gxmessage'
pkgname=gxmessage
version=3.4.3
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="intltool pkg-config"
makedepends="gtk+3-devel"
-short_desc="An xmessage clone based on GTK+"
+short_desc="Clone of xmessage based on GTK+"
maintainer="Peter Wang <novalazy@gmail.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="http://savannah.gnu.org/projects/gxmessage"
-distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz"
+distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz"
checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From 4d3ae66740e19014d68762efcf50bef0ac6a6597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:51:08 +0700
Subject: [PATCH 35/38] homebank: fix l10n dir
---
srcpkgs/homebank/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template
index 21792cd48a6..dad20250626 100644
--- a/srcpkgs/homebank/template
+++ b/srcpkgs/homebank/template
@@ -1,7 +1,7 @@
# Template file for 'homebank'
pkgname=homebank
version=5.4.3
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="intltool pkg-config"
makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel"
@@ -12,3 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://homebank.free.fr/"
distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz"
checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b
+
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
From 4f5768d854903cb6819d2498d2215bd6e1ea76de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 20:58:12 +0700
Subject: [PATCH 36/38] leafpad: fix l10n dir
---
srcpkgs/leafpad/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template
index bf925ca462f..f80347e452f 100644
--- a/srcpkgs/leafpad/template
+++ b/srcpkgs/leafpad/template
@@ -1,15 +1,20 @@
# Template file for 'leafpad'
pkgname=leafpad
version=0.8.18.1
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="intltool pkg-config"
makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme"
depends="desktop-file-utils hicolor-icon-theme"
short_desc="GTK+ Simple text editor"
-maintainer="Carlo Dormeletti <carloDOTdormelettiATaliceDOTit>"
+maintainer="Carlo Dormeletti <carlo.dormeletti@alice.it>"
license="GPL-2.0-or-later"
homepage="http://tarot.freeshell.org/leafpad/"
distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz"
checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \
+ -e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \
+ configure
+}
From ea6a475411bcb133b775c6a25c54ffbe5384bb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 21:48:48 +0700
Subject: [PATCH 37/38] libcryptui: fix l10n dir
---
srcpkgs/libcryptui/template | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template
index 30be95c3ebe..171300292e3 100644
--- a/srcpkgs/libcryptui/template
+++ b/srcpkgs/libcryptui/template
@@ -1,7 +1,7 @@
# Template file for 'libcryptui'
pkgname=libcryptui
version=3.12.2
-revision=2
+revision=3
build_style=gnu-configure
build_helper="gir"
configure_args="--disable-static --disable-update-mime-database
@@ -22,6 +22,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866
build_options="gir"
build_options_default="gir"
+post_patch() {
+ vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure
+}
+
libcryptui-devel_package() {
depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
From c5727ec73182e00755e33a0cd4e858193d8e848e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 1 Jan 2021 22:05:43 +0700
Subject: [PATCH 38/38] libglib-static: fix l10n dir, conflicts with
libglib-devel
---
srcpkgs/libglib-static/template | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template
index ee6de793298..83dc7323082 100644
--- a/srcpkgs/libglib-static/template
+++ b/srcpkgs/libglib-static/template
@@ -5,7 +5,7 @@
#
pkgname=libglib-static
version=2.58.3
-revision=4
+revision=5
wrksrc="glib-${version}"
build_style=gnu-configure
configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system
@@ -20,6 +20,7 @@ homepage="https://wiki.gnome.org/Projects/GLib"
changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
+conflicts="libglib-devel>=0"
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" glib-devel"
@@ -29,6 +30,15 @@ if [ "$CROSS_BUILD" ]; then
esac
fi
+post_patch() {
+ # Better to just rm -rf /usr/lib/locale in post_install?
+ vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \
+ -e "s,DATADIRNAME=lib,DATADIRNAME=share," \
+ m4macros/glib-gettext.m4
+ vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
+ po/Makefile.in.in
+}
+
pre_configure() {
NOCONFIGURE=1 ./autogen.sh
}
next prev parent reply other threads:[~2021-01-01 15:09 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-30 16:45 [PR PATCH] " sgn
2020-12-30 17:37 ` q66
2020-12-30 17:37 ` q66
2020-12-30 17:38 ` q66
2020-12-30 17:39 ` q66
2020-12-30 20:37 ` [PR REVIEW] " Chocimier
2020-12-30 21:53 ` ericonr
2020-12-30 21:59 ` q66
2020-12-31 0:12 ` [PR PATCH] [Updated] " sgn
2020-12-31 0:14 ` sgn
2020-12-31 0:15 ` sgn
2020-12-31 1:00 ` sgn
2020-12-31 1:02 ` sgn
2020-12-31 1:25 ` sgn
2020-12-31 1:28 ` sgn
2020-12-31 2:06 ` q66
2020-12-31 2:07 ` [PR PATCH] [Updated] " sgn
2020-12-31 2:09 ` sgn
2020-12-31 2:13 ` [PR PATCH] [Updated] " sgn
2020-12-31 2:35 ` q66
2020-12-31 2:43 ` [PR PATCH] [Updated] " sgn
2020-12-31 2:55 ` sgn
2020-12-31 3:37 ` sgn
2020-12-31 11:49 ` sgn
2020-12-31 12:49 ` sgn
2020-12-31 13:23 ` q66
2020-12-31 13:46 ` [PR PATCH] [Updated] " sgn
2020-12-31 13:54 ` sgn
2020-12-31 13:56 ` sgn
2020-12-31 15:10 ` [PR PATCH] [Updated] " sgn
2020-12-31 15:12 ` sgn
2020-12-31 16:01 ` [PR PATCH] [Updated] " sgn
2020-12-31 16:12 ` sgn
2020-12-31 16:15 ` q66
2020-12-31 16:55 ` ericonr
2020-12-31 17:06 ` q66
2020-12-31 17:06 ` q66
2021-01-01 13:10 ` [PR PATCH] [Updated] " sgn
2021-01-01 14:43 ` sgn
2021-01-01 15:08 ` sgn [this message]
2021-01-01 23:46 ` sgn
2021-01-03 13:07 ` sgn
2021-01-03 23:38 ` sgn
2021-01-04 0:35 ` q66
2021-01-06 11:59 ` sgn
2021-01-07 13:52 ` [PR PATCH] [Updated] " sgn
2021-01-07 14:54 ` sgn
2021-01-07 16:12 ` sgn
2021-01-09 11:04 ` sgn
2021-01-09 11:06 ` sgn
2021-01-09 11:29 ` sgn
2021-01-09 11:29 ` sgn
2021-01-09 11:33 ` sgn
2021-01-09 11:50 ` sgn
2021-01-09 11:50 ` [PR PATCH] [Updated] " sgn
2021-01-09 11:52 ` sgn
2021-01-09 11:59 ` sgn
2021-01-09 11:59 ` sgn
2021-01-09 12:01 ` sgn
2021-01-09 12:01 ` sgn
2021-01-09 12:05 ` sgn
2021-01-09 12:13 ` sgn
2021-01-09 12:13 ` [PR PATCH] [Updated] " sgn
2021-01-09 12:13 ` sgn
2021-01-09 12:18 ` sgn
2021-01-09 12:18 ` [PR PATCH] [Updated] " sgn
2021-01-09 12:18 ` sgn
2021-01-09 12:20 ` sgn
2021-01-09 12:27 ` [PR PATCH] [Updated] " sgn
2021-01-09 12:28 ` sgn
2021-01-09 12:28 ` sgn
2021-01-09 12:29 ` sgn
2021-01-09 16:06 ` [PR PATCH] [Updated] " sgn
2021-01-09 16:07 ` sgn
2021-01-09 16:10 ` sgn
2021-01-09 16:11 ` sgn
2021-01-09 16:11 ` sgn
2021-01-09 16:11 ` sgn
2021-01-09 16:11 ` sgn
2021-01-09 16:20 ` sgn
2021-01-09 16:20 ` [PR PATCH] [Updated] " sgn
2021-01-09 16:23 ` sgn
2021-01-09 16:23 ` [PR PATCH] [Updated] " sgn
2021-01-09 16:37 ` sgn
2021-01-09 16:37 ` sgn
2021-01-10 11:24 ` [PR PATCH] [Updated] " sgn
2021-01-10 14:47 ` sgn
2021-01-10 14:53 ` [PR PATCH] [Updated] " sgn
2021-01-12 1:27 ` sgn
2021-01-12 15:33 ` sgn
2021-01-30 7:27 ` sgn
2021-01-30 7:30 ` sgn
2021-01-30 7:31 ` sgn
2021-01-30 8:35 ` [PR PATCH] [Updated] " sgn
2021-01-30 9:38 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210101150858.ICFIxHeooVRNfFNgHhCLFpi8b1OJexJUYM9BHF6uJkc@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).