Re: [PR PATCH] [Updated] gegl: update to 0.4.36, babl: update to 0.1.92

[paper42 <paper42@users.noreply.github.com>]

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

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

https://github.com/paper42/void-packages gegl-0.4.36
https://github.com/void-linux/void-packages/pull/37623

gegl: update to 0.4.36, babl: update to 0.1.92
<!-- 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 [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/37623.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gegl-0.4.36-37623.patch --]
[-- Type: text/x-diff, Size: 5223 bytes --]

From 52b5a20c02cb98e271802e91fd3c193375805d8b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 20 Jun 2022 13:24:44 +0200
Subject: [PATCH 1/2] gegl: update to 0.4.38.

---
 srcpkgs/gegl/template | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template
index cd195ed8846b..0c34513f2d51 100644
--- a/srcpkgs/gegl/template
+++ b/srcpkgs/gegl/template
@@ -1,6 +1,6 @@
 # Template file for 'gegl'
 pkgname=gegl
-version=0.4.34
+version=0.4.38
 revision=1
 build_style=meson
 build_helper="gir"
@@ -8,20 +8,24 @@ configure_args="-Ddocs=false -Dintrospection=true
  -Dlibspiro=disabled -Dlibv4l=disabled -Dlibv4l2=disabled -Dlua=disabled
  -Dmrg=disabled -Dopenexr=disabled -Dsdl2=disabled -Dvapigen=disabled
  -Dlibav=disabled -Dumfpack=disabled"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config gettext"
 makedepends="babl-devel exiv2-devel gtk+-devel jasper-devel json-glib-devel
  lensfun-devel libgexiv2-devel librsvg-devel libraw-devel libwebp-devel
  python3-gobject-devel poppler-glib-devel"
 short_desc="Graph based image processing framework"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-only, LGPL-3.0-only"
-homepage="https://www.gimp.org"
-changelog="https://gitlab.gnome.org/GNOME/gegl/raw/master/docs/NEWS.txt"
+homepage="https://gegl.org/"
+changelog="https://gitlab.gnome.org/GNOME/gegl/-/raw/master/docs/NEWS.adoc"
 distfiles="https://download.gimp.org/pub/gegl/${version%.*}/gegl-${version}.tar.xz"
-checksum=ef63f0bca5b431c6119addd834ca7fbb507c900c4861c57b3667b6f4ccfcaaaa
+checksum=e4a33c8430a5042fba8439b595348e71870f0d95fbf885ff553f9020c1bed750
+
+case "$XBPS_TARGET_MACHINE" in
+	arm*) configure_args+=" -Db_lto=false"
+esac
 
 gegl-devel_package() {
-	depends="json-glib-devel babl-devel gegl>=${version}_${revision}"
+	depends="json-glib-devel babl-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

From e16b82fd4f75f2b74e1fe5c2b5769172bfdc98ad Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 20 Jun 2022 13:36:46 +0200
Subject: [PATCH 2/2] babl: update to 0.1.96.

---
 srcpkgs/babl/patches/meson-0.62.patch | 33 ---------------------------
 srcpkgs/babl/template                 | 15 ++++++++----
 2 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 srcpkgs/babl/patches/meson-0.62.patch

diff --git a/srcpkgs/babl/patches/meson-0.62.patch b/srcpkgs/babl/patches/meson-0.62.patch
deleted file mode 100644
index a105c98cb0db..000000000000
--- a/srcpkgs/babl/patches/meson-0.62.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b05b2826365a7dbc6ca1bf0977b848055cd0cbb6 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Sun, 13 Mar 2022 20:26:05 -0400
-Subject: [PATCH] meson: fix misspelled kwarg name
-
-set10 doesn't have a `Description` kwarg, it does have a `description`
-kwarg though.
-
-This caused the conf variable to not have a description when it should
-have one, and newer versions of Meson with better argument validation
-error out with:
-
-meson.build:58:5: ERROR: configuration_data.set10 got unknown keyword arguments "Description"
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 55054f441..8c93be9d1 100644
---- a/meson.build
-+++ b/meson.build
-@@ -55,7 +55,7 @@ lib_name    = meson.project_name() + '-' + api_version
- stability_version_number = (major_version != 0 ? minor_version : micro_version)
- stable = (stability_version_number % 2 == 0)
- 
--conf.set10('BABL_UNSTABLE', not stable, Description:
-+conf.set10('BABL_UNSTABLE', not stable, description:
-   'Define to 1 if this is an unstable version of BABL.')
- 
- conf.set       ('BABL_MAJOR_VERSION',    '@0@'.format(major_version))
--- 
-GitLab
-
diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template
index 1ed797f599da..c220d2ccbdf1 100644
--- a/srcpkgs/babl/template
+++ b/srcpkgs/babl/template
@@ -1,6 +1,6 @@
 # Template file for 'babl'
 pkgname=babl
-version=0.1.88
+version=0.1.96
 revision=1
 build_style=meson
 build_helper=gir
@@ -10,16 +10,21 @@ makedepends="lcms2-devel vala-devel"
 short_desc="Dynamic pixel format translation library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-3.0-only"
-homepage="http://gegl.org/babl/"
-changelog="https://raw.githubusercontent.com/GNOME/babl/master/NEWS"
+homepage="https://gegl.org/babl/"
+changelog="https://gitlab.gnome.org/GNOME/babl/-/raw/master/NEWS"
 distfiles="https://download.gimp.org/pub/babl/${version%.*}/babl-${version}.tar.xz"
-checksum=4f0d7f4aaa0bb2e725f349adf7b351a957d9fb26d555d9895a7af816b4167039
+checksum=33673fe459a983f411245a49f81fd7f1966af1ea8eca9b095a940c542b8545f6
+
+case "$XBPS_TARGET_MACHINE" in
+	arm*) configure_args+=" -Db_lto=false"
+esac
 
 babl-devel_package() {
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="lcms2-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
+		vmove usr/share/vala
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
 		vmove "usr/share/gir-*"