From 52bb6ec4a025683604d07fc650394ae2d0a860cb Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Sat, 22 May 2021 05:33:17 -0500 Subject: [PATCH 34/37] gnu: qtwebengine: Remove variable. * gnu/packages/qt.scm (qtwebengine): Remove variable. * gnu/packages/qt.scm (qtwebengine-5): New variable. --- gnu/packages/audio.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/ebook.scm | 2 +- gnu/packages/education.scm | 4 ++-- gnu/packages/geo.scm | 4 ++-- gnu/packages/jami.scm | 2 +- gnu/packages/kde-pim.scm | 12 ++++++------ gnu/packages/kde.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++---- gnu/packages/sync.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/vpn.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/web.scm | 2 +- 15 files changed, 47 insertions(+), 25 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 67969dcd61..c542af8a7f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2886,7 +2886,7 @@ link REQUIRED)")) ("qtwebchannel" ,qtwebchannel-5) ("qtwebsockets" ,qtwebsockets-5))) (propagated-inputs ;to get native-search-path - `(("qtwebengine" ,qtwebengine))) + `(("qtwebengine" ,qtwebengine-5))) (home-page "https://github.com/supercollider/supercollider") (synopsis "Synthesis engine and programming language") (description "SuperCollider is a synthesis engine (@code{scsynth} or diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index ae8246f16e..d730c4c6ae 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -333,7 +333,7 @@ local system.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine) + ("qtwebengine" ,qtwebengine-5) ("qtquickcontrols" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras-5) ("xcb-util-keyms" ,xcb-util-keysyms))) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 565b800e96..a39eb0decc 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -197,7 +197,7 @@ with Microsoft Compiled HTML (CHM) files") ("python-regex" ,python-regex) ("python-speechd" ,speech-dispatcher) ("python-zeroconf" ,python-zeroconf) - ("qtwebengine" ,qtwebengine) + ("qtwebengine" ,qtwebengine-5) ("sqlite" ,sqlite))) (arguments `(;; Calibre is using setuptools by itself, but the setup.py is not diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 6600078b11..b36f2ee66d 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -786,7 +786,7 @@ adjust the level of difficulty.") (for-each (lambda (program) (wrap-program program `("QTWEBENGINEPROCESS_PATH" = - (,qtwebengineprocess)) + (,qtwebengine-5process)) `("PATH" prefix (,(string-append (assoc-ref inputs "mpv") "/bin"))) @@ -813,7 +813,7 @@ adjust the level of difficulty.") ("python-sip" ,python-sip) ;; `qtwebengine' is included in `pyqtwebengine', included here for easy ;; wrapping. - ("qtwebengine" ,qtwebengine))) + ("qtwebengine" ,qtwebengine-5))) (home-page "https://apps.ankiweb.net/") (synopsis "Powerful, intelligent flash cards") (description "Anki is a program which makes remembering things diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0ec6f3d2be..b18ac8d6fa 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1667,7 +1667,7 @@ using the dataset of topographical information collected by ("qtdeclarative" ,qtdeclarative-5) ("qtlocation" ,qtlocation-5) ("qtwebchannel" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine) + ("qtwebengine" ,qtwebengine-5) ("quazip" ,quazip) ("routino" ,routino) ("sqlite" ,sqlite) ; See wrap phase @@ -1701,7 +1701,7 @@ using the dataset of topographical information collected by (for-each (lambda (program) (wrap-program program `("QTWEBENGINEPROCESS_PATH" = - (,qtwebengineprocess)))) + (,qtwebengine-5process)))) (find-files bin ".*"))) #t))))) (synopsis "GPS mapping application") diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index d8d497f38b..e718f2b0bd 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -602,7 +602,7 @@ decentralized calling using P2P-DHT.") ("network-manager" ,network-manager) ("qrencode" ,qrencode) ("qtsvg" ,qtsvg-5) - ("qtwebengine" ,qtwebengine) + ("qtwebengine" ,qtwebengine-5) ("qtwebchannel" ,qtwebchannel-5) ("qtmultimedia" ,qtmultimedia-5) ("qtdeclarative" ,qtdeclarative-5) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index f0f06da67f..dc343fce73 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -744,7 +744,7 @@ for KDE PIM.") ("qtnetworkauth" ,qtnetworkauth-5) ("qtspeech" ,qtspeech-5) ("qtwebchannel" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine) + ("qtwebengine" ,qtwebengine-5) ("qtxmlpatterns" ,qtxmlpatterns-5))) (arguments ;; TODO: 5/45 tests fail for quite different reasons, even with @@ -1099,7 +1099,7 @@ and retrieving certificates from LDAP servers.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine) + ("qtwebengine" ,qtwebengine-5) ("sonnet" ,sonnet))) (arguments `(#:phases @@ -1358,7 +1358,7 @@ using a Qt/KMime C++ API.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine) + ("qtwebengine" ,qtwebengine-5) ("qtwebkit" ,qtwebkit) ("sonnet" ,sonnet))) (arguments @@ -1698,7 +1698,7 @@ Virtual Contact File}) files to the KPeople contact management library.") ("libxslt" ,libxslt) ("purpose" ,purpose) ("qtbase" ,qtbase-5) - ("qtwebengine" ,qtwebengine))) + ("qtwebengine" ,qtwebengine-5))) (arguments `(#:tests? #f)) ;; TODO tests hang (home-page "https://invent.kde.org/pim/pimcommon") @@ -1895,7 +1895,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine))) + ("qtwebengine" ,qtwebengine-5))) (arguments `(#:tests? #f)) ;; TODO 6/48 tests fail (home-page "https://invent.kde.org/pim/libkgapi") @@ -1981,7 +1981,7 @@ KDE using certificate-based crypto.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine))) + ("qtwebengine" ,qtwebengine-5))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 92f83baf43..23b9998a1b 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -205,7 +205,7 @@ This package contains GUI widgets for baloo.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine) + ("qtwebengine" ,qtwebengine-5) ("syndication" ,syndication))) (home-page "https://apps.kde.org/en/akregator") (synopsis "KDE Feed Reader") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 54e3ba5a83..66cd0400ec 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2726,7 +2726,7 @@ as phones, embedded computers or microcontrollers.") ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel-5))) (propagated-inputs - `(("qtwebengine" ,qtwebengine))) + `(("qtwebengine" ,qtwebengine-5))) (home-page "https://movim.eu/") (synopsis "Desktop Application for Movim") (description diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 85e3f6adf0..cf44a55af6 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1496,6 +1496,28 @@ ECMAScript and Qt."))) applications scriptable. This module provides a set of extra components that can be used to build complete interfaces in Qt Quick."))) +(define-public qtquickcontrols2 + (package (inherit qtsvg) + (name "qtquickcontrols2") + (version "6.1.0") + (source (origin + (method url-fetch) + (uri (qt5-urls "qtquickcontrols2" version)) + (sha256 + (base32 + "0nbxjp1plh6qpbb6cmkz6nyh2a77hmni2shjbc4rzxadwxwiskvq")))) + (arguments + (substitute-keyword-arguments (package-arguments qtsvg) + ((#:tests? _ #f) #f))) ; TODO: Enable the tests + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative))) + (synopsis "Qt Quick Controls 2 and other Quick 2 modules") + (description "The Qt Quick Controls 2 module contains the Qt Labs Platform +module that provides platform integration: native dialogs, menus and menu bars, +and tray icons. It falls back to Qt Widgets when a native implementation is +not available."))) + (define-public qtquickcontrols2-5 (package (inherit qtsvg-5) (name "qtquickcontrols2-5") @@ -1887,15 +1909,15 @@ using the Enchant spell-checking library.") ;; 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") + (name "qtwebengine-5") (version (package-version qtbase)) (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt5-urls "qtwebengine" version)) (sha256 (base32 "1q4idxdm81sx102xc12ixj0xpfx52d6vwvs3jpapnkyq8c7cmby8")) @@ -2462,7 +2484,7 @@ contain over 620 classes.") ("qtsvg" ,qtsvg-5) ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine))) + ("qtwebengine" ,qtwebengine-5))) (arguments `(#:modules ((srfi srfi-1) ((guix build python-build-system) #:select (python-version)) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 112f5ee285..9f7864bccb 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -206,7 +206,7 @@ ("xdg-utils" ,xdg-utils) ("zlib" ,zlib))) (propagated-inputs - `(("qtwebengine" ,qtwebengine))) + `(("qtwebengine" ,qtwebengine-5))) (synopsis "Desktop sync client for Nextcloud") (description "Nextcloud-Desktop is a tool to synchronize files from Nextcloud Server with your computer.") diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 00e761f055..7b21b62ac6 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -624,7 +624,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. ("qtsvg" ,qtsvg-5) ("qtwebchannel" ,qtwebchannel-5))) (propagated-inputs ; To get native-search-path - `(("qtwebengine" ,qtwebengine))) + `(("qtwebengine" ,qtwebengine-5))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index a952e3f0db..4532b58af5 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -340,7 +340,7 @@ and probably others.") ("python-pyxdg" ,python-pyxdg) ("python-structlog" ,python-structlog) ("python-toml" ,python-toml) - ("qtwebengine" ,qtwebengine))) + ("qtwebengine" ,qtwebengine-5))) (native-inputs `(("python-pytest" ,python-pytest) ("python-setuptools-scm" ,python-setuptools-scm))) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index edf9068618..02bf12cfe3 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -510,7 +510,7 @@ interface.") ("python-pyqt" ,python-pyqt) ;; While qtwebengine is provided by python-pyqtwebengine, it's ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. - ("qtwebengine" ,qtwebengine))) + ("qtwebengine" ,qtwebengine-5))) (arguments `(;; FIXME: With the existance of qtwebengine, tests can now run. But ;; they are still disabled because test phase hangs. It's not readily diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index d3572999c7..ccb1a1b610 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8155,7 +8155,7 @@ It contains the code shared by all Kiwix ports.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine) + ("qtwebengine" ,qtwebengine-5) ("xapian" ,xapian) ("zlib" ,zlib) ("zstd" ,zstd "lib"))) -- 2.31.1