From c8251e9570bf22d8770b0c4551653b0b174eb4aa 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, 30 Jan 2021 09:43:02 +0700 Subject: [PATCH 1/5] geeqie: fix l10n dir --- srcpkgs/geeqie/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template index 2681f31e3ef..efc425e9d83 100644 --- a/srcpkgs/geeqie/template +++ b/srcpkgs/geeqie/template @@ -1,7 +1,7 @@ # 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" @@ -25,6 +25,11 @@ post_extract() { pre_configure() { NOCONFIGURE=1 ./autogen.sh + # The shipped configure doesn't have the code path + # for generating gtk+3 cflags and ldflags + vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \ + -e '/CATOBJEXT=/s/\.mo/.gmo/' \ + configure } do_build() { From 516c762b4cff2a469bc50bed37f09a06386828c1 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, 30 Jan 2021 09:50:10 +0700 Subject: [PATCH 2/5] libgpod: fix l10n dir --- srcpkgs/libgpod/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template index c990c094bc2..8e547f1f9eb 100644 --- a/srcpkgs/libgpod/template +++ b/srcpkgs/libgpod/template @@ -1,7 +1,7 @@ # Template file for 'libgpod' pkgname=libgpod version=0.8.3 -revision=3 +revision=4 build_style=gnu-configure configure_args="--with-udev-dir=/usr/lib/udev --enable-udev" hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool" @@ -19,6 +19,7 @@ post_patch() { pre_configure() { autoreconf -fi + vsed -i -e '/DATADIRNAME=/s/=.*/=share/' configure } libgpod-devel_package() { From e6512ef5a934491081aadafb694d5c268fb7f93c 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, 30 Jan 2021 13:40:19 +0700 Subject: [PATCH 3/5] pragha: fix l10n dir, remove build_options --- srcpkgs/pragha/template | 44 ++++++++++++++++++----------------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/srcpkgs/pragha/template b/srcpkgs/pragha/template index fef3510d75c..2069b22b1ef 100644 --- a/srcpkgs/pragha/template +++ b/srcpkgs/pragha/template @@ -1,41 +1,35 @@ # Template file for 'pragha' pkgname=pragha version=1.3.3 -revision=5 +revision=6 build_style=gnu-configure -hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel pkg-config" +hostmakedepends="automake libtool xfce4-dev-tools glib-devel gettext-devel + pkg-config" makedepends=" gtk+3-devel glib-devel gstreamer1-devel sqlite-devel taglib-devel - $(vopt_if peas libpeas-devel) libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel + libpeas-devel libxfce4ui-devel totem-pl-parser-devel gst-plugins-base1-devel libnotify-devel libcdio-devel libcdio-paranoia-devel libcddb-devel libkeybinder3-devel glyr-devel rygel-devel grilo-devel libgudev-devel libmtp-devel" -short_desc="Pragha is a Lightweight Music Player for GNU/Linux" +short_desc="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 -build_options="peas" -desc_option_peas="Enable libpeas plugin library" - -if [ -z "$CROSS_BUILD" ]; then - build_options_default="peas" -fi - -pre_configure() { - CPP=$CPP ./autogen.sh +do_configure() { + CFLAGS+=" $($PKG_CONFIG --cflags gupnp-1.2)" + CPP=$CPP ./autogen.sh \ + $configure_args \ + --disable-maintainer-mode \ + --with-locales-dir=/usr/share/locale } -if [ -z "$CROSS_BUILD" ]; then - - pragha-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include/pragha/plugins - vmove usr/lib/pragha/plugins/devices/libdeviceclient.so - } +pragha-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include/pragha/plugins + vmove usr/lib/pragha/plugins/devices/libdeviceclient.so } - -fi +} From b548913652b00cf304932d58bd6b7ff0590c8494 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, 30 Jan 2021 13:59:01 +0700 Subject: [PATCH 4/5] xsane: fix l10n dir --- srcpkgs/xsane/template | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/srcpkgs/xsane/template b/srcpkgs/xsane/template index 022eae8e946..d637963bcba 100644 --- a/srcpkgs/xsane/template +++ b/srcpkgs/xsane/template @@ -1,8 +1,9 @@ # Template file for 'xsane' pkgname=xsane version=0.999 -revision=3 -hostmakedepends="pkg-config" +revision=4 +build_style=gnu-configure +hostmakedepends="pkg-config sane-devel gettext" makedepends="gtk+-devel lcms-devel sane-devel gimp-devel" depends="sane" short_desc="GTK-based X11 frontend for SANE" @@ -12,21 +13,19 @@ homepage="http://www.xsane.org" distfiles="${DEBIAN_SITE}/main/x/xsane/xsane_${version}.orig.tar.gz" checksum=5782d23e67dc961c81eef13a87b17eb0144cae3d1ffc5cf7e0322da751482b4b -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" sane-devel" -fi +post_patch() { + vsed -i -e 's/DATADIRNAME=.*/DATADIRNAME=share/' \ + -e '/^ac_default_prefix=/s,=.*,=/usr,' \ + configure +} do_build() { - local _args="--prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man - --target=${XBPS_CROSS_TRIPLET} --host=${XBPS_CROSS_TRIPLET} - --build=${XBPS_TRIPLET}" - ./configure ${_args} --enable-gimp + ./configure ${configure_args} --enable-gimp make ${makejobs} mv src/xsane{,-gimp} make clean - echo "=== ./configure ${_args} --disable-gimp" - ./configure ${_args} --disable-gimp - sed -i 's;/usr/local;/usr;g' src/Makefile + echo "=== ./configure ${configure_args} --disable-gimp" + ./configure ${configure_args} --disable-gimp make ${makejobs} } From a8bad22bf266a9ad92644825c362064830bb2eee 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, 30 Jan 2021 14:29:51 +0700 Subject: [PATCH 5/5] gtk+: fix l10n dir --- srcpkgs/gtk+/template | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template index 39883068d06..8c6bc811502 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,17 @@ 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 + fi + vsed -i -e '/DATADIRNAME=/s/=.*/=share/' \ + -e '/CATOBJEXT=/s/\.mo/.gmo/' \ + configure +} + post_install() { # Provide a default (icon)theme and font. vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0