Fix building old versions against >=glib-2.31.

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

6 files changed, 147 insertions, 8 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/Manifest b/net-misc/modemmanager/Manifest
index 9fe6b82b8606..e56ffdac880b 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,11 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 01-org.freedesktop.ModemManager.pkla 285 RMD160 7ac809452d98472958212ff1cbddf4a3f012ee5f SHA1 eaa96c037f9424f84c4a6c461cfa331b89b4a2e5 SHA256 c4eeb956c5bfa0dfe30efe1ae1c88e60674425dcc786c080da0d17f245c0e5f5
+AUX modemmanager-0.5-glib-2.31.patch 2648 RMD160 47bb67ca734c829c4d2042b5b078bf531953e437 SHA1 b2f306628e83e4639a29febb35282297f278dd5e SHA256 7a59df7d4db579ca5b794410956733002ea509b67f0180353a92573a9b9e8671
 DIST ModemManager-0.4.tar.bz2 444746 RMD160 c2d82f746bc3611e11b7f0c4504fa4cc14fa0788 SHA1 786231841cfa3824ff69ad2c9a6a40b881689012 SHA256 8b5415ae8597726f82e9fd09237c02b5c8af7e9f4fc4cba00f9fe183cc2c6c5f
 DIST ModemManager-0.4_p20110205.tar.bz2 482484 RMD160 7ef84838751685c2d731285b9ea78c0cadcdd684 SHA1 26a624c4a1a133a6b0817ed81fe1fa3e207647bc SHA256 fe3e9ab797e60bf4ead90c40ea88c33c81d36e991408f62276cb30111f66d051
 DIST ModemManager-0.5.2.0.tar.xz 492728 RMD160 32abe19a16b543049925539a59ffa315571b8bbf SHA1 44775ec78bda336e0e6abb1dea60744b033412db SHA256 7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8
 DIST ModemManager-0.5.tar.xz 461608 RMD160 093321c2ac43e00117ade3bd9cdd9dca5790d47f SHA1 550959ca02af9970a0bdd19a72810ed9f065b9dd SHA256 e7c7aed7c1484adee22f04dac358c1f971985f8413096c4d412d084aa2cd7c7f
-EBUILD modemmanager-0.4.ebuild 1899 RMD160 88b0904660463ac23e9f229282538d175bdd8719 SHA1 2512f54c324636d3247ad235c5336c6114d26b9d SHA256 4593de29a4793d9f764c4f71ae15a74147a532cb59ae0c5738428b1558f071e3
-EBUILD modemmanager-0.4_p20110205-r1.ebuild 1986 RMD160 f277ff8a82f3b3d6829973a8f60452c6fb5ddafb SHA1 c22f455b256690f156b3059d4ac71af706b26386 SHA256 9842571c9e5c2f84ce34e1191c07b88aea8a759931434713c80b5ba3eee1569b
+EBUILD modemmanager-0.4.ebuild 2011 RMD160 e2f0524e17f4019722c847183cd67a2f96983817 SHA1 bc40819f8ff4a50a18e9ebbe0bf236e208073f05 SHA256 9e365ced791a6e05b7a5bcee6ff1e0a8960758833b38d2fa91300a9a8e6bdde6
+EBUILD modemmanager-0.4_p20110205-r1.ebuild 2098 RMD160 497ab019057279009dccb20d3255848910247f41 SHA1 c63c2315b7c2576b03ab2c3955ff575c58f9d8ce SHA256 e622b8ae4d767559b461bdedfc0e1a63bf6f681a7da4c8dadfea6f29d97d8c7a
 EBUILD modemmanager-0.5.2.0.ebuild 2095 RMD160 b43a84a75e1282057bb18307754062271397094d SHA1 7a1fe569dfb491480f0d2a2da2765e34d8b62336 SHA256 8daf7e1f0cf5dfe7e31aabf141452264fd129174b86df1c6fc73280881ce3efd
-EBUILD modemmanager-0.5.ebuild 1705 RMD160 6ad7dfc0216b742e46a9ed0d42b34ecd51ce32b8 SHA1 ee17410642aff6a93491aaed3334bee344d5ece8 SHA256 9d1ea2731f2bba36c83f206c9a685b6d33368f79e582a5ceb93aaaf4b5473f78
-MISC ChangeLog 4779 RMD160 35eb038f1f45724c51f2faa465805cede15d4215 SHA1 51cfdb919aa4bf0d4b002c53ebb2c17180ceb21b SHA256 9a27bafd82a4a3baf923e708cac3cd66449834f46fb0ef525283ad615788e5c2
+EBUILD modemmanager-0.5.ebuild 1817 RMD160 6559a59511184e9e4c7cc97a655f68f1ae17b93e SHA1 d7b9a6472897cbc15a20f600cfa151a9280f1d0d SHA256 229aab949bfa04d0e97bd48bc85075376daadaaa9e8684e44686aec3a3196501
+MISC ChangeLog 5024 RMD160 c79a0d9cdaa8ac414d003f9f2767a39d009b9de3 SHA1 856337b2935bcc7869535e429b550c417cf5510c SHA256 f9b3f8c1c9a48003edc4414841d571f5a0a90f2b120cd64e408268becf58fd64
 MISC metadata.xml 433 RMD160 4e1de171ef3d57f25cbb69731a50dc2f7373487b SHA1 fd2e36d9b7bf7d3b52e95d041e4f5f8c256d645b SHA256 fd7d12efce57e4ab207b1d38c879211dad38e99c2cf785c5d8ba49e76b4859b2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEbBAEBAgAGBQJPvaKVAAoJEJ0WA1zPCt1hJfMH+P+glfIOByY8oGnuHMqASARk
+FkhqiXODu7L9Tr3dC3H5hwnigDWndS27K4tzo6dkjIUBI6jFgRtlND/nDGAHGkl4
+E3W3AEZKyVdTXxnB/vWQ+1NStSzge871P0elj0kZ3wAdvs4wsYMApDzJo7+FaMFi
+aOuBx5uCnoAlGRWtK5w1fFIQDHXT+h0e9MiDDLQT5eroYRczyGNekzjoipVkLg6u
+sU4j7o3ZnITcoRvwUde5dTxScR6u7gT3N2AChmoGIBDiYmfXrk1S6k0Kxe0dE/50
+QffLyq/7oa9VSVGexF1unubnHF9yF04Tx38YhglfuA9FtleY79FY2ovAW9a0Ew==
+=2Gx/
+-----END PGP SIGNATURE-----
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