Re: [PR PATCH] [Updated] Update glib and glibmm and *mm friends

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

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

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

https://github.com/ericonr/void-packages glibu
https://github.com/void-linux/void-packages/pull/28425

Update glib and glibmm and *mm friends
<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->

I believe this is the last release series, the future is the ABI breaking version that uses gtk4. I will be preparing a PR for those, but I don't know what the transition period will look like.

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

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

From 7767c099149aa97c1bb6cd2219572ff72e0de9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 01:18:43 -0300
Subject: [PATCH 1/5] glib: update to 2.66.6.

- build static libraries.

- remove LTO from build to avoid issues when linking qemu-user-static.
Thanks to leah for finding the fix.

- disable fileutils tests, broken on container where user is root.
---
 srcpkgs/glib/patches/disable-broken-tests.patch | 12 ++++++------
 srcpkgs/glib/template                           |  9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index c8d1967ff89..15e87215d27 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -1,4 +1,4 @@
-diff --git a/gio/tests/meson.build b/gio/tests/meson.build
+diff --git gio/tests/meson.build gio/tests/meson.build
 index d8ebd56..be72f5c 100644
 --- gio/tests/meson.build
 +++ gio/tests/meson.build
@@ -19,11 +19,11 @@ index d8ebd56..be72f5c 100644
  
    plugin_resources_c = custom_target('plugin-resources.c',
      input : 'test4.gresource.xml',
-diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index 6eb23e8..59807ff 100644
+diff --git glib/tests/meson.build glib/tests/meson.build
+index 6eb23e8..d7aacfa 100644
 --- glib/tests/meson.build
 +++ glib/tests/meson.build
-@@ -11,18 +11,12 @@ glib_tests = {
+@@ -11,18 +11,11 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -35,14 +35,14 @@ index 6eb23e8..59807ff 100644
    'dir' : {},
    'environment' : {},
    'error' : {},
-   'fileutils' : {},
+-  'fileutils' : {},
 -  'gdatetime' : {
 -    'suite' : ['slow'],
 -  },
    'guuid' : {},
    'gvariant' : {
      'suite' : ['slow'],
-@@ -54,7 +48,6 @@ glib_tests = {
+@@ -54,7 +47,6 @@ glib_tests = {
    'mutex' : {},
    'node' : {},
    'once' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0d6de76ea88..c011c7ef7b4 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,10 +1,12 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.66.2
+version=2.66.6
 revision=1
 build_style=meson
+# static version is necessary for qemu-user-static;
+# also disable LTO, otherwise there are multiple failures when linking qemu
 configure_args="-Dfam=false -Dman=true -Dselinux=disabled
- $(vopt_bool gtk_doc gtk_doc)"
+ $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
 checkdepends="desktop-file-utils shared-mime-info tzdata dbus"
@@ -14,7 +16,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
 changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=ec390bed4e8dd0f89e918f385e8d4cfd7470b1ef7c1ce93ec5c4fc6e3c6a17c4
+checksum=80fff9c63d2725834328071c42003c311f77f91caf2285195c587c62f5638329
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
@@ -36,6 +38,7 @@ libglib-devel_package() {
 		vmove usr/lib/glib-2.0
 		vmove usr/lib/pkgconfig
 		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
 	}
 }
 

From a58088207aa2dcd97c380a6d5cb58b771331842d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:57 -0300
Subject: [PATCH 2/5] glibmm: update to 2.66.0.

Also drop glibmm-doc.
---
 srcpkgs/glibmm-doc                |  1 -
 srcpkgs/glibmm/template           | 16 ++++------------
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 120000 srcpkgs/glibmm-doc

diff --git a/srcpkgs/glibmm-doc b/srcpkgs/glibmm-doc
deleted file mode 120000
index d5491e56bc0..00000000000
--- a/srcpkgs/glibmm-doc
+++ /dev/null
@@ -1 +0,0 @@
-glibmm
\ No newline at end of file
diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template
index 6e51158ece0..3697ed41a02 100644
--- a/srcpkgs/glibmm/template
+++ b/srcpkgs/glibmm/template
@@ -1,8 +1,8 @@
 # Template file for 'glibmm'
 pkgname=glibmm
-version=2.64.2
-revision=2
-build_style=gnu-configure
+version=2.66.0
+revision=1
+build_style=meson
 hostmakedepends="glib-devel perl pkg-config"
 makedepends="libglib-devel libsigc++-devel"
 checkdepends="glib-networking"
@@ -11,15 +11,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtkmm.org"
 distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz"
-checksum=a75282e58d556d9b2bb44262b6f5fb76c824ac46a25a06f527108bec86b8d4ec
-
-glibmm-doc_package() {
-	short_desc+=" - documentation"
-	pkg_install() {
-		vmove usr/share/doc
-		vmove usr/share/devhelp
-	}
-}
+checksum=9e1db7d43d2e2d4dfa2771354e21a69a6beec7c446b711619cf8c779e13a581e
 
 glibmm-devel_package() {
 	depends="${makedepends} glibmm>=${version}_${revision}"
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 229c78a6bcc..d50d4f980b0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -38,6 +38,7 @@ replaces="
  gens-gs<=2.16.7_2
  geoip-data<=20171002_2
  gksu<=2.0.2_4
+ glibmm-doc<=2.64.2_2
  go1.4-bootstrap<=20171003_2
  goffice0.8<=0.8.17_6
  gst1-python<=1.18.3_1

From 7266e0add3ce98ec2451327fb416e9d4618245cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:32 -0300
Subject: [PATCH 3/5] atkmm: update to 2.28.1.

---
 srcpkgs/atkmm/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/atkmm/template b/srcpkgs/atkmm/template
index a5453a1447a..8e0a09ea9f2 100644
--- a/srcpkgs/atkmm/template
+++ b/srcpkgs/atkmm/template
@@ -1,9 +1,8 @@
 # Template file for 'atkmm'
 pkgname=atkmm
-version=2.28.0
+version=2.28.1
 revision=1
-build_style=gnu-configure
-configure_args="--disable-documentation"
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libsigc++-devel atk-devel glibmm-devel"
 short_desc="Set of interfaces for accessibility (C++ bindings)"
@@ -11,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.gtkmm.org"
 distfiles="${GNOME_SITE}/atkmm/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a
+checksum=116876604770641a450e39c1f50302884848ce9cc48d43c5dc8e8efc31f31bad
 
 atkmm-devel_package() {
 	depends="${makedepends} atkmm>=${version}_${revision}"

From 96d7f3675e5af57920d673e8f641aec2a4b8bdd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:08 -0300
Subject: [PATCH 4/5] pangomm: update to 2.46.0.

---
 srcpkgs/pangomm/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pangomm/template b/srcpkgs/pangomm/template
index 632236f5d96..29757083e84 100644
--- a/srcpkgs/pangomm/template
+++ b/srcpkgs/pangomm/template
@@ -1,9 +1,8 @@
 # Template file for 'pangomm'
 pkgname=pangomm
-version=2.42.1
+version=2.46.0
 revision=1
-build_style=gnu-configure
-configure_args="--disable-documentation"
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="libsigc++-devel glibmm-devel cairomm-devel pango-devel"
 short_desc="C++ bindings for the pango library"
@@ -11,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
 distfiles="${GNOME_SITE}/pangomm/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=14bf04939930870d5cfa96860ed953ad2ce07c3fd8713add4a1bfe585589f40f
+checksum=d3787d04d6198b606f3efa357b3b452a7140e2a7dee56f9f9ce516d7d5fcec1b
 
 pangomm-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"

From c7217a78cf70c7357905be6c777f916b273dcc55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:37:05 -0300
Subject: [PATCH 5/5] gtkmm: update to 3.24.3.

Add gdk-pixbuf to hostmakedepends, since gdk-pixbuf-pixdata is necessary
during build.
---
 srcpkgs/gtkmm/template | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index a4e24bcbf3b..8efe5d72596 100644
--- a/srcpkgs/gtkmm/template
+++ b/srcpkgs/gtkmm/template
@@ -1,10 +1,9 @@
 # Template file for 'gtkmm'
 pkgname=gtkmm
-version=3.24.2
+version=3.24.3
 revision=1
-build_style=gnu-configure
-configure_args="--disable-documentation"
-hostmakedepends="automake libtool pkg-config mm-common"
+build_style=meson
+hostmakedepends="pkg-config mm-common gdk-pixbuf"
 makedepends="gtk+3-devel glibmm-devel atkmm-devel pangomm-devel"
 checkdepends="xvfb-run"
 short_desc="C++ bindings for The GTK+ toolkit (v3)"
@@ -13,10 +12,10 @@ license="LGPL-2.1-or-later"
 homepage="https://gtkmm.org"
 changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3
+checksum=60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435
 
 do_check() {
-	xvfb-run make check
+	xvfb-run ninja -C build test
 }
 
 gtkmm-devel_package() {