Let it compile against glib-2.32

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 160 insertions, 3 deletions

diff --git a/media-sound/neutrino/ChangeLog b/media-sound/neutrino/ChangeLog
index de6029f43ab2..4198e20f6679 100644
--- a/media-sound/neutrino/ChangeLog
+++ b/media-sound/neutrino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/neutrino
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/neutrino/ChangeLog,v 1.5 2012/05/05 08:44:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/neutrino/ChangeLog,v 1.6 2012/07/21 14:30:22 pacho Exp $
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/neutrino-0.8.4-glib-single-include.patch, neutrino-0.8.4.ebuild:
+  Let it compile against glib-2.32
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> neutrino-0.8.4.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -22,4 +26,3 @@
   30 Jul 2005; Tony Vroon <chainsaw@gentoo.org> +metadata.xml,
   +neutrino-0.8.3.ebuild:
   Initial commit, closes bug #65162.
-
diff --git a/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch b/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch
new file mode 100644
index 000000000000..1d2558dc9313
--- /dev/null
+++ b/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch
@@ -0,0 +1,148 @@
+Index: neutrino-0.8.4/id3/nomad-id3-util.c
+===================================================================
+--- neutrino-0.8.4.orig/id3/nomad-id3-util.c
++++ neutrino-0.8.4/id3/nomad-id3-util.c
+@@ -26,15 +26,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #ifndef HAVE_GNOME_VFS
+ 
+-#include <glib/gfileutils.h>
+-#include <glib/gdir.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+Index: neutrino-0.8.4/id3/nomad-id3.c
+===================================================================
+--- neutrino-0.8.4.orig/id3/nomad-id3.c
++++ neutrino-0.8.4/id3/nomad-id3.c
+@@ -30,10 +30,8 @@
+ #include <libgnomevfs/gnome-vfs-file-info.h>
+ #endif
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+-#include <glib/gtypes.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+Index: neutrino-0.8.4/libnomad/nomad-jukebox.c
+===================================================================
+--- neutrino-0.8.4.orig/libnomad/nomad-jukebox.c
++++ neutrino-0.8.4/libnomad/nomad-jukebox.c
+@@ -27,8 +27,7 @@
+ 
+ #include <string.h>
+ 
+-#include <glib/gqueue.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include <semaphore.h>
+ 
+Index: neutrino-0.8.4/libnomad/nomad-util.c
+===================================================================
+--- neutrino-0.8.4.orig/libnomad/nomad-util.c
++++ neutrino-0.8.4/libnomad/nomad-util.c
+@@ -31,15 +31,10 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ 
+ #ifndef HAVE_GNOME_VFS
+ 
+-#include <glib/gfileutils.h>
+-#include <glib/gdir.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+Index: neutrino-0.8.4/src/neutrino-file-browser.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-file-browser.c
++++ neutrino-0.8.4/src/neutrino-file-browser.c
+@@ -25,9 +25,7 @@
+ 
+ #include <config.h>
+ 
+-#include <glib/gutils.h>
+-#include <glib/ghash.h>
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+ #include <libgnomevfs/gnome-vfs-mime-utils.h>
+Index: neutrino-0.8.4/src/neutrino-jukebox-view.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-jukebox-view.c
++++ neutrino-0.8.4/src/neutrino-jukebox-view.c
+@@ -27,7 +27,7 @@
+ 
+ #include <gdk/gdk.h>
+ 
+-#include <glib/gmarkup.h>
++#include <glib.h>
+ 
+ #include <string.h>
+ 
+Index: neutrino-0.8.4/src/neutrino-util.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-util.c
++++ neutrino-0.8.4/src/neutrino-util.c
+@@ -26,16 +26,11 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#include <glib/gconvert.h>
+-#include <glib/gunicode.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <gtk/gtkwidget.h>
+ 
+ #ifndef HAVE_GNOME_VFS
+ 
+-#include <glib/gfileutils.h>
+-#include <glib/gdir.h>
+ 
+ #include <sys/stat.h>
+ #include <sys/types.h>
+Index: neutrino-0.8.4/src/neutrino-wav.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-wav.c
++++ neutrino-0.8.4/src/neutrino-wav.c
+@@ -28,7 +28,7 @@
+ #include <libgnomevfs/gnome-vfs-ops.h>
+ #endif
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ 
+ #include <libnjb.h>
+ 
+Index: neutrino-0.8.4/src/neutrino-window.c
+===================================================================
+--- neutrino-0.8.4.orig/src/neutrino-window.c
++++ neutrino-0.8.4/src/neutrino-window.c
+@@ -34,7 +34,7 @@
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
+ #include <libgnomevfs/gnome-vfs-utils.h>
+ 
+-#include <glib/grand.h>
++#include <glib.h>
+ 
+ #include <gtk/gtk.h>
+ 
diff --git a/media-sound/neutrino/neutrino-0.8.4.ebuild b/media-sound/neutrino/neutrino-0.8.4.ebuild
index d5fbdbcfd9aa..660edb9280ab 100644
--- a/media-sound/neutrino/neutrino-0.8.4.ebuild
+++ b/media-sound/neutrino/neutrino-0.8.4.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/neutrino/neutrino-0.8.4.ebuild,v 1.2 2012/05/05 08:44:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/neutrino/neutrino-0.8.4.ebuild,v 1.3 2012/07/21 14:30:22 pacho Exp $
 
+EAPI=4
 inherit gnome2
 
 DESCRIPTION="A GNOME application to manage Creative music players using the PDE protocol"
@@ -27,3 +28,8 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog README TODO"
 MAKEOPTS="${MAKEOPTS} -j1"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8.4-glib-single-include.patch"
+	gnome2_src_prepare
+}