[oe-commits] : gnome games: fix broken ggz.m4 file that keeps adding -I/usr/include

[OE GIT Trial]

Module: OE.dev
Branch: org.openembedded.dev
Commit: ede32965c213c55912c17d007f62a3bd4b4bc6a3
URL:    http://gitweb.openembedded.net/?p=OE.dev&a=commit;h=ede32965c213c55912c17d007f62a3bd4b4bc6a3

Author:  <koen at openembedded.org>
Date:   Thu Oct  2 13:46:45 2008 +0000

gnome games: fix broken ggz.m4 file that keeps adding -I/usr/include

---

 packages/gnome/gnome-games/ggz-unbreak-m4.patch |   46 +++++++++++++++++++++++
 packages/gnome/gnome-games_2.24.0.bb            |    7 +++-
 2 files changed, 52 insertions(+), 1 deletions(-)

diff --git a/packages/gnome/gnome-games/.mtn2git_empty b/packages/gnome/gnome-games/.mtn2git_empty
new file mode 100644
index 0000000..e69de29
diff --git a/packages/gnome/gnome-games/ggz-unbreak-m4.patch b/packages/gnome/gnome-games/ggz-unbreak-m4.patch
new file mode 100644
index 0000000..5f182cf
--- /dev/null
+++ b/packages/gnome/gnome-games/ggz-unbreak-m4.patch
@@ -0,0 +1,46 @@
+--- /tmp/ggz.m4	2008-09-27 09:57:44.000000000 +0200
++++ ggz-client-libs-0.0.14.1/m4/ggz.m4	2008-09-27 10:06:02.000000000 +0200
+@@ -139,8 +139,8 @@
+     ])
+ 
+ if test "x${prefix}" = "xNONE"; then
+-   ac_ggz_prefix_incdir="${ac_default_prefix}/include"
+-   ac_ggz_prefix_libdir="${ac_default_prefix}/lib"
++   ac_ggz_prefix_incdir=""
++   ac_ggz_prefix_libdir=""
+    ac_ggz_prefix_bindir="${ac_default_prefix}/bin"
+    ac_ggz_prefix_etcdir="${ac_default_prefix}/etc"
+ else
+@@ -163,26 +163,22 @@
+    ac_ggz_prefix_bindir="${unq_bindir}"
+    ac_ggz_prefix_etcdir="${unq_sysconfdir}"
+ fi
+-ac_ggz_stdinc="$ac_ggz_prefix_incdir"
+-ac_ggz_stdlib="$ac_ggz_prefix_libdir"
++ac_ggz_stdinc=""
++ac_ggz_stdlib=""
+ ac_ggz_stdbin="$ac_ggz_prefix_bindir"
+ ac_ggz_stdetc="$ac_ggz_prefix_etcdir/ggzd"
+ if test "x$ac_ggz_prefix" != "x"; then
+-  ac_ggz_stdinc="$ac_ggz_stdinc $ac_ggz_prefix/include"
+-  ac_ggz_stdlib="$ac_ggz_stdlib $ac_ggz_prefix/lib $ac_ggz_prefix/lib64"
++  ac_ggz_stdinc=" "
++  ac_ggz_stdlib=" "
+   ac_ggz_stdbin="$ac_ggz_stdbin $ac_ggz_prefix/bin"
+   ac_ggz_stdetc="$ac_ggz_stdetc $ac_ggz_prefix/etc/ggzd"
+ fi
+ if test "x$1" = "xdefaults" || test "x$2" = "xdefaults"; then
+-  ac_ggz_stdinc="$ac_ggz_stdinc /usr/local/include /usr/include"
+-  ac_ggz_stdlib="$ac_ggz_stdlib /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64"
++  ac_ggz_stdinc=" "
++  ac_ggz_stdlib=" "
+   ac_ggz_stdbin="$ac_ggz_stdbin /usr/local/bin /usr/bin"
+   ac_ggz_stdetc="$ac_ggz_stdetc /usr/local/etc/ggzd /etc/ggzd"
+ fi
+-if test "x$1" = "xexport" || test "x$2" = "xexport"; then
+-  CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
+-  LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
+-fi
+ 
+ save_cflags=$CFLAGS
+ save_cxxflags=$CXXFLAGS
diff --git a/packages/gnome/gnome-games_2.24.0.bb b/packages/gnome/gnome-games_2.24.0.bb
index d849f4c..eeb6535 100644
--- a/packages/gnome/gnome-games_2.24.0.bb
+++ b/packages/gnome/gnome-games_2.24.0.bb
@@ -3,10 +3,15 @@ DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui l
 
 inherit gnome distutils-base gconf
 
+PR = "r1"
+
+SRC_URI += "file://ggz-unbreak-m4.patch;patch=1 \
+           "
+
 EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \
                 --with-libggz-libraries=${STAGING_LIBDIR} \
                 --with-ggzmod-includes=${STAGING_INCDIR} \
-		--with-ggzmod-libraries=${STAGING_LIBDIR} \
+                --with-ggzmod-libraries=${STAGING_LIBDIR} \
 	        --enable-scalable \
 	       "