brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Port to gcr4

Browse Source 
The gcr4 is going to replace gcr3. As only base functions are used,
the port to gcr4 is trivial.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2386>
This commit is contained in:
Milan Crha 2022-07-19 18:31:04 +02:00 committed by Marge Bot
parent a3a886f185
commit 5c935af7d3
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/environment.js
View File

@ -8,7 +8,7 @@ imports.gi.versions.Atk = '1.0';
imports.gi.versions.Atspi = '2.0'; imports.gi.versions.Atspi = '2.0';
imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION;
imports.gi.versions.Cogl = 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.Gdk = '3.0';
imports.gi.versions.Gdm = '1.0'; imports.gi.versions.Gdm = '1.0';
imports.gi.versions.Geoclue = '2.0'; imports.gi.versions.Geoclue = '2.0';

4
meson.build
View File

@ -20,7 +20,7 @@ libmutter_test_pc = 'libmutter-test-' + mutter_api_version
ecal_req = '>= 3.33.1' ecal_req = '>= 3.33.1'
eds_req = '>= 3.33.1' eds_req = '>= 3.33.1'
gcr_req = '>= 3.7.5' gcr_req = '>= 3.90.0'
gio_req = '>= 2.56.0' gio_req = '>= 2.56.0'
gi_req = '>= 1.49.1' gi_req = '>= 1.49.1'
gjs_req = '>= 1.73.1' gjs_req = '>= 1.73.1'
@ -71,7 +71,7 @@ endif
atk_bridge_dep = dependency('atk-bridge-2.0') atk_bridge_dep = dependency('atk-bridge-2.0')
ecal_dep = dependency('libecal-2.0', version: ecal_req) ecal_dep = dependency('libecal-2.0', version: ecal_req)
eds_dep = dependency('libedataserver-1.2', version: eds_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_x11_dep = dependency('gdk-x11-3.0')
gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0') gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0')
gi_dep = dependency('gobject-introspection-1.0', version: gi_req) gi_dep = dependency('gobject-introspection-1.0', version: gi_req)

2
src/meson.build
View File

@ -213,7 +213,7 @@ libshell_dep = declare_dependency(link_with: libshell)
libshell_gir_includes = [ libshell_gir_includes = [
'Clutter-@0@'.format(mutter_api_version), 'Clutter-@0@'.format(mutter_api_version),
'Meta-@0@'.format(mutter_api_version), 'Meta-@0@'.format(mutter_api_version),
'Gcr-3', 'Gcr-4',
'PolkitAgent-1.0' 'PolkitAgent-1.0'
] ]

6
src/shell-keyring-prompt.c
View File

@ -26,7 +26,7 @@
#include "shell-secure-text-buffer.h" #include "shell-secure-text-buffer.h"
#define GCR_API_SUBJECT_TO_CHANGE #define GCR_API_SUBJECT_TO_CHANGE
#include <gcr/gcr-base.h> #include <gcr/gcr.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
@ -91,7 +91,7 @@ enum {
static GParamSpec *props[N_PROPS] = { NULL, }; 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_DEFINE_TYPE_WITH_CODE (ShellKeyringPrompt, shell_keyring_prompt, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (GCR_TYPE_PROMPT, shell_keyring_prompt_iface); G_IMPLEMENT_INTERFACE (GCR_TYPE_PROMPT, shell_keyring_prompt_iface);
@ -531,7 +531,7 @@ shell_keyring_prompt_close (GcrPrompt *prompt)
} }
static void 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_async = shell_keyring_prompt_password_async;
iface->prompt_password_finish = shell_keyring_prompt_password_finish; iface->prompt_password_finish = shell_keyring_prompt_password_finish;

2
src/shell-secure-text-buffer.c
View File

@ -26,7 +26,7 @@
#include "shell-secure-text-buffer.h" #include "shell-secure-text-buffer.h"
#define GCR_API_SUBJECT_TO_CHANGE #define GCR_API_SUBJECT_TO_CHANGE
#include <gcr/gcr-base.h> #include <gcr/gcr.h>
#include <string.h> #include <string.h>