From d2d03507121185d390ab98bac5dc29402e1361d4 Mon Sep 17 00:00:00 2001
From: Niels Horn <niels.horn@gmail.com>
Date: Sun, 16 Sep 2012 13:47:05 -0300
Subject: games/monkey-bubble: Fixed to build against gcc-4.7

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 games/monkey-bubble/monkey-bubble.SlackBuild |  6 ++++-
 games/monkey-bubble/monkey-bubble_glib.patch | 33 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 games/monkey-bubble/monkey-bubble_glib.patch

(limited to 'games/monkey-bubble')

diff --git a/games/monkey-bubble/monkey-bubble.SlackBuild b/games/monkey-bubble/monkey-bubble.SlackBuild
index 9d6930a96cf57..a53892892beaa 100644
--- a/games/monkey-bubble/monkey-bubble.SlackBuild
+++ b/games/monkey-bubble/monkey-bubble.SlackBuild
@@ -53,6 +53,9 @@ find . \
 
 patch -p1 < $CWD/monkey-bubble-0.4.0-gnome-doc.patch
 
+# Patch to fix glib include errors
+patch -p1 < $CWD/monkey-bubble_glib.patch
+
 # This is if you want to enable scrollkeeper.
 if [ "${HAVE_RARIAN:-no}" != "yes" ]; then
   USE_RARIAN="disable-scrollkeeper"
@@ -60,8 +63,9 @@ else
   USE_RARIAN="enable-scrollkeeper"
 fi
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error=unused-but-set-variable -Wno-error=deprecated-declarations" \
 CXXFLAGS="$SLKCFLAGS" \
+LIBS="-lm" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/games/monkey-bubble/monkey-bubble_glib.patch b/games/monkey-bubble/monkey-bubble_glib.patch
new file mode 100644
index 0000000000000..c8b015d91db20
--- /dev/null
+++ b/games/monkey-bubble/monkey-bubble_glib.patch
@@ -0,0 +1,33 @@
+--- monkey-bubble-0.4.0/src/net/message-handler.c	2004-12-24 09:35:30.000000000 -0200
++++ monkey-bubble-0.4.0_patched/src/net/message-handler.c	2012-09-16 13:23:34.000000000 -0300
+@@ -28,7 +28,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <arpa/inet.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <sys/time.h>
+ #include <time.h>
+ 
+--- monkey-bubble-0.4.0/src/net/simple-server.c	2006-03-21 17:17:40.000000000 -0300
++++ monkey-bubble-0.4.0_patched/src/net/simple-server.c	2012-09-16 13:23:55.000000000 -0300
+@@ -31,7 +31,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <arpa/inet.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <sys/time.h>
+ #include <time.h>
+ 
+--- monkey-bubble-0.4.0/src/ui/main.c	2004-12-03 05:05:59.000000000 -0200
++++ monkey-bubble-0.4.0_patched/src/ui/main.c	2012-09-16 13:24:07.000000000 -0300
+@@ -15,7 +15,7 @@
+ #include <gtk/gtk.h>
+ #include <gst/gst.h>
+ #include <bonobo/bonobo-i18n.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <libgnomeui/gnome-ui-init.h>
+ 
+ #include <math.h>
-- 
cgit v1.2.3