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

gnu: qt: Update to 5.11.1. 

* gnu/packages/qt.scm (qt): Update to 5.11.1.
[source]: Update snippet.
[inputs]: Remove sqlite.
[arguments]: Don't use system sqlite.
This commit is contained in:
Efraim Flashner 2018-07-04 16:03:28 +03:00
parent 64a64fa72a
commit f79c7e9747
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/qt.scm
View File

@ -105,7 +105,7 @@ system, and the core design of Django is reused in Grantlee.")
(define-public qt (define-public qt
(package (package
(name "qt") (name "qt")
(version "5.9.4") (version "5.11.1")
(outputs '("out" "examples")) (outputs '("out" "examples"))
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -114,11 +114,11 @@ system, and the core design of Django is reused in Grantlee.")
"http://download.qt.io/official_releases/qt/" "http://download.qt.io/official_releases/qt/"
(version-major+minor version) (version-major+minor version)
"/" version "/" version
"/single/qt-everywhere-opensource-src-" "/single/qt-everywhere-src-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1mblh8k04l13nk9fhhrr43h5bcph1gbz94j5y7csx8zvxb5xkb73")) "0azva1wx298jh0xskymz8jic83yhxs1xfxf321wqd5lwiyq2qq1r"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -135,7 +135,7 @@ system, and the core design of Django is reused in Grantlee.")
(lambda (dir) (lambda (dir)
(delete-file-recursively (string-append "qtbase/src/3rdparty/" dir))) (delete-file-recursively (string-append "qtbase/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"))
(for-each (for-each
(lambda (dir) (lambda (dir)
@ -143,10 +143,23 @@ system, and the core design of Django is reused in Grantlee.")
(list "qtimageformats/src/3rdparty" (list "qtimageformats/src/3rdparty"
"qtmultimedia/examples/multimedia/spectrum/3rdparty" "qtmultimedia/examples/multimedia/spectrum/3rdparty"
"qtwayland/examples" "qtwayland/examples"
"qtscxml/tests/3rdparty"
"qtcanvas3d/examples/canvas3d/3rdparty")) "qtcanvas3d/examples/canvas3d/3rdparty"))
;; Tests depend on this example, which depends on the 3rd party code. ;; Tests depend on this example, which depends on the 3rd party code.
(substitute* "qtmultimedia/examples/multimedia/multimedia.pro" (substitute* "qtmultimedia/examples/multimedia/multimedia.pro"
(("spectrum") "#")) (("spectrum") "#"))
(substitute* "qtxmlpatterns/tests/auto/auto.pro"
(("qxmlquery") "# qxmlquery")
(("xmlpatterns ") "# xmlpatterns"))
(substitute* "qtwebglplugin/tests/plugins/platforms/platforms.pro"
(("webgl") "# webgl"))
(substitute* "qtscxml/tests/auto/auto.pro"
(("scion") "#"))
(substitute* "qtnetworkauth/tests/auto/auto.pro"
(("oauth1 ") "# oauth1 "))
(substitute* "qtremoteobjects/tests/auto/qml/qml.pro"
(("integration") "# integration")
(("usertypes") "# usertypes"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
@ -193,7 +206,7 @@ system, and the core design of Django is reused in Grantlee.")
("postgresql" ,postgresql) ("postgresql" ,postgresql)
("pulseaudio" ,pulseaudio) ("pulseaudio" ,pulseaudio)
("pcre2" ,pcre2) ("pcre2" ,pcre2)
("sqlite" ,sqlite) ;("sqlite" ,sqlite)
("udev" ,eudev) ("udev" ,eudev)
("unixodbc" ,unixodbc) ("unixodbc" ,unixodbc)
("wayland" ,wayland) ("wayland" ,wayland)
@ -244,7 +257,7 @@ system, and the core design of Django is reused in Grantlee.")
"-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"
"-system-harfbuzz" "-system-harfbuzz"
;; explicitly link with openssl instead of dlopening it ;; explicitly link with openssl instead of dlopening it
"-openssl-linked" "-openssl-linked"