rpms/muse/devel muse-glibc210.patch,NONE,1.1 muse.spec,1.5,1.6

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/muse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27389

Modified Files:
	muse.spec 
Added Files:
	muse-glibc210.patch 
Log Message:
* Fri Jul 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-0.7.rc3
- Bugfix: muse doesn't start properly on x86_64 on F-11+. Backport glibc-2.10 patch from trunk
- Remove BR: e2fsprogs-devel


muse-glibc210.patch:
 memory.cpp |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE muse-glibc210.patch ---

diff -rupN muse-1.0rc3.old/muse/memory.cpp muse-1.0rc3/muse/memory.cpp

--- muse-1.0rc3.old/muse/memory.cpp	2003-10-27 13:51:22.000000000 -0500

+++ muse-1.0rc3/muse/memory.cpp	2009-07-15 17:49:27.000000000 -0400

@@ -1,7 +1,7 @@

 //=========================================================

 //  MusE

 //  Linux Music Editor

-//  $Id: memory.cpp,v 1.1.1.1 2003/10/27 18:51:22 wschweer Exp $

+//  $Id: memory.cpp,v 1.1.1.1.2.1 2009/07/15 21:49:27 spamatica Exp $

 //

 //  (C) Copyright 2003 Werner Schweer (ws at seh.de)

 //=========================================================

@@ -48,7 +48,14 @@ void Pool::grow(int idx)

       {

 //      printf("grow memory idx %d\n", idx);

 

-      int esize = (idx+1) * sizeof(int);

+//      int esize = (idx+1) * sizeof(int);

+      int esize = (idx+1) * sizeof(int)+2;

+      // (rj) changed to +2 due to bug 2819312 

+      // "1.0rc3 malloc problem w/glibc-2.10 on x86_64 (with fix)"

+      // the change apparently allows muse to launch with this 

+      // configuration. It is however uncertain that this is the right fix. 

+      // Probably it means that nelem will not become bigger than

+      // the allowed number of elements

 

       Chunk* n    = new Chunk;

       n->next     = chunks[idx];


Index: muse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muse/devel/muse.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- muse.spec	21 Jun 2009 01:10:20 -0000	1.5
+++ muse.spec	17 Jul 2009 06:30:43 -0000	1.6
@@ -6,7 +6,7 @@ Summary:       Midi/Audio Music Sequence
 # See: https://fedoraproject.org/wiki/AudioCreation
 Epoch:         1
 Version:       1.0
-Release:       %{?prerelease:0.}6%{?prerelease:.%prerelease}%{?dist}
+Release:       %{?prerelease:0.}7%{?prerelease:.%prerelease}%{?dist}
 # synti/vam is GPLv2+
 # original freeverb plugin was public domain
 # some of the widgets are GPLv2
@@ -17,13 +17,15 @@ License:       GPL+ and GPLv2 and GPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.muse-sequencer.org/
 Source0:       http://downloads.sourceforge.net/lmuse/%{name}-%{version}%{?prerelease}.tar.gz
+# Fix: muse doesn't start on systems using glibc-2.10
+# https://sourceforge.net/tracker/?func=detail&aid=2819312&group_id=93414&atid=604222
+Patch0:        muse-glibc210.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
 BuildRequires: docbook-style-dsssl
 BuildRequires: doxygen
-BuildRequires: e2fsprogs-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: graphviz
 BuildRequires: jack-audio-connection-kit-devel
@@ -47,6 +49,7 @@ for Linux.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
+%patch0 -p1 -b .glibc210
 
 # Fix encoding issues (upstream is informed):
 for f in README.de README.softsynth SECURITY synti/vam/README; do
@@ -144,6 +147,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/*/*
 
 %changelog 
+* Fri Jul 17 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-0.7.rc3
+- Bugfix: muse doesn't start properly on x86_64 on F-11+. Backport glibc-2.10 patch from trunk
+- Remove BR: e2fsprogs-devel
+
 * Sat Jun 20 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-0.6.rc3
 - Update to 1.0rc3