Fix bug #49377.

4 files changed, 86 insertions, 4 deletions

diff --git a/media-sound/musescore/ChangeLog b/media-sound/musescore/ChangeLog
index 9773fa5abb92..4ead1dfbbb26 100644
--- a/media-sound/musescore/ChangeLog
+++ b/media-sound/musescore/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/musescore
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.4 2004/04/17 18:22:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/ChangeLog,v 1.5 2004/05/01 20:23:13 eradicator Exp $
+
+  01 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  musescore-0.0.6.ebuild, files/musescore-0.0.6-assert.patch:
+  Fix bug #49377.
 
   17 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   musescore-0.0.6.ebuild:
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index fa13d0e7f59f..8dd375149226 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,4 +1,5 @@
-MD5 196fc3fe7d856d6de4305b7719e091ec musescore-0.0.6.ebuild 554
-MD5 acd04377f3925ab226f28cbea222dcaa ChangeLog 569
+MD5 394dcda59d6317e91011dbd15926f057 musescore-0.0.6.ebuild 810
+MD5 cb0b50f43d901d3fcbcdc4bbecb5c62b ChangeLog 707
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 56eb9287f3dd49624e640674d5c2ead2 files/musescore-0.0.6-assert.patch 1572
 MD5 727e72b54693e0734a6d0a66159140ea files/digest-musescore-0.0.6 65
diff --git a/media-sound/musescore/files/musescore-0.0.6-assert.patch b/media-sound/musescore/files/musescore-0.0.6-assert.patch
new file mode 100644
index 000000000000..406715227901
--- /dev/null
+++ b/media-sound/musescore/files/musescore-0.0.6-assert.patch
@@ -0,0 +1,61 @@
+--- src/tempo.cpp.orig	2004-05-01 12:49:01.000000000 -0700
++++ src/tempo.cpp	2004-05-01 12:49:15.000000000 -0700
+@@ -8,6 +8,7 @@
+ 
+ #include <stdio.h>
+ #include <errno.h>
++#include <assert.h>
+ #include <cmath>
+ 
+ #include "tempo.h"
+--- src/sig.cpp.orig	2004-05-01 12:54:46.000000000 -0700
++++ src/sig.cpp	2004-05-01 12:54:58.000000000 -0700
+@@ -7,6 +7,7 @@
+ //=========================================================
+ 
+ #include <stdio.h>
++#include <assert.h>
+ #include "sig.h"
+ #include "xml.h"
+ 
+--- src/clef.cpp.orig	2004-05-01 12:55:46.000000000 -0700
++++ src/clef.cpp	2004-05-01 12:55:57.000000000 -0700
+@@ -7,6 +7,7 @@
+ //=========================================================
+ 
+ #include <stdio.h>
++#include <assert.h>
+ #include "clef.h"
+ #include "xml.h"
+ 
+--- src/key.cpp.orig	2004-05-01 12:56:30.000000000 -0700
++++ src/key.cpp	2004-05-01 12:56:44.000000000 -0700
+@@ -7,6 +7,7 @@
+ //=========================================================
+ 
+ #include <stdio.h>
++#include <assert.h>
+ #include "key.h"
+ #include "xml.h"
+ 
+--- src/mscore.cpp.orig	2004-05-01 12:58:34.000000000 -0700
++++ src/mscore.cpp	2004-05-01 12:58:44.000000000 -0700
+@@ -10,6 +10,8 @@
+ #include <getopt.h>
+ #include <unistd.h>
+ 
++#include <assert.h>
++
+ #include <qapplication.h>
+ #include <qcombobox.h>
+ #include <qpixmap.h>
+--- src/midi.cpp.orig	2004-05-01 13:06:06.000000000 -0700
++++ src/midi.cpp	2004-05-01 13:06:17.000000000 -0700
+@@ -9,6 +9,7 @@
+ #include <qfiledialog.h>
+ #include <qmessagebox.h>
+ #include <errno.h>
++#include <assert.h>
+ 
+ #include "midi.h"
+ #include "scanvas.h"
diff --git a/media-sound/musescore/musescore-0.0.6.ebuild b/media-sound/musescore/musescore-0.0.6.ebuild
index 08a8be94e413..f46701529f8a 100644
--- a/media-sound/musescore/musescore-0.0.6.ebuild
+++ b/media-sound/musescore/musescore-0.0.6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/musescore-0.0.6.ebuild,v 1.6 2004/04/17 18:22:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musescore/musescore-0.0.6.ebuild,v 1.7 2004/05/01 20:23:13 eradicator Exp $
+
+inherit kde eutils
 
 DESCRIPTION="Music Score Typesetter"
 HOMEPAGE="http://muse.seh.de/mscore/index.php"
@@ -16,7 +18,21 @@ S=${WORKDIR}/${MY_P}
 
 DEPEND=">=x11-libs/qt-3.1.0"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-assert.patch
+}
+
+src_compile() {
+	addwrite "${QTDIR}/etc/settings"
+	econf --disable-qttest || die
+	emake || die
+}
+
 src_install() {
 	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog NEWS README README.translate TODO
 }