$ git diff --patch-with-stat --summary 894fd86df47d0b3e01da1dccb4848c18d9b03633..f8e8cca56bf6b1d661f9f085a86323572212209a
.abf.yml | 2 +-
2078.patch | 81 --------------------------------------------------------
2487.patch | 36 -------------------------
2495.patch | 67 ----------------------------------------------
gnome-shell.spec | 36 +++++++++++--------------
5 files changed, 17 insertions(+), 205 deletions(-)
delete mode 100644 2078.patch
delete mode 100644 2487.patch
delete mode 100644 2495.patch
diff --git a/.abf.yml b/.abf.yml
index d9017c5..27d5774 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- gnome-shell-43.0.tar.xz: ec9518de2c8188b03966c1944f9234ee84609f62
+ gnome-shell-45.0.tar.xz: 0b812b2337996faf81cc5ea065cca5e45fb48fc1
diff --git a/2078.patch b/2078.patch
deleted file mode 100644
index 6a476f5..0000000
--- a/2078.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 23 Dec 2021 17:18:16 +0100
-Subject: [PATCH] build: Drop incorrect positional arg
-
-Unlike other targets that take a name, i18n.merge_file() does not.
-
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078>
----
- data/meson.build | 2 +-
- src/calendar-server/meson.build | 2 +-
- subprojects/extensions-app/data/meson.build | 2 +-
- subprojects/extensions-app/data/metainfo/meson.build | 2 +-
- subprojects/extensions-tool/src/templates/meson.build | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index f924fdf806..76ae45c93a 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir)
- desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false')
-
- foreach desktop_file : desktop_files
-- i18n.merge_file('desktop',
-+ i18n.merge_file(
- input: configure_file(
- input: desktop_file + '.in.in',
- output: desktop_file + '.in',
-diff --git a/src/calendar-server/meson.build b/src/calendar-server/meson.build
-index 7363282a59..8b4ef411c8 100644
---- a/src/calendar-server/meson.build
-+++ b/src/calendar-server/meson.build
-@@ -27,7 +27,7 @@ configure_file(
- install_dir: servicedir
- )
-
--i18n.merge_file('evolution-calendar.desktop',
-+i18n.merge_file(
- input: 'evolution-calendar.desktop.in',
- output: 'evolution-calendar.desktop',
- po_dir: po_dir,
-diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
-index d7e7d4001c..4b601e8bd1 100644
---- a/subprojects/extensions-app/data/meson.build
-+++ b/subprojects/extensions-app/data/meson.build
-@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir)
- desktopconf.set('app_id', app_id)
- desktopconf.set('prgname', prgname)
-
--i18n.merge_file('desktop',
-+i18n.merge_file(
- input: configure_file(
- input: base_id + '.desktop.in.in',
- output: desktop_file + '.in',
-diff --git a/subprojects/extensions-app/data/metainfo/meson.build b/subprojects/extensions-app/data/metainfo/meson.build
-index c4962c0576..a19bfa80a4 100644
---- a/subprojects/extensions-app/data/metainfo/meson.build
-+++ b/subprojects/extensions-app/data/metainfo/meson.build
-@@ -1,5 +1,5 @@
- metainfo = app_id + '.metainfo.xml'
--i18n.merge_file(metainfo,
-+i18n.merge_file(
- input: base_id + '.metainfo.xml.in',
- output: metainfo,
- po_dir: po_dir,
-diff --git a/subprojects/extensions-tool/src/templates/meson.build b/subprojects/extensions-tool/src/templates/meson.build
-index 670e2bf448..d693bfaddb 100644
---- a/subprojects/extensions-tool/src/templates/meson.build
-+++ b/subprojects/extensions-tool/src/templates/meson.build
-@@ -4,7 +4,7 @@ template_metas = [
- ]
- template_deps = []
- foreach template : template_metas
-- template_deps += i18n.merge_file(template,
-+ template_deps += i18n.merge_file(
- input: template + '.in',
- output: template,
- po_dir: po_dir,
---
-GitLab
diff --git a/2487.patch b/2487.patch
deleted file mode 100644
index 0f8a710..0000000
--- a/2487.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 13c9fd2a668e137b9e2569dcdedb0a25b95ae9aa Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Wed, 14 Sep 2022 20:20:14 +0200
-Subject: [PATCH] status: Use fixed sorting of input sources on empty MRU
-
-When updating the MRU sources if there was no prior MRU, we want
-to go with the unmodified list of sources in visibility order.
-
-However iterating over object properties happens in an undetermined
-order, so the initial MRU list ends up picking a value at random.
-
-In order to prefer the sources list in the same order than they
-appear in the menu if there was no prior MRU, order the keys
-when accessing it and building the initial list of sources.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5873
-Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2487>
----
- js/ui/status/keyboard.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
-index 76a42f6bd7..65b3962731 100644
---- a/js/ui/status/keyboard.js
-+++ b/js/ui/status/keyboard.js
-@@ -492,7 +492,7 @@ var InputSourceManager = class extends Signals.EventEmitter {
-
- _updateMruSources() {
- let sourcesList = [];
-- for (let i in this._inputSources)
-+ for (let i of Object.keys(this._inputSources).sort((a, b) => a - b))
- sourcesList.push(this._inputSources[i]);
-
- this._keyboardManager.setUserLayouts(sourcesList.map(x => x.xkbId));
---
-GitLab
diff --git a/2495.patch b/2495.patch
deleted file mode 100644
index 34978a3..0000000
--- a/2495.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 79a45d691fb03279f501b33bfbefd933e94ec12d Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Mon, 19 Sep 2022 22:35:15 +0200
-Subject: [PATCH] status: Ignore prior single-element lists updating input
- sources MRU
-
-Consider the existing input sources MRU only valid if it contained
-more than one element to pick from. Fixes the following situation
-with initial-setup sessions:
-
-- Initial setup Session starts, with several input sources already
- configured ("us" between them)
-- InputSourceManager initializes, only the default "us" keymap is
- available
-- MRU list is constructed, "us" is picked
-- InputSourceManager catches up with session configuration, the
- other extra sources are added
-- MRU list is reconstructed, "us" is already the most recent
-- Session ends up with "us" picked, regardless of its position in
- the list, and no MRU existing prior to startup
-
-If we consider the intermediate single-element MRU list invalid,
-it is still possible to pick the best default source between all
-the configured ones (the one that was put first in the list,
-basically), after initialization is complete.
-
-But also, it is unnecessary to have if there is a single source to
-pick from. After the sources list has two elements of more, the
-MRU list will become effective and preserved during changes to
-the available sources.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5873
----
- js/ui/status/keyboard.js | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
-index 65b3962731..82706c0389 100644
---- a/js/ui/status/keyboard.js
-+++ b/js/ui/status/keyboard.js
-@@ -524,15 +524,18 @@ var InputSourceManager = class extends Signals.EventEmitter {
- }
-
- let mruSources = [];
-- for (let i = 0; i < this._mruSources.length; i++) {
-- for (let j = 0; j < sourcesList.length; j++) {
-- if (this._mruSources[i].type == sourcesList[j].type &&
-- this._mruSources[i].id == sourcesList[j].id) {
-- mruSources = mruSources.concat(sourcesList.splice(j, 1));
-- break;
-+ if (this._mruSources.length > 1) {
-+ for (let i = 0; i < this._mruSources.length; i++) {
-+ for (let j = 0; j < sourcesList.length; j++) {
-+ if (this._mruSources[i].type === sourcesList[j].type &&
-+ this._mruSources[i].id === sourcesList[j].id) {
-+ mruSources = mruSources.concat(sourcesList.splice(j, 1));
-+ break;
-+ }
- }
- }
- }
-+
- this._mruSources = mruSources.concat(sourcesList);
- }
-
---
-GitLab
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 08d5ba7..b05d8e9 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -1,7 +1,7 @@
%define _disable_rebuild_configure 1
%define url_ver %(echo %{version}|cut -d. -f1,2)
# To make GNOME Shell extensions load, we need to get rid of DT_RUNPATH on /usr/bin/gnome-shell
-# (see glibc bug #13945, GNOME bug #670477, Mageia bug #4523)
+# (see glibc bug #13945, GNOME bug #670477)
%define _disable_ld_enable_new_dtags 1
#define debug_package %{nil}
@@ -9,12 +9,12 @@
Summary: Next generation GNOME desktop shell
Name: gnome-shell
-Version: 43.0
+Version: 45.0
Release: 2
License: GPLv2+ and LGPLv2+
Group: Graphical desktop/GNOME
-Url: http://live.gnome.org/GnomeShell
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/%{url_ver}/%{name}-%{version}.tar.xz
+Url: https://live.gnome.org/GnomeShell
+Source0: https://ftp.gnome.org/pub/GNOME/sources/gnome-shell/%{url_ver}/%{name}-%{version}.tar.xz
# Mandriva patches
# Looks like it is still requires because soup3 is still pulled even when we compile g-s with soup2.
@@ -26,11 +26,6 @@ Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell/%{url_ver}/%{name}-%
Patch1: gnome-shell-favourite-apps-firefox.patch
# Backported from upstream
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2487
-Patch10: 2487.patch
-# Backported from upstream
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2495
-Patch11: 2495.patch
BuildRequires: a2x
BuildRequires: gtk-doc
@@ -52,7 +47,7 @@ BuildRequires: pkgconfig(gio-unix-2.0) >= 2.31.6
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(gnome-autoar-0)
BuildRequires: pkgconfig(gnome-bluetooth-3.0)
-BuildRequires: pkgconfig(gnome-desktop-3.0)
+BuildRequires: pkgconfig(gnome-desktop-4)
BuildRequires: pkgconfig(gnome-keyring-1)
# NOT READY YET
#BuildRequires: pkgconfig(gnome-keybindings)
@@ -68,8 +63,8 @@ BuildRequires: pkgconfig(libcanberra)
BuildRequires: pkgconfig(libecal-2.0)
BuildRequires: pkgconfig(libedataserver-1.2) >= 1.2.0
BuildRequires: pkgconfig(libgnome-menu-3.0) >= 3.6.0
-BuildRequires: pkgconfig(libmutter-11)
-BuildRequires: pkgconfig(mutter-clutter-11)
+BuildRequires: pkgconfig(libmutter-13)
+BuildRequires: pkgconfig(mutter-clutter-13)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libpulse-mainloop-glib)
@@ -106,7 +101,8 @@ Requires: gsettings-desktop-schemas
Requires: packagekit-gtk3-module
Requires: telepathy-mission-control
Requires: gnome-control-center
-Requires: libgnomekbd-common
+Requires: tecla
+#Requires: libgnomekbd-common
# Optional
Recommends: chrome-gnome-shell
Recommends: gnome-tweaks
@@ -160,6 +156,7 @@ Requires: typelib(Json)
#Requires: typelib(Meta)
Requires: typelib(NM)
Requires: typelib(NMA)
+Requires: typelib(NMA4)
Requires: typelib(Pango)
Requires: typelib(PangoCairo)
Requires: typelib(Polkit)
@@ -203,8 +200,7 @@ This package contains the documentation for %{name}.
%build
%meson \
- -Dgtk_doc=true \
- -Dsoup2=false
+ -Dgtk_doc=false
%meson_build
%install
@@ -219,15 +215,15 @@ This package contains the documentation for %{name}.
%doc README.md NEWS HACKING.md
%{_bindir}/*
#{_bindir}/gnome-extensions-app
-%{_sysconfdir}/xdg/autostart/gnome-shell-overrides-migration.desktop
+#{_sysconfdir}/xdg/autostart/gnome-shell-overrides-migration.desktop
%{_libdir}/%{name}
%{_libexecdir}/gnome-shell-calendar-server
%{_libexecdir}/gnome-shell-hotplug-sniffer
%{_libexecdir}/gnome-shell-perf-helper
%{_libexecdir}/gnome-shell-portal-helper
-%{_libexecdir}/gnome-shell-overrides-migration.sh
+#{_libexecdir}/gnome-shell-overrides-migration.sh
%{_datadir}/applications/org.gnome.Shell.desktop
-%{_datadir}/applications/evolution-calendar.desktop
+#{_datadir}/applications/evolution-calendar.desktop
%{_datadir}/applications/org.gnome.Extensions.desktop
#{_datadir}/applications/gnome-shell-wayland.desktop
%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop
@@ -271,5 +267,5 @@ This package contains the documentation for %{name}.
%{_datadir}/metainfo/org.gnome.Extensions.metainfo.xml
%files docs
-%{_datadir}/gtk-doc/html/shell
-%{_datadir}/gtk-doc/html/st
+#{_datadir}/gtk-doc/html/shell
+#{_datadir}/gtk-doc/html/st