From 1bfde769f6c6aed2623a34047d8dfed82722731c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 10 Jun 2018 13:47:25 +0200 Subject: 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". --- gnu/packages/music.scm | 14 ++++++++++++-- 1 file 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: + ;; + (add-after 'unpack 'patch-sources + (lambda _ + (substitute* "all.h" + (("#include ") "#include +#include ")) + #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) -- cgit v1.2.3