From e4499adaef800455cb562c7a2c0b7d1d1d832c66 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 19 Jul 2022 18:36:47 +0200 Subject: [PATCH] Add patch to port to gcr4 The path is upstream-ed at: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2386 --- 0001-build-Port-to-gcr4.patch | 110 ++++++++++++++++++++++++++++++++++ gnome-shell.spec | 5 +- 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 0001-build-Port-to-gcr4.patch diff --git a/0001-build-Port-to-gcr4.patch b/0001-build-Port-to-gcr4.patch new file mode 100644 index 0000000..eab08cb --- /dev/null +++ b/0001-build-Port-to-gcr4.patch @@ -0,0 +1,110 @@ +From 82489d37d9b4f86506e5843e50d26217f8cb8508 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 19 Jul 2022 18:31:04 +0200 +Subject: [PATCH] build: Port to gcr4 + +The gcr4 is going to replace gcr3. As only base functions are used, +the port to gcr4 is trivial. +--- + js/ui/environment.js | 2 +- + meson.build | 4 ++-- + src/meson.build | 2 +- + src/shell-keyring-prompt.c | 6 +++--- + src/shell-secure-text-buffer.c | 2 +- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/js/ui/environment.js b/js/ui/environment.js +index 83df7bcce..4853a83d5 100644 +--- a/js/ui/environment.js ++++ b/js/ui/environment.js +@@ -8,7 +8,7 @@ imports.gi.versions.Atk = '1.0'; + imports.gi.versions.Atspi = '2.0'; + imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; + imports.gi.versions.Cogl = Config.LIBMUTTER_API_VERSION; +-imports.gi.versions.Gcr = '3'; ++imports.gi.versions.Gcr = '4'; + imports.gi.versions.Gdk = '3.0'; + imports.gi.versions.Gdm = '1.0'; + imports.gi.versions.Geoclue = '2.0'; +diff --git a/meson.build b/meson.build +index bc0f62176..c3766e5e3 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,7 +20,7 @@ libmutter_test_pc = 'libmutter-test-' + mutter_api_version + + ecal_req = '>= 3.33.1' + eds_req = '>= 3.33.1' +-gcr_req = '>= 3.7.5' ++gcr_req = '>= 3.90.0' + gio_req = '>= 2.56.0' + gi_req = '>= 1.49.1' + gjs_req = '>= 1.71.1' +@@ -71,7 +71,7 @@ endif + atk_bridge_dep = dependency('atk-bridge-2.0') + ecal_dep = dependency('libecal-2.0', version: ecal_req) + eds_dep = dependency('libedataserver-1.2', version: eds_req) +-gcr_dep = dependency('gcr-base-3', version: gcr_req) ++gcr_dep = dependency('gcr-4', version: gcr_req) + gdk_x11_dep = dependency('gdk-x11-3.0') + gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') + gi_dep = dependency('gobject-introspection-1.0', version: gi_req) +diff --git a/src/meson.build b/src/meson.build +index 112782d86..e784a5132 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -213,7 +213,7 @@ libshell_dep = declare_dependency(link_with: libshell) + libshell_gir_includes = [ + 'Clutter-@0@'.format(mutter_api_version), + 'Meta-@0@'.format(mutter_api_version), +- 'Gcr-3', ++ 'Gcr-4', + 'PolkitAgent-1.0' + ] + +diff --git a/src/shell-keyring-prompt.c b/src/shell-keyring-prompt.c +index 83c674638..bb0327966 100644 +--- a/src/shell-keyring-prompt.c ++++ b/src/shell-keyring-prompt.c +@@ -26,7 +26,7 @@ + #include "shell-secure-text-buffer.h" + + #define GCR_API_SUBJECT_TO_CHANGE +-#include ++#include + + #include + +@@ -91,7 +91,7 @@ enum { + + static GParamSpec *props[N_PROPS] = { NULL, }; + +-static void shell_keyring_prompt_iface (GcrPromptIface *iface); ++static void shell_keyring_prompt_iface (GcrPromptInterface *iface); + + G_DEFINE_TYPE_WITH_CODE (ShellKeyringPrompt, shell_keyring_prompt, G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GCR_TYPE_PROMPT, shell_keyring_prompt_iface); +@@ -531,7 +531,7 @@ shell_keyring_prompt_close (GcrPrompt *prompt) + } + + static void +-shell_keyring_prompt_iface (GcrPromptIface *iface) ++shell_keyring_prompt_iface (GcrPromptInterface *iface) + { + iface->prompt_password_async = shell_keyring_prompt_password_async; + iface->prompt_password_finish = shell_keyring_prompt_password_finish; +diff --git a/src/shell-secure-text-buffer.c b/src/shell-secure-text-buffer.c +index 03af451ba..8271410e2 100644 +--- a/src/shell-secure-text-buffer.c ++++ b/src/shell-secure-text-buffer.c +@@ -26,7 +26,7 @@ + #include "shell-secure-text-buffer.h" + + #define GCR_API_SUBJECT_TO_CHANGE +-#include ++#include + + #include + +-- +2.35.1 + diff --git a/gnome-shell.spec b/gnome-shell.spec index de810a8..3cd1641 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -19,6 +19,8 @@ Patch40001: 0001-gdm-Work-around-failing-fingerprint-auth.patch # Work around crashy tear down Patch60003: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch +Patch01: 0001-build-Port-to-gcr4.patch + %define eds_version 3.45.1 %define gnome_desktop_version 3.35.91 %define glib2_version 2.56.0 @@ -43,7 +45,7 @@ BuildRequires: git BuildRequires: pkgconfig(ibus-1.0) >= %{ibus_version} BuildRequires: desktop-file-utils BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version} -BuildRequires: pkgconfig(gcr-base-3) +BuildRequires: pkgconfig(gcr-4) BuildRequires: pkgconfig(gjs-1.0) >= %{gjs_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gnome-autoar-0) @@ -234,6 +236,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de %changelog * Tue Jul 19 2022 Milan Crha - 43~alpha-2 - Rebuilt for evolution-data-server soname version bump +- Add patch to port to gcr4 * Sun Jul 10 2022 Florian Müllner - 43~alpha-1 - Update to 43.alpha