--- a/ChangeLog	Mon Jun 11 08:56:54 2007 +0000
+++ b/ChangeLog	Mon Jun 11 11:01:55 2007 +0000
@@ -1,4 +1,13 @@
-2007-06-08  brian Cameron  <[email protected]>
+2007-06-11  Damien Carbery <[email protected]>
+
+	* SUNWgnome-games.spec: Update %files to 2.19.3 tarball.
+	* base-specs/gnome-games.spec: Add patch 04-build-gnometris to fix
+	  build error in gnometris game. Filed bugzilla #446290. Also add some
+	  autofoo calls to incorporate updates ggz.m4 file (modified in patch3).
+	* patches/gnome-games-04-build-gnometris.diff: Hack patch to get module
+	  to build. Root cause reported in #446290.
+
+2007-06-08  Brian Cameron  <[email protected]>
 
 	* base-libs/gdm.spec, patches/gdm-02-xnestperms.diff:  Add patch
 	  so that we don't change device permissions when logging into

--- a/SUNWgnome-games.spec	Mon Jun 11 08:56:54 2007 +0000
+++ b/SUNWgnome-games.spec	Mon Jun 11 11:01:55 2007 +0000
@@ -141,7 +141,8 @@
   echo '         $SDIR/gnotski.schemas';
   echo '         $SDIR/gtali.schemas';
   echo '         $SDIR/iagno.schemas';
-  echo '         $SDIR/libgnomegames.schemas';
+  echo '         $SDIR/blackjack.schemas';
+  echo '         $SDIR/gnometris.schemas';
   echo '         $SDIR/same-gnome.schemas';
   echo '         $SDIR/mahjongg.schemas"';
   echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
@@ -152,6 +153,7 @@
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/*
 %dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/gnome-games
 %{_libdir}/python?.?/vendor-packages
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/applications
@@ -163,13 +165,16 @@
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/*/C
 %{_datadir}/glchess
+%{_datadir}/gnome-games/blackjack
 %{_datadir}/gnome-games/mahjongg
+%{_datadir}/gnome-games/pixmaps
 %{_datadir}/gnome-games/same-gnome
+%{_datadir}/gnome-games/sounds
+%{_datadir}/gnome-games-common
 %{_datadir}/gnome-sudoku
 %{_datadir}/omf/*/*-C.omf
 %dir %attr (0755, root, other) %{_datadir}/pixmaps
 %{_datadir}/pixmaps/*
-%{_datadir}/sounds
 %attr (-, root, other) %{_datadir}/icons
 
 %if %build_l10n
@@ -186,23 +191,25 @@
 %files root
 %defattr (-, root, sys)
 %attr(0755, root, sys) %dir %{_sysconfdir}
-%{_sysconfdir}/sound/events/*
+%{_sysconfdir}/gconf/schemas/blackjack.schemas
 %{_sysconfdir}/gconf/schemas/glchess.schemas
 %{_sysconfdir}/gconf/schemas/glines.schemas
 %{_sysconfdir}/gconf/schemas/gnect.schemas
 %{_sysconfdir}/gconf/schemas/gnibbles.schemas
 %{_sysconfdir}/gconf/schemas/gnobots2.schemas
+%{_sysconfdir}/gconf/schemas/gnometris.schemas
 %{_sysconfdir}/gconf/schemas/gnomine.schemas
 %{_sysconfdir}/gconf/schemas/gnotravex.schemas
 %{_sysconfdir}/gconf/schemas/gnotski.schemas
 %{_sysconfdir}/gconf/schemas/gtali.schemas
 %{_sysconfdir}/gconf/schemas/iagno.schemas
-%{_sysconfdir}/gconf/schemas/libgnomegames.schemas
 %{_sysconfdir}/gconf/schemas/same-gnome.schemas
 %{_sysconfdir}/gconf/schemas/mahjongg.schemas
 
 
 %changelog
+* Mon Jun 11 2007 - [email protected]
+- Update %files to 2.19.3 tarball.
 * Wed Jun 06 2007 - [email protected]
 - Add $CXX dir to PATH so that configure can find it. Set $CXX to 'CC', again so
   configure can find it (via PATH).

--- a/base-specs/gnome-games.spec	Mon Jun 11 08:56:54 2007 +0000
+++ b/base-specs/gnome-games.spec	Mon Jun 11 11:01:55 2007 +0000
@@ -22,6 +22,8 @@
 Patch2:       gnome-games-02-strrchr.diff
 #owner:dcarbery date:2007-06-08 type:bug bugzilla:445556
 Patch3:       gnome-games-03-signed-char.diff 
+#owner:dcarbery date:2007-06-11 type:bug bugzilla:446290
+Patch4:       gnome-games-04-build-gnometris.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
@@ -47,6 +49,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %ifos linux
@@ -63,6 +66,8 @@
 export install_user=$LOGNAME
 export install_group=`groups | awk '{print $1}'`
 
+aclocal $ACLOCAL_FLAGS -I m4
+automake -a -c -f
 autoconf
 ./configure --prefix=%{_prefix} 	\
 	    --sysconfdir=%{_sysconfdir} \
@@ -145,6 +150,10 @@
 %config %{_sysconfdir}/sound/events/*
 
 %changelog
+* Mon Jun 11 2007 - [email protected]
+- Add patch 04-build-gnometris to fix build error in gnometris game. Filed
+  bugzilla #446290. Also add some autofoo calls to incorporate updates ggz.m4
+  file (modified in patch3).
 * Fri Jun 08 2007 - [email protected]
 - Add patch, 03-signed-char, for #445556.
 * Wed Jun 06 2007 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-games-04-build-gnometris.diff	Mon Jun 11 11:01:55 2007 +0000
@@ -0,0 +1,45 @@
+--- gnome-games-2.19.3/gnometris/renderer.h.orig	2007-06-11 11:55:12.541569766 +0100
++++ gnome-games-2.19.3/gnometris/renderer.h	2007-06-11 11:56:05.971686236 +0100
+@@ -70,7 +70,7 @@
+     virtual void drawCell (cairo_t * cr, gint x, gint y);
+ 
+ private:
+-  const static double border = 0.2;
++  double border;
+   void drawInnerCorner (cairo_t * cr);
+   void drawOuterCorner (cairo_t * cr);
+   void drawHEdge (cairo_t * cr);
+--- gnome-games-2.19.3/gnometris/renderer.cpp.orig	2007-06-11 11:56:33.065386115 +0100
++++ gnome-games-2.19.3/gnometris/renderer.cpp	2007-06-11 11:57:14.146934413 +0100
+@@ -159,6 +159,7 @@
+ 
+ void JoinedUp::drawInnerCorner (cairo_t *cr)
+ {
++	border = 0.2;
+         cairo_move_to (cr, 0, 0);
+         cairo_line_to (cr, border, border);
+         cairo_line_to (cr, border, 0);
+@@ -169,6 +170,7 @@
+ 
+ void JoinedUp::drawOuterCorner (cairo_t *cr)
+ {
++	border = 0.2;
+         cairo_move_to (cr, 0, 0.5);
+         cairo_line_to (cr, 0, 0);
+         cairo_line_to (cr, 0.5, 0);
+@@ -182,6 +184,7 @@
+ 
+ void JoinedUp::drawHEdge (cairo_t *cr)
+ {
++	border = 0.2;
+         cairo_move_to (cr, 0, 0);
+         cairo_line_to (cr, 0.5, 0);
+         cairo_move_to (cr, 0, border);
+@@ -191,6 +194,7 @@
+ 
+ void JoinedUp::drawVEdge (cairo_t *cr)
+ {
++	border = 0.2;
+         cairo_move_to (cr, 0, 0);
+         cairo_line_to (cr, 0, 0.5);
+         cairo_move_to (cr, border, 0);