sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

Replace deprecated g_qsort_with_data with g_sort_array

Browse source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3899>
This commit is contained in:
Sebastian Wick 2024-07-23 12:31:24 +02:00
parent e5827ea06b
commit 7610973a94
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -96,7 +96,7 @@ variables:
- .skip-git-clone - .skip-git-clone
variables: variables:
FDO_DISTRIBUTION_VERSION: 40 FDO_DISTRIBUTION_VERSION: 40
BASE_TAG: '2024-08-03.1' BASE_TAG: '2024-08-15.1'
MUTTER_USER: 'meta-user' MUTTER_USER: 'meta-user'
FDO_DISTRIBUTION_PACKAGES: FDO_DISTRIBUTION_PACKAGES:
asciidoc asciidoc
@ -139,6 +139,10 @@ variables:
# Remove when we have a fixed version! # Remove when we have a fixed version!
dnf install -y libX11-common-1.8.7 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 \ ./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/jadahl/catch.git \ https://gitlab.gnome.org/jadahl/catch.git \
main main

6
clutter/clutter/clutter-box-layout.c
View file

@ -588,9 +588,9 @@ distribute_natural_allocation (float extra_space,
*/ */
/* Sort descending by gap and position. */ /* Sort descending by gap and position. */
g_qsort_with_data (spreading, g_sort_array (spreading,
n_requested_sizes, sizeof (unsigned int), n_requested_sizes, sizeof (unsigned int),
compare_gap, sizes); compare_gap, sizes);
/* Distribute available space. /* Distribute available space.
* This master piece of a loop was conceived by Behdad Esfahbod. * This master piece of a loop was conceived by Behdad Esfahbod.

6
clutter/clutter/clutter-grid-layout.c
View file

@ -971,9 +971,9 @@ distribute_natural_allocation (gint extra_space,
*/ */
/* Sort descending by gap and position. */ /* Sort descending by gap and position. */
g_qsort_with_data (spreading, g_sort_array (spreading,
n_requested_sizes, sizeof (guint), n_requested_sizes, sizeof (guint),
compare_gap, sizes); compare_gap, sizes);
/* Distribute available space. /* Distribute available space.
* This master piece of a loop was conceived by Behdad Esfahbod. * This master piece of a loop was conceived by Behdad Esfahbod.

2
meson.build
View file

@ -16,7 +16,7 @@ mutter_builddir = meson.current_build_dir()
lcms2_req = '>= 2.6' lcms2_req = '>= 2.6'
colord_req = '>= 1.4.5' colord_req = '>= 1.4.5'
fribidi_req = '>= 1.0.0' fribidi_req = '>= 1.0.0'
glib_req = '>= 2.75.1' glib_req = '>= 2.81.1'
gi_req = '>= 0.9.5' gi_req = '>= 0.9.5'
graphene_req = '>= 1.10.2' graphene_req = '>= 1.10.2'
gtk3_req = '>= 3.19.8' gtk3_req = '>= 3.19.8'