Fix single includes (bug #413413)

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

4 files changed, 67 insertions, 12 deletions

diff --git a/media-sound/ario/ChangeLog b/media-sound/ario/ChangeLog
index a97ce45fd55e..eafe0b39f763 100644
--- a/media-sound/ario/ChangeLog
+++ b/media-sound/ario/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ario
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ChangeLog,v 1.24 2011/06/19 15:55:08 angelos Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ChangeLog,v 1.25 2012/04/25 06:58:17 angelos Exp $
+
+  25 Apr 2012; Christoph Mende <angelos@gentoo.org>
+  +files/ario-1.5.1-single-includes.patch, ario-1.5.1.ebuild:
+  Fix single includes (bug #413413)
 
 *ario-1.5.1 (19 Jun 2011)
 
diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
index cff1fcfabb37..4f8e19e5067f 100644
--- a/media-sound/ario/Manifest
+++ b/media-sound/ario/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA256
 
 AUX ario-1.5-libnotify-0.7.patch 947 RMD160 c39364548e835f91bc6089d134cafbaa97860ba0 SHA1 058567173892ca869a4f55a60489c56c6270a4fd SHA256 3df3bac95f6534c8a3d4dcb53b5e0f7aa2b4c70597ca1d1a21e6b72fa443d9b9
+AUX ario-1.5.1-single-includes.patch 1670 RMD160 724718e3991ea2d6365d8175777f67540d068e1a SHA1 4622ca57dcc96d2e8d770f225711ba37d6b4bc1c SHA256 9321533a1ff67452e45659efe7587cd5eb001903880451f833d44d23768daeb5
 DIST ario-1.5.1.tar.gz 1135444 RMD160 dfc819cf46a80e822aa3b654c334d8cbaddb3b9d SHA1 99c1ae6318a596cd27ac3c38ad25bc716527a94d SHA256 0831281ab8634eb92424b61230eee035822f7f92d8b0526da7316c898239c91e
 DIST ario-1.5.tar.gz 1119387 RMD160 74701aaae0c5413958675fde837ea04640113d9a SHA1 45996e16056046ce49f132dd675031b47b571735 SHA256 0de4885f3c133cc3af2fd506d19780d9fa8c1e7b8a6413b0c2153b30b73c9725
-EBUILD ario-1.5.1.ebuild 1457 RMD160 e90db6968373d4a6d050d99c5d38866960cd2334 SHA1 c20ccc9f593931f3b168903a57d4f47c763679ca SHA256 155336156477dd33628988e206a6b1541d5f6029748e7abaea29116ef7cca979
+EBUILD ario-1.5.1.ebuild 1525 RMD160 49f3bcdbd0a8b4663d7be3641dea520890995b31 SHA1 ba6f58dee60183dd1e4bd520bb5fa566c492cbb0 SHA256 315c1ddc9b3e91ee6e60b275c08595ed4707be3fe762ac54945bfb0b4fed6612
 EBUILD ario-1.5.ebuild 1801 RMD160 513ebb74ee6734fab5246ae7689b5055c8e327f5 SHA1 f08d42176934babe7227a1590ad9a6b0a7c458a7 SHA256 057cdd6d9c67c8ca20f0daca0a1f8140289bd389060597fc2637c16b66add956
-MISC ChangeLog 3323 RMD160 17f37056cfeb653ae2300d62a50ced5e5ede13c1 SHA1 2c05b5cb2c67511dc2511408e1bc6fa53b24e270 SHA256 413997459877b02b7867a367e1908e4d12e11d0b8ad40dea455ed4b20997ed43
+MISC ChangeLog 3474 RMD160 03eb053d6b102afe6a76a6f8b4143f291ceb4155 SHA1 4448b74a07c33f3d2ddff516d70e12fe7a34d834 SHA256 fcaeaa51643c55e2434dae5930993cf0ed2eddbce13384e8fd647fa3b038a9a1
 MISC metadata.xml 451 RMD160 a07b7c297b45d7e7116285fc21931105aeaa3bc1 SHA1 45abc2a361f1bed8f83706662a6cfac748d3b243 SHA256 1dc1904e1927ba9bbb7d5c68b7b30659be1dfc06ff566124dc6c603be2eaef80
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59o9kACgkQfXuS5UK5QB3yfAP8C4GMTXvEDd+At4Qs2JFp54RV
-+PXSv4ycsm19UmQ7Fl3mUAgnVFmMhodwHlzFRcADZ1ql6f3jdTKywOUSDbKAvFA6
-WCRZnPwXsfaCZFLuTP6DsXxSMccCKdrtIG3kV1iALhYXu4GH84s3rJ0Qp4KImBa8
-0Y2LtdzfXtauDYWANvY=
-=lU6c
+iF4EAREIAAYFAk+XoI4ACgkQmWq1bYTyC0Np9AD8CpiJQzF2H6n5ujwm0U01cvhp
+u4k0j7uuwfBZR42B9VMA/A9s3WYLaOgBsp45REkg4XT0EDaKJZSiyL12CBpmB9S/
+=vYPW
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ario/ario-1.5.1.ebuild b/media-sound/ario/ario-1.5.1.ebuild
index df1eb43e65a3..f5782a158be5 100644
--- a/media-sound/ario/ario-1.5.1.ebuild
+++ b/media-sound/ario/ario-1.5.1.ebuild
@@ -1,6 +1,6 @@
-# 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/media-sound/ario/ario-1.5.1.ebuild,v 1.1 2011/06/19 15:55:08 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ario-1.5.1.ebuild,v 1.2 2012/04/25 06:58:17 angelos Exp $
 
 EAPI=4
 GNOME2_LA_PUNT=yes
@@ -37,6 +37,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-single-includes.patch
+}
+
 src_configure() {
 	econf \
 		--disable-static \
diff --git a/media-sound/ario/files/ario-1.5.1-single-includes.patch b/media-sound/ario/files/ario-1.5.1-single-includes.patch
new file mode 100644
index 000000000000..da7d7b598a8c
--- /dev/null
+++ b/media-sound/ario/files/ario-1.5.1-single-includes.patch
@@ -0,0 +1,48 @@
+Description: Only <glib.h> can be included directly.
+ Starting with glib 2.32 it is now mandatory to include glib.h
+ instead of individual headers, or the compiler will generate
+ an error.
+Origin: vendor: Debian
+Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665506
+
+Index: ario-1.5.1/src/ario-profiles.h
+===================================================================
+--- ario-1.5.1.orig/src/ario-profiles.h	2011-05-17 19:54:49.000000000 +0200
++++ ario-1.5.1/src/ario-profiles.h	2012-03-30 07:10:46.285079675 +0200
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_PROFILES_H
+ #define __ARIO_PROFILES_H
+ 
+-#include <glib/gslist.h>
++#include <glib.h>
+ #include "servers/ario-server.h"
+ 
+ G_BEGIN_DECLS
+Index: ario-1.5.1/src/plugins/ario-plugin-info.c
+===================================================================
+--- ario-1.5.1.orig/src/plugins/ario-plugin-info.c	2011-02-27 16:07:28.000000000 +0100
++++ ario-1.5.1/src/plugins/ario-plugin-info.c	2012-03-30 07:10:48.289079604 +0200
+@@ -27,7 +27,7 @@
+ 
+ #include <string.h>
+ #include <glib/gi18n.h>
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ 
+ #include "plugins/ario-plugin-info-priv.h"
+ #include "ario-debug.h"
+Index: ario-1.5.1/src/ario-util.h
+===================================================================
+--- ario-1.5.1.orig/src/ario-util.h	2011-02-27 16:07:31.000000000 +0100
++++ ario-1.5.1/src/ario-util.h	2012-03-30 07:21:04.725057804 +0200
+@@ -18,8 +18,8 @@
+  */
+ 
+ #include "servers/ario-server.h"
+-#include "glib/gslist.h"
+-#include "gdk/gdkpixbuf.h"
++#include <glib.h>
++#include <gdk/gdkpixbuf.h>
+ 
+ /* Number of covers used to generate the drag & drop image */
+ #define MAX_COVERS_IN_DRAG 3