Fix building with glibc-2.10+ wrt #272602, thanks to Martin Väth and Diego E. Pettenò.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 136 insertions, 9 deletions

diff --git a/media-sound/sidplay/ChangeLog b/media-sound/sidplay/ChangeLog
index 358604ef30cc..ff0f8bc532dd 100644
--- a/media-sound/sidplay/ChangeLog
+++ b/media-sound/sidplay/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/sidplay
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sidplay/ChangeLog,v 1.18 2009/05/21 22:01:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sidplay/ChangeLog,v 1.19 2009/07/22 21:01:53 ssuominen Exp $
+
+  22 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> sidplay-2.0.9.ebuild,
+  +files/sidplay-2.0.9-gcc44.patch:
+  Fix building with glibc-2.10+ wrt #272602, thanks to Martin Väth and
+  Diego E. Pettenò.
 
   21 May 2009; Jeroen Roovers <jer@gentoo.org> sidplay-2.0.9.ebuild:
   Marked ~hppa too.
diff --git a/media-sound/sidplay/files/sidplay-2.0.9-gcc44.patch b/media-sound/sidplay/files/sidplay-2.0.9-gcc44.patch
new file mode 100644
index 000000000000..b5c4ab236007
--- /dev/null
+++ b/media-sound/sidplay/files/sidplay-2.0.9-gcc44.patch
@@ -0,0 +1,122 @@
+diff -Nur ori/src/IniConfig.cpp new/src/IniConfig.cpp
+--- ori/src/IniConfig.cpp	2004-02-29 15:28:28.000000000 +0100
++++ new/src/IniConfig.cpp	2009-07-20 21:17:56.926134851 +0200
+@@ -120,7 +120,7 @@
+ }
+ 
+ 
+-bool IniConfig::readInt (ini_fd_t ini, char *key, int &value)
++bool IniConfig::readInt (ini_fd_t ini, const char *key, int &value)
+ {
+     int i = value;
+     if (ini_locateKey (ini, key) < 0)
+@@ -134,7 +134,7 @@
+ }
+ 
+ 
+-bool IniConfig::readString (ini_fd_t ini, char *key, char *&str)
++bool IniConfig::readString (ini_fd_t ini, const char *key, char *&str)
+ {
+     char  *ret;
+     size_t length;
+@@ -165,7 +165,7 @@
+ }
+ 
+ 
+-bool IniConfig::readBool (ini_fd_t ini, char *key, bool &boolean)
++bool IniConfig::readBool (ini_fd_t ini, const char *key, bool &boolean)
+ {
+     int b = boolean;
+     if (ini_locateKey (ini, key) < 0)
+@@ -179,7 +179,7 @@
+ }
+ 
+ 
+-bool IniConfig::readChar (ini_fd_t ini, char *key, char &ch)
++bool IniConfig::readChar (ini_fd_t ini, const char *key, char &ch)
+ {
+     char *str, c = 0;
+     bool  ret = readString (ini, key, str);
+@@ -206,7 +206,7 @@
+ }
+ 
+ 
+-bool IniConfig::readTime (ini_fd_t ini, char *key, int &value)
++bool IniConfig::readTime (ini_fd_t ini, const char *key, int &value)
+ {
+     char *str, *sep;
+     int   time;
+diff -Nur ori/src/IniConfig.h new/src/IniConfig.h
+--- ori/src/IniConfig.h	2001-07-03 19:49:27.000000000 +0200
++++ new/src/IniConfig.h	2009-07-20 21:16:17.406144852 +0200
+@@ -98,11 +98,11 @@
+ protected:
+     void  clear ();
+ 
+-    bool  readInt    (ini_fd_t ini, char *key, int &value);
+-    bool  readString (ini_fd_t ini, char *key, char *&str);
+-    bool  readBool   (ini_fd_t ini, char *key, bool &boolean);
+-    bool  readChar   (ini_fd_t ini, char *key, char &ch);
+-    bool  readTime   (ini_fd_t ini, char *key, int  &time);
++    bool  readInt    (ini_fd_t ini, const char *key, int &value);
++    bool  readString (ini_fd_t ini, const char *key, char *&str);
++    bool  readBool   (ini_fd_t ini, const char *key, bool &boolean);
++    bool  readChar   (ini_fd_t ini, const char *key, char &ch);
++    bool  readTime   (ini_fd_t ini, const char *key, int  &time);
+ 
+     bool  readSidplay2  (ini_fd_t ini);
+     bool  readConsole   (ini_fd_t ini);
+diff -Nur ori/src/args.cpp new/src/args.cpp
+--- ori/src/args.cpp	2004-05-06 01:49:20.000000000 +0200
++++ new/src/args.cpp	2009-07-20 21:19:12.249460696 +0200
+@@ -77,6 +77,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <iostream>
++#include <string>
+ using std::cout;
+ using std::cerr;
+ using std::endl;
+@@ -95,7 +96,7 @@
+ // Convert time from integer
+ bool ConsolePlayer::parseTime (const char *str, uint_least32_t &time)
+ {
+-    char *sep;
++    const char *sep;
+     uint_least32_t _time;
+ 
+     // Check for empty string
+@@ -110,8 +111,7 @@
+     else
+     {   // Read in MM:SS format
+         int val;
+-        *sep = '\0';
+-        val  = atoi (str);
++        val  = atoi (std::string(str, sep - str).c_str());
+         if (val < 0 || val > 99)
+             return false;
+         _time = (uint_least32_t) val * 60;
+diff -Nur ori/src/audio/AudioBase.h new/src/audio/AudioBase.h
+--- ori/src/audio/AudioBase.h	2001-11-16 20:34:29.000000000 +0100
++++ new/src/audio/AudioBase.h	2009-07-20 21:06:15.619538393 +0200
+@@ -43,7 +43,7 @@
+ {
+ protected:
+     AudioConfig _settings;
+-    char       *_errorString;
++    const char *_errorString;
+     void       *_sampleBuffer;
+ 
+ public:
+diff -Nur ori/src/menu.cpp new/src/menu.cpp
+--- ori/src/menu.cpp	2004-02-29 15:28:28.000000000 +0100
++++ new/src/menu.cpp	2009-07-20 21:20:16.576120922 +0200
+@@ -353,7 +353,7 @@
+ {
+     if ((m_iniCfg.console ()).ansi)
+     {
+-        char *mode = "";
++        const char *mode = "";
+ 
+         switch (colour)
+         {
diff --git a/media-sound/sidplay/sidplay-2.0.9.ebuild b/media-sound/sidplay/sidplay-2.0.9.ebuild
index 2f0d9404d4b7..563cfce57984 100644
--- a/media-sound/sidplay/sidplay-2.0.9.ebuild
+++ b/media-sound/sidplay/sidplay-2.0.9.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sidplay/sidplay-2.0.9.ebuild,v 1.10 2009/05/21 22:01:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sidplay/sidplay-2.0.9.ebuild,v 1.11 2009/07/22 21:01:53 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="C64 SID player"
@@ -10,20 +11,19 @@ SRC_URI="mirror://sourceforge/sidplay2/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc sparc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=media-libs/libsidplay-2.1.0"
+RDEPEND=">=media-libs/libsidplay-2.1"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc TODO AUTHORS ChangeLog
 }