Dominique Leuenberger 2019-04-17 12:56:20 +00:00 committed by Git OBS Bridge
parent e6ed1e650f
commit aae8ec931b
9 changed files with 144 additions and 58 deletions

View File

@ -0,0 +1,9 @@
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;

View File

@ -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 @@ Index: gnome-shell-extensions-3.27.91/extensions/apps-menu/extension.js
});
this._updateIcon();
@@ -84,6 +97,106 @@ class ApplicationMenuItem extends PopupM
});
@@ -75,6 +88,106 @@
};
}
+ _onKeyboardPopupMenu() {
@ -137,4 +135,4 @@ Index: gnome-shell-extensions-3.27.91/extensions/apps-menu/extension.js
+
activate(event) {
this._app.open_new_window(-1);
this._button.selectCategory(null, null);
this._button.selectCategory(null);

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7301209ff143f9e83d43f9521ab53c9f8db0104ce562e4ec8a49c5e1cb13dbf
size 198652

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:85de915dda1ec20e071b8bd996cb800a4e381f1aea37ea4939446f73e18ef973
size 198316

View File

@ -1,3 +1,61 @@
-------------------------------------------------------------------
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.
-------------------------------------------------------------------
Tue Oct 9 10:12:44 UTC 2018 - bjorn.lie@gmail.com

View File

@ -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
@ -20,13 +20,13 @@
%global __requires_exclude typelib\\(Meta\\)
Name: gnome-shell-extensions
Version: 3.30.1
Version: 3.32.0
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
@ -39,6 +39,8 @@ Source7: 00_org.gnome.shell.extensions.sle-classic.gschema.override
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
@ -103,8 +105,12 @@ and also installs the required session files.
%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 +126,7 @@ sed -i -e 's/openSUSE/SUSE Linux Enterprise/g' README.SUSE
%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 +177,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
%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 +184,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
%{_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/

View File

@ -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 @@ Index: gnome-shell-extensions-3.27.91/extensions/apps-menu/extension.js
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 @@ Index: gnome-shell-extensions-3.27.91/extensions/apps-menu/extension.js
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 @@
}
}

View File

@ -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 @@ Index: gnome-shell-extensions-3.29.90/extensions/window-list/classic.css
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 @@ Index: gnome-shell-extensions-3.29.90/extensions/window-list/extension.js
+ 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 @@ Index: gnome-shell-extensions-3.29.90/extensions/window-list/extension.js
+ }
+
+ _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 @@ Index: gnome-shell-extensions-3.29.90/extensions/window-list/extension.js
+ 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 @@ Index: gnome-shell-extensions-3.29.90/extensions/window-list/extension.js
+};
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 @@ Index: gnome-shell-extensions-3.29.90/extensions/window-list/extension.js
+ 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 @@ Index: gnome-shell-extensions-3.29.90/extensions/window-list/stylesheet.css
.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%); }
}

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fc36d2a43f64bf66296efd72b38e8fc0244935eba260f156265e5c8bdefe68fc
size 6130
oid sha256:054dd31d07c0870e93e1ba0f7d0e9933c85f3bd2632009934dc847a217238d7b
size 4515