From 7610973a948bce0b2aea8e1a8e2fb01e00d3526f Mon Sep 17 00:00:00 2001
From: Sebastian Wick <sebastian.wick@redhat.com>
Date: Tue, 23 Jul 2024 12:31:24 +0200
Subject: [PATCH] Replace deprecated g_qsort_with_data with g_sort_array

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3899>
---
 .gitlab-ci.yml                        | 6 +++++-
 clutter/clutter/clutter-box-layout.c  | 6 +++---
 clutter/clutter/clutter-grid-layout.c | 6 +++---
 meson.build                           | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 813b06b03..359f9b78d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,7 +96,7 @@ variables:
     - .skip-git-clone
   variables:
     FDO_DISTRIBUTION_VERSION: 40
-    BASE_TAG: '2024-08-03.1'
+    BASE_TAG: '2024-08-15.1'
     MUTTER_USER: 'meta-user'
     FDO_DISTRIBUTION_PACKAGES:
       asciidoc
@@ -139,6 +139,10 @@ variables:
       # Remove when we have a fixed version!
       dnf install -y libX11-common-1.8.7
 
+      ./.gitlab-ci/install-meson-project.sh \
+        https://gitlab.gnome.org/GNOME/glib.git \
+        2.81.1
+
       ./.gitlab-ci/install-meson-project.sh \
         https://gitlab.gnome.org/jadahl/catch.git \
         main
diff --git a/clutter/clutter/clutter-box-layout.c b/clutter/clutter/clutter-box-layout.c
index 12aaa2091..af814f17d 100644
--- a/clutter/clutter/clutter-box-layout.c
+++ b/clutter/clutter/clutter-box-layout.c
@@ -588,9 +588,9 @@ distribute_natural_allocation (float          extra_space,
    */
 
   /* Sort descending by gap and position. */
-  g_qsort_with_data (spreading,
-                     n_requested_sizes, sizeof (unsigned int),
-                     compare_gap, sizes);
+  g_sort_array (spreading,
+                n_requested_sizes, sizeof (unsigned int),
+                compare_gap, sizes);
 
   /* Distribute available space.
    * This master piece of a loop was conceived by Behdad Esfahbod.
diff --git a/clutter/clutter/clutter-grid-layout.c b/clutter/clutter/clutter-grid-layout.c
index 8a2c485c2..22f9cf7ec 100644
--- a/clutter/clutter/clutter-grid-layout.c
+++ b/clutter/clutter/clutter-grid-layout.c
@@ -971,9 +971,9 @@ distribute_natural_allocation (gint           extra_space,
    */
 
   /* Sort descending by gap and position. */
-  g_qsort_with_data (spreading,
-                     n_requested_sizes, sizeof (guint),
-                     compare_gap, sizes);
+  g_sort_array (spreading,
+                n_requested_sizes, sizeof (guint),
+                compare_gap, sizes);
 
   /* Distribute available space.
    * This master piece of a loop was conceived by Behdad Esfahbod.
diff --git a/meson.build b/meson.build
index 6fd873f49..7b432f04b 100644
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,7 @@ mutter_builddir = meson.current_build_dir()
 lcms2_req = '>= 2.6'
 colord_req = '>= 1.4.5'
 fribidi_req = '>= 1.0.0'
-glib_req = '>= 2.75.1'
+glib_req = '>= 2.81.1'
 gi_req = '>= 0.9.5'
 graphene_req = '>= 1.10.2'
 gtk3_req = '>= 3.19.8'