Update to 2.31.2.

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

8 files changed, 258 insertions, 0 deletions

diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
new file mode 100644
index 000000000..bd8830730
--- /dev/null
+++ b/x11/gnome-shell/Makefile
@@ -0,0 +1,53 @@
+# New ports collection makefile for:   gnome-shell
+# Date created:        14 Aug 2009
+# Whom:                Pawel Worach <pawel.worach@gmail.com>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	gnome-shell
+PORTVERSION=	2.31.2
+CATEGORIES=	x11 gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Next generation GNOME desktop shell
+
+LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+		mutter-private.0:${PORTSDIR}/x11-wm/mutter \
+		clutter-glx-1.0:${PORTSDIR}/graphics/clutter \
+		gjs-gi:${PORTSDIR}/lang/gjs
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
+    		glxinfo:${PORTSDIR}/graphics/mesa-demos
+
+USE_BZIP2=	yes
+USE_XORG=	x11 xfixes sm
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:22
+USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gconf2 gnomemenus \
+		gnomedesktop ltverhack libgnomeui librsvg2
+USE_GSTREAMER=	theora
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/js -I${LOCALBASE}/include/nspr"
+
+GCONF_SCHEMAS=	gnome-shell.schemas
+
+MAN1=		gnome-shell.1
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-Werror||g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/src/gnome-shell.in
+# temp hack around configure failure in 2.29.90. Fixed upstream
+	@${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|gnome-shell|g' \
+		${WRKSRC}/po/Makefile.in.in
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.mk>
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
new file mode 100644
index 000000000..f32fae96e
--- /dev/null
+++ b/x11/gnome-shell/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-shell-2.31.2.tar.bz2) = 42f593eddbe3dcc2552f8ac2ca3748b6
+SHA256 (gnome2/gnome-shell-2.31.2.tar.bz2) = cf16167cf2354f57431125b38a7b3de424c3c9d3d44627c52ee4596694ee80f2
+SIZE (gnome2/gnome-shell-2.31.2.tar.bz2) = 692948
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
new file mode 100644
index 000000000..1bf59d1bc
--- /dev/null
+++ b/x11/gnome-shell/files/patch-src_gdmuser_gdm-user-manager.c
@@ -0,0 +1,11 @@
+--- src/gdmuser/gdm-user-manager.c.orig	2009-08-14 05:38:43.000000000 +0000
++++ src/gdmuser/gdm-user-manager.c	2009-08-14 05:39:14.000000000 +0000
+@@ -1297,7 +1297,7 @@
+                 }
+         }
+ 
+-        for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
++        for (pwent = getpwent(); pwent != NULL; pwent = getpwent()) {
+                 GdmUser *user;
+ 
+                 user = NULL;
diff --git a/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c b/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c
new file mode 100644
index 000000000..90359fa33
--- /dev/null
+++ b/x11/gnome-shell/files/patch-src_gnome-shell-plugin.c
@@ -0,0 +1,26 @@
+--- src/gnome-shell-plugin.c.orig	2010-06-06 22:53:13.000000000 +0200
++++ src/gnome-shell-plugin.c	2010-06-06 22:56:03.000000000 +0200
+@@ -38,7 +38,6 @@
+ #include <gjs/gjs.h>
+ #include <girepository.h>
+ #include <gmodule.h>
+-#include <malloc.h>
+ #include <stdlib.h>
+ #include <string.h>
+ 
+@@ -238,6 +237,7 @@
+ malloc_statistics_callback (ShellPerfLog *perf_log,
+                             gpointer      data)
+ {
++#if defined(__linux__)
+   struct mallinfo info = mallinfo ();
+ 
+   shell_perf_log_update_statistic_i (perf_log,
+@@ -249,6 +249,7 @@
+   shell_perf_log_update_statistic_i (perf_log,
+                                      "malloc.usedSize",
+                                      info.uordblks);
++#endif
+ }
+ 
+ static void
diff --git a/x11/gnome-shell/files/patch-src_gnome-shell.in b/x11/gnome-shell/files/patch-src_gnome-shell.in
new file mode 100644
index 000000000..07775f34d
--- /dev/null
+++ b/x11/gnome-shell/files/patch-src_gnome-shell.in
@@ -0,0 +1,8 @@
+--- src/gnome-shell.in.orig	2009-08-28 18:34:04.000000000 +0200
++++ src/gnome-shell.in	2009-08-29 12:13:44.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python
+ 
+ import atexit
+ import optparse
diff --git a/x11/gnome-shell/pkg-descr b/x11/gnome-shell/pkg-descr
new file mode 100644
index 000000000..693aa3b6e
--- /dev/null
+++ b/x11/gnome-shell/pkg-descr
@@ -0,0 +1,3 @@
+Next generation GNOME desktop shell
+
+WWW: http://live.gnome.org/GnomeShell
diff --git a/x11/gnome-shell/pkg-message b/x11/gnome-shell/pkg-message
new file mode 100644
index 000000000..e00823112
--- /dev/null
+++ b/x11/gnome-shell/pkg-message
@@ -0,0 +1,33 @@
+Running
+
+You can either start gnome-shell "nested" in a window within your current 
+session, or you can run it within your session replacing gnome-panel and 
+window manager.
+
+Depending on the state of your X drivers, one or of the other of these may
+work better. So, if the first one you try doesn't work, try the other.
+
+====
+
+Running gnome-shell replacing the panel
+
+This approach is best when trying out the GNOME Shell and wanting to see its
+full potential.
+
+gnome-shell --replace
+
+When gnome-shell exits (you can kill it with Control-C in the terminal in which
+you started it), gnome-panel and metacity are restarted.
+
+====
+
+Running gnome-shell nested
+
+This approach is useful when developing the GNOME Shell and wanting to quickly
+test some changes. NOTE: It isn't useful for getting a good feel for how the
+shell works since it will be really slow, and won't properly integrate with
+the rest of your desktop.
+
+gnome-shell
+(This requires a relatively recent version of Xephyr with GLX support to be
+installed on your system (x11-servers/xephyr).
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
new file mode 100644
index 000000000..4d53b8601
--- /dev/null
+++ b/x11/gnome-shell/pkg-plist
@@ -0,0 +1,121 @@
+bin/gnome-shell
+bin/gnome-shell-clock-preferences
+lib/gnome-shell/Gdm-1.0.typelib
+lib/gnome-shell/Shell-0.1.typelib
+lib/gnome-shell/St-1.0.typelib
+lib/mutter/plugins/libgnome-shell.a
+lib/mutter/plugins/libgnome-shell.la
+lib/mutter/plugins/libgnome-shell.so
+share/applications/gnome-shell.desktop
+share/applications/gnome-shell-clock-preferences.desktop
+%%DATADIR%%/clock-preferences.ui
+%%DATADIR%%/images/close-black.svg
+%%DATADIR%%/images/magnifier.svg
+%%DATADIR%%/js/misc/docInfo.js
+%%DATADIR%%/js/misc/format.js
+%%DATADIR%%/js/misc/gnomeSession.js
+%%DATADIR%%/js/misc/params.js
+%%DATADIR%%/js/misc/telepathy.js
+%%DATADIR%%/js/perf/core.js
+%%DATADIR%%/js/prefs/clockPreferences.js
+%%DATADIR%%/js/ui/altTab.js
+%%DATADIR%%/js/ui/appDisplay.js
+%%DATADIR%%/js/ui/appFavorites.js
+%%DATADIR%%/js/ui/boxpointer.js
+%%DATADIR%%/js/ui/calendar.js
+%%DATADIR%%/js/ui/chrome.js
+%%DATADIR%%/js/ui/dash.js
+%%DATADIR%%/js/ui/dnd.js
+%%DATADIR%%/js/ui/docDisplay.js
+%%DATADIR%%/js/ui/environment.js
+%%DATADIR%%/js/ui/extensionSystem.js
+%%DATADIR%%/js/ui/genericDisplay.js
+%%DATADIR%%/js/ui/lightbox.js
+%%DATADIR%%/js/ui/link.js
+%%DATADIR%%/js/ui/lookingGlass.js
+%%DATADIR%%/js/ui/magnifier.js
+%%DATADIR%%/js/ui/magnifierDBus.js
+%%DATADIR%%/js/ui/main.js
+%%DATADIR%%/js/ui/messageTray.js
+%%DATADIR%%/js/ui/notificationDaemon.js
+%%DATADIR%%/js/ui/overview.js
+%%DATADIR%%/js/ui/placeDisplay.js
+%%DATADIR%%/js/ui/panel.js
+%%DATADIR%%/js/ui/runDialog.js
+%%DATADIR%%/js/ui/scripting.js
+%%DATADIR%%/js/ui/search.js
+%%DATADIR%%/js/ui/shellDBus.js
+%%DATADIR%%/js/ui/statusMenu.js
+%%DATADIR%%/js/ui/telepathyClient.js
+%%DATADIR%%/js/ui/tweener.js
+%%DATADIR%%/js/ui/windowAttentionHandler.js
+%%DATADIR%%/js/ui/windowManager.js
+%%DATADIR%%/js/ui/workspace.js
+%%DATADIR%%/js/ui/workspaceSwitcherPopup.js
+%%DATADIR%%/js/ui/workspacesView.js
+%%DATADIR%%/theme/add-workspace.svg
+%%DATADIR%%/theme/close-window.svg
+%%DATADIR%%/theme/close.svg
+%%DATADIR%%/theme/corner-ripple.png
+%%DATADIR%%/theme/dialog-error.svg
+%%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/remove-workspace.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-back.svg
+%%DATADIR%%/theme/section-more-open.svg
+%%DATADIR%%/theme/section-more.svg
+%%DATADIR%%/theme/single-view-active.svg
+%%DATADIR%%/theme/single-view.svg
+%%DATADIR%%/theme/ws-switch-arrow-left.svg
+%%DATADIR%%/theme/ws-switch-arrow-right.svg
+share/locale/ar/LC_MESSAGES/gnome-shell.mo
+share/locale/bg/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/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/he/LC_MESSAGES/gnome-shell.mo
+share/locale/hu/LC_MESSAGES/gnome-shell.mo
+share/locale/it/LC_MESSAGES/gnome-shell.mo
+share/locale/ko/LC_MESSAGES/gnome-shell.mo
+share/locale/nb/LC_MESSAGES/gnome-shell.mo
+share/locale/nl/LC_MESSAGES/gnome-shell.mo
+share/locale/pa/LC_MESSAGES/gnome-shell.mo
+share/locale/pl/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/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/tr/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
+@dirrm %%DATADIR%%/theme
+@dirrm %%DATADIR%%/js/ui
+@dirrm %%DATADIR%%/js/prefs
+@dirrm %%DATADIR%%/js/perf
+@dirrm %%DATADIR%%/js/misc
+@dirrm %%DATADIR%%/js
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
+@dirrm lib/gnome-shell
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin