Update to 3.4.1.

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

2 files changed, 43 insertions, 43 deletions

diff --git a/x11/gnome-shell/files/patch-js_ui_extensionSystem.js b/x11/gnome-shell/files/patch-js_ui_extensionSystem.js
index dc68dd1a2..6377d562e 100644
--- a/x11/gnome-shell/files/patch-js_ui_extensionSystem.js
+++ b/x11/gnome-shell/files/patch-js_ui_extensionSystem.js
@@ -1,5 +1,5 @@
---- js/ui/extensionSystem.js.orig	2011-12-15 16:07:45.000000000 +0100
-+++ js/ui/extensionSystem.js	2011-12-15 16:30:19.000000000 +0100
+--- js/ui/extensionSystem.js.orig	2012-04-10 20:14:57.000000000 +0200
++++ js/ui/extensionSystem.js	2012-05-25 22:43:38.000000000 +0200
 @@ -8,7 +8,6 @@
  const Gio = imports.gi.Gio;
  const St = imports.gi.St;
@@ -7,8 +7,8 @@
 -const Soup = imports.gi.Soup;
  
  const Config = imports.misc.config;
- const FileUtils = imports.misc.fileUtils;
-@@ -37,15 +36,10 @@
+ const ExtensionUtils = imports.misc.extensionUtils;
+@@ -34,15 +33,10 @@
  const REPOSITORY_URL_DOWNLOAD = REPOSITORY_URL_BASE + '/download-extension/%s.shell-extension.zip';
  const REPOSITORY_URL_INFO =     REPOSITORY_URL_BASE + '/extension-info/';
  
@@ -24,16 +24,7 @@
  function _getCertFile() {
      let localCert = GLib.build_filenamev([global.userdatadir, 'extensions.gnome.org.crt']);
      if (GLib.file_test(localCert, GLib.FileTest.EXISTS))
-@@ -54,8 +48,6 @@
-         return Config.SHELL_SYSTEM_CA_FILE;
- }
- 
--_httpSession.ssl_ca_file = _getCertFile();
--
- // Maps uuid -> metadata object
- const extensionMeta = {};
- // Maps uuid -> importer object (extension directory tree)
-@@ -117,14 +109,6 @@
+@@ -75,14 +69,6 @@
                     shell_version: Config.PACKAGE_VERSION,
                     api_version: API_VERSION.toString() };
  
@@ -48,7 +39,7 @@
  }
  
  function uninstallExtensionFromUUID(uuid) {
-@@ -159,10 +143,6 @@
+@@ -110,10 +96,6 @@
  }
  
  function gotExtensionZipFile(session, message, uuid) {
@@ -59,15 +50,15 @@
  
      // FIXME: use a GFile mkstemp-type method once one exists
      let fd, tmpzip;
-@@ -175,7 +155,6 @@
+@@ -126,7 +108,6 @@
  
      let stream = new Gio.UnixOutputStream({ fd: fd });
-     let dir = userExtensionsDir.get_child(uuid);
+     let dir = ExtensionUtils.userExtensionsDir.get_child(uuid);
 -    Shell.write_soup_message_to_stream(stream, message);
      stream.close(null);
      let [success, pid] = GLib.spawn_async(null,
                                            ['unzip', '-uod', dir.get_path(), '--', tmpzip],
-@@ -519,12 +498,6 @@
+@@ -440,12 +421,6 @@
                         api_version: API_VERSION.toString() };
  
          let url = REPOSITORY_URL_DOWNLOAD.format(this._uuid);
diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in
index f103bb2a9..3fd90eb92 100644
--- a/x11/gnome-shell/files/patch-src_Makefile.in
+++ b/x11/gnome-shell/files/patch-src_Makefile.in
@@ -1,40 +1,49 @@
---- src/Makefile.in.orig	2011-09-18 16:16:03.000000000 +0200
-+++ src/Makefile.in	2011-09-18 16:22:57.000000000 +0200
-@@ -113,7 +113,7 @@
- 	shell-arrow.c shell-contact-system.c shell-doc-system.c \
- 	shell-embedded-window.c shell-generic-container.c \
- 	shell-gtk-embed.c shell-global.c shell-mobile-providers.c \
+--- src/Makefile.in.orig	2012-05-26 19:23:31.000000000 +0200
++++ src/Makefile.in	2012-05-26 19:25:20.000000000 +0200
+@@ -125,7 +125,7 @@
+ 	shell-embedded-window.h shell-generic-container.h \
+ 	shell-gtk-embed.h shell-global.h shell-idle-monitor.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-util.h shell-window-tracker.h shell-wm.h \
+@@ -141,7 +141,7 @@
+ 	shell-generic-container.c shell-gtk-embed.c shell-global.c \
+ 	shell-idle-monitor.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-mount-operation.c shell-perf-log.c \
  	shell-polkit-authentication-agent.h \
- 	shell-polkit-authentication-agent.c shell-slicer.c \
- 	shell-stack.c shell-tp-client.c shell-tray-icon.c \
-@@ -140,7 +140,6 @@
- 	libgnome_shell_la-shell-global.lo \
+ 	shell-polkit-authentication-agent.c shell-screenshot.c \
+ 	shell-screen-grabber.c shell-secure-text-buffer.c \
+@@ -173,7 +173,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-slicer.lo \
-@@ -821,7 +820,6 @@
- 	shell-global.h			\
+ 	libgnome_shell_la-shell-screenshot.lo \
+@@ -850,7 +849,6 @@
+ 	shell-idle-monitor.h		\
  	shell-mobile-providers.h	\
  	shell-mount-operation.h		\
 -	shell-network-agent.h		\
  	shell-perf-log.h		\
- 	shell-slicer.h			\
- 	shell-stack.h			\
-@@ -843,7 +841,7 @@
- 	shell-contact-system.c shell-doc-system.c \
- 	shell-embedded-window.c shell-generic-container.c \
- 	shell-gtk-embed.c shell-global.c shell-mobile-providers.c \
+ 	shell-screenshot.h		\
+ 	shell-screen-grabber.h		\
+@@ -878,7 +876,7 @@
+ 	shell-generic-container.c shell-gtk-embed.c shell-global.c \
+ 	shell-idle-monitor.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-mount-operation.c shell-perf-log.c \
  	shell-polkit-authentication-agent.h \
- 	shell-polkit-authentication-agent.c shell-slicer.c \
- 	shell-stack.c shell-tp-client.c shell-tray-icon.c \
-@@ -896,7 +894,7 @@
+ 	shell-polkit-authentication-agent.c shell-screenshot.c \
+ 	shell-screen-grabber.c shell-secure-text-buffer.c \
+@@ -952,7 +950,7 @@
  	$(NULL)
  
  libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
@@ -43,15 +52,15 @@
  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)
-@@ -1171,7 +1169,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-marshal.Plo@am__quote@
+@@ -1234,7 +1232,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@
-@@ -2438,7 +2435,7 @@
+@@ -2355,7 +2352,7 @@
  
  shell-enum-types.h: stamp-shell-enum-types.h Makefile
  	@true