summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-10-21 10:28:07 +0000
committerPacho Ramos <pacho@gentoo.org>2012-10-21 10:28:07 +0000
commitb0b8577138c6f48511de2e3374ada0eff122b1b9 (patch)
treed20df936d9cb469311e83f20aa69da19cc3c6344 /sci-electronics
parentold (diff)
downloadhistorical-b0b8577138c6f48511de2e3374ada0eff122b1b9.tar.gz
historical-b0b8577138c6f48511de2e3374ada0eff122b1b9.tar.bz2
historical-b0b8577138c6f48511de2e3374ada0eff122b1b9.zip
Let it compile with glib-2.32, bug #437770 by Flameeyes.
Package-Manager: portage-2.1.11.30/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'sci-electronics')
-rw-r--r--sci-electronics/gspeakers/ChangeLog6
-rw-r--r--sci-electronics/gspeakers/Manifest13
-rw-r--r--sci-electronics/gspeakers/files/gspeakers-0.11-glib-single-include.patch117
-rw-r--r--sci-electronics/gspeakers/gspeakers-0.11-r1.ebuild13
4 files changed, 135 insertions, 14 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/Manifest b/sci-electronics/gspeakers/Manifest
index 6636b1a9eeab..ca2ef9024f5e 100644
--- a/sci-electronics/gspeakers/Manifest
+++ b/sci-electronics/gspeakers/Manifest
@@ -1,15 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX gspeakers-0.11-gcc43.patch 1224 SHA256 9db7df395329c5aa056c561026c3de5b188d3b73ffe4bb69c92e69367e9b7677 SHA512 13ac2ccd0bac188a7b9ac6cabe937ce8bc5ae5b48052f4db15902a7a2a21fd826353709955c8c8c3cc0aba952ab7c5a34b99c9b4080115160707bfc97b29ba78 WHIRLPOOL 2ad38137f89c13381967b9c92f1698e3904d626594789f498e31a1cb8e59c29538241d26d429fbf1b4d966dfef035942c8157edbf60721b4e86e11a6473f4f2d
+AUX gspeakers-0.11-glib-single-include.patch 3393 SHA256 573996d595077937dc3ade1e9187108e375a6f1f79b880925ebfe28c31e384e7 SHA512 dfa91f565088c3e6a3af0abf454184dff48cc0598e22a0c9b5828373e573755b3c0c7a25dc2b909539f543e5392cc402f5b3677a1ce126e783b3bf32353ac100 WHIRLPOOL 16f0f6416bb50d9d306bd211167bf7c219278ea94490bc4da4cc926d7c4e97871a1d83d5cdd712efabc65830a96cf01fde98b943ccfcba971d47698d5be58e06
DIST gspeakers-0.11.tar.gz 546406 SHA256 fe5941f9e17b57d47581b56afb47c35957bc1c1e254a2675a2ad913a9625dc3f SHA512 5a0c6374b5f18d089a1903c5718ba21b9932e4c6a99456e13d4f144eef243a623aca241590e941fa50300a642876b6be8684bcf036db724182c2ee925072bd20 WHIRLPOOL 9418d010b14b760b95c1a51729358c2f30ba7d8f7f5860136195cc7d687310d07ec93ce19525a042d44230e41b1b857895e975c48a4631ccab6de2d63b10d7b1
-EBUILD gspeakers-0.11-r1.ebuild 870 SHA256 be16c03e46d67aa8abbb828d455748d32d26dd05a1d1cae8e1eff7bb13f58758 SHA512 11809c15ce9d594eb8fa0e5eb4be335c7bfba65018fdf3ab4b969450952512ed38e08ffd2634c9f4c19c859b2cd2fd58cf58126cb4ae5a24720be2ae9f89d243 WHIRLPOOL c7337d3a085e973fe238779da5d4a1dc5b4473ff27930e75ead1a7f1e286d34d6d4b0f5333d49a9d52006c32ca00bcd351a12ebc7170e853a7cf502c80cfaac4
-MISC ChangeLog 2602 SHA256 000b415ddf7dbeadbcb681b74b9c526d7ffc639bc00443b79314bf3624018932 SHA512 cb74576402c66d64b5acb119ba14ecfddacf55ddbc77c2e482d43dc1f25dcb597f577ef835b1ff896f386cee3e0e35ead8fa483f9755f8e7f086a790c9809806 WHIRLPOOL d6c77bf4d1ca94d4d06674f712c8418f98d35327ba231704f6ce23d845929f0258eee5c2fc7eb72d27aa8fb79291fe5db728816dd62ed3b8d1eec206ebf270c6
+EBUILD gspeakers-0.11-r1.ebuild 919 SHA256 e08b90cd7498cb29eb3e1f9214e72a88dae4b8dda9b3140eca8e28e33ac576e7 SHA512 22759179bed13e05da5c7d615838c8c8204533cb44444ef993275ea4a5fc11ca1a1947b4e829c08078d82b8e280b4eca92c23e03a9687cc95769e2c0e5f522a3 WHIRLPOOL 80fb9f8ad2a05e4fb7a63a0ceaa4a9899718a7e496d5c5e53588cbc6ca897eb6a3fd37f632a64324f88fe3233a35253691d4425a0996f01e32009a8e741a77f8
+MISC ChangeLog 2784 SHA256 f400282e4bba1610c1d07bea3e05c6e9a2e03d4f97a97070f8b9c7349e0edc8d SHA512 fb8ea2cec8868062c12f3d9b23b97b59a218e8dbe3d1fc1086cb6c2dbd9ba833be69145b58f20d8c3956b3e5c215cc7a151c51d9ea04bf521c9f995e2aaeb0d1 WHIRLPOOL b6e8a7d37f5fc2218457dd68a3bdc6b74de765b423435f47481ebf404e5021666cee47879d74c5f90d6a3a0a0f0bef50d574fe3fc7597622fcc442b11c216a4d
MISC metadata.xml 289 SHA256 783e0d235c0475abc008deb95f81532cfe93a5172476eb34141b87dd08596e99 SHA512 eded84a6052d96b7e819a6dc180a774710b751dd77ca2ed7a6eff89cd51884a45cfd0627712f735faa9f252918f5c724b9acf5f2e24eea50ffb9812b0d6da282 WHIRLPOOL a34abc661e33329c2f38987cd03a0ef5fd6b35a128c635b92bdf72d4b602080a1cb61a2dd386d24b0a7611b2fa6248a4cb290b3333aefee9b3243ed7f2a378ca
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk/2c+cACgkQQe4uqXYgU9U3HgCfVopKBL7ZWap7YYLvc3bM0Fpb
-n3gAn0+KuEMtn7DYRR4rqcJw2PNHRATY
-=uScZ
+iEYEAREIAAYFAlCDzjMACgkQCaWpQKGI+9T13QCfcyb8Gaz/QIm2bRwMCoe0A8xY
++DkAnRoChELarvyUbryp6tngOKyOQm+B
+=CgLP
-----END PGP SIGNATURE-----
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
}