From ee6df2f76d79894e63451b05219ba7d41f73d320 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 01/25] 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 01f878076f0fbeedac4a41e416a1819f37ebefdc 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 02/25] 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 c9ec48b81fca2abca65ffdbe6d27e0801087c8bb 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 03/25] 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 30b25a8a7e384584ecd6260855422ca075fb47c0 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/25] 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 bfe82bc03f514553e722f2760cc9b1300ec8ea91 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:41:55 +0700 Subject: [PATCH 05/25] 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 7f038ff657150a836438496098b893c70ec8f78a 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 06/25] 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 5f67f1be7fd7c02d87eb8608ea5f3eaef33247a8 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 07/25] 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 " -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 285b08c77b63ff9a6fc03fabf69997970904a54e 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 08/25] 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 66a9f20b1a5ef08385d36d07b1e6582f15bed602 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 09/25] 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 bba4e5e3799a7b225b494e61b0152f657da7b8ee 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 10/25] 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 325dbc3c00361ed0d3b03e777b7d1e842c692a7c 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/25] 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 2bc311a493a31620400fcf4fce1f3caf2b80d254 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 12/25] 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 eb1e4bed765f4d55087d0f45890f30b93a2b40fa 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 13/25] 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 533df7e4f2011de8fc19cf68632a9d434fb967ae 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 14/25] 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 177528838d27b313170983446710fe248c6267ae 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 15/25] 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 " -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 6302e101aee3d6cc7b59b7eeaefcbe9ef7b6c6c6 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 16/25] dia: fix l10n dir --- srcpkgs/dia/template | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/srcpkgs/dia/template b/srcpkgs/dia/template index 31766322c4c..52229cb6900 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 freetype-devel libxml2-devel" +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" 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 a20d6acb8c7ad917174375a043aa99f7609f3e39 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 17/25] 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 " +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 919afbbfcd77ec9110d033218b66b24e3dd37aae 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 18/25] 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 e4ecc14e73e639fc8e8cecf1eb83c361dab44d15 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 19/25] 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 452025a4696067946e3683b2128cb55b9e66ea26 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 20/25] 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 7a9d5b334b8eb44b5ff4c647206d0a47cc3156b1 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 21/25] 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 7dadd27dae5873bd8ce2006c8a4821fb9fe2e8bb 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 22/25] 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 a1ec14332f9525a59d632de065d4ce4be986e55a 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 23/25] 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 29ee1292acdad7ca69eb5b4d80cfcdf3ea114d50 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 24/25] gnome-nettool: fix l10n dir --- srcpkgs/gnome-nettool/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template index d9769176514..2a0f0868fe6 100644 --- a/srcpkgs/gnome-nettool/template +++ b/srcpkgs/gnome-nettool/template @@ -1,7 +1,7 @@ # 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 @@ -14,3 +14,7 @@ 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 24c047a56a1e85910b9e4eb92fea498aefd280c0 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 25/25] gnome-screensaver: fix l10n dir --- srcpkgs/gnome-screensaver/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/gnome-screensaver/template b/srcpkgs/gnome-screensaver/template index c3a70cfef7c..469d3f7d41d 100644 --- a/srcpkgs/gnome-screensaver/template +++ b/srcpkgs/gnome-screensaver/template @@ -1,7 +1,7 @@ # 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" @@ -13,3 +13,7 @@ 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 +}