1
0

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
This commit is contained in:
Dominique Leuenberger 2021-10-11 17:20:00 +00:00 committed by Git OBS Bridge
parent ae3ae417fe
commit 186f8592db
3 changed files with 60 additions and 33 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Oct 8 06:51:46 UTC 2021 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- 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 <mgorse@suse.com> Tue Sep 21 19:40:12 UTC 2021 - Michael Gorse <mgorse@suse.com>

View File

@ -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.0.orig/extensions/window-list/extension.js
+++ gnome-shell-extensions-41.beta/extensions/window-list/extension.js +++ gnome-shell-extensions-41.0/extensions/window-list/extension.js
@@ -177,6 +177,9 @@ class WindowTitle extends St.BoxLayout { @@ -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 }); let layout = new Clutter.BoxLayout({ homogeneous: true });
this._windowList = new St.Widget({ 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 || let workspacesOnMonitor = this._monitor === Main.layoutManager.primaryMonitor ||
!this._mutterSettings.get_boolean('workspaces-only-on-primary'); !this._mutterSettings.get_boolean('workspaces-only-on-primary');
@ -40,7 +56,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js
} }
_updateWindowListVisibility() { _updateWindowListVisibility() {
@@ -872,6 +878,9 @@ class WindowList extends St.Widget { @@ -875,6 +883,9 @@ class WindowList extends St.Widget {
} }
_getMaxWindowListWidth() { _getMaxWindowListWidth() {
@ -50,7 +66,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js
let indicatorsBox = this._workspaceIndicator.get_parent(); let indicatorsBox = this._workspaceIndicator.get_parent();
return this.width - indicatorsBox.get_preferred_width(-1)[1]; 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._workspacesOnlyOnPrimaryChangedId);
this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId); this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId);
@ -60,7 +76,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js
Main.ctrlAltTabManager.removeGroup(this); Main.ctrlAltTabManager.removeGroup(this);
@@ -1113,6 +1123,7 @@ class Extension { @@ -1116,6 +1128,7 @@ class Extension {
this._windowLists = null; this._windowLists = null;
this._hideOverviewOrig = Main.overview.hide; this._hideOverviewOrig = Main.overview.hide;
@ -68,7 +84,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js
} }
enable() { enable() {
@@ -1132,19 +1143,47 @@ class Extension { @@ -1135,19 +1148,51 @@ class Extension {
this._hideOverviewOrig.call(Main.overview); this._hideOverviewOrig.call(Main.overview);
}; };
@ -77,6 +93,11 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js
+ Main.panel._centerBox.hide(); }); + Main.panel._centerBox.hide(); });
+ this.overviewHidingId = Main.overview.connect('hiding', () => { + this.overviewHidingId = Main.overview.connect('hiding', () => {
+ Main.panel._centerBox.show(); }); + Main.panel._centerBox.show(); });
+
+ Main.sessionMode.hasOverview = false;
+ Main.layoutManager.connect('startup-complete', () => {
+ Main.sessionMode.hasOverview = true;
+ });
+ } + }
+ +
this._buildWindowLists(); 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); + let list = new WindowList(false, Main.layoutManager.primaryMonitor);
+ list._workspaceIndicator.destroy(); + list._workspaceIndicator.destroy();
+ list._workspaceIndicator = null; + list._workspaceIndicator = null;
+ Main.layoutManager.removeChrome(list);
+ +
+ let [box] = list.get_children(); + let [box] = list.get_children();
+ box.remove_child(list._windowList); + box.remove_child(list._windowList);
@ -120,7 +140,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js
} }
disable() { disable() {
@@ -1158,6 +1197,11 @@ class Extension { @@ -1161,6 +1206,11 @@ class Extension {
this._monitorsChangedId = 0; this._monitorsChangedId = 0;
this._windowLists.forEach(windowList => { this._windowLists.forEach(windowList => {
@ -132,7 +152,7 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js
windowList.hide(); windowList.hide();
windowList.destroy(); windowList.destroy();
}); });
@@ -1166,6 +1210,11 @@ class Extension { @@ -1169,6 +1219,11 @@ class Extension {
Main.windowPicker.destroy(); Main.windowPicker.destroy();
delete Main.windowPicker; delete Main.windowPicker;
@ -144,10 +164,10 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/extension.js
Main.overview.hide = this._hideOverviewOrig; 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 --- /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 @@ @@ -0,0 +1,46 @@
+@import url("stylesheet.css"); +@import url("stylesheet.css");
+ +
@ -195,10 +215,10 @@ Index: gnome-shell-extensions-41.beta/extensions/window-list/sle-classic.css
+ color: #888; + color: #888;
+ box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5); + 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.0.orig/extensions/places-menu/extension.js
+++ gnome-shell-extensions-41.beta/extensions/places-menu/extension.js +++ gnome-shell-extensions-41.0/extensions/places-menu/extension.js
@@ -139,6 +139,10 @@ function init() { @@ -139,6 +139,10 @@ function init() {
let _indicator; 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.0.orig/extensions/apps-menu/extension.js
+++ gnome-shell-extensions-41.beta/extensions/apps-menu/extension.js +++ gnome-shell-extensions-41.0/extensions/apps-menu/extension.js
@@ -26,6 +26,10 @@ const NAVIGATION_REGION_OVERSHOOT = 50; @@ -26,6 +26,10 @@ const NAVIGATION_REGION_OVERSHOOT = 50;
Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish'); Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish');
Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_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( var ApplicationMenuItem = GObject.registerClass(
class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem { class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
_init(button, app) { _init(button, app) {
@@ -706,8 +710,6 @@ class ApplicationsButton extends PanelMe @@ -699,8 +703,6 @@ class ApplicationsButton extends PanelMe
this.applicationsByCategory = {}; this.applicationsByCategory = {};
this._tree.load_sync(); this._tree.load_sync();
let root = this._tree.get_root_directory(); 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 iter = root.iter();
let nextType; let nextType;
while ((nextType = iter.next()) !== GMenu.TreeItemType.INVALID) { 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.applicationsByCategory[categoryId] = [];
this._loadCategory(categoryId, dir); this._loadCategory(categoryId, dir);
if (this.applicationsByCategory[categoryId].length > 0) { if (this.applicationsByCategory[categoryId].length > 0) {
@ -264,7 +284,7 @@ Index: gnome-shell-extensions-41.beta/extensions/apps-menu/extension.js
// Load applications // Load applications
this._displayButtons(this._listApplications(null)); this._displayButtons(this._listApplications(null));
@@ -790,7 +796,10 @@ let appsMenuButton; @@ -783,7 +789,10 @@ let appsMenuButton;
function enable() { function enable() {
appsMenuButton = new ApplicationsButton(); appsMenuButton = new ApplicationsButton();
let index = Main.sessionMode.panel.left.indexOf('activities') + 1; 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.0.orig/data/gnome-classic.css
+++ gnome-shell-extensions-41.beta/data/gnome-classic.css +++ gnome-shell-extensions-41.0/data/gnome-classic.css
@@ -2262,9 +2262,9 @@ StScrollBar { @@ -2262,9 +2262,9 @@ StScrollBar {
#panel.solid .panel-corner:focus { #panel.solid .panel-corner:focus {
-panel-corner-radius: 0; } -panel-corner-radius: 0; }
@ -300,10 +320,10 @@ Index: gnome-shell-extensions-41.beta/data/gnome-classic.css
+ +
+.popup-menu.panel-menu { +.popup-menu.panel-menu {
+ margin-bottom: 0em; } + 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.0.orig/extensions/workspace-indicator/extension.js
+++ gnome-shell-extensions-41.beta/extensions/workspace-indicator/extension.js +++ gnome-shell-extensions-41.0/extensions/workspace-indicator/extension.js
@@ -321,7 +321,8 @@ class WorkspaceIndicator extends PanelMe @@ -321,7 +321,8 @@ class WorkspaceIndicator extends PanelMe
_updateThumbnailVisibility() { _updateThumbnailVisibility() {
const { workspaceManager } = global; const { workspaceManager } = global;
@ -314,10 +334,10 @@ Index: gnome-shell-extensions-41.beta/extensions/workspace-indicator/extension.j
vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS; vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
this.reactive = useMenu; 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.0.orig/extensions/workspace-indicator/stylesheet.css
+++ gnome-shell-extensions-41.beta/extensions/workspace-indicator/stylesheet.css +++ gnome-shell-extensions-41.0/extensions/workspace-indicator/stylesheet.css
@@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
.panel-workspace-indicator { .panel-workspace-indicator {
padding: 0 8px; padding: 0 8px;

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:aeb7b48a4685701ab82af1269f3b897e57fd222ff276a06fc6d55e43c7845038 oid sha256:83c49e6b7428e0c32d9ed39ce9360988be60710ecec3f50dfe003dbbe2fd2139
size 4309 size 4289