Fix building with >=glib-2.31 (bug #414127, thanks to salamanderrake for reporting).

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

4 files changed, 68 insertions, 10 deletions

diff --git a/dev-cpp/gtksourceviewmm/ChangeLog b/dev-cpp/gtksourceviewmm/ChangeLog
index 82cfcb9f6eea..7ffe002d26c8 100644
--- a/dev-cpp/gtksourceviewmm/ChangeLog
+++ b/dev-cpp/gtksourceviewmm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-cpp/gtksourceviewmm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/ChangeLog,v 1.23 2012/04/29 15:18:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/ChangeLog,v 1.24 2012/05/02 07:17:04 tetromino Exp $
+
+  02 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtksourceviewmm-2.10.2.ebuild, +files/gtksourceviewmm-2.10.2-glib-2.31.patch:
+  Fix building with >=glib-2.31 (bug #414127, thanks to salamanderrake for
+  reporting).
 
   29 Apr 2012; Markus Meier <maekke@gentoo.org> gtksourceviewmm-3.2.0.ebuild:
   x86 stable, bug #410611
diff --git a/dev-cpp/gtksourceviewmm/Manifest b/dev-cpp/gtksourceviewmm/Manifest
index 878de0a760c3..ad576cd5a2e0 100644
--- a/dev-cpp/gtksourceviewmm/Manifest
+++ b/dev-cpp/gtksourceviewmm/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gtksourceviewmm-2.10.2-glib-2.31.patch 1437 RMD160 25416db347a2f1260887eb4d987aeb378a84cbc0 SHA1 8f407b90e90b1bdbc7fd0fce375799128a7e7865 SHA256 f779806415fe20fa12dd698282e9fe31931ca0e0219816bde39ca747f2827533
 DIST gtksourceviewmm-2.10.2.tar.xz 745036 RMD160 0840d3cd9f696cc2455c9a92a6df9aaf8d71f8d8 SHA1 c90b1ee3bff591dbab8a18d43ced6859613b8435 SHA256 12faffd4b0d412a4ff08d0989fa136dfe4dec434a58447bfeffb93473b775cb7
 DIST gtksourceviewmm-3.0.0.tar.bz2 940243 RMD160 0ce0ceea318f1f83c4abf8555cae35faaad7a202 SHA1 203b5b80b9b8de41811445f3cdc926c597a26f97 SHA256 4f5d2b68758483d37a462e4e19e31393fc072473b2c9dfc2cce275e2934ef7f0
 DIST gtksourceviewmm-3.2.0.tar.xz 742028 RMD160 d5dc1a67b8fd43308e9efcf9bfaf51022201b8c0 SHA1 cac8d2fdde7b862bdb5eb12c6b8998a29e3fcf95 SHA256 9dc0c44f00627e434a36ac7c3a34d9c30ebe45eb6dc682dc733a85dcead2ba66
-EBUILD gtksourceviewmm-2.10.2.ebuild 1111 RMD160 907ecd9e2d842cf0aafb29f750f306bdf2c8b5ec SHA1 18b87901e620577a24a4558ce35d9b6fff78ab41 SHA256 4df27f597a27c16e4c3f584ddf3a519a0ff9704fe4a694fe5d869bb63cabefd3
+EBUILD gtksourceviewmm-2.10.2.ebuild 1227 RMD160 58f2a28ed54fa1b4713e2cb77177e8011e81c7df SHA1 6b27f9f589aa8bc4d42608d120a687bb13e176da SHA256 76af06441a0c6ef427ac92505ec32acf166e3fa979496313d60367b7811fe47c
 EBUILD gtksourceviewmm-3.0.0.ebuild 812 RMD160 a6e1ab2e002284c28e7db0bdbf4004f29a72860f SHA1 62eb00a8902b82d765f33ec3c1d4317b1c2a1a45 SHA256 810bb8b9213dd1f46b9b193e4a00b4ca1fa22a447772f0b5032b17ebe205f6a3
 EBUILD gtksourceviewmm-3.2.0.ebuild 788 RMD160 0211bba0a41551ba04bdb542191f11933436bbe3 SHA1 44a813d24364639e7d55697a92e60a2722838170 SHA256 cb1f60205a0e2e8d36e2297485e049e8afb9c38811fb3ba4a1154fb57caf4d2d
-MISC ChangeLog 3412 RMD160 25e4bb86f2425bc13d147c050b235676c01eb5b8 SHA1 ee8d18d749590ca397ed18833952f16fe6b3aeca SHA256 2c8c573b20edc090ba14cd76c27cde062ae1136b33c2a6d0348b68df2a348679
+MISC ChangeLog 3644 RMD160 008876a80f9f9e11b75692e4df2f36ee17f08094 SHA1 221e5be590821dba280481fcc1e65848e630a850 SHA256 9b1fe3debc45f3831e710a3fc362b6647978d9cf58e87a3883cbbe8cf1ab013f
 MISC metadata.xml 246 RMD160 7703f45f1d99ffb3ce99a9e71a45fdcde5a33af8 SHA1 37233fad556c0590e65a7e5731a8cad87f4afc9f SHA256 e5453f00c41dc039793368ecbe6c7296ac8593f976fee6e3aeeeb5751b03d15d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+dXGwACgkQkKaRLQcq0GLxYgCgl2xD0BfqeQVZ3+nO9MUhibha
-bC4An0eWh7AxjYwVKtdRub6+nW78B61h
-=zoka
+iQEcBAEBAgAGBQJPoN91AAoJEJ0WA1zPCt1hPxYH/RU7xa15nwHK6Z+I8ATe7lAa
+6qfrPldJY4CgIWFV52vDLYKVU+vWDwTzMR3/f0RnSuMYd7DAAsGXrQIloYgan0mu
+pdWBQZj4mWwosATu2EWH7x4XvTkNlLYEAcsjD7djTAkqVKG7UGZ95KqxDk56goY4
+kOGS6V6muX2tAOTuhYg4aZyHE0RNGRnJZxsniTXAD1tR+Shb3re68pRnOGh9SSFF
+fzXuQU6uUuhC55+UlmOmaI0WsvhNoW3rqjy6gmCDAKOTS1TO4+lSmEEvTH/DKbtL
+n7Cpmq9axdvKUGsF/LP1aQ5u9hLGdFud93y0wdvkvkoyNrNX4vSdeDSpTGK7PsM=
+=mr27
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-2.10.2-glib-2.31.patch b/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-2.10.2-glib-2.31.patch
new file mode 100644
index 000000000000..b42d0727f106
--- /dev/null
+++ b/dev-cpp/gtksourceviewmm/files/gtksourceviewmm-2.10.2-glib-2.31.patch
@@ -0,0 +1,45 @@
+Fix build with glib 2.31
+
+Patch by Dominique Leuenberger <dimstar@opensuse.org>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=666651
+
+Index: gtksourceviewmm-2.10.2/gtksourceview/gtksourceviewmm/sourceiter.cc
+===================================================================
+--- a/gtksourceviewmm-2.10.2/gtksourceview/gtksourceviewmm/sourceiter.cc
++++ b/gtksourceviewmm-2.10.2/gtksourceview/gtksourceviewmm/sourceiter.cc
+@@ -28,7 +28,7 @@
+  */
+ 
+ #include "sourceiter.h"
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtksourceview/gtksourceview-typebuiltins.h>
+ namespace gtksourceview
+ {
+Index: gtksourceviewmm-2.10.2/gtksourceview/src/sourceiter.ccg
+===================================================================
+--- a/gtksourceviewmm-2.10.2/gtksourceview/src/sourceiter.ccg
++++ b/gtksourceviewmm-2.10.2/gtksourceview/src/sourceiter.ccg
+@@ -21,7 +21,7 @@
+  */
+ 
+ #include "sourceiter.h"
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtksourceview/gtksourceview-typebuiltins.h>
+ namespace gtksourceview
+ {
+Index: gtksourceviewmm-2.10.2/tests/search/main.cc
+===================================================================
+--- a/gtksourceviewmm-2.10.2/tests/search/main.cc
++++ b/gtksourceviewmm-2.10.2/tests/search/main.cc
+@@ -6,7 +6,7 @@
+ #include <cstring>
+ #include <gtkmm.h>
+ #include <gtksourceviewmm.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ using namespace std ;
+ using namespace Gtk;
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.2.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.2.ebuild
index a5b1f6bcafba..d20155c97367 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.2.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.2.ebuild,v 1.6 2011/10/21 14:07:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.2.ebuild,v 1.7 2012/05/02 07:17:04 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="C++ bindings for gtksourceview"
 HOMEPAGE="http://projects.gnome.org/gtksourceviewmm/"
@@ -33,6 +33,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# bug #414127, https://bugzilla.gnome.org/show_bug.cgi?id=666651
+	epatch "${FILESDIR}/${P}-glib-2.31.patch"
+
 	gnome2_src_prepare
 
 	# Remove docs from SUBDIRS so that docs are not installed, as