From 6d4341f8a46e20407372ad64a74c1be822c5ef03 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Sun, 30 Nov 2014 15:07:11 +0000 Subject: [PATCH] * New upstream bugfix release. * menu-arrows-icons: new patch. Make arrows consistent with the rest of the shell. * apps-center-labels.patch: patch from upstream git. Center labels vertically in the applications menu. * window-list-pointerInNotification.patch: patch from upstream git. Update window-list extension for an older shell API change. --- debian/changelog | 12 +++++ debian/patches/apps-center-labels.patch | 27 +++++++++++ debian/patches/menu-arrows-icons.patch | 45 +++++++++++++++++++ debian/patches/series | 3 ++ .../window-list-pointerInNotification.patch | 24 ++++++++++ 5 files changed, 111 insertions(+) create mode 100644 debian/patches/apps-center-labels.patch create mode 100644 debian/patches/menu-arrows-icons.patch create mode 100644 debian/patches/window-list-pointerInNotification.patch diff --git a/debian/changelog b/debian/changelog index 426dcd25..518684fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +gnome-shell-extensions (3.14.2-1) unstable; urgency=medium + + * New upstream bugfix release. + * menu-arrows-icons: new patch. Make arrows consistent with the rest + of the shell. + * apps-center-labels.patch: patch from upstream git. Center labels + vertically in the applications menu. + * window-list-pointerInNotification.patch: patch from upstream git. + Update window-list extension for an older shell API change. + + -- Josselin Mouette Sun, 30 Nov 2014 16:06:59 +0100 + gnome-shell-extensions (3.14.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/apps-center-labels.patch b/debian/patches/apps-center-labels.patch new file mode 100644 index 00000000..afa7261f --- /dev/null +++ b/debian/patches/apps-center-labels.patch @@ -0,0 +1,27 @@ +From 79f263d1edbd6f7cfe13cf89933941b439325cee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 26 Nov 2014 19:03:49 +0100 +Subject: apps-menu: Center app labels + +Currently labels are not vertically centered, unlike icons. +Fix this. + +https://bugzilla.gnome.org/show_bug.cgi?id=740724 + +diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js +index a8fb74d..f8438fd 100644 +--- a/extensions/apps-menu/extension.js ++++ b/extensions/apps-menu/extension.js +@@ -58,7 +58,8 @@ const ApplicationMenuItem = new Lang.Class({ + this._iconBin = new St.Bin(); + this.actor.add_child(this._iconBin); + +- let appLabel = new St.Label({ text: app.get_name() }); ++ let appLabel = new St.Label({ text: app.get_name(), y_expand: true, ++ y_align: Clutter.ActorAlign.CENTER }); + this.actor.add_child(appLabel, { expand: true }); + this.actor.label_actor = appLabel; + +-- +cgit v0.10.1 + diff --git a/debian/patches/menu-arrows-icons.patch b/debian/patches/menu-arrows-icons.patch new file mode 100644 index 00000000..3038769b --- /dev/null +++ b/debian/patches/menu-arrows-icons.patch @@ -0,0 +1,45 @@ +Index: gnome-shell-extensions-3.14.2/extensions/apps-menu/extension.js +=================================================================== +--- gnome-shell-extensions-3.14.2.orig/extensions/apps-menu/extension.js 2014-10-07 13:54:01.000000000 +0200 ++++ gnome-shell-extensions-3.14.2/extensions/apps-menu/extension.js 2014-11-30 15:59:57.300620972 +0100 +@@ -283,9 +283,7 @@ const ApplicationsButton = new Lang.Clas + y_expand: true, + y_align: Clutter.ActorAlign.CENTER }); + hbox.add_child(this._label); +- hbox.add_child(new St.Label({ text: '\u25BE', +- y_expand: true, +- y_align: Clutter.ActorAlign.CENTER })); ++ hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); + + this.actor.add_actor(hbox); + this.actor.name = 'panelApplications'; +Index: gnome-shell-extensions-3.14.2/extensions/drive-menu/extension.js +=================================================================== +--- gnome-shell-extensions-3.14.2.orig/extensions/drive-menu/extension.js 2014-11-30 15:59:14.629264311 +0100 ++++ gnome-shell-extensions-3.14.2/extensions/drive-menu/extension.js 2014-11-30 15:59:32.344997226 +0100 +@@ -128,9 +128,7 @@ const DriveMenu = new Lang.Class({ + style_class: 'system-status-icon' }); + + hbox.add_child(icon); +- hbox.add_child(new St.Label({ text: '\u25BE', +- y_expand: true, +- y_align: Clutter.ActorAlign.CENTER })); ++ hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); + this.actor.add_child(hbox); + + this._monitor = Gio.VolumeMonitor.get(); +Index: gnome-shell-extensions-3.14.2/extensions/places-menu/extension.js +=================================================================== +--- gnome-shell-extensions-3.14.2.orig/extensions/places-menu/extension.js 2014-10-07 13:54:01.000000000 +0200 ++++ gnome-shell-extensions-3.14.2/extensions/places-menu/extension.js 2014-11-30 15:57:44.382624700 +0100 +@@ -82,9 +82,7 @@ const PlacesMenu = new Lang.Class({ + y_expand: true, + y_align: Clutter.ActorAlign.CENTER }); + hbox.add_child(label); +- hbox.add_child(new St.Label({ text: '\u25BE', +- y_expand: true, +- y_align: Clutter.ActorAlign.CENTER })); ++ hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM)); + this.actor.add_actor(hbox); + + this.placesManager = new PlaceDisplay.PlacesManager(); diff --git a/debian/patches/series b/debian/patches/series index 6410b5c4..c3746d7d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,5 @@ dont-require-nautilus-classic.patch gnome-session-classic-wrapper-script.patch +menu-arrows-icons.patch +apps-center-labels.patch +window-list-pointerInNotification.patch diff --git a/debian/patches/window-list-pointerInNotification.patch b/debian/patches/window-list-pointerInNotification.patch new file mode 100644 index 00000000..e720122b --- /dev/null +++ b/debian/patches/window-list-pointerInNotification.patch @@ -0,0 +1,24 @@ +From 2f49d77931b57d20ba37f03b9a0733f18cbba5c8 Mon Sep 17 00:00:00 2001 +From: Sylvain Pasche +Date: Sat, 1 Nov 2014 22:03:43 +0100 +Subject: window-list: _pointerInTray was renamed to _pointerInNotification in + bug 695800 + +https://bugzilla.gnome.org/show_bug.cgi?id=737486 + +diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js +index 5115a68..0cee654 100644 +--- a/extensions/window-list/extension.js ++++ b/extensions/window-list/extension.js +@@ -1188,7 +1188,7 @@ function enable() { + + windowList.actor.connect('notify::hover', Lang.bind(Main.messageTray, + function() { +- this._pointerInTray = windowList.actor.hover; ++ this._pointerInNotification = windowList.actor.hover; + this._updateState(); + })); + +-- +cgit v0.10.1 +