From 6319d50ea8cfb0f703642b10f0029884dcc00445 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   | 52 ++++++++++++-------
 srcpkgs/glib/template                         | 21 ++++----
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 2a5263007503..f4a46c4ae19c 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -6,25 +6,40 @@
    },
 -  '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
+   'data-input-stream' : {},
+   'data-output-stream' : {},
+@@ -76,12 +75,6 @@ gio_tests = {
+   'g-icon' : {},
+   'gdbus-addresses' : {},
+   'gdbus-message' : {},
+-  'gdbus-peer' : {
+-    'dependencies' : [libgdbus_example_objectmanager_dep],
+-    'install_rpath' : installed_tests_execdir,
+-    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
+-    'should_fail' : host_system == 'darwin',
+-  },
+   'inet-address' : {},
+   'io-stream' : {},
+   'memory-input-stream' : {},
+@@ -198,7 +191,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()
+     'gdbus-peer-object-manager' : {},
+     'gdbus-sasl' : {},
+     'live-g-file' : {},
+@@ -239,9 +231,6 @@ if host_machine.system() != 'windows'
+   # unable to find the installed executable
+   if not glib_have_cocoa
+     gio_tests += {
+-      'appinfo' : {
+-        'install' : false,
+-      },
+       'desktop-app-info' : {
+         'install' : false,
+       },
+@@ -814,14 +803,6 @@ if meson.can_run_host_binaries()
        test_resources_binary2,
      ]
    endif
@@ -41,7 +56,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,22 +11,14 @@ glib_tests = {
    'cache' : {},
    'charset' : {},
    'checksum' : {},
@@ -49,9 +64,6 @@
    'completion' : {},
    'cond' : {},
 -  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
    'dataset' : {},
 -  'date' : {
 -    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
@@ -68,9 +80,9 @@
      'suite' : ['slow'],
    },
 @@ -65,7 +57,6 @@ glib_tests = {
-   'mutex' : {},
    'node' : {},
    'once' : {},
+   'onceinit' : {},
 -  'option-context' : {},
    'option-argv0' : {},
    'overflow' : {},
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 8583a6616511..7665dba5bd3e 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,23 +1,24 @@
 # 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
+make_check_pre="dbus-run-session"
 
 build_options="gtk_doc"
 desc_option_gtk_doc="Build GTK API docs"
@@ -26,10 +27,6 @@ if [ -z "$CROSS_BUILD" ]; then
 	build_options_default+=" gtk_doc"
 fi
 
-do_check() {
-	dbus-run-session ninja -C build test
-}
-
 libglib-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"