Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 35 insertions, 129 deletions

diff --git a/x11/gnome-shell/files/patch-js_ui_panel.js b/x11/gnome-shell/files/patch-js_ui_panel.js
deleted file mode 100644
index 5c57b6a19..000000000
--- a/x11/gnome-shell/files/patch-js_ui_panel.js
+++ /dev/null
@@ -1,16 +0,0 @@
---- js/ui/panel.js.old	2013-04-28 19:22:35.753485501 +0000
-+++ js/ui/panel.js	2013-04-28 19:23:28.059021301 +0000
-@@ -910,13 +910,6 @@
-     PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
-         imports.ui.status.bluetooth.Indicator;
- 
--try {
--    PANEL_ITEM_IMPLEMENTATIONS['network'] =
--        imports.ui.status.network.NMApplet;
--} catch(e) {
--    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
--}
--
- const Panel = new Lang.Class({
-     Name: 'Panel',
- 
diff --git a/x11/gnome-shell/files/patch-js_ui_sessionMode.js b/x11/gnome-shell/files/patch-js_ui_sessionMode.js
index 19e314e45..011ddcffd 100644
--- a/x11/gnome-shell/files/patch-js_ui_sessionMode.js
+++ b/x11/gnome-shell/files/patch-js_ui_sessionMode.js
@@ -1,36 +1,29 @@
---- js/ui/sessionMode.js.orig	2013-04-28 19:50:35.808911032 +0000
-+++ js/ui/sessionMode.js	2013-04-28 19:51:07.527210205 +0000
-@@ -50,7 +50,7 @@
+--- js/ui/sessionMode.js.orig	2014-02-19 20:54:46.000000000 +0000
++++ js/ui/sessionMode.js	2014-03-17 19:23:36.755386539 +0000
+@@ -60,7 +60,7 @@
          isLocked: true,
          isGreeter: undefined,
          unlockDialog: undefined,
 -        components: ['polkitAgent', 'telepathyClient'],
 +        components: ['polkitAgent'],
          panel: {
-             left: ['userMenu'],
+             left: [],
              center: [],
-@@ -61,7 +61,7 @@
+@@ -72,7 +72,7 @@
      'unlock-dialog': {
          isLocked: true,
          unlockDialog: undefined,
 -        components: ['polkitAgent', 'telepathyClient'],
 +        components: ['polkitAgent'],
          panel: {
-             left: ['userMenu'],
+             left: [],
              center: [],
-@@ -91,13 +91,13 @@
-         isLocked: false,
-         isPrimary: true,
-         unlockDialog: imports.ui.unlockDialog.UnlockDialog,
--        components: ['networkAgent', 'polkitAgent', 'telepathyClient',
-+        components: ['polkitAgent',
-                      'keyring', 'recorder', 'autorunManager', 'automountManager'],
+@@ -97,7 +97,7 @@
+         components: Config.HAVE_NETWORKMANAGER ?
+                     ['networkAgent', 'polkitAgent', 'telepathyClient',
+                      'keyring', 'autorunManager', 'automountManager'] :
+-                    ['polkitAgent', 'telepathyClient',
++                    ['polkitAgent',
+                      'keyring', 'autorunManager', 'automountManager'],
+ 
          panel: {
-             left: ['activities', 'appMenu'],
-             center: ['dateMenu'],
-             right: ['a11y', 'keyboard', 'volume', 'bluetooth',
--                    'network', 'battery', 'userMenu']
-+                    'battery', 'userMenu']
-         }
-     }
- };
diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in
deleted file mode 100644
index c9b3ca40d..000000000
--- a/x11/gnome-shell/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,80 +0,0 @@
---- src/Makefile.in.orig	2013-04-12 17:24:31.329599290 +0000
-+++ src/Makefile.in	2013-04-12 17:25:03.025595800 +0000
-@@ -143,9 +143,9 @@
- 	shell-generic-container.h shell-gtk-embed.h shell-global.h \
- 	shell-idle-monitor.h shell-invert-lightness-effect.h \
- 	shell-mobile-providers.h shell-mount-operation.h \
--	shell-network-agent.h shell-perf-log.h shell-screenshot.h \
-+	shell-perf-log.h shell-screenshot.h \
- 	shell-screen-grabber.h shell-slicer.h shell-stack.h \
--	shell-tp-client.h shell-tray-icon.h shell-tray-manager.h \
-+	shell-tray-icon.h shell-tray-manager.h \
- 	shell-util.h shell-window-tracker.h shell-wm.h \
- 	shell-xfixes-cursor.h gactionmuxer.h gactionmuxer.c \
- 	gactionobservable.h gactionobservable.c gactionobserver.h \
-@@ -159,7 +159,7 @@
- 	shell-idle-monitor.c shell-invert-lightness-effect.c \
- 	shell-keyring-prompt.h shell-keyring-prompt.c \
- 	shell-mobile-providers.c shell-mount-operation.c \
--	shell-network-agent.c shell-perf-log.c \
-+	shell-perf-log.c \
- 	shell-polkit-authentication-agent.h \
- 	shell-polkit-authentication-agent.c shell-screenshot.c \
- 	shell-screen-grabber.c shell-secure-text-buffer.c \
-@@ -191,7 +191,6 @@
- 	libgnome_shell_la-shell-keyring-prompt.lo \
- 	libgnome_shell_la-shell-mobile-providers.lo \
- 	libgnome_shell_la-shell-mount-operation.lo \
--	libgnome_shell_la-shell-network-agent.lo \
- 	libgnome_shell_la-shell-perf-log.lo \
- 	libgnome_shell_la-shell-polkit-authentication-agent.lo \
- 	libgnome_shell_la-shell-screenshot.lo \
-@@ -888,13 +887,11 @@
- 	shell-invert-lightness-effect.h	\
- 	shell-mobile-providers.h	\
- 	shell-mount-operation.h		\
--	shell-network-agent.h		\
- 	shell-perf-log.h		\
- 	shell-screenshot.h		\
- 	shell-screen-grabber.h		\
- 	shell-slicer.h			\
- 	shell-stack.h			\
--	shell-tp-client.h		\
- 	shell-tray-icon.h		\
- 	shell-tray-manager.h		\
- 	shell-util.h			\
-@@ -916,7 +913,7 @@
- 	shell-idle-monitor.c shell-invert-lightness-effect.c \
- 	shell-keyring-prompt.h shell-keyring-prompt.c \
- 	shell-mobile-providers.c shell-mount-operation.c \
--	shell-network-agent.c shell-perf-log.c \
-+	shell-perf-log.c \
- 	shell-polkit-authentication-agent.h \
- 	shell-polkit-authentication-agent.c shell-screenshot.c \
- 	shell-screen-grabber.c shell-secure-text-buffer.c \
-@@ -990,7 +987,7 @@
- 	$(NULL)
- 
- libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
--Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
-+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0
- 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)
-@@ -1285,7 +1282,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-keyring-prompt.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-mobile-providers.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-mount-operation.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-network-agent.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-perf-log.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-polkit-authentication-agent.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-recorder-src.Plo@am__quote@
-@@ -2446,7 +2442,7 @@
- 
- shell-enum-types.h: stamp-shell-enum-types.h Makefile
- 	@true
--stamp-shell-enum-types.h: $(srcdir)/shell-enum-types.h.in $(shell_public_headers_h)
-+stamp-shell-enum-types.h: $(srcdir)/shell-enum-types.h.in
- 	$(AM_V_GEN) ( \
- 	  $(GLIB_MKENUMS) \
- 	    --template $< \
diff --git a/x11/gnome-shell/files/patch-src_data-to-c.pl b/x11/gnome-shell/files/patch-src_data-to-c.pl
new file mode 100644
index 000000000..79542797d
--- /dev/null
+++ b/x11/gnome-shell/files/patch-src_data-to-c.pl
@@ -0,0 +1,8 @@
+--- src/data-to-c.pl.orig	2014-03-22 16:28:35.000000000 +0100
++++ src/data-to-c.pl	2014-03-22 16:28:44.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#!/usr/bin/env perl
+ 
+ # Copyright © 2011 Red Hat, Inc
+ #
diff --git a/x11/gnome-shell/files/patch-src_shell-global.c b/x11/gnome-shell/files/patch-src_shell-global.c
index 4f97e16fa..ba0baff9e 100644
--- a/x11/gnome-shell/files/patch-src_shell-global.c
+++ b/x11/gnome-shell/files/patch-src_shell-global.c
@@ -1,14 +1,15 @@
---- src/shell-global.c.orig	2012-10-03 22:10:22.000000000 +0000
-+++ src/shell-global.c	2012-10-03 22:12:09.000000000 +0000
-@@ -1255,9 +1255,9 @@
-   GError *error = NULL;
-   
-   /* Linux specific (I think, anyways). */
--  if (!g_file_get_contents ("/proc/self/cmdline", &buf, &len, &error))
+--- src/shell-global.c.orig	2014-03-19 18:15:45.680036087 +0000
++++ src/shell-global.c	2014-03-19 18:16:14.289034013 +0000
+@@ -1145,6 +1145,12 @@
+     g_warning ("failed to get command line args: %d", errno);
+     return;
+   }
++#elif defined __FreeBSD__
 +  if (!g_file_get_contents ("/proc/curproc/cmdline", &buf, &len, &error))
-     {
--      g_warning ("failed to get /proc/self/cmdline: %s", error->message);
++    {
 +      g_warning ("failed to get /proc/curproc/cmdline: %s", error->message);
-       return;
-     }
-       
++      return;
++    }
+ #else
+   return;
+ #endif