From 186f8592dbd479a09d073c90f53f9031231424a2a75caae80b9f2d933e0eeaf2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 11 Oct 2021 17:20:00 +0000 Subject: [PATCH] Accepting request 924308 from home:xiaoguang_wang:branches:GNOME:Factory - Update sle-classic to version 41 + Update gse-sle-classic-ext.patch + Update sle-classic@suse.com.tar.gz OBS-URL: https://build.opensuse.org/request/show/924308 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=251 --- gnome-shell-extensions.changes | 7 +++ gse-sle-classic-ext.patch | 82 +++++++++++++++++++++------------- sle-classic@suse.com.tar.gz | 4 +- 3 files changed, 60 insertions(+), 33 deletions(-) diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index 00f5a81..06d8e77 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 8 06:51:46 UTC 2021 - Xiaoguang Wang + +- Update sle-classic to version 41 + + Update gse-sle-classic-ext.patch + + Update sle-classic@suse.com.tar.gz + ------------------------------------------------------------------- Tue Sep 21 19:40:12 UTC 2021 - Michael Gorse diff --git a/gse-sle-classic-ext.patch b/gse-sle-classic-ext.patch index 5a8b3e5..e7580c3 100644 --- a/gse-sle-classic-ext.patch +++ b/gse-sle-classic-ext.patch @@ -1,7 +1,7 @@ -Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js +Index: gnome-shell-extensions-41.0/extensions/window-list/extension.js =================================================================== ---- gnome-shell-extensions-41.beta.orig/extensions/window-list/extension.js -+++ gnome-shell-extensions-41.beta/extensions/window-list/extension.js +--- gnome-shell-extensions-41.0.orig/extensions/window-list/extension.js ++++ gnome-shell-extensions-41.0/extensions/window-list/extension.js @@ -177,6 +177,9 @@ class WindowTitle extends St.BoxLayout { } }); @@ -30,7 +30,23 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js let layout = new Clutter.BoxLayout({ homogeneous: true }); this._windowList = new St.Widget({ -@@ -836,7 +841,8 @@ class WindowList extends St.Widget { +@@ -733,6 +738,7 @@ class WindowList extends St.Widget { + this._menuManager = new PopupMenu.PopupMenuManager(this); + this._menuManager.addMenu(this._workspaceIndicator.menu); + ++ if (!isSLEClassicMode()) { + Main.layoutManager.addChrome(this, { + affectsStruts: true, + trackFullscreen: true, +@@ -743,6 +749,7 @@ class WindowList extends St.Widget { + this.width = this._monitor.width; + this.connect('notify::height', this._updatePosition.bind(this)); + this._updatePosition(); ++ } + + this._appSystem = Shell.AppSystem.get_default(); + this._appStateChangedId = this._appSystem.connect( +@@ -839,7 +846,8 @@ class WindowList extends St.Widget { let workspacesOnMonitor = this._monitor === Main.layoutManager.primaryMonitor || !this._mutterSettings.get_boolean('workspaces-only-on-primary'); @@ -40,7 +56,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js } _updateWindowListVisibility() { -@@ -872,6 +878,9 @@ class WindowList extends St.Widget { +@@ -875,6 +883,9 @@ class WindowList extends St.Widget { } _getMaxWindowListWidth() { @@ -50,7 +66,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js let indicatorsBox = this._workspaceIndicator.get_parent(); return this.width - indicatorsBox.get_preferred_width(-1)[1]; } -@@ -1072,7 +1081,8 @@ class WindowList extends St.Widget { +@@ -1075,7 +1086,8 @@ class WindowList extends St.Widget { this._mutterSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId); this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId); @@ -60,7 +76,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js Main.ctrlAltTabManager.removeGroup(this); -@@ -1113,6 +1123,7 @@ class Extension { +@@ -1116,6 +1128,7 @@ class Extension { this._windowLists = null; this._hideOverviewOrig = Main.overview.hide; @@ -68,7 +84,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js } enable() { -@@ -1132,19 +1143,47 @@ class Extension { +@@ -1135,19 +1148,51 @@ class Extension { this._hideOverviewOrig.call(Main.overview); }; @@ -77,6 +93,11 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js + Main.panel._centerBox.hide(); }); + this.overviewHidingId = Main.overview.connect('hiding', () => { + Main.panel._centerBox.show(); }); ++ ++ Main.sessionMode.hasOverview = false; ++ Main.layoutManager.connect('startup-complete', () => { ++ Main.sessionMode.hasOverview = true; ++ }); + } + this._buildWindowLists(); @@ -103,7 +124,6 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js + let list = new WindowList(false, Main.layoutManager.primaryMonitor); + list._workspaceIndicator.destroy(); + list._workspaceIndicator = null; -+ Main.layoutManager.removeChrome(list); + + let [box] = list.get_children(); + box.remove_child(list._windowList); @@ -120,7 +140,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js } disable() { -@@ -1158,6 +1197,11 @@ class Extension { +@@ -1161,6 +1206,11 @@ class Extension { this._monitorsChangedId = 0; this._windowLists.forEach(windowList => { @@ -132,7 +152,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js windowList.hide(); windowList.destroy(); }); -@@ -1166,6 +1210,11 @@ class Extension { +@@ -1169,6 +1219,11 @@ class Extension { Main.windowPicker.destroy(); delete Main.windowPicker; @@ -144,10 +164,10 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js Main.overview.hide = this._hideOverviewOrig; } -Index: gnome-shell-extensions-41.beta/extensions/window-list/sle-classic.css +Index: gnome-shell-extensions-41.0/extensions/window-list/sle-classic.css =================================================================== --- /dev/null -+++ gnome-shell-extensions-41.beta/extensions/window-list/sle-classic.css ++++ gnome-shell-extensions-41.0/extensions/window-list/sle-classic.css @@ -0,0 +1,46 @@ +@import url("stylesheet.css"); + @@ -195,10 +215,10 @@ Index: gnome-shell-extensions-41.beta/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.beta/extensions/places-menu/extension.js +Index: gnome-shell-extensions-41.0/extensions/places-menu/extension.js =================================================================== ---- gnome-shell-extensions-41.beta.orig/extensions/places-menu/extension.js -+++ gnome-shell-extensions-41.beta/extensions/places-menu/extension.js +--- gnome-shell-extensions-41.0.orig/extensions/places-menu/extension.js ++++ gnome-shell-extensions-41.0/extensions/places-menu/extension.js @@ -139,6 +139,10 @@ function init() { let _indicator; @@ -222,10 +242,10 @@ Index: gnome-shell-extensions-41.beta/extensions/places-menu/extension.js } /** */ -Index: gnome-shell-extensions-41.beta/extensions/apps-menu/extension.js +Index: gnome-shell-extensions-41.0/extensions/apps-menu/extension.js =================================================================== ---- gnome-shell-extensions-41.beta.orig/extensions/apps-menu/extension.js -+++ gnome-shell-extensions-41.beta/extensions/apps-menu/extension.js +--- gnome-shell-extensions-41.0.orig/extensions/apps-menu/extension.js ++++ gnome-shell-extensions-41.0/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 +257,7 @@ Index: gnome-shell-extensions-41.beta/extensions/apps-menu/extension.js var ApplicationMenuItem = GObject.registerClass( class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem { _init(button, app) { -@@ -706,8 +710,6 @@ class ApplicationsButton extends PanelMe +@@ -699,8 +703,6 @@ class ApplicationsButton extends PanelMe this.applicationsByCategory = {}; this._tree.load_sync(); let root = this._tree.get_root_directory(); @@ -246,7 +266,7 @@ Index: gnome-shell-extensions-41.beta/extensions/apps-menu/extension.js let iter = root.iter(); let nextType; while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) { -@@ -722,11 +724,15 @@ class ApplicationsButton extends PanelMe +@@ -715,11 +717,15 @@ class ApplicationsButton extends PanelMe this.applicationsByCategory[categoryId] = []; this._loadCategory(categoryId, dir); if (this.applicationsByCategory[categoryId].length > 0) { @@ -264,7 +284,7 @@ Index: gnome-shell-extensions-41.beta/extensions/apps-menu/extension.js // Load applications this._displayButtons(this._listApplications(null)); -@@ -790,7 +796,10 @@ let appsMenuButton; +@@ -783,7 +789,10 @@ let appsMenuButton; function enable() { appsMenuButton = new ApplicationsButton(); let index = Main.sessionMode.panel.left.indexOf('activities') + 1; @@ -276,10 +296,10 @@ Index: gnome-shell-extensions-41.beta/extensions/apps-menu/extension.js } /** */ -Index: gnome-shell-extensions-41.beta/data/gnome-classic.css +Index: gnome-shell-extensions-41.0/data/gnome-classic.css =================================================================== ---- gnome-shell-extensions-41.beta.orig/data/gnome-classic.css -+++ gnome-shell-extensions-41.beta/data/gnome-classic.css +--- gnome-shell-extensions-41.0.orig/data/gnome-classic.css ++++ gnome-shell-extensions-41.0/data/gnome-classic.css @@ -2262,9 +2262,9 @@ StScrollBar { #panel.solid .panel-corner:focus { -panel-corner-radius: 0; } @@ -300,10 +320,10 @@ Index: gnome-shell-extensions-41.beta/data/gnome-classic.css + +.popup-menu.panel-menu { + margin-bottom: 0em; } -Index: gnome-shell-extensions-41.beta/extensions/workspace-indicator/extension.js +Index: gnome-shell-extensions-41.0/extensions/workspace-indicator/extension.js =================================================================== ---- gnome-shell-extensions-41.beta.orig/extensions/workspace-indicator/extension.js -+++ gnome-shell-extensions-41.beta/extensions/workspace-indicator/extension.js +--- gnome-shell-extensions-41.0.orig/extensions/workspace-indicator/extension.js ++++ gnome-shell-extensions-41.0/extensions/workspace-indicator/extension.js @@ -321,7 +321,8 @@ class WorkspaceIndicator extends PanelMe _updateThumbnailVisibility() { const { workspaceManager } = global; @@ -314,10 +334,10 @@ Index: gnome-shell-extensions-41.beta/extensions/workspace-indicator/extension.j vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS; this.reactive = useMenu; -Index: gnome-shell-extensions-41.beta/extensions/workspace-indicator/stylesheet.css +Index: gnome-shell-extensions-41.0/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 +--- gnome-shell-extensions-41.0.orig/extensions/workspace-indicator/stylesheet.css ++++ gnome-shell-extensions-41.0/extensions/workspace-indicator/stylesheet.css @@ -1,5 +1,7 @@ .panel-workspace-indicator { padding: 0 8px; diff --git a/sle-classic@suse.com.tar.gz b/sle-classic@suse.com.tar.gz index 48a39e8..4efdfb8 100644 --- a/sle-classic@suse.com.tar.gz +++ b/sle-classic@suse.com.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aeb7b48a4685701ab82af1269f3b897e57fd222ff276a06fc6d55e43c7845038 -size 4309 +oid sha256:83c49e6b7428e0c32d9ed39ce9360988be60710ecec3f50dfe003dbbe2fd2139 +size 4289