| 1 |
commit: b3376134974d207fe512dc3f65d6bbad0ffc2e35 |
| 2 |
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 24 09:50:17 2011 +0000 |
| 4 |
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 24 09:50:17 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b3376134 |
| 7 |
|
| 8 |
gnome-extra/gnome-games: add patch to fix build |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha23_p5/git/Linux i686, RepoMan options: --force, signed Manifest commit with key 229E5838) |
| 11 |
|
| 12 |
--- |
| 13 |
...gnome-games-2.91.90-fix-header-collisions.patch | 71 ++++++++++++++++++++ |
| 14 |
gnome-extra/gnome-games/gnome-games-2.91.90.ebuild | 3 + |
| 15 |
2 files changed, 74 insertions(+), 0 deletions(-) |
| 16 |
|
| 17 |
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-header-collisions.patch b/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-header-collisions.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..eb22628 |
| 20 |
--- /dev/null |
| 21 |
+++ b/gnome-extra/gnome-games/files/gnome-games-2.91.90-fix-header-collisions.patch |
| 22 |
@@ -0,0 +1,71 @@ |
| 23 |
+From 705397f479f758a6eae767aad84e13b10ca25f46 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Nirbheek Chauhan <nirbheek@g.o> |
| 25 |
+Date: Wed, 23 Feb 2011 15:49:00 +0000 |
| 26 |
+Subject: Fix header collisions between clutter-gtk-0.10 and clutter-gtk-1.0 |
| 27 |
+ |
| 28 |
+Always add CLUTTER_GTK_CFLAGS before CLUTTER_CFLAGS to maintain the path order. |
| 29 |
+Use the same LIBS order for consistency. |
| 30 |
+ |
| 31 |
+https://bugzilla.gnome.org/show_bug.cgi?id=643080 |
| 32 |
+--- |
| 33 |
+diff --git a/aisleriot/Makefile.am b/aisleriot/Makefile.am |
| 34 |
+index 9bd5995..030927f 100644 |
| 35 |
+--- a/aisleriot/Makefile.am |
| 36 |
++++ b/aisleriot/Makefile.am |
| 37 |
+@@ -167,9 +167,9 @@ sol_clutter_SOURCES += \ |
| 38 |
+ endif |
| 39 |
+ |
| 40 |
+ sol_clutter_CPPFLAGS = $(sol_CPPFLAGS) -DHAVE_CLUTTER |
| 41 |
+-sol_clutter_CFLAGS = $(sol_CFLAGS) $(CLUTTER_CFLAGS) $(CLUTTER_GTK_CFLAGS) |
| 42 |
++sol_clutter_CFLAGS = $(sol_CFLAGS) $(CLUTTER_GTK_CFLAGS) $(CLUTTER_CFLAGS) |
| 43 |
+ sol_clutter_LDFLAGS = $(sol_LDFLAGS) |
| 44 |
+-sol_clutter_LDADD = $(sol_LDADD) $(CLUTTER_LIBS) $(CLUTTER_GTK_LIBS) |
| 45 |
++sol_clutter_LDADD = $(sol_LDADD) $(CLUTTER_GTK_LIBS) $(CLUTTER_LIBS) |
| 46 |
+ |
| 47 |
+ |
| 48 |
+ endif # ENABLE_AISLERIOT_CLUTTER |
| 49 |
+diff --git a/gnibbles/Makefile.am b/gnibbles/Makefile.am |
| 50 |
+index c332c5d..cf0e4ff 100644 |
| 51 |
+--- a/gnibbles/Makefile.am |
| 52 |
++++ b/gnibbles/Makefile.am |
| 53 |
+@@ -39,15 +39,15 @@ gnibbles_CPPFLAGS = \ |
| 54 |
+ |
| 55 |
+ gnibbles_CFLAGS = \ |
| 56 |
+ $(GTK_CFLAGS) \ |
| 57 |
+- $(CLUTTER_CFLAGS) \ |
| 58 |
+ $(CLUTTER_GTK_CFLAGS) \ |
| 59 |
++ $(CLUTTER_CFLAGS) \ |
| 60 |
+ $(AM_CFLAGS) |
| 61 |
+ |
| 62 |
+ gnibbles_LDADD = \ |
| 63 |
+ $(top_builddir)/libgames-support/libgames-support.la \ |
| 64 |
+ $(GTK_LIBS) \ |
| 65 |
+- $(CLUTTER_LIBS) \ |
| 66 |
+ $(CLUTTER_GTK_LIBS) \ |
| 67 |
++ $(CLUTTER_LIBS) \ |
| 68 |
+ $(INTLLIBS) |
| 69 |
+ |
| 70 |
+ if HAVE_GNOME |
| 71 |
+diff --git a/quadrapassel/Makefile.am b/quadrapassel/Makefile.am |
| 72 |
+index dedd075..087d34b 100644 |
| 73 |
+--- a/quadrapassel/Makefile.am |
| 74 |
++++ b/quadrapassel/Makefile.am |
| 75 |
+@@ -31,14 +31,14 @@ quadrapassel_CPPFLAGS = \ |
| 76 |
+ |
| 77 |
+ quadrapassel_CXXFLAGS = \ |
| 78 |
+ $(GTK_CFLAGS) \ |
| 79 |
+- $(CLUTTER_CFLAGS) \ |
| 80 |
+ $(CLUTTER_GTK_CFLAGS) \ |
| 81 |
++ $(CLUTTER_CFLAGS) \ |
| 82 |
+ $(AM_CXXFLAGS) |
| 83 |
+ |
| 84 |
+ quadrapassel_LDADD = \ |
| 85 |
+ $(top_builddir)/libgames-support/libgames-support.la \ |
| 86 |
+- $(CLUTTER_LIBS) \ |
| 87 |
+ $(CLUTTER_GTK_LIBS) \ |
| 88 |
++ $(CLUTTER_LIBS) \ |
| 89 |
+ $(GTK_LIBS) \ |
| 90 |
+ $(INTLLIBS) |
| 91 |
+ |
| 92 |
+-- |
| 93 |
+cgit v0.8.3.4 |
| 94 |
|
| 95 |
diff --git a/gnome-extra/gnome-games/gnome-games-2.91.90.ebuild b/gnome-extra/gnome-games/gnome-games-2.91.90.ebuild |
| 96 |
index a4a7b2e..86caea5 100644 |
| 97 |
--- a/gnome-extra/gnome-games/gnome-games-2.91.90.ebuild |
| 98 |
+++ b/gnome-extra/gnome-games/gnome-games-2.91.90.ebuild |
| 99 |
@@ -135,6 +135,9 @@ src_prepare() { |
| 100 |
# Without this, --enable-staging enables all those games unconditionally |
| 101 |
epatch "${FILESDIR}/${PN}-fix-staging-games.patch" |
| 102 |
|
| 103 |
+ # Fixed upstream, remove in next release |
| 104 |
+ epatch "${FILESDIR}/${P}-fix-header-collisions.patch" |
| 105 |
+ |
| 106 |
eautoreconf |
| 107 |
|
| 108 |
# disable pyc compiling |
Archives