Update to 3.1.91.1.

Note, browser plugin disabled. and this now has a hard depend on networkmanager
which we don't have. So it builds but I haven't run tested my changes yet.


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

6 files changed, 94 insertions, 103 deletions

diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index c2eb05010..394a17ab7 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-shell/Makefile,v 1.38 2011/06/10 21:14:07 mezz Exp $
+#   $MCom: ports/x11/gnome-shell/Makefile,v 1.39 2011/09/04 17:18:48 kwm Exp $
 #
 
 PORTNAME=	gnome-shell
-PORTVERSION=	3.0.2
-PORTREVISION=	2
+PORTVERSION=	3.1.91.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,7 +15,9 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Next generation GNOME desktop shell
 
+BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+		caribou.0:${PORTSDIR}/accessibility/caribou \
 		mutter.0:${PORTSDIR}/x11-wm/mutter \
 		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
 		telepathy-logger.2:${PORTSDIR}/net-im/telepathy-logger \
@@ -24,10 +25,11 @@ LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		croco-0.6.3:${PORTSDIR}/textproc/libcroco \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		clutter-glx-1.0:${PORTSDIR}/graphics/clutter \
-		gjs-gi:${PORTSDIR}/lang/gjs
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus
+		gjs.0:${PORTSDIR}/lang/gjs
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
+		${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_XORG=	x11 xfixes sm
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -42,10 +44,15 @@ GCONF_SCHEMAS=	gnome-shell.schemas
 
 MAN1=		gnome-shell.1
 
-CONFIGURE_ARGS+=--enable-compile-warnings=no
+CONFIGURE_ARGS+=--enable-compile-warnings=no \
+		--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|g' \
 		${WRKSRC}/src/shell-app-system.c
+	@${REINPLACE_CMD} -e 's|libnm-glib libnm-util ||g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|UBDIRS = data js src browser-plugin|UBDIRS = data js src|g' \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
index 5941fddee..5198ec50b 100644
--- a/x11/gnome-shell/distinfo
+++ b/x11/gnome-shell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-shell-3.0.2.tar.bz2) = a44963877da895d9b9f1ea98617067c5e88a5c4b414c6ccf0fcbfacdeac7db95
-SIZE (gnome3/gnome-shell-3.0.2.tar.bz2) = 1073613
+SHA256 (gnome3/gnome-shell-3.1.91.1.tar.xz) = d0da24c87f6851811e89774bb271b66377e67b5373ca3f73cfda7fec827f3865
+SIZE (gnome3/gnome-shell-3.1.91.1.tar.xz) = 1074600
diff --git a/x11/gnome-shell/files/patch-data_org.gnome.shell.gschema.xml.in b/x11/gnome-shell/files/patch-data_org.gnome.shell.gschema.xml.in
deleted file mode 100644
index cd42ad9fb..000000000
--- a/x11/gnome-shell/files/patch-data_org.gnome.shell.gschema.xml.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/org.gnome.shell.gschema.xml.in.orig	2011-09-02 12:44:15.000000000 +0200
-+++ data/org.gnome.shell.gschema.xml.in	2011-09-04 19:13:22.000000000 +0200
-@@ -30,7 +30,7 @@
-       </_description>
-     </key>
-     <key name="favorite-apps" type="as">
--      <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default>
-+      <default>[ 'epiphany.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default>
-       <_summary>List of desktop file IDs for favorite applications</_summary>
-       <_description>
-         The applications corresponding to these identifiers
diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in
new file mode 100644
index 000000000..f103bb2a9
--- /dev/null
+++ b/x11/gnome-shell/files/patch-src_Makefile.in
@@ -0,0 +1,62 @@
+--- 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 \
+-	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 \
+ 	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			\
+ 	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-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 @@
+ 	$(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 Folks-0.6
++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 Folks-0.6
+ 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@
+ @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 @@
+ 
+ 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_gdmuser_gdm-user-manager.c b/x11/gnome-shell/files/patch-src_gdmuser_gdm-user-manager.c
deleted file mode 100644
index 10a75f2bd..000000000
--- a/x11/gnome-shell/files/patch-src_gdmuser_gdm-user-manager.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/gdmuser/gdm-user-manager.c.orig	2010-12-08 21:06:50.000000000 +0000
-+++ src/gdmuser/gdm-user-manager.c	2011-01-15 18:39:35.000000000 +0000
-@@ -2230,9 +2230,9 @@ reload_passwd_file (GHashTable *valid_sh
- 
-                 g_debug ("GdmUserManager: include_all is TRUE");
- 
--                for (pwent = fgetpwent (fp);
-+                for (pwent = getpwent ();
-                      pwent != NULL;
--                     pwent = fgetpwent (fp)) {
-+                     pwent = getpwent ()) {
- 
-                         /* Skip users below MinimalUID... */
-                         if (pwent->pw_uid < FALLBACK_MINIMAL_UID) {
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
index 23534aa5d..b79b5e583 100644
--- a/x11/gnome-shell/pkg-plist
+++ b/x11/gnome-shell/pkg-plist
@@ -1,6 +1,5 @@
 bin/gnome-shell
 bin/gnome-shell-extension-tool
-lib/gnome-shell/Gdm-1.0.typelib
 lib/gnome-shell/Gvc-1.0.typelib
 lib/gnome-shell/Shell-0.1.typelib
 lib/gnome-shell/St-1.0.typelib
@@ -8,9 +7,13 @@ lib/gnome-shell/libgnome-shell.a
 lib/gnome-shell/libgnome-shell.la
 lib/gnome-shell/libgnome-shell.so
 libexec/gnome-shell-calendar-server
+libexec/gnome-shell-hotplug-sniffer
 libexec/gnome-shell-perf-helper
 share/applications/gnome-shell.desktop
 share/dbus-1/services/org.gnome.Shell.CalendarServer.service
+share/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
+%%DATADIR%%/js/gdm/batch.js
+%%DATADIR%%/js/gdm/loginDialog.js
 %%DATADIR%%/js/misc/config.js
 %%DATADIR%%/js/misc/docInfo.js
 %%DATADIR%%/js/misc/fileUtils.js
@@ -19,14 +22,17 @@ share/dbus-1/services/org.gnome.Shell.CalendarServer.service
 %%DATADIR%%/js/misc/history.js
 %%DATADIR%%/js/misc/modemManager.js
 %%DATADIR%%/js/misc/params.js
+%%DATADIR%%/js/misc/screenSaver.js
 %%DATADIR%%/js/misc/util.js
 %%DATADIR%%/js/perf/core.js
 %%DATADIR%%/js/ui/altTab.js
 %%DATADIR%%/js/ui/appDisplay.js
 %%DATADIR%%/js/ui/appFavorites.js
+%%DATADIR%%/js/ui/automountManager.js
+%%DATADIR%%/js/ui/autorunManager.js
 %%DATADIR%%/js/ui/boxpointer.js
 %%DATADIR%%/js/ui/calendar.js
-%%DATADIR%%/js/ui/chrome.js
+%%DATADIR%%/js/ui/contactDisplay.js
 %%DATADIR%%/js/ui/ctrlAltTab.js
 %%DATADIR%%/js/ui/dash.js
 %%DATADIR%%/js/ui/dateMenu.js
@@ -36,6 +42,8 @@ share/dbus-1/services/org.gnome.Shell.CalendarServer.service
 %%DATADIR%%/js/ui/environment.js
 %%DATADIR%%/js/ui/extensionSystem.js
 %%DATADIR%%/js/ui/iconGrid.js
+%%DATADIR%%/js/ui/keyboard.js
+%%DATADIR%%/js/ui/layout.js
 %%DATADIR%%/js/ui/lightbox.js
 %%DATADIR%%/js/ui/link.js
 %%DATADIR%%/js/ui/lookingGlass.js
@@ -44,6 +52,7 @@ share/dbus-1/services/org.gnome.Shell.CalendarServer.service
 %%DATADIR%%/js/ui/main.js
 %%DATADIR%%/js/ui/messageTray.js
 %%DATADIR%%/js/ui/modalDialog.js
+%%DATADIR%%/js/ui/networkAgent.js
 %%DATADIR%%/js/ui/notificationDaemon.js
 %%DATADIR%%/js/ui/overview.js
 %%DATADIR%%/js/ui/panel.js
@@ -63,9 +72,10 @@ share/dbus-1/services/org.gnome.Shell.CalendarServer.service
 %%DATADIR%%/js/ui/status/power.js
 %%DATADIR%%/js/ui/status/volume.js
 %%DATADIR%%/js/ui/statusIconDispatcher.js
-%%DATADIR%%/js/ui/statusMenu.js
+%%DATADIR%%/js/ui/shellMountOperation.js
 %%DATADIR%%/js/ui/telepathyClient.js
 %%DATADIR%%/js/ui/tweener.js
+%%DATADIR%%/js/ui/userMenu.js
 %%DATADIR%%/js/ui/viewSelector.js
 %%DATADIR%%/js/ui/windowAttentionHandler.js
 %%DATADIR%%/js/ui/windowManager.js
@@ -87,27 +97,16 @@ share/dbus-1/services/org.gnome.Shell.CalendarServer.service
 %%DATADIR%%/theme/dash-placeholder.svg
 %%DATADIR%%/theme/filter-selected-ltr.svg
 %%DATADIR%%/theme/filter-selected-rtl.svg
+%%DATADIR%%/theme/gdm.css
 %%DATADIR%%/theme/gnome-shell.css
-%%DATADIR%%/theme/mosaic-view-active.svg
-%%DATADIR%%/theme/mosaic-view.svg
-%%DATADIR%%/theme/move-window-on-new.svg
 %%DATADIR%%/theme/panel-border.svg
 %%DATADIR%%/theme/panel-button-border.svg
 %%DATADIR%%/theme/panel-button-highlight-narrow.svg
 %%DATADIR%%/theme/panel-button-highlight-wide.svg
 %%DATADIR%%/theme/process-working.svg
 %%DATADIR%%/theme/running-indicator.svg
-%%DATADIR%%/theme/scroll-button-down-hover.png
-%%DATADIR%%/theme/scroll-button-down.png
-%%DATADIR%%/theme/scroll-button-up-hover.png
-%%DATADIR%%/theme/scroll-button-up.png
 %%DATADIR%%/theme/scroll-hhandle.svg
 %%DATADIR%%/theme/scroll-vhandle.svg
-%%DATADIR%%/theme/section-more-open.svg
-%%DATADIR%%/theme/section-more.svg
-%%DATADIR%%/theme/separator-white.png
-%%DATADIR%%/theme/single-view-active.svg
-%%DATADIR%%/theme/single-view.svg
 %%DATADIR%%/theme/source-button-border.svg
 %%DATADIR%%/theme/toggle-off-intl.svg
 %%DATADIR%%/theme/toggle-off-us.svg
@@ -115,60 +114,7 @@ share/dbus-1/services/org.gnome.Shell.CalendarServer.service
 %%DATADIR%%/theme/toggle-on-us.svg
 %%DATADIR%%/theme/ws-switch-arrow-down.svg
 %%DATADIR%%/theme/ws-switch-arrow-up.svg
-share/locale/af/LC_MESSAGES/gnome-shell.mo
-share/locale/ar/LC_MESSAGES/gnome-shell.mo
-share/locale/bg/LC_MESSAGES/gnome-shell.mo
-share/locale/bn/LC_MESSAGES/gnome-shell.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-shell.mo
-share/locale/ca/LC_MESSAGES/gnome-shell.mo
-share/locale/cs/LC_MESSAGES/gnome-shell.mo
-share/locale/da/LC_MESSAGES/gnome-shell.mo
-share/locale/de/LC_MESSAGES/gnome-shell.mo
-share/locale/el/LC_MESSAGES/gnome-shell.mo
-share/locale/en_GB/LC_MESSAGES/gnome-shell.mo
-share/locale/es/LC_MESSAGES/gnome-shell.mo
-share/locale/et/LC_MESSAGES/gnome-shell.mo
-share/locale/eu/LC_MESSAGES/gnome-shell.mo
-share/locale/fa/LC_MESSAGES/gnome-shell.mo
-share/locale/fi/LC_MESSAGES/gnome-shell.mo
-share/locale/fr/LC_MESSAGES/gnome-shell.mo
-share/locale/ga/LC_MESSAGES/gnome-shell.mo
-share/locale/gl/LC_MESSAGES/gnome-shell.mo
-share/locale/gu/LC_MESSAGES/gnome-shell.mo
-share/locale/he/LC_MESSAGES/gnome-shell.mo
-share/locale/hi/LC_MESSAGES/gnome-shell.mo
-share/locale/hu/LC_MESSAGES/gnome-shell.mo
-share/locale/id/LC_MESSAGES/gnome-shell.mo
-share/locale/it/LC_MESSAGES/gnome-shell.mo
-share/locale/ja/LC_MESSAGES/gnome-shell.mo
-share/locale/kn/LC_MESSAGES/gnome-shell.mo
-share/locale/ko/LC_MESSAGES/gnome-shell.mo
-share/locale/lt/LC_MESSAGES/gnome-shell.mo
-share/locale/lv/LC_MESSAGES/gnome-shell.mo
-share/locale/mr/LC_MESSAGES/gnome-shell.mo
-share/locale/nb/LC_MESSAGES/gnome-shell.mo
-share/locale/nl/LC_MESSAGES/gnome-shell.mo
-share/locale/nn/LC_MESSAGES/gnome-shell.mo
-share/locale/pa/LC_MESSAGES/gnome-shell.mo
-share/locale/pl/LC_MESSAGES/gnome-shell.mo
-share/locale/pt/LC_MESSAGES/gnome-shell.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-shell.mo
-share/locale/ro/LC_MESSAGES/gnome-shell.mo
-share/locale/ru/LC_MESSAGES/gnome-shell.mo
-share/locale/sk/LC_MESSAGES/gnome-shell.mo
-share/locale/sl/LC_MESSAGES/gnome-shell.mo
-share/locale/sr/LC_MESSAGES/gnome-shell.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-shell.mo
-share/locale/sv/LC_MESSAGES/gnome-shell.mo
-share/locale/ta/LC_MESSAGES/gnome-shell.mo
-share/locale/th/LC_MESSAGES/gnome-shell.mo
-share/locale/tr/LC_MESSAGES/gnome-shell.mo
-share/locale/ug/LC_MESSAGES/gnome-shell.mo
-share/locale/uk/LC_MESSAGES/gnome-shell.mo
-share/locale/vi/LC_MESSAGES/gnome-shell.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-shell.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-shell.mo
+@comment locale
 @dirrm %%DATADIR%%/theme
 @dirrm %%DATADIR%%/shaders
 @dirrm %%DATADIR%%/search_providers
@@ -176,6 +122,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-shell.mo
 @dirrm %%DATADIR%%/js/ui
 @dirrm %%DATADIR%%/js/perf
 @dirrm %%DATADIR%%/js/misc
+@dirrm %%DATADIR%%/js/gdm
 @dirrm %%DATADIR%%/js
 @dirrm %%DATADIR%%
 @dirrm lib/gnome-shell