[mscore] - fix FTBFS (#992300)
Dan Horák
sharkcz at fedoraproject.org
Wed Feb 26 20:49:53 UTC 2014
commit a63bbffd4aa63a32abb1900a1d5f490384de6cae
Author: Dan Horák <dan at danny.cz>
Date: Wed Feb 26 21:50:44 2014 +0100
- fix FTBFS (#992300)
mscore-1.3-freetype-includes.patch | 12 ++++++++++++
mscore.spec | 10 ++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/mscore-1.3-freetype-includes.patch b/mscore-1.3-freetype-includes.patch
new file mode 100644
index 0000000..d126327
--- /dev/null
+++ b/mscore-1.3-freetype-includes.patch
@@ -0,0 +1,12 @@
+diff -up mscore-1.3/mscore/mscore/genft.cpp.ft mscore-1.3/mscore/mscore/genft.cpp
+--- mscore-1.3/mscore/mscore/genft.cpp.ft 2014-02-26 21:07:18.867472252 +0100
++++ mscore-1.3/mscore/mscore/genft.cpp 2014-02-26 21:07:26.085367434 +0100
+@@ -27,7 +27,7 @@
+
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/tttables.h>
++#include <tttables.h>
+ #include "al/xml.h"
+
+ QMap<int, int> codemap;
diff --git a/mscore.spec b/mscore.spec
index 89a2baf..e5a5832 100644
--- a/mscore.spec
+++ b/mscore.spec
@@ -3,7 +3,7 @@
Name: mscore
Summary: Music Composition & Notation Software
Version: 1.3
-Release: 3%{?dist}
+Release: 4%{?dist}
# rtf2html is LGPLv2+
# paper4.png paper5.png are LGPLv3
# the rest is GPLv2
@@ -41,6 +41,8 @@ Patch6: %{name}-system-qtsingleapplication.patch
Patch8: %{name}-fix-accidentals-crash.patch
# Remove prelude from cmake files
Patch9: mscore-1.3-no-prelude.patch
+# Fix freetype includes path
+Patch10: mscore-1.3-freetype-includes.patch
BuildRequires: alsa-lib-devel
BuildRequires: cmake
@@ -63,7 +65,7 @@ Requires: qtscriptbindings
# Hence we don't build it for now. Otherwise it needs:
# BuildRequires: graphviz doxygen texlive-latex texlive-dvips
-Provides: musescore = %{name}-%{version}-%{release}
+Provides: musescore = %{version}-%{release}
%description
MuseScore is a free cross platform WYSIWYG music notation program. Some
@@ -119,6 +121,7 @@ This package contains the musical notation fonts for use of MuseScore.
%patch6 -p1 -b .qtsingleapp
%patch8 -p1 -b .accidentals
%patch9 -p1 -b .noprelude
+%patch10 -p1 -b .freetype-includes
# Remove the precompiled binary
rm mscore/rtf2html/rtf2html
@@ -259,6 +262,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Wed Feb 26 2014 Dan Horák <dan[at]danny.cz> - 1.3-4
+- fix FTBFS (#992300)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list