From 391c3fe13b422db7880dc45b6a0e568a40f984cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:32:47 +0700 Subject: [PATCH 01/54] hooks: abort if l10n files found in /usr/lib --- common/hooks/pre-pkg/99-pkglint.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh index 834bdb0a682..ada06c485ea 100644 --- a/common/hooks/pre-pkg/99-pkglint.sh +++ b/common/hooks/pre-pkg/99-pkglint.sh @@ -68,6 +68,12 @@ hook() { fi done + # Check for l10n files in usr/lib/locale + if [ -d ${PKGDESTDIR}/usr/lib/locale ]; then + msg_red "${pkgver}: /usr/lib/locale is forbidden, use /usr/share/locale!\n" + error=1 + fi + # Check for bash completions in etc/bash_completion.d # should be on usr/share/bash-completion/completions if [ -d ${PKGDESTDIR}/etc/bash_completion.d ]; then From 0ed5e36a684fbde1f1221c710765c0f4763bde11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:33:16 +0700 Subject: [PATCH 02/54] glib: patch m4 files to honour --localedir --- srcpkgs/glib/patches/honour-localedir.patch | 24 +++++++++++++++++++++ srcpkgs/glib/template | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/glib/patches/honour-localedir.patch diff --git a/srcpkgs/glib/patches/honour-localedir.patch b/srcpkgs/glib/patches/honour-localedir.patch new file mode 100644 index 00000000000..a666d8205c8 --- /dev/null +++ b/srcpkgs/glib/patches/honour-localedir.patch @@ -0,0 +1,24 @@ +--- m4macros/glib-gettext.m4.orig 2020-10-19 22:05:31.339006200 +0700 ++++ m4macros/glib-gettext.m4 2020-12-30 23:27:56.555000405 +0700 +@@ -448,7 +448,9 @@ + test "x$prefix" = xNONE && prefix=$ac_default_prefix + test "x$exec_prefix" = xNONE && exec_prefix=$prefix + datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then ++if test "x$localedir" != "x" ; then ++ : ++elif test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` + else + localedir=`eval echo "${datadir}/locale"` +--- m4macros/glib-gettext.m4.orig 2020-12-31 18:10:40.213812919 +0700 ++++ m4macros/glib-gettext.m4 2020-12-31 18:12:31.005850695 +0700 +@@ -295,7 +295,7 @@ + ;; + *) + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + ;; + esac]) + LIBS="$glib_save_LIBS" diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 0d6de76ea88..bb28c7f1246 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,7 +1,7 @@ # Template file for 'glib' pkgname=glib version=2.66.2 -revision=1 +revision=2 build_style=meson configure_args="-Dfam=false -Dman=true -Dselinux=disabled $(vopt_bool gtk_doc gtk_doc)" From c0867c4de9a339d22c4619153b2f62c26364ec63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 09:12:29 +0700 Subject: [PATCH 03/54] xfce4-dev-tools: patch m4 file for i18n --- .../patches/i18n-goes-to-usr-share.patch | 14 ++++++++++++++ srcpkgs/xfce4-dev-tools/template | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch diff --git a/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch new file mode 100644 index 00000000000..dc864920c8c --- /dev/null +++ b/srcpkgs/xfce4-dev-tools/patches/i18n-goes-to-usr-share.patch @@ -0,0 +1,14 @@ +--- m4macros/xdt-i18n.m4.orig 2020-07-08 02:16:08.000000000 +0700 ++++ m4macros/xdt-i18n.m4 2020-12-31 09:10:37.664036285 +0700 +@@ -59,11 +59,7 @@ + AC_HELP_STRING([--with-locales-dir=DIR], [Install locales into DIR]) + ], [localedir=$withval], + [ +- if test x"$CATOBJEXT" = x".mo"; then +- localedir=$libdir/locale +- else + localedir=$datarootdir/locale +- fi + ]) + AC_MSG_RESULT([$localedir]) + AC_SUBST([localedir]) diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template index d993eb5e0a3..e3835fea52f 100644 --- a/srcpkgs/xfce4-dev-tools/template +++ b/srcpkgs/xfce4-dev-tools/template @@ -1,7 +1,7 @@ # Template file for 'xfce4-dev-tools' pkgname=xfce4-dev-tools version=4.16.0 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel" makedepends="libglib-devel" From 7028084cb59462b15ba1e5dfd2c92feb4e1cfc25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 30 Dec 2020 23:33:59 +0700 Subject: [PATCH 04/54] geeqie: fix localedir --- srcpkgs/geeqie/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template index 2681f31e3ef..b82ec9f14e4 100644 --- a/srcpkgs/geeqie/template +++ b/srcpkgs/geeqie/template @@ -1,10 +1,11 @@ # Template file for 'geeqie' pkgname=geeqie version=1.5.1 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--enable-gtk3" -hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel" +configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3" +hostmakedepends="automake pkg-config intltool glib-devel gtk+3-devel + gettext-devel" makedepends="gtk+3-devel exiv2-devel lcms2-devel librsvg-devel lua51-devel ffmpegthumbnailer-devel" depends="desktop-file-utils" From 3d3eebce48c529625f35f6c35e35095129e75dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:35:46 +0700 Subject: [PATCH 05/54] appdata-tools: fix l10n dir --- srcpkgs/appdata-tools/template | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/srcpkgs/appdata-tools/template b/srcpkgs/appdata-tools/template index e1fe4419587..7e46118f652 100644 --- a/srcpkgs/appdata-tools/template +++ b/srcpkgs/appdata-tools/template @@ -1,13 +1,19 @@ -# Template build file for 'appdata-tools'. +# Template file for 'appdata-tools' pkgname=appdata-tools version=0.1.8 -revision=1 +revision=2 build_style=gnu-configure -hostmakedepends="pkg-config intltool" +configure_args="--with-locales-dir=/usr/share/locale" +hostmakedepends="pkg-config intltool automake libtool glib-devel + gettext-devel" makedepends="libglib-devel gdk-pixbuf-devel libsoup-devel libxslt-devel appstream-glib-devel" short_desc="Tools to handle the AppData files" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://people.freedesktop.org/~hughsient/appdata" distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz" checksum=401583d27f0f91bbc03de09f53efd4bf86b20da37d6930ff7bff297d7f1e5461 + +pre_configure() { + autoreconf -fi +} From a4f6cf44dceeeb78ff576f5278e9a4f1e8254f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:39:57 +0700 Subject: [PATCH 06/54] ario: fix l10n dir --- srcpkgs/ario/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template index e57c07d2101..b634acc8fda 100644 --- a/srcpkgs/ario/template +++ b/srcpkgs/ario/template @@ -1,21 +1,23 @@ # Template file for 'ario' pkgname=ario version=1.6 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--disable-static" -hostmakedepends="pkg-config intltool" +configure_args="--with-locales-dir=/usr/share/locale --disable-static" +hostmakedepends="pkg-config intltool glib-devel automake libtool + gettext-devel" makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel libcurl-devel libmpdclient-devel libnotify-devel libsoup-devel libunique1-devel taglib-devel" short_desc="GTK client for MPD" maintainer="Leah Neukirchen " -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 + vsed -i 's,,,g' src/ario-profiles.h + autoreconf -fi } From b409a0dc93d6fdd5bf3d23e10bcc46807261d8ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:48:52 +0700 Subject: [PATCH 07/54] brasero: fix l10n dir --- srcpkgs/brasero/template | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template index b1cc79d8027..9ff2a6468ea 100644 --- a/srcpkgs/brasero/template +++ b/srcpkgs/brasero/template @@ -1,10 +1,11 @@ # Template file for 'brasero' pkgname=brasero version=3.12.2 -revision=5 +revision=6 build_style=gnu-configure build_helper="gir" -configure_args="--disable-schemas-compile --disable-caches" +configure_args="--with-locales-dir=/usr/share/locale + --disable-schemas-compile --disable-caches" hostmakedepends="pkg-config intltool cdrtools itstool" makedepends="gst-plugins-base1-devel totem-pl-parser-devel libnotify-devel libcanberra-devel nautilus-devel libisofs-devel @@ -21,6 +22,12 @@ checksum=6822166f9d08efcf8d900cab6f563e87f49f0e078ca10595dcd908498ef12041 build_options="gir" build_options_default="gir" +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \ + -e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \ + configure +} + brasero-devel_package() { depends="gtk+3-devel brasero>=${version}_${revision}" short_desc+=" - development files" From 3b4ebd383ef390d7004d999ed51226317ec651ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:51:12 +0700 Subject: [PATCH 08/54] GConf: fix l10n dir --- srcpkgs/GConf/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template index 677fff7efc5..b38fe7df570 100644 --- a/srcpkgs/GConf/template +++ b/srcpkgs/GConf/template @@ -1,10 +1,11 @@ # Template file for 'GConf' pkgname=GConf version=3.2.6 -revision=9 +revision=10 build_style=gnu-configure build_helper="gir" configure_args="--without-openldap --enable-gtk --enable-defaults-service + --with-locales-dir=/usr/share/locale --disable-orbit --enable-gsettings-backend --disable-static --disable-gtk-doc-html $(vopt_enable gir introspection)" conf_files="/etc/gconf/2/path" @@ -14,11 +15,12 @@ makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel" depends="dconf" short_desc="Process-transparent configuration system" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://projects.gnome.org/gconf" distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz" checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c -python_version=2 #unverified +# Line 606 +python_version=2 make_dirs="/usr/share/gconf/schemas 0755 root root /etc/gconf/gconf.xml.defaults 0755 root root /etc/gconf/gconf.xml.mandatory 0755 root root From c16981caa2980402e0b616219cedddd58cef0571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:58:18 +0700 Subject: [PATCH 09/54] seahorse-sharing: fix l10n dir --- srcpkgs/seahorse-sharing/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template index a1883d54423..281d12393b6 100644 --- a/srcpkgs/seahorse-sharing/template +++ b/srcpkgs/seahorse-sharing/template @@ -1,8 +1,9 @@ # Template file for 'seahorse-sharing' pkgname=seahorse-sharing version=3.8.0 -revision=3 +revision=4 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="automake libtool pkg-config intltool gettext-devel glib-devel gpgme-devel gnupg" makedepends="libsoup-devel gettext-devel glib-devel gpgme-devel gtk+3-devel From 5473dc23d5b3e87ece220cc60ac54f11eaeaec9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:59:15 +0700 Subject: [PATCH 10/54] tilp2: fix l10n dir --- srcpkgs/tilp2/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/tilp2/template b/srcpkgs/tilp2/template index e6f6335e53d..3fa52ae695c 100644 --- a/srcpkgs/tilp2/template +++ b/srcpkgs/tilp2/template @@ -1,8 +1,9 @@ # Template file for 'tilp2' pkgname=tilp2 version=1.18 -revision=1 +revision=2 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="automake bison groff intltool libtool pkg-config texinfo" makedepends="gtk+-devel libusb-devel zlib-devel glib-devel libarchive-devel gettext-devel libticonv-devel libtifiles2-devel libticables2-devel @@ -16,6 +17,7 @@ distfiles="${SOURCEFORGE_SITE}/tilp/tilp2-linux/tilp2-${version}/${pkgname}-${ve checksum=7b3ab363eeb52504d6ef5811c5d264f8016060bb7bd427be5a064c2ed7384e47 if [ -n "$CROSS_BUILD" ]; then +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends+=" gettext-devel glib-devel" fi From 15181e120918fd690800c6b0a224acca52a29003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 07:59:15 +0700 Subject: [PATCH 11/54] volumeicon: fix l10n dir --- srcpkgs/volumeicon/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template index bd79cabe1f3..8c13bec2d12 100644 --- a/srcpkgs/volumeicon/template +++ b/srcpkgs/volumeicon/template @@ -1,16 +1,16 @@ # Template file for 'volumeicon' pkgname=volumeicon version=0.5.1 -revision=3 +revision=4 build_style=gnu-configure -configure_args="--enable-notify" +configure_args="--with-locales-dir=/usr/share/locale --enable-notify" hostmakedepends="pkg-config intltool automake glib-devel gettext-devel" makedepends="alsa-lib-devel libnotify-devel gtk+3-devel" short_desc="Lightweight volume control that sits in your systray" maintainer="Orphaned " license="GPL-3.0-only, ISC, MIT" -homepage="http://softwarebakery.com/maato/volumeicon.html" -distfiles="http://softwarebakery.com/maato/files/volumeicon/volumeicon-${version}.tar.gz" +homepage="http://nullwise.com/volumeicon.html" +distfiles="http://nullwise.com/files/volumeicon/volumeicon-${version}.tar.gz" checksum=24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0 post_patch() { From 3b2b6fa06e0e9ca5bc16e3d88de6a84d623f70d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 22:33:53 +0700 Subject: [PATCH 12/54] xdg-user-dirs-gtk: fix l10n dir --- srcpkgs/xdg-user-dirs-gtk/template | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template index 4f6a3e03549..b89f1e28d63 100644 --- a/srcpkgs/xdg-user-dirs-gtk/template +++ b/srcpkgs/xdg-user-dirs-gtk/template @@ -1,8 +1,9 @@ # Template file for 'xdg-user-dirs-gtk' pkgname=xdg-user-dirs-gtk version=0.10 -revision=3 +revision=4 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="pkg-config intltool xdg-user-dirs" makedepends="gtk+3-devel xdg-user-dirs" depends="xdg-user-dirs" @@ -12,3 +13,9 @@ license="GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/xdg-user-dirs-gtk/${version}/xdg-user-dirs-gtk-${version}.tar.xz" checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \ + -e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \ + configure +} From 140b697627fe3e594607d4a2c498f03956955db1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 22:54:06 +0700 Subject: [PATCH 13/54] gtk+: fix l10n dir --- srcpkgs/gtk+/template | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template index 39883068d06..9f6e50a1e42 100644 --- a/srcpkgs/gtk+/template +++ b/srcpkgs/gtk+/template @@ -1,10 +1,11 @@ # Template file for 'gtk+' pkgname=gtk+ version=2.24.32 -revision=3 +revision=4 build_style=gnu-configure build_helper="gir" -configure_args="--enable-man $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)" +configure_args="--with-locales-dir=/usr/share/locale --enable-man + $(vopt_enable cups) --with-xinput $(vopt_enable gir introspection)" hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)" makedepends="libglib-devel libXcursor-devel libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel @@ -18,7 +19,8 @@ license="LGPL-2.1-or-later" homepage="http://www.gtk.org" distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz" checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e -python_version=2 #unverified +# gtk-builder-convert:794 +python_version=2 CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED" # Package build options @@ -27,11 +29,16 @@ build_options_default="gir cups" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache" - pre_configure() { - autoreconf -if - } fi +pre_configure() { + if [ "$CROSS_BUILD" ]; then + autoreconf -if + else + vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in + fi +} + post_install() { # Provide a default (icon)theme and font. vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0 From 76a81e54f3928336a13dc96acf007cfe03a2456f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 19:45:00 +0700 Subject: [PATCH 14/54] desmume: fix l10n dir --- srcpkgs/desmume/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template index 71ab6d9feca..50d46ade7df 100644 --- a/srcpkgs/desmume/template +++ b/srcpkgs/desmume/template @@ -1,15 +1,16 @@ # Template file for 'desmume' pkgname=desmume version=0.9.11 -revision=3 +revision=4 build_style=gnu-configure -configure_args="--enable-wifi --enable-hud --disable-openal --enable-glx" +configure_args="--with-locales-dir=/usr/share/locale + --enable-wifi --enable-hud --disable-openal --enable-glx" hostmakedepends="pkg-config intltool dos2unix" makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel agg-devel zziplib-devel glu-devel" depends="desktop-file-utils" short_desc="Nintendo DS emulator" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.desmume.org" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=3ab34ba6cc009566245025c1dd94bf449b6a1b416d24387cb42e183c78e38896 @@ -19,3 +20,7 @@ post_extract() { # convert the target file to LF-only. dos2unix $wrksrc/src/MMU_timing.h } + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From d8556aaf392847864a08a806ed87905e7ffbc3af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 19:52:46 +0700 Subject: [PATCH 15/54] dia: fix l10n dir --- srcpkgs/dia/template | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template index 31766322c4c..4a4037c9cc4 100644 --- a/srcpkgs/dia/template +++ b/srcpkgs/dia/template @@ -1,13 +1,19 @@ # Template file for 'dia' pkgname=dia version=0.97.3 -revision=3 +revision=4 +build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" +hostmakedepends="pkg-config intltool" +makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel + libart-devel libxslt-devel" short_desc="GTK+ based diagram creation program" maintainer="Martin Riese " -license="GPL-2" +license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Dia" -distfiles="${GNOME_SITE}/dia/0.97/dia-${version}.tar.xz" +distfiles="${GNOME_SITE}/dia/${version%.*}/dia-${version}.tar.xz" checksum=22914e48ef48f894bb5143c5efc3d01ab96e0a0cde80de11058d3b4301377d34 -build_style=gnu-configure -hostmakedepends="pkg-config intltool freetype-devel libxml2-devel" -makedepends="gtk+-devel libxml2-devel freetype-devel libpng-devel libart-devel libxslt-devel" + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 908bafed90bf415723f7100d2ef4f7b6c4ac216b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 19:57:00 +0700 Subject: [PATCH 16/54] gconf-editor: fix l10n dir --- srcpkgs/gconf-editor/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gconf-editor/template b/srcpkgs/gconf-editor/template index 9a22cc53d23..4046a204711 100644 --- a/srcpkgs/gconf-editor/template +++ b/srcpkgs/gconf-editor/template @@ -1,9 +1,10 @@ # Template file for 'gconf-editor' pkgname=gconf-editor version=3.0.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-schemas-install --disable-scrollkeeper + --with-locales-dir=/usr/share/locale --with-gconf-schema-file-dir=/usr/share/gconf/schemas" hostmakedepends="pkg-config intltool itstool gnome-doc-utils GConf-devel which" makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel @@ -11,11 +12,15 @@ makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils" short_desc="Graphical editor to maintain the Gnome registry" maintainer="Enno Boland " +license="GPL-2.0-or-later" homepage="http://www.gnome.org" -license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944 +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} + post_install() { mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc} gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \ From 72644a2f792ecc49f114b6e65ea61d2ff98d9856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 19:58:42 +0700 Subject: [PATCH 17/54] gdmap: fix l10n dir --- srcpkgs/gdmap/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gdmap/template b/srcpkgs/gdmap/template index 3e43a2446b5..2dc46b6e074 100644 --- a/srcpkgs/gdmap/template +++ b/srcpkgs/gdmap/template @@ -1,9 +1,9 @@ # Template file for 'gdmap' pkgname=gdmap version=0.8.1 -revision=3 +revision=4 build_style=gnu-configure -configure_args="LIBS=-lm" +configure_args="--with-locales-dir=/usr/share/locale LIBS=-lm" hostmakedepends="pkg-config intltool" makedepends="gtk+-devel libxml2-devel" short_desc="Graphical Disk Map" @@ -12,3 +12,7 @@ license="GPL-2.0-only" homepage="http://gdmap.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 8a2a3866f20bc399fb87e0f090c8b26ae167028a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:00:34 +0700 Subject: [PATCH 18/54] gimp-lqr-plugin: fix l10n dir --- srcpkgs/gimp-lqr-plugin/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gimp-lqr-plugin/template b/srcpkgs/gimp-lqr-plugin/template index 6a49a881e8f..45d8ce44f05 100644 --- a/srcpkgs/gimp-lqr-plugin/template +++ b/srcpkgs/gimp-lqr-plugin/template @@ -1,8 +1,9 @@ # Template file for 'gimp-lqr-plugin' pkgname=gimp-lqr-plugin version=0.7.2 -revision=1 +revision=2 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="automake intltool pkg-config" makedepends="gimp-devel glib-devel gettext-devel liblqr-devel" short_desc="Gimp plugins for image resizing through seam carving" @@ -13,3 +14,7 @@ distfiles="http://liquidrescale.wdfiles.com/local--files/en:download-page-source checksum=169e11164e4fe4e93a0f06e545748bd77b206b7a471bdebf7dd3bc8a008e647a CFLAGS="-fcommon" + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 2347eb168737afa6d18215f0a843f0900c259d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:01:48 +0700 Subject: [PATCH 19/54] gmpc: fix l10n dir --- srcpkgs/gmpc/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template index 7e2dcf1d506..f3283baafb8 100644 --- a/srcpkgs/gmpc/template +++ b/srcpkgs/gmpc/template @@ -1,8 +1,9 @@ # Template file for 'gmpc' pkgname=gmpc version=11.8.16 -revision=2 +revision=3 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="pkg-config gob2 intltool vala" makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel" depends="xdg-utils hicolor-icon-theme" @@ -16,6 +17,10 @@ checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c LDFLAGS="-lm" +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} + gmpc-devel_package() { short_desc+=" - development files" depends="gtk+-devel libmpd-devel" From e23f71558d558d98763175f06499322a9b478c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:03:42 +0700 Subject: [PATCH 20/54] gnome-doc-utils: fix l10n dir --- srcpkgs/gnome-doc-utils/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template index f2dbf6db8f4..eb75c72bebf 100644 --- a/srcpkgs/gnome-doc-utils/template +++ b/srcpkgs/gnome-doc-utils/template @@ -1,9 +1,9 @@ # Template file for 'gnome-doc-utils' pkgname=gnome-doc-utils version=0.20.10 -revision=7 +revision=8 build_style=gnu-configure -configure_args="--disable-scrollkeeper" +configure_args="--with-locales-dir=/usr/share/locale --disable-scrollkeeper" hostmakedepends="pkg-config intltool python3 libxml2-python3 libxslt gsettings-desktop-schemas" makedepends="libxslt-devel docbook-xml docbook-xsl rarian python3 @@ -16,3 +16,7 @@ homepage="https://wiki.gnome.org/Projects/GnomeDocUtils" distfiles="${GNOME_SITE}/${pkgname}/0.20/${pkgname}-${version}.tar.xz" checksum=cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6 patch_args="-Np1" + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 4d3568a294db820208bbf3f0caf2c1869d869e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:06:30 +0700 Subject: [PATCH 21/54] gnome-mime-data: fix l10n dir --- srcpkgs/gnome-mime-data/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template index 937e9dad473..4bb4769baa2 100644 --- a/srcpkgs/gnome-mime-data/template +++ b/srcpkgs/gnome-mime-data/template @@ -1,8 +1,9 @@ # Template file for 'gnome-mime-data' pkgname=gnome-mime-data version=2.18.0 -revision=5 +revision=6 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="intltool shared-mime-info" makedepends="shared-mime-info" depends="shared-mime-info" @@ -12,5 +13,8 @@ license="GPL-2.0-only" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/${pkgname}/2.18/${pkgname}-${version}.tar.bz2" checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7 - conf_files="/etc/gnome-vfs-mime-magic" + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 0770dae46f610f31782f3a7029576d74715fd0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:07:41 +0700 Subject: [PATCH 22/54] gnome-mplayer: fix l10n dir --- srcpkgs/gnome-mplayer/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template index c965aad6e0b..51502970ea0 100644 --- a/srcpkgs/gnome-mplayer/template +++ b/srcpkgs/gnome-mplayer/template @@ -1,9 +1,9 @@ # Template file for 'gnome-mplayer' pkgname=gnome-mplayer version=1.0.9 -revision=4 +revision=5 build_style=gnu-configure -configure_args="--disable-schemas-install" +configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-install" hostmakedepends="pkg-config intltool glib-devel" # XXX missing libgpod makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel @@ -18,3 +18,7 @@ distfiles="https://github.com/kdekorte/gnome-mplayer/archive/v${version}.tar.gz" checksum=07e11bc42834dae14ad66f887e6045f2bea94eae7f797b624c9a099f806b5cde CFLAGS="-fcommon" + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 23cfae0236f6a65d54c5d58cbca1061173e1dff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:08:55 +0700 Subject: [PATCH 23/54] gnome-nettool: fix l10n dir --- srcpkgs/gnome-nettool/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template index d9769176514..fad533c4901 100644 --- a/srcpkgs/gnome-nettool/template +++ b/srcpkgs/gnome-nettool/template @@ -1,16 +1,21 @@ # Template file for 'gnome-nettool' pkgname=gnome-nettool version=3.8.1 -revision=5 +revision=6 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="glib-devel intltool itstool pkg-config" makedepends="bind-utils desktop-file-utils gsettings-desktop-schemas-devel gtk+3-devel hicolor-icon-theme iputils libgtop-devel net-tools traceroute" depends="bind-utils desktop-file-utils hicolor-icon-theme iputils net-tools traceroute" -short_desc="A Collection of GNOME3 Networking Tools" +short_desc="Collection of GNOME3 Networking Tools" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1 + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 6d7777f6687ab9608f281fcfb3df04ffc23132bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:09:48 +0700 Subject: [PATCH 24/54] gnome-screensaver: fix l10n dir --- srcpkgs/gnome-screensaver/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template index c3a70cfef7c..6ee40a2ad5f 100644 --- a/srcpkgs/gnome-screensaver/template +++ b/srcpkgs/gnome-screensaver/template @@ -1,15 +1,19 @@ # Template file for 'gnome-screensaver' pkgname=gnome-screensaver version=3.6.1 -revision=3 +revision=4 build_style=gnu-configure -configure_args="--enable-compile-warnings=minimum" +configure_args="--with-locales-dir=/usr/share/locale --enable-compile-warnings=minimum" hostmakedepends="pkg-config automake intltool glib-devel" makedepends="gnome-desktop-devel dbus-glib-devel pam-devel" depends="gnome-desktop libgnomekbd dbus" -short_desc="A new screensaver that can replace xscreensaver" +short_desc="GNOME's screensaver that can replace xscreensaver" maintainer="shizonic " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeScreensaver" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0 + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 413a44e9b59b146b907b923e6f47043c057862da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:33:45 +0700 Subject: [PATCH 25/54] gnome-system-log: fix l10n dir --- srcpkgs/gnome-system-log/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template index 92fd318ffbd..653a2a94fce 100644 --- a/srcpkgs/gnome-system-log/template +++ b/srcpkgs/gnome-system-log/template @@ -1,9 +1,9 @@ # Template file for 'gnome-system-log' pkgname=gnome-system-log version=3.9.90 -revision=3 +revision=4 build_style=gnu-configure -configure_args="--disable-schemas-compile" +configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-compile" hostmakedepends="pkg-config intltool itstool glib-devel" makedepends="gtk+3-devel" depends="hicolor-icon-theme desktop-file-utils" @@ -13,3 +13,7 @@ license="GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411 + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From c906f0cd51ff78e3c96626f2fa3146435ab949a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:35:12 +0700 Subject: [PATCH 26/54] gnumeric: fix l10n dir --- srcpkgs/gnumeric/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gnumeric/template b/srcpkgs/gnumeric/template index 0a753798b09..1328f77d55c 100644 --- a/srcpkgs/gnumeric/template +++ b/srcpkgs/gnumeric/template @@ -1,7 +1,7 @@ # Template file for 'gnumeric' pkgname=gnumeric version=1.12.48 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="bison gdk-pixbuf-devel glib-devel intltool itstool pkg-config " makedepends="goffice-devel librsvg-devel libxslt-devel" @@ -22,6 +22,10 @@ if [ "$CROSS_BUILD" ]; then configure_args+=" --without-perl" fi +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} + gnumeric-devel_package() { depends="gnumeric>=${version}_${revision}" short_desc+=" - development files" From 09ac730e621b47f407373a1b81cef43ac0ea540c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:36:33 +0700 Subject: [PATCH 27/54] gpicview: fix l10n dir --- srcpkgs/gpicview/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template index 217df197ff1..be07a3dc96d 100644 --- a/srcpkgs/gpicview/template +++ b/srcpkgs/gpicview/template @@ -1,9 +1,9 @@ # Template file for 'gpicview' pkgname=gpicview version=0.2.5 -revision=3 +revision=4 build_style=gnu-configure -configure_args="--enable-gtk3" +configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3" hostmakedepends="pkg-config intltool" makedepends="libjpeg-turbo-devel gtk+3-devel desktop-file-utils" depends="desktop-file-utils" @@ -15,6 +15,7 @@ distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz" checksum=38466058e53702450e5899193c4b264339959b563dd5cd81f6f690de32d82942 patch_args="-Np1" -pre_configure() { - sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure + vsed -i -e '/^Categories=/ s/Utility;//' gpicview.desktop.in } From c2c14776d0d104a042d540f670eccd9dfd18b833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:37:42 +0700 Subject: [PATCH 28/54] gtk2-engines: fix l10n dir --- srcpkgs/gtk2-engines/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template index c272d525cc0..b0afbc7b65e 100644 --- a/srcpkgs/gtk2-engines/template +++ b/srcpkgs/gtk2-engines/template @@ -1,15 +1,19 @@ # Template file for 'gtk2-engines' pkgname=gtk2-engines version=2.21.0 -revision=4 +revision=5 wrksrc=gtk-engines-${version} build_style=gnu-configure -configure_args="--enable-animation" +configure_args="--with-locales-dir=/usr/share/locale --enable-animation" hostmakedepends="pkg-config intltool" makedepends="gtk+-devel" short_desc="GTK+2 Theme engines" maintainer="Orphaned " -license="GPL-2" +license="LGPL-2.1-or-later" homepage="http://live.gnome.org/GnomeArt" distfiles="https://sources.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz" checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 4d650d37e773c2166f800547f2fae8faedfaf431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:39:26 +0700 Subject: [PATCH 29/54] gtkpod: fix l10n dir --- srcpkgs/gtkpod/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template index 0057900580b..15c75642635 100644 --- a/srcpkgs/gtkpod/template +++ b/srcpkgs/gtkpod/template @@ -1,9 +1,9 @@ # Template file for 'gtkpod' pkgname=gtkpod version=2.1.5 -revision=3 +revision=4 build_style=gnu-configure -configure_args="--disable-static" +configure_args="--with-locales-dir=/usr/share/locale --disable-static" hostmakedepends="flex intltool pkg-config glib" makedepends="libcurl-devel libflac-devel libgpod-devel libmusicbrainz5-devel libdiscid-devel clutter-gtk-devel libmp4v2-devel libvorbis-devel @@ -18,3 +18,7 @@ checksum=a57dc8ae9138e0cb4cee98691e7a95001130c9ea7823e6a75cc72503facd3a76 python_version=2 CFLAGS="-fcommon" + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 849b0a3c16ee119542808d27ab06f325934658ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:44:09 +0700 Subject: [PATCH 30/54] gtksourceview2: fix l10n dir --- srcpkgs/gtksourceview2/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template index 7b2df2006fe..c16d57ba73f 100644 --- a/srcpkgs/gtksourceview2/template +++ b/srcpkgs/gtksourceview2/template @@ -1,10 +1,10 @@ # Template file for 'gtksourceview2' pkgname=gtksourceview2 version=2.10.5 -revision=6 +revision=7 wrksrc="gtksourceview-${version}" build_style=gnu-configure -configure_args="--disable-static" +configure_args="--with-locales-dir=/usr/share/locale --disable-static" hostmakedepends="pkg-config intltool glib-devel" makedepends="gtk+-devel libxml2-devel" short_desc="Text widget that extends GTK+ GtkTextView widget" @@ -13,7 +13,12 @@ license="GPL-2.0-or-later" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/gtksourceview/2.10/gtksourceview-${version}.tar.bz2" checksum=c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e -python_version=2 #unverified +# convert.py:178 +python_version=2 + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} do_check() { : #requires xserver From 041fa5a884993df8ea91183e7bcb7c481d7c15c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:45:43 +0700 Subject: [PATCH 31/54] gtkspell: fix l10n dir --- srcpkgs/gtkspell/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template index e7369063b2b..2b185f6ee9a 100644 --- a/srcpkgs/gtkspell/template +++ b/srcpkgs/gtkspell/template @@ -1,20 +1,22 @@ # Template file for 'gtkspell' pkgname=gtkspell version=2.0.16 -revision=4 +revision=5 build_style=gnu-configure -configure_args="--disable-static" +configure_args="--with-locales-dir=/usr/share/locale --disable-static" hostmakedepends="intltool pkg-config" makedepends="enchant2-devel gtk+-devel" short_desc="Provides word-processor-style highlighting" maintainer="Orphaned " -homepage="http://gtkspell.sourceforge.net/" license="LGPL-2.1-or-later" +homepage="http://gtkspell.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02 -pre_configure() { - sed -i 's/enchant/enchant-2/g' configure +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \ + -e 's/enchant/enchant-2/g' \ + configure } gtkspell-devel_package() { From 29183aa3330adf652b59d3e0c3afa0b336d3f16d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:49:03 +0700 Subject: [PATCH 32/54] gxmessage: fix l10n dir --- srcpkgs/gxmessage/template | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gxmessage/template b/srcpkgs/gxmessage/template index 8263304878a..0d349d8bbe5 100644 --- a/srcpkgs/gxmessage/template +++ b/srcpkgs/gxmessage/template @@ -1,13 +1,18 @@ # Template file for 'gxmessage' pkgname=gxmessage version=3.4.3 -revision=1 +revision=2 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="intltool pkg-config" makedepends="gtk+3-devel" -short_desc="An xmessage clone based on GTK+" +short_desc="Clone of xmessage based on GTK+" maintainer="Peter Wang " -license="GPL-3" +license="GPL-3.0-or-later" homepage="http://savannah.gnu.org/projects/gxmessage" -distfiles="${GNU_SITE}/gxmessage/gxmessage-3.4.3.tar.gz" +distfiles="${GNU_SITE}/gxmessage/gxmessage-${version}.tar.gz" checksum=db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05 + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From fe5e92cccb70f729e1fb6d11a5aee529756584e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:51:08 +0700 Subject: [PATCH 33/54] homebank: fix l10n dir --- srcpkgs/homebank/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/homebank/template b/srcpkgs/homebank/template index 21792cd48a6..c987e54e0e7 100644 --- a/srcpkgs/homebank/template +++ b/srcpkgs/homebank/template @@ -1,8 +1,9 @@ # Template file for 'homebank' pkgname=homebank version=5.4.3 -revision=1 +revision=2 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="intltool pkg-config" makedepends="libofx-devel librsvg-devel gtk+3-devel libsoup-devel" depends="shared-mime-info hicolor-icon-theme desktop-file-utils" @@ -12,3 +13,7 @@ license="GPL-2.0-or-later" homepage="http://homebank.free.fr/" distfiles="http://homebank.free.fr/public/homebank-${version}.tar.gz" checksum=9222d7ed7cc44fcfff3f1fe20935a1b7fe91bb4d9f90003cb3c6f3b893298d0b + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From bc89791bc8ad98e3e6892c24ebd048f5d4416772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 20:58:12 +0700 Subject: [PATCH 34/54] leafpad: fix l10n dir --- srcpkgs/leafpad/template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/leafpad/template b/srcpkgs/leafpad/template index bf925ca462f..bd613e392ae 100644 --- a/srcpkgs/leafpad/template +++ b/srcpkgs/leafpad/template @@ -1,15 +1,21 @@ # Template file for 'leafpad' pkgname=leafpad version=0.8.18.1 -revision=4 +revision=5 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="intltool pkg-config" makedepends="gettext-devel gtk+-devel desktop-file-utils hicolor-icon-theme" depends="desktop-file-utils hicolor-icon-theme" short_desc="GTK+ Simple text editor" -maintainer="Carlo Dormeletti " +maintainer="Carlo Dormeletti " license="GPL-2.0-or-later" homepage="http://tarot.freeshell.org/leafpad/" distfiles="http://download-mirror.savannah.gnu.org/releases/leafpad/leafpad-${version}.tar.gz" checksum=959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \ + -e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \ + configure +} From 4217bd2cd634331415351da5eb687b1089bc25eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 21:48:48 +0700 Subject: [PATCH 35/54] libcryptui: fix l10n dir --- srcpkgs/libcryptui/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template index 30be95c3ebe..922427179c2 100644 --- a/srcpkgs/libcryptui/template +++ b/srcpkgs/libcryptui/template @@ -1,11 +1,12 @@ # Template file for 'libcryptui' pkgname=libcryptui version=3.12.2 -revision=2 +revision=3 build_style=gnu-configure build_helper="gir" configure_args="--disable-static --disable-update-mime-database ---disable-schemas-compile $(vopt_enable gir introspection)" + --with-locales-dir=/usr/share/locale + --disable-schemas-compile $(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool dbus-glib-devel glib gnupg $(vopt_if gir gobject-introspection)" makedepends="libSM-devel dbus-glib-devel gtk+3-devel gpgme-devel @@ -22,6 +23,10 @@ checksum=71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866 build_options="gir" build_options_default="gir" +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} + libcryptui-devel_package() { depends="gtk+3-devel dbus-glib-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From 122eee129ada3e0d85d01309723c8c64bfdc5eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 1 Jan 2021 22:05:43 +0700 Subject: [PATCH 36/54] libglib-static: fix l10n dir, conflicts with libglib-devel --- srcpkgs/libglib-static/template | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libglib-static/template b/srcpkgs/libglib-static/template index ee6de793298..e3ff6e7ffc6 100644 --- a/srcpkgs/libglib-static/template +++ b/srcpkgs/libglib-static/template @@ -5,10 +5,11 @@ # pkgname=libglib-static version=2.58.3 -revision=4 +revision=5 wrksrc="glib-${version}" build_style=gnu-configure -configure_args="--enable-libelf --disable-fam --disable-shared --with-pcre=system +configure_args="--with-locales-dir=/usr/share/locale + --enable-libelf --disable-fam --disable-shared --with-pcre=system --enable-static" hostmakedepends="automake gettext libtool pkg-config python3 libxslt docbook-xsl" makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel" @@ -20,6 +21,7 @@ homepage="https://wiki.gnome.org/Projects/GLib" changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" checksum=8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481 +conflicts="libglib-devel>=0" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" glib-devel" @@ -29,6 +31,15 @@ if [ "$CROSS_BUILD" ]; then esac fi +post_patch() { + # Better to just rm -rf /usr/lib/locale in post_install? + vsed -i -e "s,localedir=.*,localedir=/usr/share/locale," \ + -e "s,DATADIRNAME=lib,DATADIRNAME=share," \ + m4macros/glib-gettext.m4 + vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \ + po/Makefile.in.in +} + pre_configure() { NOCONFIGURE=1 ./autogen.sh } From e87f7214641aca4ae6c4de164991045e696b7991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:23:37 +0700 Subject: [PATCH 37/54] libgnomecanvas: fix l10n dir --- srcpkgs/libgnomecanvas/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libgnomecanvas/template b/srcpkgs/libgnomecanvas/template index 53d66f4f5d1..10ceb3d3c0d 100644 --- a/srcpkgs/libgnomecanvas/template +++ b/srcpkgs/libgnomecanvas/template @@ -1,18 +1,24 @@ # Template file for 'libgnomecanvas' pkgname=libgnomecanvas version=2.30.3 -revision=9 +revision=10 build_style=gnu-configure -configure_args="--disable-static" +configure_args="--with-locales-dir=/usr/share/locale --disable-static" hostmakedepends="pkg-config intltool glib-devel" makedepends="gtk+-devel libart-devel" short_desc="GNOME Canvas library" maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="http://gnome.org/" -distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2" +distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" checksum=859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40 +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' \ + -e 's,localedir=.*eval echo.*,localedir=/usr/share/locale,' \ + configure +} + libgnomecanvas-devel_package() { depends="gtk+-devel libart-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" -- development files" From 936e9bd7f64d08b0b14e29c7e2bd01b7a6d4dbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:24:46 +0700 Subject: [PATCH 38/54] libgnome-keyring: fix l10n dir --- srcpkgs/libgnome-keyring/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgnome-keyring/template b/srcpkgs/libgnome-keyring/template index 41c6b31f4f3..193b8b21994 100644 --- a/srcpkgs/libgnome-keyring/template +++ b/srcpkgs/libgnome-keyring/template @@ -1,10 +1,10 @@ # Template file for 'libgnome-keyring' pkgname=libgnome-keyring version=3.12.0 -revision=4 +revision=5 build_style=gnu-configure build_helper="gir" -configure_args="$(vopt_enable gir introspection)" +configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool" makedepends="dbus-devel libglib-devel libgcrypt-devel" checkdepends="glib-devel" @@ -19,6 +19,10 @@ checksum=c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 build_options="gir" build_options_default="gir" +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} + libgnome-keyring-devel_package() { depends="libglib-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From 000b626c01b959ce04eeb8696020cd450c6e785e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:26:24 +0700 Subject: [PATCH 39/54] libgpod: fix l10n dir --- srcpkgs/libgpod/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template index c990c094bc2..bbd4fc3ad5b 100644 --- a/srcpkgs/libgpod/template +++ b/srcpkgs/libgpod/template @@ -1,9 +1,9 @@ # Template file for 'libgpod' pkgname=libgpod version=0.8.3 -revision=3 +revision=4 build_style=gnu-configure -configure_args="--with-udev-dir=/usr/lib/udev --enable-udev" +configure_args="--with-locales-dir=/usr/share/locale --with-udev-dir=/usr/lib/udev --enable-udev" hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool" makedepends="gdk-pixbuf-devel libimobiledevice-devel sg3_utils-devel sqlite-devel" short_desc="Shared library to access the contents of an iPod" From b8fbce7d8961fc12511aaa9a94684c85e173d3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:27:53 +0700 Subject: [PATCH 40/54] libwnck2: fix l10n dir --- srcpkgs/libwnck/template | 2 +- srcpkgs/libwnck2/template | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template index 07068c2b5f9..1033388b4d4 100644 --- a/srcpkgs/libwnck/template +++ b/srcpkgs/libwnck/template @@ -4,7 +4,7 @@ version=3.36.0 revision=1 build_style=meson build_helper="gir" -#configure_args="$(vopt_enable gir introspection)" +configure_args="-Dintrospection=$(vopt_if gir enabled disabled)" hostmakedepends="gdk-pixbuf-devel pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)" makedepends="startup-notification-devel gtk+3-devel libXres-devel" diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template index eff87a30f29..313ce31e34a 100644 --- a/srcpkgs/libwnck2/template +++ b/srcpkgs/libwnck2/template @@ -1,11 +1,11 @@ # Template file for 'libwnck2' pkgname=libwnck2 version=2.30.7 -revision=7 +revision=8 wrksrc="${pkgname/2/}-${version}" build_style=gnu-configure build_helper="gir" -configure_args="$(vopt_enable gir introspection)" +configure_args="--with-locales-dir=/usr/share/locale $(vopt_enable gir introspection)" hostmakedepends="pkg-config intltool gdk-pixbuf-devel $(vopt_if gir gobject-introspection)" makedepends="startup-notification-devel libXres-devel gtk+-devel" short_desc="Library for layout and rendering of text (GTK+2)" @@ -19,6 +19,10 @@ checksum=8aabbe6c87b89b170dbd6e1577a89d248323da128fff0b3ab673010f0cd6156c build_options="gir" build_options_default="gir" +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} + post_install() { rm -rf ${DESTDIR}/usr/bin } From 98a36728028605b98db8b21770fad937b101b7c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:28:38 +0700 Subject: [PATCH 41/54] libwnck2: fix l10n dir --- srcpkgs/libwnck2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template index 313ce31e34a..e95a1133b4f 100644 --- a/srcpkgs/libwnck2/template +++ b/srcpkgs/libwnck2/template @@ -1,7 +1,7 @@ # Template file for 'libwnck2' pkgname=libwnck2 version=2.30.7 -revision=8 +revision=9 wrksrc="${pkgname/2/}-${version}" build_style=gnu-configure build_helper="gir" From 0b43c8192c472a35b1fed30dec10bfdae8c5e25b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:29:34 +0700 Subject: [PATCH 42/54] lxappearance-obconf: fix l10n dir --- srcpkgs/lxappearance-obconf/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lxappearance-obconf/template b/srcpkgs/lxappearance-obconf/template index 33b0be4f0a4..46c4734a0c3 100644 --- a/srcpkgs/lxappearance-obconf/template +++ b/srcpkgs/lxappearance-obconf/template @@ -1,9 +1,9 @@ # Template file for 'lxappearance-obconf' pkgname=lxappearance-obconf version=0.2.3 -revision=2 +revision=3 build_style=gnu-configure -configure_args="--disable-static --enable-gtk3" +configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-gtk3" hostmakedepends="pkg-config intltool" makedepends=" openbox-devel dbus-glib-devel libxml2-devel libXft-devel libSM-devel @@ -15,3 +15,7 @@ license="GPL-2.0-or-later" homepage="http://lxde.org/" distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz" checksum=3150b33b4b7beb71c1803aee2be21c94767d73b70dfc8d2bcaafe2650ea83149 + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From beb6c3c32bd0976f793f0b070dbc2c1f1867cbfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:30:30 +0700 Subject: [PATCH 43/54] lxinput: fix l10n dir --- srcpkgs/lxinput/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template index f5689634fb8..8736f3f854a 100644 --- a/srcpkgs/lxinput/template +++ b/srcpkgs/lxinput/template @@ -1,9 +1,9 @@ # Template file for 'lxinput' pkgname=lxinput version=0.3.5 -revision=2 +revision=3 build_style=gnu-configure -configure_args="--enable-gtk3" +configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3" hostmakedepends="pkg-config intltool" makedepends="gtk+3-devel" depends="desktop-file-utils" @@ -13,3 +13,7 @@ license="GPL-2.0-or-later" homepage="http://lxde.org/" distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz" checksum=4e8f778a65a4afe2365b47e7899358aa4fab535343aa62c72a3cdc4cac1f6e88 + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 2062cf8b718623c94f52b5aa99ea697ca6c048a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:31:14 +0700 Subject: [PATCH 44/54] lxlauncher: fix l10n dir --- srcpkgs/lxlauncher/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template index d9817999fb3..44f7b806ea5 100644 --- a/srcpkgs/lxlauncher/template +++ b/srcpkgs/lxlauncher/template @@ -1,9 +1,9 @@ # Template file for 'lxlauncher' pkgname=lxlauncher version=0.2.5 -revision=2 +revision=3 build_style=gnu-configure -configure_args="--enable-gtk3" +configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3" hostmakedepends="pkg-config intltool" makedepends="gtk+3-devel startup-notification-devel menu-cache-devel" conf_files=" @@ -17,3 +17,7 @@ homepage="http://lxde.org/" distfiles="${SOURCEFORGE_SITE}/lxde/${pkgname}-${version}.tar.xz" checksum=cd14b59cf337e7ba0d67efc95cd79859ab5f0f85af5a84c7aff771f868c3dca7 patch_args="-Np1" + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From e2248a758d419bc642acbf2068f6770a486c816d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:33:19 +0700 Subject: [PATCH 45/54] pcmanx-gtk2: fix l10n dir --- srcpkgs/pcmanx-gtk2/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pcmanx-gtk2/template b/srcpkgs/pcmanx-gtk2/template index 18951baf76c..68269d5fea0 100644 --- a/srcpkgs/pcmanx-gtk2/template +++ b/srcpkgs/pcmanx-gtk2/template @@ -1,16 +1,16 @@ # Template file for 'pcmanx-gtk2' pkgname=pcmanx-gtk2 version=1.3 -revision=1 +revision=2 build_style=gnu-configure -configure_args="--enable-iplookup --enable-proxy +configure_args="--with-locales-dir=/usr/share/locale --enable-iplookup --enable-proxy $(vopt_enable libnotify) $(vopt_enable wget)" hostmakedepends="pkg-config intltool gettext" makedepends="gtk+-devel $(vopt_if libnotify libnotify-devel)" depends="$(vopt_if wget wget)" short_desc="Easy-to-use telnet client mainly for BBS users" maintainer="Casper Ti. Vector " -license="GPL-2" +license="GPL-2.0-only" homepage="https://github.com/pcman-bbs/pcmanx" distfiles="https://github.com/pcman-bbs/pcmanx/releases/download/$version/$pkgname-$version.tar.xz" checksum=3f5d7eaf5daa7dcf3843a01e239cea312045ded03dd77b364fa1082b9356968a @@ -20,6 +20,10 @@ desc_option_libnotify="Enable libnotify dependency" desc_option_wget="Enable wget dependency" build_options_default="libnotify wget" +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} + post_install() { vdoc README vdoc TODO From 2cdfa30659a0866badcf1b549bae8d306f420660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:35:26 +0700 Subject: [PATCH 46/54] lightdm-gtk-greeter: fix l10n dir --- srcpkgs/lightdm-gtk-greeter/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template index 574877b6369..30d7ac5d401 100644 --- a/srcpkgs/lightdm-gtk-greeter/template +++ b/srcpkgs/lightdm-gtk-greeter/template @@ -1,9 +1,9 @@ # Template file for 'lightdm-gtk-greeter' pkgname=lightdm-gtk-greeter version=1.8.5 -revision=4 +revision=5 build_style=gnu-configure -configure_args="--disable-static --with-gtk2 +configure_args="--with-locales-dir=/usr/share/locale --disable-static --with-gtk2 --enable-compile-warnings=no" conf_files="/etc/lightdm/lightdm-gtk-greeter.conf" hostmakedepends="pkg-config intltool" @@ -17,3 +17,7 @@ distfiles="${homepage}/${version%.*}/${version}/+download/${pkgname}-${version}. checksum=22386e787dc64ac372c63cf2cdce47bfa1c791d1cf8b5d3df68df24ecfbf7d68 conflicts="lightdm-gtk3-greeter>=0" patch_args="-Np1" + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 74c6066b0a73fb64d6075e6891849d5f5b78487c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:35:41 +0700 Subject: [PATCH 47/54] pidgin-libnotify: fix l10n dir --- srcpkgs/pidgin-libnotify/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pidgin-libnotify/template b/srcpkgs/pidgin-libnotify/template index 2dfbcdf5db1..bc71b0e602c 100644 --- a/srcpkgs/pidgin-libnotify/template +++ b/srcpkgs/pidgin-libnotify/template @@ -1,15 +1,20 @@ # Template file for 'pidgin-libnotify' pkgname=pidgin-libnotify version=0.14 -revision=2 +revision=3 build_style=gnu-configure -configure_args="--disable-deprecated --disable-static" +configure_args="--with-locales-dir=/usr/share/locale --disable-deprecated --disable-static" hostmakedepends="intltool pkg-config" makedepends="pidgin-devel libnotify-devel" short_desc="Pidgin plugin that enables popups when someone logs in or messages you" maintainer="Kharlamov Alexey " -license="GPL-3.0-or-later" +# See its only source file pidgin-libnotify.c +license="GPL-2.0-or-later" homepage="http://gaim-libnotify.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/gaim-libnotify/${pkgname}-${version}.tar.gz" checksum=74f4a9f20e0a483df39974178f1f2380786176189512bcd438e4ada280ec3abe lib32disabled=yes + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From de318f50916a39439461f8e88e40d6cd429ccccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:36:45 +0700 Subject: [PATCH 48/54] pidgin-otr: fix l10n dir --- srcpkgs/pidgin-otr/template | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template index 0cda9a5b705..1ec42101f17 100644 --- a/srcpkgs/pidgin-otr/template +++ b/srcpkgs/pidgin-otr/template @@ -1,14 +1,19 @@ # Template file for 'pidgin-otr' pkgname=pidgin-otr version=4.0.2 -revision=1 -lib32disabled=yes +revision=2 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="pkg-config intltool" makedepends="pidgin-devel libgcrypt-devel libotr-devel" short_desc="Off-the-Record Messaging plugin for Pidgin IM" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-only" homepage="http://www.cypherpunks.ca/otr/" distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz" checksum=f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4 +lib32disabled=yes + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From 026e55374cd91867d21d809aa2cf2211e0f1e3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:38:20 +0700 Subject: [PATCH 49/54] pidgin-privacy-please: fix l10n dir --- srcpkgs/pidgin-privacy-please/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pidgin-privacy-please/template b/srcpkgs/pidgin-privacy-please/template index 6b9c1d15be0..18499372923 100644 --- a/srcpkgs/pidgin-privacy-please/template +++ b/srcpkgs/pidgin-privacy-please/template @@ -1,10 +1,12 @@ # Template file for 'pidgin-privacy-please' pkgname=pidgin-privacy-please version=0.7.1 -revision=3 +revision=4 build_style=gnu-configure -makedepends="libpurple-devel pidgin-devel glib-devel" -hostmakedepends="automake intltool libtool pkg-config $makedepends" +configure_args="--with-locales-dir=/usr/share/locale" +hostmakedepends="automake intltool libtool pkg-config libpurple-devel + pidgin-devel glib-devel" +makedepends="libpurple-devel pidgin-devel libglib-devel" depends="pidgin" short_desc="Pidgin plugin to stop spam" maintainer="Leah Neukirchen " @@ -12,3 +14,7 @@ license="GPL-3.0-or-later" homepage="https://packages.debian.org/sid/pidgin-privacy-please" distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.gz" checksum=8134bcd5da98fe8b4c9918fd420c7e68b0990e895ed2534396cacbf473f2615c + +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} From aba2f76bbc473a59493324416e9d2f0fad974ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:39:41 +0700 Subject: [PATCH 50/54] pmount: fix l10n dir --- srcpkgs/pmount/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/pmount/template b/srcpkgs/pmount/template index b95f2690b6b..b840e762971 100644 --- a/srcpkgs/pmount/template +++ b/srcpkgs/pmount/template @@ -1,18 +1,20 @@ # Template file for 'pmount' pkgname=pmount version=0.9.23 -revision=6 -conf_files="/etc/pmount.allow" +revision=7 build_style=gnu-configure -short_desc="Permits normal users to mount removable devices" -maintainer="Enno Boland " -license="GPL-2" +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="intltool" makedepends="libblkid-devel" +short_desc="Permits normal users to mount removable devices" +maintainer="Enno Boland " +license="GPL-3.0-only" homepage="http://pmount.alioth.debian.org/" distfiles="${DEBIAN_SITE}/main/p/${pkgname}/${pkgname}_${version}.orig.tar.bz2" checksum=db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036 +conf_files="/etc/pmount.allow" -pre_configure() { - sed -i -e 's/-o root -g root //' src/Makefile.in +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure + vsed -i -e 's/-o root -g root //' src/Makefile.in } From bb42b404ce7870dff87e68f5b51c654e986618f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:40:55 +0700 Subject: [PATCH 51/54] polkit-gnome: fix l10n dir --- srcpkgs/polkit-gnome/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template index a12599dcad8..b43a693c05a 100644 --- a/srcpkgs/polkit-gnome/template +++ b/srcpkgs/polkit-gnome/template @@ -1,8 +1,9 @@ # Template file for 'polkit-gnome' pkgname=polkit-gnome version=0.105 -revision=7 +revision=8 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="polkit-devel gtk+3-devel" short_desc="PolicyKit integration for the GNOME desktop" @@ -12,6 +13,10 @@ homepage="http://www.freedesktop.org/wiki/Software/PolicyKit" distfiles="${GNOME_SITE}/$pkgname/$version/$pkgname-$version.tar.xz" checksum=1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369 +post_patch() { + vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure +} + post_install() { vinstall ${FILESDIR}/polkit-gnome-authentication-agent-1.desktop 644 usr/share/applications } From 83fa92c59cf7f565b0fb2fcdd35ab7d633a4e235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 2 Jan 2021 06:42:31 +0700 Subject: [PATCH 52/54] pragha: fix l10n dir --- srcpkgs/pragha/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template index fef3510d75c..2322a5037c9 100644 --- a/srcpkgs/pragha/template +++ b/srcpkgs/pragha/template @@ -1,8 +1,9 @@ # Template file for 'pragha' pkgname=pragha version=1.3.3 -revision=5 +revision=6 build_style=gnu-configure +configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config" makedepends=" gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel @@ -11,7 +12,7 @@ makedepends=" libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel" short_desc="Pragha is a Lightweight Music Player for GNU/Linux" maintainer="VargMon " -license="GPL-3" +license="GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://pragha-music-player.github.io/" distfiles="https://github.com/pragha-music-player/pragha/archive/v${version}.tar.gz" checksum=71babb217115f362fc8565072cd70d94f02d58b346f00d2d06e40cecaaf282c8 From d37c7f7cf7a4f3d84ac5a9714dca62ba04802f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 31 Dec 2020 08:01:55 +0700 Subject: [PATCH 53/54] DO NOT MERGE GitHub Workflows: turn off do_check --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d8328911eec..e1c142f738c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -41,11 +41,11 @@ jobs: fail-fast: false matrix: config: - - { arch: x86_64, bootstrap: x86_64, test: 1 } - - { arch: i686, bootstrap: i686, test: 1 } + - { arch: x86_64, bootstrap: x86_64, test: 0 } + - { arch: i686, bootstrap: i686, test: 0 } - { arch: aarch64, bootstrap: x86_64, test: 0 } - { arch: armv7l, bootstrap: x86_64, test: 0 } - - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 } + - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 } - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 } - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 } From 0c170ab6609ed5fed4431d4bd6928a6d37f9c3a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 7 Jan 2021 23:11:52 +0700 Subject: [PATCH 54/54] fixup! gnome-mplayer: fix l10n dir --- srcpkgs/gnome-mplayer/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template index 51502970ea0..1ec69337940 100644 --- a/srcpkgs/gnome-mplayer/template +++ b/srcpkgs/gnome-mplayer/template @@ -3,7 +3,8 @@ pkgname=gnome-mplayer version=1.0.9 revision=5 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale --disable-schemas-install" +configure_args="--with-locales-dir=/usr/share/locale + --disable-schemas-install" hostmakedepends="pkg-config intltool glib-devel" # XXX missing libgpod makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel @@ -21,4 +22,5 @@ CFLAGS="-fcommon" post_patch() { vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure + vsed -i '/^localedir =/s/libdir/datadir/' po/Makefile.in.in }