Update to 2.31.2.

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

6 files changed, 169 insertions, 35 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index 80513dded..1720183d3 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/games/gnome-games/Makefile,v 1.220 2010/05/28 08:55:41 kwm Exp $
 #
 
 PORTNAME=	gnome-games
-PORTVERSION=	2.30.1
-PORTREVISION=	1
+PORTVERSION=	2.31.2
+PORTREVISION=	0
 CATEGORIES=	games gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,9 +18,9 @@ COMMENT=	The game applications package for the GNOME 2 Desktop Environment
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	guile.20:${PORTSDIR}/lang/guile \
+		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		clutter-gtk-0.10.0:${PORTSDIR}/graphics/clutter-gtk \
-		clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter \
-		ggzmod.5:${PORTSDIR}/games/ggz-client-libs
+		clutter-glx-1.0.0:${PORTSDIR}/graphics/clutter
 RUN_DEPENDS=	seed:${PORTSDIR}/devel/seed
 
 USE_BZIP2=	yes
@@ -28,13 +28,14 @@ USE_PYTHON=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
+GLIB_SCHEMAS=	org.gnome.Games.WindowState.gschema.xml
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 \
-		librsvg2 desktopfileutils pygnomedesktop gnomedocutils
+USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 pygtk2 \
+		librsvg2 desktopfileutils gnomedocutils
 USE_GSTREAMER=	vorbis ogg
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-sound=gstreamer \
-		--disable-tests
+# temporarly disable, seems GSettings is missing from glib gir. (or I'm missing something)
+CONFIGURE_ARGS=--enable-introspection=no 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -46,9 +47,6 @@ GCONF_SCHEMAS=	aisleriot.schemas glchess.schemas glines.schemas \
 
 CONFLICTS=	sol-1.0.* glchess-[0-9]* gnomesudoku-[0-9]*
 
-#DSC_FILES=	iagno/iagno-client.dsc gnect/data/gnect-client.dsc \
-#		gnibbles/gnibbles-client.dsc
-
 MAN6=		glchess.6 glines.6 gnect.6 gnibbles.6 gnobots2.6 \
 		gnome-sudoku.6 gnomine.6 gnotravex.6 gnotski.6 \
 		gtali.6 iagno.6 mahjongg.6 quadrapassel.6 sol.6
@@ -60,15 +58,14 @@ LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
 .endif
 
 post-patch:
+#	workaround for configure bug, should be fixed in 2.31.3.
+	@${REINPLACE_CMD} -e 's|as_fn_error "couldn|as_fn_warning "couldn|g' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
 	    	${WRKSRC}/gnome-sudoku/src/lib/defaults.py.in \
 		${WRKSRC}/glchess/src/lib/defaults.py.in
 
 post-install:
-	${MKDIR} ${PREFIX}/share/ggz/gnome-games
-#.for dsc in ${DSC_FILES}
-#	${INSTALL_DATA} ${WRKSRC}/${dsc} ${PREFIX}/share/ggz/gnome-games/${dsc:T}
-#.endfor
 	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 10dab5d62..b34110ee8 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-games-2.30.1.tar.bz2) = d3cbdc3531c9a23d55add25d5b7d4d5e
-SHA256 (gnome2/gnome-games-2.30.1.tar.bz2) = 9adc8067bbf02e0dc0ccd5a1fe98d95b88f96e378e2d577543befc3ed6302da1
-SIZE (gnome2/gnome-games-2.30.1.tar.bz2) = 27625895
+MD5 (gnome2/gnome-games-2.31.2.tar.bz2) = 72a941c94cd1fb740e9c8dfbcb56adbc
+SHA256 (gnome2/gnome-games-2.31.2.tar.bz2) = b285bc89ce6dc87273dd39bc07e9ba4709d0e46358f43a36aaa7e8cca7a8eba1
+SIZE (gnome2/gnome-games-2.31.2.tar.bz2) = 27686019
diff --git a/games/gnome-games/files/patch-aisleriot_lib_ar-card-themes.c b/games/gnome-games/files/patch-aisleriot_lib_ar-card-themes.c
new file mode 100644
index 000000000..51cda79a9
--- /dev/null
+++ b/games/gnome-games/files/patch-aisleriot_lib_ar-card-themes.c
@@ -0,0 +1,71 @@
+From a4dd39444218a98fb80c5d9e4a0337a12bc858c2 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Tue, 25 May 2010 19:14:52 +0000
+Subject: aisleriot: Fix for recent GDBus API change
+
+Adapt to the API change, and update gio req to 2.25.7.
+---
+diff --git a/aisleriot/lib/ar-card-themes.c b/aisleriot/lib/ar-card-themes.c
+index e82904f..d3e326a 100644
+--- aisleriot/lib/ar-card-themes.c
++++ aisleriot/lib/ar-card-themes.c
+@@ -25,7 +25,7 @@
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gtk/gtk.h>
+ 
+-#if GLIB_CHECK_VERSION (2, 25, 5)
++#if GLIB_CHECK_VERSION (2, 25, 7)
+ #include <gio/gio.h>
+ #endif
+ 
+@@ -368,7 +368,7 @@ themes_foreach_any (gpointer key,
+   data->theme = ar_card_themes_get_theme (data->theme_manager, theme_info);
+ }
+ 
+-#if GLIB_CHECK_VERSION (2, 25, 5)
++#if GLIB_CHECK_VERSION (2, 25, 7)
+ 
+ static void
+ theme_install_reply_cb (GDBusConnection  *connection,
+@@ -395,7 +395,7 @@ theme_install_reply_cb (GDBusConnection  *connection,
+   g_object_unref (theme_manager);
+ }
+ 
+-#endif /* GLIB >= 2.25.5 */
++#endif /* GLIB >= 2.25.7 */
+ 
+ /* Class implementation */
+ 
+@@ -650,7 +650,7 @@ ar_card_themes_get_themes (ArCardThemes *theme_manager)
+ gboolean
+ ar_card_themes_can_install_themes (ArCardThemes *theme_manager)
+ {
+-#if GLIB_CHECK_VERSION (2, 25, 5)
++#if GLIB_CHECK_VERSION (2, 25, 7)
+   return TRUE;
+ #else
+   return FALSE;
+@@ -670,7 +670,7 @@ ar_card_themes_install_themes (ArCardThemes *theme_manager,
+                                   GtkWindow *parent_window,
+                                   guint user_time)
+ {
+-#if GLIB_CHECK_VERSION (2, 25, 5)
++#if GLIB_CHECK_VERSION (2, 25, 7)
+   static const char *formats[] = {
+ #ifdef ENABLE_CARD_THEME_FORMAT_SVG
+     "ThemesSVG",
+@@ -753,10 +753,11 @@ ar_card_themes_install_themes (ArCardThemes *theme_manager,
+                           "org.freedesktop.PackageKit.Modify",
+                           "InstallPackageNames",
+                           g_variant_builder_end (&builder),
++                          G_VARIANT_TYPE ("()"),
+                           G_DBUS_CALL_FLAGS_NONE,
+                           G_MAXINT /* no timeout */,
+                           NULL,
+                           (GAsyncReadyCallback) theme_install_reply_cb,
+                           g_object_ref (theme_manager));
+-#endif /* GLIB >= 2.25.5 */
++#endif /* GLIB >= 2.25.7 */
+ }
+--
+cgit v0.8.3.1
diff --git a/games/gnome-games/files/patch-libgames-support_Makefile.in b/games/gnome-games/files/patch-libgames-support_Makefile.in
new file mode 100644
index 000000000..607fac314
--- /dev/null
+++ b/games/gnome-games/files/patch-libgames-support_Makefile.in
@@ -0,0 +1,11 @@
+--- libgames-support/Makefile.in.orig	2010-05-29 15:45:53.000000000 +0200
++++ libgames-support/Makefile.in	2010-05-29 15:46:23.000000000 +0200
+@@ -1582,7 +1582,7 @@
+ 
+ install-data-hook:
+ @GSETTINGS_SCHEMAS_INSTALL_TRUE@	if test -z "$(DATADIR)"; then \
+-@GSETTINGS_SCHEMAS_INSTALL_TRUE@		$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) ; \
++@GSETTINGS_SCHEMAS_INSTALL_TRUE@		$(GLIB_COMPILE_SCHEMAS) $(DESTDIR)$(gsettingsschemadir) ; \
+ @GSETTINGS_SCHEMAS_INSTALL_TRUE@	fi
+ 
+ @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/games/gnome-games/files/patch-libgames-support_org.gnome.Games.WindowState.gchema.xml.in b/games/gnome-games/files/patch-libgames-support_org.gnome.Games.WindowState.gchema.xml.in
new file mode 100644
index 000000000..d3ef1dd98
--- /dev/null
+++ b/games/gnome-games/files/patch-libgames-support_org.gnome.Games.WindowState.gchema.xml.in
@@ -0,0 +1,27 @@
+--- libgames-support/org.gnome.Games.WindowState.gschema.xml.in.orig	2010-05-29 15:21:00.000000000 +0200
++++ libgames-support/org.gnome.Games.WindowState.gschema.xml.in	2010-05-29 15:20:34.000000000 +0200
+@@ -0,0 +1,24 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<schemalist>
++  <!-- This schema is relocatable -->
++  <schema id="org.gnome.Games.WindowState" gettext-domain="gnome-games">
++    <key name="maximized" type="b">
++      <default>false</default>
++      <_summary>Whether the window is maximized</_summary>
++    </key>
++    <key name="fullscreen" type="b">
++      <default>false</default>
++      <_summary>Whether the window is fullscreen</_summary>
++    </key>
++    <key name="width" type="i">
++      <!-- <range min="-1" max="65535" /> -->
++      <default>-1</default>
++      <_summary>Window width</_summary>
++    </key>
++    <key name="height" type="i">
++      <!-- <range min="-1" max="65535" /> -->
++      <default>-1</default>
++      <_summary>Window height</_summary>
++    </key>
++  </schema>
++</schemalist>
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 7b1f1c069..38ed0e832 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -102,12 +102,12 @@ bin/swell-foop
 @unexec [ -s %D/share/games/sweel-foop.Large.scores ] || rm -f %D/share/games/swell-foop.Large.scores
 @unexec [ -s %D/share/games/sweel-foop.Medium.scores ] || rm -f %D/share/games/swell-foop.Medium.scores
 @unexec [ -s %D/share/games/sweel-foop.Small.scores ] || rm -f %D/share/games/swell-foop.Small.scores
-lib/girepository-1.0/GnomeGamesSupport-1.0.typelib
+@comment lib/girepository-1.0/GnomeGamesSupport-1.0.typelib
 lib/gnome-games/ar-cards-renderer
-lib/gnome-games/libgames-support-gi.a
-lib/gnome-games/libgames-support-gi.la
-lib/gnome-games/libgames-support-gi.so
-lib/gnome-games/libgames-support-gi.so.0
+@comment lib/gnome-games/libgames-support-gi.a
+@comment lib/gnome-games/libgames-support-gi.la
+@comment lib/gnome-games/libgames-support-gi.so
+@comment lib/gnome-games/libgames-support-gi.so.0
 %%PYTHON_SITELIBDIR%%/glchess/__init__.py
 %%PYTHON_SITELIBDIR%%/glchess/__init__.pyc
 %%PYTHON_SITELIBDIR%%/glchess/__init__.pyo
@@ -216,9 +216,6 @@ lib/gnome-games/libgames-support-gi.so.0
 %%PYTHON_SITELIBDIR%%/glchess/scene/cairo/__init__.py
 %%PYTHON_SITELIBDIR%%/glchess/scene/cairo/__init__.pyc
 %%PYTHON_SITELIBDIR%%/glchess/scene/cairo/__init__.pyo
-%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/pieces.py
-%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/pieces.pyc
-%%PYTHON_SITELIBDIR%%/glchess/scene/cairo/pieces.pyo
 %%PYTHON_SITELIBDIR%%/glchess/scene/human.py
 %%PYTHON_SITELIBDIR%%/glchess/scene/human.pyc
 %%PYTHON_SITELIBDIR%%/glchess/scene/human.pyo
@@ -303,9 +300,6 @@ lib/gnome-games/libgames-support-gi.so.0
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku.py
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku.pyc
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku.pyo
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.py
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.pyc
-%%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_generator_gui.pyo
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.py
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.pyc
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/sudoku_maker.pyo
@@ -315,6 +309,9 @@ lib/gnome-games/libgames-support-gi.so.0
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.py
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyc
 %%PYTHON_SITELIBDIR%%/gnome_sudoku/timer.pyo
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/tracker_info.py
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/tracker_info.pyc
+%%PYTHON_SITELIBDIR%%/gnome_sudoku/tracker_info.pyo
 share/applications/freecell.desktop
 share/applications/glchess.desktop
 share/applications/glines.desktop
@@ -332,20 +329,44 @@ share/applications/mahjongg.desktop
 share/applications/quadrapassel.desktop
 share/applications/sol.desktop
 share/applications/swell-foop.desktop
-share/gir-1.0/GnomeGamesSupport-1.0.gir
+@comment share/gir-1.0/GnomeGamesSupport-1.0.gir
 share/glchess/ai.xml
-share/glchess/chess_view.ui
 share/glchess/glchess.ui
 share/glchess/load_game.ui
 share/glchess/log.ui
 share/glchess/network_game.ui
 share/glchess/network_new_server.ui
 share/glchess/new_game.ui
+share/glchess/pieces/fancy/blackBishop.svg
+share/glchess/pieces/fancy/blackKing.svg
+share/glchess/pieces/fancy/blackKnight.svg
+share/glchess/pieces/fancy/blackPawn.svg
+share/glchess/pieces/fancy/blackQueen.svg
+share/glchess/pieces/fancy/blackRook.svg
+share/glchess/pieces/fancy/whiteBishop.svg
+share/glchess/pieces/fancy/whiteKing.svg
+share/glchess/pieces/fancy/whiteKnight.svg
+share/glchess/pieces/fancy/whitePawn.svg
+share/glchess/pieces/fancy/whiteQueen.svg
+share/glchess/pieces/fancy/whiteRook.svg
+share/glchess/pieces/simple/blackBishop.svg
+share/glchess/pieces/simple/blackKing.svg
+share/glchess/pieces/simple/blackKnight.svg
+share/glchess/pieces/simple/blackPawn.svg
+share/glchess/pieces/simple/blackQueen.svg
+share/glchess/pieces/simple/blackRook.svg
+share/glchess/pieces/simple/whiteBishop.svg
+share/glchess/pieces/simple/whiteKing.svg
+share/glchess/pieces/simple/whiteKnight.svg
+share/glchess/pieces/simple/whitePawn.svg
+share/glchess/pieces/simple/whiteQueen.svg
+share/glchess/pieces/simple/whiteRook.svg
 share/glchess/preferences.ui
 share/glchess/save_game.ui
 share/glchess/textures/board.png
 share/glchess/textures/piece.png
 share/gnome-games-common/cards/gnomangelo_bitmap.svg
+share/gnome-games-common/theme-install.ini
 %%DATADIR%%/aisleriot/games/accordion.scm
 %%DATADIR%%/aisleriot/games/agnes.scm
 %%DATADIR%%/aisleriot/games/athena.scm
@@ -556,6 +577,7 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg
 %%DATADIR%%/lightsoff/LED.js
 %%DATADIR%%/lightsoff/Light.js
 %%DATADIR%%/lightsoff/Path.js
+%%DATADIR%%/lightsoff/Puzzle.js
 %%DATADIR%%/lightsoff/Settings.js
 %%DATADIR%%/lightsoff/ThemeLoader.js
 %%DATADIR%%/lightsoff/lightsoff.ui
@@ -631,7 +653,6 @@ share/gnome-games-common/cards/gnomangelo_bitmap.svg
 %%DATADIR%%/swell-foop/themes/test/yellow.svg
 share/gnome-sudoku/images/footprints.png
 share/gnome-sudoku/print_games.ui
-share/gnome-sudoku/puzzle_generator.ui
 share/gnome-sudoku/puzzles/easy
 share/gnome-sudoku/puzzles/hard
 share/gnome-sudoku/puzzles/medium
@@ -1708,6 +1729,9 @@ share/gnome/help/gnotski/ca/gnotski.xml
 share/gnome/help/gnotski/cs/figures/gnotski_start_window.png
 share/gnome/help/gnotski/cs/figures/gnotski_win.png
 share/gnome/help/gnotski/cs/gnotski.xml
+share/gnome/help/gnotski/da/figures/gnotski_start_window.png
+share/gnome/help/gnotski/da/figures/gnotski_win.png
+share/gnome/help/gnotski/da/gnotski.xml
 share/gnome/help/gnotski/de/figures/gnotski_start_window.png
 share/gnome/help/gnotski/de/figures/gnotski_win.png
 share/gnome/help/gnotski/de/gnotski.xml
@@ -2422,6 +2446,7 @@ share/omf/gnomine/gnomine-zh_CN.omf
 share/omf/gnotski/gnotski-C.omf
 share/omf/gnotski/gnotski-ca.omf
 share/omf/gnotski/gnotski-cs.omf
+share/omf/gnotski/gnotski-da.omf
 share/omf/gnotski/gnotski-de.omf
 share/omf/gnotski/gnotski-el.omf
 share/omf/gnotski/gnotski-en_GB.omf
@@ -2701,6 +2726,8 @@ share/omf/swell-foop/swell-foop-sv.omf
 @dirrm share/gnome/help/gnotski/el
 @dirrm share/gnome/help/gnotski/de/figures
 @dirrm share/gnome/help/gnotski/de
+@dirrm share/gnome/help/gnotski/da/figures
+@dirrm share/gnome/help/gnotski/da
 @dirrm share/gnome/help/gnotski/cs/figures
 @dirrm share/gnome/help/gnotski/cs
 @dirrm share/gnome/help/gnotski/ca/figures
@@ -3056,9 +3083,10 @@ share/omf/swell-foop/swell-foop-sv.omf
 @dirrm share/gnome-games-common/cards
 @dirrm share/gnome-games-common
 @dirrm share/glchess/textures
+@dirrm share/glchess/pieces/simple
+@dirrm share/glchess/pieces/fancy
+@dirrm share/glchess/pieces
 @dirrm share/glchess
-@dirrmtry share/ggz/gnome-games
-@dirrmtry share/ggz
 @dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku/gtk_goodies
 @dirrm %%PYTHON_SITELIBDIR%%/gnome_sudoku