Hello community,
here is the log from the commit of package gnome-shell-extensions for
openSUSE:Factory checked in at 2017-11-12 17:57:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-shell-extensions (Old)
and /work/SRC/openSUSE:Factory/.gnome-shell-extensions.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-shell-extensions"
Sun Nov 12 17:57:33 2017 rev:71 rq:540575 version:3.26.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/gnome-shell-extensions/gnome-shell-extensions.changes
2017-11-10 14:45:15.298423677 +0100
+++
/work/SRC/openSUSE:Factory/.gnome-shell-extensions.new/gnome-shell-extensions.changes
2017-11-12 17:57:34.335252514 +0100
@@ -1,0 +2,7 @@
+Thu Nov 9 01:37:47 UTC 2017 - xw...@suse.com
+
+- Apply SLE-Classic session on Tumbleweed (bsc#1051772).
+ + Rename sle-classic-favorites-menu-at-end.patch to
+ gnome-shell-favorites-menu-at-end.patch
+
+-------------------------------------------------------------------
Old:
----
sle-classic-favorites-menu-at-end.patch
New:
----
gnome-shell-favorites-menu-at-end.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-shell-extensions.spec ++++++
--- /var/tmp/diff_new_pack.aeAsdj/_old 2017-11-12 17:57:35.071225708 +0100
+++ /var/tmp/diff_new_pack.aeAsdj/_new 2017-11-12 17:57:35.075225562 +0100
@@ -34,8 +34,8 @@
Source6: sle-clas...@suse.com.tar.gz
# PATCH-FEATURE-OPENSUSE gnome-shell-add-app-to-desktop.patch bnc#870580
dli...@suse.com -- allow adding app shortcut to desktop easily.
Patch1: gnome-shell-add-app-to-desktop.patch
-# PATCH-FEATURE-SLE sle-classic-favorites-menu-at-end.patch bnc#890989
cxi...@suse.com -- put the favorites at the end of the app catogories for
accessibility reason -- cxi...@suse.com bnc#890989
-Patch2: sle-classic-favorites-menu-at-end.patch
+# PATCH-FEATURE-OPENSUSE sle-classic-favorites-menu-at-end.patch bnc#890989
cxi...@suse.com -- put the favorites at the end of the app catogories for
accessibility reason -- cxi...@suse.com bnc#890989
+Patch2: gnome-shell-favorites-menu-at-end.patch
# PATCH-FEATURE-SLE sle-classic-lock-screen-background.patch bsc#1007468
xw...@suse.com -- add SUSE logo on lock screen when auth is requested
Patch3: sle-classic-lock-screen-background.patch
## NOTE keep SLE Classic patch at the bottom
@@ -99,13 +99,13 @@
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
%if !0%{?is_opensuse}
translation-update-upstream
gnome-patch-translation-prepare
-%patch2 -p1
%patch3 -p1
-%patch1000 -p1
%endif
+%patch1000 -p1
##gnome-patch-translation-update
# In openSUSE GNOME, we don't launch gnome-session directly, but wrap this
through a shell script, /usr/bin/gnome
sed -i "s:Exec=gnome-session:Exec=gnome:g" data/gnome-classic.desktop.in
@@ -116,9 +116,7 @@
%build
CLASSIC_EXTENSIONS=$(awk -F\" '/^CLASSIC_EXTENSIONS=/{ print $2 }'
configure.ac)
-%if !0%{?is_opensuse}
CLASSIC_EXTENSIONS="${CLASSIC_EXTENSIONS} workspace-indicator"
-%endif
%configure \
--enable-classic-mode \
--enable-extensions="$CLASSIC_EXTENSIONS"
@@ -127,23 +125,25 @@
%install
%make_install
%find_lang %{name} %{?no_lang_C}
-%if !0%{?is_opensuse}
install -m0644 %{SOURCE2}
%{buildroot}/%{_datadir}/xsessions/sle-classic.desktop
-install -m0644 %{SOURCE4}
%{buildroot}/%{_datadir}/xsessions/sle-classic-xorg.desktop
cp
%{buildroot}/%{_datadir}/gnome-shell/extensions/window-l...@gnome-shell-extensions.gcampax.github.com/classic.css
\
%{buildroot}/%{_datadir}/gnome-shell/extensions/window-l...@gnome-shell-extensions.gcampax.github.com/sle-classic.css
install -m0644 %{SOURCE5}
%{buildroot}/%{_datadir}/gnome-shell/modes/sle-classic.json
install -d -m755 %{buildroot}%{_datadir}/wayland-sessions
install -m0644 %{SOURCE2}
%{buildroot}/%{_datadir}/wayland-sessions/sle-classic.desktop
# Install SLE theme
-tar -xzvf %{SOURCE3}
-install -d %{buildroot}%{_datadir}/gnome-shell/theme
-cp SLE-theme/theme/* %{buildroot}%{_datadir}/gnome-shell/theme
#Install sle-clas...@suse.com extension
tar -xzvf %{SOURCE6}
install -d %{buildroot}%{_datadir}/gnome-shell/extensions/sle-clas...@suse.com
cp sle-clas...@suse.com/*
%{buildroot}%{_datadir}/gnome-shell/extensions/sle-clas...@suse.com
+%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
+%endif
+%if !0%{?is_opensuse}
# Prepare for 'default.desktop' being update-alternative handled, boo#1039756
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
@@ -180,9 +180,7 @@
%{_datadir}/gnome-shell/extensions/apps-m...@gnome-shell-extensions.gcampax.github.com/
%{_datadir}/gnome-shell/extensions/launch-new-insta...@gnome-shell-extensions.gcampax.github.com/
%{_datadir}/gnome-shell/extensions/places-m...@gnome-shell-extensions.gcampax.github.com/
-%if !0%{?is_opensuse}
%{_datadir}/gnome-shell/extensions/workspace-indica...@gnome-shell-extensions.gcampax.github.com/
-%endif
%{_datadir}/gnome-shell/extensions/window-l...@gnome-shell-extensions.gcampax.github.com/
%dir %{_datadir}/gnome-shell/modes
%{_datadir}/gnome-shell/modes/classic.json
@@ -196,17 +194,17 @@
%{_datadir}/gnome-shell/theme/gnome-classic.css
%{_datadir}/gnome-shell/theme/gnome-classic-high-contrast.css
%{_datadir}/xsessions/gnome-classic.desktop
-%if !0%{?is_opensuse}
-%{_datadir}/xsessions/default.desktop
%{_datadir}/xsessions/sle-classic.desktop
-%{_datadir}/xsessions/sle-classic-xorg.desktop
%{_datadir}/gnome-shell/extensions/window-l...@gnome-shell-extensions.gcampax.github.com/sle-classic.css
%{_datadir}/gnome-shell/modes/sle-classic.json
%{_datadir}/gnome-shell/extensions/sle-clas...@suse.com/
%dir %{_datadir}/wayland-sessions
-%{_datadir}/wayland-sessions/default.desktop
%{_datadir}/wayland-sessions/sle-classic.desktop
+%if !0%{?is_opensuse}
%{_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
%endif
++++++ gnome-shell-favorites-menu-at-end.patch ++++++
Index: gnome-shell-extensions-3.26.1/extensions/apps-menu/extension.js
===================================================================
--- gnome-shell-extensions-3.26.1.orig/extensions/apps-menu/extension.js
+++ gnome-shell-extensions-3.26.1/extensions/apps-menu/extension.js
@@ -33,6 +33,10 @@ const HORIZ_FACTOR = 5;
const MENU_HEIGHT_OFFSET = 132;
const NAVIGATION_REGION_OVERSHOOT = 50;
+function isSLEClassicMode() {
+ return Main.sessionMode.currentMode == "sle-classic" ? true : false;
+}
+
const ActivitiesMenuItem = new Lang.Class({
Name: 'ActivitiesMenuItem',
Extends: PopupMenu.PopupBaseMenuItem,
@@ -790,8 +794,6 @@ const ApplicationsButton = new Lang.Clas
let tree = new GMenu.Tree({ menu_basename: 'applications.menu' });
tree.load_sync();
let root = tree.get_root_directory();
- let categoryMenuItem = new CategoryMenuItem(this, null);
- this.categoriesBox.add_actor(categoryMenuItem.actor);
let iter = root.iter();
let nextType;
while ((nextType = iter.next()) != GMenu.TreeItemType.INVALID) {
@@ -809,6 +811,10 @@ const ApplicationsButton = new Lang.Clas
}
}
+ let categoryMenuItem = new CategoryMenuItem(this, null);
+ this.categoriesBox.insert_child_at_index(categoryMenuItem.actor,
+ isSLEClassicMode() ? -1 : 0);
+
//Load applications
this._displayButtons(this._listApplications(null));
