Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] json-glib, appstream-glib, phodav, ...: build translations
@ 2022-11-06 18:37 paper42
  2022-11-08 17:13 ` [PR PATCH] [Updated] " paper42
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: paper42 @ 2022-11-06 18:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages build-translations
https://github.com/void-linux/void-packages/pull/40365

json-glib, appstream-glib, phodav, ...: build translations
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40365.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-translations-40365.patch --]
[-- Type: text/x-diff, Size: 10933 bytes --]

From 5a2d13c5771f208b5ee9b39176b06eeb94a74f2d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 18:13:45 +0100
Subject: [PATCH 01/10] LGOGDownloader: build manpage

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 0778374ad224..5b2094a4eb91 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,10 +1,10 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.9
-revision=2
+revision=3
 wrksrc="lgogdownloader-${version}"
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config help2man"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
  jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"

From 0c0a37a33a3983785e66e166227aefa8fc463010 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:25:14 +0100
Subject: [PATCH 02/10] json-glib: build translations, remove tests

---
 srcpkgs/json-glib/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index 2905530efee4..14448c6ec3d6 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,29 +1,37 @@
 # Template file for 'json-glib'
 pkgname=json-glib
 version=1.6.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel gettext"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+changelog="https://gitlab.gnome.org/GNOME/json-glib/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/json-glib/${version%.*}/json-glib-${version}.tar.xz"
 checksum=96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
+post_install() {
+	rm -r ${DESTDIR}/usr/share/installed-tests
+	rm -r ${DESTDIR}/usr/libexec/installed-tests
+}
+
 json-glib-devel_package() {
-	depends="libglib-devel ${sourcepkg}-${version}_${revision}"
+	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 	}

From 1cf257deffa91cf154b27ef525947edab0ca679f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 03/10] appstream-glib: build translations

---
 srcpkgs/appstream-glib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template
index ef5baf1afdf9..a84d7ae9d212 100644
--- a/srcpkgs/appstream-glib/template
+++ b/srcpkgs/appstream-glib/template
@@ -1,12 +1,12 @@
 # Template file for 'appstream-glib'
 pkgname=appstream-glib
 version=0.8.1
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dgtk-doc=false -Drpm=false -Dstemmer=false
  -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gcab gperf pkg-config glib-devel"
+hostmakedepends="gcab gperf pkg-config glib-devel gettext"
 makedepends="gcab-devel gtk+3-devel json-glib-devel libarchive-devel
  libcurl-devel libyaml-devel"
 short_desc="Install and update applications"

From 84c25c5b628a17a1af7555566a5b5da0aed4fa48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 04/10] phodav: build translations

---
 srcpkgs/phodav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/phodav/template b/srcpkgs/phodav/template
index eac226f7b8e6..73e2f543910f 100644
--- a/srcpkgs/phodav/template
+++ b/srcpkgs/phodav/template
@@ -1,10 +1,10 @@
 # Template file for 'phodav'
 pkgname=phodav
 version=3.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Davahi=enabled -Dgtk_doc=disabled"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
 makedepends="libglib-devel libsoup3-devel libxml2-devel avahi-glib-libs-devel
  eudev-libudev-devel"
 short_desc="GNOME Web Dav implementation"

From 2ee337947947db455a293a9747ba5fbc4de5bc7e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 05/10] gtksourceview4: build translations

---
 srcpkgs/gtksourceview4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview4/template b/srcpkgs/gtksourceview4/template
index f3529e6f9ad9..a30504f3448a 100644
--- a/srcpkgs/gtksourceview4/template
+++ b/srcpkgs/gtksourceview4/template
@@ -1,14 +1,14 @@
 # Template file for 'gtksourceview4'
 pkgname=gtksourceview4
 version=4.8.2
-revision=1
+revision=2
 wrksrc="gtksourceview-${version}"
 build_style=meson
 build_helper="gir"
 configure_args="-Dglade_catalog=true $(vopt_bool gir gir)
  $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="gtk+3-devel glib-devel itstool libxslt pkg-config
- $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+ $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc) gettext"
 makedepends="glade3-devel gtk+3-devel libglib-devel libxml2-devel
  $(vopt_if gir vala)"
 short_desc="Text widget that extends GTK+ GtkTextView widget"

From 5c0ea339e773fbec296a86fe39812ff32b1ae9fa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 06/10] libdazzle: build translations

---
 srcpkgs/libdazzle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 590dce06ffe5..45c55a599a29 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,13 +1,13 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
 version=3.44.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Denable_gtk_doc=false
  $(vopt_bool gir with_vapi)
  $(vopt_bool gir with_introspection)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gir vala)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gir vala) gettext"
 makedepends="gtk+3-devel libglib-devel"
 checkdepends="xvfb-run"
 short_desc="Library to delight your users with fancy features"

From 497ef5528ddb24b3f55f05668223f3aa470663e4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 07/10] spice-gtk: build translations

---
 srcpkgs/spice-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 344f91ce2de8..3afa0268ee9f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.41
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -9,7 +9,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
  -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
- spice-protocol python3-six python3-parsing perl"
+ spice-protocol python3-six python3-parsing perl gettext"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup3-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel

From 733bf9df91556bbd23c2f43e028124a7c7237d19 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 08/10] osinfo-db-tools: build translations

---
 srcpkgs/osinfo-db-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osinfo-db-tools/template b/srcpkgs/osinfo-db-tools/template
index 89edbf989ac1..40cf51a68732 100644
--- a/srcpkgs/osinfo-db-tools/template
+++ b/srcpkgs/osinfo-db-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'osinfo-db-tools'
 pkgname=osinfo-db-tools
 version=1.10.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config perl"
+hostmakedepends="pkg-config perl gettext"
 makedepends="libglib-devel libarchive-devel libxslt-devel
  json-glib-devel libsoup3-devel"
 checkdepends="python3-pytest python3-requests"

From 2bb6829b2a3f6c3d9bdbe47b521caf5a6b74178c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 09/10] wireplumber: build translations

---
 srcpkgs/wireplumber/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 823a4cb1e082..9b54c0434be9 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,11 +1,11 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.12
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
-hostmakedepends="pkg-config glib-devel python3-lxml doxygen"
+hostmakedepends="pkg-config glib-devel python3-lxml doxygen gettext"
 makedepends="libglib-devel pipewire-devel lua54-devel"
 checkdepends="pipewire dbus"
 short_desc="Session and policy manager implementation for PipeWire"

From 6eba727614e2b4b1358b81ebd1919bb2ac0b1516 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 10/10] lightdm-webkit2-greeter: build translations

---
 srcpkgs/lightdm-webkit2-greeter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-webkit2-greeter/template b/srcpkgs/lightdm-webkit2-greeter/template
index 2ba74b5676ea..d61a6122ed2c 100644
--- a/srcpkgs/lightdm-webkit2-greeter/template
+++ b/srcpkgs/lightdm-webkit2-greeter/template
@@ -1,10 +1,10 @@
 # Template file for 'lightdm-webkit2-greeter'
 pkgname=lightdm-webkit2-greeter
 version=2.2.5
-revision=3
+revision=4
 wrksrc="web-greeter-${version}"
 build_style=meson
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel gettext"
 makedepends="accountsservice-devel gnome-backgrounds lightdm-devel
  webkit2gtk-devel dbus-glib-devel libxklavier-devel"
 depends="void-artwork lightdm"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] json-glib, appstream-glib, phodav, ...: build translations
  2022-11-06 18:37 [PR PATCH] json-glib, appstream-glib, phodav, ...: build translations paper42
@ 2022-11-08 17:13 ` paper42
  2022-11-08 22:12 ` paper42
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-11-08 17:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages build-translations
https://github.com/void-linux/void-packages/pull/40365

json-glib, appstream-glib, phodav, ...: build translations
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40365.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-translations-40365.patch --]
[-- Type: text/x-diff, Size: 10825 bytes --]

From 038ad4f3f7ada29cac2205c6a929e789320d35d6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 18:13:45 +0100
Subject: [PATCH 01/10] LGOGDownloader: build manpage

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index b1fb70cc1bf0..306cad36049d 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,9 +1,9 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.9
-revision=2
+revision=3
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config help2man"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
  jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"

From b902e45af50cf93f7c3dbd800500b04772cb0803 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:25:14 +0100
Subject: [PATCH 02/10] json-glib: build translations, remove tests

---
 srcpkgs/json-glib/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index 2905530efee4..14448c6ec3d6 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,29 +1,37 @@
 # Template file for 'json-glib'
 pkgname=json-glib
 version=1.6.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel gettext"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+changelog="https://gitlab.gnome.org/GNOME/json-glib/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/json-glib/${version%.*}/json-glib-${version}.tar.xz"
 checksum=96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
+post_install() {
+	rm -r ${DESTDIR}/usr/share/installed-tests
+	rm -r ${DESTDIR}/usr/libexec/installed-tests
+}
+
 json-glib-devel_package() {
-	depends="libglib-devel ${sourcepkg}-${version}_${revision}"
+	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 	}

From e0c797923da6d7ec63e4f25ed866924c3bf887ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 03/10] appstream-glib: build translations

---
 srcpkgs/appstream-glib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template
index ef5baf1afdf9..a84d7ae9d212 100644
--- a/srcpkgs/appstream-glib/template
+++ b/srcpkgs/appstream-glib/template
@@ -1,12 +1,12 @@
 # Template file for 'appstream-glib'
 pkgname=appstream-glib
 version=0.8.1
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dgtk-doc=false -Drpm=false -Dstemmer=false
  -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gcab gperf pkg-config glib-devel"
+hostmakedepends="gcab gperf pkg-config glib-devel gettext"
 makedepends="gcab-devel gtk+3-devel json-glib-devel libarchive-devel
  libcurl-devel libyaml-devel"
 short_desc="Install and update applications"

From 3c50068613361ddf47bf69fe3254e20e3cf378a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 04/10] phodav: build translations

---
 srcpkgs/phodav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/phodav/template b/srcpkgs/phodav/template
index eac226f7b8e6..73e2f543910f 100644
--- a/srcpkgs/phodav/template
+++ b/srcpkgs/phodav/template
@@ -1,10 +1,10 @@
 # Template file for 'phodav'
 pkgname=phodav
 version=3.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Davahi=enabled -Dgtk_doc=disabled"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
 makedepends="libglib-devel libsoup3-devel libxml2-devel avahi-glib-libs-devel
  eudev-libudev-devel"
 short_desc="GNOME Web Dav implementation"

From b08fd7ef5c5c56ac3d22768ccb355916ee273bab Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 05/10] gtksourceview4: build translations

---
 srcpkgs/gtksourceview4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview4/template b/srcpkgs/gtksourceview4/template
index b101596fdebf..58e05d7f20df 100644
--- a/srcpkgs/gtksourceview4/template
+++ b/srcpkgs/gtksourceview4/template
@@ -1,13 +1,13 @@
 # Template file for 'gtksourceview4'
 pkgname=gtksourceview4
 version=4.8.2
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dglade_catalog=true $(vopt_bool gir gir)
  $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="gtk+3-devel glib-devel itstool libxslt pkg-config
- $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+ $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc) gettext"
 makedepends="glade3-devel gtk+3-devel libglib-devel libxml2-devel
  $(vopt_if gir vala)"
 short_desc="Text widget that extends GTK+ GtkTextView widget"

From 4728ca2fbcf5d175ed5f4f8ddb9dea1bcddaf3e0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 06/10] libdazzle: build translations

---
 srcpkgs/libdazzle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 590dce06ffe5..45c55a599a29 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,13 +1,13 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
 version=3.44.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Denable_gtk_doc=false
  $(vopt_bool gir with_vapi)
  $(vopt_bool gir with_introspection)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gir vala)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gir vala) gettext"
 makedepends="gtk+3-devel libglib-devel"
 checkdepends="xvfb-run"
 short_desc="Library to delight your users with fancy features"

From 801e82635184dc19d030ea3e2b69a9c5d626abc0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 07/10] spice-gtk: build translations

---
 srcpkgs/spice-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 344f91ce2de8..3afa0268ee9f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.41
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -9,7 +9,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
  -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
- spice-protocol python3-six python3-parsing perl"
+ spice-protocol python3-six python3-parsing perl gettext"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup3-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel

From df933341227a69f17cffbf8d3436bec227b3f7be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 08/10] osinfo-db-tools: build translations

---
 srcpkgs/osinfo-db-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osinfo-db-tools/template b/srcpkgs/osinfo-db-tools/template
index 89edbf989ac1..40cf51a68732 100644
--- a/srcpkgs/osinfo-db-tools/template
+++ b/srcpkgs/osinfo-db-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'osinfo-db-tools'
 pkgname=osinfo-db-tools
 version=1.10.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config perl"
+hostmakedepends="pkg-config perl gettext"
 makedepends="libglib-devel libarchive-devel libxslt-devel
  json-glib-devel libsoup3-devel"
 checkdepends="python3-pytest python3-requests"

From 2aecb221930f3df0b1a04878cf3c01c6efcf8c09 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 09/10] wireplumber: build translations

---
 srcpkgs/wireplumber/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 823a4cb1e082..9b54c0434be9 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,11 +1,11 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.12
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
-hostmakedepends="pkg-config glib-devel python3-lxml doxygen"
+hostmakedepends="pkg-config glib-devel python3-lxml doxygen gettext"
 makedepends="libglib-devel pipewire-devel lua54-devel"
 checkdepends="pipewire dbus"
 short_desc="Session and policy manager implementation for PipeWire"

From 5041bcd711aba4ee8181166e0677e62232c08660 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 10/10] lightdm-webkit2-greeter: build translations

---
 srcpkgs/lightdm-webkit2-greeter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-webkit2-greeter/template b/srcpkgs/lightdm-webkit2-greeter/template
index 98129a58bd3a..99d56791bae2 100644
--- a/srcpkgs/lightdm-webkit2-greeter/template
+++ b/srcpkgs/lightdm-webkit2-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-webkit2-greeter'
 pkgname=lightdm-webkit2-greeter
 version=2.2.5
-revision=3
+revision=4
 build_style=meson
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel gettext"
 makedepends="accountsservice-devel gnome-backgrounds lightdm-devel
  webkit2gtk-devel dbus-glib-devel libxklavier-devel"
 depends="void-artwork lightdm"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] json-glib, appstream-glib, phodav, ...: build translations
  2022-11-06 18:37 [PR PATCH] json-glib, appstream-glib, phodav, ...: build translations paper42
  2022-11-08 17:13 ` [PR PATCH] [Updated] " paper42
@ 2022-11-08 22:12 ` paper42
  2022-11-18 12:11 ` paper42
  2022-11-18 13:51 ` [PR PATCH] [Merged]: " paper42
  3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-11-08 22:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages build-translations
https://github.com/void-linux/void-packages/pull/40365

json-glib, appstream-glib, phodav, ...: build translations
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40365.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-translations-40365.patch --]
[-- Type: text/x-diff, Size: 10825 bytes --]

From f2b2a4df785bdc00873200b76713ad4b66ab92e5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 18:13:45 +0100
Subject: [PATCH 01/10] LGOGDownloader: build manpage

---
 srcpkgs/LGOGDownloader/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index b1fb70cc1bf0..306cad36049d 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,9 +1,9 @@
 # Template file for 'LGOGDownloader'
 pkgname=LGOGDownloader
 version=3.9
-revision=2
+revision=3
 build_style=cmake
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config help2man"
 makedepends="htmlcxx-devel tinyxml2-devel libcurl-devel rhash-devel
  jsoncpp-devel boost-devel openssl-devel zlib-devel"
 short_desc="Open source downloader for GOG.com games that uses the GOG.com API"

From 8d4f3cad2472d91918a7b037aac4101941f9292d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:25:14 +0100
Subject: [PATCH 02/10] json-glib: build translations, remove tests

---
 srcpkgs/json-glib/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index 2905530efee4..14448c6ec3d6 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,29 +1,37 @@
 # Template file for 'json-glib'
 pkgname=json-glib
 version=1.6.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel gettext"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+changelog="https://gitlab.gnome.org/GNOME/json-glib/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/json-glib/${version%.*}/json-glib-${version}.tar.xz"
 checksum=96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
+post_install() {
+	rm -r ${DESTDIR}/usr/share/installed-tests
+	rm -r ${DESTDIR}/usr/libexec/installed-tests
+}
+
 json-glib-devel_package() {
-	depends="libglib-devel ${sourcepkg}-${version}_${revision}"
+	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 	}

From 0b5c07d64f9bbae1f3ce617f39280d3ec41402d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 03/10] appstream-glib: build translations

---
 srcpkgs/appstream-glib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template
index ef5baf1afdf9..a84d7ae9d212 100644
--- a/srcpkgs/appstream-glib/template
+++ b/srcpkgs/appstream-glib/template
@@ -1,12 +1,12 @@
 # Template file for 'appstream-glib'
 pkgname=appstream-glib
 version=0.8.1
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dgtk-doc=false -Drpm=false -Dstemmer=false
  -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gcab gperf pkg-config glib-devel"
+hostmakedepends="gcab gperf pkg-config glib-devel gettext"
 makedepends="gcab-devel gtk+3-devel json-glib-devel libarchive-devel
  libcurl-devel libyaml-devel"
 short_desc="Install and update applications"

From 845e22252df843d87a4c758990811728af0f6796 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 04/10] phodav: build translations

---
 srcpkgs/phodav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/phodav/template b/srcpkgs/phodav/template
index eac226f7b8e6..73e2f543910f 100644
--- a/srcpkgs/phodav/template
+++ b/srcpkgs/phodav/template
@@ -1,10 +1,10 @@
 # Template file for 'phodav'
 pkgname=phodav
 version=3.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Davahi=enabled -Dgtk_doc=disabled"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
 makedepends="libglib-devel libsoup3-devel libxml2-devel avahi-glib-libs-devel
  eudev-libudev-devel"
 short_desc="GNOME Web Dav implementation"

From b9cf819bfd3d1ec9e8191c777cca85fd2802ff43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 05/10] gtksourceview4: build translations

---
 srcpkgs/gtksourceview4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview4/template b/srcpkgs/gtksourceview4/template
index b101596fdebf..58e05d7f20df 100644
--- a/srcpkgs/gtksourceview4/template
+++ b/srcpkgs/gtksourceview4/template
@@ -1,13 +1,13 @@
 # Template file for 'gtksourceview4'
 pkgname=gtksourceview4
 version=4.8.2
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dglade_catalog=true $(vopt_bool gir gir)
  $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="gtk+3-devel glib-devel itstool libxslt pkg-config
- $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+ $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc) gettext"
 makedepends="glade3-devel gtk+3-devel libglib-devel libxml2-devel
  $(vopt_if gir vala)"
 short_desc="Text widget that extends GTK+ GtkTextView widget"

From 0e0683515d59a10d9e4863b62dd5562e7e7db87f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 06/10] libdazzle: build translations

---
 srcpkgs/libdazzle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 590dce06ffe5..45c55a599a29 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,13 +1,13 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
 version=3.44.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Denable_gtk_doc=false
  $(vopt_bool gir with_vapi)
  $(vopt_bool gir with_introspection)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gir vala)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gir vala) gettext"
 makedepends="gtk+3-devel libglib-devel"
 checkdepends="xvfb-run"
 short_desc="Library to delight your users with fancy features"

From 78deeb1c099dc848728f0975e94052ed1ad10b47 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 07/10] spice-gtk: build translations

---
 srcpkgs/spice-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 344f91ce2de8..3afa0268ee9f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.41
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -9,7 +9,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
  -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
- spice-protocol python3-six python3-parsing perl"
+ spice-protocol python3-six python3-parsing perl gettext"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup3-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel

From 66282e8a24ad393b586bffd9539f6e086d630126 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 08/10] osinfo-db-tools: build translations

---
 srcpkgs/osinfo-db-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osinfo-db-tools/template b/srcpkgs/osinfo-db-tools/template
index 89edbf989ac1..40cf51a68732 100644
--- a/srcpkgs/osinfo-db-tools/template
+++ b/srcpkgs/osinfo-db-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'osinfo-db-tools'
 pkgname=osinfo-db-tools
 version=1.10.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config perl"
+hostmakedepends="pkg-config perl gettext"
 makedepends="libglib-devel libarchive-devel libxslt-devel
  json-glib-devel libsoup3-devel"
 checkdepends="python3-pytest python3-requests"

From c6bae3c0f690675e5f3dc8c593ff1103fcd2b442 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 09/10] wireplumber: build translations

---
 srcpkgs/wireplumber/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 823a4cb1e082..9b54c0434be9 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,11 +1,11 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.12
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
-hostmakedepends="pkg-config glib-devel python3-lxml doxygen"
+hostmakedepends="pkg-config glib-devel python3-lxml doxygen gettext"
 makedepends="libglib-devel pipewire-devel lua54-devel"
 checkdepends="pipewire dbus"
 short_desc="Session and policy manager implementation for PipeWire"

From 6a61c8b1fbbf934dc5f483fccd390c63d0146018 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 10/10] lightdm-webkit2-greeter: build translations

---
 srcpkgs/lightdm-webkit2-greeter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-webkit2-greeter/template b/srcpkgs/lightdm-webkit2-greeter/template
index 98129a58bd3a..99d56791bae2 100644
--- a/srcpkgs/lightdm-webkit2-greeter/template
+++ b/srcpkgs/lightdm-webkit2-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-webkit2-greeter'
 pkgname=lightdm-webkit2-greeter
 version=2.2.5
-revision=3
+revision=4
 build_style=meson
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel gettext"
 makedepends="accountsservice-devel gnome-backgrounds lightdm-devel
  webkit2gtk-devel dbus-glib-devel libxklavier-devel"
 depends="void-artwork lightdm"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Updated] json-glib, appstream-glib, phodav, ...: build translations
  2022-11-06 18:37 [PR PATCH] json-glib, appstream-glib, phodav, ...: build translations paper42
  2022-11-08 17:13 ` [PR PATCH] [Updated] " paper42
  2022-11-08 22:12 ` paper42
@ 2022-11-18 12:11 ` paper42
  2022-11-18 13:51 ` [PR PATCH] [Merged]: " paper42
  3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-11-18 12:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1290 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages build-translations
https://github.com/void-linux/void-packages/pull/40365

json-glib, appstream-glib, phodav, ...: build translations
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40365.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-translations-40365.patch --]
[-- Type: text/x-diff, Size: 9905 bytes --]

From 24dc1e1c5b6c1c3c78e3406d9401ed3e859bac38 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:25:14 +0100
Subject: [PATCH 1/9] json-glib: build translations, remove tests

---
 srcpkgs/json-glib/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template
index 2905530efee4..14448c6ec3d6 100644
--- a/srcpkgs/json-glib/template
+++ b/srcpkgs/json-glib/template
@@ -1,29 +1,37 @@
 # Template file for 'json-glib'
 pkgname=json-glib
 version=1.6.6
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel gettext"
 makedepends="libglib-devel"
 short_desc="JSON parser for GLib-based libraries and applications"
 maintainer="skmpz <dem.procopiou@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="http://live.gnome.org/JsonGlib"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+changelog="https://gitlab.gnome.org/GNOME/json-glib/-/raw/master/NEWS"
+distfiles="${GNOME_SITE}/json-glib/${version%.*}/json-glib-${version}.tar.xz"
 checksum=96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e
 
 # Package build options
 build_options="gir"
 build_options_default="gir"
 
+post_install() {
+	rm -r ${DESTDIR}/usr/share/installed-tests
+	rm -r ${DESTDIR}/usr/libexec/installed-tests
+}
+
 json-glib-devel_package() {
-	depends="libglib-devel ${sourcepkg}-${version}_${revision}"
+	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/share
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+		fi
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 	}

From 8c6b87e859aa477dc457d7dc20da676d35a7bd7e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 2/9] appstream-glib: build translations

---
 srcpkgs/appstream-glib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/appstream-glib/template b/srcpkgs/appstream-glib/template
index ef5baf1afdf9..a84d7ae9d212 100644
--- a/srcpkgs/appstream-glib/template
+++ b/srcpkgs/appstream-glib/template
@@ -1,12 +1,12 @@
 # Template file for 'appstream-glib'
 pkgname=appstream-glib
 version=0.8.1
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dgtk-doc=false -Drpm=false -Dstemmer=false
  -Dintrospection=$(vopt_if gir true false)"
-hostmakedepends="gcab gperf pkg-config glib-devel"
+hostmakedepends="gcab gperf pkg-config glib-devel gettext"
 makedepends="gcab-devel gtk+3-devel json-glib-devel libarchive-devel
  libcurl-devel libyaml-devel"
 short_desc="Install and update applications"

From 7221c5f1cbcf600c8ec8f849f56cc49dfaa63855 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 3/9] phodav: build translations

---
 srcpkgs/phodav/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/phodav/template b/srcpkgs/phodav/template
index eac226f7b8e6..73e2f543910f 100644
--- a/srcpkgs/phodav/template
+++ b/srcpkgs/phodav/template
@@ -1,10 +1,10 @@
 # Template file for 'phodav'
 pkgname=phodav
 version=3.0
-revision=1
+revision=2
 build_style=meson
 configure_args="-Davahi=enabled -Dgtk_doc=disabled"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config gettext"
 makedepends="libglib-devel libsoup3-devel libxml2-devel avahi-glib-libs-devel
  eudev-libudev-devel"
 short_desc="GNOME Web Dav implementation"

From 74f56b835398f7e8021020ab43d6d8a6f51f52e1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 4/9] gtksourceview4: build translations

---
 srcpkgs/gtksourceview4/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gtksourceview4/template b/srcpkgs/gtksourceview4/template
index b101596fdebf..58e05d7f20df 100644
--- a/srcpkgs/gtksourceview4/template
+++ b/srcpkgs/gtksourceview4/template
@@ -1,13 +1,13 @@
 # Template file for 'gtksourceview4'
 pkgname=gtksourceview4
 version=4.8.2
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Dglade_catalog=true $(vopt_bool gir gir)
  $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)"
 hostmakedepends="gtk+3-devel glib-devel itstool libxslt pkg-config
- $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)"
+ $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc) gettext"
 makedepends="glade3-devel gtk+3-devel libglib-devel libxml2-devel
  $(vopt_if gir vala)"
 short_desc="Text widget that extends GTK+ GtkTextView widget"

From 30e1ed606caa1099fbba5e641d933eb3d0003724 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:03 +0100
Subject: [PATCH 5/9] libdazzle: build translations

---
 srcpkgs/libdazzle/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libdazzle/template b/srcpkgs/libdazzle/template
index 590dce06ffe5..45c55a599a29 100644
--- a/srcpkgs/libdazzle/template
+++ b/srcpkgs/libdazzle/template
@@ -1,13 +1,13 @@
 # Template file for 'libdazzle'
 pkgname=libdazzle
 version=3.44.0
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Denable_gtk_doc=false
  $(vopt_bool gir with_vapi)
  $(vopt_bool gir with_introspection)"
-hostmakedepends="glib-devel pkg-config $(vopt_if gir vala)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gir vala) gettext"
 makedepends="gtk+3-devel libglib-devel"
 checkdepends="xvfb-run"
 short_desc="Library to delight your users with fancy features"

From 468579426950ed66a4da5d6a3f927fdcad3d861a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 6/9] spice-gtk: build translations

---
 srcpkgs/spice-gtk/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template
index 344f91ce2de8..3afa0268ee9f 100644
--- a/srcpkgs/spice-gtk/template
+++ b/srcpkgs/spice-gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'spice-gtk'
 pkgname=spice-gtk
 version=0.41
-revision=2
+revision=3
 build_style=meson
 build_helper="gir"
 configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
@@ -9,7 +9,7 @@ configure_args="-Dintrospection=$(vopt_if gir enabled disabled)
  -Dusbredir=enabled -Dpolkit=enabled -Dlz4=enabled -Dopus=enabled
  -Dusb-ids-path=/usr/share/hwdata/usb.ids -Dgtk_doc=disabled"
 hostmakedepends="pkg-config $(vopt_if vala vala) glib-devel
- spice-protocol python3-six python3-parsing perl"
+ spice-protocol python3-six python3-parsing perl gettext"
 makedepends="acl-devel liblz4-devel pixman-devel opus-devel openssl-devel
  libsasl-devel gtk+3-devel libjpeg-turbo-devel polkit-devel libsoup3-devel
  usbredir-devel spice-protocol json-glib-devel libglib-devel libva-devel

From 32b64684599183781dd5e94db5885f2dd5f48f9b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 7/9] osinfo-db-tools: build translations

---
 srcpkgs/osinfo-db-tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/osinfo-db-tools/template b/srcpkgs/osinfo-db-tools/template
index 89edbf989ac1..40cf51a68732 100644
--- a/srcpkgs/osinfo-db-tools/template
+++ b/srcpkgs/osinfo-db-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'osinfo-db-tools'
 pkgname=osinfo-db-tools
 version=1.10.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config perl"
+hostmakedepends="pkg-config perl gettext"
 makedepends="libglib-devel libarchive-devel libxslt-devel
  json-glib-devel libsoup3-devel"
 checkdepends="python3-pytest python3-requests"

From ca237cebc89f37f2c4b08b41e9f53188a6151d9f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 8/9] wireplumber: build translations

---
 srcpkgs/wireplumber/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wireplumber/template b/srcpkgs/wireplumber/template
index 823a4cb1e082..9b54c0434be9 100644
--- a/srcpkgs/wireplumber/template
+++ b/srcpkgs/wireplumber/template
@@ -1,11 +1,11 @@
 # Template file for 'wireplumber'
 pkgname=wireplumber
 version=0.4.12
-revision=1
+revision=2
 build_style=meson
 build_helper=gir
 configure_args="-Dintrospection=enabled -Dsystem-lua=true"
-hostmakedepends="pkg-config glib-devel python3-lxml doxygen"
+hostmakedepends="pkg-config glib-devel python3-lxml doxygen gettext"
 makedepends="libglib-devel pipewire-devel lua54-devel"
 checkdepends="pipewire dbus"
 short_desc="Session and policy manager implementation for PipeWire"

From 4a8b3323cc5e8d8aef0c9e2e6ba75ba30139355f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 6 Nov 2022 19:30:04 +0100
Subject: [PATCH 9/9] lightdm-webkit2-greeter: build translations

---
 srcpkgs/lightdm-webkit2-greeter/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/lightdm-webkit2-greeter/template b/srcpkgs/lightdm-webkit2-greeter/template
index 98129a58bd3a..99d56791bae2 100644
--- a/srcpkgs/lightdm-webkit2-greeter/template
+++ b/srcpkgs/lightdm-webkit2-greeter/template
@@ -1,9 +1,9 @@
 # Template file for 'lightdm-webkit2-greeter'
 pkgname=lightdm-webkit2-greeter
 version=2.2.5
-revision=3
+revision=4
 build_style=meson
-hostmakedepends="pkg-config glib-devel"
+hostmakedepends="pkg-config glib-devel gettext"
 makedepends="accountsservice-devel gnome-backgrounds lightdm-devel
  webkit2gtk-devel dbus-glib-devel libxklavier-devel"
 depends="void-artwork lightdm"

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Merged]: json-glib, appstream-glib, phodav, ...: build translations
  2022-11-06 18:37 [PR PATCH] json-glib, appstream-glib, phodav, ...: build translations paper42
                   ` (2 preceding siblings ...)
  2022-11-18 12:11 ` paper42
@ 2022-11-18 13:51 ` paper42
  3 siblings, 0 replies; 5+ messages in thread
From: paper42 @ 2022-11-18 13:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1123 bytes --]

There's a merged pull request on the void-packages repository

json-glib, appstream-glib, phodav, ...: build translations
https://github.com/void-linux/void-packages/pull/40365

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-11-18 13:51 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-06 18:37 [PR PATCH] json-glib, appstream-glib, phodav, ...: build translations paper42
2022-11-08 17:13 ` [PR PATCH] [Updated] " paper42
2022-11-08 22:12 ` paper42
2022-11-18 12:11 ` paper42
2022-11-18 13:51 ` [PR PATCH] [Merged]: " paper42

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).