From 5370ca579b3db7a0dc739afd13b9b9cf82ceaf6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:33:16 +0700 Subject: [PATCH 01/15] glib: patch m4 files to honour --localedir --- srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++ srcpkgs/glib/template | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/glib/patches/honour-localedir.patch diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch new file mode 100644 index 00000000000..817a2cd1c47 --- /dev/null +++ b/srcpkgs/glib/patches/honour-localedir.patch @@ -0,0 +1,24 @@ +--- m4macros/glib-gettext.m4.orig 2020-10-19 22:05:31.339006200 +0700 ++++ m4macros/glib-gettext.m4 2020-12-30 23:27:56.555000405 +0700 +@@ -448,7 +448,9 @@ + test "x$prefix" = xNONE && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix=$prefix + datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then ++if test "x$localedir" != "x" ; then ++ localedir=`eval echo "${localedir}"` ++elif test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` + else + localedir=`eval echo "${datadir}/locale"` +--- m4macros/glib-gettext.m4.orig 2020-12-31 18:10:40.213812919 +0700 ++++ m4macros/glib-gettext.m4 2020-12-31 18:12:31.005850695 +0700 +@@ -295,7 +295,7 @@ + ;; + *) + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + ;; + esac]) + LIBS="$glib_save_LIBS" diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 0d6de76ea88..bb28c7f1246 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,7 +1,7 @@ # Template file for 'glib' pkgname=glib version=2.66.2 -revision=1 +revision=2 build_style=meson configure_args="-Dfam=false -Dman=true -Dselinux=disabled $(vopt_bool gtk_doc gtk_doc)" From ae23eca0bab4890c4c870c62663c0b88af56ab63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 09:12:29 +0700 Subject: [PATCH 02/15] xfce4-dev-tools: patch m4 file for i18n --- .../patches/i18n-goes-to-usr-share.patch | 14 ++++++++++++++ srcpkgs/xfce4-dev-tools/template | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch new file mode 100644 index 00000000000..dc864920c8c --- /dev/null +++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch @@ -0,0 +1,14 @@ +--- m4macros/xdt-i18n.m4.orig 2020-07-08 02:16:08.000000000 +0700 ++++ m4macros/xdt-i18n.m4 2020-12-31 09:10:37.664036285 +0700 +@@ -59,11 +59,7 @@ + AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR]) + ], [localedir=$withval], + [ +- if test x"$CATOBJEXT" = x".mo"; then +- localedir=$libdir/locale +- else + localedir=$datarootdir/locale +- fi + ]) + AC_MSG_RESULT([$localedir]) + AC_SUBST([localedir]) diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template index d993eb5e0a3..e3835fea52f 100644 --- a/srcpkgs/xfce4-dev-tools/template +++ b/srcpkgs/xfce4-dev-tools/template @@ -1,7 +1,7 @@ # Template file for 'xfce4-dev-tools' pkgname=xfce4-dev-tools version=4.16.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel" makedepends="libglib-devel" From f99ba32cbe84bebba5690d7371f812645abc6a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:33:59 +0700 Subject: [PATCH 03/15] geeqie: fix localedir --- srcpkgs/geeqie/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template index 2681f31e3ef..3eb2cda003f 100644 --- a/srcpkgs/geeqie/template +++ b/srcpkgs/geeqie/template @@ -1,10 +1,11 @@ # Template file for 'geeqie' pkgname=geeqie version=1.5.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-gtk3" -hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel" +hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel + gettext-devel" makedepends="gtk+3-devel exiv2-devel lcms2-devel librsvg-devel lua51-devel ffmpegthumbnailer-devel" depends="desktop-file-utils" From aa49ad27ed1cab5dea9304604e10324d0c890ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:35:46 +0700 Subject: [PATCH 04/15] appdata-tools: fix l10n dir --- srcpkgs/appdata-tools/template | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template index e1fe4419587..dc9e9ae16e4 100644 --- a/srcpkgs/appdata-tools/template +++ b/srcpkgs/appdata-tools/template @@ -1,13 +1,18 @@ -# Template build file for 'appdata-tools'. +# Template file for 'appdata-tools' pkgname=appdata-tools version=0.1.8 -revision=1 +revision=2 build_style=gnu-configure -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config intltool automake libtool glib-devel + gettext-devel" makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel" short_desc="Tools to handle the AppData files" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://people.freedesktop.org/~hughsient/appdata" distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz" checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461 + +pre_configure() { + autoreconf -fi +} From 48bf12bbf7192642043385b63a3e9e4ef3f9786a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:39:57 +0700 Subject: [PATCH 05/15] ario: fix l10n dir --- srcpkgs/ario/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template index e57c07d2101..52fee779ee5 100644 --- a/srcpkgs/ario/template +++ b/srcpkgs/ario/template @@ -1,21 +1,22 @@ # Template file for 'ario' pkgname=ario version=1.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config intltool glib-devel automake libtool + gettext-devel" makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel libunique1-devel taglib-devel" short_desc="GTK client for MPD" maintainer="Leah Neukirchen " -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,,,g' src/ario-profiles.c - sed -i 's,,,g' src/ario-profiles.h +post_patch() { + vsed -i 's,,,g' src/ario-profiles.c + autoreconf -fi } From 7bc61bfa7a534a6bd6c5fc32a04d95425ce28256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:51:12 +0700 Subject: [PATCH 06/15] GConf: fix l10n dir --- srcpkgs/GConf/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template index 677fff7efc5..bcf803c3ae3 100644 --- a/srcpkgs/GConf/template +++ b/srcpkgs/GConf/template @@ -1,7 +1,7 @@ # Template file for 'GConf' pkgname=GConf version=3.2.6 -revision=9 +revision=10 build_style=gnu-configure build_helper="gir" configure_args="--without-openldap --enable-gtk --enable-defaults-service @@ -14,11 +14,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel" depends="dconf" short_desc="Process-transparent configuration system" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://projects.gnome.org/gconf" distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz" checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c -python_version=2 #unverified +# Line 606 +python_version=2 make_dirs="/usr/share/gconf/schemas 0755 root root /etc/gconf/gconf.xml.defaults 0755 root root /etc/gconf/gconf.xml.mandatory 0755 root root From 8641789a643b1d6ea5cbca69be3129512f59e7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:58:18 +0700 Subject: [PATCH 07/15] seahorse-sharing: fix l10n dir --- srcpkgs/seahorse-sharing/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template index a1883d54423..69be19c778d 100644 --- a/srcpkgs/seahorse-sharing/template +++ b/srcpkgs/seahorse-sharing/template @@ -1,7 +1,7 @@ # Template file for 'seahorse-sharing' pkgname=seahorse-sharing version=3.8.0 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel gpgme-devel gnupg" From da168bb88b30738eca9ab1af88a20dd8b491456d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:59:15 +0700 Subject: [PATCH 08/15] tilp2: fix l10n dir --- srcpkgs/tilp2/template | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template index e6f6335e53d..99e6324c7a4 100644 --- a/srcpkgs/tilp2/template +++ b/srcpkgs/tilp2/template @@ -1,9 +1,10 @@ # Template file for 'tilp2' pkgname=tilp2 version=1.18 -revision=1 +revision=2 build_style=gnu-configure -hostmakedepends="automake bison groff intltool libtool pkg-config texinfo" +hostmakedepends="automake bison groff intltool libtool pkg-config + texinfo gettext-devel glib-devel" makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel gettext-devel libticonv-devel libtifiles2-devel libticables2-devel libticalcs2-devel" @@ -15,10 +16,6 @@ homepage="https://www.ticalc.org" distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${version}.tar.bz2" checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47 -if [ -n "$CROSS_BUILD" ]; then - hostmakedepends+=" gettext-devel glib-devel" -fi - pre_configure() { mkdir -p m4 autoreconf -i -v -f From d3123e6058ca4da2c982d8003bceb07a260ef7a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:59:15 +0700 Subject: [PATCH 09/15] volumeicon: fix l10n dir --- srcpkgs/volumeicon/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template index bd79cabe1f3..64daf7a0949 100644 --- a/srcpkgs/volumeicon/template +++ b/srcpkgs/volumeicon/template @@ -1,7 +1,7 @@ # Template file for 'volumeicon' pkgname=volumeicon version=0.5.1 -revision=3 +revision=4 build_style=gnu-configure configure_args="--enable-notify" hostmakedepends="pkg-config intltool automake glib-devel gettext-devel" @@ -9,8 +9,8 @@ makedepends="alsa-lib-devel libnotify-devel gtk+3-devel" short_desc="Lightweight volume control that sits in your systray" maintainer="Orphaned " license="GPL-3.0-only, ISC, MIT" -homepage="http://softwarebakery.com/maato/volumeicon.html" -distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz" +homepage="http://nullwise.com/volumeicon.html" +distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz" checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0 post_patch() { From 1fbb7c52fe5501fdb02d5cfd535cf2c50bcec27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:26:24 +0700 Subject: [PATCH 10/15] libgpod: fix l10n dir --- srcpkgs/libgpod/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template index c990c094bc2..ebbb640ef11 100644 --- a/srcpkgs/libgpod/template +++ b/srcpkgs/libgpod/template @@ -1,7 +1,7 @@ # Template file for 'libgpod' pkgname=libgpod version=0.8.3 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-udev-dir=/usr/lib/udev --enable-udev" hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool" From d6c6263086c02425d4629028b5a160b2b8593114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:42:31 +0700 Subject: [PATCH 11/15] pragha: fix l10n dir --- srcpkgs/pragha/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template index fef3510d75c..88420e00409 100644 --- a/srcpkgs/pragha/template +++ b/srcpkgs/pragha/template @@ -1,7 +1,7 @@ # Template file for 'pragha' pkgname=pragha version=1.3.3 -revision=5 +revision=6 build_style=gnu-configure hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config" makedepends=" @@ -11,7 +11,7 @@ makedepends=" libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel" short_desc="Pragha is a Lightweight Music Player for GNU/Linux" maintainer="VargMon " -license="GPL-3" +license="GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://pragha-music-player.github.io/" distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz" checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8 From 5a301d585b52177c83550e26dc98f7faa84e362e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 9 Jan 2021 16:31:31 +0700 Subject: [PATCH 12/15] parcellite: fix l10n dir --- srcpkgs/parcellite/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/parcellite/template b/srcpkgs/parcellite/template index b0f37057052..ac93df741dc 100644 --- a/srcpkgs/parcellite/template +++ b/srcpkgs/parcellite/template @@ -1,7 +1,7 @@ # Template file for 'parcellite' pkgname=parcellite version=1.2.1 -revision=3 +revision=4 build_style=gnu-configure hostmakedepends="automake intltool gettext-devel glib-devel pkg-config" makedepends="gtk+-devel" From ad7ff270b39cbd1d5789dc4c5a6973b4aeb8e47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 9 Jan 2021 23:23:03 +0700 Subject: [PATCH 13/15] xsane: fix l10n dir --- srcpkgs/xsane/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template index 022eae8e946..8a2fbfe7c81 100644 --- a/srcpkgs/xsane/template +++ b/srcpkgs/xsane/template @@ -1,7 +1,7 @@ # Template file for 'xsane' pkgname=xsane version=0.999 -revision=3 +revision=4 hostmakedepends="pkg-config" makedepends="gtk+-devel lcms-devel sane-devel gimp-devel" depends="sane" From 2a03c3f5194152c84d91b4c7f2e78f524cca93e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:40:55 +0700 Subject: [PATCH 14/15] polkit-gnome: fix l10n dir --- srcpkgs/polkit-gnome/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template index a12599dcad8..21841eebb2c 100644 --- a/srcpkgs/polkit-gnome/template +++ b/srcpkgs/polkit-gnome/template @@ -1,7 +1,7 @@ # Template file for 'polkit-gnome' pkgname=polkit-gnome version=0.105 -revision=7 +revision=8 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" makedepends="polkit-devel gtk+3-devel" @@ -12,6 +12,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit" distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz" checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369 +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} + post_install() { vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications } From dcd790013345532e3792713e5c569d2ea80431ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 22:54:06 +0700 Subject: [PATCH 15/15] gtk+: fix l10n dir --- srcpkgs/gtk+/template | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template index 39883068d06..206a60de608 100644 --- a/srcpkgs/gtk+/template +++ b/srcpkgs/gtk+/template @@ -1,7 +1,7 @@ # Template file for 'gtk+' pkgname=gtk+ version=2.24.32 -revision=3 +revision=4 build_style=gnu-configure build_helper="gir" configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)" @@ -18,7 +18,8 @@ license="LGPL-2.1-or-later" homepage="http://www.gtk.org" distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz" checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e -python_version=2 #unverified +# gtk-builder-convert:794 +python_version=2 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED" # Package build options @@ -27,11 +28,16 @@ build_options_default="gir cups" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache" - pre_configure() { - autoreconf -if - } fi +pre_configure() { + if [ "$CROSS_BUILD" ]; then + autoreconf -if + else + vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in + fi +} + post_install() { # Provide a default (icon)theme and font. vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0