Added gcc-3.4 patch

8 files changed, 138 insertions, 14 deletions

diff --git a/media-video/kdenlive/ChangeLog b/media-video/kdenlive/ChangeLog
index b526f28e7d1f..33d7c923d03a 100644
--- a/media-video/kdenlive/ChangeLog
+++ b/media-video/kdenlive/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/kdenlive
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.5 2004/06/29 12:10:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/ChangeLog,v 1.6 2004/10/18 15:16:12 zypher Exp $
+
+  18 Oct 2004; Marc Hildebrand <zypher@gentoo.org> kdenlive-0.2.4.ebuild:
+  Added gcc-3.4 patch. Thanks to Mathijs Mohlmann for the patch.
 
   29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kdenlive-0.2.4.ebuild:
   QA: IUSE, need-kde after R/DEPEND
diff --git a/media-video/kdenlive/Manifest b/media-video/kdenlive/Manifest
index 645c3ea81434..569b3fe5a996 100644
--- a/media-video/kdenlive/Manifest
+++ b/media-video/kdenlive/Manifest
@@ -1,4 +1,5 @@
-MD5 80918426da071ccb9ff9cc59908f6fe5 ChangeLog 642
+MD5 b616349b59fed6652131843090111800 ChangeLog 782
 MD5 b930e21bf22fd73f984ae65f871fdc2d metadata.xml 253
-MD5 352cc22f24971918700d7ea107a3ba57 kdenlive-0.2.4.ebuild 579
+MD5 ce231220c4c93e9b98b69d6e11f0871e kdenlive-0.2.4.ebuild 721
+MD5 9b7f530fe5c63b0114d2445b9d352e43 files/kdenlive-0.2.4-gcc34.patch 3723
 MD5 e0e37c5c67335b510278e92e08bb01d8 files/digest-kdenlive-0.2.4 67
diff --git a/media-video/kdenlive/files/kdenlive-0.2.4-gcc34.patch b/media-video/kdenlive/files/kdenlive-0.2.4-gcc34.patch
new file mode 100644
index 000000000000..8d6d51617a85
--- /dev/null
+++ b/media-video/kdenlive/files/kdenlive-0.2.4-gcc34.patch
@@ -0,0 +1,82 @@
+diff -ru kdenlive-0.2.4/kdenlive/docclipbaselist.h kdenlive-0.2.4.sav/kdenlive/docclipbaselist.h
+--- kdenlive-0.2.4/kdenlive/docclipbaselist.h	2003-12-17 01:14:12.000000000 +0100
++++ kdenlive-0.2.4.sav/kdenlive/docclipbaselist.h	2004-10-13 14:45:51.665341837 +0200
+@@ -49,7 +49,7 @@
+ 	/** The "master clip" of this list. The master clip is special only in that it is mentioned
+ 	seperately to every other clip in the clip list; it also appears in the clip list. It is
+ 	singled out so that operations that require a master clip can	make use of it. */
+-	DocClipBase * m_masterClip;;
++	DocClipBase * m_masterClip;
+ };
+ 
+ #endif
+diff -ru kdenlive-0.2.4/kdenlive/docclipreflist.h kdenlive-0.2.4.sav/kdenlive/docclipreflist.h
+--- kdenlive-0.2.4/kdenlive/docclipreflist.h	2003-12-17 01:14:58.000000000 +0100
++++ kdenlive-0.2.4.sav/kdenlive/docclipreflist.h	2004-10-13 14:45:17.239736652 +0200
+@@ -49,7 +49,7 @@
+ 	/** The "master clip" of this list. The master clip is special only in that it is mentioned
+ 	seperately to every other clip in the clip list; it also appears in the clip list. It is
+ 	singled out so that operations that require a master clip can	make use of it. */
+-	DocClipRef * m_masterClip;;
++	DocClipRef * m_masterClip;
+ };
+ 
+ #endif
+diff -ru kdenlive-0.2.4/kdenlive/doctrackbase.h kdenlive-0.2.4.sav/kdenlive/doctrackbase.h
+--- kdenlive-0.2.4/kdenlive/doctrackbase.h	2003-12-17 01:14:12.000000000 +0100
++++ kdenlive-0.2.4.sav/kdenlive/doctrackbase.h	2004-10-13 14:45:30.860602135 +0200
+@@ -67,7 +67,7 @@
+ 	/** Adds all of the clips in the pointerlist into this track. */
+ 	void addClips(DocClipRefList list, bool selected);
+ 	/** returns true if all of the clips within the cliplist can be added, returns false otherwise. */
+-	bool canAddClips(DocClipRefList clipList);;
++	bool canAddClips(DocClipRefList clipList);
+ 	/** Returns true if the clip given exists in this track, otherwise returns
+ 	false. */
+ 	bool clipExists(DocClipRef *clip);
+diff -ru kdenlive-0.2.4/kdenlive/kaddmarkercommand.cpp kdenlive-0.2.4.sav/kdenlive/kaddmarkercommand.cpp
+--- kdenlive-0.2.4/kdenlive/kaddmarkercommand.cpp	2003-12-17 01:15:02.000000000 +0100
++++ kdenlive-0.2.4.sav/kdenlive/kaddmarkercommand.cpp	2004-10-13 14:50:33.841122249 +0200
+@@ -108,4 +108,4 @@
+ 	}
+ }
+ 
+-};
++}
+diff -ru kdenlive-0.2.4/kdenlive/kaddmarkercommand.h kdenlive-0.2.4.sav/kdenlive/kaddmarkercommand.h
+--- kdenlive-0.2.4/kdenlive/kaddmarkercommand.h	2003-12-17 01:15:02.000000000 +0100
++++ kdenlive-0.2.4.sav/kdenlive/kaddmarkercommand.h	2004-10-13 14:47:35.352093152 +0200
+@@ -64,6 +64,6 @@
+ 	void deleteMarker();
+ };
+ 
+-};
++}
+ 
+ #endif
+diff -ru kdenlive-0.2.4/kdenlive/kdenlivedoc.cpp kdenlive-0.2.4.sav/kdenlive/kdenlivedoc.cpp
+--- kdenlive-0.2.4/kdenlive/kdenlivedoc.cpp	2003-12-20 19:33:48.000000000 +0100
++++ kdenlive-0.2.4.sav/kdenlive/kdenlivedoc.cpp	2004-10-13 14:48:05.338394017 +0200
+@@ -290,7 +290,7 @@
+ 	}
+ 
+ 	return pResult;
+-};
++}
+ 
+ void KdenliveDoc::activeSceneListGeneration(bool active)
+ {
+diff -ru kdenlive-0.2.4/kdenlive/krender.h kdenlive-0.2.4.sav/kdenlive/krender.h
+--- kdenlive-0.2.4/kdenlive/krender.h	2003-12-17 01:14:33.000000000 +0100
++++ kdenlive-0.2.4.sav/kdenlive/krender.h	2004-10-13 14:43:46.950885761 +0200
+@@ -117,7 +117,7 @@
+   void setSceneList(QDomDocument list);
+   /** Wraps the VEML command of the same name - sends a <ping> command to the server, which
+ should reply with a <pong> - let's us determine the round-trip latency of the connection. */
+-  void ping(QString &ID);;
++  void ping(QString &ID);
+   /** Wraps the VEML command of the same name. Tells the renderer to
+ play the current scene at the speed specified, relative to normal
+ playback. e.g. 1.0 is normal speed, 0.0 is paused, -1.0 means play
+
+
diff --git a/media-video/kdenlive/kdenlive-0.2.4.ebuild b/media-video/kdenlive/kdenlive-0.2.4.ebuild
index 19c19e456744..4c9b3d3de7da 100644
--- a/media-video/kdenlive/kdenlive-0.2.4.ebuild
+++ b/media-video/kdenlive/kdenlive-0.2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.2.4.ebuild,v 1.6 2004/06/29 12:10:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kdenlive/kdenlive-0.2.4.ebuild,v 1.7 2004/10/18 15:16:12 zypher Exp $
 
-inherit kde
+inherit gcc kde
 
 DESCRIPTION="Kdenlive! (pronounced Kay-den-live) is a Non Linear Video Editing Suite for KDE."
 HOMEPAGE="http://www.uchian.pwp.blueyonder.co.uk/kdenlive.html"
@@ -16,3 +16,11 @@ IUSE=""
 DEPEND=">=media-video/piave-0.2.4
 	>=kde-base/kdesdk-3.2"
 need-kde 3
+
+src_unpack() {
+	unpack ${A}
+	if [ "`gcc-minor-version`" -eq "4" ]
+	then
+	epatch ${FILESDIR}/kdenlive-0.2.4-gcc34.patch
+	fi
+}
diff --git a/media-video/piave/ChangeLog b/media-video/piave/ChangeLog
index 12f4358fbc8c..e01345953a85 100644
--- a/media-video/piave/ChangeLog
+++ b/media-video/piave/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/piave
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/piave/ChangeLog,v 1.7 2004/06/25 00:48:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/piave/ChangeLog,v 1.8 2004/10/18 15:11:29 zypher Exp $
+
+  18 Oct 2004; Marc Hildebrand <zypher@gentoo.org> piave-0.2.4-r1.ebuild:
+  Added gcc-3.4 patch. Thanks to Mathijs Mohlmann for the patch.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> piave-0.2.4-r1.ebuild:
   Add inherit eutils
diff --git a/media-video/piave/Manifest b/media-video/piave/Manifest
index 581c7a5dc77d..da4032e0ad3c 100644
--- a/media-video/piave/Manifest
+++ b/media-video/piave/Manifest
@@ -1,7 +1,8 @@
-MD5 8c4d7b9d8480671367944430b153ab32 piave-0.2.4.ebuild 1092
-MD5 cd31720b006f217fc17803562a455d45 ChangeLog 775
+MD5 65c49d2bcf26d0d1b9d0b670e923a381 ChangeLog 915
 MD5 b930e21bf22fd73f984ae65f871fdc2d metadata.xml 253
-MD5 25e4a8caa341a6623aae01f0d304b86b piave-0.2.4-r1.ebuild 1085
+MD5 8c4d7b9d8480671367944430b153ab32 piave-0.2.4.ebuild 1092
+MD5 e8842eadfbcb611d22a39305a59f873d piave-0.2.4-r1.ebuild 1178
 MD5 b3f256c82b671e109307527c6d78a51a files/piave-0.2.4-include-arts.diff 1216
-MD5 e82020c9dafa6d2c570921b0fafbd5ff files/digest-piave-0.2.4 63
 MD5 e82020c9dafa6d2c570921b0fafbd5ff files/digest-piave-0.2.4-r1 63
+MD5 b39211483360995059bfb6eb8e23fd30 files/piave-0.2.4-gcc34.patch 671
+MD5 e82020c9dafa6d2c570921b0fafbd5ff files/digest-piave-0.2.4 63
diff --git a/media-video/piave/files/piave-0.2.4-gcc34.patch b/media-video/piave/files/piave-0.2.4-gcc34.patch
new file mode 100644
index 000000000000..f4f0e542a204
--- /dev/null
+++ b/media-video/piave/files/piave-0.2.4-gcc34.patch
@@ -0,0 +1,23 @@
+--- piave-0.2.4/plugins/iostream/vorbisfile/vorbisfile.cc      2003-09-15 12:52:25.000000000 +0200
++++ piave-0.2.4.sav/plugins/iostream/vorbisfile/vorbisfile.cc       2004-10-13 13:52:03.402240909 +0200
+@@ -44,6 +44,7 @@
+ using std::endl;
+ #include <string>
+ using std::string;
++#include <math.h>
+
+ // this header
+ #include "vorbisfile.hh"
+--- piave-0.2.4/plugins/iostream/sndfile/sndfile.cc      2003-09-15 12:52:25.000000000 +0200
++++ piave-0.2.4.sav/plugins/iostream/sndfile/sndfile.cc       2004-10-13 13:52:03.402240909 +0200
+@@ -44,6 +44,7 @@
+ using std::endl;
+ #include <string>
+ using std::string;
++#include <math.h>
+
+ // this header
+ #include "vorbisfile.hh"
+
+
+
diff --git a/media-video/piave/piave-0.2.4-r1.ebuild b/media-video/piave/piave-0.2.4-r1.ebuild
index 78add39282a5..cd43aa335d7a 100644
--- a/media-video/piave/piave-0.2.4-r1.ebuild
+++ b/media-video/piave/piave-0.2.4-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/piave/piave-0.2.4-r1.ebuild,v 1.3 2004/06/25 00:48:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/piave/piave-0.2.4-r1.ebuild,v 1.4 2004/10/18 15:11:29 zypher Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="PIAVE - Piave Is A Video Editor"
 HOMEPAGE="http://modesto.sourceforge.net/piave/index.html"
@@ -30,8 +30,11 @@ DEPEND="virtual/x11
 src_compile() {
 	cd ${S}
 	epatch ${FILESDIR}/piave-0.2.4-include-arts.diff
-	`use_enable nls` \
-	myconf=${myconf}" --with-gnu-ld"
+	if [ "`gcc-minor-version`" -eq "4" ]
+	then
+	epatch ${FILESDIR}/piave-0.2.4-gcc34.patch
+	fi
+	myconf=${myconf}" --with-gnu-ld	`use_enable nls`"
 	econf ${myconf} || die "configure failed"
 	emake || die
 }