* debian/patches/apps-center-labels.patch,

debian/patches/dont-require-nautilus-classic.patch,
  debian/patches/menu-arrows-icons.patch:
  + Dropped, merged upstream.
This commit is contained in:
Emilio Pozuelo Monfort
2015-06-14 12:29:29 +00:00
parent 269e008541
commit 31a5de2577
5 changed files with 8 additions and 81 deletions
+4
View File
@@ -5,6 +5,10 @@ gnome-shell-extensions (3.16.1-1) UNRELEASED; urgency=medium
debian/rules:
+ The system monitor extension was removed. Drop the libgtop
build and runtime dependencies and stop enabling it.
* debian/patches/apps-center-labels.patch,
debian/patches/dont-require-nautilus-classic.patch,
debian/patches/menu-arrows-icons.patch:
+ Dropped, merged upstream.
-- Emilio Pozuelo Monfort <pochu@debian.org> Sun, 14 Jun 2015 14:17:27 +0200
-27
View File
@@ -1,27 +0,0 @@
From 79f263d1edbd6f7cfe13cf89933941b439325cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
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
+4 -6
View File
@@ -2,12 +2,10 @@ Description: Don't use nautilus-classic since it forces desktop icons
Author: Jeremy Bicha <jbicha@ubuntu.com>
Bug: https://bugzilla.gnome.org/695088
Index: gnome-shell-extensions-3.8.3.1/data/gnome-classic.session.desktop.in.in
===================================================================
--- gnome-shell-extensions-3.8.3.1.orig/data/gnome-classic.session.desktop.in.in 2013-06-17 15:42:43.000000000 -0400
+++ gnome-shell-extensions-3.8.3.1/data/gnome-classic.session.desktop.in.in 2013-06-19 10:31:47.900318151 -0400
--- a/data/gnome-classic.session.desktop.in.in
+++ b/data/gnome-classic.session.desktop.in.in
@@ -1,3 +1,3 @@
[GNOME Session]
_Name=GNOME Classic
-RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic;
+RequiredComponents=gnome-shell-classic;gnome-settings-daemon;
-RequiredComponents=gnome-shell;gnome-settings-daemon;nautilus-classic;
+RequiredComponents=gnome-shell;gnome-settings-daemon;
-45
View File
@@ -1,45 +0,0 @@
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();
-3
View File
@@ -1,5 +1,2 @@
dont-require-nautilus-classic.patch
gnome-session-classic-wrapper-script.patch
menu-arrows-icons.patch
apps-center-labels.patch
window-list-pointerInNotification.patch