Hello community, here is the log from the commit of package gnome-shell-extensions for openSUSE:Factory checked in at 2019-12-11 12:05:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-shell-extensions (Old) and /work/SRC/openSUSE:Factory/.gnome-shell-extensions.new.4691 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-shell-extensions" Wed Dec 11 12:05:34 2019 rev:92 rq:755668 version:3.34.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-shell-extensions/gnome-shell-extensions.changes 2019-10-22 15:41:44.297463194 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-shell-extensions.new.4691/gnome-shell-extensions.changes 2019-12-11 12:05:56.320719821 +0100 @@ -1,0 +2,13 @@ +Tue Dec 10 00:58:50 UTC 2019 - Xiaoguang Wang <xw...@suse.com> + +- Update gse-sle-classic-ext.patch: Adapt version 3.34.1 + (bsc#1158496). +- Remove file sle-classic-xorg.desktop: now sle-classic only works + on X, we don't need this file anymore. + +------------------------------------------------------------------- +Mon Dec 2 09:17:46 UTC 2019 - Frederic Crozat <fcro...@suse.com> + +- Rebase patch gnome-classic-s390-not-require-g-s-d_wacom.patch. + +------------------------------------------------------------------- Old: ---- sle-classic-xorg.desktop ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-shell-extensions.spec ++++++ --- /var/tmp/diff_new_pack.y2SeKa/_old 2019-12-11 12:05:58.156719049 +0100 +++ /var/tmp/diff_new_pack.y2SeKa/_new 2019-12-11 12:05:58.156719049 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-shell-extensions # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # Copyright (c) 2011 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -29,7 +29,6 @@ Source1: README.SUSE Source2: sle-classic.desktop Source3: SLE-theme.tar.gz -Source4: sle-classic-xorg.desktop Source5: sle-classic.json Source6: sle-clas...@suse.com.tar.gz Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override @@ -148,7 +147,6 @@ cp sle-clas...@suse.com/* %{buildroot}/%{_datadir}/gnome-shell/extensions/sle-clas...@suse.com install -m0644 %{SOURCE7} %{buildroot}/%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.extensions.sle-classic.gschema.override %if !0%{?is_opensuse} -install -m0644 %{SOURCE4} %{buildroot}/%{_datadir}/xsessions/sle-classic-xorg.desktop tar -xzvf %{SOURCE3} install -d %{buildroot}%{_datadir}/gnome-shell/theme cp SLE-theme/theme/* %{buildroot}%{_datadir}/gnome-shell/theme @@ -214,7 +212,6 @@ %dir %{_datadir}/wayland-sessions %{_datadir}/gnome-shell/theme/sle-background.png %{_datadir}/xsessions/default.desktop -%{_datadir}/xsessions/sle-classic-xorg.desktop %{_datadir}/wayland-sessions/default.desktop %ghost %{_sysconfdir}/alternatives/default-xsession.desktop %ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop ++++++ gnome-classic-s390-not-require-g-s-d_wacom.patch ++++++ --- /var/tmp/diff_new_pack.y2SeKa/_old 2019-12-11 12:05:58.216719024 +0100 +++ /var/tmp/diff_new_pack.y2SeKa/_new 2019-12-11 12:05:58.216719024 +0100 @@ -1,9 +1,9 @@ -Index: gnome-shell-extensions-3.32.0/data/gnome-classic.session.desktop.in +Index: gnome-shell-extensions-3.34.1/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 +--- gnome-shell-extensions-3.34.1.orig/data/gnome-classic.session.desktop.in 2019-12-02 10:17:20.012181181 +0100 ++++ gnome-shell-extensions-3.34.1/data/gnome-classic.session.desktop.in 2019-12-02 10:17:37.176181929 +0100 @@ -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; +-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;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.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;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; ++++++ gse-sle-classic-ext.patch ++++++ --- /var/tmp/diff_new_pack.y2SeKa/_old 2019-12-11 12:05:58.232719017 +0100 +++ /var/tmp/diff_new_pack.y2SeKa/_new 2019-12-11 12:05:58.232719017 +0100 @@ -12,7 +12,63 @@ function _minimizeOrActivateWindow(window) { let focusWindow = global.display.focus_window; -@@ -1141,19 +1144,45 @@ class Extension { +@@ -691,11 +694,13 @@ const WindowList = GObject.registerClass + let box = new St.BoxLayout({ x_expand: true, y_expand: true }); + this.add_actor(box); + +- let toggle = new WindowPickerToggle(); +- box.add_actor(toggle); ++ if (!isSLEClassicMode()) { ++ let toggle = new WindowPickerToggle(); ++ box.add_actor(toggle); + +- toggle.connect('notify::checked', +- this._updateWindowListVisibility.bind(this)); ++ toggle.connect('notify::checked', ++ this._updateWindowListVisibility.bind(this)); ++ } + + let layout = new Clutter.BoxLayout({ homogeneous: true }); + this._windowList = new St.Widget({ +@@ -837,7 +842,8 @@ const WindowList = GObject.registerClass + let workspacesOnMonitor = this._monitor === Main.layoutManager.primaryMonitor || + !this._mutterSettings.get_boolean('workspaces-only-on-primary'); + +- this._workspaceIndicator.visible = hasWorkspaces && workspacesOnMonitor; ++ if (this._workspaceIndicator != null) ++ this._workspaceIndicator.visible = hasWorkspaces && workspacesOnMonitor; + } + + _updateWindowListVisibility() { +@@ -873,6 +879,9 @@ const WindowList = GObject.registerClass + } + + _getMaxWindowListWidth() { ++ if (this._workspaceIndicator == null) ++ return this.width; ++ + let indicatorsBox = this._workspaceIndicator.get_parent(); + return this.width - indicatorsBox.get_preferred_width(-1)[1]; + } +@@ -1082,7 +1091,8 @@ const WindowList = GObject.registerClass + this._mutterSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId); + this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId); + +- this._workspaceIndicator.destroy(); ++ if (this._workspaceIndicator != null) ++ this._workspaceIndicator.destroy(); + + Main.ctrlAltTabManager.removeGroup(this); + +@@ -1122,6 +1132,7 @@ class Extension { + constructor() { + this._windowLists = null; + this._hideOverviewOrig = Main.overview.hide; ++ this._isSLEClassic = isSLEClassicMode(); + } + + enable() { +@@ -1141,19 +1152,47 @@ class Extension { this._hideOverviewOrig.call(Main.overview); }; @@ -45,11 +101,13 @@ - if (showOnAllMonitors || monitor === Main.layoutManager.primaryMonitor) + if (isSLEClassicMode()){ + 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); -+ Main.panel._centerBox.add(list._windowList, {expand: true, x_align: St.Align.START}); ++ Main.panel._centerBox.add_child(list._windowList); + + this._windowLists.push(list); + } else { @@ -62,19 +120,23 @@ } disable() { -@@ -1167,6 +1196,7 @@ class Extension { +@@ -1167,6 +1206,11 @@ class Extension { this._monitorsChangedId = 0; this._windowLists.forEach(windowList => { -+ Main.panel._centerBox.remove_child(windowList._windowList); ++ if (this._isSLEClassic) { ++ Main.panel._centerBox.remove_child(windowList._windowList); ++ let [box] = windowList.get_children(); ++ box.add_child(windowList._windowList); ++ } windowList.hide(); windowList.destroy(); }); -@@ -1175,6 +1205,11 @@ class Extension { +@@ -1175,6 +1219,11 @@ class Extension { Main.windowPicker.destroy(); delete Main.windowPicker; -+ if (isSLEClassicMode()) { ++ if (this._isSLEClassic) { + Main.overview.disconnect(this.overviewShowingId); + Main.overview.disconnect(this.overviewHidingId); + }