From 619bf5b4e05a0862dec08c0c08d2118359f77225 Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Fri, 12 Dec 2025 19:59:50 +0100 Subject: [PATCH] Migrate to gcr-4 and gck-2 The older versions aren't maintained anymore. Luckily, this is quite a minimal change, since we only use a very small subset of those APIs. --- .gitlab-ci.yml | 4 ++-- meson.build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad95fd79..a8e91f8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,7 +56,7 @@ build.container.fedora@x86_64: desktop-file-utils enchant2-devel folks-devel - gcr3-devel + gcr-devel git glib-networking glib2-devel @@ -94,7 +94,7 @@ build.container.fedora@x86_64: # release branch name to ensure that a new image will # be created, tailored for the stable branch. BRANCH_NAME: 'main' - CONTAINER_TAG: '2025-12-11.0' + CONTAINER_TAG: '2025-12-12.0' FEDORA_VERSION: latest # Derive FDO variables from this automatically. # DO NOT edit, instead change the variables above diff --git a/meson.build b/meson.build index 5a434d6f..59b4ba7e 100644 --- a/meson.build +++ b/meson.build @@ -72,8 +72,8 @@ webkit2gtk = dependency('webkit2gtk-4.1', version: '>=' + target_webkit) cairo = dependency('cairo') enchant = dependency('enchant-2', version: '>=2.1') folks = dependency('folks', version: '>=0.11') -gck = dependency('gck-1') -gcr = dependency('gcr-3', version: '>= 3.10.1') +gck = dependency('gck-2') +gcr = dependency('gcr-4') gdk = dependency('gdk-3.0', version: '>=' + target_gtk) gee = dependency('gee-0.8', version: '>= 0.8.5') gio = dependency('gio-2.0', version: '>=' + target_glib)