[packages/musescore] Build without QtWebKit on x32

jajcus jajcus at pld-linux.org
Fri Nov 16 08:26:34 CET 2018


commit 9b6384a371b701149b9297d4908e7d7916250e19
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Fri Nov 16 08:25:18 2018 +0100

    Build without QtWebKit on x32
    
    We don't have that library there.
    
    Also, do not use Qt version for WebKit dependency, they are versioned
    separately.
    
    Release: 2

 musescore.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/musescore.spec b/musescore.spec
index 3e4f7ba..74980ac 100644
--- a/musescore.spec
+++ b/musescore.spec
@@ -9,7 +9,7 @@ Summary:	MuseScore - music notation software
 Summary(pl.UTF-8):	MuseScore - oprogramowanie do notacji muzycznej
 Name:		musescore
 Version:	2.3.2
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Applications
 Source0:	https://github.com/musescore/MuseScore/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -35,7 +35,7 @@ BuildRequires:	Qt5Sql-devel >= %{min_qt_version}
 BuildRequires:	Qt5Svg-devel >= %{min_qt_version}
 BuildRequires:	Qt5Test-devel >= %{min_qt_version}
 BuildRequires:	Qt5UiTools-devel >= %{min_qt_version}
-BuildRequires:	Qt5WebKit-devel >= %{min_qt_version}
+BuildRequires:	Qt5WebKit-devel
 BuildRequires:	Qt5Widgets-devel >= %{min_qt_version}
 BuildRequires:	Qt5Xml-devel >= %{min_qt_version}
 BuildRequires:	Qt5XmlPatterns-devel >= %{min_qt_version}
@@ -93,6 +93,9 @@ CXXFLAGS="%{rpmcxxflags} -DNDEBUG -DQT_NO_DEBUG -fPIC" \
 	-DDOWNLOAD_SOUNDFONT="OFF" \
 	-DUSE_SYSTEM_FREETYPE="ON" \
 	-DBUILD_PORTMIDI="OFF" \
+%ifarch x32
+	-DBUILD_WEBKIT="OFF" \
+%endif
 	..
 
 %{__make} lrelease
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/musescore.git/commitdiff/9b6384a371b701149b9297d4908e7d7916250e19



More information about the pld-cvs-commit mailing list