Add patches for GLib>2.25, taken from upstream.

6 files changed, 82 insertions, 1 deletions

diff --git a/graphics/clutter-qt/distinfo b/graphics/clutter-qt/distinfo
index d53b8ed2585..f09259d9d70 100644
--- a/graphics/clutter-qt/distinfo
+++ b/graphics/clutter-qt/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/10/27 03:04:22 obache Exp $
+$NetBSD: distinfo,v 1.2 2010/12/05 14:45:35 obache Exp $
 
 SHA1 (clutter-qt-1.0.0.tar.gz) = b5b9dabbd797a043b8fbaa955d107cc216e03e92
 RMD160 (clutter-qt-1.0.0.tar.gz) = 139065a525c4a00ebe94986587b94893a6d4ddde
 Size (clutter-qt-1.0.0.tar.gz) = 335386 bytes
+SHA1 (patch-aa) = e33b008c5c18596c7d0d51a359441fb5edf712cd
+SHA1 (patch-ab) = 606610f7cea648f967af48b6826030f74fb32577
+SHA1 (patch-ac) = 6c5be6d9d6f825bbf9be53f960fe4c02b2a881e2
+SHA1 (patch-ad) = fd8a3cebf253eb01f67e2e7056e6576d0dd0747e
+SHA1 (patch-ae) = c4665a4b1ebbdbf12f56a0049559adb6ec61e27e
diff --git a/graphics/clutter-qt/patches/patch-aa b/graphics/clutter-qt/patches/patch-aa
new file mode 100644
index 00000000000..857d0555665
--- /dev/null
+++ b/graphics/clutter-qt/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2010/12/05 14:45:35 obache Exp $
+
+for GLib>2.25
+http://git.clutter-project.org/clutter-qt/commit/?id=b423e97ba28f529e3c618740ef6370bcc6ad2ced
+
+--- clutter-qt/Makefile.am.orig	2009-08-03 14:15:12.000000000 +0000
++++ clutter-qt/Makefile.am
+@@ -6,6 +6,7 @@ INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"Clutter-Qt\" 		\
+ 	-DPREFIX=\""$(prefix)"\" 		\
+ 	-DLIBDIR=\""$(libdir)"\" 		\
++	-DQT_NO_KEYWORDS			\
+ 	$(CLUTTER_DEBUG_FLAGS) 			\
+ 	$(GCC_FLAGS) 				\
+ 	$(CLUTTER_CFLAGS) 			\
diff --git a/graphics/clutter-qt/patches/patch-ab b/graphics/clutter-qt/patches/patch-ab
new file mode 100644
index 00000000000..0bcd07fdc28
--- /dev/null
+++ b/graphics/clutter-qt/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2010/12/05 14:45:35 obache Exp $
+
+for GLib>2.25
+http://git.clutter-project.org/clutter-qt/commit/?id=b423e97ba28f529e3c618740ef6370bcc6ad2ced
+
+--- clutter-qt/Makefile.in.orig	2009-08-03 14:15:16.000000000 +0000
++++ clutter-qt/Makefile.in
+@@ -222,6 +222,7 @@ INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"Clutter-Qt\" 		\
+ 	-DPREFIX=\""$(prefix)"\" 		\
+ 	-DLIBDIR=\""$(libdir)"\" 		\
++	-DQT_NO_KEYWORDS			\
+ 	$(CLUTTER_DEBUG_FLAGS) 			\
+ 	$(GCC_FLAGS) 				\
+ 	$(CLUTTER_CFLAGS) 			\
diff --git a/graphics/clutter-qt/patches/patch-ac b/graphics/clutter-qt/patches/patch-ac
new file mode 100644
index 00000000000..4a8fe7b94a5
--- /dev/null
+++ b/graphics/clutter-qt/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2010/12/05 14:45:35 obache Exp $
+
+for GLib>2.25
+http://git.clutter-project.org/clutter-qt/commit/?id=b423e97ba28f529e3c618740ef6370bcc6ad2ced
+
+--- examples/Makefile.am.orig	2009-07-20 11:24:30.000000000 +0000
++++ examples/Makefile.am
+@@ -4,6 +4,7 @@ noinst_PROGRAMS = \
+ 	testqt
+ 
+ INCLUDES = \
++	-DQT_NO_KEYWORDS \
+ 	-I$(srcdir) \
+ 	-I$(top_srcdir)
+ 
diff --git a/graphics/clutter-qt/patches/patch-ad b/graphics/clutter-qt/patches/patch-ad
new file mode 100644
index 00000000000..4ea872c63ac
--- /dev/null
+++ b/graphics/clutter-qt/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 2010/12/05 14:45:35 obache Exp $
+
+for GLib>2.25
+http://git.clutter-project.org/clutter-qt/commit/?id=b423e97ba28f529e3c618740ef6370bcc6ad2ced
+
+--- examples/Makefile.in.orig	2009-08-03 14:05:57.000000000 +0000
++++ examples/Makefile.in
+@@ -205,6 +205,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ NULL = 
+ INCLUDES = \
++	-DQT_NO_KEYWORDS \
+ 	-I$(srcdir) \
+ 	-I$(top_srcdir)
+ 
diff --git a/graphics/clutter-qt/patches/patch-ae b/graphics/clutter-qt/patches/patch-ae
new file mode 100644
index 00000000000..28551ece9f0
--- /dev/null
+++ b/graphics/clutter-qt/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2010/12/05 14:45:35 obache Exp $
+
+for GLib>2.25
+http://git.clutter-project.org/clutter-qt/commit/?id=b423e97ba28f529e3c618740ef6370bcc6ad2ced
+
+--- examples/testqt.h.orig	2009-07-20 11:21:34.000000000 +0000
++++ examples/testqt.h
+@@ -37,7 +37,7 @@ public:
+   MainWin (QWidget *parent = NULL);
+   ~MainWin ();
+ 
+-public slots:
++public Q_SLOTS:
+   void onEditChanged (const QString &str);
+   void onSpinX (int angle);
+   void onSpinY (int angle);