Hello community, here is the log from the commit of package gnome-shell-extensions for openSUSE:Factory checked in at 2019-05-03 22:16:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell-extensions (Old) and /work/SRC/openSUSE:Factory/.gnome-shell-extensions.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-shell-extensions" Fri May 3 22:16:58 2019 rev:86 rq:695777 version:3.32.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell-extensions/gnome-shell-extensions.changes 2018-10-17 08:23:06.450775964 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-shell-extensions.new.5148/gnome-shell-extensions.changes 2019-05-03 22:16:59.760052695 +0200 @@ -1,0 +2,67 @@ +Thu Apr 18 11:16:42 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org> + +- Update to version 3.32.1: + + Fix windowsNavigator extension after ES6 port. + + screenshot-window-sizer: Add phone screenshot sizes. + + Misc. bug fixes and cleanups + + +------------------------------------------------------------------- +Tue Apr 9 07:27:44 UTC 2019 - Chingkai <qkzhu@suse.com> + +- Rebase sle-classic@suse.com.tar.gz to version 3.32.0: + + Drop Lang.bind(). + + Drop Convenience library. + + Stop using Shell.GenericContainer. +- Update gse-sle-classic-ext.patch: + + Rename WorkspaceIndicator to WorkspaceIndicatorWList(bsc#1130478). + +------------------------------------------------------------------- +Fri Mar 29 06:33:23 UTC 2019 - Yifan Jiang <yfjiang@suse.com> + +- Add gnome-classic-s390-not-require-g-s-d_wacom.patch: Remove the + gnome session runtime requirement of g-s-d Wacom plugin because + it is not build on s390 (bsc#1129412). + +------------------------------------------------------------------- +Wed Mar 20 08:45:23 UTC 2019 - Chingkai <qkzhu@suse.com> + +- Rebase: the following patches are rebased to version 3.32.0 + + gnome-shell-add-app-to-desktop.patch + + gnome-shell-favorites-menu-at-end.patch + + gse-sle-classic-ext.patch + +------------------------------------------------------------------- +Tue Mar 12 06:31:37 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> + +- Update to version 3.32.0: + + Updated translations. +- Disable sle-classic-favorites-menu-at-end.patch: Needs rebase. + +------------------------------------------------------------------- +Fri Feb 22 06:47:35 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.31.91: + + apps-menu: Remove outdated legacy-tray handling. + + user-theme: Allow using XDG user data dir. + + Misc. bug fixes and cleanups. + +------------------------------------------------------------------- +Thu Feb 21 16:19:41 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.31.90: + + Misc. bug fixes and cleanups. + + Updated translations. +- Rebase gnome-shell-favorites-menu-at-end.patch via + refresh_patches service. +- Disable gnome-shell-add-app-to-desktop.patch and + gse-sle-classic-ext.patch, needs rebase. + +------------------------------------------------------------------- +Sat Jan 5 11:01:46 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 3.31.2: + + Remove obsolete alternate-tab extension. + + Adjust to gnome-shell changes. + +------------------------------------------------------------------- Old: ---- gnome-shell-extensions-3.30.1.tar.xz New: ---- gnome-classic-s390-not-require-g-s-d_wacom.patch gnome-shell-extensions-3.32.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell-extensions.spec ++++++ --- /var/tmp/diff_new_pack.SpYSqt/_old 2019-05-03 22:17:00.400053981 +0200 +++ /var/tmp/diff_new_pack.SpYSqt/_new 2019-05-03 22:17:00.404053989 +0200 @@ -1,7 +1,7 @@ # # spec file for package gnome-shell-extensions # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -18,15 +18,14 @@ %global __requires_exclude typelib\\(Meta\\) - Name: gnome-shell-extensions -Version: 3.30.1 +Version: 3.32.1 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: http://download.gnome.org/sources/gnome-shell-extensions/3.30/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gnome-shell-extensions/3.32/%{name}-%{version}.tar.xz Source1: README.SUSE Source2: sle-classic.desktop Source3: SLE-theme.tar.gz @@ -34,18 +33,17 @@ Source5: sle-classic.json Source6: sle-classic@suse.com.tar.gz Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override - # 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 # PATCH-FEATURE-OPENSUSE sle-classic-favorites-menu-at-end.patch bnc#890989 cxiong@suse.com -- put the favorites at the end of the app catogories for accessibility reason -- cxiong@suse.com bnc#890989 Patch2: gnome-shell-favorites-menu-at-end.patch - +# PATCH-FIX-OPENSUSE gnome-classic-s390-not-require-g-s-d_wacom.patch bsc#1129412 yfjiang@suse.com -- Remove the runtime requirement of g-s-d Wacom plugin +Patch3: gnome-classic-s390-not-require-g-s-d_wacom.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 Patch1000: gse-sle-classic-ext.patch # PATCH-FEATURE-SLE sle-classic-lock-screen-background.patch bsc#1007468 xwang@suse.com -- add SUSE logo on lock screen when auth is requested Patch1001: sle-classic-lock-screen-background.patch - BuildRequires: fdupes BuildRequires: gnome-patch-translation # Needed for directory ownership @@ -103,8 +101,12 @@ %setup -q %patch1 -p1 %patch2 -p1 +%ifarch s390 s390x +%patch3 -p1 +%endif translation-update-upstream po %{name} gnome-patch-translation-prepare po %{name} + %patch1000 -p1 %if !0%{?is_opensuse} %patch1001 -p1 @@ -120,7 +122,7 @@ %meson \ -D classic_mode=true \ -D extension_set=classic \ - -D enable_extensions="alternate-tab,apps-menu,places-menu,launch-new-instance,window-list,workspace-indicator" + -D enable_extensions="apps-menu,places-menu,launch-new-instance,window-list,workspace-indicator" %meson_build %install @@ -171,7 +173,6 @@ %files -n gnome-shell-classic %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.auto-move-windows.gschema.xml %{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.classic.gschema.override -%{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.example.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.native-window-placement.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.shell.extensions.user-theme.gschema.xml @@ -179,7 +180,6 @@ %{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.sle-classic.gschema.override %{_datadir}/gnome-session/sessions/gnome-classic.session %dir %{_datadir}/gnome-shell/extensions -%{_datadir}/gnome-shell/extensions/alternate-tab@gnome-shell-extensions.gcampax.github.com/ %{_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/ %{_datadir}/gnome-shell/extensions/places-menu@gnome-shell-extensions.gcampax.github.com/ ++++++ gnome-classic-s390-not-require-g-s-d_wacom.patch ++++++ Index: gnome-shell-extensions-3.32.0/data/gnome-classic.session.desktop.in =================================================================== --- gnome-shell-extensions-3.32.0.orig/data/gnome-classic.session.desktop.in +++ gnome-shell-extensions-3.32.0/data/gnome-classic.session.desktop.in @@ -1,3 +1,3 @@ [GNOME Session] Name=GNOME Classic -RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; +RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.XSettings; ++++++ gnome-shell-add-app-to-desktop.patch ++++++ --- /var/tmp/diff_new_pack.SpYSqt/_old 2019-05-03 22:17:00.452054086 +0200 +++ /var/tmp/diff_new_pack.SpYSqt/_new 2019-05-03 22:17:00.452054086 +0200 @@ -1,17 +1,15 @@ -Index: gnome-shell-extensions-3.27.91/extensions/apps-menu/extension.js -=================================================================== ---- gnome-shell-extensions-3.27.91.orig/extensions/apps-menu/extension.js -+++ gnome-shell-extensions-3.27.91/extensions/apps-menu/extension.js -@@ -6,6 +6,8 @@ const GMenu = imports.gi.GMenu; - const Shell = imports.gi.Shell; - const St = imports.gi.St; - const Clutter = imports.gi.Clutter; +--- gnome-shell-extensions-3.32.0.orig/extensions/apps-menu/extension.js 2019-03-12 07:05:45.000000000 +0800 ++++ gnome-shell-extensions-3.32.0/extensions/apps-menu/extension.js 2019-03-20 15:52:39.830009264 +0800 +@@ -4,6 +4,8 @@ + const { + Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St + } = imports.gi; +const BoxPointer = imports.ui.boxpointer; +const AppFavorites = imports.ui.appFavorites; + const DND = imports.ui.dnd; const Main = imports.ui.main; - const Meta = imports.gi.Meta; const PanelMenu = imports.ui.panelMenu; -@@ -61,8 +63,19 @@ class ApplicationMenuItem extends PopupM +@@ -59,8 +61,19 @@ let textureCache = St.TextureCache.get_default(); let iconThemeChangedId = textureCache.connect('icon-theme-changed', this._updateIcon.bind(this)); @@ -31,8 +29,8 @@ }); this._updateIcon(); -@@ -84,6 +97,106 @@ class ApplicationMenuItem extends PopupM - }); +@@ -75,6 +88,106 @@ + }; } + _onKeyboardPopupMenu() { @@ -137,4 +135,4 @@ + activate(event) { this._app.open_new_window(-1); - this._button.selectCategory(null, null); + this._button.selectCategory(null); ++++++ gnome-shell-extensions-3.30.1.tar.xz -> gnome-shell-extensions-3.32.1.tar.xz ++++++ ++++ 8086 lines of diff (skipped) ++++++ gnome-shell-favorites-menu-at-end.patch ++++++ --- /var/tmp/diff_new_pack.SpYSqt/_old 2019-05-03 22:17:00.564054311 +0200 +++ /var/tmp/diff_new_pack.SpYSqt/_new 2019-05-03 22:17:00.564054311 +0200 @@ -1,11 +1,8 @@ - -Index: gnome-shell-extensions-3.27.91/extensions/apps-menu/extension.js -=================================================================== ---- gnome-shell-extensions-3.27.91.orig/extensions/apps-menu/extension.js -+++ gnome-shell-extensions-3.27.91/extensions/apps-menu/extension.js -@@ -32,6 +32,10 @@ const HORIZ_FACTOR = 5; - const MENU_HEIGHT_OFFSET = 132; - const NAVIGATION_REGION_OVERSHOOT = 50; +--- gnome-shell-extensions-3.32.0.orig/extensions/apps-menu/extension.js 2019-03-20 16:13:13.614381612 +0800 ++++ gnome-shell-extensions-3.32.0/extensions/apps-menu/extension.js 2019-03-20 16:07:47.238041280 +0800 +@@ -27,6 +27,10 @@ + Gio._promisify(Gio._LocalFilePrototype, 'query_info_async', 'query_info_finish'); + Gio._promisify(Gio._LocalFilePrototype, 'set_attributes_async', 'set_attributes_finish'); +function isSLEClassicMode() { + return Main.sessionMode.currentMode == "sle-classic" ? true : false; @@ -14,7 +11,7 @@ class ActivitiesMenuItem extends PopupMenu.PopupBaseMenuItem { constructor(button) { super(); -@@ -776,8 +780,6 @@ class ApplicationsButton extends PanelMe +@@ -775,8 +779,6 @@ this.applicationsByCategory = {}; this._tree.load_sync(); let root = this._tree.get_root_directory(); @@ -23,7 +20,7 @@ let iter = root.iter(); let nextType; while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) { -@@ -795,6 +797,10 @@ class ApplicationsButton extends PanelMe +@@ -796,6 +798,10 @@ } } ++++++ gse-sle-classic-ext.patch ++++++ --- /var/tmp/diff_new_pack.SpYSqt/_old 2019-05-03 22:17:00.572054327 +0200 +++ /var/tmp/diff_new_pack.SpYSqt/_new 2019-05-03 22:17:00.576054335 +0200 @@ -1,7 +1,7 @@ -Index: gnome-shell-extensions-3.29.90/extensions/window-list/classic.css -=================================================================== ---- gnome-shell-extensions-3.29.90.orig/extensions/window-list/classic.css -+++ gnome-shell-extensions-3.29.90/extensions/window-list/classic.css +diff --git a/extensions/window-list/classic.css b/extensions/window-list/classic.css +index f3c44a3..8096d27 100644 +--- a/extensions/window-list/classic.css ++++ b/extensions/window-list/classic.css @@ -6,7 +6,7 @@ height: 2.25em ; } @@ -43,11 +43,11 @@ color: #888; box-shadow: inset -1px -1px 1px rgba(0,0,0,0.5); } -Index: gnome-shell-extensions-3.29.90/extensions/window-list/extension.js -=================================================================== ---- gnome-shell-extensions-3.29.90.orig/extensions/window-list/extension.js -+++ gnome-shell-extensions-3.29.90/extensions/window-list/extension.js -@@ -27,6 +27,398 @@ const GroupingMode = { +diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js +index e1ea742..9764745 100644 +--- a/extensions/window-list/extension.js ++++ b/extensions/window-list/extension.js +@@ -21,6 +21,398 @@ const GroupingMode = { ALWAYS: 2 }; @@ -325,7 +325,7 @@ + let [, childWidth] = children[0].get_preferred_width(-1); + let spacing = this.actor.layout_manager.spacing; + -+ let workspace = global.screen.get_active_workspace(); ++ let workspace = global.workspace_manager.get_active_workspace(); + let windows = global.display.get_tab_list(Meta.TabList.NORMAL, workspace); + if (this._perMonitor) + windows = windows.filter(w => w.get_monitor() == this._monitor.index); @@ -356,9 +356,9 @@ + } + + _disconnectWorkspaceSignals() { -+ let numWorkspaces = global.screen.n_workspaces; ++ let numWorkspaces = global.workspace_manager.n_workspaces; + for (let i = 0; i < numWorkspaces; i++) { -+ let workspace = global.screen.get_workspace_by_index(i); ++ let workspace = global.workspace_manager.get_workspace_by_index(i); + let signals = this._workspaceSignals.get(workspace); + this._workspaceSignals.delete(workspace); + workspace.disconnect(signals._windowAddedId); @@ -372,7 +372,7 @@ + Main.overview.disconnect(this._overviewShowingId); + this._overviewShowingId = 0; + -+ global.screen.disconnect(this._nWorkspacesChangedId); ++ global.workspace_manager.disconnect(this._nWorkspacesChangedId); + this._nWorkspacesChangedId = 0; + global.window_manager.disconnect(this._switchWorkspaceId); + this._switchWorkspaceId = 0; @@ -445,9 +445,29 @@ +}; function _minimizeOrActivateWindow(window) { - let focusWindow = global.display.focus_window; -@@ -1257,5 +1649,10 @@ class Extension { - }; + let focusWindow = global.display.focus_window; +@@ -644,8 +1036,8 @@ class AppButton extends BaseButton { + } + + +-let WorkspaceIndicator = GObject.registerClass( +-class WorkspaceIndicator extends PanelMenu.Button { ++let WorkspaceIndicatorWList = GObject.registerClass( ++class WorkspaceIndicatorWList extends PanelMenu.Button { + _init() { + super._init(0.0, _('Workspace Indicator'), true); + this.setMenu(new PopupMenu.PopupMenu(this, 0.0, St.Side.BOTTOM)); +@@ -808,7 +1200,7 @@ class WindowList { + let indicatorsBox = new St.BoxLayout({ x_align: Clutter.ActorAlign.END }); + box.add(indicatorsBox); + +- this._workspaceIndicator = new WorkspaceIndicator(); ++ this._workspaceIndicator = new WorkspaceIndicatorWList(); + indicatorsBox.add(this._workspaceIndicator.container, { expand: false, y_fill: true }); + + this._mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' }); +@@ -1259,5 +1651,10 @@ class Extension { + } function init() { - return new Extension(); @@ -458,10 +478,10 @@ + return new Extension(); + } } -Index: gnome-shell-extensions-3.29.90/extensions/window-list/stylesheet.css -=================================================================== ---- gnome-shell-extensions-3.29.90.orig/extensions/window-list/stylesheet.css -+++ gnome-shell-extensions-3.29.90/extensions/window-list/stylesheet.css +diff --git a/extensions/window-list/stylesheet.css b/extensions/window-list/stylesheet.css +index f5285cb..c207078 100644 +--- a/extensions/window-list/stylesheet.css ++++ b/extensions/window-list/stylesheet.css @@ -79,6 +79,10 @@ border: 1px solid #cccccc; } @@ -473,10 +493,10 @@ .notification { font-weight: normal; } -Index: gnome-shell-extensions-3.29.90/data/gnome-classic.scss -=================================================================== ---- gnome-shell-extensions-3.29.90.orig/data/gnome-classic.scss -+++ gnome-shell-extensions-3.29.90/data/gnome-classic.scss +diff --git a/data/gnome-classic.scss b/data/gnome-classic.scss +index 9e23506..be56527 100644 +--- a/data/gnome-classic.scss ++++ b/data/gnome-classic.scss @@ -103,3 +103,15 @@ $variant: 'light'; &:hover, &focus { background-color: darken($bg_color,2%); } } ++++++ sle-classic@suse.com.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sle-classic@suse.com/convenience.js new/sle-classic@suse.com/convenience.js --- old/sle-classic@suse.com/convenience.js 2017-12-08 04:11:43.873463586 +0100 +++ new/sle-classic@suse.com/convenience.js 1970-01-01 01:00:00.000000000 +0100 @@ -1,93 +0,0 @@ -/* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* - Copyright (c) 2011-2012, Giovanni Campagna <scampa.giovanni@gmail.com> - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the GNOME nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -const Gettext = imports.gettext; -const Gio = imports.gi.Gio; - -const Config = imports.misc.config; -const ExtensionUtils = imports.misc.extensionUtils; - -/** - * initTranslations: - * @domain: (optional): the gettext domain to use - * - * Initialize Gettext to load translations from extensionsdir/locale. - * If @domain is not provided, it will be taken from metadata['gettext-domain'] - */ -function initTranslations(domain) { - let extension = ExtensionUtils.getCurrentExtension(); - - domain = domain || extension.metadata['gettext-domain']; - - // check if this extension was built with "make zip-file", and thus - // has the locale files in a subfolder - // otherwise assume that extension has been installed in the - // same prefix as gnome-shell - let localeDir = extension.dir.get_child('locale'); - if (localeDir.query_exists(null)) - Gettext.bindtextdomain(domain, localeDir.get_path()); - else - Gettext.bindtextdomain(domain, Config.LOCALEDIR); -} - -/** - * getSettings: - * @schema: (optional): the GSettings schema id - * - * Builds and return a GSettings schema for @schema, using schema files - * in extensionsdir/schemas. If @schema is not provided, it is taken from - * metadata['settings-schema']. - */ -function getSettings(schema) { - let extension = ExtensionUtils.getCurrentExtension(); - - schema = schema || extension.metadata['settings-schema']; - - const GioSSS = Gio.SettingsSchemaSource; - - // check if this extension was built with "make zip-file", and thus - // has the schema files in a subfolder - // otherwise assume that extension has been installed in the - // same prefix as gnome-shell (and therefore schemas are available - // in the standard folders) - let schemaDir = extension.dir.get_child('schemas'); - let schemaSource; - if (schemaDir.query_exists(null)) - schemaSource = GioSSS.new_from_directory(schemaDir.get_path(), - GioSSS.get_default(), - false); - else - schemaSource = GioSSS.get_default(); - - let schemaObj = schemaSource.lookup(schema, true); - if (!schemaObj) - throw new Error('Schema ' + schema + ' could not be found for extension ' - + extension.metadata.uuid + '. Please check your installation.'); - - return new Gio.Settings({ settings_schema: schemaObj }); -} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sle-classic@suse.com/extension.js new/sle-classic@suse.com/extension.js --- old/sle-classic@suse.com/extension.js 2018-09-06 09:00:25.916630632 +0200 +++ new/sle-classic@suse.com/extension.js 2019-04-09 08:16:08.013005210 +0200 @@ -4,7 +4,7 @@ const GLib = imports.gi.GLib; const Meta = imports.gi.Meta; const Clutter = imports.gi.Clutter; -const Lang = imports.lang; +const Gi = imports._gi; const Panel = imports.ui.panel.Panel; const Layout = imports.ui.layout; const OverviewControls = imports.ui.overviewControls; @@ -15,8 +15,6 @@ const _ = Gettext.gettext; const ExtensionUtils = imports.misc.extensionUtils; -const Me = ExtensionUtils.getCurrentExtension(); -const Convenience = Me.imports.convenience; const CLASSIC_OVERRIDES_SCHEMA = 'org.gnome.shell.extensions.classic-overrides'; @@ -35,7 +33,7 @@ // list. // // NOTE: has to be a *direct* replacement to have proper `this` setup -function sle_classic_allocate (actor, box, flags) { +function sle_classic_allocate (box, flags) { // NOTE: for convenience, the followings are shared. The params of this // function is also shared. let allocWidth = box.x2 - box.x1; @@ -294,11 +292,11 @@ let computeScaleAndSpaceOrigin; let computeWindowSlotsOrigin; let layoutAllocationChangedId; -let mainPanelActorAllocateId; let heightChangeId; +let _origVfuncAllocate; function init() { - Convenience.initTranslations(); + ExtensionUtils.initTranslations(); _updateBoxesOrigin = Main.layoutManager._updateBoxes; @@ -311,24 +309,29 @@ if (!isSLEClassicMode()) return; - mainPanelActorAllocateId = Main.panel.actor.connect('allocate', Lang.bind(Main.panel, sle_classic_allocate)); + _origVfuncAllocate = Main.panel.__proto__.vfunc_allocate; + + Main.panel.__proto__[Gi.hook_up_vfunc_symbol]('allocate', (box, flags) => { + Main.panel.vfunc_allocate.call(Main.panel, box, flags); + sle_classic_allocate.call(Main.panel, box, flags); + }); Main.layoutManager._updateBoxes = _updateBoxesNew; //bsc#1064378 let layout = Main.overview._controls.actor.layout_manager; - layoutAllocationChangedId = layout.connect('allocation-changed', Lang.bind(Main.overview._controls, _updateWorkspacesGeometryNew)); + layoutAllocationChangedId = layout.connect('allocation-changed', _updateWorkspacesGeometryNew.bind(Main.overview._controls)); //bsc#1064378 Workspace.LayoutStrategy.prototype.computeScaleAndSpace = computeScaleAndSpaceNew; Workspace.LayoutStrategy.prototype.computeWindowSlots = computeWindowSlotsNew; //bsc#1046570 - heightChangeId = Main.panel.actor.connect('notify::height', Lang.bind(this, function() { + heightChangeId = Main.panel.connect('notify::height', () => { let primaryMonitor = Main.layoutManager.primaryMonitor; Main.layoutManager.panelBox.set_position(primaryMonitor.x, - primaryMonitor.y + primaryMonitor.height - Main.panel.actor.height); - })); + primaryMonitor.y + primaryMonitor.height - Main.panel.height); + }); Main.layoutManager._monitorsChanged(); } @@ -337,8 +340,10 @@ let primaryMonitor = Main.layoutManager.primaryMonitor; Main.layoutManager.panelBox.set_position(primaryMonitor.x, primaryMonitor.y); - if (mainPanelActorAllocateId) - Main.panel.actor.disconnect(mainPanelActorAllocateId); + if (_origVfuncAllocate) { + Main.panel.__proto__[Gi.hook_up_vfunc_symbol]('allocate', _origVfuncAllocate); + _origVfuncAllocate = null; + } Main.layoutManager._updateBoxes = _updateBoxesOrigin; @@ -353,5 +358,5 @@ //bsc#1046570 if (heightChangeId) - Main.panel.actor.disconnect(heightChangeId); + Main.panel.disconnect(heightChangeId); }