Delete adaptor_gcr-3.patch and using default gcr4 to build this package.
This commit is contained in:
parent
5227a9a511
commit
9ddd432601
@ -1,54 +0,0 @@
|
|||||||
diff -up gnome-shell-43.2/src/meson.build.BAK gnome-shell-43.2/src/meson.build
|
|
||||||
--- gnome-shell-43.2/src/meson.build.BAK 2023-01-11 04:43:36.977946205 +0000
|
|
||||||
+++ gnome-shell-43.2/src/meson.build 2023-01-11 04:43:54.333945186 +0000
|
|
||||||
@@ -215,7 +215,7 @@ libshell_dep = declare_dependency(link_w
|
|
||||||
libshell_gir_includes = [
|
|
||||||
'Clutter-@0@'.format(mutter_api_version),
|
|
||||||
'Meta-@0@'.format(mutter_api_version),
|
|
||||||
- 'Gcr-4',
|
|
||||||
+ 'Gcr-3',
|
|
||||||
'PolkitAgent-1.0'
|
|
||||||
]
|
|
||||||
|
|
||||||
diff -up gnome-shell-43.2/src/shell-keyring-prompt.c.BAK gnome-shell-43.2/src/shell-keyring-prompt.c
|
|
||||||
--- gnome-shell-43.2/src/shell-keyring-prompt.c.BAK 2023-01-11 04:38:19.865964808 +0000
|
|
||||||
+++ gnome-shell-43.2/src/shell-keyring-prompt.c 2023-01-11 04:38:50.025963038 +0000
|
|
||||||
@@ -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 *p
|
|
||||||
}
|
|
||||||
|
|
||||||
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 -up gnome-shell-43.2/meson.build.BAK gnome-shell-43.2/meson.build
|
|
||||||
--- gnome-shell-43.2/meson.build.BAK 2023-01-11 04:47:00.245934280 +0000
|
|
||||||
+++ gnome-shell-43.2/meson.build 2023-01-11 04:47:24.061932883 +0000
|
|
||||||
@@ -20,7 +20,7 @@ libmutter_test_pc = 'libmutter-test-' +
|
|
||||||
|
|
||||||
ecal_req = '>= 3.33.1'
|
|
||||||
eds_req = '>= 3.33.1'
|
|
||||||
-gcr_req = '>= 3.90.0'
|
|
||||||
+gcr_req = '>= 3.41.0'
|
|
||||||
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-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)
|
|
||||||
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
Name: gnome-shell
|
Name: gnome-shell
|
||||||
Version: 43.2
|
Version: 43.2
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Core user interface functions for the GNOME 3 desktop
|
Summary: Core user interface functions for the GNOME 3 desktop
|
||||||
Group: User Interface/Desktops
|
Group: User Interface/Desktops
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -26,14 +26,13 @@ Source0: https://download.gnome.org/sources/gnome-shell/43/%{name}-%{vers
|
|||||||
Patch10001: gnome-shell-favourite-apps-firefox.patch
|
Patch10001: gnome-shell-favourite-apps-firefox.patch
|
||||||
Patch40001: 0001-gdm-Work-around-failing-fingerprint-auth.patch
|
Patch40001: 0001-gdm-Work-around-failing-fingerprint-auth.patch
|
||||||
Patch60003: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
|
Patch60003: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch
|
||||||
Patch70001: adaptor_gcr-3.patch
|
|
||||||
|
|
||||||
BuildRequires: bash-completion gcc meson mesa-libGL-devel mesa-libEGL-devel
|
BuildRequires: bash-completion gcc meson mesa-libGL-devel mesa-libEGL-devel
|
||||||
BuildRequires: gtk-doc desktop-file-utils python3 librsvg2-devel chrpath cmake
|
BuildRequires: gtk-doc desktop-file-utils python3 librsvg2-devel chrpath cmake
|
||||||
BuildRequires: gettext >= 0.19.6 libXfixes-devel >= 5.0
|
BuildRequires: gettext >= 0.19.6 libXfixes-devel >= 5.0
|
||||||
BuildRequires: gcr-devel pkgconfig(gnome-autoar-0) pkgconfig(gnome-desktop-3.0) pkgconfig(libpulse)
|
BuildRequires: gcr4-devel pkgconfig(gnome-autoar-0) pkgconfig(gnome-desktop-3.0) pkgconfig(libpulse)
|
||||||
BuildRequires: pkgconfig(libnm) pkgconfig(libsystemd) pkgconfig(libstartup-notification-1.0)
|
BuildRequires: pkgconfig(libnm) pkgconfig(libsystemd) pkgconfig(libstartup-notification-1.0)
|
||||||
BuildRequires: pkgconfig(gcr-3)
|
BuildRequires: pkgconfig(gcr-4)
|
||||||
BuildRequires: pkgconfig(ibus-1.0) >= %{ibus_version}
|
BuildRequires: pkgconfig(ibus-1.0) >= %{ibus_version}
|
||||||
BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version}
|
BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version}
|
||||||
BuildRequires: pkgconfig(gjs-1.0) >= %{gjs_version}
|
BuildRequires: pkgconfig(gjs-1.0) >= %{gjs_version}
|
||||||
@ -51,7 +50,7 @@ Requires: xdg-user-dirs-gtk
|
|||||||
Requires: libgnomekbd gnome-control-center switcheroo-control
|
Requires: libgnomekbd gnome-control-center switcheroo-control
|
||||||
Requires: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version}
|
Requires: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version}
|
||||||
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
|
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
|
||||||
Requires: gcr%{?_isa}
|
Requires: gcr4%{?_isa}
|
||||||
Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
|
Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
|
||||||
Requires: gjs%{?_isa} >= %{gjs_version}
|
Requires: gjs%{?_isa} >= %{gjs_version}
|
||||||
Requires: gtk3%{?_isa} >= %{gtk3_version}
|
Requires: gtk3%{?_isa} >= %{gtk3_version}
|
||||||
@ -192,6 +191,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
|
|||||||
%{_mandir}/man1/gnome-shell.1*
|
%{_mandir}/man1/gnome-shell.1*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 2 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-2
|
||||||
|
- Delete adaptor_gcr-3.patch and using default gcr4 to build this package.
|
||||||
|
|
||||||
* Mon Jan 2 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-1
|
* Mon Jan 2 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 43.2-1
|
||||||
- Upgrade to 43.2
|
- Upgrade to 43.2
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user