diff --git a/adaptor_gcr-3.patch b/adaptor_gcr-3.patch new file mode 100644 index 0000000000000000000000000000000000000000..2208328bdca1619a80d7d25ba9c4b9eab7affcae --- /dev/null +++ b/adaptor_gcr-3.patch @@ -0,0 +1,54 @@ +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) diff --git a/gnome-shell-42.2.tar.xz b/gnome-shell-42.2.tar.xz deleted file mode 100644 index d6475f55e742bba5f3a0f3cbc0dde6a60cff8b45..0000000000000000000000000000000000000000 Binary files a/gnome-shell-42.2.tar.xz and /dev/null differ diff --git a/gnome-shell-43.2.tar.xz b/gnome-shell-43.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..251004d78be59cdcf022392da5992b56affbcd79 Binary files /dev/null and b/gnome-shell-43.2.tar.xz differ diff --git a/gnome-shell.spec b/gnome-shell.spec index b5e82fe629b441800747eba6f79c53a25c3cfb3e..941d58d54d2b607116ed1fac2a171d6e0fd137fd 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,37 +1,39 @@ -%define eds_version 3.33.1 +%define eds_version 3.45.1 %define gnome_desktop_version 3.35.91 %define glib2_version 2.56.0 %define gobject_introspection_version 1.49.1 -%define gjs_version 1.71.1 +%define gjs_version 1.73.1 %define gtk3_version 3.15.0 %define gtk4_version 4.0.0 %define adwaita_version 1.0.0 -%define mutter_version 42.0 +%define mutter_version 43.2 %define polkit_version 0.100 -%define gsettings_desktop_schemas_version 42~beta +%define gsettings_desktop_schemas_version 42 %define ibus_version 1.5.2 -%define gnome_bluetooth_version 1:3.9.0 +%define gnome_bluetooth_version 1:42.3 %define gstreamer_version 1.4.5 %define pipewire_version 0.3.0 %define gnome_settings_daemon_version 3.37.1 Name: gnome-shell -Version: 42.2 -Release: 2 +Version: 43.2 +Release: 1 Summary: Core user interface functions for the GNOME 3 desktop Group: User Interface/Desktops License: GPLv2+ URL: https://wiki.gnome.org/Projects/GnomeShell -Source0: https://download.gnome.org/sources/gnome-shell/42/%{name}-%{version}.tar.xz -Patch10001: gnome-shell-favourite-apps-firefox.patch -Patch40001: 0001-gdm-Work-around-failing-fingerprint-auth.patch -Patch60003: 0001-main-Leak-the-GJS-context-and-ShellGlobal.patch +Source0: https://download.gnome.org/sources/gnome-shell/43/%{name}-%{version}.tar.xz +Patch10001: gnome-shell-favourite-apps-firefox.patch +Patch40001: 0001-gdm-Work-around-failing-fingerprint-auth.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: gtk-doc desktop-file-utils python3 librsvg2-devel chrpath +BuildRequires: gtk-doc desktop-file-utils python3 librsvg2-devel chrpath cmake BuildRequires: gettext >= 0.19.6 libXfixes-devel >= 5.0 -BuildRequires: pkgconfig(gcr-base-3) pkgconfig(gnome-autoar-0) pkgconfig(gnome-desktop-3.0) pkgconfig(libpulse) +BuildRequires: gcr-devel pkgconfig(gnome-autoar-0) pkgconfig(gnome-desktop-3.0) pkgconfig(libpulse) BuildRequires: pkgconfig(libnm) pkgconfig(libsystemd) pkgconfig(libstartup-notification-1.0) +BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(ibus-1.0) >= %{ibus_version} BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version} BuildRequires: pkgconfig(gjs-1.0) >= %{gjs_version} @@ -49,12 +51,14 @@ Requires: xdg-user-dirs-gtk Requires: libgnomekbd gnome-control-center switcheroo-control Requires: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version} Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version} +Requires: gcr%{?_isa} Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version} Requires: gjs%{?_isa} >= %{gjs_version} Requires: gtk3%{?_isa} >= %{gtk3_version} Requires: gtk4%{?_isa} >= %{gtk4_version} Requires: libadwaita%{_isa} >= %{adwaita_version} Requires: libnma%{?_isa} +Requires: highcontrast-icon-theme Requires: librsvg2%{?_isa} Requires: mutter%{?_isa} >= %{mutter_version} Requires: upower%{?_isa} @@ -72,7 +76,7 @@ Requires: accountsservice-libs%{?_isa} Requires: gdm-libs%{?_isa} Requires: python3%{_isa} Requires: geoclue2-libs%{?_isa} -Requires: libgweather%{?_isa} +Requires: libgweather%{?_isa} >= 4.2.0 Requires: bolt%{?_isa} Requires: xdg-desktop-portal-gtk >= 1.8.0 # Disabled on RHEL 7 to allow logging into KDE session by default @@ -96,13 +100,7 @@ management. The GNOME Shell is intended to replace functions handled by the GNOM and by the window manager in previous versions of GNOME. The GNOME Shell has rich visual effects enabled by new graphical technologies. -%package help -Summary: Help files for %{name} -BuildArch: noarch - -%description help -Help files for %{name} - +%package_help %prep %autosetup -n %{name}-%{version} -p1 @@ -190,10 +188,13 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null %config(noreplace) /etc/ld.so.conf.d/* %files help -%{_mandir}/man1/%{name}.1.gz -%{_mandir}/man1/gnome-extensions.1.gz +%{_mandir}/man1/gnome-extensions.1* +%{_mandir}/man1/gnome-shell.1* %changelog +* Mon Jan 2 2023 lin zhang - 43.2-1 +- Upgrade to 43.2 + * Wed Jul 06 2022 chenchen - 42.2-2 - change gnome-session-xsession and gnome-tour to "Recommends"