aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-06-10 13:47:25 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-06-10 13:47:25 +0200
commit1bfde769f6c6aed2623a34047d8dfed82722731c (patch)
treec6f29aa780978e6aa59c6bbfb3aa10ec03874431 /gnu/packages
parent09b21b77ccff2603a8145a2eace1e2162db2adc6 (diff)
downloadguix-1bfde769f6c6aed2623a34047d8dfed82722731c.tar.gz
guix-1bfde769f6c6aed2623a34047d8dfed82722731c.zip
gnu: musescore: Fix build against Qt 5.11.
* 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".
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/music.scm14
1 files changed, 12 insertions, 2 deletions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 56f43393cd..f06885d69e 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3536,7 +3536,10 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
`(#: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 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
#: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 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke
("qtdeclarative" ,qtdeclarative)
("qtscript" ,qtscript)
("qtsvg" ,qtsvg)
- ("qtwebkit" ,qtwebkit)
("qtxmlpatterns" ,qtxmlpatterns)))
(native-inputs
`(("cmake" ,cmake)