glib: update to 2.74.3

Can update now on all OS now that we dropped the Cocoa mainloop
patches for macOS/iOS, see #323 and !1023.

Fixes #330

Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/864>

1 files changed, 6 insertions, 37 deletions

diff --git a/recipes/glib.recipe b/recipes/glib.recipe
index c157846b..41e28af8 100644
--- a/recipes/glib.recipe
+++ b/recipes/glib.recipe
@@ -22,49 +22,20 @@ GLIB_CONFIG_UNVERSAL='''\
 
 class Recipe(recipe.Recipe):
     name = 'glib'
-    version = '2.62.6'
+    version = '2.74.3'
     stype = SourceType.TARBALL
     url = 'gnome://'
-    tarball_checksum = '104fa26fbefae8024ff898330c671ec23ad075c1c0bce45c325c6d5657d58b9c'
+    tarball_checksum = 'e9bc41ecd9690d9bc6a970cc7380119b828e5b6a4b16c393c638b3dc2b87cbcb'
     licenses = [License.LGPLv2Plus]
     btype = BuildType.MESON
-    meson_options = {'internal_pcre': 'true', 'libmount': 'false', 'dtrace': 'false',
-                     'iconv': 'auto'}
-    deps = ['libffi', 'zlib']
+    meson_options = {'libmount': 'disabled', 'dtrace': 'false', 'iconv': 'auto'}
+    deps = ['libffi', 'zlib', 'pcre2']
 
     patches = [
         'glib/0003-Add-support-for-loading-GIO-modules-from-the-distro-.patch',
         'glib/0004-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch',
         'glib/0006-giomodule-do-not-try-to-load-modules-from-gio-module.patch',
         'glib/0008-Unhide-_g_io_modules_ensure_extension_points_registe.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1415
-        'glib/0001-meson-Don-t-use-assert-in-test-code.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1433
-        'glib/0001-meson-fix-buildtype-args-and-vscrt-usage.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1512
-        'glib/0001-meson-host_system-can-be-ios-when-cross-compiling.patch',
-        'glib/0002-meson-Autodetect-when-building-for-iOS.patch',
-        'glib/0003-meson-Only-look-for-_NSGetEnviron-when-building-for-.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1522
-        'glib/0001-meson-Fix-gnulib-printf-checks.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1579
-        'glib/0001-glib-Use-g_getenv-everywhere-instead-of-getenv.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1771
-        'glib/0001-macos-fix-frexpl-checks-in-cross-compilation.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1884
-        'glib/0001-gthread-win32-Use-SetThreadDescription-Win32-API-for.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1616
-        'glib/0001-gioerror-Map-WSAENETRESET-on-Windows-to-G_IO_ERROR_C.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1836
-        'glib/0001-Windows-fix-FD_READ-condition-flag-still-set-on-reco.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1428
-        'glib/0001-Add-missing-extern-to-the-dllexport-version-of-GLIB_.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1698
-        'glib/0001-gslice-Inline-win32-implementation-of-g_getenv-to-av.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2848
-        'glib/0001-giomodule-Automatically-detect-modules-on-macOS.patch',
-        # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1396
-        'glib/0001-macros-Define-G_GNUC_FALLTHROUGH-for-more-compilers.patch',
     ]
 
     files_libs = [
@@ -152,8 +123,6 @@ class Recipe(recipe.Recipe):
                 self.files_bins.remove('gdbus')
                 self.files_bins_devel.remove('bin/gdbus.pdb')
                 self.patches += [
-                    # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1583
-                    'glib/uwp/0001-gio-Remove-broken-support-for-XP.patch',
                     # Ready to upstream
                     'glib/uwp/0001-gio-Disable-generic-DNS-record-lookup-on-UWP.patch',
                     'glib/uwp/0001-glib-Never-use-MessageBox-on-UWP-apps.patch',
@@ -170,7 +139,6 @@ class Recipe(recipe.Recipe):
                     'glib/uwp/0011-gsocket-if_nametoindex-is-not-available-on-WinRT.patch',
                     'glib/uwp/0012-gio-ginetaddress-Fix-build-on-WinRT.patch',
                     # Need some more work
-                    'glib/uwp/0013-WIP-UPSTREAM-glib-Specify-noreturn-prototype-for-MSV.patch',
                     'glib/uwp/0014-WIP-gspawn-Do-not-allow-spawning-or-making-pipes-on-.patch',
                     'glib/uwp/0015-WIP-glib-giowin32-Disallow-invalid-usage-of-GIOChann.patch',
                     'glib/uwp/0016-WIP-glocalfile-Trash-as-a-concept-does-not-exist-on-.patch',
@@ -270,7 +238,8 @@ class Recipe(recipe.Recipe):
         major, minor, micro = get_libtool_versions(self.version)
         # Meson does not generate la files
         LibtoolLibrary('glib-2.0', major, minor, micro,
-                self.config.libdir, self.config.target_platform).save()
+                self.config.libdir, self.config.target_platform,
+                deps=['pcre2-8']).save()
         LibtoolLibrary('gobject-2.0', major, minor, micro,
                 self.config.libdir, self.config.target_platform,
                 deps=['glib-2.0', 'ffi']).save()