[mscore] Fix accidontals crash RHBZ#738044

[Orcan Ogetbil]

commit 2630f2fcd4547627a50cefa8d9e4208710316c99
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Sun Mar 4 01:37:20 2012 -0500

    Fix accidontals crash RHBZ#738044

 mscore-fix-accidentals-crash.patch |   18 ++++++++++++++++++
 mscore.spec                        |   15 +++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)
---
diff --git a/mscore-fix-accidentals-crash.patch b/mscore-fix-accidentals-crash.patch
new file mode 100644
index 0000000..c82d5fc
--- /dev/null
+++ b/mscore-fix-accidentals-crash.patch
@@ -0,0 +1,18 @@
+diff -rupN mscore-1.1.old/mscore/mscore/sym.cpp mscore-1.1/mscore/mscore/sym.cpp
+--- mscore-1.1.old/mscore/mscore/sym.cpp	2011-07-27 09:32:43.000000000 -0400
++++ mscore-1.1/mscore/mscore/sym.cpp	2012-03-03 16:47:43.831015608 -0500
+@@ -509,7 +509,14 @@ void Sym::draw(QPainter& painter, double
+       {
+       double imag = 1.0 / mag;
+       painter.scale(mag, mag);
++#if 1 // backported from revision 3193
++      painter.setFont(_font);
++      QString s(_code);
++      painter.drawText(x * imag, y * imag, s);
++#else
++      // does not work with surrogates?
+       tl->draw(&painter, QPointF(x * imag, y * imag));
++#endif
+       painter.scale(imag, imag);
+       }
+ 
diff --git a/mscore.spec b/mscore.spec
index d03a630..4071678 100644
--- a/mscore.spec
+++ b/mscore.spec
@@ -3,7 +3,7 @@
 Name:          mscore
 Summary:       Music Composition & Notation Software
 Version:       1.1
-Release:       3%{?dist}
+Release:       4%{?dist}
 # rtf2html is LGPLv2+
 # paper4.png paper5.png are LGPLv3
 # the rest is GPLv2
@@ -42,7 +42,8 @@ Patch5:        %{name}-dso-linking.patch
 Patch6:        %{name}-system-qtsingleapplication.patch
 # gcc-4.6 buid fix
 Patch7:        %{name}-gcc46.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Fix crash on Accidentals click RHBZ#738044 From upstream trunk rev 3193
+Patch8:        %{name}-fix-accidentals-crash.patch
 
 BuildRequires: alsa-lib-devel
 BuildRequires: cmake
@@ -121,6 +122,7 @@ This package contains the musical notation fonts for use of MuseScore.
 %patch5 -p1 -b .dso
 %patch6 -p1 -b .qtsingleapp
 %patch7 -p1 -b .gcc46
+%patch8 -p1 -b .accidentals
 
 # Remove the precompiled binary
 rm mscore/rtf2html/rtf2html
@@ -166,7 +168,6 @@ pushd %{name}/%{name}/fonts
 popd
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # Install fonts
@@ -223,9 +224,6 @@ popd
 # iotest seems outdated. Skipping.
 # rendertest needs the X server. Skipping.
 
-%clean
-rm -rf %{buildroot}
-
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 update-mime-database %{_datadir}/mime &> /dev/null || :
@@ -244,7 +242,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files
-%defattr(-,root,root,-)
 %doc mscore/{ChangeLog*,COPYING*,NEWS,README*}
 %{_bindir}/%{name}
 %{_datadir}/%{name}-%{version}/
@@ -257,13 +254,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_qt4_plugindir}/designer/libawlplugin.so
 
 %files doc
-%defattr(-,root,root,-)
 %doc %{_datadir}/%{name}-%{version}/man/
 
 %_font_pkg %{fontfamilyname}*.ttf
 
 
 %changelog
+* Sat Mar 03 2012 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.1-4
+- Fix accidontals crash RHBZ#738044
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
 - Rebuilt for c++ ABI breakage