From ae3ae417fe629688a868a36a839c950889df4619ff2558b4e3c658436bb6f993 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Sep 2021 06:24:35 +0000 Subject: [PATCH] Accepting request 920948 from GNOME:Next Scripted push from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/920948 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=250 --- gnome-shell-extensions-40.4.tar.xz | 3 - gnome-shell-extensions-41.0.tar.xz | 3 + gnome-shell-extensions.changes | 24 ++++++++ gnome-shell-extensions.spec | 7 ++- gse-sle-classic-ext.patch | 88 +++++++++++++++--------------- 5 files changed, 75 insertions(+), 50 deletions(-) delete mode 100644 gnome-shell-extensions-40.4.tar.xz create mode 100644 gnome-shell-extensions-41.0.tar.xz diff --git a/gnome-shell-extensions-40.4.tar.xz b/gnome-shell-extensions-40.4.tar.xz deleted file mode 100644 index 4b8bd1f..0000000 --- a/gnome-shell-extensions-40.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f51d4c42c22bbbd0312ca718f47cf4569fc58a46ef400743ae4d1cc7d90acd79 -size 218088 diff --git a/gnome-shell-extensions-41.0.tar.xz b/gnome-shell-extensions-41.0.tar.xz new file mode 100644 index 0000000..d6c545e --- /dev/null +++ b/gnome-shell-extensions-41.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d84faac1448b38f975d9c19490c5928afc5c5a2c49dd7e7f81af690f9466fc68 +size 219664 diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index 20d46b4..00f5a81 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Sep 21 19:40:12 UTC 2021 - Michael Gorse + +- Update to version 41.0: + + No changes. + +------------------------------------------------------------------- +Tue Sep 21 07:11:06 UTC 2021 - Dominique Leuenberger + +- Update to version 41.rc.1: + + Fix pre-generating stylesheets in tarball. +- Changes from version 41.rc: + + window-list: Adapt to overview-on-startup. + + apps-menu: Use a custom 'toggle-menu' shortcut. + + Misc. bug fixes and cleanups. + ------------------------------------------------------------------- Mon Sep 20 19:51:16 UTC 2021 - Stanislav Brabec @@ -11,6 +27,14 @@ Thu Sep 2 02:27:21 UTC 2021 - xiaoguang wang gnome-shell-classic to fix the translations in SLE Classic and GNOME Classic(bsc#1190016 jsc#SLE-20311). +------------------------------------------------------------------- +Tue Aug 24 11:03:03 UTC 2021 - Dominique Leuenberger + +- Update to version 41.beta: + + window-list: Extend reactive area of minimap to screen edges. + + drive-menu: Improve detection of network mounts. + + Misc. bug fixes and cleanups. + ------------------------------------------------------------------- Thu Aug 19 08:13:48 UTC 2021 - Bjørn Lie diff --git a/gnome-shell-extensions.spec b/gnome-shell-extensions.spec index 6bcce27..31ce128 100644 --- a/gnome-shell-extensions.spec +++ b/gnome-shell-extensions.spec @@ -19,13 +19,13 @@ %global __requires_exclude typelib\\(Meta\\) Name: gnome-shell-extensions -Version: 40.4 +Version: 41.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/40/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-shell-extensions/41/%{name}-%{version}.tar.xz Source1: README.SUSE Source2: sle-classic.desktop Source5: sle-classic.json @@ -42,7 +42,7 @@ BuildRequires: fdupes BuildRequires: gnome-shell # gobject-introspection is needed for the typelib() rpm magic. BuildRequires: gobject-introspection -BuildRequires: meson >= 0.44.0 +BuildRequires: meson >= 0.53.0 BuildRequires: sassc %description @@ -158,6 +158,7 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %files -n gnome-shell-classic %{_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 %dir %{_datadir}/gnome-shell/extensions diff --git a/gse-sle-classic-ext.patch b/gse-sle-classic-ext.patch index 0b5e3b1..5a8b3e5 100644 --- a/gse-sle-classic-ext.patch +++ b/gse-sle-classic-ext.patch @@ -1,18 +1,18 @@ -Index: gnome-shell-extensions-40.3/extensions/window-list/extension.js +Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js =================================================================== ---- gnome-shell-extensions-40.3.orig/extensions/window-list/extension.js -+++ gnome-shell-extensions-40.3/extensions/window-list/extension.js -@@ -23,6 +23,9 @@ const GroupingMode = { - ALWAYS: 2, - }; +--- gnome-shell-extensions-41.beta.orig/extensions/window-list/extension.js ++++ gnome-shell-extensions-41.beta/extensions/window-list/extension.js +@@ -177,6 +177,9 @@ class WindowTitle extends St.BoxLayout { + } + }); +function isSLEClassicMode() { + return Main.sessionMode.currentMode == "sle-classic" ? true : false; +} - function _minimizeOrActivateWindow(window) { - let focusWindow = global.display.focus_window; -@@ -687,11 +690,13 @@ class WindowList extends St.Widget { + const BaseButton = GObject.registerClass({ + GTypeFlags: GObject.TypeFlags.ABSTRACT, +@@ -691,11 +694,13 @@ class WindowList extends St.Widget { let box = new St.BoxLayout({ x_expand: true, y_expand: true }); this.add_actor(box); @@ -30,7 +30,7 @@ Index: gnome-shell-extensions-40.3/extensions/window-list/extension.js let layout = new Clutter.BoxLayout({ homogeneous: true }); this._windowList = new St.Widget({ -@@ -832,7 +837,8 @@ class WindowList extends St.Widget { +@@ -836,7 +841,8 @@ class WindowList extends St.Widget { let workspacesOnMonitor = this._monitor === Main.layoutManager.primaryMonitor || !this._mutterSettings.get_boolean('workspaces-only-on-primary'); @@ -40,7 +40,7 @@ Index: gnome-shell-extensions-40.3/extensions/window-list/extension.js } _updateWindowListVisibility() { -@@ -868,6 +874,9 @@ class WindowList extends St.Widget { +@@ -872,6 +878,9 @@ class WindowList extends St.Widget { } _getMaxWindowListWidth() { @@ -50,7 +50,7 @@ Index: gnome-shell-extensions-40.3/extensions/window-list/extension.js let indicatorsBox = this._workspaceIndicator.get_parent(); return this.width - indicatorsBox.get_preferred_width(-1)[1]; } -@@ -1068,7 +1077,8 @@ class WindowList extends St.Widget { +@@ -1072,7 +1081,8 @@ class WindowList extends St.Widget { this._mutterSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId); this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId); @@ -60,7 +60,7 @@ Index: gnome-shell-extensions-40.3/extensions/window-list/extension.js Main.ctrlAltTabManager.removeGroup(this); -@@ -1109,6 +1119,7 @@ class Extension { +@@ -1113,6 +1123,7 @@ class Extension { this._windowLists = null; this._hideOverviewOrig = Main.overview.hide; @@ -68,7 +68,7 @@ Index: gnome-shell-extensions-40.3/extensions/window-list/extension.js } enable() { -@@ -1128,19 +1139,47 @@ class Extension { +@@ -1132,19 +1143,47 @@ class Extension { this._hideOverviewOrig.call(Main.overview); }; @@ -120,7 +120,7 @@ Index: gnome-shell-extensions-40.3/extensions/window-list/extension.js } disable() { -@@ -1154,6 +1193,11 @@ class Extension { +@@ -1158,6 +1197,11 @@ class Extension { this._monitorsChangedId = 0; this._windowLists.forEach(windowList => { @@ -132,7 +132,7 @@ Index: gnome-shell-extensions-40.3/extensions/window-list/extension.js windowList.hide(); windowList.destroy(); }); -@@ -1162,6 +1206,11 @@ class Extension { +@@ -1166,6 +1210,11 @@ class Extension { Main.windowPicker.destroy(); delete Main.windowPicker; @@ -144,10 +144,10 @@ Index: gnome-shell-extensions-40.3/extensions/window-list/extension.js Main.overview.hide = this._hideOverviewOrig; } -Index: gnome-shell-extensions-40.3/extensions/window-list/sle-classic.css +Index: gnome-shell-extensions-41.beta/extensions/window-list/sle-classic.css =================================================================== --- /dev/null -+++ gnome-shell-extensions-40.3/extensions/window-list/sle-classic.css ++++ gnome-shell-extensions-41.beta/extensions/window-list/sle-classic.css @@ -0,0 +1,46 @@ +@import url("stylesheet.css"); + @@ -195,11 +195,11 @@ Index: gnome-shell-extensions-40.3/extensions/window-list/sle-classic.css + color: #888; + box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5); + } -Index: gnome-shell-extensions-40.3/extensions/places-menu/extension.js +Index: gnome-shell-extensions-41.beta/extensions/places-menu/extension.js =================================================================== ---- gnome-shell-extensions-40.3.orig/extensions/places-menu/extension.js -+++ gnome-shell-extensions-40.3/extensions/places-menu/extension.js -@@ -139,13 +139,21 @@ function init() { +--- gnome-shell-extensions-41.beta.orig/extensions/places-menu/extension.js ++++ gnome-shell-extensions-41.beta/extensions/places-menu/extension.js +@@ -139,6 +139,10 @@ function init() { let _indicator; @@ -207,26 +207,26 @@ Index: gnome-shell-extensions-40.3/extensions/places-menu/extension.js + return Main.sessionMode.currentMode == "sle-classic" ? true : false; +} + + /** */ function enable() { _indicator = new PlacesMenu(); - +@@ -146,7 +150,10 @@ function enable() { let pos = Main.sessionMode.panel.left.indexOf('appMenu'); if ('apps-menu' in Main.panel.statusArea) pos++; - Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left'); -+ + if (isSLEClassicMode()) + Main.panel.addToStatusArea('places-menu', _indicator, 1, 'left'); + else + Main.panel.addToStatusArea('places-menu', _indicator, pos, 'left'); } - function disable() { -Index: gnome-shell-extensions-40.3/extensions/apps-menu/extension.js + /** */ +Index: gnome-shell-extensions-41.beta/extensions/apps-menu/extension.js =================================================================== ---- gnome-shell-extensions-40.3.orig/extensions/apps-menu/extension.js -+++ gnome-shell-extensions-40.3/extensions/apps-menu/extension.js -@@ -27,6 +27,10 @@ const NAVIGATION_REGION_OVERSHOOT = 50; +--- gnome-shell-extensions-41.beta.orig/extensions/apps-menu/extension.js ++++ gnome-shell-extensions-41.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'); @@ -237,7 +237,7 @@ Index: gnome-shell-extensions-40.3/extensions/apps-menu/extension.js var ApplicationMenuItem = GObject.registerClass( class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem { _init(button, app) { -@@ -707,8 +711,6 @@ class ApplicationsButton extends PanelMe +@@ -706,8 +710,6 @@ class ApplicationsButton extends PanelMe this.applicationsByCategory = {}; this._tree.load_sync(); let root = this._tree.get_root_directory(); @@ -246,7 +246,7 @@ Index: gnome-shell-extensions-40.3/extensions/apps-menu/extension.js let iter = root.iter(); let nextType; while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) { -@@ -723,11 +725,15 @@ class ApplicationsButton extends PanelMe +@@ -722,11 +724,15 @@ class ApplicationsButton extends PanelMe this.applicationsByCategory[categoryId] = []; this._loadCategory(categoryId, dir); if (this.applicationsByCategory[categoryId].length > 0) { @@ -275,12 +275,12 @@ Index: gnome-shell-extensions-40.3/extensions/apps-menu/extension.js + Main.panel.addToStatusArea('apps-menu', appsMenuButton, index, 'left'); } - function disable() { -Index: gnome-shell-extensions-40.3/data/gnome-classic.css + /** */ +Index: gnome-shell-extensions-41.beta/data/gnome-classic.css =================================================================== ---- gnome-shell-extensions-40.3.orig/data/gnome-classic.css -+++ gnome-shell-extensions-40.3/data/gnome-classic.css -@@ -2259,9 +2259,9 @@ StScrollBar { +--- gnome-shell-extensions-41.beta.orig/data/gnome-classic.css ++++ gnome-shell-extensions-41.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 { @@ -293,18 +293,18 @@ Index: gnome-shell-extensions-40.3/data/gnome-classic.css 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: #eeeeec; } -@@ -2288,3 +2288,6 @@ StScrollBar { +@@ -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-40.3/extensions/workspace-indicator/extension.js +Index: gnome-shell-extensions-41.beta/extensions/workspace-indicator/extension.js =================================================================== ---- gnome-shell-extensions-40.3.orig/extensions/workspace-indicator/extension.js -+++ gnome-shell-extensions-40.3/extensions/workspace-indicator/extension.js -@@ -322,7 +322,8 @@ class WorkspaceIndicator extends PanelMe +--- gnome-shell-extensions-41.beta.orig/extensions/workspace-indicator/extension.js ++++ gnome-shell-extensions-41.beta/extensions/workspace-indicator/extension.js +@@ -321,7 +321,8 @@ class WorkspaceIndicator extends PanelMe _updateThumbnailVisibility() { const { workspaceManager } = global; const vertical = workspaceManager.layout_rows === -1; @@ -314,10 +314,10 @@ Index: gnome-shell-extensions-40.3/extensions/workspace-indicator/extension.js vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS; this.reactive = useMenu; -Index: gnome-shell-extensions-40.3/extensions/workspace-indicator/stylesheet.css +Index: gnome-shell-extensions-41.beta/extensions/workspace-indicator/stylesheet.css =================================================================== ---- gnome-shell-extensions-40.3.orig/extensions/workspace-indicator/stylesheet.css -+++ gnome-shell-extensions-40.3/extensions/workspace-indicator/stylesheet.css +--- gnome-shell-extensions-41.beta.orig/extensions/workspace-indicator/stylesheet.css ++++ gnome-shell-extensions-41.beta/extensions/workspace-indicator/stylesheet.css @@ -1,5 +1,7 @@ .panel-workspace-indicator { padding: 0 8px;