Update to 3.4.2.

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

3 files changed, 24 insertions, 15 deletions

diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 75b108cbd..842959abf 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-shell/Makefile,v 1.52 2012/03/21 03:17:07 mezz Exp $
+#   $MCom: ports/x11/gnome-shell/Makefile,v 1.53 2012/05/26 19:05:29 kwm Exp $
 #
 
 PORTNAME=	gnome-shell
-PORTVERSION=	3.4.1
+PORTVERSION=	3.4.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -43,8 +43,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gtk30 gnomemenus3 \
 USE_GSTREAMER=	theora vp8 ogg
 USE_LDCONFIG=	yes
 
-GLIB_SCHEMAS=	org.gnome.shell.gschema.xml
-
+GLIB_SCHEMAS=	org.gnome.shell.gschema.xml \
+		org.gnome.shell.evolution.calendar.gschema.xml
 MAN1=		gnome-shell.1
 
 CONFIGURE_ARGS+=--enable-compile-warnings=no \
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
index a00aaecc3..2798e97ba 100644
--- a/x11/gnome-shell/distinfo
+++ b/x11/gnome-shell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-shell-3.4.1.tar.xz) = 6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9
-SIZE (gnome3/gnome-shell-3.4.1.tar.xz) = 1254596
+SHA256 (gnome3/gnome-shell-3.4.2.tar.xz) = 3807f7882968d032f8f5c64b0e0af51c0d016f2e1c4fd1576203c9350e412720
+SIZE (gnome3/gnome-shell-3.4.2.tar.xz) = 1257612
diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in
index 3fd90eb92..1abafc1bb 100644
--- a/x11/gnome-shell/files/patch-src_Makefile.in
+++ b/x11/gnome-shell/files/patch-src_Makefile.in
@@ -1,14 +1,17 @@
---- 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 @@
+--- src/Makefile.in.orig	2012-06-14 23:43:49.000000000 +0200
++++ src/Makefile.in	2012-06-14 23:44:29.000000000 +0200
+@@ -125,9 +125,9 @@
  	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-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 \
 @@ -141,7 +141,7 @@
  	shell-generic-container.c shell-gtk-embed.c shell-global.c \
  	shell-idle-monitor.c shell-keyring-prompt.h \
@@ -26,7 +29,7 @@
  	libgnome_shell_la-shell-perf-log.lo \
  	libgnome_shell_la-shell-polkit-authentication-agent.lo \
  	libgnome_shell_la-shell-screenshot.lo \
-@@ -850,7 +849,6 @@
+@@ -850,13 +849,11 @@
  	shell-idle-monitor.h		\
  	shell-mobile-providers.h	\
  	shell-mount-operation.h		\
@@ -34,7 +37,13 @@
  	shell-perf-log.h		\
  	shell-screenshot.h		\
  	shell-screen-grabber.h		\
-@@ -878,7 +876,7 @@
+ 	shell-slicer.h			\
+ 	shell-stack.h			\
+-	shell-tp-client.h		\
+ 	shell-tray-icon.h		\
+ 	shell-tray-manager.h		\
+ 	shell-util.h			\
+@@ -878,7 +875,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 \
@@ -43,7 +52,7 @@
  	shell-polkit-authentication-agent.h \
  	shell-polkit-authentication-agent.c shell-screenshot.c \
  	shell-screen-grabber.c shell-secure-text-buffer.c \
-@@ -952,7 +950,7 @@
+@@ -952,7 +949,7 @@
  	$(NULL)
  
  libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
@@ -52,7 +61,7 @@
  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)
-@@ -1234,7 +1232,6 @@
+@@ -1234,7 +1231,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@
@@ -60,7 +69,7 @@
  @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@
-@@ -2355,7 +2352,7 @@
+@@ -2355,7 +2351,7 @@
  
  shell-enum-types.h: stamp-shell-enum-types.h Makefile
  	@true