Freeze request for gnome-games: Enable swell-foop and lightsoff

[Robert Ancell <robert ancell gmail com>]

Hi all,

I'm requesting a freeze break for GNOME Games 3.0 to enable the Lights
Off and Swell Foop games.

These games have been disabled due to them not working with GTK3,
however (see attached patches):
- I can confirm Swell Foop runs fine with the latest Seed (2.91.90)
- Lights Off had two small bugs, but with them fixed also runs fine
- The typelib was installed into a public location, and the third
patch installs this correctly into a private location

These games have no changes from 2.32 in terms of UI or behaviour.
Without these patches they will not be present in GNOME3.

The relevant bug is:
https://bugzilla.gnome.org/show_bug.cgi?id=631563

Thanks,
--Robert

From 1076b7a2d1bb0d2054660a101029ed89ff825f55 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert ancell canonical com>
Date: Wed, 30 Mar 2011 16:36:51 +1100
Subject: [PATCH 1/3] lightsoff: Get working with seed 2.91.90
  - Fix error setting default theme
  - Don't call Gtk.init - it makes things break and swell-foop doesn't use it so it can't be too important...

---
 configure.in              |    4 ++--
 lightsoff/src/Settings.js |    2 +-
 lightsoff/src/main.js     |    2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index 57f45ef..7a46b7e 100644
--- a/configure.in
+++ b/configure.in
@@ -23,9 +23,9 @@ AM_MAINTAINER_MODE([enable])
 # we support and which features to check for
 
 # This is the canonical list of all game subdirectories.
-allgames="aisleriot glchess glines gnect gnibbles gnobots2 gnomine gnotravex gnotski gtali iagno mahjongg quadrapassel"
+allgames="aisleriot glchess glines gnect gnibbles gnobots2 gnomine gnotravex gnotski gtali iagno lightsoff mahjongg quadrapassel"
 AC_SUBST([allgames])
-staginggames="swell-foop gnome-sudoku lightsoff"
+staginggames="swell-foop gnome-sudoku"
 AC_SUBST([staginggames])
 
 gamelist=""
diff --git a/lightsoff/src/Settings.js b/lightsoff/src/Settings.js
index 74d6b17..9be2695 100644
--- a/lightsoff/src/Settings.js
+++ b/lightsoff/src/Settings.js
@@ -22,7 +22,7 @@ try
 	use_theme_colors = gconf_client.get_bool("/apps/lightsoff/use_theme_colors");
 	
 	if(theme == null)
-		theme = default_theme_name;
+		theme_name = default_theme_name;
 }
 catch(e)
 {
diff --git a/lightsoff/src/main.js b/lightsoff/src/main.js
index c02167c..4eed988 100755
--- a/lightsoff/src/main.js
+++ b/lightsoff/src/main.js
@@ -6,8 +6,6 @@ Gtk = imports.gi.Gtk;
 GtkBuilder = imports.gtkbuilder;
 GnomeGamesSupport = imports.gi.GnomeGamesSupport;
 
-Gtk.init(Seed.argv);
-
 try
 {
 	GtkClutter.init(Seed.argv.length, Seed.argv);
-- 
1.7.4.1

From 620c501fc86589cefb9087fa79d2b6cf292fe893 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert ancell canonical com>
Date: Wed, 30 Mar 2011 16:38:23 +1100
Subject: [PATCH 2/3] swell-foop: Runs fine with seed 2.91.90

---
 configure.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 7a46b7e..f695364 100644
--- a/configure.in
+++ b/configure.in
@@ -23,9 +23,9 @@ AM_MAINTAINER_MODE([enable])
 # we support and which features to check for
 
 # This is the canonical list of all game subdirectories.
-allgames="aisleriot glchess glines gnect gnibbles gnobots2 gnomine gnotravex gnotski gtali iagno lightsoff mahjongg quadrapassel"
+allgames="aisleriot glchess glines gnect gnibbles gnobots2 gnomine gnotravex gnotski gtali iagno lightsoff mahjongg quadrapassel swell-foop"
 AC_SUBST([allgames])
-staginggames="swell-foop gnome-sudoku"
+staginggames="gnome-sudoku"
 AC_SUBST([staginggames])
 
 gamelist=""
-- 
1.7.4.1

From 9f54cae637585a50700721943c3a19f7c79bc381 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert ancell canonical com>
Date: Wed, 30 Mar 2011 16:49:18 +1100
Subject: [PATCH 3/3] libgames-support: Install typelib into a private location, don't bother installing the .gir since the library is private and is not going to be extended by other libraries

---
 libgames-support/Makefile.am |   11 +----------
 lightsoff/src/lightsoff.in   |    1 +
 swell-foop/swell-foop.in     |    1 +
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/libgames-support/Makefile.am b/libgames-support/Makefile.am
index fa96061..ec7744d 100644
--- a/libgames-support/Makefile.am
+++ b/libgames-support/Makefile.am
@@ -199,9 +199,6 @@ libgames_support_gi_la_LIBADD = $(libgames_support_la_LIBADD)
 
 BUILT_GIRSOURCES = GnomeGamesSupport-1.0.gir
 
-# FIXMEchpe: change GIR version for the gtk+-3.0 based one...
-# or just remove introspection support for the gtk+-2.0 build
-
 GnomeGamesSupport-1.0.gir: $(INTROSPECTION_SCANNER) libgames-support-gi.la $(libgames_support_gi_la_SOURCES)
 	$(AM_V_GEN) $(INTROSPECTION_SCANNER) -v \
 	--namespace GnomeGamesSupport --nsversion=1.0 \
@@ -222,13 +219,7 @@ GnomeGamesSupport-1.0.gir: $(INTROSPECTION_SCANNER) libgames-support-gi.la $(lib
 	-I$(top_builddir) \
 	$(filter games%,$^)
 
-# FIXMEchpe: this looks bogus. If the introspection.m4 macro gets it wrong, fix it!
-# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
-# install anything - we need to install inside our prefix.
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(BUILT_GIRSOURCES)
-
-typelibsdir = $(libdir)/girepository-1.0
+typelibsdir = $(pkglibdir)
 typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
 
 %.typelib: %.gir $(INTROSPECTION_COMPILER)
diff --git a/lightsoff/src/lightsoff.in b/lightsoff/src/lightsoff.in
index daff9e5..976e1db 100644
--- a/lightsoff/src/lightsoff.in
+++ b/lightsoff/src/lightsoff.in
@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
 
 export LD_LIBRARY_PATH="%pkglibdir%${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export GI_TYPELIB_PATH="%pkglibdir%${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
 /usr/bin/env seed %pkgdatadir%/lightsoff/main.js
diff --git a/swell-foop/swell-foop.in b/swell-foop/swell-foop.in
index ccfca41..5129a5e 100644
--- a/swell-foop/swell-foop.in
+++ b/swell-foop/swell-foop.in
@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
 
 export LD_LIBRARY_PATH="%pkglibdir%${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export GI_TYPELIB_PATH="%pkglibdir%${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
 /usr/bin/env seed %pkgdatadir%/swell-foop/main.js
-- 
1.7.4.1