Accepting request 963598 from GNOME:Factory

GNOME 42 - ready for impact

OBS-URL: https://build.opensuse.org/request/show/963598
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell-extensions?expand=0&rev=122
This commit is contained in:
Dominique Leuenberger 2022-03-23 19:16:26 +00:00 committed by Git OBS Bridge
commit 8c668c6b2f
7 changed files with 101 additions and 65 deletions

View File

@ -1,10 +0,0 @@
diff -Nur orig-gnome-shell-extensions-41.1/data/meson.build gnome-shell-extensions-41.1/data/meson.build
--- orig-gnome-shell-extensions-41.1/data/meson.build 2022-02-08 19:00:20.879140911 +0100
+++ gnome-shell-extensions-41.1/data/meson.build 2022-02-08 19:01:41.716276754 +0100
@@ -1,5 +1,5 @@
session_desktop = 'gnome-classic.desktop'
-i18n.merge_file('',
+i18n.merge_file(
input: session_desktop + '.in',
output: session_desktop,
po_dir: '../po',

View File

@ -1,7 +1,7 @@
Index: gnome-shell-extensions-3.34.2/extensions/apps-menu/extension.js
Index: gnome-shell-extensions-42.rc/extensions/apps-menu/extension.js
===================================================================
--- gnome-shell-extensions-3.34.2.orig/extensions/apps-menu/extension.js
+++ gnome-shell-extensions-3.34.2/extensions/apps-menu/extension.js
--- gnome-shell-extensions-42.rc.orig/extensions/apps-menu/extension.js
+++ gnome-shell-extensions-42.rc/extensions/apps-menu/extension.js
@@ -5,6 +5,8 @@ const {
Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St,
} = imports.gi;
@ -11,7 +11,7 @@ Index: gnome-shell-extensions-3.34.2/extensions/apps-menu/extension.js
const DND = imports.ui.dnd;
const ExtensionUtils = imports.misc.extensionUtils;
@@ -46,8 +48,19 @@ class ApplicationMenuItem extends PopupM
@@ -48,8 +50,19 @@ class ApplicationMenuItem extends PopupM
let textureCache = St.TextureCache.get_default();
let iconThemeChangedId = textureCache.connect('icon-theme-changed',
this._updateIcon.bind(this));
@ -31,7 +31,7 @@ Index: gnome-shell-extensions-3.34.2/extensions/apps-menu/extension.js
});
this._updateIcon();
@@ -62,6 +75,107 @@ class ApplicationMenuItem extends PopupM
@@ -64,6 +77,107 @@ class ApplicationMenuItem extends PopupM
};
}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ad9ba82f4cbd04726973b5e87afad18afdaa323860a0af3e7240f3a74d222f19
size 222528

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3ee65b75b1afd8bcca0a2a03da9b2884787ed40e257a881d9aa6ef7c8727602f
size 226240

View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Sun Mar 13 09:22:03 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 42.0:
+ Updated translations.
-------------------------------------------------------------------
Mon Mar 7 18:34:04 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 42.rc:
+ Misc. bug fixes and cleanups.
+ Updated translations.
- Rebase patches with quilt.
- Disable gse-sle-classic-ext.patch: Fails to apply. This means
disabling sle classic desktop variant too.
-------------------------------------------------------------------
Tue Feb 15 22:33:44 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 42.beta:
+ workspace-indicator: Fix cancelling editing with Esc
+ window-list: Update window tracking to avoid missing icons
+ Use libadwaita for preferences
+ Adapt to Clutter grab API changes
+ Misc. bug fixes and cleanups.
- Drop cdaa837d48894737ca0b4e7d2dfb365119e53759.patch: Fixed
upstream.
- Rebase patches with quilt.
-------------------------------------------------------------------
Tue Feb 15 21:22:23 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Rebase cdaa837d48894737ca0b4e7d2dfb365119e53759.patch: Use
upstream commit.
-------------------------------------------------------------------
Tue Feb 15 20:22:07 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
@ -11,6 +46,13 @@ Thu Feb 3 05:51:27 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
- Add cdaa837d48894737ca0b4e7d2dfb365119e53759.patch: Fix build
with meson 0.61 and newer. Backported to apply on stable version.
-------------------------------------------------------------------
Wed Jan 12 10:29:32 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 42.alpha:
+ Misc. bug fixes and cleanups.
+ Updated translations.
-------------------------------------------------------------------
Mon Dec 13 16:10:45 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -19,25 +19,24 @@
%global __requires_exclude typelib\\(Meta\\)
Name: gnome-shell-extensions
Version: 41.2
Version: 42.0
Release: 0
Summary: A collection of extensions for GNOME Shell
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: https://wiki.gnome.org/Projects/GnomeShell/Extensions
Source0: https://download.gnome.org/sources/gnome-shell-extensions/41/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-shell-extensions/42/%{name}-%{version}.tar.xz
Source1: README.SUSE
Source2: sle-classic.desktop
Source5: sle-classic.json
Source6: sle-classic@suse.com.tar.gz
Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override
# PATCH-FIX-UPSTREAM cdaa837d48894737ca0b4e7d2dfb365119e53759.patch -- Fix build with meson 0.61 and newer
Patch0: cdaa837d48894737ca0b4e7d2dfb365119e53759.patch
# PATCH-FEATURE-OPENSUSE gnome-shell-add-app-to-desktop.patch bnc#870580 dliang@suse.com -- allow adding app shortcut to desktop easily.
Patch1: gnome-shell-add-app-to-desktop.patch
## NOTE keep SLE Classic patch at the bottom
# PATCH-FIX-SLE gse-sle-classic-ext.patch Fate#318572 cxiong@suse.com -- add sle classic support
# PATCH-NEEDS-REBASE gse-sle-classic-ext.patch Fate#318572 cxiong@suse.com -- add sle classic support Was:PATCH-FIX-SLE
Patch1000: gse-sle-classic-ext.patch
BuildRequires: fdupes
# Needed for directory ownership
@ -102,10 +101,11 @@ to pick system installed themes or even themes installed in the user's home.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch1000 -p1
# Patch needs rebase
#%%patch1000 -p1
# In openSUSE GNOME, we don't launch gnome-session directly, but wrap this through a shell script, /usr/bin/gnome
sed -i "s:Exec=gnome-session:Exec=gnome:g" data/gnome-classic.desktop.in
cp %{SOURCE1} .
@ -125,14 +125,14 @@ sed -i -e 's/openSUSE/SUSE Linux Enterprise/g' README.SUSE
%find_lang %{name} %{?no_lang_C}
#Install SLE theme
#Install sle-classic@suse.com extension
install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/xsessions/sle-classic.desktop
cp %{_builddir}/%{name}-%{version}/extensions/window-list/sle-classic.css \
%{buildroot}/%{_datadir}/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/sle-classic.css
install -m0644 %{SOURCE5} %{buildroot}/%{_datadir}/gnome-shell/modes/sle-classic.json
tar -xzvf %{SOURCE6}
install -d %{buildroot}/%{_datadir}/gnome-shell/extensions/sle-classic@suse.com
cp sle-classic@suse.com/* %{buildroot}/%{_datadir}/gnome-shell/extensions/sle-classic@suse.com
install -m0644 %{SOURCE7} %{buildroot}/%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.sle-classic.gschema.override
#install -m0644 %{SOURCE2} %{buildroot}/%{_datadir}/xsessions/sle-classic.desktop
#cp %{_builddir}/%{name}-%{version}/extensions/window-list/sle-classic.css \
#%{buildroot}/%{_datadir}/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/sle-classic.css
#install -m0644 %{SOURCE5} %{buildroot}/%{_datadir}/gnome-shell/modes/sle-classic.json
#tar -xzvf %{SOURCE6}
#install -d %{buildroot}/%{_datadir}/gnome-shell/extensions/sle-classic@suse.com
#cp sle-classic@suse.com/* %{buildroot}/%{_datadir}/gnome-shell/extensions/sle-classic@suse.com
#install -m0644 %{SOURCE7} %{buildroot}/%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.sle-classic.gschema.override
%fdupes %{buildroot}%{_datadir}
%if 0%{?sle_version}
@ -163,7 +163,7 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.classic.gschema.override
%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.apps-menu.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.window-list.gschema.xml
%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.sle-classic.gschema.override
#%%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.sle-classic.gschema.override
%dir %{_datadir}/gnome-shell/extensions
%{_datadir}/gnome-shell/extensions/apps-menu@gnome-shell-extensions.gcampax.github.com/
%{_datadir}/gnome-shell/extensions/launch-new-instance@gnome-shell-extensions.gcampax.github.com/
@ -179,13 +179,17 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
%{_datadir}/gnome-shell/theme/classic-toggle-off-us.svg
%{_datadir}/gnome-shell/theme/classic-toggle-on-intl.svg
%{_datadir}/gnome-shell/theme/classic-toggle-on-us.svg
%{_datadir}/gnome-shell/theme/gnome-classic.css
%{_datadir}/gnome-shell/theme/gnome-classic-high-contrast.css
%{_datadir}/gnome-shell/theme/gnome-classic.css
%dir %{_datadir}/wayland-sessions
%{_datadir}/wayland-sessions/gnome-classic-wayland.desktop
%{_datadir}/wayland-sessions/gnome-classic.desktop
%{_datadir}/xsessions/gnome-classic-xorg.desktop
%{_datadir}/xsessions/gnome-classic.desktop
%{_datadir}/xsessions/sle-classic.desktop
%{_datadir}/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/sle-classic.css
%{_datadir}/gnome-shell/modes/sle-classic.json
%{_datadir}/gnome-shell/extensions/sle-classic@suse.com/
#%%{_datadir}/xsessions/sle-classic.desktop
#%{_datadir}/gnome-shell/extensions/window-list@gnome-shell-extensions.gcampax.github.com/sle-classic.css
#%{_datadir}/gnome-shell/modes/sle-classic.json
#%{_datadir}/gnome-shell/extensions/sle-classic@suse.com/
%if 0%{?sle_version}
%dir %{_datadir}/wayland-sessions
%{_datadir}/xsessions/default.desktop

View File

@ -1,7 +1,7 @@
Index: gnome-shell-extensions-41.2/extensions/window-list/extension.js
Index: gnome-shell-extensions-42.beta/extensions/window-list/extension.js
===================================================================
--- gnome-shell-extensions-41.2.orig/extensions/window-list/extension.js
+++ gnome-shell-extensions-41.2/extensions/window-list/extension.js
--- gnome-shell-extensions-42.beta.orig/extensions/window-list/extension.js
+++ gnome-shell-extensions-42.beta/extensions/window-list/extension.js
@@ -177,6 +177,9 @@ class WindowTitle extends St.BoxLayout {
}
});
@ -164,10 +164,10 @@ Index: gnome-shell-extensions-41.2/extensions/window-list/extension.js
Main.overview.hide = this._hideOverviewOrig;
}
Index: gnome-shell-extensions-41.2/extensions/window-list/sle-classic.css
Index: gnome-shell-extensions-42.beta/extensions/window-list/sle-classic.css
===================================================================
--- /dev/null
+++ gnome-shell-extensions-41.2/extensions/window-list/sle-classic.css
+++ gnome-shell-extensions-42.beta/extensions/window-list/sle-classic.css
@@ -0,0 +1,46 @@
+@import url("stylesheet.css");
+
@ -215,10 +215,10 @@ Index: gnome-shell-extensions-41.2/extensions/window-list/sle-classic.css
+ color: #888;
+ box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5);
+ }
Index: gnome-shell-extensions-41.2/extensions/places-menu/extension.js
Index: gnome-shell-extensions-42.beta/extensions/places-menu/extension.js
===================================================================
--- gnome-shell-extensions-41.2.orig/extensions/places-menu/extension.js
+++ gnome-shell-extensions-41.2/extensions/places-menu/extension.js
--- gnome-shell-extensions-42.beta.orig/extensions/places-menu/extension.js
+++ gnome-shell-extensions-42.beta/extensions/places-menu/extension.js
@@ -139,6 +139,10 @@ function init() {
let _indicator;
@ -242,10 +242,10 @@ Index: gnome-shell-extensions-41.2/extensions/places-menu/extension.js
}
/** */
Index: gnome-shell-extensions-41.2/extensions/apps-menu/extension.js
Index: gnome-shell-extensions-42.beta/extensions/apps-menu/extension.js
===================================================================
--- gnome-shell-extensions-41.2.orig/extensions/apps-menu/extension.js
+++ gnome-shell-extensions-41.2/extensions/apps-menu/extension.js
--- gnome-shell-extensions-42.beta.orig/extensions/apps-menu/extension.js
+++ gnome-shell-extensions-42.beta/extensions/apps-menu/extension.js
@@ -26,6 +26,10 @@ const NAVIGATION_REGION_OVERSHOOT = 50;
Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish');
@ -257,7 +257,7 @@ Index: gnome-shell-extensions-41.2/extensions/apps-menu/extension.js
var ApplicationMenuItem = GObject.registerClass(
class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
_init(button, app) {
@@ -699,8 +703,6 @@ class ApplicationsButton extends PanelMe
@@ -703,8 +707,6 @@ class ApplicationsButton extends PanelMe
this.applicationsByCategory = {};
this._tree.load_sync();
let root = this._tree.get_root_directory();
@ -266,7 +266,7 @@ Index: gnome-shell-extensions-41.2/extensions/apps-menu/extension.js
let iter = root.iter();
let nextType;
while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) {
@@ -715,11 +717,15 @@ class ApplicationsButton extends PanelMe
@@ -719,11 +721,15 @@ class ApplicationsButton extends PanelMe
this.applicationsByCategory[categoryId] = [];
this._loadCategory(categoryId, dir);
if (this.applicationsByCategory[categoryId].length > 0) {
@ -284,7 +284,7 @@ Index: gnome-shell-extensions-41.2/extensions/apps-menu/extension.js
// Load applications
this._displayButtons(this._listApplications(null));
@@ -783,7 +789,10 @@ let appsMenuButton;
@@ -787,7 +793,10 @@ let appsMenuButton;
function enable() {
appsMenuButton = new ApplicationsButton();
let index = Main.sessionMode.panel.left.indexOf('activities') + 1;
@ -296,11 +296,11 @@ Index: gnome-shell-extensions-41.2/extensions/apps-menu/extension.js
}
/** */
Index: gnome-shell-extensions-41.2/data/gnome-classic.css
Index: gnome-shell-extensions-42.beta/data/gnome-classic.css
===================================================================
--- gnome-shell-extensions-41.2.orig/data/gnome-classic.css
+++ gnome-shell-extensions-41.2/data/gnome-classic.css
@@ -2619,9 +2619,9 @@ StScrollBar {
--- gnome-shell-extensions-42.beta.orig/data/gnome-classic.css
+++ gnome-shell-extensions-42.beta/data/gnome-classic.css
@@ -2262,9 +2262,9 @@ StScrollBar {
#panel.solid .panel-corner:focus {
-panel-corner-radius: 0; }
#panel.lock-screen, #panel.unlock-screen, #panel.login-screen, #panel.solid.lock-screen, #panel.solid.unlock-screen, #panel.solid.login-screen {
@ -312,18 +312,18 @@ Index: gnome-shell-extensions-41.2/data/gnome-classic.css
+ background-gradient-end: none;
border-bottom: none; }
#panel.lock-screen .panel-button, #panel.unlock-screen .panel-button, #panel.login-screen .panel-button, #panel.solid.lock-screen .panel-button, #panel.solid.unlock-screen .panel-button, #panel.solid.login-screen .panel-button {
color: white; }
@@ -2649,3 +2649,6 @@ StScrollBar {
color: #eeeeec; }
@@ -2292,3 +2292,6 @@ StScrollBar {
.calendar-day-with-events {
background-image: url("calendar-today.svg"); }
+
+.popup-menu.panel-menu {
+ margin-bottom: 0em; }
Index: gnome-shell-extensions-41.2/extensions/workspace-indicator/extension.js
Index: gnome-shell-extensions-42.beta/extensions/workspace-indicator/extension.js
===================================================================
--- gnome-shell-extensions-41.2.orig/extensions/workspace-indicator/extension.js
+++ gnome-shell-extensions-41.2/extensions/workspace-indicator/extension.js
--- gnome-shell-extensions-42.beta.orig/extensions/workspace-indicator/extension.js
+++ gnome-shell-extensions-42.beta/extensions/workspace-indicator/extension.js
@@ -321,7 +321,8 @@ class WorkspaceIndicator extends PanelMe
_updateThumbnailVisibility() {
const { workspaceManager } = global;
@ -334,10 +334,10 @@ Index: gnome-shell-extensions-41.2/extensions/workspace-indicator/extension.js
vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
this.reactive = useMenu;
Index: gnome-shell-extensions-41.2/extensions/workspace-indicator/stylesheet.css
Index: gnome-shell-extensions-42.beta/extensions/workspace-indicator/stylesheet.css
===================================================================
--- gnome-shell-extensions-41.2.orig/extensions/workspace-indicator/stylesheet.css
+++ gnome-shell-extensions-41.2/extensions/workspace-indicator/stylesheet.css
--- gnome-shell-extensions-42.beta.orig/extensions/workspace-indicator/stylesheet.css
+++ gnome-shell-extensions-42.beta/extensions/workspace-indicator/stylesheet.css
@@ -1,5 +1,7 @@
.panel-workspace-indicator {
padding: 0 8px;