From f7f87a1d3739985f33341d11bb1e6b0caa61f4b340a01243727d9b12cfbc7b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 14 Sep 2017 11:46:04 +0000 Subject: [PATCH] Accepting request 525997 from home:xiaoguang_wang:branches:GNOME:Factory - Update sle-classic patches to version 3.26.0: + Update gse-sle-classic-ext.patch + Update sle-classic-favorites-menu-at-end.patch + Update sle-classic-lock-screen-background.patch OBS-URL: https://build.opensuse.org/request/show/525997 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell-extensions?expand=0&rev=132 --- gnome-shell-extensions.changes | 8 ++ gse-sle-classic-ext.patch | 115 ++++++++++++++++------- sle-classic-favorites-menu-at-end.patch | 10 +- sle-classic-lock-screen-background.patch | 8 +- 4 files changed, 96 insertions(+), 45 deletions(-) diff --git a/gnome-shell-extensions.changes b/gnome-shell-extensions.changes index 2967906..a9dedfe 100644 --- a/gnome-shell-extensions.changes +++ b/gnome-shell-extensions.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 13 02:57:16 UTC 2017 - xwang@suse.com + +- Update sle-classic patches to version 3.26.0: + + Update gse-sle-classic-ext.patch + + Update sle-classic-favorites-menu-at-end.patch + + Update sle-classic-lock-screen-background.patch + ------------------------------------------------------------------- Tue Sep 12 19:21:13 UTC 2017 - luc14n0@linuxmail.org diff --git a/gse-sle-classic-ext.patch b/gse-sle-classic-ext.patch index c0a6772..0feaf83 100644 --- a/gse-sle-classic-ext.patch +++ b/gse-sle-classic-ext.patch @@ -1,8 +1,8 @@ -Index: gnome-shell-extensions-3.24.3/data/gnome-classic.css +Index: gnome-shell-extensions-3.26.0/data/gnome-classic.css =================================================================== ---- gnome-shell-extensions-3.24.3.orig/data/gnome-classic.css -+++ gnome-shell-extensions-3.24.3/data/gnome-classic.css -@@ -512,7 +512,12 @@ StScrollBar { +--- gnome-shell-extensions-3.26.0.orig/data/gnome-classic.css ++++ gnome-shell-extensions-3.26.0/data/gnome-classic.css +@@ -500,7 +500,12 @@ StScrollBar { color: rgba(46, 52, 54, 0.5); } .popup-menu.panel-menu { -boxpointer-gap: 4px; @@ -16,7 +16,17 @@ Index: gnome-shell-extensions-3.24.3/data/gnome-classic.css .popup-menu-ornament { text-align: right; -@@ -877,6 +882,7 @@ StScrollBar { +@@ -691,8 +696,7 @@ StScrollBar { + margin-right: 4px; } + #panel .panel-button .system-status-icon, + #panel .panel-button .app-menu-icon > StIcon, +- #panel .panel-button .popup-menu-arrow { +- icon-shadow: 0px 0px 2px rgba(0, 0, 0, 0.9); } ++ #panel .panel-button .popup-menu-arrow {} + #panel .panel-button:hover { + color: #454f52; + text-shadow: 0px 0px 8px black; } +@@ -901,6 +905,7 @@ StScrollBar { width: 31.5em; } .message-list-clear-button.button { @@ -24,7 +34,7 @@ Index: gnome-shell-extensions-3.24.3/data/gnome-classic.css background-color: transparent; margin: 1.5em 1.5em 0; } .message-list-clear-button.button:hover, .message-list-clear-button.button:focus { -@@ -900,7 +906,6 @@ StScrollBar { +@@ -924,7 +929,6 @@ StScrollBar { padding: 10px 10px 10px 3px; } .message-icon-bin > StIcon { @@ -32,7 +42,7 @@ Index: gnome-shell-extensions-3.24.3/data/gnome-classic.css icon-size: 16px; -st-icon-style: symbolic; } -@@ -917,11 +922,9 @@ StScrollBar { +@@ -941,11 +945,9 @@ StScrollBar { .message-secondary-bin > StIcon { icon-size: 16px; } @@ -45,10 +55,43 @@ Index: gnome-shell-extensions-3.24.3/data/gnome-classic.css padding: 10px; } .message-media-control { -Index: gnome-shell-extensions-3.24.3/extensions/window-list/classic.css +@@ -1882,8 +1884,6 @@ StScrollBar { + #panel { + font-weight: normal; + background-color: #ededed !important; +- background-gradient-direction: vertical; +- background-gradient-end: #e0e0e0; + border-top-color: #666; + /* we don't support non-uniform border-colors and + use the top border color for any border, so we +@@ -1912,8 +1912,6 @@ StScrollBar { + icon-shadow: none; } + #panel .panel-button:hover { + text-shadow: none; } +- #panel .panel-button:hover .system-status-icon { +- icon-shadow: none; } + #panel .panel-button .app-menu-icon { + width: 0; + height: 0; +@@ -1924,12 +1922,10 @@ StScrollBar { + #panel .panel-corner:focus { + -panel-corner-radius: 0; } + #panel.lock-screen, #panel.unlock-screen, #panel.login-screen { +- background-color: rgba(46, 52, 54, 0.5); +- background-gradient-start: rgba(46, 52, 54, 0.5); +- background-gradient-end: rgba(46, 52, 54, 0.5); ++ background-color: transparent !important; + border-bottom: none; } + #panel.lock-screen .panel-button, #panel.unlock-screen .panel-button, #panel.login-screen .panel-button { +- color: #eeeeec; } ++ color: #eeeeec !important; } + #panel .popup-menu-arrow { + width: 0; + height: 0; } +Index: gnome-shell-extensions-3.26.0/extensions/window-list/classic.css =================================================================== ---- gnome-shell-extensions-3.24.3.orig/extensions/window-list/classic.css -+++ gnome-shell-extensions-3.24.3/extensions/window-list/classic.css +--- gnome-shell-extensions-3.26.0.orig/extensions/window-list/classic.css ++++ gnome-shell-extensions-3.26.0/extensions/window-list/classic.css @@ -6,7 +6,7 @@ height: 2.25em ; } @@ -90,10 +133,10 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/classic.css color: #888; box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5); } -Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js +Index: gnome-shell-extensions-3.26.0/extensions/window-list/extension.js =================================================================== ---- gnome-shell-extensions-3.24.3.orig/extensions/window-list/extension.js -+++ gnome-shell-extensions-3.24.3/extensions/window-list/extension.js +--- gnome-shell-extensions-3.26.0.orig/extensions/window-list/extension.js ++++ gnome-shell-extensions-3.26.0/extensions/window-list/extension.js @@ -22,6 +22,8 @@ const _ = Gettext.gettext; const ICON_TEXTURE_SIZE = 24; const DND_ACTIVATE_TIMEOUT = 500; @@ -115,15 +158,15 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js Extends: PopupMenu.PopupMenu, @@ -113,6 +118,9 @@ const WindowContextMenu = new Lang.Class })); - this.addMenuItem(item); + this.addMenuItem(this._closeItem); + // NOTE add `-boxpointer-gap` to the menu, to align with `PanelMenu`, + // totally optional. + this.actor.add_style_class_name('bottom-panel-menu'); this.actor.connect('destroy', Lang.bind(this, this._onDestroy)); - }, -@@ -669,6 +677,8 @@ const WorkspaceIndicator = new Lang.Clas + this.connect('open-state-changed', () => { +@@ -678,6 +686,8 @@ const WorkspaceIndicator = new Lang.Clas this.parent(0.0, _("Workspace Indicator"), true); this.setMenu(new PopupMenu.PopupMenu(this.actor, 0.0, St.Side.BOTTOM)); this.actor.add_style_class_name('window-list-workspace-indicator'); @@ -132,7 +175,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js this.menu.actor.remove_style_class_name('panel-menu'); let container = new St.Widget({ layout_manager: new Clutter.BinLayout(), -@@ -773,88 +783,53 @@ const WorkspaceIndicator = new Lang.Clas +@@ -782,88 +792,52 @@ const WorkspaceIndicator = new Lang.Clas } }); @@ -156,7 +199,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js + this._getMaxWindowListWidth = maxWidthFunc; - this.actor = new St.Widget({ name: 'panel', -- style_class: 'bottom-panel', +- style_class: 'bottom-panel solid', + let layout = new Clutter.BoxLayout({ homogeneous: true }); + this.actor = new St.Widget({ style_class: 'window-list', reactive: true, @@ -223,7 +266,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js - this.actor.width = this._monitor.width; - this.actor.connect('notify::height', Lang.bind(this, this._updatePosition)); - this._updatePosition(); - +- this._appSystem = Shell.AppSystem.get_default(); this._appStateChangedId = this._appSystem.connect('app-state-changed', @@ -255,7 +298,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js this._workspaceSignals = new Map(); this._nWorkspacesChangedId = global.screen.connect('notify::n-workspaces', -@@ -865,42 +840,18 @@ const WindowList = new Lang.Class({ +@@ -874,42 +848,18 @@ const WindowList = new Lang.Class({ global.window_manager.connect('switch-workspace', Lang.bind(this, this._checkGrouping)); @@ -301,7 +344,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js }, _getDynamicWorkspacesSettings: function() { -@@ -909,77 +860,77 @@ const WindowList = new Lang.Class({ +@@ -918,77 +868,77 @@ const WindowList = new Lang.Class({ return this._mutterSettings; }, @@ -426,7 +469,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js }, _groupingModeChanged: function() { -@@ -988,7 +939,7 @@ const WindowList = new Lang.Class({ +@@ -997,7 +947,7 @@ const WindowList = new Lang.Class({ if (this._groupingMode == GroupingMode.AUTO) { this._checkGrouping(); } else { @@ -435,7 +478,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js this._populateWindowList(); } }, -@@ -997,6 +948,26 @@ const WindowList = new Lang.Class({ +@@ -1006,6 +956,26 @@ const WindowList = new Lang.Class({ if (this._groupingMode != GroupingMode.AUTO) return; @@ -462,7 +505,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js let maxWidth = this._getMaxWindowListWidth(); let natWidth = this._getPreferredUngroupedWindowListWidth(); -@@ -1008,7 +979,7 @@ const WindowList = new Lang.Class({ +@@ -1017,7 +987,7 @@ const WindowList = new Lang.Class({ }, _populateWindowList: function() { @@ -471,7 +514,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js if (!this._grouped) { let windows = global.get_window_actors().sort( -@@ -1029,42 +1000,8 @@ const WindowList = new Lang.Class({ +@@ -1038,42 +1008,8 @@ const WindowList = new Lang.Class({ } }, @@ -516,7 +559,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js _onWindowAdded: function(ws, win) { if (win.skip_taskbar) return; -@@ -1075,30 +1012,32 @@ const WindowList = new Lang.Class({ +@@ -1084,30 +1020,32 @@ const WindowList = new Lang.Class({ if (this._grouped) return; @@ -555,7 +598,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js for (let i = 0; i < children.length; i++) { if (children[i]._delegate.metaWindow == win) { children[i].destroy(); -@@ -1107,6 +1046,28 @@ const WindowList = new Lang.Class({ +@@ -1116,6 +1054,28 @@ const WindowList = new Lang.Class({ } }, @@ -584,7 +627,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js _onWorkspacesChanged: function() { let numWorkspaces = global.screen.n_workspaces; for (let i = 0; i < numWorkspaces; i++) { -@@ -1123,8 +1084,6 @@ const WindowList = new Lang.Class({ +@@ -1132,8 +1092,6 @@ const WindowList = new Lang.Class({ Lang.bind(this, this._onWindowRemoved)); this._workspaceSignals.set(workspace, signals); } @@ -593,7 +636,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js }, _disconnectWorkspaceSignals: function() { -@@ -1138,6 +1097,157 @@ const WindowList = new Lang.Class({ +@@ -1147,6 +1105,157 @@ const WindowList = new Lang.Class({ } }, @@ -751,7 +794,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js _onDragBegin: function() { DND.addDragMonitor(this._dragMonitor); }, -@@ -1199,22 +1309,11 @@ const WindowList = new Lang.Class({ +@@ -1208,22 +1317,11 @@ const WindowList = new Lang.Class({ Main.ctrlAltTabManager.removeGroup(this.actor); @@ -774,7 +817,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js Main.overview.disconnect(this._overviewShowingId); Main.overview.disconnect(this._overviewHidingId); -@@ -1222,12 +1321,6 @@ const WindowList = new Lang.Class({ +@@ -1231,12 +1329,6 @@ const WindowList = new Lang.Class({ Main.xdndHandler.disconnect(this._dragBeginId); Main.xdndHandler.disconnect(this._dragEndId); @@ -787,7 +830,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js } }); -@@ -1236,7 +1329,6 @@ const Extension = new Lang.Class({ +@@ -1245,7 +1337,6 @@ const Extension = new Lang.Class({ _init: function() { this._windowLists = null; @@ -795,7 +838,7 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js }, enable: function() { -@@ -1292,6 +1384,71 @@ const Extension = new Lang.Class({ +@@ -1301,6 +1392,71 @@ const Extension = new Lang.Class({ } }); @@ -868,10 +911,10 @@ Index: gnome-shell-extensions-3.24.3/extensions/window-list/extension.js + return new Extension(); + } } -Index: gnome-shell-extensions-3.24.3/extensions/window-list/stylesheet.css +Index: gnome-shell-extensions-3.26.0/extensions/window-list/stylesheet.css =================================================================== ---- gnome-shell-extensions-3.24.3.orig/extensions/window-list/stylesheet.css -+++ gnome-shell-extensions-3.24.3/extensions/window-list/stylesheet.css +--- gnome-shell-extensions-3.26.0.orig/extensions/window-list/stylesheet.css ++++ gnome-shell-extensions-3.26.0/extensions/window-list/stylesheet.css @@ -79,6 +79,10 @@ border: 1px solid #cccccc; } diff --git a/sle-classic-favorites-menu-at-end.patch b/sle-classic-favorites-menu-at-end.patch index b986209..f115f84 100644 --- a/sle-classic-favorites-menu-at-end.patch +++ b/sle-classic-favorites-menu-at-end.patch @@ -1,8 +1,8 @@ -Index: gnome-shell-extensions-3.24.2/extensions/apps-menu/extension.js +Index: gnome-shell-extensions-3.26.0/extensions/apps-menu/extension.js =================================================================== ---- gnome-shell-extensions-3.24.2.orig/extensions/apps-menu/extension.js -+++ gnome-shell-extensions-3.24.2/extensions/apps-menu/extension.js +--- gnome-shell-extensions-3.26.0.orig/extensions/apps-menu/extension.js ++++ gnome-shell-extensions-3.26.0/extensions/apps-menu/extension.js @@ -22,6 +22,8 @@ const Pango = imports.gi.Pango; const Gettext = imports.gettext.domain('gnome-shell-extensions'); const _ = Gettext.gettext; @@ -12,7 +12,7 @@ Index: gnome-shell-extensions-3.24.2/extensions/apps-menu/extension.js const ExtensionUtils = imports.misc.extensionUtils; const Me = ExtensionUtils.getCurrentExtension(); const Convenience = Me.imports.convenience; -@@ -793,8 +795,6 @@ const ApplicationsButton = new Lang.Clas +@@ -785,8 +787,6 @@ const ApplicationsButton = new Lang.Clas let tree = new GMenu.Tree({ menu_basename: 'applications.menu' }); tree.load_sync(); let root = tree.get_root_directory(); @@ -21,7 +21,7 @@ Index: gnome-shell-extensions-3.24.2/extensions/apps-menu/extension.js let iter = root.iter(); let nextType; while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) { -@@ -812,6 +812,10 @@ const ApplicationsButton = new Lang.Clas +@@ -804,6 +804,10 @@ const ApplicationsButton = new Lang.Clas } } diff --git a/sle-classic-lock-screen-background.patch b/sle-classic-lock-screen-background.patch index c171fd4..fb6d8b9 100644 --- a/sle-classic-lock-screen-background.patch +++ b/sle-classic-lock-screen-background.patch @@ -1,8 +1,8 @@ -Index: gnome-shell-extensions-3.24.2/data/gnome-classic.css +Index: gnome-shell-extensions-3.26.0/data/gnome-classic.css =================================================================== ---- gnome-shell-extensions-3.24.2.orig/data/gnome-classic.css -+++ gnome-shell-extensions-3.24.2/data/gnome-classic.css -@@ -1606,7 +1606,8 @@ StScrollBar { +--- gnome-shell-extensions-3.26.0.orig/data/gnome-classic.css ++++ gnome-shell-extensions-3.26.0/data/gnome-classic.css +@@ -1602,7 +1602,8 @@ StScrollBar { .login-dialog { border: none;