Fix building with USE=-introspection (bug #402113, thanks to Anthony Parsons).

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 43 insertions, 7 deletions

diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog
index e314dec919be..58bd762a7561 100644
--- a/x11-wm/mutter/ChangeLog
+++ b/x11-wm/mutter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/mutter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.5 2012/01/21 02:06:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.6 2012/02/04 20:33:03 tetromino Exp $
+
+  04 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org> mutter-3.2.2.ebuild,
+  +files/mutter-3.2.2-disable-introspection.patch:
+  Fix building with USE=-introspection (bug #402113, thanks to Anthony
+  Parsons).
 
 *mutter-3.2.2 (21 Jan 2012)
 
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index f7a91b6ce5b7..589e0a43a2e6 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA256
 
 AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 RMD160 408acd936e0a474714ffaa3c4a0a5c17bcc160ca SHA1 3705a09d1160c6a7ace480c5f51a3c413ac52a0d SHA256 765c04ba4d177789407a25d3cbdf358e3fa125170cfd37c53095372bc4ec883d
+AUX mutter-3.2.2-disable-introspection.patch 678 RMD160 c9a67368e6f618cadb446ca7c8b81158c097412c SHA1 f70de86c5b82be3ed9f6628925ea3b39754108be SHA256 5edfd4204142b4305f96ffe836de717a39cfcd9c5edc954161ab21fb49e98eb4
 DIST mutter-3.2.1.tar.xz 1640556 RMD160 310ad5d91e0c741b95c3e14f1f27c2a5bb32609e SHA1 d3990d3f51481e679dd7e588ca28795a361c6006 SHA256 d6135d5e6c0852f7dc996798e9455fc2e9cbe6d2672f3750fc9b8d27ab141294
 DIST mutter-3.2.2.tar.xz 1647416 RMD160 dd186b113149646ef120fa8c4fe89bdfe6c45ec5 SHA1 7ba5bdb7014311d3bfee1e201fdc039b96598471 SHA256 cd5977d86a100d89cfef557c22900b6d061730e2bda66e314e4943505d2bd5a1
 EBUILD mutter-3.2.1-r1.ebuild 1937 RMD160 645e906873397d025929f2d0ddfa7eae7b399f66 SHA1 b4e2f729adfdf535f7cd978200fcb3c673ed2271 SHA256 f60d0792520285195b2290e75eba366d48e6ecd2b8df8d4158596f8eac101386
-EBUILD mutter-3.2.2.ebuild 1934 RMD160 ba2cfe281358fa56064f032a66ae9243bc733293 SHA1 874066070b7df67644d3fc9070b1238accc84d89 SHA256 80e8a2e558e7cdafdebb52b2265a503d4c61f4c14312e2ca4be066c99d9a00c6
-MISC ChangeLog 1232 RMD160 72570ea73366c042a25264e260a5c08ef5afd318 SHA1 e09ff0273d8e0cd3a6a249fce959705012baa5a2 SHA256 bc5c130509c3301ad1d0919ff738a8106c245fcf38a85117341afbf222376682
+EBUILD mutter-3.2.2.ebuild 2048 RMD160 536dbeb9193ad68d47090f2581217ee5cd5bb2e8 SHA1 46a890b972d18dac265fd49a9378765939bbac37 SHA256 17c24a3448ec9f469947b4c18b9ae194f46b164c315c6272edc5e6519d24a232
+MISC ChangeLog 1447 RMD160 f453f10d0ed0fb58bbf6b5a693d4b9d939c840ba SHA1 bb48afaddcefd855a33a26d8ee33fd5db66b9451 SHA256 53369e7aec3ab80cf2d3cd0b579c65d81c2f98f06d4c79a24af975fabd0f6f73
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8aHZoACgkQdjK8w9WeBnA9ZQD9HzI+x8k4ge/VeeLzcaYOc3hc
-ZhPdgIOqOzZpBXkAQmoA/3DYVmwF5TB5J2sepY6MAjcRcJWT2IbaVLycCYzLE0e+
-=/8f4
+iF4EAREIAAYFAk8tlgQACgkQdjK8w9WeBnDmRQD/V1my01EMzAxFod4Zth7I3q9Z
+bjJwP+juIMzkQiZcjjwA/Al+tZeZWAEmpkP/r4+ZmH7NMa62aXxbfEURbe9FQCWr
+=aHl5
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/mutter/files/mutter-3.2.2-disable-introspection.patch b/x11-wm/mutter/files/mutter-3.2.2-disable-introspection.patch
new file mode 100644
index 000000000000..454376aff193
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.2.2-disable-introspection.patch
@@ -0,0 +1,27 @@
+From 41ae760454fa6b4aff50ff417d8a6ea265d82253 Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin@gmail.com>
+Date: Fri, 25 Nov 2011 18:28:38 +0000
+Subject: Fix compilation with --disable-introspection
+
+Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@linux.intel.com>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=661871
+---
+(limited to 'src/core/mutter.c')
+
+diff --git a/src/core/mutter.c b/src/core/mutter.c
+index 159bbf3..117a549 100644
+--- a/src/core/mutter.c
++++ b/src/core/mutter.c
+@@ -25,9 +25,7 @@
+ 
+ #include <meta/main.h>
+ #include <meta/util.h>
+-#ifdef HAVE_INTROSPECTION
+ #include "meta-plugin-manager.h"
+-#endif
+ 
+ #include <glib.h>
+ 
+--
+cgit v0.9.0.2
diff --git a/x11-wm/mutter/mutter-3.2.2.ebuild b/x11-wm/mutter/mutter-3.2.2.ebuild
index 2fb7d16a899c..d6a1d00d50eb 100644
--- a/x11-wm/mutter/mutter-3.2.2.ebuild
+++ b/x11-wm/mutter/mutter-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.2.2.ebuild,v 1.1 2012/01/21 02:06:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.2.2.ebuild,v 1.2 2012/02/04 20:33:03 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -74,5 +74,8 @@ src_prepare() {
 	# Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
 	epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch"
 
+	# Patch from 3.3.x, fixes building without introspection
+	epatch "${FILESDIR}/${P}-disable-introspection.patch"
+
 	gnome2_src_prepare
 }