;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
-;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net>
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2022 Foo Chuan Wei <chuanwei.foo@hotmail.com>
+;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages markup)
#:use-module (gnu packages networking)
#:use-module (gnu packages ninja)
+ #:use-module (gnu packages node)
#:use-module (gnu packages nss)
#:use-module (gnu packages pciutils)
#:use-module (gnu packages pcre)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages python-web)
#:use-module (gnu packages regex)
#:use-module (gnu packages ruby)
#:use-module (gnu packages sdl)
(string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2"))
(sha256
(base32 "14742vs32m98nbfb5mad0i8ciff5f45gfcb5v03p4hh2dvhhqgfn"))))
- (build-system gnu-build-system)
+ (build-system qt-build-system)
(arguments
- `(#:tests? #f ; No target
- #:imported-modules
- (,@%qt-build-system-modules)
- #:modules
- ((guix build gnu-build-system)
- ((guix build qt-build-system)
- #:prefix qt:)
- (guix build utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "qt5ct.pro"
- (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
- (search-input-file inputs "/bin/lrelease")))))
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out")))
- (invoke "qmake"
- (string-append "PREFIX=" out)
- (string-append "BINDIR=" out "/bin")
- (string-append "DATADIR=" out "/share")
- (string-append "PLUGINDIR=" out "/lib/qt5/plugins")))))
- (add-after 'install 'qt-wrap
- (assoc-ref qt:%standard-phases 'qt-wrap)))))
+ (list
+ #:tests? #f ; No target
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch
+ (lambda _
+ (substitute* '("src/qt5ct-qtplugin/CMakeLists.txt"
+ "src/qt5ct-style/CMakeLists.txt")
+ (("\\$\\{PLUGINDIR\\}")
+ (string-append #$output "/lib/qt5/plugins"))))))))
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
- (list qtbase-5 qtsvg-5))
+ (list qtsvg-5))
(synopsis "Qt5 Configuration Tool")
(description "Qt5CT is a program that allows users to configure Qt5
settings (such as icons, themes, and fonts) in desktop environments or
(list cmake-shared extra-cmake-modules pkg-config))
(inputs
`(("qtbase" ,qtbase-5)
- ("qtwayland" ,qtwayland)
+ ("qtwayland" ,qtwayland-5)
("wayland" ,wayland)
("xkbcommon" ,libxkbcommon)))
(synopsis "Material Decoration for Qt")
system, and the core design of Django is reused in Grantlee.")
(license license:lgpl2.1+)))
-(define (qt5-urls component version)
+(define (qt-urls component version)
"Return a list of URLs for VERSION of the Qt5 COMPONENT."
;; We can't use a mirror:// scheme because these URLs are not exact copies:
;; the layout differs between them.
(list (string-append "https://download.qt.io/official_releases/qt/"
+ (version-major+minor version) "/" version
+ "/submodules/" component "-everywhere-opensource-src-"
+ version ".tar.xz")
+ (string-append "https://download.qt.io/official_releases/qt/"
(version-major+minor version) "/" version
"/submodules/" component "-everywhere-src-"
version ".tar.xz")
(string-append "https://download.qt.io/archive/qt/"
(version-major+minor version) "/" version
- "/submodules/" component "-everywhere-src-"
+ "/submodules/" component "-everywhere-opensource-src-"
version ".tar.xz")
(let ((directory (string-append "qt5" (string-drop component 2))))
(string-append "http://sources.buildroot.net/" directory "/"
- component "-everywhere-src-" version ".tar.xz"))
+ component "-everywhere-opensource-src-" version ".tar.xz"))
(string-append "https://distfiles.macports.org/qt5/"
- component "-everywhere-src-" version ".tar.xz")))
+ component "-everywhere-opensource-src-" version ".tar.xz")))
(define-public qtbase-5
(package
(name "qtbase")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1y70libf2x52lpbqvhz10lpk7nyl1ajjwzjxly9pjdpfj4jsv7wh"))
+ "1p2fa94m1y8qzhdfi2d7dck93qh1lgsinibwl1wy92bwmacwfhhc"))
;; Use TZDIR to avoid depending on package "tzdata".
(patches (search-patches "qtbase-use-TZDIR.patch"
"qtbase-moc-ignore-gcc-macro.patch"
("nss" ,nss)
("openssl" ,openssl)
("pcre2" ,pcre2)
- ;; TODO: Switch to 'postgres' in the next rebuild cycle.
- ("postgresql" ,postgresql-13)
+ ("postgresql" ,postgresql)
("pulseaudio" ,pulseaudio)
("sqlite" ,sqlite)
("unixodbc" ,unixodbc)
(version "6.3.1")
(source (origin
(inherit (package-source qtbase-5))
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
"00sfya41ihqb0zwg6wf1kiy02iymj6mk584hhk2c4s94khfl4r0a"))
(variable "XDG_CONFIG_DIRS")
(files '("etc/xdg")))))))
+(define-public qt5compat
+ (package
+ (name "qt5compat")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1zbcaswpl79ixcxzj85qzjq73962s4c7316pibwfrskqswmwcgm4"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output "/tests")))))))
+ (native-inputs (list perl))
+ (inputs (list icu4c libxkbcommon qtbase qtdeclarative qtshadertools))
+ (home-page (package-home-page qtbase))
+ (synopsis "Legacy Qt 5 APIs ported to Qt 6")
+ (description "The @code{qt5compat} package includes application
+programming interfaces (APIs) from Qt 5 that were ported to Qt 6, to ease
+migration. It provides for example the @code{GraphicalEffects} module that
+came with the @{qtgraphicaleffects} Qt 5 package.")
+ (license (list license:gpl2+ license:lgpl3+)))) ;dual licensed
+
(define-public qtsvg-5
(package
(inherit qtbase-5)
(name "qtsvg")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb"))))
+ "0cdhmhxngv4y7kl5vbcii4l4anbz0hj7dvhlddy1agyl19j9xky4"))))
(propagated-inputs `())
(native-inputs (list perl))
(inputs
[EffectiveSourcePaths]
HostPrefix=~a
HostData=lib/qt5
-" out out qtbase)))
- #t)))
+" out out qtbase))))))
(replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Valid QT_BUILD_PARTS variables are:
(add-before 'check 'set-display
(lambda _
;; make Qt render "offscreen", required for tests
- (setenv "QT_QPA_PLATFORM" "offscreen")
- #t)))))
+ (setenv "QT_QPA_PLATFORM" "offscreen"))))))
(synopsis "Qt module for displaying SVGs")
(description "The QtSvg module provides classes for displaying the
contents of SVG files.")))
(version "6.3.1")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
"1xvxz2jfpr1al85rhwss7ji5vkxa812d0b888hry5f7pwqcg86bv"))))
(define-public qtimageformats
(package (inherit qtsvg-5)
(name "qtimageformats")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1msk8a0z8rr16hkp2fnv668vf6wayiydqgc2mcklaa04rv3qb0mz"))
+ "1xjb2z2h1ajw7z9cwq8djpdvjwalpnmirwcwrlbjqv5r4ghmi82a"))
(modules '((guix build utils)))
(snippet
'(begin
- (delete-file-recursively "src/3rdparty")
- #t))))
- (arguments
- (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'fix-build
- (lambda _
- (substitute* "src/plugins/imageformats/jp2/qjp2handler.cpp"
- (("^#include <jasper/jasper.h>")
- "#include <jasper/jasper.h>\n#include <QtCore/qmath.h>"))
- #t))))))
+ (delete-file-recursively "src/3rdparty")))))
(native-inputs `())
(inputs
(list jasper
(define-public qtx11extras
(package (inherit qtsvg-5)
(name "qtx11extras")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h"))))
+ "0wxsrnnkkn68myy211rfz98brs7j3qmx3hmy097vh5avgsmw11bn"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(define-public qtxmlpatterns
(package (inherit qtsvg-5)
(name "qtxmlpatterns")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn"))))
+ "065vj1gk5i4cg0f9spksyb9ps4px0vssx262y77aakvw408vfmq5"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f) ; TODO: Enable the tests
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-network-tests
(lambda _ (substitute* "tests/auto/auto.pro"
(("qxmlquery") "# qxmlquery")
- (("xmlpatterns ") "# xmlpatterns"))
- #t))))))
+ (("xmlpatterns ") "# xmlpatterns"))))
+ (add-after 'unpack 'skip-qquickxmllistmodel-test
+ (lambda _ (substitute* "tests/auto/auto.pro"
+ ((".*qquickxmllistmodel.*") ""))))))))
(native-inputs (list perl qtdeclarative-5))
(inputs (list qtbase-5))
(synopsis "Qt XML patterns module")
(define-public qtdeclarative-5
(package (inherit qtsvg-5)
(name "qtdeclarative")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066"))))
+ "0ji5131g7h2mrgxw1wxc5mcvmsn3fbw64j28gzpa25gv3vcnkhaw"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f) ;TODO: Enable the tests
;; is provided by qtdeclarative-5.
(substitute*
"lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
- (("\\$\\{_qt5Core_install_prefix\\}") out)))
- #t))))))
+ (("\\$\\{_qt5Core_install_prefix\\}") out)))))
+ ;; TODO: Add phase unconditionally.
+ ,@(if (target-riscv64?)
+ '((add-after 'unpack 'fix-linking-riscv64
+ (lambda _
+ (substitute* "src/qml/qml.pro"
+ (("DEFINES \\+= QT_NO_FOREACH")
+ (string-append
+ "isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n"
+ "DEFINES += QT_NO_FOREACH"))))))
+ '())))))
(native-inputs
(list perl
pkg-config
;; TODO: Package 'masm' and unbundle from sources.
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
"1s268fha3650dn1lqxf8jfa07wxpw09f6p7rjyiwq3w24d0nkrq3"))))
(define-public qtconnectivity
(package (inherit qtsvg-5)
(name "qtconnectivity")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003"))))
+ "0b2dnxw1rjbp1srhgns148cwl99f50mx29588dal3avv0f73s597"))))
(native-inputs
(list perl pkg-config qtdeclarative-5))
(inputs
(description "The Qt Connectivity modules provides modules for interacting
with Bluetooth and NFC.")))
-(define-public qtwebsockets
+(define-public qtwebsockets-5
(package (inherit qtsvg-5)
(name "qtwebsockets")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50"))))
+ "0f120rfqnmlffjhrm5jbpipk1qsbzp1a2v3q8gz94hz6n9dqpav6"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
to act as a server that can process WebSocket requests, or a client that can
consume data received from the server, or both.")))
+(define-public qtwebsockets
+ (package
+ (name "qtwebsockets")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "06hj0pkdzjicmbiinjp1dk1ziz8cb3fgcwy7a0dxxjvzr680v64z"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases #~(modify-phases %standard-phases
+ (delete 'check) ;move after install
+ (add-after 'install 'prepare-for-tests
+ (lambda _
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (setenv "QML2_IMPORT_PATH"
+ (string-append #$output "/lib/qt6/qml:"
+ (getenv "QML2_IMPORT_PATH")))))
+ (add-after 'prepare-for-tests 'check
+ (assoc-ref %standard-phases 'check))
+ (add-after 'check 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output "/tests")))))))
+ (native-inputs (list perl))
+ (inputs (list qtbase qtdeclarative))
+ (synopsis "Qt Web Sockets module")
+ (description "WebSocket is a web-based protocol designed to enable two-way
+communication between a client application and a remote host. The Qt
+WebSockets module provides C++ and QML interfaces that enable Qt applications
+to act as a server that can process WebSocket requests, or a client that can
+consume data received from the server, or both.")
+ (home-page (package-home-page qtbase))
+ (license (package-license qtbase))))
+
(define-public qtsensors
(package (inherit qtsvg-5)
(name "qtsensors")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z"))))
+ "0zlhm4js02niibb23rw87wf4ik0gy4ai08fwprnwy7zf4rm1ss3d"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:parallel-tests? _ #f) #f) ; can lead to race condition
(add-after 'unpack 'fix-tests
(lambda _
(substitute* "tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp"
- (("2000") "5000") ;lengthen test timeout
- (("QTest::newRow(\"twist\") << \"twist\"") "")) ;failing test
- #t))))))
+ (("2000") "5000") ;lengthen test timeout
+ (("QTest::newRow(\"twist\") << \"twist\"") "")))))))) ;failing test
(native-inputs
(list perl qtdeclarative-5))
(inputs (list qtbase-5))
(package
(inherit qtsvg-5)
(name "qtmultimedia")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1xbd6kc7i0iablqdkvfrajpi32cbq7j6ajbfyyyalcai1s0mhdqc"))
+ "0q76iy1frcgm85mid17lh4p6gnn04n19n6zklgpv4w3md1ng97xw"))
(modules '((guix build utils)))
(snippet
'(begin
"examples/multimedia/spectrum/3rdparty")
;; We also prevent the spectrum example from being built.
(substitute* "examples/multimedia/multimedia.pro"
- (("spectrum") "#"))
- #t))))
+ (("spectrum") "#"))))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
(version "6.3.1")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
;; Note: the source bundles *patched* glslang and SPIRV-Cross
;; sources.
(sha256
(description "The @code{qtshadertools} module provides APIs and tools
supporting shader pipeline functionality as offered in Qt Quick to operate on
Vulkan, OpenGL and other main graphic APIs.")
- (license (package-home-page qtbase))))
+ (license (package-license qtbase))))
(define-public qtmultimedia
(package
(version "6.3.1")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
"0dkk3lmzi2fs13cnj8q1lpcs6gghj219826gkwnzyd6nmlm280vy"))
set of plugins for interacting with pulseaudio and GStreamer.")
(license (package-license qtbase))))
-(define-public qtwayland
+(define-public qtwayland-5
(package (inherit qtsvg-5)
(name "qtwayland")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
+ (patches (search-patches "qtwayland-gcc-11.patch"))
(sha256
(base32
- "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr"))))
+ "0yy8qf9kn15iqsxi2r7jbcsc0vsdyfz7bbxmfn4i9qmz1yvg0jgr"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
"m_waitingFrameCallbacks\\.empty\\(\\)\\);"))
"")
(("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);")
- ""))
- #t))
+ ""))))
(add-before 'check 'set-test-environment
(lambda _
;; Do not fail just because /etc/machine-id is missing.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- #t))))))
+ (setenv "DBUS_FATAL_WARNINGS" "0")))))))
(native-inputs
(list glib perl pkg-config qtdeclarative-5))
(inputs
- `(("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("libx11" ,libx11)
- ("libxcomposite" ,libxcomposite)
- ("libxext" ,libxext)
- ("libxkbcommon" ,libxkbcommon)
- ("libxrender" ,libxrender)
- ("mesa" ,mesa)
- ("mtdev" ,mtdev)
- ("qtbase" ,qtbase-5)
- ("vulkan-headers" ,vulkan-headers)
- ("wayland" ,wayland)))
+ (list fontconfig
+ freetype
+ libx11
+ libxcomposite
+ libxext
+ libxkbcommon
+ libxrender
+ mesa
+ mtdev
+ qtbase-5
+ vulkan-headers
+ wayland))
(synopsis "Qt Wayland module")
(description "The Qt Wayland module provides the QtWayland client and
compositor libraries.")))
+(define-public qtwayland
+ (package
+ (name "qtwayland")
+ (version "6.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32 "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'disable-failing-tests
+ (lambda _
+ ;; FIXME: tst_seatv4::animatedCursor() fails here.
+ ;; See also: <https://bugreports.qt.io/browse/QTBUG-78317>
+ (substitute* "tests/auto/client/seatv4/tst_seatv4.cpp"
+ (((string-append
+ "QVERIFY\\(!cursorSurface\\(\\)->"
+ "m_waitingFrameCallbacks\\.empty\\(\\)\\);")) "")
+ (("QTRY_COMPARE\\(bufferSpy\\.count\\(\\), 1\\);") ""))))
+ (add-before 'check 'set-test-environment
+ (lambda _
+ ;; Do not fail just because /etc/machine-id is missing.
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ ;; Make Qt render "offscreen", required for tests.
+ (setenv "QT_QPA_PLATFORM" "offscreen"))))))
+ (native-inputs (list glib perl pkg-config qtdeclarative))
+ (inputs
+ (list fontconfig
+ freetype
+ libx11
+ libxcomposite
+ libxext
+ libxkbcommon
+ libxrender
+ mesa
+ mtdev
+ qtbase
+ vulkan-headers
+ wayland))
+ (synopsis "Qt Wayland module")
+ (description "The Qt Wayland module provides the QtWayland client and
+compositor libraries.")
+ (home-page (package-home-page qtbase))
+ (license (package-license qtbase))))
+
(define-public qtserialport
(package (inherit qtsvg-5)
(name "qtserialport")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "17gp5qzg4wdg8qlxk2p3mh8x1vk33rf33wic3fy0cws193bmkiar"))))
+ "0xg2djwhrj5jqamawlp75g70nmwbp2ph2hh1pm45s36jkxm0k7al"))))
(native-inputs (list perl))
(inputs
(list qtbase-5 eudev))
;; otherwise the lib will be searched in LD_LIBRARY_PATH which
;; typically is not set in guix.
(("^\\s*(udevLibrary->setFileNameAndVersion\\(QStringLiteral\\(\")(udev\"\\),\\s*[0-9]+\\);)" _ a b)
- (string-append a (assoc-ref inputs "eudev") "/lib/lib" b)))
- #t))))))
+ (string-append a (assoc-ref inputs "eudev") "/lib/lib" b)))))))))
(synopsis "Qt Serial Port module")
(description "The Qt Serial Port module provides the library for
interacting with serial ports from within Qt.")))
(define-public qtserialbus
(package (inherit qtsvg-5)
(name "qtserialbus")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf"))))
+ "180gm1jvqfn0h3251zafdd1wd3af00phwaa5qljsbrj6s6ywj79j"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases '%standard-phases)
"/lib/libsocketcan.so")))
(substitute* "src/plugins/canbus/socketcan/libsocketcan.cpp"
(("QStringLiteral\\(\"socketcan\"\\)")
- (format #f "QStringLiteral(~s)" libcansocket.so)))
- #t)))))))
+ (format #f "QStringLiteral(~s)" libcansocket.so))))))))))
(inputs
(list libsocketcan qtbase-5 qtserialport))
(synopsis "Qt Serial Bus module")
access the various industrial serial buses and protocols, such as CAN, ModBus,
and others.")))
-(define-public qtwebchannel
+(define-public qtwebchannel-5
(package (inherit qtsvg-5)
(name "qtwebchannel")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj"))))
+ "1w8mcpdqlphgg3a6yfq18liwlj2nkwrafv0n80h242x5l2mk3ljf"))))
(native-inputs
- (list perl qtdeclarative-5 qtwebsockets))
+ (list perl qtdeclarative-5 qtwebsockets-5))
(inputs (list qtbase-5))
(synopsis "Web communication library for Qt")
(description "The Qt WebChannel module enables peer-to-peer communication
application). The transport mechanism is supported out of the box by the two
popular web engines, Qt WebKit 2 and Qt WebEngine.")))
+(define-public qtwebchannel
+ (package
+ (name "qtwebchannel")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0s16zx3qn3byldvhmsnwijm8rmizk8vpqj7fnwhjg6c67z10m8ma"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases #~(modify-phases %standard-phases
+ (delete 'check) ;move after install
+ (add-after 'install 'prepare-for-tests
+ (lambda _
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (setenv "QML2_IMPORT_PATH"
+ (string-append #$output "/lib/qt6/qml:"
+ (getenv "QML2_IMPORT_PATH")))))
+ (add-after 'prepare-for-tests 'check
+ (assoc-ref %standard-phases 'check))
+ (add-after 'check 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output "/tests")))))))
+ (native-inputs (list perl))
+ (inputs (list qtbase qtdeclarative qtwebsockets))
+ (home-page (package-home-page qtbase))
+ (synopsis "Web communication library for Qt")
+ (description "The Qt WebChannel module enables peer-to-peer communication
+between the host (QML/C++ application) and the client (HTML/JavaScript
+application).")
+ (license (package-license qtbase))))
+
(define-public qtwebglplugin
(package (inherit qtsvg-5)
(name "qtwebglplugin")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1"))))
+ "1m0p4ssykw07lbip2qyv6w34f8ng13bxb63j0w446f5w0492nn9f"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-network-tests
(lambda _ (substitute* "tests/plugins/platforms/platforms.pro"
- (("webgl") "# webgl"))
- #t))))))
+ (("webgl") "# webgl"))))))))
(native-inputs '())
(inputs
- (list mesa qtbase-5 qtdeclarative-5 qtwebsockets zlib))
+ (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
(synopsis "QPA plugin for running an application via a browser using
streamed WebGL commands")
(description "Qt back end that uses WebGL for rendering. It allows Qt
(define-public qtwebview
(package (inherit qtsvg-5)
(name "qtwebview")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1rw1wibmbxlj6xc86qs3y8h42al1vczqiksyxzaylxs9gqb4d7xy"))))
+ "0arwaky3jy5ql3z4d8f7k7diidzb1kncdans7pn50hsa1bzacfal"))))
(native-inputs
(list perl))
(inputs
(define-public qtlocation
(package (inherit qtsvg-5)
(name "qtlocation")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (string-append "https://download.qt.io/official_releases/qt/"
- (version-major+minor version) "/" version
- "/submodules/" name "-everywhere-src-"
- version ".tar.xz"))
+ (uri (qt-urls name version))
(sha256
(base32
- "184jychnlfhplpwc5cdcsapwljgwvzk5qpf3val4kpq8w44wnkwq"))))
+ "0mlhhhcxx3gpr9kh04c6fljxcj50c2j21r0wb9f7d7nk4flip7b2"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ ((#:tests? _ #f) #f) ; TODO: Enable the tests
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-before 'check 'pre-check
+ (lambda _
+ (setenv "HOME" "/tmp")))))))
(native-inputs
- (list perl qtdeclarative-5 qtquickcontrols qtserialport))
+ (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport))
(inputs
(list icu4c openssl qtbase-5 zlib))
(synopsis "Qt Location and Positioning modules")
(description "The Qt Location module provides an interface for location,
positioning and geolocation plugins.")))
-(define-public qttools
+(define-public qtlottie
+ (package
+ (name "qtlottie")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1x8wmc6gwmxk92zjcsrbhrbqbfvnk7302ggghld5wk8jk5lsf2vl"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'check) ;move after install
+ (add-after 'install 'prepare-for-tests
+ (lambda _
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ (setenv "QML2_IMPORT_PATH"
+ (string-append #$output "/lib/qt6/qml:"
+ (getenv "QML2_IMPORT_PATH"))))))))
+ (native-inputs (list perl))
+ (inputs (list libxkbcommon qtbase qtdeclarative))
+ (home-page (package-home-page qtbase))
+ (synopsis "QML API for rendering Bodymovin graphics and animations")
+ (description "Qt Lottie Animation provides a QML API for rendering
+graphics and animations that are exported in JSON format by the Bodymovin
+plugin for Adobe After Effects.")
+ (license (package-license qtbase))))
+
+(define-public qttools-5
(package (inherit qtsvg-5)
(name "qttools")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1"))))
+ "0v7wkzq9i8w3qrw0z8al7lb6clr57lfisyb1fm9cnhi73fvph1vd"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
the documentation, translate applications, generate help files and other stuff
that helps in Qt development.")))
+(define-public qttools
+ (package
+ (name "qttools")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "1h96w4bzkbd80vr7lh6hnypdlmbzc1y52c2zrqzvkgm3587pa4n4"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; The build system attempts to fetch online resources and fails when
+ ;; building the test suite.
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=OFF")))
+ (native-inputs (list perl qtdeclarative vulkan-headers))
+ (inputs (list libxkbcommon mesa qtbase))
+ (home-page (package-home-page qtbase))
+ (synopsis "Qt Tools and Designer modules")
+ (description "The Qt Tools module provides a set of applications to browse
+the documentation, translate applications, generate help files and other stuff
+that helps in Qt development.")
+ ;; GPL 3 only with Qt GPL exception 1.0 (see:
+ ;; LICENSES/Qt-GPL-exception-1.0.txt).
+ (license (list license:gpl3))))
+
(define-public qtscript
(package (inherit qtsvg-5)
(name "qtscript")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "0gk74hk488k9ldacxbxcranr3arf8ifqg8kz9nm1rgdgd59p36d2"))
+ "17yk0p8ci47xlfpllc17arlycng47wrnnskimskzz85bspabc8pm"))
(patches (search-patches "qtscript-disable-tests.patch"))))
(native-inputs
- (list perl qttools))
+ (list perl qttools-5))
(inputs
(list qtbase-5))
(synopsis "Qt Script module")
The following guides and references cover aspects of programming with
ECMAScript and Qt.")))
-(define-public qtquickcontrols
+(define-public qtquickcontrols-5
(package (inherit qtsvg-5)
(name "qtquickcontrols")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3"))))
+ "0mjw25wcgd2bvjz9rr4qjydb423c63615rcx1vws4jmydqdihssr"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
applications scriptable. This module provides a set of extra components that
can be used to build complete interfaces in Qt Quick.")))
-(define-public qtquickcontrols2
+(define-public qtquickcontrols2-5
(package (inherit qtsvg-5)
(name "qtquickcontrols2")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7"))))
+ "1cxg4ml07k1zcyi5m4lx06sz8f5l67isb5vhk7nakxm0wnn7p8y4"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
and tray icons. It falls back to Qt Widgets when a native implementation is
not available.")))
+(define-public qtquickcontrols2
+ ;; qtquickcontrols2 still exist, but was merged into qtdeclarative.
+ ;; Unfortunately that hasn't been well communicated at all (see:
+ ;; https://bugreports.qt.io/browse/QTBUG-79454).
+ (deprecated-package "qtquickcontrols2" qtdeclarative))
+
(define-public qtgraphicaleffects
(package (inherit qtsvg-5)
(name "qtgraphicaleffects")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc"))))
+ "0xznn5zqp6xrqfgl54l8cig9asqf9m2hz0p3ga514rh8spmdazr3"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(define-public qtgamepad
(package (inherit qtsvg-5)
(name "qtgamepad")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "0p07bg93fdfn4gr2kv38qgnws5znhswajrxdfs8xc9l3i7vi2xn7"))))
+ "0wa4d8f025hlp4bmdzdy5wcahm9wjg6bkwig8dpw9nrsj3idz5b0"))))
(native-inputs
(list perl pkg-config))
(inputs
(define-public qtscxml
(package (inherit qtsvg-5)
(name "qtscxml")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1p5771b9hnpchfcdgy0zkhwg09a6xq88934aggp0rij1k85mkfb0"))
+ "0xf5mqsrw16h8xjglymgfc8qg2qa5bi4fgdl4j3dkhvvpr7vrphp"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "tests/3rdparty")
;; the scion test refers to the bundled 3rd party test code.
(substitute* "tests/auto/auto.pro"
- (("scion") "#"))
- #t))))
+ (("scion") "#"))))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
+ ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt SCXML module")
generating a C++ file that has a class implementing the state machine. It
also contains functionality to support data models and executable content.")))
+(define-public qtpositioning
+ (package
+ (name "qtpositioning")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0v78wamvdw02kf9rq7m5v24q2g6jmgq4ch0fnfa014p1r978wy06"))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'install 'delete-installed-tests
+ (lambda _
+ (delete-file-recursively
+ (string-append #$output "/tests")))))))
+ (inputs (list perl qtbase))
+ (home-page (package-home-page qtbase))
+ (synopsis "QML and C++ positioning information API")
+ (description "The Qt Positioning API provides positioning information via
+QML and C++ interfaces. The Qt Positioning API lets you to determine a
+position by using a variety of possible sources, including satellite, wifi, or
+text files. That information can then be used to, for example, determine a
+position on a map. In addition, you can use to the API to retrieve satellite
+information and perform area based monitoring.")
+ (license (package-license qtbase))))
+
(define-public qtpurchasing
(package (inherit qtsvg-5)
(name "qtpurchasing")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7"))))
+ "04z6mwzn73gg56hgs7gividinfgndx4kmcnp7w6h3wamrdlkfdx7"))))
(inputs
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt Purchasing module")
(define-public qtcharts
(package (inherit qtsvg-5)
(name "qtcharts")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0"))))
+ "0y051i1837bfybkf8cm7cx8k5wjmbi47pxawaaz6wm0hd2z5b4qi"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'remove-failing-test
+ (lambda _
+ (substitute* "tests/auto/auto.pro"
+ (("qml") "# qml")
+ (("qml-qtquicktest") "# qml-qtquicktest"))))))))
(inputs
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt Charts module")
(define-public qtdatavis3d
(package (inherit qtsvg-5)
(name "qtdatavis3d")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2"))))
+ "0sczwqlc36jdywf7bqxz0hm6mr7fn8p1fsnc33jliiqzn9yrg77x"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
customized by using themes or by adding custom items and labels to them.")
(license license:gpl3)))
-(define-public qtnetworkauth
+(define-public qtnetworkauth-5
(package (inherit qtsvg-5)
(name "qtnetworkauth")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw"))))
- (arguments
- (substitute-keyword-arguments (package-arguments qtsvg-5)
- ((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'remove-failing-test
- (lambda _
- ;; These tests can't find their test data.
- (substitute* "tests/auto/auto.pro"
- (("oauth1 ") "# oauth1 "))
- #t))))))
+ "0c7mz715rlpg0cqgs6s0aszmslyamkhnpamc1iij6i571sj5j2f1"))))
(inputs
(list qtbase-5))
(synopsis "Qt Network Authorization module")
(description "The Qt Network Authorization module provides an
implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
+(define-public qtnetworkauth
+ (package
+ (name "qtnetworkauth")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0apvsb2ip1m3kw8vi9spvf6f6q72ys8vr40rpyysi7shsjwm83yn"))))
+ (build-system cmake-build-system)
+ (arguments (list #:configure-flags #~(list "-DQT_BUILD_TESTS=ON")))
+ (native-inputs (list perl))
+ (inputs (list qtbase))
+ (home-page (package-home-page qtbase))
+ (synopsis "Qt Network Authorization module")
+ (description "The Qt Network Authorization module provides an
+implementation of OAuth and OAuth2 authenticathon methods for Qt.")
+ (license (package-license qtbase))))
+
(define-public qtremoteobjects
(package (inherit qtsvg-5)
(name "qtremoteobjects")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7"))))
+ "1m0xcqlbxsfn0cd4ajin1h3i4l51dajmkw91v0r4a61xi14i0kks"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
;; disable failing tests: they need network
(substitute* "tests/auto/auto.pro"
(("integration_multiprocess proxy_multiprocess integration_external restart")
- "integration_multiprocess"))
- #t))))))
+ "integration_multiprocess"))))))))
(inputs
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt Remote Objects module")
(define-public qtspeech
(package (inherit qtsvg-5)
(name "qtspeech")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468"))))
-
+ "0xskp9dzjy5nqszygk8gwvjyiylgynx5sq3nk2vi3zwgfdh5jpm4"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(arguments
`(#:tests? #f)) ;no test
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list enchant qtbase-5))
(home-page "https://github.com/manisandro/qtspell")
;; COPYING file specify GPL3, but source code files all refer to GPL2+.
(license license:gpl2+)))
-(define-public qtwebengine
+(define-public qtwebengine-5
(package
(inherit qtsvg-5)
(name "qtwebengine")
- (version (package-version qtbase-5))
+ (version "5.15.5")
(source
(origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt-urls name version))
(sha256
(base32
- "1q4idxdm81sx102xc12ixj0xpfx52d6vwvs3jpapnkyq8c7cmby8"))
+ "0zahr9w6rqdxwh2whsgk3fhcszs7wa9j95lq4sqi8xzin2wcgl17"))
(modules '((ice-9 ftw)
(ice-9 match)
(srfi srfi-1)
"third_party/boringssl/src/third_party/fiat"
"third_party/breakpad"
"third_party/brotli"
+ "third_party/catapult/common/py_vulcanize/py_vulcanize"
+ "third_party/catapult/common/py_vulcanize/third_party"
+ "third_party/catapult/third_party/beautifulsoup4"
+ "third_party/catapult/third_party/html5lib-python"
+ "third_party/catapult/third_party/polymer/components"
+ "third_party/catapult/tracing"
+ "third_party/catapult/tracing/third_party"
"third_party/ced"
"third_party/cld_3"
"third_party/closure_compiler"
"third_party/dav1d"
"third_party/dawn"
"third_party/devtools-frontend"
- "third_party/devtools-frontend/src/front_end/third_party/fabricjs"
- "third_party/devtools-frontend/src/front_end/third_party/lighthouse"
- "third_party/devtools-frontend/src/front_end/third_party/wasmparser"
- "third_party/devtools-frontend/src/third_party/axe-core"
+ "third_party/devtools-frontend/src/front_end/third_party"
+ "third_party/devtools-frontend/src/third_party/typescript"
"third_party/emoji-segmenter"
"third_party/ffmpeg"
"third_party/googletest"
"third_party/khronos"
"third_party/leveldatabase"
"third_party/libaddressinput"
+ "third_party/libavif"
"third_party/libgifcodec"
"third_party/libjingle_xmpp"
"third_party/libjpeg_turbo"
"third_party/libxml"
"third_party/libxslt"
"third_party/libyuv"
+ "third_party/lottie"
"third_party/lss"
"third_party/mako"
"third_party/markupsafe"
"third_party/metrics_proto"
"third_party/modp_b64"
"third_party/nasm"
+ "third_party/node"
"third_party/one_euro_filter"
"third_party/openh264/src/codec/api/svc"
"third_party/opus"
"third_party/skia/include/third_party/skcms/skcms.h"
"third_party/skia/include/third_party/vulkan"
"third_party/skia/third_party/skcms"
- "third_party/skia/third_party/vulkanmemoryallocator"
"third_party/smhasher"
"third_party/snappy"
"third_party/sqlite"
"third_party/usb_ids"
"third_party/usrsctp"
+ "third_party/vulkan_memory_allocator"
"third_party/web-animations-js"
"third_party/webrtc"
- "third_party/webrtc/common_audio/third_party/fft4g"
+ "third_party/webrtc/common_audio/third_party/ooura/fft_size_128"
+ "third_party/webrtc/common_audio/third_party/ooura/fft_size_256"
"third_party/webrtc/common_audio/third_party/spl_sqrt_floor"
"third_party/webrtc/modules/third_party/fft"
"third_party/webrtc/modules/third_party/g711"
"third_party/widevine/cdm/widevine_cdm_common.h"
"third_party/widevine/cdm/widevine_cdm_version.h"
"third_party/woff2"
- "third_party/yasm"
+ "third_party/xcbproto"
"third_party/zlib"
"url/third_party/mozilla"
"v8/src/third_party/utf8-decoder"
(_ #t)))
(with-directory-excursion "src/3rdparty"
- ;; TODO: Try removing "gn" too for future versions of qtwebengine.
+ ;; TODO: Try removing "gn" too for future versions of qtwebengine-5.
(delete-file-recursively "ninja")
(with-directory-excursion "chromium"
;; Use relative header locations instead of hard coded ones.
(substitute*
- "base/third_party/dynamic_annotations/dynamic_annotations.c"
+ "base/third_party/dynamic_annotations/dynamic_annotations.c"
(("base/third_party/valgrind") "valgrind"))
(substitute*
- "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h"
+ '("third_party/breakpad/breakpad/src/common/linux/http_upload.cc"
+ "third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h")
(("third_party/curl") "curl"))
(substitute*
- '("components/viz/common/gpu/vulkan_context_provider.h"
- "components/viz/common/resources/resource_format_utils_vulkan.h"
- "gpu/config/gpu_util.cc")
- (("third_party/vulkan/include/")
+ '("components/viz/common/gpu/vulkan_context_provider.h"
+ "components/viz/common/resources/resource_format_utils.h"
+ "gpu/config/gpu_info_collector_win.cc"
+ "gpu/config/gpu_util.cc"
+ "gpu/config/vulkan_info.h")
+ (("third_party/vulkan_headers/include/")
""))
;; Replace Google Analytics bundle with an empty file and hope
flex
gperf
ninja
+ node
perl
pkg-config
python2-six
libxcb
libxcomposite
libxcursor
+ libxkbfile
libxi
libxkbcommon
;; FIXME: libxml2 needs to built with icu support though it links to
qtbase-5
qtdeclarative-5
qtmultimedia-5
- qtwebchannel
+ qtwebchannel-5
re2
snappy
eudev
(display "\ngn_args += use_system_openh264=true\n" out)))
;; Qtwebengine is not installed into the same prefix as
;; qtbase. Some qtbase QTLibraryInfo constants will not
- ;; work. Replace with the full path to the qtwebengine
+ ;; work. Replace with the full path to the qtwebengine-5
;; translations and locales in the store.
(substitute* "src/core/web_engine_library_info.cpp"
(("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)")
(invoke "qmake" "QT_BUILD_PARTS = libs tools" "--"
"--webengine-printing-and-pdf=no"
"--webengine-ffmpeg=system"
- ;; FIXME: Building qtwebengine 5.12.2 with
+ ;; FIXME: Building qtwebengine-5 5.12.2 with
;; icu4c >= 68 fails.
;;"--webengine-icu=system"
"--webengine-pepper-plugins=no"
and binaries removed, and adds modular support for using system libraries.")
(license license:lgpl2.1+)))
-(define-public single-application-qt5
- ;; Change in function signature, nheko requires at least this commit
- (let ((commit "dc8042b5db58f36e06ba54f16f38b16c5eea9053"))
- (package
- (name "single-application-qt5")
- (version (string-append "3.2.0-" (string-take commit 7)))
- (source
- (origin
- (method git-fetch)
- (uri
- (git-reference
- (url "https://github.com/itay-grudev/SingleApplication")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "163aa2x2qb0h8w26si5ql833ilj427jjbdwlz1p2p8iaq6dh0vq1"))))
- (build-system cmake-build-system)
- (arguments
- `(#:tests? #f ; no check target
- ;; Projects can decide how to build this library. You might need to
- ;; override this flag (QApplication, QGuiApplication or
- ;; QCoreApplication).
+(define-public qtwebengine
+ (package
+ (name "qtwebengine")
+ (version "6.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (qt-urls name version))
+ (sha256
+ (base32
+ "0ivfsqd5c0cxsnssj6z37901cf6a47w50zaqgjiysvcm3ar36ymd"))
+ (modules '((ice-9 ftw)
+ (ice-9 match)
+ (srfi srfi-1)
+ (srfi srfi-26)
+ (guix build utils)))
+ (snippet
+ '(begin
+ (let ((preserved-third-party-files
+ '("base/third_party/double_conversion"
+ "base/third_party/cityhash"
+ "base/third_party/cityhash_v103"
+ "base/third_party/dynamic_annotations"
+ "base/third_party/icu"
+ "base/third_party/libevent"
+ "base/third_party/nspr"
+ "base/third_party/superfasthash"
+ "base/third_party/symbolize"
+ "base/third_party/xdg_mime"
+ "base/third_party/xdg_user_dirs"
+ "net/third_party/mozilla_security_manager"
+ "net/third_party/nss"
+ "net/third_party/quiche"
+ "net/third_party/uri_template"
+ "third_party/abseil-cpp"
+ "third_party/angle"
+ "third_party/angle/src/common/third_party/base"
+ "third_party/angle/src/common/third_party/smhasher"
+ "third_party/angle/src/common/third_party/xxhash"
+ "third_party/axe-core"
+ "third_party/blink"
+ "third_party/boringssl"
+ "third_party/boringssl/src/third_party/fiat"
+ "third_party/breakpad"
+ "third_party/brotli"
+ "third_party/ced"
+ "third_party/cld_3"
+ "third_party/closure_compiler"
+ "third_party/crashpad"
+ "third_party/crashpad/crashpad/third_party/lss"
+ "third_party/crashpad/crashpad/third_party/zlib"
+ "third_party/crc32c"
+ "third_party/dav1d"
+ "third_party/dawn"
+ "third_party/devtools-frontend"
+ "third_party/devtools-frontend/src/front_end/third_party/lighthouse"
+ "third_party/devtools-frontend/src/front_end/third_party/wasmparser"
+ "third_party/emoji-segmenter"
+ "third_party/ffmpeg"
+ "third_party/googletest"
+ "third_party/harfbuzz-ng/utils"
+ "third_party/hunspell"
+ "third_party/iccjpeg"
+ "third_party/icu"
+ "third_party/inspector_protocol"
+ "third_party/jinja2"
+ "third_party/jsoncpp"
+ "third_party/jstemplate"
+ "third_party/khronos"
+ "third_party/leveldatabase"
+ "third_party/libaddressinput"
+ "third_party/libgifcodec"
+ "third_party/libjingle_xmpp"
+ "third_party/libjpeg_turbo"
+ "third_party/libpng"
+ "third_party/libsrtp"
+ "third_party/libsync"
+ "third_party/libudev"
+ "third_party/libvpx"
+ "third_party/libwebm"
+ "third_party/libwebp"
+ "third_party/libxml"
+ "third_party/libxslt"
+ "third_party/libyuv"
+ "third_party/lss"
+ "third_party/mako"
+ "third_party/markupsafe"
+ "third_party/mesa_headers"
+ "third_party/metrics_proto"
+ "third_party/modp_b64"
+ "third_party/nasm"
+ "third_party/one_euro_filter"
+ "third_party/openh264/src/codec/api/svc"
+ "third_party/opus"
+ "third_party/ots"
+ "third_party/pdfium"
+ "third_party/pdfium/third_party/agg23"
+ "third_party/pdfium/third_party/base"
+ "third_party/pdfium/third_party/freetype"
+ "third_party/pdfium/third_party/lcms"
+ "third_party/pdfium/third_party/libopenjpeg20"
+ "third_party/pdfium/third_party/skia_shared"
+ "third_party/perfetto"
+ "third_party/pffft"
+ "third_party/ply"
+ "third_party/polymer"
+ "third_party/protobuf"
+ "third_party/protobuf/third_party/six"
+ "third_party/pyjson5"
+ "third_party/re2"
+ "third_party/rnnoise"
+ "third_party/skia"
+ "third_party/skia/include/third_party/skcms/skcms.h"
+ "third_party/skia/include/third_party/vulkan"
+ "third_party/skia/third_party/skcms"
+ "third_party/skia/third_party/vulkanmemoryallocator"
+ "third_party/smhasher"
+ "third_party/snappy"
+ "third_party/sqlite"
+ "third_party/usb_ids"
+ "third_party/usrsctp"
+ "third_party/web-animations-js"
+ "third_party/webrtc"
+ "third_party/webrtc/common_audio/third_party/ooura"
+ "third_party/webrtc/common_audio/third_party/spl_sqrt_floor"
+ "third_party/webrtc/modules/third_party/fft"
+ "third_party/webrtc/modules/third_party/g711"
+ "third_party/webrtc/modules/third_party/g722"
+ "third_party/webrtc/rtc_base/third_party/base64"
+ "third_party/webrtc/rtc_base/third_party/sigslot"
+ "third_party/webrtc_overrides"
+ "third_party/widevine/cdm/widevine_cdm_common.h"
+ "third_party/widevine/cdm/widevine_cdm_version.h"
+ "third_party/woff2"
+ "third_party/zlib"
+ "url/third_party/mozilla"
+ "v8/src/third_party/utf8-decoder"
+ "v8/src/third_party/valgrind"
+ "v8/src/third_party/siphash"
+ "v8/third_party/v8/builtins"
+ "v8/third_party/inspector_protocol"))
+ (protected (make-regexp "\\.(gn|gyp)i?$")))
+ (define preserved-club
+ (map (lambda (member)
+ (string-append "./" member))
+ preserved-third-party-files))
+ (define (empty? dir)
+ (equal? (scandir dir) '("." "..")))
+ (define (third-party? file)
+ (string-contains file "third_party/"))
+ (define (useless? file)
+ (any (cute string-suffix? <> file)
+ '(".zip" ".so" ".dll" ".exe" ".jar")))
+ (define (parents child)
+ ;; Return all parent directories of CHILD up to and including
+ ;; the closest "third_party".
+ (let* ((dirs (match (string-split child #\/)
+ ((dirs ... last) dirs)))
+ (closest (list-index (lambda (dir)
+ (string=? "third_party" dir))
+ (reverse dirs)))
+ (delim (- (length dirs) closest)))
+ (fold (lambda (dir prev)
+ (cons (string-append (car prev) "/" dir)
+ prev))
+ (list (string-join (list-head dirs delim) "/"))
+ (list-tail dirs delim))))
+ (define (remove-loudly file)
+ (format #t "deleting ~a...~%" file)
+ (force-output)
+ (delete-file file))
+ (define (delete-unwanted-files child stat flag base level)
+ (match flag
+ ((or 'regular 'symlink 'stale-symlink)
+ (when (third-party? child)
+ (unless (or (member child preserved-club)
+ (any (cute member <> preserved-club)
+ (parents child))
+ (regexp-exec protected child))
+ (remove-loudly child)))
+ (when (and (useless? child) (file-exists? child))
+ (remove-loudly child)))
+ ('directory-processed
+ (when (empty? child)
+ (rmdir child)))
+ (_ #t)))
+
+ (with-directory-excursion "src/3rdparty"
+ (delete-file-recursively "ninja")
+
+ (with-directory-excursion "chromium"
+ ;; Delete bundled software and binaries that were not
+ ;; explicitly preserved above.
+ (nftw "." delete-unwanted-files 'depth 'physical)
+
+ ;; Assert that each preserved item is present to catch
+ ;; removals.
+ (for-each (lambda (third-party)
+ (unless (file-exists? third-party)
+ (error (format #f "~s does not exist!~%"
+ third-party))))
+ preserved-club)
+
+ ;; Use relative header locations instead of hard coded ones.
+ (substitute*
+ "base/third_party/dynamic_annotations/dynamic_annotations.c"
+ (("base/third_party/valgrind") "valgrind"))
+ (substitute* "third_party/breakpad/breakpad/src/common/\
+linux/libcurl_wrapper.h"
+ (("third_party/curl") "curl"))
+ (substitute*
+ '("components/viz/common/gpu/vulkan_context_provider.h"
+ "gpu/config/gpu_util.cc")
+ (("third_party/vulkan/include/")
+ ""))
+
+ ;; Replace Google Analytics bundle with an empty file and
+ ;; hope no one notices.
+ (mkdir-p "third_party/analytics")
+ (call-with-output-file
+ "third_party/analytics/google-analytics-bundle.js"
+ (lambda (port)
+ (const #t)))))
+ ;; Do not enable support for loading the Widevine DRM plugin.
+ (substitute* "src/core/CMakeLists.txt"
+ (("enable_widevine=true")
+ "enable_widevine=false")))))))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ ;; XXX: The test suite is not built by default; leave it off to save
+ ;; some build time and resources.
+ #:tests? #f
+ #:configure-flags
+ ;; Use the CMake ninja generator, otherwise the build fails (see:
+ ;; https://bugreports.qt.io/browse/QTBUG-96897).
+ #~(list "-GNinja" ;
+ ;; Manually add the NSS library prefix to the linker
+ ;; search path, otherwise it fails to be linked (see:
+ ;; https://bugreports.qt.io/browse/QTBUG-105053).
+ (string-append "-DCMAKE_SHARED_LINKER_FLAGS=-L"
+ (search-input-directory %build-inputs "lib/nss"))
+
+ ;; The PDF renderer plugin fails to build with errors such as
+ ;; "src/3rdparty/chromium/components/pdf
+ ;; /renderer/pdf_accessibility_tree.cc:1373:39:
+ ;; error: use of undeclared identifier 'IDS_PDF_PAGE_INDEX'";
+ ;; disable it.
+ "-DQT_FEATURE_webengine_printing_and_pdf=OFF"
+ "-DQT_FEATURE_webengine_pepper_plugins=OFF" ;widevine
+ "-DQT_FEATURE_system_ffmpeg=ON"
+ ;; Do not artificially limit codec support; video decoding is
+ ;; done by ffmpeg.
+ "-DQT_FEATURE_webengine_proprietary_codecs=ON"
+ "-DQT_FEATURE_webengine_system_alsa=ON"
+ "-DQT_FEATURE_webengine_system_icu=ON"
+ "-DQT_FEATURE_webengine_system_libxml=ON"
+ "-DQT_FEATURE_webengine_system_libpci=ON"
+ "-DQT_FEATURE_webengine_system_libpng=ON"
+ "-DQT_FEATURE_webengine_system_pulseaudio=ON"
+ "-DQT_FEATURE_webengine_system_zlib=ON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-paths
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Qtwebengine is not installed into the same prefix as qtbase.
+ ;; Some qtbase QTLibraryInfo constants will not work. Replace
+ ;; with the full path to the qtwebengine translations and
+ ;; locales in the store.
+ (substitute* "src/core/web_engine_library_info.cpp"
+ (("QLibraryInfo::path\\(QLibraryInfo::TranslationsPath)")
+ (string-append "QLatin1String(\"" #$output
+ "/share/qt6/translations\")"))
+ (("QLibraryInfo::path\\(QLibraryInfo::DataPath)")
+ (string-append "QLatin1String(\"" #$output
+ "/share/qt6\")")))
+ ;; Substitute full dynamic library path for nss.
+ (substitute* "src/3rdparty/chromium/crypto/nss_util.cc"
+ (("libnssckbi.so")
+ (search-input-file inputs "lib/nss/libnssckbi.so")))
+ ;; Substitute full dynamic library path for udev.
+ (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
+ (("libudev.so.1")
+ (search-input-file inputs "lib/libudev.so.1")))
+ ;; Patch the location of the X11 keywoard layouts, otherwise
+ ;; webengine *crashes* at run time when the default directory,
+ ;; '/usr/share/X11/xkb' is empty (see:
+ ;; https://bugreports.qt.io/browse/QTBUG-105124).
+ (substitute* "src/3rdparty/chromium/ui/events/ozone/layout/xkb\
+/xkb_keyboard_layout_engine.cc"
+ (("/usr/share/X11/xkb")
+ (search-input-directory inputs "share/X11/xkb")))))
+ (add-before 'configure 'prepare-build-environment
+ (lambda _
+ ;; Avoids potential race conditions.
+ (setenv "PYTHONDONTWRITEBYTECODE" "1")
+ (setenv "NINJAFLAGS"
+ (string-append
+ "-k1" ;less verbose build output
+ ;; Respect the '--cores' option of 'guix build'.
+ " -j" (number->string (parallel-job-count))))
+ ;; Use Clang/LDD to help tame the memory requirements and hasten
+ ;; the build.
+ (setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm")
+ (setenv "CC" "clang") (setenv "CXX" "clang++")))
+ (replace 'build
+ (lambda* (#:key parallel-build? #:allow-other-keys)
+ (apply invoke "cmake" "--build" "."
+ (if parallel-build?
+ `("--parallel" ,(number->string (parallel-job-count)))
+ '()))))
+ (replace 'install
+ (lambda _
+ (invoke "cmake" "--install" "."))))))
+ (native-inputs
+ (modify-inputs (package-native-inputs qtwebengine-5)
+ (delete "python2" "python2-six")
+ (append clang-14
+ lld-as-ld-wrapper
+ node-lts
+ python-wrapper
+ python-html5lib)))
+ (inputs
+ (modify-inputs (package-inputs qtwebengine-5)
+ (replace "qtbase" qtbase)
+ (replace "qtdeclarative" qtdeclarative)
+ (replace "qtmultimedia" qtmultimedia)
+ (replace "qtwebchannel" qtwebchannel)
+ (append libxkbfile xkeyboard-config)))
+ (native-search-paths
+ (list (search-path-specification
+ (file-type 'regular)
+ (separator #f)
+ (variable "QTWEBENGINEPROCESS_PATH")
+ (files '("lib/qt6/libexec/QtWebEngineProcess")))))
+ (home-page "https://wiki.qt.io/QtWebEngine")
+ (synopsis "Qt WebEngine module")
+ (description "The Qt WebEngine module provides support for web
+applications using the Chromium browser project. The Chromium source code has
+Google services and binaries removed, and adds modular support for using
+system libraries.")
+ (license license:lgpl2.1+)))
+
+(define-public single-application-qt5
+ ;; Change in function signature, nheko requires at least this commit
+ (let ((commit "dc8042b5db58f36e06ba54f16f38b16c5eea9053"))
+ (package
+ (name "single-application-qt5")
+ (version (string-append "3.2.0-" (string-take commit 7)))
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/itay-grudev/SingleApplication")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "163aa2x2qb0h8w26si5ql833ilj427jjbdwlz1p2p8iaq6dh0vq1"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:tests? #f ; no check target
+ ;; Projects can decide how to build this library. You might need to
+ ;; override this flag (QApplication, QGuiApplication or
+ ;; QCoreApplication).
#:configure-flags '("-DQAPPLICATION_CLASS=QApplication")
#:phases
(modify-phases %standard-phases
(define-public python-pyqt
(package
(name "python-pyqt")
- (version "5.15.2")
+ (version "5.15.5")
(source
(origin
(method url-fetch)
(file-name (string-append "PyQt5-" version ".tar.gz"))
(sha256
(base32
- "1z74295i69cha52llsqffzhb5zz7qnbjc64h8qg21l91jgf0harp"))
+ "0aya963kkmbwfwmpd0p6k85y4g7wl5zarjqxxfgir403zalbf4dl"))
(patches (search-patches "pyqt-configure.patch"))))
(build-system gnu-build-system)
(native-inputs
("qtsensors" ,qtsensors)
("qtserialport" ,qtserialport)
("qtsvg-5" ,qtsvg-5)
- ("qttools" ,qttools)
- ("qtwebchannel" ,qtwebchannel)
+ ("qttools-5" ,qttools-5)
+ ("qtwebchannel-5" ,qtwebchannel-5)
("qtwebkit" ,qtwebkit)
- ("qtwebsockets" ,qtwebsockets)
+ ("qtwebsockets-5" ,qtwebsockets-5)
("qtx11extras" ,qtx11extras)
("qtxmlpatterns" ,qtxmlpatterns)))
(arguments
(define-public python-pyqt5-sip
(package
(name "python-pyqt5-sip")
- (version "12.8.1")
+ (version "12.10.1")
(source
(origin
(method url-fetch)
(uri (pypi-uri "PyQt5_sip" version))
(sha256
(base32
- "1gg032ys4pccwkdzmdryadc9a4lq85nr05pag9swrsdykbdl9s9h"))))
+ "09771b6fdn0rx34l5a0wzcd899yd57zxp5sw3bsqhd25biwhiq4p"))))
(build-system python-build-system)
(arguments
`(#:tests? #f)) ;; No test code.
(define-public python-pyqtwebengine
(package
(name "python-pyqtwebengine")
- (version "5.15.2")
+ (version "5.15.5")
(source
(origin
(method url-fetch)
"/PyQtWebEngine-" version ".tar.gz")))
(sha256
(base32
- "0d56ak71r14w4f9r96vaj34qcn2rbln3s6ildvvyc707fjkzwwjd"))))
+ "0hdr0g0rzlhsnylhfk826pq1lw8p9dqcr8yma2wy9dgjrj6n0ixb"))))
(build-system gnu-build-system)
(native-inputs
(list python python-sip
("qtbase" ,qtbase-5)
("qtsvg-5" ,qtsvg-5)
("qtdeclarative-5" ,qtdeclarative-5)
- ("qtwebchannel" ,qtwebchannel)
- ("qtwebengine" ,qtwebengine)))
+ ("qtwebchannel-5" ,qtwebchannel-5)
+ ("qtwebengine-5" ,qtwebengine-5)))
(arguments
`(#:modules ((srfi srfi-1)
((guix build python-build-system) #:select (python-version))
(define-public python-qtpy
(package
(name "python-qtpy")
- (version "2.0.1")
+ (version "2.2.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "QtPy" version))
(sha256
(base32
- "13zbhnl2rm30xafwrzfwdb4mjp7gk4s9h2xagbf83pnjzczhgzdd"))))
+ "051rj10lbv2ny48lz34zhclcbdxxdbk4di2mdk91m9143w91npyq"))))
(build-system python-build-system)
(propagated-inputs (list python-packaging))
(arguments
(PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
(license license:expat)))
+(define-public python-qt.py
+ (package
+ (name "python-qt.py")
+ (version "1.3.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "Qt.py" version))
+ (sha256
+ (base32 "07rvfwzjl378j75j2va0c6xylwx16icxa6dycsjgjc329pgpng40"))))
+ (build-system python-build-system)
+ (native-inputs (list python-pyqt))
+ (home-page "https://github.com/mottosso/Qt.py")
+ (synopsis "Abstraction layer for Python Qt bindings")
+ (description
+ "This package provides an abstraction layer on top of the various Qt
+bindings (PySide, PySide2, PyQt4 and PyQt5).")
+ (license license:expat)))
+
(define-public qscintilla
(package
(name "qscintilla")
"1zk6r2vc1q48qs7mw2h47bpgrfbb9r7lf9cwq4sb1a4nls87zznk"))))
(build-system cmake-build-system)
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list libsecret qtbase-5))
(arguments
(base32 "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"))))
(build-system gnu-build-system)
(inputs
- (list qtbase-5 qtsvg-5 qttools))
+ (list qtbase-5 qtsvg-5 qttools-5))
(arguments
`(#:phases
(modify-phases %standard-phases
("qtlocation" ,qtlocation)
("qtmultimedia-5" ,qtmultimedia-5)
("qtsensors" ,qtsensors)
- ("qtwebchannel" ,qtwebchannel)
+ ("qtwebchannel-5" ,qtwebchannel-5)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("libx11" ,libx11)
(define-public dotherside
(package
(name "dotherside")
- (version "0.6.4")
+ (version "0.9.0")
(source
(origin
(method git-fetch)
(file-name (git-file-name name version))
(sha256
(base32
- "09fz6v8rp28997f235yaifj8p4vvsyv45knc1iivgdvx7msgcd0m"))))
+ "13n2qb8q9jz4ihwlbs7y15lw90w9113gb1bgnb1dggpxkj64r953"))))
(build-system cmake-build-system)
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
+ ;; TODO: Support Qt 6 (requires qtdeclarative of Qt6).
(list qtbase-5 qtdeclarative-5))
(home-page "https://filcuc.github.io/DOtherSide/index.html")
(synopsis "C language library for creating bindings for the Qt QML language")
(build-system cmake-build-system)
(arguments `(#:tests? #f)) ; There are no tests
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list qtbase-5))
(home-page "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets")
"QCustomPlot is a Qt C++ widget providing 2D plots, graphs and charts.")
(license license:gpl3+)))
+;; TODO: Split shiboken2 binding generator into a dedicated output.
+;; This executable requires libxml2, libxslt, clang-toolchain at runtime.
+;; The libshiboken library only requires Qt and Python at runtime.
(define-public python-shiboken-2
(package
(name "python-shiboken-2")
- (version "5.15.2")
+ (version "5.15.5")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases"
version ".tar.xz"))
(sha256
(base32
- "060ljj1nzyp4zfz2vasbv2i7gs5rfkkjwxxbisd0fdw01d5m01mk"))))
+ "0cwvw6695215498rsbm2xzkwaxdr3w7zfvy4kc62c01k6pxs881r"))))
(build-system cmake-build-system)
(inputs
(list clang-toolchain
qtbase-5
qtxmlpatterns))
(arguments
- `(#:tests? #f
- ;; FIXME: Building tests fails
- #:configure-flags '("-DBUILD_TESTS=off")
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'use-shiboken-dir-only
- (lambda _ (chdir "sources/shiboken2") #t))
- (add-before 'configure 'make-files-writable-and-update-timestamps
- (lambda _
- ;; The build scripts need to modify some files in
- ;; the read-only source directory, and also attempts
- ;; to create Zip files which fails because the Zip
- ;; format does not support timestamps before 1980.
- (let ((circa-1980 (* 10 366 24 60 60)))
- (for-each (lambda (file)
- (make-file-writable file)
- (utime file circa-1980 circa-1980))
- (find-files ".")))
- #t))
- (add-before 'configure 'set-build-env
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((llvm (assoc-ref inputs "clang-toolchain")))
- (setenv "CLANG_INSTALL_DIR" llvm)
- #t))))))
+ (list
+ #:tests? #f
+ ;; FIXME: Building tests fails
+ #:configure-flags #~(list "-DBUILD_TESTS=off")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'use-shiboken-dir-only
+ (lambda _ (chdir "sources/shiboken2") #t))
+ (add-before 'configure 'make-files-writable-and-update-timestamps
+ (lambda _
+ ;; The build scripts need to modify some files in
+ ;; the read-only source directory, and also attempts
+ ;; to create Zip files which fails because the Zip
+ ;; format does not support timestamps before 1980.
+ (let ((circa-1980 (* 10 366 24 60 60)))
+ (for-each (lambda (file)
+ (make-file-writable file)
+ (utime file circa-1980 circa-1980))
+ (find-files ".")))
+ #t))
+ (add-before 'configure 'set-build-env
+ (lambda _
+ (let ((llvm #$(this-package-input "clang-toolchain")))
+ (setenv "CLANG_INSTALL_DIR" llvm)
+ #t))))))
(home-page "https://wiki.qt.io/Qt_for_Python")
(synopsis
"Shiboken generates bindings for C++ libraries using CPython source code")
license:lgpl3
license:bsd-3))))
+(define-public python-shiboken-6
+ (package
+ (inherit python-shiboken-2)
+ (name "python-shiboken-6")
+ (version "6.3.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qt.io/official_releases"
+ "/QtForPython/pyside6/PySide6-" version
+ "-src/pyside-setup-opensource-src-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "0xwri69nnbhn6fajm7l045r0s0qv8nlq6qj8wcj87srli3b5xa75"))))
+ (build-system cmake-build-system)
+ (inputs
+ (modify-inputs (package-inputs python-shiboken-2)
+ (replace "qtbase" qtbase)
+ (delete "qtxmlpatterns")))
+ (arguments
+ (substitute-keyword-arguments (package-arguments python-shiboken-2)
+ ((#:phases p)
+ #~(modify-phases #$p
+ (replace 'use-shiboken-dir-only
+ (lambda _ (chdir "sources/shiboken6") #t))))
+ ((#:configure-flags flags)
+ #~(cons*
+ ;; The RUNPATH of shibokenmodule contains the entry in build
+ ;; directory instead of install directory.
+ "-DCMAKE_SKIP_RPATH=TRUE"
+ (string-append "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath="
+ #$output "/lib")
+ #$flags))))))
+
(define-public python-pyside-2
(package
(name "python-pyside-2")
(source (package-source python-shiboken-2))
(build-system cmake-build-system)
(inputs
- (list libxml2
- libxslt
- clang-toolchain
- qtbase-5
+ (list qtbase-5
qtdatavis3d
qtdeclarative-5
qtlocation
qtmultimedia-5
- qtquickcontrols
- qtquickcontrols2
+ qtquickcontrols-5
+ qtquickcontrols2-5
qtscript
qtscxml
qtsensors
qtspeech
qtsvg-5
- qtwebchannel
- qtwebengine
- qtwebsockets
+ qttools-5
+ qtwebchannel-5
+ qtwebengine-5
+ qtwebsockets-5
qtx11extras
qtxmlpatterns))
(propagated-inputs
(list python-shiboken-2))
(native-inputs
- `(("cmake" ,cmake-minimal)
- ("python" ,python-wrapper)
- ("qttools" ,qttools)
- ("which" ,which)))
+ (list python-wrapper))
(arguments
- `(#:tests? #f
- ;; FIXME: Building tests fail.
- #:configure-flags
- (list "-DBUILD_TESTS=FALSE"
- (string-append "-DPYTHON_EXECUTABLE="
- (assoc-ref %build-inputs "python")
- "/bin/python"))
- #:modules ((guix build cmake-build-system)
+ (list
+ #:tests? #f
+ ;; FIXME: Building tests fail.
+ #:configure-flags
+ #~(list "-DBUILD_TESTS=FALSE"
+ (string-append "-DPYTHON_EXECUTABLE="
+ (search-input-file %build-inputs
+ "/bin/python")))
+ #:modules '((guix build cmake-build-system)
(guix build utils)
(srfi srfi-1))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'go-to-source-dir
- (lambda _ (chdir "sources/pyside2") #t))
- (add-after 'go-to-source-dir 'fix-qt-module-detection
- (lambda* (#:key inputs #:allow-other-keys)
- ;; Activate qt module support even if it not in the same
- ;; directory as qtbase.
- (substitute* "../cmake_helpers/helpers.cmake"
- (("\\(\"\\$\\{found_basepath\\}\" GREATER \"0\"\\)")
- "true"))
- ;; Add include directories for qt modules.
- (let ((dirs (map (lambda (name)
- (string-append (assoc-ref inputs name)
- "/include/qt5"))
- '("qtdatavis3d"
- "qtdeclarative-5"
- "qtlocation"
- "qtmultimedia-5"
- "qtquickcontrols"
- "qtquickcontrols2"
- "qtscript"
- "qtscxml"
- "qtsensors"
- "qtspeech"
- "qtsvg-5"
- "qttools"
- "qtwebchannel"
- "qtwebengine"
- "qtwebsockets"
- "qtx11extras"
- "qtxmlpatterns"))))
- (substitute* "cmake/Macros/PySideModules.cmake"
- (("\\$\\{PATH_SEP\\}\\$\\{core_includes\\}" all)
- (fold (lambda (dir paths)
- (string-append paths "${PATH_SEP}" dir))
- all
- dirs)))
- (setenv "CXXFLAGS" (fold (lambda (dir paths)
- (string-append paths " -I" dir))
- ""
- dirs)))))
- (add-before 'configure 'set-clang-dir
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((clang (assoc-ref inputs "clang-toolchain")))
- (setenv "CLANG_INSTALL_DIR" clang)
- #t))))))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'go-to-source-dir
+ (lambda _ (chdir "sources/pyside2") #t))
+ (add-after 'go-to-source-dir 'fix-qt-module-detection
+ (lambda _
+ ;; Activate qt module support even if it not in the same
+ ;; directory as qtbase.
+ (substitute* "../cmake_helpers/helpers.cmake"
+ (("\\(\"\\$\\{found_basepath\\}\" GREATER \"0\"\\)")
+ "true"))
+ ;; Add include directories for qt modules.
+ (let ((dirs (map (lambda (path)
+ (string-append path "/include/qt5"))
+ (list
+ #$@(map (lambda (name)
+ (this-package-input name))
+ '("qtdatavis3d"
+ "qtdeclarative"
+ "qtlocation"
+ "qtmultimedia"
+ "qtquickcontrols"
+ "qtquickcontrols2"
+ "qtscript"
+ "qtscxml"
+ "qtsensors"
+ "qtspeech"
+ "qtsvg"
+ "qttools"
+ "qtwebchannel"
+ "qtwebengine"
+ "qtwebsockets"
+ "qtx11extras"
+ "qtxmlpatterns"))))))
+ (substitute* "cmake/Macros/PySideModules.cmake"
+ (("\\$\\{PATH_SEP\\}\\$\\{core_includes\\}" all)
+ (fold (lambda (dir paths)
+ (string-append paths "${PATH_SEP}" dir))
+ all
+ dirs)))
+ (setenv "CXXFLAGS" (fold (lambda (dir paths)
+ (string-append paths " -I" dir))
+ ""
+ dirs))))))))
(home-page "https://wiki.qt.io/Qt_for_Python")
(synopsis
"The Qt for Python product enables the use of Qt5 APIs in Python applications")
license:gpl3
license:gpl2))))
+(define-public python-pyside-6
+ (package
+ (inherit python-pyside-2)
+ (name "python-pyside-6")
+ (version (package-version python-shiboken-6))
+ (source (package-source python-shiboken-6))
+ ;; TODO: Add more Qt components if available.
+ (inputs
+ (list qtbase
+ qtdeclarative
+ qtmultimedia
+ qtnetworkauth
+ qtpositioning
+ qtsvg
+ qttools
+ qtwebchannel
+ qtwebengine
+ qtwebsockets))
+ (propagated-inputs
+ (list python-shiboken-6))
+ (native-inputs
+ (list python-wrapper))
+ (arguments
+ (list
+ #:tests? #f
+ #:configure-flags
+ #~(list "-DBUILD_TESTS=FALSE"
+ (string-append "-DPYTHON_EXECUTABLE="
+ (search-input-file %build-inputs
+ "/bin/python")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'go-to-source-dir
+ (lambda _ (chdir "sources/pyside6") #t))
+ (add-after 'go-to-source-dir 'fix-qt-module-detection
+ (lambda _
+ (substitute* "cmake/PySideHelpers.cmake"
+ (("\\(\"\\$\\{found_basepath\\}\" GREATER \"0\"\\)")
+ "true"))
+ (let ((dirs (map (lambda (path)
+ (string-append path "/include/qt6"))
+ (list
+ #$@(map (lambda (name)
+ (this-package-input name))
+ '("qtdeclarative"
+ "qtmultimedia"
+ "qtnetworkauth"
+ "qtpositioning"
+ "qtsvg"
+ "qttools"
+ "qtwebchannel"
+ "qtwebengine"
+ "qtwebsockets"))))))
+ (substitute* "cmake/Macros/PySideModules.cmake"
+ (("set\\(shiboken_include_dir_list " all)
+ (string-append all (string-join dirs ";") " ")))
+ (setenv "CXXFLAGS"
+ (string-join
+ (map (lambda (dir)
+ (string-append "-I" dir))
+ dirs)
+ " "))))))))
+ (synopsis
+ "The Qt for Python product enables the use of Qt6 APIs in Python applications")
+ (description
+ "The Qt for Python product enables the use of Qt6 APIs in Python
+applications. It lets Python developers utilize the full potential of Qt,
+using the PySide6 module. The PySide6 module provides access to the
+individual Qt modules such as QtCore, QtGui,and so on. Qt for Python also
+comes with the Shiboken6 CPython binding code generator, which can be used to
+generate Python bindings for your C or C++ code.")))
+
(define-public python-pyside-2-tools
(package
(name "python-pyside-2-tools")
(inputs
(list python-pyside-2 python-shiboken-2 qtbase-5))
(native-inputs
- `(("python" ,python-wrapper)))
+ (list python-wrapper))
(arguments
- `(#:tests? #f
- #:configure-flags
- (list "-DBUILD_TESTS=off"
- (string-append "-DPYTHON_EXECUTABLE="
- (assoc-ref %build-inputs "python")
- "/bin/python"))
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'go-to-source-dir
- (lambda _ (chdir "sources/pyside2-tools") #t)))))
+ (list
+ #:tests? #f
+ #:configure-flags
+ #~(list "-DBUILD_TESTS=off"
+ (string-append "-DPYTHON_EXECUTABLE="
+ (search-input-file %build-inputs
+ "/bin/python")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'go-to-source-dir
+ (lambda _ (chdir "sources/pyside2-tools") #t)))))
(home-page "https://wiki.qt.io/Qt_for_Python")
(synopsis
- "Contains command line tools for PySide2")
+ "Command line tools for PySide2")
(description
- "Contains lupdate, rcc and uic tools for PySide2")
+ "Python-pyside-2-tools contains lupdate, rcc and uic tools for PySide2")
(license license:gpl2)))
(define-public libqglviewer
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke (cons "qmake" make-flags)))))))
(native-inputs
- (list qtbase-5 qttools))
+ (list qtbase-5 qttools-5))
(inputs
(list glu))
(home-page "http://libqglviewer.com")
(install-file file include-dir))
(find-files "." "\\.h$"))))))))
(inputs (list qtbase-5))
- (native-inputs (list qttools))
+ (native-inputs (list qttools-5))
(home-page "https://simsys.github.io")
(synopsis "Binary editor widget for Qt")
(description
also compatible with SGI and TGS Open Inventor, and the API is based on the API
of the InventorXt GUI component toolkit.")
(license license:bsd-3))))
+
+(define-public libdbusmenu-qt
+ (package
+ (name "libdbusmenu-qt")
+ (version "0.9.3+16.04.20160218-0ubuntu1")
+ (source
+ (origin
+ (method git-fetch)
+ ;; Download from github rather than launchpad because launchpad trunk
+ ;; tarball hash is not deterministic.
+ (uri (git-reference
+ (url "https://github.com/unity8-team/libdbusmenu-qt")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0b7ii1cvmpcyl79gqal9c3va9m55h055s4hx7fpxkhhqs9463ggg"))))
+ (build-system cmake-build-system)
+ (arguments
+ ;; XXX: Tests require a dbus session and some icons.
+ '(#:tests? #f))
+ (native-inputs
+ (list doxygen))
+ (inputs
+ (list qtbase-5))
+ (home-page "https://launchpad.net/libdbusmenu-qt")
+ (synopsis "Qt implementation of the DBusMenu spec")
+ (description "This library provides a Qt implementation of the DBusMenu
+protocol. The DBusMenu protocol makes it possible for applications to export
+and import their menus over DBus.")
+ (license license:lgpl2.1+)))
+
+(define-public kdsoap
+ (package
+ (name "kdsoap")
+ (version "2.0.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/KDAB/KDSoap/releases/download/"
+ "kdsoap-" version "/kdsoap-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1vh4rzb09kks1ilay1y60q7gf64gwzdwsca60hmx1xx69w8672fi"))))
+ (build-system qt-build-system)
+ (inputs `(("qtbase" ,qtbase-5)))
+ (arguments
+ '(#:configure-flags '("-DKDSoap_TESTS=true")
+ #:phases
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "ctest" "-E" ;; These tests try connect to the internet.
+ "(kdsoap-webcalls|kdsoap-webcalls_wsdl|kdsoap-test_calc)"))
+ #t)))))
+ (home-page "https://www.kdab.com/development-resources/qt-tools/kd-soap/")
+ (synopsis "Qt SOAP component")
+ (description "KD SOAP is a tool for creating client applications for web
+services using the XML based SOAP protocol and without the need for a dedicated
+web server.")
+ (license (list license:gpl2 license:gpl3))))
+
+;;;
+;;; Avoid adding new packages to the end of this file. To reduce the chances
+;;; of a merge conflict, place them above by existing packages with similar
+;;; functionality or similar names.
+;;;
HCoop / jackhill / guix / guix.git / blobdiff