Re: [PR PATCH] [Updated] glib: update to 2.74.0.

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

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

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

https://github.com/paper42/void-packages glib-2.74
https://github.com/void-linux/void-packages/pull/39341

glib: update to 2.74.0.
<!-- 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/39341.patch is attached

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

From 6aee220fa4ed3eb2e64d95020ba34fab19bdfece Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 12 Sep 2022 20:58:10 +0200
Subject: [PATCH] glib: update to 2.74.0.

---
 .../glib/patches/disable-broken-tests.patch   | 34 ++++---------------
 srcpkgs/glib/template                         | 16 ++++-----
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 2a5263007503..86443f1c8aba 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -6,25 +6,9 @@
    },
 -  'converter-stream' : {},
    'credentials' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-@@ -91,7 +90,6 @@ gio_tests = {
-   'network-monitor' : {},
-   'network-monitor-race' : {},
-   'permission' : {},
--  'pollable' : {'dependencies' : [libdl_dep]},
-   'power-profile-monitor' : {},
-   'proxy-test' : {},
-   'readwrite' : {},
-@@ -174,7 +172,6 @@ endif
- #  Test programs buildable on UNIX only
- if host_machine.system() != 'windows'
-   gio_tests += {
--    'file' : {},
-     'gdbus-peer' : {
-       'dependencies' : [libgdbus_example_objectmanager_dep],
-       'install_rpath' : installed_tests_execdir,
-@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+   'data-input-stream' : {},
+   'data-output-stream' : {},
+@@ -814,14 +813,6 @@ if meson.can_run_host_binaries()
        test_resources_binary2,
      ]
    endif
@@ -41,7 +25,7 @@
  foreach test_name, extra_args : gio_tests
 --- a/glib/tests/meson.build
 +++ b/glib/tests/meson.build
-@@ -11,25 +11,17 @@ glib_tests = {
+@@ -11,21 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -49,9 +33,6 @@
    'completion' : {},
    'cond' : {},
 -  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
@@ -63,14 +44,13 @@
      'should_fail' : host_system == 'darwin',
    },
 -  'error' : {},
--  'fileutils' : {},
+   'fileutils' : {},
    'gdatetime' : {
      'suite' : ['slow'],
-   },
-@@ -65,7 +57,6 @@ glib_tests = {
-   'mutex' : {},
+@@ -65,7 +58,6 @@ glib_tests = {
    'node' : {},
    'once' : {},
+   'onceinit' : {},
 -  'option-context' : {},
    'option-argv0' : {},
    'overflow' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 8583a6616511..5d9693a8933d 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,23 +1,23 @@
 # Template file for 'glib'
 pkgname=glib
-version=2.72.2
-revision=2
+version=2.74.0
+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
+configure_args="-Dman=true -Dselinux=disabled
  $(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"
+makedepends="zlib-devel pcre2-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
 checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest"
 short_desc="GNU library of C routines"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
 license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
 distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
+checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"