From 8b8429d58bd25884b5280e5b1ece2734a584d0e2 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   | 77 -------------------
 srcpkgs/glib/template                         | 16 ++--
 2 files changed, 8 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/glib/patches/disable-broken-tests.patch

diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
deleted file mode 100644
index 2a5263007503..000000000000
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/gio/tests/meson.build
-+++ b/gio/tests/meson.build
-@@ -56,7 +56,6 @@ gio_tests = {
-     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392 / https://gitlab.gnome.org/GNOME/glib/-/issues/1251
-     'should_fail' : host_system == 'darwin',
-   },
--  '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()
-       test_resources_binary2,
-     ]
-   endif
--
--  gio_tests += {
--    'resources' : {
--      'extra_sources' : resources_extra_sources,
--      # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--      'should_fail' : host_system == 'darwin',
--    },
--  }
- endif
- 
- foreach test_name, extra_args : gio_tests
---- a/glib/tests/meson.build
-+++ b/glib/tests/meson.build
-@@ -11,25 +11,17 @@ glib_tests = {
-   'cache' : {},
-   'charset' : {},
-   'checksum' : {},
--  'collate' : {},
-   'completion' : {},
-   'cond' : {},
--  'convert' : {},
-   'cxx' : {
-     'source' : ['cxx.cpp'],
-   },
-   'dataset' : {},
--  'date' : {
--    # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
--    'should_fail' : host_system == 'darwin',
--  },
-   'dir' : {},
-   'environment' : {
-     # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
-     'should_fail' : host_system == 'darwin',
-   },
--  'error' : {},
--  'fileutils' : {},
-   'gdatetime' : {
-     'suite' : ['slow'],
-   },
-@@ -65,7 +57,6 @@ glib_tests = {
-   'mutex' : {},
-   'node' : {},
-   'once' : {},
--  'option-context' : {},
-   'option-argv0' : {},
-   'overflow' : {},
-   'overflow-fallback' : {
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"