Fixed segfault on startup on amd64, closes #118869.

(Portage version: 2.1_pre3-r1)

4 files changed, 27 insertions, 15 deletions

diff --git a/media-sound/museseq/ChangeLog b/media-sound/museseq/ChangeLog
index ccc80a4d4ed7..4a6edb396809 100644
--- a/media-sound/museseq/ChangeLog
+++ b/media-sound/museseq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/museseq
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.34 2006/01/13 13:24:35 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/ChangeLog,v 1.35 2006/01/13 21:13:36 fvdpol Exp $
+
+  13 Jan 2006; Frank van de Pol <fvdpol@gentoo.org>
+  +files/museseq-0.7.2_pre5-rtctimerfix.patch, museseq-0.7.2_pre5.ebuild:
+  Fixed segfault on startup on amd64, closes #118869.
 
 *museseq-0.7.2_pre5 (13 Jan 2006)
 
diff --git a/media-sound/museseq/Manifest b/media-sound/museseq/Manifest
index 604166c4e3e8..c38e5d23e8c4 100644
--- a/media-sound/museseq/Manifest
+++ b/media-sound/museseq/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 11176f2a8c4f7dd3063eec6bb07c2730 ChangeLog 5716
 MD5 fbb837028f0103f8c2775f24e661888b files/digest-museseq-0.6.2-r1 64
 MD5 20ef97c251eae618ada71d7493308b96 files/digest-museseq-0.7.0-r1 64
@@ -14,17 +11,11 @@ MD5 8bf0be08b3013a6047aecad1e99bc1fb files/museseq-0.6.2-gcc34.patch 5500
 MD5 135d65fe445ace2c95913e681e7a7b68 files/museseq-0.6.2-int2ptr.patch.gz 4000
 MD5 7fb0bc9c25aa67018b8c07120f4f16a1 files/museseq-0.6.2-memory.patch 2032
 MD5 fd23ed0d1b20d7ed5f18d26d4a45acc1 files/museseq-0.7.0-suidinstall.patch 837
+MD5 5cfdb8a06e52a3113b39a238bd45c860 files/museseq-0.7.2_pre5-rtctimerfix.patch 509
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 MD5 a03dd77415ceaab8e76a3e8ff75fff88 museseq-0.6.2-r1.ebuild 3144
 MD5 298a2b1058e54c7d5da5294d1d63e07b museseq-0.7.0-r1.ebuild 1960
 MD5 caecf6cff21c5e9ec670b5904f6700ab museseq-0.7.1.ebuild 1752
 MD5 807a8c3d57d8116a56cc51e6c64db7ff museseq-0.7.1_pre3.ebuild 1696
 MD5 e55b1aaf26a535d85a9ee2353999c80a museseq-0.7.2_pre2.ebuild 1720
-MD5 e799eebe08b8788a12286eb949e22670 museseq-0.7.2_pre5.ebuild 1796
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDx6ouvpz1081QvMkRAvlvAJ9bGwuJHF+nyAgeKXGcQb2SkI0hHQCdFVic
-jt2g82btpAyAgs7xwtYo1ww=
-=cBju
------END PGP SIGNATURE-----
+MD5 6a2ebd43bcc49ad0eaa11e5ebd683058 museseq-0.7.2_pre5.ebuild 1813
diff --git a/media-sound/museseq/files/museseq-0.7.2_pre5-rtctimerfix.patch b/media-sound/museseq/files/museseq-0.7.2_pre5-rtctimerfix.patch
new file mode 100644
index 000000000000..2def593c2ff7
--- /dev/null
+++ b/media-sound/museseq/files/museseq-0.7.2_pre5-rtctimerfix.patch
@@ -0,0 +1,12 @@
+diff -ru muse-0.7.2pre5.orig/muse/driver/rtctimer.cpp muse-0.7.2pre5/muse/driver/rtctimer.cpp
+--- muse-0.7.2pre5.orig/muse/driver/rtctimer.cpp	2006-01-13 21:07:29.000000000 +0100
++++ muse-0.7.2pre5/muse/driver/rtctimer.cpp	2006-01-13 21:09:49.000000000 +0100
+@@ -141,7 +141,7 @@
+     {
+     if(TIMER_DEBUG)
+       printf("getTimerTicks()\n");
+-    unsigned int nn;
++    unsigned long nn;
+     if (timerFd==-1) {
+         fprintf(stderr,"RtcTimer::getTimerTicks(): no RTC open to read!\n");
+         return 0;
diff --git a/media-sound/museseq/museseq-0.7.2_pre5.ebuild b/media-sound/museseq/museseq-0.7.2_pre5.ebuild
index 14d12dce6fcc..d4fa44713283 100644
--- a/media-sound/museseq/museseq-0.7.2_pre5.ebuild
+++ b/media-sound/museseq/museseq-0.7.2_pre5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.7.2_pre5.ebuild,v 1.1 2006/01/13 13:24:35 fvdpol Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/museseq/museseq-0.7.2_pre5.ebuild,v 1.2 2006/01/13 21:13:36 fvdpol Exp $
 
 inherit kde-functions virtualx eutils
 
@@ -14,8 +14,7 @@ HOMEPAGE="http://http://www.muse-sequencer.org/"
 LICENSE="GPL-2"
 SLOT="0"
 
-# masked for amd64 because of segfaults on startup, see bug #118869 
-KEYWORDS="-amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc ladcca debug"
 
 DEPEND="$(qt_min_version 3.2)
@@ -30,6 +29,12 @@ DEPEND="$(qt_min_version 3.2)
 	>=media-sound/jack-audio-connection-kit-0.98.0
 	ladcca? ( >=media-libs/ladcca-0.4.0 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-rtctimerfix.patch
+}
+
 src_compile() {
 	cd ${WORKDIR}/${MY_P}
 	local myconf