Let it compile with glib-2.32, bug #437770 by Flameeyes.

(Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 128 insertions, 8 deletions

diff --git a/sci-electronics/gspeakers/ChangeLog b/sci-electronics/gspeakers/ChangeLog
index 36f03ba7ee1a..5667e54e1e3d 100644
--- a/sci-electronics/gspeakers/ChangeLog
+++ b/sci-electronics/gspeakers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-electronics/gspeakers
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspeakers/ChangeLog,v 1.18 2012/07/06 05:12:52 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspeakers/ChangeLog,v 1.19 2012/10/21 10:28:01 pacho Exp $
+
+  21 Oct 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/gspeakers-0.11-glib-single-include.patch, gspeakers-0.11-r1.ebuild:
+  Let it compile with glib-2.32, bug #437770 by Flameeyes.
 
   06 Jul 2012; Thomas Beierlein <tomjbe@gentoo.org> gspeakers-0.11-r1.ebuild:
   Filter -O0 from src/Makefile. Thanks ago
diff --git a/sci-electronics/gspeakers/files/gspeakers-0.11-glib-single-include.patch b/sci-electronics/gspeakers/files/gspeakers-0.11-glib-single-include.patch
new file mode 100644
index 000000000000..344527abbeeb
--- /dev/null
+++ b/sci-electronics/gspeakers/files/gspeakers-0.11-glib-single-include.patch
@@ -0,0 +1,117 @@
+Index: gspeakers-0.11/src/box.cc
+===================================================================
+--- gspeakers-0.11.orig/src/box.cc
++++ gspeakers-0.11/src/box.cc
+@@ -17,7 +17,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <sstream>
+ #include "box.h"
+ #include "common.h"
+Index: gspeakers-0.11/src/boxlist.cc
+===================================================================
+--- gspeakers-0.11.orig/src/boxlist.cc
++++ gspeakers-0.11/src/boxlist.cc
+@@ -17,7 +17,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include "boxlist.h"
+ #include "common.h"
+ 
+Index: gspeakers-0.11/src/cellitemcrossover.h
+===================================================================
+--- gspeakers-0.11.orig/src/cellitemcrossover.h
++++ gspeakers-0.11/src/cellitemcrossover.h
+@@ -22,7 +22,7 @@
+ #define __GSPEAKERS_CELLITEM_CROSSOVER
+ 
+ #include <glibmm/ustring.h>
+-#include <glib/gstring.h>
++#include <glib.h>
+ #include <vector>
+ #include "part.h"
+ 
+Index: gspeakers-0.11/src/crossover.cc
+===================================================================
+--- gspeakers-0.11.orig/src/crossover.cc
++++ gspeakers-0.11/src/crossover.cc
+@@ -15,7 +15,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <sstream>
+ #include "crossover.h"
+ 
+Index: gspeakers-0.11/src/crossoverlist.cc
+===================================================================
+--- gspeakers-0.11.orig/src/crossoverlist.cc
++++ gspeakers-0.11/src/crossoverlist.cc
+@@ -15,7 +15,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include "crossoverlist.h"
+ 
+ CrossoverList::CrossoverList()
+Index: gspeakers-0.11/src/net.cc
+===================================================================
+--- gspeakers-0.11.orig/src/net.cc
++++ gspeakers-0.11/src/net.cc
+@@ -17,7 +17,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <sstream>
+ #include <fstream>
+ #include "net.h"
+Index: gspeakers-0.11/src/part.cc
+===================================================================
+--- gspeakers-0.11.orig/src/part.cc
++++ gspeakers-0.11/src/part.cc
+@@ -21,7 +21,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <stdlib.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ 
+ using namespace sigc;
+ using namespace std;
+Index: gspeakers-0.11/src/speaker.cc
+===================================================================
+--- gspeakers-0.11.orig/src/speaker.cc
++++ gspeakers-0.11/src/speaker.cc
+@@ -15,7 +15,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include <sstream>
+ #include "speaker.h"
+ #include "common.h"
+Index: gspeakers-0.11/src/speakerlist.cc
+===================================================================
+--- gspeakers-0.11.orig/src/speakerlist.cc
++++ gspeakers-0.11/src/speakerlist.cc
+@@ -15,7 +15,7 @@
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include "speakerlist.h"
+ #include "common.h"
+ 
diff --git a/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild b/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild
index 053e73fd3791..676f0e8ad2d7 100644
--- a/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild
+++ b/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild,v 1.8 2012/07/06 05:12:52 tomjbe Exp $
-
-EAPI="1"
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild,v 1.9 2012/10/21 10:28:01 pacho Exp $
 
+EAPI=4
 inherit eutils gnome2 autotools
 
 DESCRIPTION="GTK based loudspeaker enclosure and crossovernetwork designer"
@@ -15,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="
-	dev-cpp/gtkmm:2.4
+RDEPEND="dev-cpp/gtkmm:2.4
 	dev-libs/libxml2:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -27,9 +25,10 @@ RDEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README* TODO"
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
 	sed -i -e "s/-O0//" src/Makefile.am
 	epatch "${FILESDIR}"/${P}-gcc43.patch
+	epatch "${FILESDIR}"/${P}-glib-single-include.patch
 	eautoreconf
+	gnome2_src_prepare
 }