summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-06-28 09:11:02 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-06-28 09:11:02 +0000
commit3e3a585fedc631e172b8cd0c350eb609b099b7b7 (patch)
treef19f55b09b0f55added277ea7c1b730948fd24d9 /media-plugins/xmms-imms
parentAdded to ~ppc (Manifest recommit) (diff)
downloadgentoo-2-3e3a585fedc631e172b8cd0c350eb609b099b7b7.tar.gz
gentoo-2-3e3a585fedc631e172b8cd0c350eb609b099b7b7.tar.bz2
gentoo-2-3e3a585fedc631e172b8cd0c350eb609b099b7b7.zip
gcc-3.4 fix to close bug #54259.
Diffstat (limited to 'media-plugins/xmms-imms')
-rw-r--r--media-plugins/xmms-imms/ChangeLog5
-rw-r--r--media-plugins/xmms-imms/files/xmms-imms-1.0.1-gcc34.patch50
-rw-r--r--media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild3
3 files changed, 55 insertions, 3 deletions
diff --git a/media-plugins/xmms-imms/ChangeLog b/media-plugins/xmms-imms/ChangeLog
index fc75c95c7646..d6dd35e7e19c 100644
--- a/media-plugins/xmms-imms/ChangeLog
+++ b/media-plugins/xmms-imms/ChangeLog
@@ -1,9 +1,10 @@
# ChangeLog for media-plugins/xmms-imms
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.14 2004/06/28 08:40:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/ChangeLog,v 1.15 2004/06/28 09:11:01 eradicator Exp $
28 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
- +files/xmms-imms-1.1-gcc34.patch:
+ xmms-imms-1.0.1.ebuild, xmms-imms-1.1.ebuild
+ +files/xmms-imms-1.0.1-gcc34.patch +files/xmms-imms-1.1-gcc34.patch:
gcc-3.4 fix to close bug #54259.
30 May 2004; Jeremy Huddleston <eradicator@gentoo.org> xmms-imms-1.1.ebuild:
diff --git a/media-plugins/xmms-imms/files/xmms-imms-1.0.1-gcc34.patch b/media-plugins/xmms-imms/files/xmms-imms-1.0.1-gcc34.patch
new file mode 100644
index 000000000000..7745d968f4d5
--- /dev/null
+++ b/media-plugins/xmms-imms/files/xmms-imms-1.0.1-gcc34.patch
@@ -0,0 +1,50 @@
+diff -Naur imms-1.0.1.orig/immstool.cc imms-1.0.1/immstool.cc
+--- imms-1.0.1.orig/immstool.cc 2004-02-25 12:53:33.000000000 -0800
++++ imms-1.0.1/immstool.cc 2004-06-28 02:03:18.703330999 -0700
+@@ -4,6 +4,7 @@
+ #include <list>
+ #include <utility>
+
++#include <math.h>
+ #include <assert.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+diff -Naur imms-1.0.1.orig/strmanip.h imms-1.0.1/strmanip.h
+--- imms-1.0.1.orig/strmanip.h 2004-02-25 12:53:33.000000000 -0800
++++ imms-1.0.1/strmanip.h 2004-06-28 02:04:14.096265724 -0700
+@@ -25,7 +25,7 @@
+ ostringstream str;
+ str << i;
+ return str.str();
+-};
++}
+
+ // Double up single quotes to escape them sqlite style
+ inline string escape_string(const string &in)
+@@ -57,7 +57,7 @@
+ if (hours)
+ s << hours << "h";
+ return s.str();
+-};
++}
+
+ inline string string_tolower(string s)
+ {
+@@ -65,7 +65,7 @@
+ *i = tolower(*i);
+
+ return s;
+-};
++}
+
+ inline string string_brfilter(string s)
+ {
+@@ -90,7 +90,7 @@
+ }
+ }
+ return news;
+-};
++}
+
+ string string_normalize(string s);
+ string title_filter(const string &title);
diff --git a/media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild b/media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild
index b473047c38a6..8bd7b1f71feb 100644
--- a/media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild
+++ b/media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild,v 1.6 2004/06/24 23:40:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-imms/xmms-imms-1.0.1.ebuild,v 1.7 2004/06/28 09:11:01 eradicator Exp $
inherit eutils
@@ -34,6 +34,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-makefile.patch
+ epatch ${FILESDIR}/${P}-gcc34.patch
WANT_AUTOCONF=2.5
autoheader