nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: qt: Update to 5.11.0. 

* gnu/packages/qt.scm (qtbase, qtsvg, qtimageformats, qtx11extras,
qtxmlpatterns, qtdeclarative, qtconnectivity, qtwebsockets, qtsensors,
qtmultimedia, qtwayland, qtserialport, qtserialbus, qtwebchannel,
qtlocation, qttools, qtscript, qtquickcontrols, qtquickcontrols2,
qtgraphicaleffects, qtgamepad, qtscxml, qtpurchasing, qtcanvas3d,
qtcharts, qtdatavis3d, qtnetworkauth, qtremoteobjects, qtspeech):
Update to 5.11.0.
[source]: Update source uri.
(qtbase)[source]: Don't remove bundled sqlite.
[inputs]: Remove sqlite.
[arguments]: Use 'invoke'. Use bundled sqlite.
(qtsvg, qtmultimedia, qtcanvas3d)[arguments]: Use 'invoke'.
(qtremoteobjects)[arguments]: Skip new integration test.
This commit is contained in:
Efraim Flashner 2018-05-26 21:23:10 +03:00
parent a4e45acdc0
commit 1f52eb7be7
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 161 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

299
gnu/packages/qt.scm
View File

@ -370,16 +370,16 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(define-public qtbase (define-public qtbase
(package (package
(name "qtbase") (name "qtbase")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1kq422vb2zaic099pgzwk7c0qzgc3xap6qahw5vklrq0mgivvrk9")) "0rny87ypnkkvyp9p76nim77v6np0cdf1dbjfmcilklzphkdlcvpd"))
;; Use TZDIR to avoid depending on package "tzdata". ;; Use TZDIR to avoid depending on package "tzdata".
(patches (search-patches "qtbase-use-TZDIR.patch")) (patches (search-patches "qtbase-use-TZDIR.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
@ -390,7 +390,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(lambda (dir) (lambda (dir)
(delete-file-recursively (string-append "src/3rdparty/" dir))) (delete-file-recursively (string-append "src/3rdparty/" dir)))
(list "double-conversion" "freetype" "harfbuzz-ng" (list "double-conversion" "freetype" "harfbuzz-ng"
"libpng" "libjpeg" "pcre2" "sqlite" "xcb" "libpng" "libjpeg" "pcre2" "xcb"
"xkbcommon" "zlib")) "xkbcommon" "zlib"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -432,7 +432,7 @@ developers using C++ or QML, a CSS & JavaScript like language.")
("pcre2" ,pcre2) ("pcre2" ,pcre2)
("postgresql" ,postgresql) ("postgresql" ,postgresql)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("sqlite" ,sqlite) ;("sqlite" ,sqlite)
("unixodbc" ,unixodbc) ("unixodbc" ,unixodbc)
("xcb-util" ,xcb-util) ("xcb-util" ,xcb-util)
("xcb-util-image" ,xcb-util-image) ("xcb-util-image" ,xcb-util-image)
@ -475,42 +475,45 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(("NO_DEFAULT_PATH") "")) (("NO_DEFAULT_PATH") ""))
;; do not pass "--enable-fast-install", which makes the ;; do not pass "--enable-fast-install", which makes the
;; configure process fail ;; configure process fail
(zero? (system* (invoke
"./configure" "./configure"
"-verbose" "-verbose"
"-prefix" out "-prefix" out
"-docdir" (string-append out "/share/doc/qt5") "-docdir" (string-append out "/share/doc/qt5")
"-headerdir" (string-append out "/include/qt5") "-headerdir" (string-append out "/include/qt5")
"-archdatadir" (string-append out "/lib/qt5") "-archdatadir" (string-append out "/lib/qt5")
"-datadir" (string-append out "/share/qt5") "-datadir" (string-append out "/share/qt5")
"-examplesdir" (string-append "-examplesdir" (string-append
out "/share/doc/qt5/examples") out "/share/doc/qt5/examples")
"-opensource" "-opensource"
"-confirm-license" "-confirm-license"
;; Do not build examples; if desired, these could go ;; Do not build examples; if desired, these could go
;; into a separate output, but for the time being, we ;; into a separate output, but for the time being, we
;; prefer to save the space and build time. ;; prefer to save the space and build time.
"-no-compile-examples" "-no-compile-examples"
;; Most "-system-..." are automatic, but some use ;; Most "-system-..." are automatic, but some use
;; the bundled copy by default. ;; the bundled copy by default.
"-system-sqlite" ;; System sqlite fails on 5.10+
"-system-harfbuzz" ;;.obj/qsql_sqlite.o: In function `QSQLiteResultPrivate::initColumns(bool)':
"-system-pcre" ;;qsql_sqlite.cpp:(.text+0x190c): undefined reference to `sqlite3_column_table_name16'
;; explicitly link with openssl instead of dlopening it ;"-system-sqlite"
"-openssl-linked" "-system-harfbuzz"
;; explicitly link with dbus instead of dlopening it "-system-pcre"
"-dbus-linked" ;; explicitly link with openssl instead of dlopening it
;; don't use the precompiled headers "-openssl-linked"
"-no-pch" ;; explicitly link with dbus instead of dlopening it
;; drop special machine instructions that do not have "-dbus-linked"
;; runtime detection ;; don't use the precompiled headers
,@(if (string-prefix? "x86_64" "-no-pch"
(or (%current-target-system) ;; drop special machine instructions that do not have
(%current-system))) ;; runtime detection
'() ,@(if (string-prefix? "x86_64"
'("-no-sse2")) (or (%current-target-system)
"-no-mips_dsp" (%current-system)))
"-no-mips_dspr2"))))) '()
'("-no-sse2"))
"-no-mips_dsp"
"-no-mips_dspr2"))))
(add-after 'install 'patch-mkspecs (add-after 'install 'patch-mkspecs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -600,16 +603,16 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(define-public qtsvg (define-public qtsvg
(package (inherit qtbase) (package (inherit qtbase)
(name "qtsvg") (name "qtsvg")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0yh3an9rc7fh013cw3bm318ap6428icsmnj38hhg1w6lpwr2gwm2")))) "0m0zglp0m5gv75ivma6l3hm8brb0cf44dhbc6lqwfdwacxhgx3jb"))))
(propagated-inputs `()) (propagated-inputs `())
(native-inputs `(("perl" ,perl))) (native-inputs `(("perl" ,perl)))
(inputs (inputs
@ -662,7 +665,7 @@ HostData=lib/qt5
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Valid QT_BUILD_PARTS variables are: ;; Valid QT_BUILD_PARTS variables are:
;; libs tools tests examples demos docs translations ;; libs tools tests examples demos docs translations
(zero? (system* "qmake" "QT_BUILD_PARTS = libs tools tests")))) (invoke "qmake" "QT_BUILD_PARTS = libs tools tests")))
(add-before 'check 'set-display (add-before 'check 'set-display
(lambda _ (lambda _
;; make Qt render "offscreen", required for tests ;; make Qt render "offscreen", required for tests
@ -675,19 +678,21 @@ HostData=lib/qt5
(define-public qtimageformats (define-public qtimageformats
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtimageformats") (name "qtimageformats")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1nfxvf96wh1smdmcsk4m9f7zg69fgp844f8772qpv6v4m20p1qb9")) "0w0yy7zzln3v7dm7ksjxkzhq8r0a9nwk823wv4f1x7vsa3pnyh2q"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(delete-file-recursively "src/3rdparty")))) '(begin
(delete-file-recursively "src/3rdparty")
#t))))
(native-inputs `()) (native-inputs `())
(inputs (inputs
`(("jasper" ,jasper) `(("jasper" ,jasper)
@ -704,16 +709,16 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
(define-public qtx11extras (define-public qtx11extras
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtx11extras") (name "qtx11extras")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1a125fi7lbxfps207i12jammm4cjbiawmp4sqa3bxqah8p21i6w7")))) "13vbx61wcd8pnpgk3j5r665pm03s7jp2s98apvc6fhp1njlr0rhi"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -728,16 +733,16 @@ from within Qt 5.")))
(define-public qtxmlpatterns (define-public qtxmlpatterns
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtxmlpatterns") (name "qtxmlpatterns")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0ybz0i3wblvrm958s9ykp3a79bakjbb7k74q71mqaaswkv9imxgs")))) "13nj2pa706sy874bqbv7y94ypicr4k09x6n2jyxkw93flb5pi8qr"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases) ((#:phases phases)
@ -757,16 +762,16 @@ xmlpatternsvalidator.")))
(define-public qtdeclarative (define-public qtdeclarative
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtdeclarative") (name "qtdeclarative")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0r9dhfc6qmxlzn2v9r6z6n2mcq6pv1nmyh91g9hcdlkx40xqlqyw")))) "1h2pbyr7dnak4q96373xpa6gk6rl528rnqima8xnvhdi2y5kgagf"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -789,16 +794,16 @@ with JavaScript and C++.")))
(define-public qtconnectivity (define-public qtconnectivity
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtconnectivity") (name "qtconnectivity")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"12qckqz6ldvn1czkkigadmgl07yk4gs74hy4ifh4hmpm7cv519yv")))) "0wqq5q5saf007aphvpn5pvj6l0qp0z7wxvfba6v9iq5ylyqm6bnd"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases) ((#:phases phases)
@ -824,16 +829,16 @@ with Bluetooth and NFC.")))
(define-public qtwebsockets (define-public qtwebsockets
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtwebsockets") (name "qtwebsockets")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"00786d9m8skj68n5x9d8151zmmskx7ckhgcdd08hs9nly04h55vj")))) "1drr6nxxbkwpmz39bhyfmmsqjhy11bj3w1nc3q9dwhpcbf04an3x"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -851,16 +856,16 @@ consume data received from the server, or both.")))
(define-public qtsensors (define-public qtsensors
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtsensors") (name "qtsensors")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0n6lkkn7c9x8vcplmfvkx7jq6najh2mrwnfb3blrmkmpash3lgvr")))) "1az22rdkpc1m44qb3dyh7cpiprplkvynzjr629ai05i8ngbfdi0g"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:parallel-tests? _ #f) #f) ; can lead to race condition ((#:parallel-tests? _ #f) #f) ; can lead to race condition
@ -884,16 +889,16 @@ recognition API for devices.")))
(define-public qtmultimedia (define-public qtmultimedia
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtmultimedia") (name "qtmultimedia")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0x2f3vpax7rq0lxnncbp5b248bxdicrwn8hv4hsas2g2283s0lj9")) "0g4x1w251imq58zp1px6yschwj6icsxzwl3fy7pjfbgd27qjhlzg"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -901,7 +906,8 @@ recognition API for devices.")))
"examples/multimedia/spectrum/3rdparty") "examples/multimedia/spectrum/3rdparty")
;; We also prevent the spectrum example from being built. ;; We also prevent the spectrum example from being built.
(substitute* "examples/multimedia/multimedia.pro" (substitute* "examples/multimedia/multimedia.pro"
(("spectrum") "#")))))) (("spectrum") "#"))
#t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases) ((#:phases phases)
@ -909,9 +915,9 @@ recognition API for devices.")))
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(zero? (system* "qmake" "QT_BUILD_PARTS = libs tools tests" (invoke "qmake" "QT_BUILD_PARTS = libs tools tests"
(string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out "/lib -Wl,-rpath,") (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out "/lib -Wl,-rpath,")
(string-append "PREFIX=" out)))))))) (string-append "PREFIX=" out)))))))
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
@ -934,20 +940,22 @@ set of plugins for interacting with pulseaudio and GStreamer.")))
(define-public qtwayland (define-public qtwayland
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtwayland") (name "qtwayland")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0x4q17k23akf14i3pyllr96s8lvprk1x006wp0mi5rhk4199cx1z")) "09s1ckqj0cgjmmi7jylsf039vgzlq7i9rr4swb590fkz427lx0b8"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; The examples try to build and cause the build to fail ;; The examples try to build and cause the build to fail
'(delete-file-recursively "examples")))) '(begin
(delete-file-recursively "examples")
#t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases) ((#:phases phases)
@ -984,16 +992,16 @@ compositor libraries.")))
(define-public qtserialport (define-public qtserialport
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtserialport") (name "qtserialport")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"172i5cpqnk0c3m0hg08hgj15qvsyd1xvw9yf2dqicg3l10lqwg8c")))) "1cbf1jsginp5p3y17cyb6dfhsafxal0bn9pya6aybz0q799zgvl5"))))
(native-inputs `(("perl" ,perl))) (native-inputs `(("perl" ,perl)))
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
@ -1018,16 +1026,16 @@ interacting with serial ports from within Qt.")))
(define-public qtserialbus (define-public qtserialbus
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtserialbus") (name "qtserialbus")
(version "5.9.5") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0gz5xsskv02yy078yffxyn8rdlklf4rsgnqrziyz5ywxwdh96gn5")))) "0r3crk7gw0xs6wk1gvw2k8r9s9vam3sfwrji1njhswavii9fbp85"))))
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
("qtserialport" ,qtserialport))) ("qtserialport" ,qtserialport)))
@ -1039,16 +1047,16 @@ and others.")))
(define-public qtwebchannel (define-public qtwebchannel
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtwebchannel") (name "qtwebchannel")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1acs0fa5rxm3cir0lydc9a8685qagf1786vkssv51wk3v9r3lc4h")))) "05fa5pwvk24cjp8m6pbw3ma95vnls762crpjdgvygfk0h8xilxmh"))))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("qtdeclarative" ,qtdeclarative) ("qtdeclarative" ,qtdeclarative)
@ -1063,16 +1071,16 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
(define-public qtlocation (define-public qtlocation
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtlocation") (name "qtlocation")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"186jzv19v674n8jmm13v5xwv211lygih5657rlvbhc1s4jq6iv9p")))) "074cjqhr14mqlsqj9rzagzdcqnayyichp31lq02k05q07wg93xi8"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1093,16 +1101,16 @@ positioning and geolocation plugins.")))
(define-public qttools (define-public qttools
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qttools") (name "qttools")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"11vfk6c8snsqwqj1xk53c0h2mkqr4gfa9kinp8py56x7sn15galm")))) "1nb77bfs63nyy0wkhsci9qbqmahncy3sdcrwj4qr1prc4y2cm4wx"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1120,16 +1128,16 @@ that helps in Qt development.")))
(define-public qtscript (define-public qtscript
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtscript") (name "qtscript")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0lz0iv1baah7cxrpyiqzqp4fxxf75i21qd06ha7r5d80hq3xlia0")) "1ib8a5gsxarbm2j94j5d097ly3ap4snqkx2imz3sl6xk6gknm4i5"))
(patches (search-patches "qtscript-disable-tests.patch")))) (patches (search-patches "qtscript-disable-tests.patch"))))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
@ -1144,16 +1152,16 @@ ECMAScript and Qt.")))
(define-public qtquickcontrols (define-public qtquickcontrols
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtquickcontrols") (name "qtquickcontrols")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"12yrmv6afjbd1fw3r8zjdrbq5l7cy7k5bxcyiv1m97gykfh0b8hn")))) "01ziibf4afdhb5b3gfci8maprmviqwhdvma2z1jlq2ck45cpsqi6"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1168,16 +1176,16 @@ can be used to build complete interfaces in Qt Quick.")))
(define-public qtquickcontrols2 (define-public qtquickcontrols2
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtquickcontrols2") (name "qtquickcontrols2")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0334ayansm743kf113rs3k9hi9qb6giscfx9xig3y1z7asisfa0m")))) "1hsa8n4dlqpyz9xq2kq1hsxrxsjc7ywzzfhqijylgzzclvlqgb7y"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1193,16 +1201,16 @@ not available.")))
(define-public qtgraphicaleffects (define-public qtgraphicaleffects
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtgraphicaleffects") (name "qtgraphicaleffects")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1vxq4j7cb5cya1g234rxhfb361n45gp8c70gj8pc03njswkm7xwp")))) "0xzr4421w7idlgndxnd68wwc2asabycjiskkyl1f8nwqv34lcy3j"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1226,14 +1234,16 @@ coloring, and many more.")))
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3")) "0zwch9vn17f3bpy300jcfxx6cx9qymk5j7khx0x9k1xqid4166c3"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(delete-file-recursively "tools/opengldummy/3rdparty")))) '(begin
(delete-file-recursively "tools/opengldummy/3rdparty")
#t))))
(native-inputs `()) (native-inputs `())
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
@ -1246,16 +1256,16 @@ backend for QtQuick scene graph.")
(define-public qtgamepad (define-public qtgamepad
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtgamepad") (name "qtgamepad")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1ci6aapq0i8qbzkn9xxvxn1n81z3y28yrlyzw0anqzj9qp97cl6f")))) "0g52c03gdgz57h7szdxvc5hdy45l7q7m29yfzhwqc57hwdfl98bi"))))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
@ -1276,23 +1286,24 @@ and mobile applications targeting TV-like form factors.")))
(define-public qtscxml (define-public qtscxml
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtscxml") (name "qtscxml")
(version "5.9.5") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0knp328cinawz6xbhf9wd6h6gbwp74rb5cpmlr8gv3g5a7fjlsh1")) "00wb89ris8fyivhz9qpqn72mzpkh6mqdjss82j3q10g3c142072k"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
(delete-file-recursively "tests/3rdparty") (delete-file-recursively "tests/3rdparty")
;; the scion test refers to the bundled 3rd party test code. ;; the scion test refers to the bundled 3rd party test code.
(substitute* "tests/auto/auto.pro" (substitute* "tests/auto/auto.pro"
(("scion") "#")))))) (("scion") "#"))
#t))))
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative))) ("qtdeclarative" ,qtdeclarative)))
@ -1306,16 +1317,16 @@ also contains functionality to support data models and executable content.")))
(define-public qtpurchasing (define-public qtpurchasing
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtpurchasing") (name "qtpurchasing")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"08sk8vw16pa1qv36rfr9dsbzlwlv6kznfpsq8wfabhkgbfl6awqs")))) "1c92yv2yi38sic06nyr9r6zpq3y4sxnasmj14d3jmg50gc1ncqfs"))))
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative))) ("qtdeclarative" ,qtdeclarative)))
@ -1326,19 +1337,21 @@ purchasing goods and services.")))
(define-public qtcanvas3d (define-public qtcanvas3d
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtcanvas3d") (name "qtcanvas3d")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0agdxgk7knf6zkjdi6316y2k9zq72wcg5zn3cbhw4hzjw81qadgg")) "1kqcaks6lkz8cp9s3pwrvgrr8381rjzf5fbf2bzshdw7psphxiiz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(delete-file-recursively "examples/canvas3d/3rdparty")))) '(begin
(delete-file-recursively "examples/canvas3d/3rdparty")
#t))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
;; Building the tests depends on the bundled 3rd party javascript files, ;; Building the tests depends on the bundled 3rd party javascript files,
@ -1349,8 +1362,8 @@ purchasing goods and services.")))
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(zero? (system* "qmake" "QT_BUILD_PARTS = libs tools" (invoke "qmake" "QT_BUILD_PARTS = libs tools"
(string-append "PREFIX=" out)))))))) (string-append "PREFIX=" out)))))))
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs `()) (native-inputs `())
(inputs (inputs
@ -1363,16 +1376,16 @@ drawing calls from Qt Quick JavaScript.")))
(define-public qtcharts (define-public qtcharts
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtcharts") (name "qtcharts")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1rykb72gr95rxd0rvbl846ys8xvyyhrms1jz7l4hlwp6zn1jkxvm")))) "0lg39vd6i0l76spjz6bhb1kkpbk2mgc0hxccj7733xxbxaz14vn4"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1390,16 +1403,16 @@ selecting one of the charts themes.")
(define-public qtdatavis3d (define-public qtdatavis3d
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtdatavis3d") (name "qtdatavis3d")
(version "5.9.5") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0i1zd7lcakhicfpqj7dlw8hzk8x5i4ddk1427jhxcpja48l4jxy5")))) "1s7gmgh6g3aia74yiqahffrc6n8f4491vb7g3i4i10ilandipg34"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1417,16 +1430,16 @@ customized by using themes or by adding custom items and labels to them.")
(define-public qtnetworkauth (define-public qtnetworkauth
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtnetworkauth") (name "qtnetworkauth")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0mqcqkp9h5bgzb3wfy239wh1c9s9zxd7mww11c0jyp56wk5balcx")))) "1kr8hwjsb8a5cypvqj48vrnkcvm2rcni102dh6i909i70a7hcsym"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg) (substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases) ((#:phases phases)
@ -1446,16 +1459,26 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
(define-public qtremoteobjects (define-public qtremoteobjects
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtremoteobjects") (name "qtremoteobjects")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1wb50dapv0l45c0rfmpiaddvwv9na50lmd5zmm052q9d1xb15f6b")))) "1chn1xxhapfwvhrlv4chwfgf2dw8x8kn1lssdmpmg5s420z3pbq9"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'remove-failing-test
(lambda _
;; This test can't find its imports.
(substitute* "tests/auto/qml/qml.pro"
(("integration") "# integration"))
#t))))))
(inputs (inputs
`(("qtbase" ,qtbase) `(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative))) ("qtdeclarative" ,qtdeclarative)))
@ -1468,16 +1491,16 @@ processes or computers.")))
(define-public qtspeech (define-public qtspeech
(package (inherit qtsvg) (package (inherit qtsvg)
(name "qtspeech") (name "qtspeech")
(version "5.9.4") (version "5.11.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/" (uri (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version (version-major+minor version) "/" version
"/submodules/" name "-opensource-src-" "/submodules/" name "-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"17h8hrixxcsn7pd5iipbj2hxpp5m2dhfq3w04wkamambb49qs80x")))) "1bgfg0akqf1nfzm28n8dhvhj0p1niwxrfs763gj7m0g6vpwjbhd1"))))
(inputs (inputs
`(("qtbase" ,qtbase))) `(("qtbase" ,qtbase)))
(native-inputs (native-inputs