r35053 - in /desktop/experimental/gnome-shell/debian/patches: 09-respect-NoDisplay-semantics-for-app-menu.patch 10-make-NetworkManager-optional.patch 14_make-GLX-optional.patch series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sat May 19 07:46:20 UTC 2012
Author: biebl
Date: Sat May 19 07:46:17 2012
New Revision: 35053
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35053
Log:
Re-add 09-respect-NoDisplay-semantics-for-app-menu.patch
This patch was accidentally dropped in r33075
Added:
desktop/experimental/gnome-shell/debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch
Modified:
desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch
desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch
desktop/experimental/gnome-shell/debian/patches/series
Added: desktop/experimental/gnome-shell/debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch?rev=35053&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch (added)
+++ desktop/experimental/gnome-shell/debian/patches/09-respect-NoDisplay-semantics-for-app-menu.patch [utf-8] Sat May 19 07:46:17 2012
@@ -1,0 +1,27 @@
+From 3013e942d862840e46eb07de9e84f9d80e7e13cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters at 0d.be>
+Date: Sun, 4 Sep 2011 15:29:38 +0200
+Subject: [PATCH] Also respect NoDisplay semantics for applications menu
+
+https://bugzilla.gnome.org/show_bug.cgi?id=658176
+---
+ src/shell-app-system.c | 6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+Index: gnome-shell-3.4.1/src/shell-app-system.c
+===================================================================
+--- gnome-shell-3.4.1.orig/src/shell-app-system.c 2012-04-10 20:14:57.000000000 +0200
++++ gnome-shell-3.4.1/src/shell-app-system.c 2012-05-19 09:44:13.135666332 +0200
+@@ -101,11 +101,7 @@
+ NULL,
+ (GDestroyNotify)g_object_unref);
+
+- /* For now, we want to pick up Evince, Nautilus, etc. We'll
+- * handle NODISPLAY semantics at a higher level or investigate them
+- * case by case.
+- */
+- priv->apps_tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
++ priv->apps_tree = gmenu_tree_new ("applications.menu", 0);
+ g_signal_connect (priv->apps_tree, "changed", G_CALLBACK (on_apps_tree_changed_cb), self);
+
+ priv->settings_tree = gmenu_tree_new ("gnomecc.menu", 0);
Modified: desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch?rev=35053&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/10-make-NetworkManager-optional.patch [utf-8] Sat May 19 07:46:17 2012
@@ -21,11 +21,11 @@
src/Makefile.am | 17 ++++++++++++-----
6 files changed, 69 insertions(+), 9 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index c6ad636..f228ebd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,9 +94,42 @@ PKG_CHECK_MODULES(GNOME_SHELL, gio-unix-2.0 >= $GIO_MIN_VERSION
+Index: gnome-shell-3.4.1/configure.ac
+===================================================================
+--- gnome-shell-3.4.1.orig/configure.ac 2012-05-19 09:44:06.875666393 +0200
++++ gnome-shell-3.4.1/configure.ac 2012-05-19 09:44:18.047666283 +0200
+@@ -94,9 +94,42 @@
telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
telepathy-logger-0.2 >= $TELEPATHY_LOGGER_MIN_VERSION
polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
@@ -69,7 +69,7 @@
PKG_CHECK_MODULES(SHELL_PERF_HELPER, gtk+-3.0 gio-2.0)
PKG_CHECK_MODULES(SHELL_HOTPLUG_SNIFFER, gio-2.0 gdk-pixbuf-2.0)
-@@ -289,3 +322,15 @@ AC_CONFIG_FILES([
+@@ -284,3 +317,15 @@
man/Makefile
])
AC_OUTPUT
@@ -85,11 +85,11 @@
+ Support for NetworkManager: $have_networkmanager
+ Support for GStreamer recording: $build_recorder
+"
-diff --git a/js/Makefile.am b/js/Makefile.am
-index e7751cc..5eb4c18 100644
---- a/js/Makefile.am
-+++ b/js/Makefile.am
-@@ -8,6 +8,7 @@ misc/config.js: misc/config.js.in Makefile
+Index: gnome-shell-3.4.1/js/Makefile.am
+===================================================================
+--- gnome-shell-3.4.1.orig/js/Makefile.am 2012-03-01 17:19:56.000000000 +0100
++++ gnome-shell-3.4.1/js/Makefile.am 2012-05-19 09:44:18.047666283 +0200
+@@ -8,6 +8,7 @@
-e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
-e "s|[@]GJS_VERSION@|$(GJS_VERSION)|g" \
-e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
@@ -97,11 +97,11 @@
-e "s|[@]SHELL_SYSTEM_CA_FILE@|$(SHELL_SYSTEM_CA_FILE)|g" \
-e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
-e "s|[@]datadir@|$(datadir)|g" \
-diff --git a/js/misc/config.js.in b/js/misc/config.js.in
-index 4a0db16..3df3394 100644
---- a/js/misc/config.js.in
-+++ b/js/misc/config.js.in
-@@ -8,6 +8,8 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+Index: gnome-shell-3.4.1/js/misc/config.js.in
+===================================================================
+--- gnome-shell-3.4.1.orig/js/misc/config.js.in 2012-05-19 04:09:20.958337829 +0200
++++ gnome-shell-3.4.1/js/misc/config.js.in 2012-05-19 09:44:18.047666283 +0200
+@@ -8,6 +8,8 @@
const GJS_VERSION = '@GJS_VERSION@';
/* 1 if gnome-bluetooth is available, 0 otherwise */
const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
@@ -110,11 +110,11 @@
/* The system TLS CA list */
const SHELL_SYSTEM_CA_FILE = '@SHELL_SYSTEM_CA_FILE@';
/* gettext package */
-diff --git a/js/ui/main.js b/js/ui/main.js
-index ac9330c..7ca91ee 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -12,6 +12,7 @@ const St = imports.gi.St;
+Index: gnome-shell-3.4.1/js/ui/main.js
+===================================================================
+--- gnome-shell-3.4.1.orig/js/ui/main.js 2012-05-19 04:09:20.958337829 +0200
++++ gnome-shell-3.4.1/js/ui/main.js 2012-05-19 09:44:18.047666283 +0200
+@@ -12,6 +12,7 @@
const AutomountManager = imports.ui.automountManager;
const AutorunManager = imports.ui.autorunManager;
@@ -122,7 +122,7 @@
const CtrlAltTab = imports.ui.ctrlAltTab;
const EndSessionDialog = imports.ui.endSessionDialog;
const PolkitAuthenticationAgent = imports.ui.polkitAuthenticationAgent;
-@@ -26,7 +27,7 @@ const PlaceDisplay = imports.ui.placeDisplay;
+@@ -26,7 +27,7 @@
const RunDialog = imports.ui.runDialog;
const Layout = imports.ui.layout;
const LookingGlass = imports.ui.lookingGlass;
@@ -131,7 +131,7 @@
const NotificationDaemon = imports.ui.notificationDaemon;
const WindowAttentionHandler = imports.ui.windowAttentionHandler;
const Scripting = imports.ui.scripting;
-@@ -85,7 +86,10 @@ function _createUserSession() {
+@@ -85,7 +86,10 @@
telepathyClient = new TelepathyClient.Client();
automountManager = new AutomountManager.AutomountManager();
autorunManager = new AutorunManager.AutorunManager();
@@ -143,11 +143,11 @@
}
function _createGDMSession() {
-diff --git a/js/ui/panel.js b/js/ui/panel.js
-index 329f118..865ce05 100644
---- a/js/ui/panel.js
-+++ b/js/ui/panel.js
-@@ -45,7 +45,8 @@ if (Config.HAVE_BLUETOOTH)
+Index: gnome-shell-3.4.1/js/ui/panel.js
+===================================================================
+--- gnome-shell-3.4.1.orig/js/ui/panel.js 2012-05-19 04:09:20.958337829 +0200
++++ gnome-shell-3.4.1/js/ui/panel.js 2012-05-19 09:44:18.047666283 +0200
+@@ -45,7 +45,8 @@
STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
try {
@@ -157,11 +157,11 @@
} catch(e) {
log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
}
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 95f1a41..637455e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -110,9 +110,7 @@ shell_public_headers_h = \
+Index: gnome-shell-3.4.1/src/Makefile.am
+===================================================================
+--- gnome-shell-3.4.1.orig/src/Makefile.am 2012-05-19 04:09:20.958337829 +0200
++++ gnome-shell-3.4.1/src/Makefile.am 2012-05-19 09:44:18.051666283 +0200
+@@ -110,9 +110,7 @@
shell-gtk-embed.h \
shell-global.h \
shell-idle-monitor.h \
@@ -171,7 +171,7 @@
shell-perf-log.h \
shell-screenshot.h \
shell-screen-grabber.h \
-@@ -134,6 +132,10 @@ shell_private_sources = \
+@@ -134,6 +132,10 @@
gactionobserver.h \
gactionobserver.c
@@ -182,7 +182,7 @@
libgnome_shell_la_SOURCES = \
$(shell_built_sources) \
$(shell_public_headers_h) \
-@@ -159,9 +161,7 @@ libgnome_shell_la_SOURCES = \
+@@ -159,9 +161,7 @@
shell-idle-monitor.c \
shell-keyring-prompt.h \
shell-keyring-prompt.c \
@@ -192,7 +192,7 @@
shell-perf-log.c \
shell-polkit-authentication-agent.h \
shell-polkit-authentication-agent.c \
-@@ -181,6 +181,10 @@ libgnome_shell_la_SOURCES = \
+@@ -181,6 +181,10 @@
$(NULL)
@@ -203,7 +203,7 @@
libgnome_shell_la_gir_sources = \
$(filter-out %-private.h $(shell_private_sources), $(shell_public_headers_h) $(libgnome_shell_la_SOURCES))
-@@ -296,7 +300,10 @@ libgnome_shell_la_LIBADD = \
+@@ -296,7 +300,10 @@
libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
Shell-0.1.gir: libgnome-shell.la St-1.0.gir
@@ -215,6 +215,3 @@
Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
Shell_0_1_gir_LIBS = libgnome-shell.la
Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
---
-1.7.8.5
-
Modified: desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch?rev=35053&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/14_make-GLX-optional.patch [utf-8] Sat May 19 07:46:17 2012
@@ -1,8 +1,8 @@
Index: gnome-shell-3.4.1/configure.ac
===================================================================
---- gnome-shell-3.4.1.orig/configure.ac 2012-05-19 04:06:00.000000000 +0200
-+++ gnome-shell-3.4.1/configure.ac 2012-05-19 04:07:47.286341139 +0200
-@@ -100,6 +100,14 @@
+--- gnome-shell-3.4.1.orig/configure.ac 2012-05-19 09:44:28.863666178 +0200
++++ gnome-shell-3.4.1/configure.ac 2012-05-19 09:44:30.099666166 +0200
+@@ -133,6 +133,14 @@
PKG_CHECK_MODULES(BROWSER_PLUGIN, gio-2.0 >= $GIO_MIN_VERSION json-glib-1.0 >= 0.13.2)
@@ -19,8 +19,8 @@
AC_SUBST([GJS_VERSION], ["$GJS_VERSION"])
Index: gnome-shell-3.4.1/src/gnome-shell-plugin.c
===================================================================
---- gnome-shell-3.4.1.orig/src/gnome-shell-plugin.c 2012-05-19 04:05:27.000000000 +0200
-+++ gnome-shell-3.4.1/src/gnome-shell-plugin.c 2012-05-19 04:06:13.126344472 +0200
+--- gnome-shell-3.4.1.orig/src/gnome-shell-plugin.c 2012-05-19 09:44:06.747666394 +0200
++++ gnome-shell-3.4.1/src/gnome-shell-plugin.c 2012-05-19 09:44:30.099666166 +0200
@@ -30,8 +30,10 @@
#include <clutter/clutter.h>
Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=35053&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series [utf-8] Sat May 19 07:46:17 2012
@@ -1,3 +1,4 @@
+09-respect-NoDisplay-semantics-for-app-menu.patch
10-make-NetworkManager-optional.patch
11-no-gettext.patch
14_make-GLX-optional.patch
More information about the pkg-gnome-commits
mailing list