diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 17:54:44 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-07 17:54:44 +0000 |
commit | c16cb1dcba60b0811b3c46aa4734b998a18fc8dc (patch) | |
tree | 43c388f09756344e3f0243122526bcfd61421ee9 /debian/patches/debian/Revert-build-Port-to-gcr4.patch | |
parent | Adding upstream version 43.9. (diff) | |
download | gnome-shell-debian/43.9-0+deb12u1.tar.xz gnome-shell-debian/43.9-0+deb12u1.zip |
Adding debian version 43.9-0+deb12u1.debian/43.9-0+deb12u1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/debian/Revert-build-Port-to-gcr4.patch')
-rw-r--r-- | debian/patches/debian/Revert-build-Port-to-gcr4.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/debian/patches/debian/Revert-build-Port-to-gcr4.patch b/debian/patches/debian/Revert-build-Port-to-gcr4.patch new file mode 100644 index 0000000..81cab65 --- /dev/null +++ b/debian/patches/debian/Revert-build-Port-to-gcr4.patch @@ -0,0 +1,107 @@ +From: Jeremy Bicha <jeremy.bicha@canonical.com> +Date: Sun, 21 Aug 2022 10:30:55 -0400 +Subject: Revert "build: Port to gcr4" + +This reverts commit 5c935af7d3b3a3c9feb4e0d9ea214b6d25a7a2e7. + +Forwarded: not-needed +--- + 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 8c790da..769f31c 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 = '4'; ++imports.gi.versions.Gcr = '3'; + 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 1fa4311..84dba1a 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.90.0' ++gcr_req = '>= 3.7.5' + gio_req = '>= 2.56.0' + gi_req = '>= 1.49.1' + gjs_req = '>= 1.73.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-4', version: gcr_req) ++gcr_dep = dependency('gcr-base-3', 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 fc7f8bf..e9ad569 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -215,7 +215,7 @@ libshell_dep = declare_dependency(link_with: libshell) + libshell_gir_includes = [ + 'Clutter-@0@'.format(mutter_api_version), + 'Meta-@0@'.format(mutter_api_version), +- 'Gcr-4', ++ 'Gcr-3', + 'PolkitAgent-1.0' + ] + +diff --git a/src/shell-keyring-prompt.c b/src/shell-keyring-prompt.c +index bb03279..83c6746 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 <gcr/gcr.h> ++#include <gcr/gcr-base.h> + + #include <glib/gi18n.h> + +@@ -91,7 +91,7 @@ enum { + + static GParamSpec *props[N_PROPS] = { NULL, }; + +-static void shell_keyring_prompt_iface (GcrPromptInterface *iface); ++static void shell_keyring_prompt_iface (GcrPromptIface *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 (GcrPromptInterface *iface) ++shell_keyring_prompt_iface (GcrPromptIface *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 8271410..03af451 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 <gcr/gcr.h> ++#include <gcr/gcr-base.h> + + #include <string.h> + |