Merge pull request #1422 from DjLegolas/upgrade-glib-2.82.0

Update GLib to version 2.82.0
wingtk · Aug 30, 2024 · 740be54 · 740be54
2 parents ae04552 + 85e2315
commit 740be54
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 170 deletions.
diff --git a/gvsbuild/patches/glib-base/002-gir-scanner-dll-not-found.patch b/gvsbuild/patches/glib-base/002-gir-scanner-dll-not-found.patch
diff --git a/gvsbuild/patches/glib/002-gir-scanner-dll-not-found.patch b/gvsbuild/patches/glib/002-gir-scanner-dll-not-found.patch
diff --git a/gvsbuild/projects/glib.py b/gvsbuild/projects/glib.py
@@ -24,11 +24,11 @@ def __init__(self):
         Meson.__init__(
             self,
             "glib-base",
-            version="2.80.4",
+            version="2.82.0",
             lastversion_even=True,
             repository="https://gitlab.gnome.org/GNOME/glib",
             archive_url="https://download.gnome.org/sources/glib/{major}.{minor}/glib-{version}.tar.xz",
-            hash="24e029c5dfc9b44e4573697adf33078a9827c48938555004b3b9096fa4ea034f",
+            hash="f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3",
             dependencies=[
                 "ninja",
                 "meson",
@@ -40,8 +40,6 @@ def __init__(self):
             ],
             patches=[
                 "001-glib-package-installation-directory.patch",
-                # https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/499
-                "002-gir-scanner-dll-not-found.patch",
             ],
         )
         self.add_param("-Dman-pages=disabled")
@@ -50,7 +48,10 @@ def __init__(self):
         self.add_param("-Dintrospection=disabled")
 
     def build(self):
-        Meson.build(self)
+        build_debug = (
+            "enabled" if self.builder.opts.configuration == "debug" else "disabled"
+        )
+        Meson.build(self, meson_params=f"-Dglib_debug={build_debug}")
         self.install(r".\LICENSES\* share\doc\glib")
 
 
@@ -60,16 +61,14 @@ def __init__(self):
         Meson.__init__(
             self,
             "glib",
-            version="2.80.4",
+            version="2.82.0",
             lastversion_even=True,
             repository="https://gitlab.gnome.org/GNOME/glib",
             archive_url="https://download.gnome.org/sources/glib/{major}.{minor}/glib-{version}.tar.xz",
-            hash="24e029c5dfc9b44e4573697adf33078a9827c48938555004b3b9096fa4ea034f",
+            hash="f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3",
             dependencies=["glib-base"],
             patches=[
                 "001-glib-package-installation-directory.patch",
-                # https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/499
-                "002-gir-scanner-dll-not-found.patch",
             ],
         )
         self.add_param("-Dman-pages=disabled")
@@ -81,7 +80,10 @@ def __init__(self):
 
     def build(self):
         if self.opts.enable_gi:
-            Meson.build(self)
+            build_debug = (
+                "enabled" if self.builder.opts.configuration == "debug" else "disabled"
+            )
+            Meson.build(self, meson_params=f"-Dglib_debug={build_debug}")
 
 
 @project_add