Fix building old versions against >=glib-2.31.

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

5 files changed, 128 insertions, 4 deletions

diff --git a/net-misc/modemmanager/ChangeLog b/net-misc/modemmanager/ChangeLog
index 6e8f730e66f4..abf1e5865020 100644
--- a/net-misc/modemmanager/ChangeLog
+++ b/net-misc/modemmanager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/modemmanager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.25 2012/05/05 03:20:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/ChangeLog,v 1.26 2012/05/24 02:52:57 tetromino Exp $
+
+  24 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  modemmanager-0.4.ebuild, modemmanager-0.4_p20110205-r1.ebuild,
+  +files/modemmanager-0.5-glib-2.31.patch, modemmanager-0.5.ebuild:
+  Fix building old versions against >=glib-2.31.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> modemmanager-0.4.ebuild,
   modemmanager-0.4_p20110205-r1.ebuild, modemmanager-0.5.ebuild,
diff --git a/net-misc/modemmanager/files/modemmanager-0.5-glib-2.31.patch b/net-misc/modemmanager/files/modemmanager-0.5-glib-2.31.patch
new file mode 100644
index 000000000000..a8aa19184756
--- /dev/null
+++ b/net-misc/modemmanager/files/modemmanager-0.5-glib-2.31.patch
@@ -0,0 +1,104 @@
+From 6406f9eb7042f63a38343412864b6a129be7fe75 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@lanedo.com>
+Date: Mon, 24 Oct 2011 21:09:11 +0200
+Subject: [PATCH] core: don't include private headers from glib
+
+The "glib/gtypes.h" is now considered private, and only "glib.h" should be
+included directly.
+---
+ src/mm-at-serial-port.h   |    1 -
+ src/mm-manager.h          |    1 -
+ src/mm-modem-base.h       |    1 -
+ src/mm-plugin-base.h      |    1 -
+ src/mm-port.h             |    1 -
+ src/mm-qcdm-serial-port.h |    1 -
+ src/mm-serial-port.h      |    1 -
+ 7 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/src/mm-at-serial-port.h b/src/mm-at-serial-port.h
+index 5d5f13f..cec5dc3 100644
+--- a/src/mm-at-serial-port.h
++++ b/src/mm-at-serial-port.h
+@@ -18,7 +18,6 @@
+ #define MM_AT_SERIAL_PORT_H
+ 
+ #include <glib.h>
+-#include <glib/gtypes.h>
+ #include <glib-object.h>
+ 
+ #include "mm-serial-port.h"
+diff --git a/src/mm-manager.h b/src/mm-manager.h
+index 1c98458..c6a64bd 100644
+--- a/src/mm-manager.h
++++ b/src/mm-manager.h
+@@ -17,7 +17,6 @@
+ #ifndef MM_MANAGER_H
+ #define MM_MANAGER_H
+ 
+-#include <glib/gtypes.h>
+ #include <glib-object.h>
+ #include <dbus/dbus-glib.h>
+ #include "mm-modem.h"
+diff --git a/src/mm-modem-base.h b/src/mm-modem-base.h
+index 0409957..d0cda3d 100644
+--- a/src/mm-modem-base.h
++++ b/src/mm-modem-base.h
+@@ -18,7 +18,6 @@
+ #define MM_MODEM_BASE_H
+ 
+ #include <glib.h>
+-#include <glib/gtypes.h>
+ #include <glib-object.h>
+ 
+ #include "mm-port.h"
+diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h
+index 799f681..e69ad17 100644
+--- a/src/mm-plugin-base.h
++++ b/src/mm-plugin-base.h
+@@ -17,7 +17,6 @@
+ #define MM_PLUGIN_BASE_H
+ 
+ #include <glib.h>
+-#include <glib/gtypes.h>
+ #include <glib-object.h>
+ 
+ #define G_UDEV_API_IS_SUBJECT_TO_CHANGE
+diff --git a/src/mm-port.h b/src/mm-port.h
+index 4bcffd4..df935db 100644
+--- a/src/mm-port.h
++++ b/src/mm-port.h
+@@ -17,7 +17,6 @@
+ #define MM_PORT_H
+ 
+ #include <glib.h>
+-#include <glib/gtypes.h>
+ #include <glib-object.h>
+ 
+ typedef enum {
+diff --git a/src/mm-qcdm-serial-port.h b/src/mm-qcdm-serial-port.h
+index 2786ee8..605016d 100644
+--- a/src/mm-qcdm-serial-port.h
++++ b/src/mm-qcdm-serial-port.h
+@@ -18,7 +18,6 @@
+ #define MM_QCDM_SERIAL_PORT_H
+ 
+ #include <glib.h>
+-#include <glib/gtypes.h>
+ #include <glib-object.h>
+ 
+ #include "mm-serial-port.h"
+diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h
+index ae38017..f988af3 100644
+--- a/src/mm-serial-port.h
++++ b/src/mm-serial-port.h
+@@ -18,7 +18,6 @@
+ #define MM_SERIAL_PORT_H
+ 
+ #include <glib.h>
+-#include <glib/gtypes.h>
+ #include <glib-object.h>
+ 
+ #include "mm-port.h"
+-- 
+1.7.8.6
+
diff --git a/net-misc/modemmanager/modemmanager-0.4.ebuild b/net-misc/modemmanager/modemmanager-0.4.ebuild
index 3d0a4c33b6e0..83d2f19d7aef 100644
--- a/net-misc/modemmanager/modemmanager-0.4.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.4.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/net-misc/modemmanager/modemmanager-0.4.ebuild,v 1.7 2012/05/05 03:20:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.4.ebuild,v 1.8 2012/05/24 02:52:57 tetromino Exp $
 
 EAPI="2"
 
@@ -30,6 +30,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+src_prepare() {
+	# fix building against glib-2.31 headers
+	epatch "${FILESDIR}/${PN}-0.5-glib-2.31.patch"
+}
+
 src_configure() {
 	# ppp-2.4.5 will change the plugin directory (not added to portage yet)
 	if has_version '=net-dialup/ppp-2.4.4*'; then
diff --git a/net-misc/modemmanager/modemmanager-0.4_p20110205-r1.ebuild b/net-misc/modemmanager/modemmanager-0.4_p20110205-r1.ebuild
index 2d3c2021ab65..31fd94592656 100644
--- a/net-misc/modemmanager/modemmanager-0.4_p20110205-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.4_p20110205-r1.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/net-misc/modemmanager/modemmanager-0.4_p20110205-r1.ebuild,v 1.2 2012/05/05 03:20:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.4_p20110205-r1.ebuild,v 1.3 2012/05/24 02:52:57 tetromino Exp $
 
 EAPI="2"
 
@@ -31,6 +31,11 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+src_prepare() {
+	# fix building against glib-2.31 headers
+	epatch "${FILESDIR}/${PN}-0.5-glib-2.31.patch"
+}
+
 src_configure() {
 	# ppp-2.4.5 will change the plugin directory (not added to portage yet)
 	if has_version '=net-dialup/ppp-2.4.4*'; then
diff --git a/net-misc/modemmanager/modemmanager-0.5.ebuild b/net-misc/modemmanager/modemmanager-0.5.ebuild
index dbd2eee086ca..215863c3d562 100644
--- a/net-misc/modemmanager/modemmanager-0.5.ebuild
+++ b/net-misc/modemmanager/modemmanager-0.5.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/net-misc/modemmanager/modemmanager-0.5.ebuild,v 1.3 2012/05/05 03:20:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/modemmanager/modemmanager-0.5.ebuild,v 1.4 2012/05/24 02:52:57 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="ModemManager"
@@ -28,6 +28,11 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
+src_prepare() {
+	# fix building against glib-2.31 headers
+	epatch "${FILESDIR}/${PN}-0.5-glib-2.31.patch"
+}
+
 src_configure() {
 	# ppp-2.4.5 changes the plugin directory
 	if has_version '=net-dialup/ppp-2.4.4*'; then