ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: musescore: Fix build against Qt 5.11.

Browse source 
* gnu/packages/music.scm (musescore)[arguments]: Remove Webkit support, since
  it is replaced with Qt WebEngine in Qt 5.11.  Add missing include line.
[inputs]: Remove "qtwekbit".
This commit is contained in:
Nicolas Goaziou 2018-06-10 13:47:25 +02:00
parent 09b21b77cc
commit 1bfde769f6
No known key found for this signature in database
GPG key ID: A834B9E080A93738
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gnu/packages/music.scm
View file

@ -3536,7 +3536,10 @@ (define-public musescore
`(#:make-flags
`(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
"USE_SYSTEM_FREETYPE=ON"
"DOWNLOAD_SOUNDFONT=OFF")
"DOWNLOAD_SOUNDFONT=OFF"
;; The following is not supported since Qt 5.11. Can be
;; removed in Musescore 2.2.2+.
"BUILD_WEBKIT=OFF")
;; There are tests, but no simple target to run. The command
;; used to run them is:
;;
@ -3548,6 +3551,14 @@ (define-public musescore
#:tests? #f
#:phases
(modify-phases %standard-phases
;; Fix Qt 5.11 upgrade. Should be fixed in 2.2.2+, see:
;; <https://github.com/musescore/MuseScore/commit/d10e70415c8e52e2ba9d45de564467e42f66c102>
(add-after 'unpack 'patch-sources
(lambda _
(substitute* "all.h"
(("#include <QRadioButton>") "#include <QRadioButton>
#include <QButtonGroup>"))
#t))
(delete 'configure))))
(inputs
`(("alsa-lib" ,alsa-lib)
@ -3565,7 +3576,6 @@ (define-public musescore
("qtdeclarative" ,qtdeclarative)
("qtscript" ,qtscript)
("qtsvg" ,qtsvg)
("qtwebkit" ,qtwebkit)
("qtxmlpatterns" ,qtxmlpatterns)))
(native-inputs
`(("cmake" ,cmake)