From 663f12ea2420227e50aff1485cbf0731a46ca021 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 12:13:12 -0400 Subject: gnu: qtbase: Patch /bin/pwd in executable scripts. * gnu/packages/qt.scm (qtbase)[phases]{patch-paths}: Patch /bin/pwd. [inputs]: Add coreutils-minimal. --- gnu/packages/qt.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ae683174927..fd262648922 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -622,6 +622,9 @@ developers using C++ or QML, a CSS & JavaScript like language.") (delete 'patch-xdg-open) (add-after 'patch-paths 'patch-more-paths (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "bin" "\\.in$") + (("/bin/pwd") + (search-input-file inputs "bin/pwd"))) (substitute* "src/gui/platform/unix/qgenericunixservices.cpp" (("\"xdg-open\"") (format #f "~s" (search-input-file inputs "bin/xdg-open")))) @@ -687,7 +690,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") ninja wayland-protocols))) (inputs (modify-inputs (package-inputs qtbase-5) - (prepend bash-minimal libxcb md4c) + (prepend bash-minimal coreutils-minimal libxcb md4c) (replace "gtk+" gtk) ;use latest gtk (replace "postgresql" postgresql))) ;use latest postgresql (native-search-paths -- cgit v1.2.3 From d48c98cd129b86ae7d9307c3bb8d3db99bed24e7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 18:52:17 -0400 Subject: gnu: qtbase: Honor CMAKE_PREFIX_PATH. * gnu/packages/qt.scm (qtbase)[phases]{honor-CMAKE_PREFIX_PATH}: New phase. --- gnu/packages/qt.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fd262648922..c2e509fcdfd 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -618,6 +618,27 @@ developers using C++ or QML, a CSS & JavaScript like language.") "-DFEATURE_mips_dspr2=OFF"))) ((#:phases phases) #~(modify-phases #$phases + (add-after 'unpack 'honor-CMAKE_PREFIX_PATH + (lambda _ + ;; The configuration files for other Qt packages are searched + ;; through a call to "find_package" in Qt5Config.cmake, which + ;; disables the use of CMAKE_PREFIX_PATH via the parameter + ;; "NO_DEFAULT_PATH". Re-enable it so that the different + ;; components can be installed in different places. + (substitute* (find-files "." "\\.cmake(\\.in)?$") + (("\\bNO_DEFAULT_PATH\\b") "")) + ;; Because Qt goes against the grain of CMake and set + ;; NO_DEFAULT_PATH, it needs to invent yet another variable + ;; to do what CMAKE_PREFIX_PATH could have done: + ;; QT_ADDITIONAL_PACKAGES_PREFIX_PATH. Since we patch out + ;; the NO_DEFAULT_PATH, we can set the default value of + ;; QT_ADDITIONAL_PACKAGES_PREFIX_PATH to that of + ;; CMAKE_PREFIX_PATH to ensure tools such as + ;; 'qmlimportscanner' from qtdeclarative work out of the + ;; box. + (substitute* "cmake/QtConfig.cmake.in" + (("(set\\(QT_ADDITIONAL_PACKAGES_PREFIX_PATH )\"\"" _ head) + (string-append head "\"$ENV{CMAKE_PREFIX_PATH}\""))))) (delete 'patch-bin-sh) (delete 'patch-xdg-open) (add-after 'patch-paths 'patch-more-paths -- cgit v1.2.3 From de6f155426b7f1c8b38b8a1f92073eff3a04ecdc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 25 Jul 2022 15:51:56 -0400 Subject: gnu: qtbase: Enable test suite. * gnu/packages/qt.scm (qtbase)[tests?]: Delete argument. [configure-flags]: Add "-DQT_BUILD_TESTS=ON". [phases]{check}: Move after the patch-prl-files phase and override. [native-inputs]: Add xvfb-run. --- gnu/packages/qt.scm | 112 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 106 insertions(+), 6 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c2e509fcdfd..001e6286fee 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -570,14 +570,10 @@ developers using C++ or QML, a CSS & JavaScript like language.") (build-system cmake-build-system) (arguments (substitute-keyword-arguments (package-arguments qtbase-5) - ;; XXX: There are many test failures, because the test suite - ;; requires a real X server (a virtual one such as Xvfb is not - ;; enough) or a functional network. It's also quite expensive to - ;; build and run. - ((#:tests? _ #f) #f) ((#:configure-flags _ ''()) `(let ((out (assoc-ref %outputs "out"))) (list "-GNinja" ;the build fails otherwise + "-DQT_BUILD_TESTS=ON" (string-append "-DINSTALL_ARCHDATADIR=" out "/lib/qt6") (string-append "-DINSTALL_DATADIR=" out "/share/qt6") (string-append "-DINSTALL_DOCDIR=" out "/share/doc/qt6") @@ -664,6 +660,108 @@ developers using C++ or QML, a CSS & JavaScript like language.") (if parallel-build? `("--parallel" ,(number->string (parallel-job-count))) '())))) + (delete 'check) ;move after patch-prl-files + (add-after 'patch-prl-files 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (when tests? + ;; The tests expect to find the modules provided by this + ;; package; extend the environment variables needed to do so. + (setenv "CMAKE_PREFIX_PATH" + (string-append #$output + ":" (getenv "CMAKE_PREFIX_PATH"))) + (setenv "QMAKEPATH" (string-append #$output "/lib/qt6")) + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml")) + (setenv "QT_PLUGIN_PATH" + (string-append #$output "/lib/qt6/plugins")) + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; Skip tests known to fail on GNU/Linux, in a CI context or + ;; due to bitness (see: https://code.qt.io/cgit/qt/qtbase.git + ;; /tree/src/testlib/qtestblacklist.cpp). + (setenv "QTEST_ENVIRONMENT" "linux ci 32bit") + (setenv "HOME" "/tmp") ;some tests require a writable HOME + (invoke + "xvfb-run" "ctest" "--output-on-failure" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + "-E" ;disable problematic tests + (string-append + "(" + (string-join + (list + ;; The 'tst_moc' test fails with "'fi.exists()' returned FALSE". + "tst_moc" + ;; The 'test_rcc' test fails on a comparison: + ;; <<<<<< actual + ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x3,0xe8, + ;; ====== + ;; 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, + ;; >>>>>> expected + "tst_rcc" + ;; The 'tst_qtemporarydir' and 'tst_qtemporaryfile' + ;; tests depend on '/home' not being writable. + "tst_qtemporarydir" + "tst_qtemporaryfile" + ;; The 'tst_qdir' compares two directories which are + ;; unexpectedly different when inside the build + ;; container. + "tst_qdir" + ;; This checks the last modified time of '/', and fails + ;; because Epoch 0 is considered to be invalid. + "tst_qresourceengine" + ;; The 'tst_qfilesystemwatcher' installs a watcher on + ;; '/home', which doesn't exist in the build container. + "tst_qfilesystemwatcher" + ;; The 'mockplugins' test fail following error: "Unknown + ;; platform linux-g++", and the other plugin tests + ;; depend on it. + "mockplugins" + "test_plugin_flavor.*" + ;; The 'test_import_plugins' fails with "Could NOT find + ;; Qt6MockPlugins1". + "test_import_plugins" + ;; The 'tst_QTimeZone::systemZone' validates the + ;; currently set timezone and fails. + "tst_qtimezone" + ;; The 'tst_qdatetime' fails with: + ;; FAIL! : tst_QDateTime::offsetFromUtc() Compared values are not the same + ;; Actual (dt5.offsetFromUtc()): 0 + ;; Expected (46800) : 46800 + "tst_qdatetime" + ;; The 'tst_QSettings::fromFile' assumes the data + ;; location to be relative to the root directory and + ;; fails. + "tst_qsettings" + ;; The 'tst_qaddpreroutine', + ;; 'test_generating_cpp_exports' and + ;; 'test_static_resources' tests fail with: "Unknown + ;; platform linux-g++. + "tst_qaddpreroutine" + "test_generating_cpp_exports" + "test_static_resources" + ;; The 'tst_qfile' fails since there is no /home in the + ;; build container. + "tst_qfile" + ;; The 'tst_QGlyphRun::mixedScripts' test fails with: + ;; Actual (glyphRuns.size()): 1 + ;; Expected (2) : 2 + "tst_qglyphrun" + ;; The 'tst_qx11info' test fails with "Internal error: + ;; QPA plugin doesn't implement generatePeekerId", + ;; likely requires a real display. + "tst_qx11info" + ;; The 'tst_qgraphicswidget' test fails because "This + ;; plugin does not support propagateSizeHints". + "tst_qgraphicswidget" + ;; The 'tst_qdnslookup' test requires networking. + "tst_qdnslookup" + ;; The 'tst_qcompleter' and 'tst_QFiledialog::completer' + ;; attempt to complete paths they assume exist, such as + ;; "/home", "/etc" or "/root" and fail. + "tst_qcompleter" + "tst_qfiledialog") "|") + ")"))))) (replace 'install (lambda _ (invoke "cmake" "--install" "."))) @@ -708,7 +806,9 @@ developers using C++ or QML, a CSS & JavaScript like language.") (native-inputs (modify-inputs (package-native-inputs qtbase-5) (prepend gtk ;for GTK theme support - ninja wayland-protocols))) + ninja + wayland-protocols + xvfb-run))) (inputs (modify-inputs (package-inputs qtbase-5) (prepend bash-minimal coreutils-minimal libxcb md4c) -- cgit v1.2.3 From 4af9984a4e77d42cd063de590c164044599b4062 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 25 Jul 2022 20:57:09 -0400 Subject: gnu: qtbase: Revert to gtk+ (3) instead of gtk (4). This revert the upgrade from GTK 3 to 4 in 8d7fdbe261e32a63df8c47f06b1a43095b6084c7. Qt doesn't yet support GTK 4. * gnu/packages/qt.scm (qtbase)[native-inputs]: Remove gtk. [inputs]: Do not replace gtk+ by gtk. --- gnu/packages/qt.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 001e6286fee..9cb6ae5893b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -805,14 +805,12 @@ developers using C++ or QML, a CSS & JavaScript like language.") (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))))))))) (native-inputs (modify-inputs (package-native-inputs qtbase-5) - (prepend gtk ;for GTK theme support - ninja + (prepend ninja wayland-protocols xvfb-run))) (inputs (modify-inputs (package-inputs qtbase-5) (prepend bash-minimal coreutils-minimal libxcb md4c) - (replace "gtk+" gtk) ;use latest gtk (replace "postgresql" postgresql))) ;use latest postgresql (native-search-paths (list (search-path-specification -- cgit v1.2.3 From 1ef04fb2288dade3ad2883026ae286a68ef13a1e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 01:11:46 -0400 Subject: gnu: qtsvg: Rename variable to qtsvg-5. This is in preparation of the qtsvg update to version 6. This change was automated via the following command: git grep -l '\bqtsvg\b' | xargs sed 's/qtsvg/qtsvg-5/g' -i --- gnu/packages/admin.scm | 4 +- gnu/packages/animation.scm | 2 +- gnu/packages/audio.scm | 5 +- gnu/packages/backup.scm | 2 +- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/bittorrent.scm | 2 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/ebook.scm | 2 +- gnu/packages/education.scm | 4 +- gnu/packages/electronics.scm | 2 +- gnu/packages/engineering.scm | 16 +++--- gnu/packages/finance.scm | 4 +- gnu/packages/game-development.scm | 2 +- gnu/packages/games.scm | 56 +++++++++--------- gnu/packages/geo.scm | 4 +- gnu/packages/gps.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/image-processing.scm | 2 +- gnu/packages/image-viewers.scm | 6 +- gnu/packages/image.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 12 ++-- gnu/packages/kde-multimedia.scm | 6 +- gnu/packages/kde-systemtools.scm | 2 +- gnu/packages/kde.scm | 18 +++--- gnu/packages/linphone.scm | 2 +- gnu/packages/lxqt.scm | 40 ++++++------- gnu/packages/maths.scm | 4 +- gnu/packages/messaging.scm | 12 ++-- gnu/packages/mpd.scm | 2 +- gnu/packages/music.scm | 22 +++---- gnu/packages/networking.scm | 2 +- gnu/packages/orange.scm | 4 +- gnu/packages/password-utils.scm | 4 +- gnu/packages/pdf.scm | 2 +- gnu/packages/printers.scm | 2 +- gnu/packages/qt.scm | 118 +++++++++++++++++++------------------- gnu/packages/radio.scm | 4 +- gnu/packages/robotics.scm | 2 +- gnu/packages/security-token.scm | 4 +- gnu/packages/sync.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/telephony.scm | 2 +- gnu/packages/tex.scm | 2 +- gnu/packages/text-editors.scm | 8 +-- gnu/packages/video.scm | 10 ++-- gnu/packages/vpn.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 50 files changed, 210 insertions(+), 211 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e66277ea92e..571271b5aba 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2137,7 +2137,7 @@ command.") (inherit wpa-supplicant) (name "wpa-supplicant-gui") (inputs (modify-inputs (package-inputs wpa-supplicant) - (prepend qtbase-5 qtsvg))) + (prepend qtbase-5 qtsvg-5))) (native-inputs ;; For icons. (modify-inputs (package-native-inputs wpa-supplicant) @@ -2157,7 +2157,7 @@ command.") (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (qt '("qtbase" "qtsvg"))) + (qt '("qtbase" "qtsvg-5"))) (install-file "wpa_gui" (string-append out "/bin")) (install-file "wpa_gui.desktop" (string-append out "/share/applications")) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index c2817725634..89079ceb6ed 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -474,7 +474,7 @@ waveform until they line up with the proper sounds.") "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg)) + (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg-5)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index d70f1e06b46..9c246cddc58 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3232,7 +3232,7 @@ link REQUIRED)")))))) yaml-cpp qtbase-5 qtdeclarative - qtsvg + qtsvg-5 qtwebchannel qtwebsockets)) (propagated-inputs ;to get native-search-path @@ -5852,9 +5852,8 @@ and DSD streams.") `(#:tests? #f)) ;; no tests (inputs (list alsa-lib pipewire-0.3 - ;; qtsvg is still on version 5; use qtbase-5 to match qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config)) (synopsis "PipeWire graph manager") (description diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 2c5fd4abd90..06a8ac59eb2 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1339,7 +1339,7 @@ borgmatic is powered by borg.") python-pyqt-without-qtwebkit python-secretstorage ;; This is included so that the qt-wrap phase picks it up. - qtsvg)) + qtsvg-5)) (home-page "https://github.com/borgbase/vorta") (synopsis "Graphical backup client based on BorgBackup") (description "Vorta is a graphical backup client based on the Borg backup diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 95e91b47f31..e9f7ab9e981 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11264,7 +11264,7 @@ Thus the per-base error rate is similar to the raw input reads.") (install-file "Bandage" (string-append out "/bin")) #t)))))) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (native-inputs (list imagemagick)) (home-page "https://rrwick.github.io/Bandage/") diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index bc0364d87cc..fe235d4b3b7 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -477,7 +477,7 @@ desktops.") ("openssl" ,openssl) ("python" ,python-wrapper) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("zlib" ,zlib))) (home-page "https://www.qbittorrent.org/") (synopsis "Graphical BitTorrent client") diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 64375b8cfcb..71d8fae7f11 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -93,7 +93,7 @@ qtgraphicaleffects qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 shadow wayland)) (arguments diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 339a72ef915..5d864da2815 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -293,7 +293,7 @@ sip-include-dirs = [\"" (setenv "CI" "true") ;; The Qt test complains about being unable to load all image ;; plugins, and I notice the available plugins list it shows - ;; lacks 'svg'. Adding qtsvg doesn't fix it, so I'm not sure how + ;; lacks 'svg'. Adding qtsvg-5 doesn't fix it, so I'm not sure how ;; to fix it. TODO: Fix test and remove this. (setenv "SKIP_QT_BUILD_TEST" "true"))) (add-after 'install 'install-rapydscript diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 9e5a17a6ae3..0e3c8feaf99 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -185,7 +185,7 @@ of categories with some of the activities available in that category. qtmultimedia qtquickcontrols qtsensors - qtsvg + qtsvg-5 qtxmlpatterns)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") @@ -560,7 +560,7 @@ specialized device.") qtbase-5 qtdeclarative qtmultimedia - qtsvg + qtsvg-5 qtwebchannel qtwebengine qtxmlpatterns diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 70d960aaab4..342294de130 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -381,7 +381,7 @@ such as: libsigrok libsigrokdecode qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://www.sigrok.org/wiki/PulseView") (synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok") (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index bf32187dde8..8037ccb5652 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -213,7 +213,7 @@ (copy-recursively "unix/resources" share)) #t))))) (inputs - (list boost muparser freetype qtbase-5 qtsvg)) + (list boost muparser freetype qtbase-5 qtsvg-5)) (native-inputs (list pkg-config which)) (home-page "https://librecad.org/") @@ -710,7 +710,7 @@ multipole-accelerated algorithm.") (inputs `(("qtbase" ,qtbase-5) ("qtserialport" ,qtserialport) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("libgit2" ,libgit2) ("boost" ,boost) ("zlib" ,zlib) @@ -764,7 +764,7 @@ ready for production.") (native-inputs (list pkg-config qttools)) (inputs - (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg sqlite)) + (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg-5 sqlite)) (home-page "https://qelectrotech.org/") (synopsis "CAD/CAE editor focusing on schematics drawing features") (description "QElectroTech, or QET in short, is a desktop application to @@ -1246,7 +1246,7 @@ the 'showing the effect of'-style of operation.") mpfr openssl qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://github.com/ccoors/Valeronoi") (synopsis "WiFi mapping companion application for Valetudo") (description @@ -2118,7 +2118,7 @@ parallel computing platforms. It also supports serial execution.") (base32 "0smp1p7wnrj0vh4rmz1cr2krfawc2lzx0pbzmgyay7xdp6jxympr")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtsvg zlib)) + (list qtbase-5 qtsvg-5 zlib)) (native-inputs (list qttools ; for lrelease unzip)) @@ -2278,7 +2278,7 @@ simulation.") (list pkg-config)) (inputs (list qtbase-5 - qtsvg + qtsvg-5 openssl ;; Depends on radare2 4.5.1 officially, builds and works fine with ;; radare2 5.0.0 but fails to build with radare2 5.1.1. @@ -2491,7 +2491,7 @@ comments."))) python-wrapper qtbase-5 qtdeclarative - qtsvg + qtsvg-5 qtwebchannel qtwebengine qtx11extras @@ -3426,7 +3426,7 @@ compiled translations. Prebuilt Firmware files are removed.") qtgraphicaleffects qtquickcontrols qtquickcontrols2 - qtsvg)) + qtsvg-5)) (arguments `(;; FIXME: tests are disabled, because they cause an infinite loop. #:tests? #f diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index adceb98f83f..f59fb56f7a4 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -651,7 +651,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") python-requests python-stem python-trezor - qtsvg + qtsvg-5 zlib)) (home-page "https://electroncash.org/") (synopsis "Bitcoin Cash wallet") @@ -807,7 +807,7 @@ the Monero command line client and daemon.") ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2",qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments `(#:tests? #f ; No tests diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 30512dcc80d..f9e8baffd41 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -520,7 +520,7 @@ formats such as PNG.") "05gczsywkk45bh0z1vv8l6cmrlncc2qj8agavj5ryxpnxkzy69r1")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative qtsvg zlib)) + (list qtbase-5 qtdeclarative qtsvg-5 zlib)) (native-inputs (list qttools)) (arguments diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d55a2ee867a..cc246551a31 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -994,7 +994,7 @@ want what you have.") (list protobuf qtbase-5 qtmultimedia - qtsvg + qtsvg-5 qttools qtwebsockets xz @@ -7199,7 +7199,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available. ;; with multiple "QPainter:: ... Painter not active" warnings. #:tests? #f)) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (native-inputs `(("cmake" ,cmake-minimal) ("gettext-minimal" ,gettext-minimal) @@ -9271,7 +9271,7 @@ and also provides the base for the FlightGear Flight Simulator.") plib qtbase-5 qtdeclarative - qtsvg + qtsvg-5 simgear speexdsp sqlite @@ -10153,7 +10153,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") (native-inputs (list pkg-config)) (inputs - (list qtbase-5 qtmultimedia qtsvg)) + (list qtbase-5 qtmultimedia qtsvg-5)) (arguments '(#:phases (modify-phases %standard-phases @@ -10249,7 +10249,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") qtbase-5 qtmultimedia qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Stamp drawing toy") (description "KTuberling is a drawing toy intended for small children and @@ -10295,7 +10295,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Number logic game") (description "Picmi is a number logic game in which cells in a grid have @@ -10376,7 +10376,7 @@ This package is part of the KDE games module.") ki18n kwidgetsaddons qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Shared library for kmahjongg and kshisen") (description "Shared library and common files for kmahjongg, kshisen and @@ -10409,7 +10409,7 @@ other Mah Jongg like games.") libkmahjongg qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Tile laying patience") (description "In KMahjongg the tiles are scrambled and staked on top of @@ -10506,7 +10506,7 @@ This package is part of the KDE games module.") python-pyqt python-zope-interface qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Classical Mah Jongg game for 4 players") (description "Kajongg is the ancient Chinese board game for 4 players. @@ -10623,7 +10623,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Simple turn-based strategy game") (description "Konquest is the KDE version of Gnu-Lactic Konquest. Players @@ -10662,7 +10662,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Jezzball arcade game") (description "KBounce is a single player arcade game with the elements of @@ -10700,7 +10700,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Single player falling blocks puzzle game") (description "KBlocks is the classic Tetris-like falling blocks game. @@ -10743,7 +10743,7 @@ This package is part of the KDE games module.") glu qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Sudoku puzzle game and solver") (description "KSudoku is a Sudoku game and solver, supporting a range of @@ -10920,7 +10920,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Place 4 pieces in a row") (description "KFourInLine is a board game for two players based on the @@ -10959,7 +10959,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Find atoms in a grid by shooting electrons") (description "KBlackbox is a game of hide and seek played on a grid of @@ -11082,7 +11082,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Bomberman clone") (description "Granatier is a clone of the classic Bomberman game, @@ -11118,7 +11118,7 @@ This package is part of the KDE games module.") qca qtbase-5 qtdeclarative - qtsvg + qtsvg-5 zlib)) (home-page "https://games.kde.org/") (synopsis "Computerized version of the well known strategy board game @@ -11179,7 +11179,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg + qtsvg-5 shared-mime-info)) (home-page "https://games.kde.org/") (synopsis "Jigsaw puzzle game") @@ -11259,7 +11259,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Go board game") (description "Kigo is an open-source implementation of the popular Go @@ -11304,7 +11304,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Game based on Rubik's Cube") (description "Kubrick is a game based on the Rubik's Cube puzzle. @@ -11344,7 +11344,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Lieutnant Skat card game") (description "Lieutnant Skat (from German \"Offiziersskat\") is a fun and @@ -11382,7 +11382,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Pac-Man clone") (description "Kapman is a clone of the well known game Pac-Man. @@ -11421,7 +11421,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Two player game with shooting spaceships flying around a sun") (description "KSpaceduel is a space battle game for one or two players, @@ -11454,7 +11454,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Classic pen and paper game: five in a line") (description "Bovo is a Gomoku (from Japanese 五目並べ - lit. \"five @@ -11534,7 +11534,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Snake race played against the computer") (description "KSnakeDuel is a fast action game where you steer a snake @@ -11650,7 +11650,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Old reversi board game, also known as othello") (description "KReversi is a simple one player strategy game played @@ -11727,7 +11727,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Simple tactical game for number-crunchers") (description "KJumpingcube is a simple tactical game for one or two @@ -11885,7 +11885,7 @@ and chess engines.") (native-inputs (list qttools)) (inputs - (list qtbase-5 qtmultimedia qtspeech qtsvg zlib)) + (list qtbase-5 qtmultimedia qtspeech qtsvg-5 zlib)) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a05b86219ec..0c98d578213 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2622,7 +2622,7 @@ growing set of geoscientific methods.") qtkeychain qtlocation qtserialport - qtsvg + qtsvg-5 qwt ;;("saga" ,saga) sqlite)) @@ -2764,7 +2764,7 @@ using third-party geocoders and other data sources.") python-3 python-numpy qtbase-5 - qtsvg + qtsvg-5 qtxmlpatterns qwt zlib)) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 853361bd619..b117ff4222f 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -194,7 +194,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (string-append "PREFIX=" (assoc-ref outputs "out")))))))) (inputs - (list qtbase-5 qtlocation qtsvg)) + (list qtbase-5 qtlocation qtsvg-5)) (native-inputs (list qttools)) (home-page "https://www.gpxsee.org") diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index c193be1efb2..915d9d79e1e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1966,7 +1966,7 @@ Automated palette selection is supported.") qtbase-5 qtkeychain qtmultimedia - qtsvg + qtsvg-5 qtx11extras)) (home-page "https://drawpile.net") (synopsis "Collaborative drawing program") diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index bcb1d7a2f60..98d30d54ed8 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1231,7 +1231,7 @@ substituted by matching images.") ("libpng" ,libpng) ("libtiff" ,libtiff) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("zlib" ,zlib))) (arguments `(#:phases diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8d4d2351c3a..2d3b8aa46f5 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -520,7 +520,7 @@ It supports JPEG, PNG and GIF formats.") (inputs (list qtbase-5 qtdeclarative - qtsvg + qtsvg-5 boost eigen ;; gtest @@ -673,7 +673,7 @@ For PDF support, install the @emph{mupdf} package.") (native-inputs (list qttools)) (inputs - (list qtbase-5 qtimageformats qtsvg)) + (list qtbase-5 qtimageformats qtsvg-5)) (home-page "https://interversehq.com/qview/") (synopsis "Convenient and minimal image viewer") (description "qView is a Qt image viewer designed with visually @@ -921,7 +921,7 @@ archives.") ("python" ,python-wrapper) ("quazip" ,quazip-0) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg-5" ,qtsvg-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 7afe96d1493..90554143d01 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1830,7 +1830,7 @@ parsing, viewing, modifying, and saving this metadata.") (native-inputs (list qttools)) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (arguments `(#:tests? #f)) ;no tests (home-page "https://github.com/flameshot-org/flameshot") diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 5fc69cab3bf..e7ace9e6c46 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -136,7 +136,7 @@ qtbase-5 qtmultimedia qtscript - qtsvg + qtsvg-5 snorenotify sonnet zlib)) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index b8210bcc1e0..726221b1e5f 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -604,7 +604,7 @@ decentralized calling using P2P-DHT.") libnotify network-manager qrencode - qtsvg + qtsvg-5 qtwebengine qtwebchannel qtmultimedia diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 9f957692cb2..0f1799edb20 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -712,7 +712,7 @@ infrastructure.") graphviz kiconthemes kparts - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config extra-cmake-modules kdoctools)) (home-page "https://apps.kde.org/en/kgraphviewer") @@ -877,7 +877,7 @@ or user activity.") qtbase-5 qtdeclarative qtquickcontrols2 - qtsvg + qtsvg-5 ;; Run-time dependency qtgraphicaleffects)) (home-page "https://community.kde.org/Frameworks") @@ -2546,7 +2546,7 @@ window does not need focus for them to be activated.") kitemviews kwidgetsaddons qtbase-5 - qtsvg)) + qtsvg-5)) (arguments `(#:phases (modify-phases %standard-phases @@ -3339,7 +3339,7 @@ setUrl, setUserAgent and call.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid))) (arguments @@ -3548,7 +3548,7 @@ workspace.") libsm networkmanager-qt openssl - qtsvg + qtsvg-5 qttools qtx11extras)) ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and @@ -3700,7 +3700,7 @@ support.") (native-inputs (list extra-cmake-modules kdoctools qttools)) (inputs - (list ki18n kjs qtbase-5 qtsvg)) + (list ki18n kjs qtbase-5 qtsvg-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 embedded Javascript engine for Qt") (description "KJSEmbed provides a method of binding Javascript objects to diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 265dcef6252..5b0d8414453 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -177,7 +177,7 @@ This package is part of the KDE multimedia module.") qtmultimedia qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 qtx11extras ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt vlc)) @@ -269,7 +269,7 @@ This package is part of the KDE multimedia module.") phonon phonon-backend-gstreamer qtbase-5 - qtsvg + qtsvg-5 taglib)) (home-page "https://kde.org/applications/multimedia/org.kde.juk") (synopsis "Music jukebox / music player") @@ -625,7 +625,7 @@ This package is part of the KDE multimedia module.") phonon qtbase-5 cairo - qtsvg + qtsvg-5 qtx11extras xcb-util xcb-util-cursor diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 3fab9089f3d..4e6cd1d6e14 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -346,7 +346,7 @@ This package is part of the KDE administration module.") kwidgetsaddons kwindowsystem qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (home-page "https://www.kde.org/applications/system/yakuake/") (synopsis "Quad-style terminal emulator for KDE") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index b56b63e7848..2dfd1348e7b 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -292,7 +292,7 @@ browser for easy news reading.") qtquickcontrols qtquickcontrols2 qtscript - qtsvg + qtsvg-5 shared-mime-info)) (home-page "https://kdenlive.org") (synopsis "Non-linear video editor") @@ -438,7 +438,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") (native-inputs (list extra-cmake-modules qttools)) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (home-page "https://invent.kde.org/graphics/kdiagram") (synopsis "Libraries for creating business diagrams") (description "This package provides libraries for integrating business @@ -541,7 +541,7 @@ expression library, that is used in Krita.") qtbase-5 qtdeclarative qtmultimedia - qtsvg + qtsvg-5 qtx11extras quazip-0 zlib)) @@ -577,7 +577,7 @@ features include brush stabilizers, brush engines and wrap-around mode.") kio ki18n qtbase-5 - qtsvg + qtsvg-5 qtxmlpatterns)) (home-page "https://apps.kde.org/en/massif-visualizer") (synopsis "Visualize massif data generated by Valgrind") @@ -828,7 +828,7 @@ communicate with each other. Here's a few things KDE Connect can do: kwidgetsaddons kxmlgui qtbase-5 - qtsvg + qtsvg-5 shared-mime-info ;; Optional. cfitsio @@ -978,7 +978,7 @@ Python, PHP, and Perl.") openal qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Runtime library for kdegames") (description "Runtime library for kdegames") @@ -1027,7 +1027,7 @@ Python, PHP, and Perl.") qtdeclarative qtlocation qtserialport - qtsvg + qtsvg-5 qtwebchannel qtwebengine shapelib @@ -1095,7 +1095,7 @@ creating routes by drag and drop and more.") poppler-qt5 qca qtdeclarative - qtsvg + qtsvg-5 threadweaver kcrash kjs)) @@ -1225,7 +1225,7 @@ or Bonjour by other projects).") ;;("phpunit" ,phpunit) )) (inputs - (list qtbase-5 qtcharts qtdeclarative qtsvg)) + (list qtbase-5 qtcharts qtdeclarative qtsvg-5)) (arguments `(#:tests? #f)) ;; 4/17 fail (home-page "https://api.kde.org/frameworks/kuserfeedback/html/") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 504b4945637..0beac88d32f 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -856,7 +856,7 @@ and video calls or instant messaging capabilities to an application.") qtgraphicaleffects qtquickcontrols qtquickcontrols2 - qtsvg)) + qtsvg-5)) (synopsis "Desktop client for the Linphone SIP softphone") (description "Linphone is a SIP softphone for voice and video over IP calling (VoIP) and instant messaging. Amongst its features are: diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index a0a3a0f15b0..9ff1de942cb 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -187,7 +187,7 @@ itself as well as other components maintained by the LXQt project.") #t))))) (propagated-inputs ;; required by Qt5XdgIconLoader.pc - (list glib qtbase-5 qtsvg)) + (list glib qtbase-5 qtsvg-5)) (native-inputs (list lxqt-build-tools pkg-config)) (home-page "https://github.com/lxqt/libqtxdg") @@ -231,7 +231,7 @@ in Qt.") libqtxdg libxscrnsaver polkit-qt - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -284,7 +284,7 @@ and memory usage or network traffic.") liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -326,7 +326,7 @@ LXQt and the system it's running on.") liblxqt libqtxdg polkit-qt - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -375,7 +375,7 @@ the operating system LXQt is running on.") libxcursor libxi qtbase-5 - qtsvg + qtsvg-5 qtx11extras solid xf86-input-libinput @@ -443,7 +443,7 @@ configuration of both LXQt and the underlying operating system.") liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list pkg-config qttools lxqt-build-tools)) @@ -489,7 +489,7 @@ as a whole and are not limited to distinct applications.") liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -534,7 +534,7 @@ according to the Desktop Notifications Specification.") liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -584,7 +584,7 @@ of other programs.") pcre pulseaudio qtbase-5 - qtsvg + qtsvg-5 qtx11extras solid xcb-util @@ -646,7 +646,7 @@ of other programs.") pcre polkit-qt qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list pkg-config polkit lxqt-build-tools qttools)) @@ -692,7 +692,7 @@ LXQt.") libqtxdg lxqt-globalkeys qtbase-5 - qtsvg + qtsvg-5 qtx11extras solid)) (native-inputs @@ -739,7 +739,7 @@ when laptop batteries are low on power.") libfm-qt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -779,7 +779,7 @@ Qt with LXQt.") muparser pcre qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list pkg-config qttools lxqt-build-tools)) @@ -825,7 +825,7 @@ allows for launching applications or shutting down the system.") libqtxdg procps qtbase-5 - qtsvg + qtsvg-5 qtx11extras xdg-user-dirs)) (native-inputs @@ -893,7 +893,7 @@ for the LXQt desktop environment.") liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras sudo)) (native-inputs @@ -1068,7 +1068,7 @@ manager Compton.") (base32 "0g6hs41xfw2ghhwpj0rqr2ciri0x9v984689yrnmnvah88zlya1f")))) (build-system cmake-build-system) (inputs - (list libexif libfm-qt qtbase-5 qtsvg qtx11extras)) + (list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list pkg-config lxqt-build-tools qttools)) (arguments @@ -1225,7 +1225,7 @@ QTermWidget.") (base32 "0cilzw7rz5m2klzpax7rrs5rr6whfda2svwzsn2jvmrirmh5by7r")))) (build-system cmake-build-system) (inputs - (list kwindowsystem libqtxdg qtbase-5 qtsvg qtx11extras)) + (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list pkg-config perl qttools)) (arguments @@ -1283,7 +1283,7 @@ like @command{tar} and @command{zip}.") (inputs (list kwindowsystem qtbase-5 - qtsvg + qtsvg-5 liblxqt qtx11extras libqtxdg)) @@ -1332,9 +1332,9 @@ desktop.") xdg-user-dirs xdg-utils ;; Base - ;; TODO: qtsvg is needed for lxqt apps to display icons. Maybe it + ;; TODO: qtsvg-5 is needed for lxqt apps to display icons. Maybe it ;; should be added to their propagated-inputs? - qtsvg + qtsvg-5 ;; Core lxqt-about lxqt-admin diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6a84f474683..72a89572000 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3064,7 +3064,7 @@ ASCII text files using Gmsh's own scripting language.") (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/veusz") `("QT_PLUGIN_PATH" prefix - ,(list (string-append (assoc-ref inputs "qtsvg") + ,(list (string-append (assoc-ref inputs "qtsvg-5") "/lib/qt5/plugins/")))))))))) (native-inputs (list pkg-config @@ -3076,7 +3076,7 @@ ASCII text files using Gmsh's own scripting language.") python-h5py ;optional, for HDF5 data python-pyqt qtbase-5 - qtsvg)) + qtsvg-5)) (propagated-inputs (list python-numpy)) (home-page "https://veusz.github.io/") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f2e4d1f3026..07f6bc17cb6 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -233,7 +233,7 @@ XMPP-based sessions.") ("qca" ,qca) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) ("x11" ,libx11) @@ -1480,7 +1480,7 @@ default.") qtgraphicaleffects qtlocation qtquickcontrols2 - qtsvg + qtsvg-5 qtmultimedia qtxmlpatterns qqc2-desktop-style @@ -1826,7 +1826,7 @@ instant messenger with audio and video chat capabilities.") openal qrencode qtbase-5 - qtsvg + qtsvg-5 sqlcipher)) (home-page "https://qtox.github.io/") (synopsis "Tox chat client using Qt") @@ -2462,7 +2462,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") qtgraphicaleffects qtmultimedia qtquickcontrols2 - qtsvg + qtsvg-5 spdlog single-application-qt5 xcb-util-wm @@ -2501,7 +2501,7 @@ notification, emojis, E2E encryption, and voip calls.") qtmultimedia qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 qttools xdg-utils)) (arguments @@ -3041,7 +3041,7 @@ social and chat platform.") ("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("usrsctp" ,usrsctp) ("x11" ,libx11) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 8d87f8f2610..e83c78e4d22 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -464,7 +464,7 @@ support") mpg123 qtbase-5 qtmultimedia - qtsvg + qtsvg-5 taglib zlib)) (synopsis "Graphical MPD Client") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 520d64d33c8..2246da84bef 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2264,7 +2264,7 @@ users to select LV2 plugins and run them with jalv.") qtdeclarative qtkeychain qtscript - qtsvg + qtsvg-5 qtx11extras rubberband soundtouch @@ -2301,7 +2301,7 @@ perform creative live mixes with digital music files.") new-session-manager liblo qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://synthv1.sourceforge.io") @@ -2334,7 +2334,7 @@ oscillators and stereo effects.") new-session-manager liblo qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://drumkv1.sourceforge.io") @@ -2367,7 +2367,7 @@ effects.") new-session-manager liblo qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://samplv1.sourceforge.io") @@ -2400,7 +2400,7 @@ effects.") liblo fftwf qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://padthv1.sourceforge.io") @@ -2928,7 +2928,7 @@ browser.") "/manpages/docbook.xsl"))) #t))))) (inputs - (list qtbase-5 qtsvg qttools alsa-lib)) + (list qtbase-5 qtsvg-5 qttools alsa-lib)) (native-inputs (list pkg-config libxslt ; for xsltproc @@ -2972,7 +2972,7 @@ backends, including ALSA, OSS, Network and FluidSynth.") "/manpages/docbook.xsl"))) #t))))) (inputs - (list drumstick qtbase-5 qtsvg qtx11extras)) + (list drumstick qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list libxslt ;for xsltproc docbook-xsl qttools pkg-config)) @@ -4761,7 +4761,7 @@ includes LV2 plugins and a JACK standalone client.") qtgraphicaleffects qtquickcontrols2 qtscript - qtsvg + qtsvg-5 qtxmlpatterns)) (native-inputs (list pkg-config qttools)) @@ -4828,7 +4828,7 @@ sample library.") pcre pulseaudio ; required by rtaudio qtbase-5 - qtsvg + qtsvg-5 rtaudio rubberband sord)) @@ -5550,7 +5550,7 @@ discard bad quality ones. ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins")) - '("qtbase" "qtmultimedia" "qtsvg"))) + '("qtbase" "qtmultimedia" "qtsvg-5"))) `("QML2_IMPORT_PATH" ":" prefix ,(map (lambda (label) (string-append (assoc-ref inputs label) @@ -5564,7 +5564,7 @@ discard bad quality ones. portaudio qtbase-5 qtmultimedia - qtsvg)) + qtsvg-5)) (native-inputs `(("gettext" ,gettext-minimal) ("hicolor-icon-theme" ,hicolor-icon-theme) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index a48c4997ef9..c39123ddfaf 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1637,7 +1637,7 @@ of the same name.") minizip qtbase-5 qtmultimedia - qtsvg + qtsvg-5 sbc snappy zlib diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index d5794429020..367c9cc288a 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -137,7 +137,7 @@ GUI based workflow. It is primarily used in the Orange framework.") (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/orange-canvas") `("QT_PLUGIN_PATH" prefix - ,(list (string-append (assoc-ref inputs "qtsvg") + ,(list (string-append (assoc-ref inputs "qtsvg-5") "/lib/qt5/plugins/")))))))))) (native-inputs (list python-cython)) @@ -172,7 +172,7 @@ GUI based workflow. It is primarily used in the Orange framework.") python-xlrd python-xlsxwriter qtbase-5 - qtsvg + qtsvg-5 xdg-utils)) (home-page "https://orangedatamining.com/") (synopsis "Component-based data mining framework") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index da140b29adb..7db592549da 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -179,7 +179,7 @@ human.") pcsc-lite qrencode qtbase-5 - qtsvg + qtsvg-5 qtx11extras quazip-0 ; XC_KEESHARE readline @@ -699,7 +699,7 @@ key URIs using the standard otpauth:// scheme.") (native-inputs (list qttools)) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 qtsvg-5)) (home-page "https://qtpass.org") (synopsis "GUI for password manager password-store") (description diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index f269449a922..39266a28224 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -869,7 +869,7 @@ program capable of converting PDF into other formats.") libspectre poppler-qt5 qtbase-5 - qtsvg)) + qtsvg-5)) (arguments `(#:tests? #f ; no tests #:phases diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm index f78923966cb..e7761070e02 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -58,7 +58,7 @@ (inputs `(("libusb" ,libusb) ("qt" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg-5" ,qtsvg-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qmake" ,qtbase-5))) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9cb6ae5893b..07fc6128c20 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -187,7 +187,7 @@ (native-inputs (list qttools)) (inputs - (list qtbase-5 qtsvg)) + (list qtbase-5 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 @@ -829,7 +829,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (variable "XDG_CONFIG_DIRS") (files '("etc/xdg"))))))) -(define-public qtsvg +(define-public qtsvg-5 (package (inherit qtbase-5) (name "qtsvg") (version "5.15.2") @@ -900,7 +900,7 @@ HostData=lib/qt5 contents of SVG files."))) (define-public qtimageformats - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtimageformats") (version "5.15.2") (source (origin @@ -915,7 +915,7 @@ HostData=lib/qt5 (delete-file-recursively "src/3rdparty") #t)))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'fix-build @@ -938,7 +938,7 @@ HostData=lib/qt5 support for MNG, TGA, TIFF and WBMP image formats."))) (define-public qtx11extras - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtx11extras") (version "5.15.2") (source (origin @@ -948,7 +948,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (base32 "0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs (list perl)) (inputs @@ -958,7 +958,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) from within Qt 5."))) (define-public qtxmlpatterns - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtxmlpatterns") (version "5.15.2") (source (origin @@ -968,7 +968,7 @@ from within Qt 5."))) (base32 "1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f) ; TODO: Enable the tests ((#:phases phases) `(modify-phases ,phases @@ -985,7 +985,7 @@ XML and custom data models. It contains programs such as xmlpatterns and xmlpatternsvalidator."))) (define-public qtdeclarative - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtdeclarative") (version "5.15.2") (source (origin @@ -995,7 +995,7 @@ xmlpatternsvalidator."))) (base32 "0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f) ;TODO: Enable the tests ((#:phases phases) `(modify-phases ,phases @@ -1013,7 +1013,7 @@ xmlpatternsvalidator."))) pkg-config python python-wrapper - qtsvg + qtsvg-5 vulkan-headers)) (inputs (list mesa qtbase-5)) @@ -1025,7 +1025,7 @@ developers to extend the QML language with custom types and integrate QML code with JavaScript and C++."))) (define-public qtconnectivity - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtconnectivity") (version "5.15.2") (source (origin @@ -1043,7 +1043,7 @@ with JavaScript and C++."))) with Bluetooth and NFC."))) (define-public qtwebsockets - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwebsockets") (version "5.15.2") (source (origin @@ -1053,7 +1053,7 @@ with Bluetooth and NFC."))) (base32 "0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs (list perl qtdeclarative)) @@ -1066,7 +1066,7 @@ 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 qtsensors - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtsensors") (version "5.15.2") (source (origin @@ -1076,7 +1076,7 @@ consume data received from the server, or both."))) (base32 "0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:parallel-tests? _ #f) #f) ; can lead to race condition ((#:phases phases) `(modify-phases ,phases @@ -1095,7 +1095,7 @@ and C++ interfaces. The Qt Sensors API also provides a motion gesture recognition API for devices."))) (define-public qtmultimedia - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtmultimedia") (version "5.15.2") (source (origin @@ -1114,7 +1114,7 @@ recognition API for devices."))) (("spectrum") "#")) #t)))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (replace 'configure @@ -1140,7 +1140,7 @@ record media, and manage a collection of media content. It also contains a set of plugins for interacting with pulseaudio and GStreamer."))) (define-public qtwayland - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwayland") (version "5.15.2") (source (origin @@ -1150,7 +1150,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (base32 "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'disable-failing-tests @@ -1189,7 +1189,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) compositor libraries."))) (define-public qtserialport - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtserialport") (version "5.15.2") (source (origin @@ -1202,7 +1202,7 @@ compositor libraries."))) (inputs (list qtbase-5 eudev)) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'patch-dlopen-paths @@ -1219,7 +1219,7 @@ compositor libraries."))) interacting with serial ports from within Qt."))) (define-public qtserialbus - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtserialbus") (version "5.15.2") (source (origin @@ -1229,7 +1229,7 @@ interacting with serial ports from within Qt."))) (base32 "125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases '%standard-phases) `(modify-phases ,phases (add-after 'unpack 'patch-libsocketcan-reference @@ -1249,7 +1249,7 @@ access the various industrial serial buses and protocols, such as CAN, ModBus, and others."))) (define-public qtwebchannel - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwebchannel") (version "5.15.2") (source (origin @@ -1268,7 +1268,7 @@ application). The transport mechanism is supported out of the box by the two popular web engines, Qt WebKit 2 and Qt WebEngine."))) (define-public qtwebglplugin - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwebglplugin") (version "5.15.2") (source (origin @@ -1278,7 +1278,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (base32 "0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'disable-network-tests @@ -1297,7 +1297,7 @@ compatible web browser without the use of plug-ins. The API is similar to OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (define-public qtwebview - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwebview") (version "5.15.2") (source (origin @@ -1316,7 +1316,7 @@ application without necessarily including a full web browser stack by using native APIs where it makes sense."))) (define-public qtlocation - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtlocation") (version "5.15.2") (source (origin @@ -1329,7 +1329,7 @@ native APIs where it makes sense."))) (base32 "184jychnlfhplpwc5cdcsapwljgwvzk5qpf3val4kpq8w44wnkwq")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs (list perl qtdeclarative qtquickcontrols qtserialport)) @@ -1340,7 +1340,7 @@ native APIs where it makes sense."))) positioning and geolocation plugins."))) (define-public qttools - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qttools") (version "5.15.2") (source (origin @@ -1350,7 +1350,7 @@ positioning and geolocation plugins."))) (base32 "1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs (list perl qtdeclarative vulkan-headers)) @@ -1362,7 +1362,7 @@ the documentation, translate applications, generate help files and other stuff that helps in Qt development."))) (define-public qtscript - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtscript") (version "5.15.2") (source (origin @@ -1382,7 +1382,7 @@ The following guides and references cover aspects of programming with ECMAScript and Qt."))) (define-public qtquickcontrols - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtquickcontrols") (version "5.15.2") (source (origin @@ -1392,7 +1392,7 @@ ECMAScript and Qt."))) (base32 "1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative)) @@ -1402,7 +1402,7 @@ 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) + (package (inherit qtsvg-5) (name "qtquickcontrols2") (version "5.15.2") (source (origin @@ -1412,7 +1412,7 @@ can be used to build complete interfaces in Qt Quick."))) (base32 "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative)) @@ -1423,7 +1423,7 @@ and tray icons. It falls back to Qt Widgets when a native implementation is not available."))) (define-public qtgraphicaleffects - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtgraphicaleffects") (version "5.15.2") (source (origin @@ -1433,7 +1433,7 @@ not available."))) (base32 "1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative)) @@ -1446,7 +1446,7 @@ types. The effects cover functional areas such as blending, masking, blurring, coloring, and many more."))) (define-public qtgamepad - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtgamepad") (version "5.15.2") (source (origin @@ -1472,7 +1472,7 @@ primary target audience are embedded devices with fullscreen user interfaces, and mobile applications targeting TV-like form factors."))) (define-public qtscxml - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtscxml") (version "5.15.2") (source (origin @@ -1499,7 +1499,7 @@ 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 qtpurchasing - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtpurchasing") (version "5.15.2") (source (origin @@ -1515,7 +1515,7 @@ also contains functionality to support data models and executable content."))) purchasing goods and services."))) (define-public qtcharts - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtcharts") (version "5.15.2") (source (origin @@ -1525,7 +1525,7 @@ purchasing goods and services."))) (base32 "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative)) @@ -1538,7 +1538,7 @@ selecting one of the charts themes.") (license license:gpl3))) (define-public qtdatavis3d - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtdatavis3d") (version "5.15.2") (source (origin @@ -1548,7 +1548,7 @@ selecting one of the charts themes.") (base32 "1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5 qtdeclarative)) @@ -1561,7 +1561,7 @@ customized by using themes or by adding custom items and labels to them.") (license license:gpl3))) (define-public qtnetworkauth - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtnetworkauth") (version "5.15.2") (source (origin @@ -1571,7 +1571,7 @@ customized by using themes or by adding custom items and labels to them.") (base32 "11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'remove-failing-test @@ -1587,7 +1587,7 @@ customized by using themes or by adding custom items and labels to them.") implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (define-public qtremoteobjects - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtremoteobjects") (version "5.15.2") (source (origin @@ -1597,7 +1597,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (base32 "1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-after 'unpack 'remove-failing-test @@ -1620,7 +1620,7 @@ Qt's functionalities to enable an easy exchange of information between processes or computers."))) (define-public qtspeech - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtspeech") (version "5.15.2") (source (origin @@ -1631,7 +1631,7 @@ processes or computers."))) "1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs (list qtbase-5)) @@ -1676,7 +1676,7 @@ using the Enchant spell-checking library.") (define-public qtwebengine (package - (inherit qtsvg) + (inherit qtsvg-5) (name "qtwebengine") (version (package-version qtbase-5)) (source @@ -1970,7 +1970,7 @@ using the Enchant spell-checking library.") vulkan-headers xcb-util)) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:modules modules '()) `((guix build gnu-build-system) (guix build utils) @@ -2203,7 +2203,7 @@ module provides support functions to the automatically generated code.") ("qtmultimedia" ,qtmultimedia) ("qtsensors" ,qtsensors) ("qtserialport" ,qtserialport) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qttools" ,qttools) ("qtwebchannel" ,qtwebchannel) ("qtwebkit" ,qtwebkit) @@ -2307,7 +2307,7 @@ contain over 620 classes.") ("python-sip" ,python-sip) ("python-pyqt" ,python-pyqt-without-qtwebkit) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) @@ -2693,7 +2693,7 @@ that can be only started once per user. (base32 "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtsvg qttools)) + (list qtbase-5 qtsvg-5 qttools)) (arguments `(#:phases (modify-phases %standard-phases @@ -3019,7 +3019,7 @@ color-related widgets.") qtscxml qtsensors qtspeech - qtsvg + qtsvg-5 qtwebchannel qtwebengine qtwebsockets @@ -3068,7 +3068,7 @@ color-related widgets.") "qtscxml" "qtsensors" "qtspeech" - "qtsvg" + "qtsvg-5" "qttools" "qtwebchannel" "qtwebengine" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index a694bc00504..d9f8e1002de 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -926,7 +926,7 @@ satellites.") portaudio pulseaudio qtbase-5 - qtsvg + qtsvg-5 spdlog volk)) (arguments @@ -1861,7 +1861,7 @@ Compatible hardware/software: opus pulseaudio qtbase-5 - qtsvg + qtsvg-5 qtwebkit qwt speexdsp diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index aedc8b8c5f6..7266aa81f30 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -118,7 +118,7 @@ hundred times faster than real-time.") enki protobuf-3.5 ;for logging qtbase-5 - qtsvg + qtsvg-5 qttools ;for libQt5Help, needed by "studio" qtwebkit qtx11extras diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index ec795443676..930c7431a3f 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -789,7 +789,7 @@ base64url, base32, base32hex and hex.") libnitrokey libusb qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://github.com/Nitrokey/nitrokey-app") (synopsis "GUI tool for Nitrokey devices") (description @@ -856,7 +856,7 @@ devices.") (list pkg-config qttools)) (inputs (list qtbase-5 - qtsvg + qtsvg-5 qtdeclarative qtwebsockets qtgraphicaleffects diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 3dfaf407963..ff389288468 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -194,7 +194,7 @@ qtkeychain qtquickcontrols2 qtsolutions - qtsvg + qtsvg-5 qtwebchannel qtwebsockets sqlite diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c5efc50b98..d62dc831b3c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -566,7 +566,7 @@ Telegram project, for its use in telegram desktop client.") ("pulseaudio" ,pulseaudio) ("qrcodegen" ,qrcodegen-cpp) ("qt" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qt5ct" ,qt5ct) ("qtimageformats" ,qtimageformats) ("qtwayland" ,qtwayland) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index e3071d9b75a..82f2b2717bd 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -646,7 +646,7 @@ address of one of the participants.") protobuf pulseaudio qtbase-5 - qtsvg + qtsvg-5 speech-dispatcher speex ; avoid bundled speexdsp ; avoid bundled diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ddcd0043c44..ff38c97c5df 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8099,7 +8099,7 @@ and Karl Berry.") mythes python qtbase-5 - qtsvg + qtsvg-5 zlib)) (propagated-inputs `(("texlive" ,(texlive-updmap.cfg (list texlive-fonts-ec))))) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0c8531cc4da..41e55db9c27 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -670,7 +670,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. qtdeclarative qtmultimedia qtquickcontrols - qtsvg + qtsvg-5 qtwebchannel)) (propagated-inputs ; To get native-search-path (list qtwebengine)) @@ -695,7 +695,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins/")) - '("qtsvg" "qtmultimedia")))))))))) + '("qtsvg-5" "qtmultimedia")))))))))) (home-page "https://wereturtle.github.io/ghostwriter/") (synopsis "Write without distractions") (description @@ -770,7 +770,7 @@ environment with Markdown markup.") #:icon "manuskript" #:categories "Office;WordProcessor;")))))))) (inputs - (list pandoc python-lxml python-markdown python-pyqt qtsvg)) + (list pandoc python-lxml python-markdown python-pyqt qtsvg-5)) (home-page "http://www.theologeek.ch/manuskript/") (synopsis "Tool for writers") (description "Manuskript provides a rich environment to help @@ -870,7 +870,7 @@ editors.") perl python-wrapper qtbase-5 - qtsvg + qtsvg-5 sqlite)) (arguments `(#:tests? #f ; no check target diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index af658ea8d7f..c53cfe96d3a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1971,7 +1971,7 @@ videoformats depend on the configuration flags of ffmpeg.") pulseaudio python-wrapper qtbase-5 - qtsvg + qtsvg-5 qtx11extras samba sdl @@ -3194,7 +3194,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") libsamplerate pulseaudio qtbase-5 - qtsvg + qtsvg-5 rtaudio sdl2 sdl2-image @@ -3362,7 +3362,7 @@ be used for realtime video capture via Linux-specific APIs.") pipewire-0.3 pulseaudio qtbase-5 - qtsvg + qtsvg-5 qtx11extras qtwayland speexdsp @@ -4740,7 +4740,7 @@ API. It includes bindings for Python, Ruby, and other languages.") python-pyqt python-pyzmq python-requests - qtsvg)) + qtsvg-5)) (arguments `(#:modules ((guix build python-build-system) (guix build qt-utils) @@ -4862,7 +4862,7 @@ transitions, and effects and then export your film to many common formats.") qtmultimedia qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 qtwebkit qtwebsockets qtx11extras diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 3ab7dc6be90..24f0682e016 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -260,7 +260,7 @@ ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg))) + ("qtsvg-5" ,qtsvg-5))) (propagated-inputs (list go-0xacab-org-leap-shapeshifter go-github-com-apparentlymart-go-openvpn-mgmt diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index b327338cd5c..1c308ffbdff 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -454,7 +454,7 @@ access.") openssl qtbase-5 qtmultimedia - qtsvg)) + qtsvg-5)) (home-page "https://kristall.random-projects.net") (synopsis "Small-internet graphical client") (description "Graphical small-internet client with with many features diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 61000083932..5b54d02e2ef 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -370,7 +370,7 @@ with X11 or Wayland, or in a text terminal with ncurses.") `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release") #:tests? #f)) ; Test suite is a rather manual process. (inputs - (list qtbase-5 qtscript qtsvg qtx11extras)) + (list qtbase-5 qtscript qtsvg-5 qtx11extras)) (synopsis "Clipboard manager with advanced features") (description "CopyQ is clipboard manager with editing and scripting features. CopyQ monitors system clipboard and saves its content in customized -- cgit v1.2.3 From 580b033a508c567852469e73fe85b236c11ae0b3 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 01:29:54 -0400 Subject: gnu: qtsvg-5: Fix indentation. * gnu/packages/qt.scm (qtsvg-5): Fix indentation. --- gnu/packages/qt.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 07fc6128c20..8dc4e063293 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -830,15 +830,16 @@ developers using C++ or QML, a CSS & JavaScript like language.") (files '("etc/xdg"))))))) (define-public qtsvg-5 - (package (inherit qtbase-5) + (package + (inherit qtbase-5) (name "qtsvg") (version "5.15.2") (source (origin - (method url-fetch) - (uri (qt5-urls name version)) - (sha256 - (base32 - "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb")))) + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb")))) (propagated-inputs `()) (native-inputs (list perl)) (inputs -- cgit v1.2.3 From 49f673415ff8a03e63c66293a5f0ddc0944dc14d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 11:21:16 -0400 Subject: gnu: Add qtsvg, version 6.3.1. * gnu/packages/qt.scm (qtsvg): New variable. --- gnu/packages/qt.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8dc4e063293..2d4a3cc6eac 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -900,6 +900,37 @@ HostData=lib/qt5 (description "The QtSvg module provides classes for displaying the contents of SVG files."))) +(define-public qtsvg + (package + (name "qtsvg") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "1xvxz2jfpr1al85rhwss7ji5vkxa812d0b888hry5f7pwqcg86bv")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-display + (lambda _ + ;; Make Qt render "offscreen", required for tests. + (setenv "QT_QPA_PLATFORM" "offscreen"))) + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively (string-append #$output "/tests"))))))) + (native-inputs (list perl)) + (inputs (list libxkbcommon mesa qtbase zlib)) + (synopsis "Qt module for displaying SVGs") + (description "The QtSvg module provides classes for displaying the + contents of SVG files.") + (home-page (package-home-page qtbase)) + (license (package-license qtbase)))) + (define-public qtimageformats (package (inherit qtsvg-5) (name "qtimageformats") -- cgit v1.2.3 From 1d65ff8fdeb20cc2db956093f0ecb1f3f72afc0e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 20:39:53 -0400 Subject: gnu: Add qtshadertools. * gnu/packages/qt.scm (qtshadertools): New variable. --- gnu/packages/qt.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2d4a3cc6eac..82c2d5fa233 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1171,6 +1171,35 @@ recognition API for devices."))) record media, and manage a collection of media content. It also contains a set of plugins for interacting with pulseaudio and GStreamer."))) +(define-public qtshadertools + (package + (name "qtshadertools") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + ;; Note: the source bundles *patched* glslang and SPIRV-Cross + ;; sources. + (sha256 + (base32 + "0nj35s2z5n438q7nqf6bnj3slwz2am3169ck1ixwqa0mjrv73dsr")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON") + #:phases #~(modify-phases %standard-phases + (add-before 'check 'prepare-for-tests + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (native-inputs (list perl)) + (inputs (list glslang libxkbcommon qtbase)) + (home-page (package-home-page qtbase)) + (synopsis "Shader pipeline API and and tools for Qt") + (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)))) + (define-public qtwayland (package (inherit qtsvg-5) (name "qtwayland") -- cgit v1.2.3 From 5f228543394244f479b6a460326fa5f1a4a40998 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 19:00:48 -0400 Subject: gnu: qtmultimedia: Rename to qtmultimedia-5. Automated via: git grep -l qtmultimedia | xargs sed 's/qtmultimedia/qtmultimedia-5/g' -i git checkout NEWS --- gnu/packages/animation.scm | 6 +++--- gnu/packages/astronomy.scm | 2 +- gnu/packages/education.scm | 8 ++++---- gnu/packages/emulators.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/games.scm | 8 ++++---- gnu/packages/graphics.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kde-multimedia.scm | 6 +++--- gnu/packages/kde.scm | 6 +++--- gnu/packages/messaging.scm | 12 ++++++------ gnu/packages/mpd.scm | 2 +- gnu/packages/music.scm | 8 ++++---- gnu/packages/networking.scm | 2 +- gnu/packages/qt.scm | 19 ++++++++++--------- gnu/packages/radio.scm | 14 +++++++------- gnu/packages/text-editors.scm | 4 ++-- gnu/packages/video.scm | 6 +++--- gnu/packages/web-browsers.scm | 2 +- 21 files changed, 59 insertions(+), 58 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 89079ceb6ed..c7f80a4b6a6 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -435,7 +435,7 @@ language.") (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (qt '("qt" "qtmultimedia"))) + (qt '("qt" "qtmultimedia-5"))) (wrap-program (string-append out "/bin/Papagayo") `("QT_PLUGIN_PATH" ":" prefix ,(map (lambda (label) @@ -445,7 +445,7 @@ language.") #t)))))) (inputs `(("qt" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("libsndfile" ,libsndfile))) (native-inputs (list qttools)) @@ -474,7 +474,7 @@ waveform until they line up with the proper sounds.") "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg-5)) + (list qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index e84eb188ff2..95659104ce2 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -607,7 +607,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") (inputs (list qtbase-5 qtlocation - qtmultimedia + qtmultimedia-5 qtscript qtserialport zlib)) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 0e3c8feaf99..998867918e3 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -182,7 +182,7 @@ of categories with some of the activities available in that category. qtbase-5 qtdeclarative qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtquickcontrols qtsensors qtsvg-5 @@ -302,7 +302,7 @@ frequently used words in American English.") ;; Recreate Makefile (invoke "qmake"))))))) (inputs - (list qtbase-5 qtmultimedia)) + (list qtbase-5 qtmultimedia-5)) (home-page "https://www.tipp10.com/") (synopsis "Touch typing tutor") (description "Tipp10 is a touch typing tutor. The ingenious thing about @@ -559,7 +559,7 @@ specialized device.") poppler qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 qtsvg-5 qtwebchannel qtwebengine @@ -995,7 +995,7 @@ formats.") (inputs (list libeb qtbase-5 - qtmultimedia + qtmultimedia-5 qtquickcontrols2 qtdeclarative qtwebchannel diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 5cff92ac893..ba7fa1dbe2e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -755,7 +755,7 @@ The following systems are supported: minizip ncurses qtbase-5 - qtmultimedia + qtmultimedia-5 sdl2 sqlite zlib)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8037ccb5652..bcf024e4376 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2356,7 +2356,7 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") ("opencsg" ,opencsg) ("qscintilla" ,qscintilla) ("qtbase" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia))) + ("qtmultimedia-5" ,qtmultimedia-5))) (native-inputs `(("bison" ,bison) ("flex" ,flex) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index cc246551a31..ceac1d33902 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -993,7 +993,7 @@ want what you have.") (inputs (list protobuf qtbase-5 - qtmultimedia + qtmultimedia-5 qtsvg-5 qttools qtwebsockets @@ -10153,7 +10153,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") (native-inputs (list pkg-config)) (inputs - (list qtbase-5 qtmultimedia qtsvg-5)) + (list qtbase-5 qtmultimedia-5 qtsvg-5)) (arguments '(#:phases (modify-phases %standard-phases @@ -10247,7 +10247,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") libkdegames python-wrapper qtbase-5 - qtmultimedia + qtmultimedia-5 qtdeclarative qtsvg-5)) (home-page "https://games.kde.org/") @@ -11885,7 +11885,7 @@ and chess engines.") (native-inputs (list qttools)) (inputs - (list qtbase-5 qtmultimedia qtspeech qtsvg-5 zlib)) + (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib)) (arguments `(#:tests? #f #:phases diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 915d9d79e1e..f7307e8f616 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1965,7 +1965,7 @@ Automated palette selection is supported.") ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason qtbase-5 qtkeychain - qtmultimedia + qtmultimedia-5 qtsvg-5 qtx11extras)) (home-page "https://drawpile.net") diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index e7ace9e6c46..67a86cbfc15 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -134,7 +134,7 @@ perl qca qtbase-5 - qtmultimedia + qtmultimedia-5 qtscript qtsvg-5 snorenotify diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 726221b1e5f..8f4c56842b4 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -607,7 +607,7 @@ decentralized calling using P2P-DHT.") qtsvg-5 qtwebengine qtwebchannel - qtmultimedia + qtmultimedia-5 qtdeclarative qtgraphicaleffects qtquickcontrols diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 0f1799edb20..3dffcdf813a 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1715,7 +1715,7 @@ from DocBook files.") karchive kcoreaddons ki18n - qtmultimedia + qtmultimedia-5 qtbase-5 ;; Required run-time packages catdoc diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 5b0d8414453..b60b4ee489e 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -174,7 +174,7 @@ This package is part of the KDE multimedia module.") qtbase-5 qtdeclarative qtgraphicaleffects ; not listed as dependency - qtmultimedia + qtmultimedia-5 qtquickcontrols qtquickcontrols2 qtsvg-5 @@ -336,7 +336,7 @@ This package is part of the KDE multimedia module.") libvorbis qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 readline taglib zlib)) @@ -698,7 +698,7 @@ Some features: oxygen-icons ; default icon set pulseaudio qtbase-5 - qtmultimedia + qtmultimedia-5 zlib)) (home-page "https://kde.org/applications/multimedia/org.kde.kwave") (synopsis "Sound editor for KDE") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 2dfd1348e7b..ff02723ab13 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -287,7 +287,7 @@ browser for easy news reading.") qtbase-5 qtdeclarative qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtnetworkauth qtquickcontrols qtquickcontrols2 @@ -540,7 +540,7 @@ expression library, that is used in Krita.") poppler-qt5 qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 qtsvg-5 qtx11extras quazip-0 @@ -747,7 +747,7 @@ different notification systems.") qtbase-5 qtdeclarative qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtquickcontrols qtquickcontrols2 qtx11extras)) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 07f6bc17cb6..77aba8ee8ac 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -232,7 +232,7 @@ XMPP-based sessions.") ("libidn" ,libidn) ("qca" ,qca) ("qtbase" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtsvg-5" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) @@ -1481,7 +1481,7 @@ default.") qtlocation qtquickcontrols2 qtsvg-5 - qtmultimedia + qtmultimedia-5 qtxmlpatterns qqc2-desktop-style qxmpp @@ -2325,7 +2325,7 @@ notifications, and Python scripting support.") (base32 "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs")))) (build-system cmake-build-system) (inputs - (list qtbase-5 qtmultimedia)) + (list qtbase-5 qtmultimedia-5)) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON") #:tests? #f)) ; no tests @@ -2460,7 +2460,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") qtdeclarative qtkeychain qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtquickcontrols2 qtsvg-5 spdlog @@ -2498,7 +2498,7 @@ notification, emojis, E2E encryption, and voip calls.") (list libqmatrixclient qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 qtquickcontrols qtquickcontrols2 qtsvg-5 @@ -3040,7 +3040,7 @@ social and chat platform.") ("qite" ,qite) ("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("usrsctp" ,usrsctp) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index e83c78e4d22..046471f32d0 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -463,7 +463,7 @@ support") libmtp mpg123 qtbase-5 - qtmultimedia + qtmultimedia-5 qtsvg-5 taglib zlib)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2246da84bef..c413be2bb3e 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -253,7 +253,7 @@ (inputs (list dbus qtbase-5 - qtmultimedia + qtmultimedia-5 ;; Plugin dependencies alsa-lib curl @@ -5550,12 +5550,12 @@ discard bad quality ones. ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins")) - '("qtbase" "qtmultimedia" "qtsvg-5"))) + '("qtbase" "qtmultimedia-5" "qtsvg-5"))) `("QML2_IMPORT_PATH" ":" prefix ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/qml")) - '("qtmultimedia")))) + '("qtmultimedia-5")))) #t)))))) (inputs (list alsa-lib @@ -5563,7 +5563,7 @@ discard bad quality ones. jack-1 portaudio qtbase-5 - qtmultimedia + qtmultimedia-5 qtsvg-5)) (native-inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c39123ddfaf..7c6d0757ea7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1636,7 +1636,7 @@ of the same name.") `(,nghttp2 "lib") minizip qtbase-5 - qtmultimedia + qtmultimedia-5 qtsvg-5 sbc snappy diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 82c2d5fa233..461180c5a3d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -140,7 +140,7 @@ (chdir "libqite") #t))))) (inputs - (list qtbase-5 qtmultimedia)) + (list qtbase-5 qtmultimedia-5)) (home-page "https://github.com/Ri0n/qite/") (synopsis "Qt Interactive Text Elements") (description "Qite manages interactive elements on QTextEdit.") @@ -1126,8 +1126,9 @@ consume data received from the server, or both."))) and C++ interfaces. The Qt Sensors API also provides a motion gesture recognition API for devices."))) -(define-public qtmultimedia - (package (inherit qtsvg-5) +(define-public qtmultimedia-5 + (package + (inherit qtsvg-5) (name "qtmultimedia") (version "5.15.2") (source (origin @@ -1697,7 +1698,7 @@ processes or computers."))) (inputs (list qtbase-5)) (native-inputs - (list perl qtdeclarative qtmultimedia qtxmlpatterns)) + (list perl qtdeclarative qtmultimedia-5 qtxmlpatterns)) (synopsis "Qt Speech module") (description "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users @@ -2022,7 +2023,7 @@ using the Enchant spell-checking library.") pulseaudio qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 qtwebchannel re2 snappy @@ -2261,7 +2262,7 @@ module provides support functions to the automatically generated code.") ("qtconnectivity" ,qtconnectivity) ("qtdeclarative" ,qtdeclarative) ("qtlocation" ,qtlocation) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) @@ -2842,7 +2843,7 @@ different kinds of sliders, and much more.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtlocation" ,qtlocation) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) ("qtwebchannel" ,qtwebchannel) ("libxml2" ,libxml2) @@ -3073,7 +3074,7 @@ color-related widgets.") qtdatavis3d qtdeclarative qtlocation - qtmultimedia + qtmultimedia-5 qtquickcontrols qtquickcontrols2 qtscript @@ -3122,7 +3123,7 @@ color-related widgets.") '("qtdatavis3d" "qtdeclarative" "qtlocation" - "qtmultimedia" + "qtmultimedia-5" "qtquickcontrols" "qtquickcontrols2" "qtscript" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index d9f8e1002de..8749a2be0e2 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1298,7 +1298,7 @@ instances over the network, and general QSO and DXpedition logging.") ("hamlib" ,wsjtx-hamlib) ("libusb" ,libusb) ("qtbase" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtserialport" ,qtserialport))) (arguments `(#:tests? #f)) ; No test suite @@ -1337,7 +1337,7 @@ weak-signal conditions.") libusb qtbase-5 qtwebsockets - qtmultimedia + qtmultimedia-5 qtserialport)) (arguments `(#:tests? #f)) ; No test suite @@ -1381,7 +1381,7 @@ focused on DXing and being shaped by community of DXers.JTDX") ("hamlib" ,wsjtx-hamlib) ("libusb" ,libusb) ("qtbase" ,qtbase-5) - ("qtmultimedia" ,qtmultimedia) + ("qtmultimedia-5" ,qtmultimedia-5) ("qtserialport" ,qtserialport))) (arguments `(#:tests? #f ; No test suite @@ -1747,7 +1747,7 @@ intended for people who want to learn receiving and sending morse code.") (native-inputs (list qttools)) (inputs - (list qtbase-5 qtmultimedia)) + (list qtbase-5 qtmultimedia-5)) (arguments `(#:tests? #f)) ; No test suite (home-page "https://dm3mat.darc.de/kochmorse/") @@ -1930,7 +1930,7 @@ receiver.") qtcharts qtdeclarative qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtquickcontrols2 soapysdr)) (arguments @@ -2161,7 +2161,7 @@ voice formats.") qtcharts qtdeclarative qtlocation - qtmultimedia + qtmultimedia-5 qtquickcontrols2 qtserialport qtspeech @@ -2293,7 +2293,7 @@ software-defined radio receivers.") (base32 "1kpkwxhcacgmprbr8xz840rj9a22513vxrh2q7d3js5i1dva8j2z")))) (build-system qt-build-system) (inputs - (list opus qcustomplot qtbase-5 qtmultimedia qtserialport)) + (list opus qcustomplot qtbase-5 qtmultimedia-5 qtserialport)) (arguments `(#:tests? #f ; No test suite. #:phases diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 41e55db9c27..2e569ac17a6 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -668,7 +668,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (list hunspell qtbase-5 qtdeclarative - qtmultimedia + qtmultimedia-5 qtquickcontrols qtsvg-5 qtwebchannel)) @@ -695,7 +695,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins/")) - '("qtsvg-5" "qtmultimedia")))))))))) + '("qtsvg-5" "qtmultimedia-5")))))))))) (home-page "https://wereturtle.github.io/ghostwriter/") (synopsis "Write without distractions") (description diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c53cfe96d3a..2ebbe8afcf9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1000,7 +1000,7 @@ H.264 (MPEG-4 AVC) video streams.") pcre2 pugixml qtbase-5 - qtmultimedia + qtmultimedia-5 utfcpp zlib)) (native-inputs @@ -4687,7 +4687,7 @@ create smoother and stable videos.") jsoncpp libopenshot-audio qtbase-5 - qtmultimedia + qtmultimedia-5 zeromq)) (arguments `(#:configure-flags @@ -4859,7 +4859,7 @@ transitions, and effects and then export your film to many common formats.") qtbase-5 qtdeclarative qtgraphicaleffects - qtmultimedia + qtmultimedia-5 qtquickcontrols qtquickcontrols2 qtsvg-5 diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 1c308ffbdff..751478c3d1f 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -453,7 +453,7 @@ access.") font-openmoji openssl qtbase-5 - qtmultimedia + qtmultimedia-5 qtsvg-5)) (home-page "https://kristall.random-projects.net") (synopsis "Small-internet graphical client") -- cgit v1.2.3 From 983a061e984c227feb2199a2ca37f9af2e594364 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 20:50:16 -0400 Subject: gnu: Add qtmultimedia, version 6.3.1. * gnu/packages/qt.scm (qtmultimedia): New variable. --- gnu/packages/qt.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 461180c5a3d..f4e689cf6fa 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1201,6 +1201,71 @@ supporting shader pipeline functionality as offered in Qt Quick to operate on Vulkan, OpenGL and other main graphic APIs.") (license (package-home-page qtbase)))) +(define-public qtmultimedia + (package + (name "qtmultimedia") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "0dkk3lmzi2fs13cnj8q1lpcs6gghj219826gkwnzyd6nmlm280vy")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively + "examples/multimedia/spectrum/3rdparty") + ;; We also prevent the spectrum example from being built. + (substitute* "examples/multimedia/multimedia.pro" + (("spectrum") "#")))))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DQT_BUILD_TESTS=ON" + "-DQT_FEATURE_pulseaudio=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-integration-tests + (lambda _ + ;; XXX: The tst_qaudiodecoderbackend, tst_qaudiodevice, + ;; tst_qaudiosource, tst_qmediaplayerbackend and + ;; tst_qcamerabackend tests fail, presumably because they + ;; require a functional pulseaudio daemon (which requires a dbus + ;; session bus, which requires an X11 server, and then is still + ;; unhappy). + (substitute* "tests/auto/CMakeLists.txt" + (("add_subdirectory\\(integration)") "")))) + (add-before 'check 'prepare-for-tests + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen"))) + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively (string-append #$output "/tests"))))))) + (native-inputs + (list perl + pkg-config + qtshadertools + vulkan-headers)) + (inputs + (list alsa-lib + glib + gstreamer + gst-plugins-base ;gstreamer-gl + gst-plugins-good ;camera support, additional plugins + gst-libav ;ffmpeg plugin + libxkbcommon + mesa + qtbase + qtdeclarative + pulseaudio)) + (home-page (package-home-page qtbase)) + (synopsis "Qt Multimedia module") + (description "The Qt Multimedia module provides set of APIs to play and +record media, and manage a collection of media content. It also contains a +set of plugins for interacting with pulseaudio and GStreamer.") + (license (package-license qtbase)))) + (define-public qtwayland (package (inherit qtsvg-5) (name "qtwayland") -- cgit v1.2.3 From 735d340ae461751eaebf177334dec537da7cfec2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 21:03:18 -0400 Subject: gnu: qtdeclarative: Rename to qtdeclarative-5. Automated via the following commands: git grep -l '\bqtdeclarative\b' | xargs sed -E 's/qtdeclarative/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 4 +-- gnu/packages/display-managers.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 8 ++--- gnu/packages/engineering.scm | 4 +-- gnu/packages/fcitx5.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/game-development.scm | 4 +-- gnu/packages/games.scm | 72 +++++++++++++++++++-------------------- gnu/packages/geo.scm | 4 +-- gnu/packages/image-processing.scm | 4 +-- gnu/packages/image-viewers.scm | 4 +-- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 38 ++++++++++----------- gnu/packages/kde-multimedia.scm | 6 ++-- gnu/packages/kde-pim.scm | 10 +++--- gnu/packages/kde-plasma.scm | 6 ++-- gnu/packages/kde-utils.scm | 2 +- gnu/packages/kde.scm | 20 +++++------ gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 8 ++--- gnu/packages/music.scm | 4 +-- gnu/packages/qt.scm | 62 ++++++++++++++++----------------- gnu/packages/radio.scm | 4 +-- gnu/packages/scribus.scm | 2 +- gnu/packages/security-token.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/telephony.scm | 4 +-- gnu/packages/terminals.scm | 4 +-- gnu/packages/text-editors.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- gnu/packages/web.scm | 2 +- 33 files changed, 149 insertions(+), 149 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 87da0a965e8..601e6e87346 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3232,7 +3232,7 @@ link REQUIRED)")))))) boost-sync yaml-cpp qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 qtwebchannel qtwebsockets)) @@ -5455,7 +5455,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.") python ;for running tests portaudio ;for portaudio examples qtbase-5 ;for Qt examples - qtdeclarative + qtdeclarative-5 qttools)) (inputs (list jack-1 ;for JACK examples diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 71d8fae7f11..e19935daa84 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -86,7 +86,7 @@ libxkbcommon linux-pam qtbase-5 - qtdeclarative + qtdeclarative-5 ;; Some user-defined themes use QtQuick components internally. Adding ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to ;; 'wrap-qt-program'. diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 9f87e67043e..74356318a1f 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -382,7 +382,7 @@ local system.") `(("libarchive" ,libarchive) ("sqlite" ,sqlite) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) ("qtquickcontrols" ,qtquickcontrols) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 998867918e3..690de4d7ded 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -180,7 +180,7 @@ of categories with some of the activities available in that category. (list openssl python-wrapper qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols @@ -558,7 +558,7 @@ specialized device.") opus poppler qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtsvg-5 qtwebchannel @@ -672,7 +672,7 @@ language and very flexible regarding to new or unknown keyboard layouts.") libxcb libxkbfile qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 qtx11extras @@ -997,7 +997,7 @@ formats.") qtbase-5 qtmultimedia-5 qtquickcontrols2 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine zlib)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index bcf024e4376..3a757deddf8 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2490,7 +2490,7 @@ comments."))) python-shiboken-2 python-wrapper qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 qtwebchannel qtwebengine @@ -3422,7 +3422,7 @@ compiled translations. Prebuilt Firmware files are removed.") python-trimesh python-zeroconf qtbase - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2 diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index ca2d8f6827c..749c170fc7e 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -392,7 +392,7 @@ the Anthy input method.") ("opencc" ,opencc) ("qtbase" ,qtbase-5) ("fcitx5-qt" ,fcitx5-qt) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) (native-inputs diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f59fb56f7a4..3b3cd70257a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -803,7 +803,7 @@ the Monero command line client and daemon.") ("libgcrypt" ,libgcrypt) ("monero" ,monero) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2",qtquickcontrols2) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f9e8baffd41..f426532cb13 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -520,7 +520,7 @@ formats such as PNG.") "05gczsywkk45bh0z1vv8l6cmrlncc2qj8agavj5ryxpnxkzy69r1")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative qtsvg-5 zlib)) + (list qtbase-5 qtdeclarative-5 qtsvg-5 zlib)) (native-inputs (list qttools)) (arguments @@ -2623,7 +2623,7 @@ utilities frequently used in roguelikes.") ("openal" ,openal) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("sdl2" ,sdl2) ("uuid.h" ,util-linux "lib") ("zlib" ,zlib))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ceac1d33902..51dec55bd72 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9270,7 +9270,7 @@ and also provides the base for the FlightGear Flight Simulator.") openscenegraph plib qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 simgear speexdsp @@ -10248,7 +10248,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") python-wrapper qtbase-5 qtmultimedia-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Stamp drawing toy") @@ -10294,7 +10294,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Number logic game") @@ -10332,7 +10332,7 @@ This package is part of the KDE games module.") ktextwidgets libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Miniature golf game") (description "Kolf is a miniature golf game for one to ten players. The @@ -10408,7 +10408,7 @@ other Mah Jongg like games.") libkdegames libkmahjongg qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Tile laying patience") @@ -10451,7 +10451,7 @@ This package is part of the KDE games module.") libkdegames libkmahjongg qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Shisen-Sho solitaire game") (description "KShisen is a solitaire-like game played using the standard @@ -10548,7 +10548,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Breakout like game") (description "KBreakout is similar to the classics breakout and xboing, @@ -10586,7 +10586,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Classical mine sweeper game") (description "KMines is a classic Minesweeper game. The idea is to @@ -10622,7 +10622,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Simple turn-based strategy game") @@ -10661,7 +10661,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Jezzball arcade game") @@ -10699,7 +10699,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Single player falling blocks puzzle game") @@ -10742,7 +10742,7 @@ This package is part of the KDE games module.") libkdegames glu qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Sudoku puzzle game and solver") @@ -10798,7 +10798,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Place 5 equal pieces together, but wait, there are 3 new ones") (description "KLines is a simple but highly addictive one player game. @@ -10841,7 +10841,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Action and puzzle solving game") (description "KGoldrunner is an action game where the hero runs through a @@ -10884,7 +10884,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Three-in-a-row game") (description "KDiamond is a three-in-a-row game like Bejeweled. It @@ -10919,7 +10919,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Place 4 pieces in a row") @@ -10958,7 +10958,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Find atoms in a grid by shooting electrons") @@ -10999,7 +10999,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Turn the board pieces to get all computers connected") (description "KNetWalk is a small game where you have to build up a @@ -11037,7 +11037,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Arcade bombing game") (description "Bomber is a single player arcade game. @@ -11081,7 +11081,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Bomberman clone") @@ -11117,7 +11117,7 @@ This package is part of the KDE games module.") phonon qca qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 zlib)) (home-page "https://games.kde.org/") @@ -11178,7 +11178,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 shared-mime-info)) (home-page "https://games.kde.org/") @@ -11219,7 +11219,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Yahtzee dice game") (description "Kiriki is an addictive and fun dice game, designed to be @@ -11258,7 +11258,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Go board game") @@ -11303,7 +11303,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Game based on Rubik's Cube") @@ -11343,7 +11343,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Lieutnant Skat card game") @@ -11381,7 +11381,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Pac-Man clone") @@ -11420,7 +11420,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Two player game with shooting spaceships flying around a sun") @@ -11453,7 +11453,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Classic pen and paper game: five in a line") @@ -11492,7 +11492,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Port of the classic BSD console game robots") (description "Killbots is a simple game of evading killer robots. @@ -11533,7 +11533,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Snake race played against the computer") @@ -11570,7 +11570,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Simple ball dodging game") (description "In Kollision you use mouse to control a small blue ball in a @@ -11610,7 +11610,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Battleship board game with built-in game server") (description "KBattleship is a Battle Ship game for KDE. @@ -11649,7 +11649,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Old reversi board game, also known as othello") @@ -11690,7 +11690,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Dots and Boxes game") (description "KSquares is an implementation of the popular paper based @@ -11726,7 +11726,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Simple tactical game for number-crunchers") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0c98d578213..0eaa64375dd 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1958,7 +1958,7 @@ using the dataset of topographical information collected by libjpeg-turbo proj qtbase-5 - qtdeclarative + qtdeclarative-5 qtlocation qtwebchannel qtwebengine @@ -2618,7 +2618,7 @@ growing set of geoscientific methods.") qca qscintilla qtbase-5 - qtdeclarative + qtdeclarative-5 qtkeychain qtlocation qtserialport diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 98d30d54ed8..d4b13cc90e7 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1091,7 +1091,7 @@ combine the information contained in both.") ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins")) - '("qtbase" "qtdeclarative")))))))))) + '("qtbase" "qtdeclarative-5")))))))))) (inputs (list curl fftw @@ -1104,7 +1104,7 @@ combine the information contained in both.") insight-toolkit-4.12 vtk-7 qtbase-5 - qtdeclarative + qtdeclarative-5 vxl-1 zlib)) (native-inputs diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 2d3b8aa46f5..2a472fb6330 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -519,7 +519,7 @@ It supports JPEG, PNG and GIF formats.") (list pkg-config qttools)) (inputs (list qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 boost eigen @@ -532,7 +532,7 @@ It supports JPEG, PNG and GIF formats.") lcms openexr-2 qtwebengine - qtdeclarative + qtdeclarative-5 qtwebchannel fftwf gsl diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 8f4c56842b4..181068cc242 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -608,7 +608,7 @@ decentralized calling using P2P-DHT.") qtwebengine qtwebchannel qtmultimedia-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2)) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 3dffcdf813a..1c10183f29a 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -304,7 +304,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (native-inputs (list dbus extra-cmake-modules)) (inputs - ;; TODO: qtdeclarative (yields one failing test) + ;; TODO: qtdeclarative-5 (yields one failing test) (list qtbase-5)) (arguments (list #:configure-flags @@ -775,7 +775,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (native-inputs (list extra-cmake-modules qttools)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://invent.kde.org/frameworks/kholidays") (synopsis "Library for regional holiday information") (description "This library provides a C++ API that determines holiday and @@ -802,7 +802,7 @@ other special events for a geographical region.") (native-inputs (list extra-cmake-modules)) (inputs - (list qtbase-5 qtdeclarative qtscript)) + (list qtbase-5 qtdeclarative-5 qtscript)) (arguments `(#:phases (modify-phases %standard-phases @@ -875,7 +875,7 @@ or user activity.") ;; introducing a recursive dependency. ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! qtbase-5 - qtdeclarative + qtdeclarative-5 qtquickcontrols2 qtsvg-5 ;; Run-time dependency @@ -904,7 +904,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (native-inputs (list extra-cmake-modules)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item models extending the Qt model-view framework") (description "KItemModels provides the following models: @@ -1306,7 +1306,7 @@ provides uniform access to generation of barcodes with data.") (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list glib pulseaudio qtdeclarative qtbase-5)) + (list glib pulseaudio qtdeclarative-5 qtbase-5)) (home-page "https://invent.kde.org/libraries/pulseaudio-qt/") (synopsis "Qt bindings for PulseAudio") (description @@ -1341,7 +1341,7 @@ libpulse.") kiconthemes ; optional kirigami qtbase-5 - qtdeclarative + qtdeclarative-5 qtquickcontrols2)) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuickControls2 style that integrates with the desktop") @@ -1376,7 +1376,7 @@ feel.") (list bison dbus extra-cmake-modules flex qttools)) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("udev" ,eudev))) ;; TODO: Add runtime-only dependency MediaPlayerInfo (home-page "https://community.kde.org/Frameworks") @@ -1476,7 +1476,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." kwindowsystem kxmlgui qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (home-page "https://community.kde.org/Frameworks") (synopsis "Core components for the KDE Activity concept") @@ -2053,7 +2053,7 @@ between feed formats.") kxmlgui lmdb qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (arguments `(#:phases @@ -2108,7 +2108,7 @@ maintaining an index of the contents of your files.") (native-inputs (list extra-cmake-modules)) (inputs - (list boost kactivities kconfig qtbase-5 qtdeclarative)) + (list boost kactivities kconfig qtbase-5 qtdeclarative-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Access usage statistics collected by the activity manager") (description "The KActivitiesStats library provides a querying mechanism for @@ -2205,7 +2205,7 @@ using the XBEL format.") kwidgetsaddons kxmlgui qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for KDE System Settings modules") (description "KCMUtils provides various classes to work with KCModules. @@ -2293,7 +2293,7 @@ their settings.") kxmlgui libepoxy qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (arguments `(#:phases @@ -2761,7 +2761,7 @@ KIO enabled infrastructure.") ktextwidgets kwidgetsaddons qtbase-5 - qtdeclarative + qtdeclarative-5 solid sonnet)) (arguments @@ -2897,7 +2897,7 @@ widgets with a user-interface defined in terms of actions.") kservice kwidgetsaddons qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (arguments `(#:tests? #f)) ; FIXME: 1/3 tests fail. (home-page "https://community.kde.org/Frameworks") @@ -2947,7 +2947,7 @@ to easily extend the contacts collection.") kwindowsystem kxmlgui qtbase-5 - qtdeclarative + qtdeclarative-5 solid threadweaver)) (arguments @@ -3078,7 +3078,7 @@ types or handled by application specific code.") libgit2 perl qtbase-5 - qtdeclarative + qtdeclarative-5 qtscript qtxmlpatterns solid @@ -3337,7 +3337,7 @@ setUrl, setUserAgent and call.") ("kxmlgui" ,kxmlgui) ("phonon" ,phonon) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) @@ -3384,7 +3384,7 @@ script engines.") kio kirigami qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (arguments `(#:tests? #f ;; seem to require network; don't find QTQuick components #:phases diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index b60b4ee489e..1c79cd16bc0 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -172,7 +172,7 @@ This package is part of the KDE multimedia module.") oxygen-icons ; default icon set phonon qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects ; not listed as dependency qtmultimedia-5 qtquickcontrols @@ -335,7 +335,7 @@ This package is part of the KDE multimedia module.") kxmlgui libvorbis qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 readline taglib @@ -529,7 +529,7 @@ autoloading of subtitle files for use while playing video.") oxygen-icons ; default icon set purpose qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2 ; not listed as dependency diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index a5acbb0da87..06da6db29a0 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -724,7 +724,7 @@ for KDE PIM.") ;; TODO: libkolab qca qtbase-5 - qtdeclarative + qtdeclarative-5 qtnetworkauth qtspeech qtwebchannel @@ -1070,7 +1070,7 @@ and retrieving certificates from LDAP servers.") oxygen-icons ; default icon set, required for tests qgpgme qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine sonnet)) @@ -1322,7 +1322,7 @@ using a Qt/KMime C++ API.") qca qgpgme qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine qtwebkit @@ -1848,7 +1848,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") kwallet kwindowsystem qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine)) (arguments @@ -1931,7 +1931,7 @@ KDE using certificate-based crypto.") kwindowsystem libkdepim qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine)) (arguments diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 2317cbec5a6..da6912affea 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -78,7 +78,7 @@ kwayland ; optional kwindowsystem qtbase-5 - qtdeclarative ; optional + qtdeclarative-5 ; optional qtx11extras)) (home-page "https://invent.kde.org/plasma/breeze") (synopsis "Default KDE Plasma theme") @@ -209,7 +209,7 @@ call it if it is not associated to a terminal.") ("linux-pam" ,linux-pam) ("logind" ,elogind) ;optional loginctl support ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid) ("wayland" ,wayland) @@ -276,7 +276,7 @@ basic needs and easy to configure for those who want special setups.") ("kwidgetsaddons" ,kwidgetsaddons) ("kservice" ,kservice) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtscript" ,qtscript) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index ec3470aa0a8..512c2acfef6 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -531,7 +531,7 @@ remind you to take a break now and then.") oxygen-icons ;; default icon set plasma-framework qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (home-page "https://kde.org/applications/utilities/org.kde.smb4k") (synopsis "Samba (SMB) share advanced browser") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index ff02723ab13..a0d73b5252b 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -205,7 +205,7 @@ This package contains GUI widgets for baloo.") libkleo qgpgme qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine syndication)) @@ -285,7 +285,7 @@ browser for easy news reading.") mlt purpose qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtnetworkauth @@ -345,7 +345,7 @@ projects.") ("libkomparediff2" ,libkomparediff2) ("oxygen-icons" ,oxygen-icons) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement ("qtwebkit" ,qtwebkit) @@ -539,7 +539,7 @@ expression library, that is used in Krita.") perl poppler-qt5 qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtsvg-5 qtx11extras @@ -745,7 +745,7 @@ different notification systems.") pulseaudio-qt qca qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols @@ -863,7 +863,7 @@ to perform data analysis.") (native-inputs (list extra-cmake-modules)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://phabricator.kde.org/source/kqtquickcharts/") (synopsis "Interactive charts for Qt Quick") (description @@ -977,7 +977,7 @@ Python, PHP, and Perl.") libsndfile openal qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Runtime library for kdegames") @@ -1024,7 +1024,7 @@ Python, PHP, and Perl.") phonon protobuf qtbase-5 - qtdeclarative + qtdeclarative-5 qtlocation qtserialport qtsvg-5 @@ -1094,7 +1094,7 @@ creating routes by drag and drop and more.") phonon poppler-qt5 qca - qtdeclarative + qtdeclarative-5 qtsvg-5 threadweaver kcrash @@ -1225,7 +1225,7 @@ or Bonjour by other projects).") ;;("phpunit" ,phpunit) )) (inputs - (list qtbase-5 qtcharts qtdeclarative qtsvg-5)) + (list qtbase-5 qtcharts qtdeclarative-5 qtsvg-5)) (arguments `(#:tests? #f)) ;; 4/17 fail (home-page "https://api.kde.org/frameworks/kuserfeedback/html/") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 0beac88d32f..d30f598c7eb 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -852,7 +852,7 @@ and video calls or instant messaging capabilities to an application.") mediastreamer2 ortp qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2 diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 77aba8ee8ac..cc2525aa576 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1476,7 +1476,7 @@ default.") (inputs (list kirigami knotifications qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtlocation qtquickcontrols2 @@ -2457,7 +2457,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") mtxclient openssl qtbase-5 - qtdeclarative + qtdeclarative-5 qtkeychain qtgraphicaleffects qtmultimedia-5 @@ -2497,7 +2497,7 @@ notification, emojis, E2E encryption, and voip calls.") (inputs (list libqmatrixclient qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtquickcontrols qtquickcontrols2 @@ -2911,7 +2911,7 @@ as phones, embedded computers or microcontrollers.") "\"../build")) #t))))) (inputs - (list qtbase-5 qtdeclarative qtwebchannel)) + (list qtbase-5 qtdeclarative-5 qtwebchannel)) (propagated-inputs (list qtwebengine)) (home-page "https://movim.eu/") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c413be2bb3e..ed188da94aa 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2261,7 +2261,7 @@ users to select LV2 plugins and run them with jalv.") portmidi protobuf qtbase-5 - qtdeclarative + qtdeclarative-5 qtkeychain qtscript qtsvg-5 @@ -4757,7 +4757,7 @@ includes LV2 plugins and a JACK standalone client.") portmidi pulseaudio qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 qtscript diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f4e689cf6fa..25f65d0a90b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -258,7 +258,7 @@ applications on Wayland.") ;; Optional: lcov and cccc, both are for code coverage (list doxygen)) (inputs - (list qtbase-5 qtdeclarative qtscript)) + (list qtbase-5 qtdeclarative-5 qtscript)) (build-system cmake-build-system) (arguments `(#:phases @@ -1009,14 +1009,14 @@ from within Qt 5."))) (("qxmlquery") "# qxmlquery") (("xmlpatterns ") "# xmlpatterns")) #t)))))) - (native-inputs (list perl qtdeclarative)) + (native-inputs (list perl qtdeclarative-5)) (inputs (list qtbase-5)) (synopsis "Qt XML patterns module") (description "The QtXmlPatterns module is a XQuery and XPath engine for XML and custom data models. It contains programs such as xmlpatterns and xmlpatternsvalidator."))) -(define-public qtdeclarative +(define-public qtdeclarative-5 (package (inherit qtsvg-5) (name "qtdeclarative") (version "5.15.2") @@ -1035,7 +1035,7 @@ xmlpatternsvalidator."))) (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen - ;; is provided by qtdeclarative. + ;; is provided by qtdeclarative-5. (substitute* "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" (("\\$\\{_qt5Core_install_prefix\\}") out))) @@ -1067,7 +1067,7 @@ with JavaScript and C++."))) (base32 "185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003")))) (native-inputs - (list perl pkg-config qtdeclarative)) + (list perl pkg-config qtdeclarative-5)) (inputs (list bluez qtbase-5)) (synopsis "Qt Connectivity module") @@ -1088,7 +1088,7 @@ with Bluetooth and NFC."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative)) + (list perl qtdeclarative-5)) (inputs (list qtbase-5)) (synopsis "Qt Web Sockets module") (description "WebSocket is a web-based protocol designed to enable two-way @@ -1119,7 +1119,7 @@ consume data received from the server, or both."))) (("QTest::newRow(\"twist\") << \"twist\"") "")) ;failing test #t)))))) (native-inputs - (list perl qtdeclarative)) + (list perl qtdeclarative-5)) (inputs (list qtbase-5)) (synopsis "Qt Sensors module") (description "The Qt Sensors API provides access to sensor hardware via QML @@ -1158,7 +1158,7 @@ recognition API for devices."))) (string-append "PREFIX=" out))))))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl pkg-config python qtdeclarative)) + (list perl pkg-config python qtdeclarative-5)) (inputs (list alsa-lib mesa @@ -1297,7 +1297,7 @@ set of plugins for interacting with pulseaudio and GStreamer.") (setenv "DBUS_FATAL_WARNINGS" "0") #t)))))) (native-inputs - (list glib perl pkg-config qtdeclarative)) + (list glib perl pkg-config qtdeclarative-5)) (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -1386,7 +1386,7 @@ and others."))) (base32 "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj")))) (native-inputs - (list perl qtdeclarative qtwebsockets)) + (list perl qtdeclarative-5 qtwebsockets)) (inputs (list qtbase-5)) (synopsis "Web communication library for Qt") (description "The Qt WebChannel module enables peer-to-peer communication @@ -1414,7 +1414,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) #t)))))) (native-inputs '()) (inputs - (list mesa qtbase-5 qtdeclarative qtwebsockets zlib)) + (list mesa qtbase-5 qtdeclarative-5 qtwebsockets 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 @@ -1436,7 +1436,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (native-inputs (list perl)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Display web content in a QML application") (description "Qt WebView provides a way to display web content in a QML application without necessarily including a full web browser stack by using @@ -1459,7 +1459,7 @@ native APIs where it makes sense."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative qtquickcontrols qtserialport)) + (list perl qtdeclarative-5 qtquickcontrols qtserialport)) (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") @@ -1480,7 +1480,7 @@ positioning and geolocation plugins."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative vulkan-headers)) + (list perl qtdeclarative-5 vulkan-headers)) (inputs (list mesa qtbase-5)) (synopsis "Qt Tools and Designer modules") @@ -1522,7 +1522,7 @@ ECMAScript and Qt."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Quick Controls and other Quick modules") (description "The QtScript module provides classes for making Qt applications scriptable. This module provides a set of extra components that @@ -1542,7 +1542,7 @@ can be used to build complete interfaces in Qt Quick."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (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, @@ -1563,7 +1563,7 @@ not available."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Graphical Effects module") (description "The Qt Graphical Effects module provides a set of QML types for adding visually impressive and configurable effects to user interfaces. @@ -1590,7 +1590,7 @@ coloring, and many more."))) ("libxrender" ,libxrender) ("sdl2" ,sdl2) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative-5" ,qtdeclarative-5))) (synopsis "Qt Gamepad module") (description "The Qt Gamepad module is an add-on library that enables Qt applications to support the use of gamepad hardware and in some cases remote @@ -1617,7 +1617,7 @@ and mobile applications targeting TV-like form factors."))) (("scion") "#")) #t)))) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt SCXML module") (description "The Qt SCXML module provides functionality to create state machines from SCXML files. This includes both dynamically creating state @@ -1636,7 +1636,7 @@ also contains functionality to support data models and executable content."))) (base32 "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7")))) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Purchasing module") (description "The Qt Purchasing module provides and in-app API for purchasing goods and services."))) @@ -1655,7 +1655,7 @@ purchasing goods and services."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Charts module") (description "The Qt Charts module provides a set of easy to use chart components. It uses the Qt Graphics View Framework, therefore charts can be @@ -1678,7 +1678,7 @@ selecting one of the charts themes.") (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Data Visualization module") (description "The Qt Data Visualization module provides a way to visualize data in 3D as bar, scatter, and surface graphs. It is especially useful for @@ -1739,7 +1739,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) "integration_multiprocess")) #t)))))) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Remote Objects module") (description "The Qt Remote Objects module is an @dfn{inter-process communication} (IPC) module developed for Qt. The idea is to extend existing @@ -1763,7 +1763,7 @@ processes or computers."))) (inputs (list qtbase-5)) (native-inputs - (list perl qtdeclarative qtmultimedia-5 qtxmlpatterns)) + (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns)) (synopsis "Qt Speech module") (description "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users @@ -2087,7 +2087,7 @@ using the Enchant spell-checking library.") protobuf pulseaudio qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtwebchannel re2 @@ -2325,7 +2325,7 @@ module provides support functions to the automatically generated code.") `(("python" ,python-wrapper) ("qtbase" ,qtbase-5) ("qtconnectivity" ,qtconnectivity) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) @@ -2435,7 +2435,7 @@ contain over 620 classes.") ("python-pyqt" ,python-pyqt-without-qtwebkit) ("qtbase" ,qtbase-5) ("qtsvg-5" ,qtsvg-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) (arguments @@ -2906,7 +2906,7 @@ different kinds of sliders, and much more.") ("fontconfig" ,fontconfig) ("libxrender" ,libxrender) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) @@ -2970,7 +2970,7 @@ time Web content can be enhanced with native controls.") (native-inputs (list qttools)) (inputs - (list qtbase-5 qtdeclarative)) + (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") (description @@ -3137,7 +3137,7 @@ color-related widgets.") clang-toolchain qtbase-5 qtdatavis3d - qtdeclarative + qtdeclarative-5 qtlocation qtmultimedia-5 qtquickcontrols @@ -3186,7 +3186,7 @@ color-related widgets.") (string-append (assoc-ref inputs name) "/include/qt5")) '("qtdatavis3d" - "qtdeclarative" + "qtdeclarative-5" "qtlocation" "qtmultimedia-5" "qtquickcontrols" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 8749a2be0e2..1438d4fd7d3 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1928,7 +1928,7 @@ receiver.") rtl-sdr qtbase-5 qtcharts - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols2 @@ -2159,7 +2159,7 @@ voice formats.") pulseaudio qtbase-5 qtcharts - qtdeclarative + qtdeclarative-5 qtlocation qtmultimedia-5 qtquickcontrols2 diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 8669ed0db57..6f557d2b2ba 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -88,7 +88,7 @@ poppler python ;need Python library qtbase-5 - qtdeclarative + qtdeclarative-5 zlib)) (native-inputs (list pkg-config qttools util-linux)) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 930c7431a3f..11f9674720a 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -857,7 +857,7 @@ devices.") (inputs (list qtbase-5 qtsvg-5 - qtdeclarative + qtdeclarative-5 qtwebsockets qtgraphicaleffects qtquickcontrols2 diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index ff389288468..23294e39f66 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -189,7 +189,7 @@ libzip openssl qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtkeychain qtquickcontrols2 diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 82f2b2717bd..5ef93fc3f1e 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -120,7 +120,7 @@ (native-inputs (list automake autoconf pkg-config)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Phone Simulator for modem testing") (description "Phonesim is a modem emulator that oFono uses for development and @@ -706,7 +706,7 @@ Mumble consists of two applications for separate usage: libsndfile libxml2 qtbase-5 - qtdeclarative + qtdeclarative-5 qtquickcontrols readline speex diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 4dfc51b2838..2d43cfa4939 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -783,7 +783,7 @@ embedded kernel situations.") (("COMMODORE_PET") "PROGGY_TINY")))))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative qtgraphicaleffects qtquickcontrols2 bash-minimal)) + (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 bash-minimal)) (arguments `(#:phases (modify-phases %standard-phases @@ -805,7 +805,7 @@ embedded kernel situations.") (,(string-append out qml) ,@(map (lambda (i) (string-append (assoc-ref inputs i) qml)) - '("qtdeclarative" + '("qtdeclarative-5" "qtgraphicaleffects" "qtquickcontrols2")))))))) (add-after 'install 'add-alternate-name diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 2e569ac17a6..7abf5b63288 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -667,7 +667,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (inputs (list hunspell qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtquickcontrols qtsvg-5 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2ebbe8afcf9..30ff377cee8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4857,7 +4857,7 @@ transitions, and effects and then export your film to many common formats.") mlt pulseaudio qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 24f0682e016..6d9dcfb53f1 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -256,7 +256,7 @@ ("procps" ,procps) ("python" ,python) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 34a2fea062b..54923838822 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8091,7 +8091,7 @@ It contains the code shared by all Kiwix ports.") libzim pugixml qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine xapian -- cgit v1.2.3 From 397d05a4bf680372e3ebdb83e388c9f672a0e90b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 21:21:43 -0400 Subject: gnu: Add qtdeclarative, version 6.3.1. * gnu/packages/qt.scm (qtdeclarative): New variable. --- gnu/packages/qt.scm | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 25f65d0a90b..708de406c4d 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1056,6 +1056,134 @@ language and engine infrastructure, and provides an API to enable application developers to extend the QML language with custom types and integrate QML code with JavaScript and C++."))) +(define-public qtdeclarative + (package + (name "qtdeclarative") + (version "6.3.1") + ;; TODO: Package 'masm' and unbundle from sources. + (source (origin + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "1s268fha3650dn1lqxf8jfa07wxpw09f6p7rjyiwq3w24d0nkrq3")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-GNinja" ;about twice as fast! + "-DQT_BUILD_TESTS=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'honor-cmake-install-rpath + ;; The build system goes out of its way to compute a runpath it + ;; thinks makes more sense, and fails. Revert to the default + ;; behavior, which is to honor CMAKE_INSTALL_RPATH. + (lambda _ + (substitute* "src/qml/Qt6QmlMacros.cmake" + (("set_target_properties.*PROPERTIES.*INSTALL_RPATH.*" all) + (string-append "# " all))))) + (add-after 'unpack 'patch-qlibraryinfo-paths + (lambda _ + ;; The QLibraryInfo paths are hard-coded to point to the qtbase + ;; installation, but all the tools used in the test suite come + ;; from this package. + (substitute* (find-files "tests" "\\.cpp$") + (("QLibraryInfo::path\\(QLibraryInfo::BinariesPath)") + (string-append "QStringLiteral(\"" #$output "/bin\")")) + (("QLibraryInfo::path\\(QLibraryInfo::LibraryExecutablesPath)") + (string-append "QStringLiteral(\"" #$output + "/lib/qt6/libexec\")")) + (("QLibraryInfo::path\\(QLibraryInfo::QmlImportsPath)") + (string-append "QStringLiteral(\"" #$output + "/lib/qt6/qml\")"))))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (apply invoke "cmake" "--build" "." + (if parallel-build? + `("--parallel" ,(number->string (parallel-job-count))) + '())))) + (delete 'check) ;move after the install phase + (replace 'install + (lambda _ + (invoke "cmake" "--install" "."))) + (add-after 'install 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (when tests? + ;; The tests expect to find the modules provided by this + ;; package; extend the environment variables needed to do so. + ;(setenv "CMAKE_PREFIX_PATH" #$output) + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml")) + (setenv "QT_PLUGIN_PATH" + (string-append #$output "/lib/qt6/plugins:" + (getenv "QT_PLUGIN_PATH"))) + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; Skip tests known to fail on GNU/Linux, in a CI context or + ;; due to bitness (see: https://code.qt.io/cgit/qt/qtbase.git + ;; /tree/src/testlib/qtestblacklist.cpp). + (setenv "QTEST_ENVIRONMENT" "linux ci 32bit") + (setenv "HOME" "/tmp") ;a few tests require a writable HOME + (invoke + "ctest" "--output-on-failure" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + "-E" ;exclude some tests by regex + (string-append + "(" + (string-join + (list + ;; This test is marked as flaky upstream (see: + ;; https://bugreports.qt.io/browse/QTBUG-101488). + "tst_qquickfiledialogimpl" + ;; These tests all fail because 'test_overlappingHandles' + ;; (see: https://bugreports.qt.io/browse/QTBUG-95750). + "tst_basic" + "tst_fusion" + "tst_imagine" + "tst_material" + "tst_universal" + ;; Fails due to using the wrong lib/qt6/qml prefix: + ;; "Warning: Failed to find the following builtins: + ;; builtins.qmltypes, jsroot.qmltypes (so will use + ;; qrc). Import paths used: + ;; /gnu/store/...-qtbase-6.3.1/lib/qt6/qml" + "tst_qmltc_qprocess" + ;; These test fail when running qmlimportscanner; perhaps + ;; an extra CMAKE_PREFIX_PATH location is missing to + ;; correctly locate the imports. + "empty_qmldir" + "qtquickcompiler" + "cmake_tooling_imports" + ;; This test seems to hangs for a long time, possibly + ;; waiting for a killed process, which becomes a zombie in + ;; the build container (perhaps solved after + ;; fixing/applying #30948). + "tst_qqmlpreview") "|") + ")"))))) + (add-after 'install 'delete-installed-tests + (lambda _ + (delete-file-recursively (string-append #$output "/tests"))))))) + (native-inputs + (list ninja + perl + pkg-config + python + qtshadertools + vulkan-headers)) + (inputs + (list libxkbcommon + mesa + qtbase)) + (home-page (package-home-page qtbase)) + (synopsis "Qt QML module (Quick 2)") + (description "The Qt QML module provides a framework for developing +applications and libraries with the QML language. It defines and implements +the language and engine infrastructure, and provides an API to enable +application developers to extend the QML language with custom types and +integrate QML code with JavaScript and C++.") + (license (package-license qtbase)))) + (define-public qtconnectivity (package (inherit qtsvg-5) (name "qtconnectivity") -- cgit v1.2.3 From 65e5e85d284ef78bc245b3779c7fcdc733ed60a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 23:47:28 -0400 Subject: gnu: qtquickcontrols: Rename to qtquickcontrols-5. Automated via: git grep -l qtquickcontrols | xargs sed 's/\bqtquickcontrols\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-multimedia.scm | 4 ++-- gnu/packages/kde.scm | 6 +++--- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 8 ++++---- gnu/packages/telephony.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 601e6e87346..0bb607abfce 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5459,7 +5459,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.") qttools)) (inputs (list jack-1 ;for JACK examples - qtquickcontrols)) ;for Qt examples + qtquickcontrols-5)) ;for Qt examples (propagated-inputs ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp ;; contains '#include '. diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index e19935daa84..7e0218dbb78 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -91,7 +91,7 @@ ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to ;; 'wrap-qt-program'. qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 shadow diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 74356318a1f..2f4755de557 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -385,7 +385,7 @@ local system.") ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras) ("xcb-util-keyms" ,xcb-util-keysyms))) (home-page "https://zealdocs.org/") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 690de4d7ded..cb0d71cc543 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -183,7 +183,7 @@ of categories with some of the activities available in that category. qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtsensors qtsvg-5 qtxmlpatterns)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3a757deddf8..7ad1873a851 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3424,7 +3424,7 @@ compiled translations. Prebuilt Firmware files are removed.") qtbase qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5)) (arguments diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 3b3cd70257a..ff6efa0a84e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -805,7 +805,7 @@ the Monero command line client and daemon.") ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtquickcontrols2",qtquickcontrols2) ("qtsvg-5" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 181068cc242..8d8d29c0db9 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -610,7 +610,7 @@ decentralized calling using P2P-DHT.") qtmultimedia-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2)) (home-page "https://jami.net") (synopsis "Qt Jami client") diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 1c79cd16bc0..34da2ef3f21 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -175,7 +175,7 @@ This package is part of the KDE multimedia module.") qtdeclarative-5 qtgraphicaleffects ; not listed as dependency qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qtx11extras @@ -531,7 +531,7 @@ autoloading of subtitle files for use while playing video.") qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 ; not listed as dependency qtx11extras)) (arguments diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index a0d73b5252b..143cb3b6a90 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -289,7 +289,7 @@ browser for easy news reading.") qtgraphicaleffects qtmultimedia-5 qtnetworkauth - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtscript qtsvg-5 @@ -346,7 +346,7 @@ projects.") ("oxygen-icons" ,oxygen-icons) ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement + ("qtquickcontrols-5" ,qtquickcontrols-5) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement ("qtwebkit" ,qtwebkit) ("threadweaver" ,threadweaver) @@ -748,7 +748,7 @@ different notification systems.") qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtx11extras)) (home-page "https://community.kde.org/KDEConnect") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index d30f598c7eb..a488fc3244e 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -854,7 +854,7 @@ and video calls or instant messaging capabilities to an application.") qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5)) (synopsis "Desktop client for the Linphone SIP softphone") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cc2525aa576..13246d0fbe1 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2499,7 +2499,7 @@ notification, emojis, E2E encryption, and voip calls.") qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qttools diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 708de406c4d..fb6fb5245c7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1587,7 +1587,7 @@ native APIs where it makes sense."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (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") @@ -1636,7 +1636,7 @@ that helps in Qt development."))) 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") @@ -3268,7 +3268,7 @@ color-related widgets.") qtdeclarative-5 qtlocation qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtscript qtscxml @@ -3317,7 +3317,7 @@ color-related widgets.") "qtdeclarative-5" "qtlocation" "qtmultimedia-5" - "qtquickcontrols" + "qtquickcontrols-5" "qtquickcontrols2" "qtscript" "qtscxml" diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5ef93fc3f1e..c711c3512f1 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -707,7 +707,7 @@ Mumble consists of two applications for separate usage: libxml2 qtbase-5 qtdeclarative-5 - qtquickcontrols + qtquickcontrols-5 readline speex speexdsp diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 7abf5b63288..66426201558 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -669,7 +669,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtsvg-5 qtwebchannel)) (propagated-inputs ; To get native-search-path diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 30ff377cee8..347e84db6fd 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4860,7 +4860,7 @@ transitions, and effects and then export your film to many common formats.") qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols + qtquickcontrols-5 qtquickcontrols2 qtsvg-5 qtwebkit diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 6d9dcfb53f1..71444d6bb61 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -258,7 +258,7 @@ ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg-5" ,qtsvg-5))) (propagated-inputs -- cgit v1.2.3 From 1130fc59917e4ea0244ea58fdf1b5ef49e30a5d5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 23:49:07 -0400 Subject: gnu: qtquickcontrols2: Rename to qtquickcontrols2-5. Automated via: git grep -l qtquickcontrols2 | xargs sed 's/\bqtquickcontrols2\b/\0-5/g' -i git checkout NEWS --- gnu/packages/display-managers.scm | 2 +- gnu/packages/education.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 6 +++--- gnu/packages/kde-multimedia.scm | 4 ++-- gnu/packages/kde.scm | 6 +++--- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 6 +++--- gnu/packages/music.scm | 2 +- gnu/packages/qt.scm | 6 +++--- gnu/packages/radio.scm | 4 ++-- gnu/packages/security-token.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/terminals.scm | 4 ++-- gnu/packages/video.scm | 2 +- gnu/packages/vpn.scm | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 7e0218dbb78..32ec5c3141d 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -92,7 +92,7 @@ ;; 'wrap-qt-program'. qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 shadow wayland)) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index cb0d71cc543..6a9de32ffb1 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -674,7 +674,7 @@ language and very flexible regarding to new or unknown keyboard layouts.") qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols2 + qtquickcontrols2-5 qtx11extras qtxmlpatterns)) (home-page "https://edu.kde.org/ktouch/") @@ -996,7 +996,7 @@ formats.") (list libeb qtbase-5 qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 qtdeclarative-5 qtwebchannel qtwebengine diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 7ad1873a851..d8d3e481d2e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3425,7 +3425,7 @@ compiled translations. Prebuilt Firmware files are removed.") qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5)) (arguments `(;; FIXME: tests are disabled, because they cause an infinite loop. diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index ff6efa0a84e..b7937a310a8 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -806,7 +806,7 @@ the Monero command line client and daemon.") ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtquickcontrols2",qtquickcontrols2) + ("qtquickcontrols2-5",qtquickcontrols2-5) ("qtsvg-5" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 8d8d29c0db9..97475063dc8 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -611,7 +611,7 @@ decentralized calling using P2P-DHT.") qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2)) + qtquickcontrols2-5)) (home-page "https://jami.net") (synopsis "Qt Jami client") (description "This package provides the Jami Qt client. Jami is a secure diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 1c10183f29a..6fc0b5f10c6 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -876,7 +876,7 @@ or user activity.") ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! qtbase-5 qtdeclarative-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 ;; Run-time dependency qtgraphicaleffects)) @@ -1342,7 +1342,7 @@ libpulse.") kirigami qtbase-5 qtdeclarative-5 - qtquickcontrols2)) + qtquickcontrols2-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuickControls2 style that integrates with the desktop") (description "This is a style for QtQuickControls2 which is using @@ -3338,7 +3338,7 @@ setUrl, setUserAgent and call.") ("phonon" ,phonon) ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2-5" ,qtquickcontrols2-5) ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid))) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 34da2ef3f21..ac86489a952 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -176,7 +176,7 @@ This package is part of the KDE multimedia module.") qtgraphicaleffects ; not listed as dependency qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qtx11extras ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt @@ -532,7 +532,7 @@ autoloading of subtitle files for use while playing video.") qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 ; not listed as dependency + qtquickcontrols2-5 ; not listed as dependency qtx11extras)) (arguments (list #:tests? #f ; test program gets built, but is not found diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 143cb3b6a90..f11419afb94 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -290,7 +290,7 @@ browser for easy news reading.") qtmultimedia-5 qtnetworkauth qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtscript qtsvg-5 shared-mime-info)) @@ -347,7 +347,7 @@ projects.") ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtquickcontrols-5" ,qtquickcontrols-5) ;; not checked as requirement - ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement + ("qtquickcontrols2-5" ,qtquickcontrols2-5) ;; not checked as requirement ("qtwebkit" ,qtwebkit) ("threadweaver" ,threadweaver) @@ -749,7 +749,7 @@ different notification systems.") qtgraphicaleffects qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtx11extras)) (home-page "https://community.kde.org/KDEConnect") (synopsis "Enable your devices to communicate with each other") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index a488fc3244e..47fb94dc686 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -855,7 +855,7 @@ and video calls or instant messaging capabilities to an application.") qtdeclarative-5 qtgraphicaleffects qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5)) (synopsis "Desktop client for the Linphone SIP softphone") (description "Linphone is a SIP softphone for voice and video over IP calling diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 13246d0fbe1..836b5037844 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1479,7 +1479,7 @@ default.") qtdeclarative-5 qtgraphicaleffects qtlocation - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qtmultimedia-5 qtxmlpatterns @@ -2461,7 +2461,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") qtkeychain qtgraphicaleffects qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 spdlog single-application-qt5 @@ -2500,7 +2500,7 @@ notification, emojis, E2E encryption, and voip calls.") qtdeclarative-5 qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qttools xdg-utils)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ed188da94aa..1147512980d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4759,7 +4759,7 @@ includes LV2 plugins and a JACK standalone client.") qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtquickcontrols2 + qtquickcontrols2-5 qtscript qtsvg-5 qtxmlpatterns)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fb6fb5245c7..061c9a5a1e7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1656,7 +1656,7 @@ 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 +(define-public qtquickcontrols2-5 (package (inherit qtsvg-5) (name "qtquickcontrols2") (version "5.15.2") @@ -3269,7 +3269,7 @@ color-related widgets.") qtlocation qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtscript qtscxml qtsensors @@ -3318,7 +3318,7 @@ color-related widgets.") "qtlocation" "qtmultimedia-5" "qtquickcontrols-5" - "qtquickcontrols2" + "qtquickcontrols2-5" "qtscript" "qtscxml" "qtsensors" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 1438d4fd7d3..989d5670f42 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1931,7 +1931,7 @@ receiver.") qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 soapysdr)) (arguments `(#:configure-flags '("-DRTLSDR=ON" @@ -2162,7 +2162,7 @@ voice formats.") qtdeclarative-5 qtlocation qtmultimedia-5 - qtquickcontrols2 + qtquickcontrols2-5 qtserialport qtspeech qtwebsockets diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 11f9674720a..3c8d6d33212 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -860,7 +860,7 @@ devices.") qtdeclarative-5 qtwebsockets qtgraphicaleffects - qtquickcontrols2 + qtquickcontrols2-5 pcsc-lite openssl)) (arguments diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 23294e39f66..f3641953417 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -192,7 +192,7 @@ qtdeclarative-5 qtgraphicaleffects qtkeychain - qtquickcontrols2 + qtquickcontrols2-5 qtsolutions qtsvg-5 qtwebchannel diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 2d43cfa4939..7e5016f08fe 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -783,7 +783,7 @@ embedded kernel situations.") (("COMMODORE_PET") "PROGGY_TINY")))))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 bash-minimal)) + (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2-5 bash-minimal)) (arguments `(#:phases (modify-phases %standard-phases @@ -807,7 +807,7 @@ embedded kernel situations.") (string-append (assoc-ref inputs i) qml)) '("qtdeclarative-5" "qtgraphicaleffects" - "qtquickcontrols2")))))))) + "qtquickcontrols2-5")))))))) (add-after 'install 'add-alternate-name (lambda* (#:key outputs #:allow-other-keys) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 347e84db6fd..29a3e651c9f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4861,7 +4861,7 @@ transitions, and effects and then export your film to many common formats.") qtgraphicaleffects qtmultimedia-5 qtquickcontrols-5 - qtquickcontrols2 + qtquickcontrols2-5 qtsvg-5 qtwebkit qtwebsockets diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 71444d6bb61..a884feabf49 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -259,7 +259,7 @@ ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2-5" ,qtquickcontrols2-5) ("qtsvg-5" ,qtsvg-5))) (propagated-inputs (list go-0xacab-org-leap-shapeshifter -- cgit v1.2.3 From d90031f799f6c56fa456dc7afe5bfdb59680f258 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 17 Jul 2022 23:52:19 -0400 Subject: gnu: qtquickcontrols2: Define as obsoleted by qtdeclarative. * gnu/packages/qt.scm (qtquickcontrols2): New variable. --- gnu/packages/qt.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 061c9a5a1e7..d71b2991ad0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1677,6 +1677,12 @@ 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 + ;; 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") -- cgit v1.2.3 From d15258d991767ec83450fc6ebdb8ff2f60870501 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 00:06:03 -0400 Subject: gnu: qtwebsockets: Rename to qtwebsockets-5. Automated via: git grep -l qtwebsockets | xargs sed 's/\bqtwebsockets\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/qt.scm | 12 ++++++------ gnu/packages/radio.scm | 4 ++-- gnu/packages/security-token.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/video.scm | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0bb607abfce..de3ed5b387a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3235,7 +3235,7 @@ link REQUIRED)")))))) qtdeclarative-5 qtsvg-5 qtwebchannel - qtwebsockets)) + qtwebsockets-5)) (propagated-inputs ;to get native-search-path (list qtwebengine)) (home-page "https://github.com/supercollider/supercollider") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 51dec55bd72..a851a6853a9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -996,7 +996,7 @@ want what you have.") qtmultimedia-5 qtsvg-5 qttools - qtwebsockets + qtwebsockets-5 xz zlib)) (home-page "https://cockatrice.github.io") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d71b2991ad0..d8838ec2397 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1202,7 +1202,7 @@ integrate QML code with JavaScript and C++.") (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") @@ -1514,7 +1514,7 @@ and others."))) (base32 "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj")))) (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 @@ -1542,7 +1542,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) #t)))))) (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 @@ -2468,7 +2468,7 @@ module provides support functions to the automatically generated code.") ("qttools" ,qttools) ("qtwebchannel" ,qtwebchannel) ("qtwebkit" ,qtwebkit) - ("qtwebsockets" ,qtwebsockets) + ("qtwebsockets-5" ,qtwebsockets-5) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments @@ -3283,7 +3283,7 @@ color-related widgets.") qtsvg-5 qtwebchannel qtwebengine - qtwebsockets + qtwebsockets-5 qtx11extras qtxmlpatterns)) (propagated-inputs @@ -3333,7 +3333,7 @@ color-related widgets.") "qttools" "qtwebchannel" "qtwebengine" - "qtwebsockets" + "qtwebsockets-5" "qtx11extras" "qtxmlpatterns")))) (substitute* "cmake/Macros/PySideModules.cmake" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 989d5670f42..5f9767c8965 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1336,7 +1336,7 @@ weak-signal conditions.") jtdx-hamlib libusb qtbase-5 - qtwebsockets + qtwebsockets-5 qtmultimedia-5 qtserialport)) (arguments @@ -2165,7 +2165,7 @@ voice formats.") qtquickcontrols2-5 qtserialport qtspeech - qtwebsockets + qtwebsockets-5 rtl-sdr serialdv soapysdr diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 3c8d6d33212..5d95aebf140 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -858,7 +858,7 @@ devices.") (list qtbase-5 qtsvg-5 qtdeclarative-5 - qtwebsockets + qtwebsockets-5 qtgraphicaleffects qtquickcontrols2-5 pcsc-lite diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index f3641953417..40385124fdf 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -196,7 +196,7 @@ qtsolutions qtsvg-5 qtwebchannel - qtwebsockets + qtwebsockets-5 sqlite xdg-utils zlib)) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 29a3e651c9f..184dca8effc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4864,7 +4864,7 @@ transitions, and effects and then export your film to many common formats.") qtquickcontrols2-5 qtsvg-5 qtwebkit - qtwebsockets + qtwebsockets-5 qtx11extras sdl2)) (home-page "https://www.shotcut.org/") -- cgit v1.2.3 From 573055b7ef93fa5fe0885ed3cca281983bf35eff Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 07:46:04 -0400 Subject: gnu: Add qtwebsockets, version 6.3.1. * gnu/packages/qt.scm (qtwebsockets): New variable. --- gnu/packages/qt.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d8838ec2397..106396a5710 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1225,6 +1225,45 @@ 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."))) +(define-public qtwebsockets + (package + (name "qtwebsockets") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-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") -- cgit v1.2.3 From 0938c3e34a9004948baa56bb21017d20fb9c9c26 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 00:02:58 -0400 Subject: gnu: qtwebchannel: Rename to qtwebchannel-5. Automated via: git grep -l qtwebchannel | xargs sed 's/\bqtwebchannel\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 4 ++-- gnu/packages/engineering.scm | 2 +- gnu/packages/fcitx5.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-pim.scm | 10 +++++----- gnu/packages/kde.scm | 4 ++-- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 14 +++++++------- gnu/packages/sync.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/web.scm | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index de3ed5b387a..e3ee3dbfb74 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3234,7 +3234,7 @@ link REQUIRED)")))))) qtbase-5 qtdeclarative-5 qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebsockets-5)) (propagated-inputs ;to get native-search-path (list qtwebengine)) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 2f4755de557..32dc26868da 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -383,7 +383,7 @@ local system.") ("sqlite" ,sqlite) ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 6a9de32ffb1..5551fd05948 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -561,7 +561,7 @@ specialized device.") qtdeclarative-5 qtmultimedia-5 qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtxmlpatterns quazip-0 @@ -998,7 +998,7 @@ formats.") qtmultimedia-5 qtquickcontrols2-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine zlib)) (synopsis "EPWING dictionary reader") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d8d3e481d2e..c8d075f5d17 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2492,7 +2492,7 @@ comments."))) qtbase-5 qtdeclarative-5 qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtx11extras qtxmlpatterns diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 749c170fc7e..ea7f1be7521 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -393,7 +393,7 @@ the Anthy input method.") ("qtbase" ,qtbase-5) ("fcitx5-qt" ,fcitx5-qt) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine))) (native-inputs (list extra-cmake-modules pkg-config)) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0eaa64375dd..324178181c3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1960,7 +1960,7 @@ using the dataset of topographical information collected by qtbase-5 qtdeclarative-5 qtlocation - qtwebchannel + qtwebchannel-5 qtwebengine quazip routino diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 2a472fb6330..81b097df07d 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -533,7 +533,7 @@ It supports JPEG, PNG and GIF formats.") openexr-2 qtwebengine qtdeclarative-5 - qtwebchannel + qtwebchannel-5 fftwf gsl libtiff)) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 97475063dc8..2583a59a264 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -606,7 +606,7 @@ decentralized calling using P2P-DHT.") qrencode qtsvg-5 qtwebengine - qtwebchannel + qtwebchannel-5 qtmultimedia-5 qtdeclarative-5 qtgraphicaleffects diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 06da6db29a0..b78c4b8c453 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -727,7 +727,7 @@ for KDE PIM.") qtdeclarative-5 qtnetworkauth qtspeech - qtwebchannel + qtwebchannel-5 qtwebengine qtxmlpatterns)) (arguments @@ -1071,7 +1071,7 @@ and retrieving certificates from LDAP servers.") qgpgme qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine sonnet)) (arguments @@ -1323,7 +1323,7 @@ using a Qt/KMime C++ API.") qgpgme qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtwebkit sonnet)) @@ -1849,7 +1849,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") kwindowsystem qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine)) (arguments `(#:tests? #f)) ;; TODO 6/48 tests fail @@ -1932,7 +1932,7 @@ KDE using certificate-based crypto.") libkdepim qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine)) (arguments `(#:phases diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index f11419afb94..6e9d9d125fc 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -206,7 +206,7 @@ This package contains GUI widgets for baloo.") qgpgme qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine syndication)) (home-page "https://apps.kde.org/en/akregator") @@ -1028,7 +1028,7 @@ Python, PHP, and Perl.") qtlocation qtserialport qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine shapelib shared-mime-info diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 836b5037844..034648d02cf 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2911,7 +2911,7 @@ as phones, embedded computers or microcontrollers.") "\"../build")) #t))))) (inputs - (list qtbase-5 qtdeclarative-5 qtwebchannel)) + (list qtbase-5 qtdeclarative-5 qtwebchannel-5)) (propagated-inputs (list qtwebengine)) (home-page "https://movim.eu/") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 106396a5710..ce2e3ad8cc3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1542,7 +1542,7 @@ interacting with serial ports from within Qt."))) 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") @@ -2262,7 +2262,7 @@ using the Enchant spell-checking library.") qtbase-5 qtdeclarative-5 qtmultimedia-5 - qtwebchannel + qtwebchannel-5 re2 snappy eudev @@ -2505,7 +2505,7 @@ module provides support functions to the automatically generated code.") ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools" ,qttools) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebkit" ,qtwebkit) ("qtwebsockets-5" ,qtwebsockets-5) ("qtx11extras" ,qtx11extras) @@ -2609,7 +2609,7 @@ contain over 620 classes.") ("qtbase" ,qtbase-5) ("qtsvg-5" ,qtsvg-5) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine))) (arguments `(#:modules ((srfi srfi-1) @@ -3083,7 +3083,7 @@ different kinds of sliders, and much more.") ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel-5" ,qtwebchannel-5) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("libx11" ,libx11) @@ -3320,7 +3320,7 @@ color-related widgets.") qtsensors qtspeech qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebengine qtwebsockets-5 qtx11extras @@ -3370,7 +3370,7 @@ color-related widgets.") "qtspeech" "qtsvg-5" "qttools" - "qtwebchannel" + "qtwebchannel-5" "qtwebengine" "qtwebsockets-5" "qtx11extras" diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 40385124fdf..10aef0c83a9 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -195,7 +195,7 @@ qtquickcontrols2-5 qtsolutions qtsvg-5 - qtwebchannel + qtwebchannel-5 qtwebsockets-5 sqlite xdg-utils diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 66426201558..acf0400b752 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -671,7 +671,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. qtmultimedia-5 qtquickcontrols-5 qtsvg-5 - qtwebchannel)) + qtwebchannel-5)) (propagated-inputs ; To get native-search-path (list qtwebengine)) (arguments diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 54923838822..f6c618478fa 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8092,7 +8092,7 @@ It contains the code shared by all Kiwix ports.") pugixml qtbase-5 qtdeclarative-5 - qtwebchannel + qtwebchannel-5 qtwebengine xapian zlib -- cgit v1.2.3 From ef648459df868be6a44c7bfdb491e8e50bb9bfc6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 07:49:35 -0400 Subject: gnu: Add qtwebchannel, version 6.3.1. * gnu/packages/qt.scm (qtwebchannel): New variable. --- gnu/packages/qt.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ce2e3ad8cc3..3f1f468b7ef 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1561,6 +1561,43 @@ between the host (QML/C++ application) and the client (HTML/JavaScript 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 (qt5-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") -- cgit v1.2.3 From a0beb297a352930b89051ff258a06d78f224d6b9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 07:57:16 -0400 Subject: gnu: qtwebengine: Rename to qtwebengine-5. Automated with: git grep -l qtwebengine | xargs sed 's/\bqtwebengine\b/\0-5/g' -i git checkout NEWS --- gnu/packages/audio.scm | 2 +- gnu/packages/documentation.scm | 4 ++-- gnu/packages/ebook.scm | 2 +- gnu/packages/education.scm | 10 +++++----- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/fcitx5.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-pim.scm | 12 ++++++------ gnu/packages/kde.scm | 6 +++--- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 14 +++++++------- gnu/packages/sync.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/vpn.scm | 4 ++-- gnu/packages/web-browsers.scm | 8 ++++---- gnu/packages/web.scm | 4 ++-- 19 files changed, 42 insertions(+), 42 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e3ee3dbfb74..f0ffeed210e 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3237,7 +3237,7 @@ link REQUIRED)")))))) qtwebchannel-5 qtwebsockets-5)) (propagated-inputs ;to get native-search-path - (list qtwebengine)) + (list 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 32dc26868da..6f24149b5dc 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -371,7 +371,7 @@ local system.") (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/zeal")) (qt-process-path (string-append - (assoc-ref inputs "qtwebengine") + (assoc-ref inputs "qtwebengine-5") "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) @@ -384,7 +384,7 @@ local system.") ("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine) + ("qtwebengine-5" ,qtwebengine-5) ("qtquickcontrols-5" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras) ("xcb-util-keyms" ,xcb-util-keysyms))) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 5d864da2815..ccc0bdf88d7 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -202,7 +202,7 @@ with Microsoft Compiled HTML (CHM) files") python-regex speech-dispatcher python-zeroconf - qtwebengine + qtwebengine-5 sqlite)) (arguments (list diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 5551fd05948..aabf3dfc210 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -448,7 +448,7 @@ specialized device.") (define-public openboard ;; The last release builds from qtwebkit, which is planned for removal in ;; Guix, so use the latest commit of the 1.7-dev branch, which builds with - ;; qtwebengine. + ;; qtwebengine-5. (let ((commit "39e914f600d26565706f0e5b6ea2482b8b4038c7") ;1.6.2-rc0311 (revision "1")) (package @@ -562,7 +562,7 @@ specialized device.") qtmultimedia-5 qtsvg-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 qtxmlpatterns quazip-0 sdl @@ -807,9 +807,9 @@ stored and user can review his performance in any time.") ("python-requests" ,python-requests) ("python-send2trash" ,python-send2trash) ("python-sip" ,python-sip) - ;; `qtwebengine' is included in `pyqtwebengine', included here for easy + ;; `qtwebengine-5' is included in `pyqtwebengine', included here for easy ;; wrapping. - ("qtwebengine" ,qtwebengine))) + ("qtwebengine-5" ,qtwebengine-5))) (home-page "https://apps.ankiweb.net/") (synopsis "Powerful, intelligent flash cards") (description "Anki is a program which makes remembering things @@ -999,7 +999,7 @@ formats.") qtquickcontrols2-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 zlib)) (synopsis "EPWING dictionary reader") (description "qolibri is a dictionary viewer for the EPWING dictionary diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 217e90b8fbc..3804ef402a2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13111,7 +13111,7 @@ programming and reproducible research.") (sha256 (base32 "17aca4mc3gbdh6nhlcaa5ymh1yy76nwysrvy9sfcqkzvd5lgagzc")) ;; XXX: ob-sclang.el is packaged separately to avoid the dependency on - ;; SuperCollider and qtwebengine. This will be unnecessary in 0.4+ + ;; SuperCollider and qtwebengine-5. This will be unnecessary in 0.4+ ;; release as the file is going to be removed from the repository. ;; XXX: org-contacts.el is now maintained in a separate repository and diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index c8d075f5d17..303dd0b737a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2493,7 +2493,7 @@ comments."))) qtdeclarative-5 qtsvg-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 qtx11extras qtxmlpatterns sqlite diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index ea7f1be7521..00648ea9639 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -394,7 +394,7 @@ the Anthy input method.") ("fcitx5-qt" ,fcitx5-qt) ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine))) + ("qtwebengine-5" ,qtwebengine-5))) (native-inputs (list extra-cmake-modules pkg-config)) (outputs '("out" "gui")) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 324178181c3..b8125ffe6e0 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1961,7 +1961,7 @@ using the dataset of topographical information collected by qtdeclarative-5 qtlocation qtwebchannel-5 - qtwebengine + qtwebengine-5 quazip routino sqlite ; See wrap phase diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 81b097df07d..045fdae882e 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -531,7 +531,7 @@ It supports JPEG, PNG and GIF formats.") libjpeg-turbo lcms openexr-2 - qtwebengine + qtwebengine-5 qtdeclarative-5 qtwebchannel-5 fftwf diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 2583a59a264..22d2f0c5ce5 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -605,7 +605,7 @@ decentralized calling using P2P-DHT.") network-manager qrencode qtsvg-5 - qtwebengine + qtwebengine-5 qtwebchannel-5 qtmultimedia-5 qtdeclarative-5 diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index b78c4b8c453..f0f5683ac5d 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -728,7 +728,7 @@ for KDE PIM.") qtnetworkauth qtspeech qtwebchannel-5 - qtwebengine + qtwebengine-5 qtxmlpatterns)) (arguments ;; TODO: 5/45 tests fail for quite different reasons, even with @@ -1072,7 +1072,7 @@ and retrieving certificates from LDAP servers.") qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 sonnet)) (arguments `(#:phases @@ -1324,7 +1324,7 @@ using a Qt/KMime C++ API.") qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 qtwebkit sonnet)) (arguments @@ -1656,7 +1656,7 @@ Virtual Contact File}) files to the KPeople contact management library.") libxslt purpose qtbase-5 - qtwebengine)) + qtwebengine-5)) (arguments `(#:tests? #f)) ;; TODO tests hang (home-page "https://invent.kde.org/pim/pimcommon") @@ -1850,7 +1850,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine)) + qtwebengine-5)) (arguments `(#:tests? #f)) ;; TODO 6/48 tests fail (home-page "https://invent.kde.org/pim/libkgapi") @@ -1933,7 +1933,7 @@ KDE using certificate-based crypto.") qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine)) + qtwebengine-5)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 6e9d9d125fc..c43758ef7f1 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -170,7 +170,7 @@ This package contains GUI widgets for baloo.") (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/akregator")) (qt-process-path (string-append - (assoc-ref inputs "qtwebengine") + (assoc-ref inputs "qtwebengine-5") "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) @@ -207,7 +207,7 @@ This package contains GUI widgets for baloo.") qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 syndication)) (home-page "https://apps.kde.org/en/akregator") (synopsis "KDE Feed Reader") @@ -1029,7 +1029,7 @@ Python, PHP, and Perl.") qtserialport qtsvg-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 shapelib shared-mime-info zlib)) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 034648d02cf..e5dd078561a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2913,7 +2913,7 @@ as phones, embedded computers or microcontrollers.") (inputs (list qtbase-5 qtdeclarative-5 qtwebchannel-5)) (propagated-inputs - (list qtwebengine)) + (list 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 3f1f468b7ef..3450efe08bc 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2011,7 +2011,7 @@ 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") @@ -2206,7 +2206,7 @@ using the Enchant spell-checking library.") (_ #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" @@ -2324,7 +2324,7 @@ using the Enchant spell-checking library.") (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\\)") @@ -2354,7 +2354,7 @@ using the Enchant spell-checking library.") (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" @@ -2647,7 +2647,7 @@ contain over 620 classes.") ("qtsvg-5" ,qtsvg-5) ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebengine" ,qtwebengine))) + ("qtwebengine-5" ,qtwebengine-5))) (arguments `(#:modules ((srfi srfi-1) ((guix build python-build-system) #:select (python-version)) @@ -3358,7 +3358,7 @@ color-related widgets.") qtspeech qtsvg-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 qtwebsockets-5 qtx11extras qtxmlpatterns)) @@ -3408,7 +3408,7 @@ color-related widgets.") "qtsvg-5" "qttools" "qtwebchannel-5" - "qtwebengine" + "qtwebengine-5" "qtwebsockets-5" "qtx11extras" "qtxmlpatterns")))) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 10aef0c83a9..5b82e0ca3d1 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -201,7 +201,7 @@ xdg-utils zlib)) (propagated-inputs - (list qtwebengine)) + (list 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 acf0400b752..345454bd62e 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -673,7 +673,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. qtsvg-5 qtwebchannel-5)) (propagated-inputs ; To get native-search-path - (list qtwebengine)) + (list qtwebengine-5)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index a884feabf49..17dd163c53c 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -737,7 +737,7 @@ and probably others.") (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/openconnect-sso")) (qt-process-path (string-append - (assoc-ref inputs "qtwebengine") + (assoc-ref inputs "qtwebengine-5") "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin #:sh (search-input-file inputs "bin/bash") @@ -757,7 +757,7 @@ and probably others.") python-pyxdg python-structlog python-toml - qtwebengine)) + qtwebengine-5)) (native-inputs (list python-pytest python-setuptools-scm)) (home-page "https://github.com/vlaci/openconnect-sso") diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 751478c3d1f..f47db2e7529 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -492,11 +492,11 @@ interface.") ;; that it's __init__.py is used first. python-pyqtwebengine python-pyqt-without-qtwebkit - ;; While qtwebengine is provided by python-pyqtwebengine, it's + ;; While qtwebengine-5 is provided by python-pyqtwebengine, it's ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. - qtwebengine)) + qtwebengine-5)) (arguments - `(;; FIXME: With the existance of qtwebengine, tests can now run. But + `(;; FIXME: With the existance of qtwebengine-5, tests can now run. But ;; they are still disabled because test phase hangs. It's not readily ;; apparent as to why. #:tests? #f @@ -543,7 +543,7 @@ interface.") (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/qutebrowser")) (qt-process-path (string-append - (assoc-ref inputs "qtwebengine") + (assoc-ref inputs "qtwebengine-5") "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f6c618478fa..8b414770144 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8078,7 +8078,7 @@ It contains the code shared by all Kiwix ports.") (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/kiwix-desktop")) (qt-process-path (string-append - (assoc-ref inputs "qtwebengine") + (assoc-ref inputs "qtwebengine-5") "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) @@ -8093,7 +8093,7 @@ It contains the code shared by all Kiwix ports.") qtbase-5 qtdeclarative-5 qtwebchannel-5 - qtwebengine + qtwebengine-5 xapian zlib `(,zstd "lib"))) -- cgit v1.2.3 From f1e126c03b25a9d20c3543d082b1f5a7d756e0f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 23:13:46 -0400 Subject: gnu: Add qtwebengine, version 6.3.1. * gnu/packages/qt.scm (qtwebengine): New variable. --- gnu/packages/qt.scm | 345 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 345 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 3450efe08bc..ce5df74f7d2 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -88,6 +88,7 @@ #: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) @@ -98,6 +99,7 @@ #: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) @@ -2376,6 +2378,349 @@ using the Chromium browser project. The Chromium source code has Google service and binaries removed, and adds modular support for using system libraries.") (license license:lgpl2.1+))) +(define-public qtwebengine + (package + (name "qtwebengine") + (version "6.3.1") + (source + (origin + (method url-fetch) + (uri (qt5-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/qt5/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")) -- cgit v1.2.3 From de20b74fc2debed186edbd613c7afe6a992c02b2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 18 Jul 2022 23:54:41 -0400 Subject: gnu: Add qt5compat. * gnu/packages/qt.scm (qt5compat): New variable. --- gnu/packages/qt.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ce5df74f7d2..488cfa61206 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -831,6 +831,35 @@ developers using C++ or QML, a CSS & JavaScript like language.") (variable "XDG_CONFIG_DIRS") (files '("etc/xdg"))))))) +(define-public qt5compat + (package + (name "qt5compat") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-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) -- cgit v1.2.3 From eef8e2ec46c4155980815e00a394428c0c3de075 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 16:52:05 -0400 Subject: gnu: qttools: Rename to qttools-5. Automated with: git grep -l qttools | xargs sed 's/\bqttools\b/\0-5/g' -i git checkout NEWS --- gnu/packages/animation.scm | 2 +- gnu/packages/astronomy.scm | 2 +- gnu/packages/audio.scm | 10 ++-- gnu/packages/benchmark.scm | 2 +- gnu/packages/bittorrent.scm | 2 +- gnu/packages/connman.scm | 2 +- gnu/packages/databases.scm | 2 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/djvu.scm | 2 +- gnu/packages/education.scm | 6 +- gnu/packages/electronics.scm | 2 +- gnu/packages/emulators.scm | 2 +- gnu/packages/engineering.scm | 8 +-- gnu/packages/finance.scm | 24 ++++---- gnu/packages/game-development.scm | 4 +- gnu/packages/games.scm | 12 ++-- gnu/packages/geo.scm | 8 +-- gnu/packages/gps.scm | 4 +- gnu/packages/graphics.scm | 2 +- gnu/packages/hardware.scm | 4 +- gnu/packages/image-processing.scm | 6 +- gnu/packages/image-viewers.scm | 6 +- gnu/packages/image.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 66 +++++++++++----------- gnu/packages/kde-multimedia.scm | 2 +- gnu/packages/kde-pim.scm | 20 +++---- gnu/packages/kde-utils.scm | 2 +- gnu/packages/kde.scm | 16 +++--- gnu/packages/lego.scm | 2 +- gnu/packages/linphone.scm | 2 +- gnu/packages/lxqt.scm | 52 ++++++++--------- gnu/packages/maths.scm | 8 +-- gnu/packages/messaging.scm | 6 +- gnu/packages/music.scm | 36 ++++++------ gnu/packages/networking.scm | 2 +- gnu/packages/password-utils.scm | 4 +- gnu/packages/patches/xygrib-fix-finding-data.patch | 2 +- gnu/packages/photo.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/qt.scm | 26 ++++----- gnu/packages/radio.scm | 8 +-- gnu/packages/robotics.scm | 2 +- gnu/packages/scribus.scm | 2 +- gnu/packages/security-token.scm | 6 +- gnu/packages/sync.scm | 4 +- gnu/packages/synergy.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/telephony.scm | 4 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/video.scm | 8 +-- guix/lint.scm | 4 +- 53 files changed, 207 insertions(+), 207 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index c7f80a4b6a6..ba8ce00fbd7 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -448,7 +448,7 @@ language.") ("qtmultimedia-5" ,qtmultimedia-5) ("libsndfile" ,libsndfile))) (native-inputs - (list qttools)) + (list qttools-5)) (home-page "https://www.lostmarble.com/papagayo/") (synopsis "Lip-syncing for animations") (description diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 95659104ce2..acac8449abf 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -615,7 +615,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") `(("gettext" ,gettext-minimal) ; xgettext is used at compile time ("perl" ,perl) ; for pod2man ("qtbase" ,qtbase-5) ; Qt MOC is needed at compile time - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (arguments `(#:test-target "test" #:configure-flags (list "-DENABLE_TESTING=1" diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f0ffeed210e..aad86bac068 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -587,7 +587,7 @@ implementation of Adaptive Multi Rate Narrowband and Wideband liblo qtbase-5)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "http://alsamodular.sourceforge.net/") (synopsis "Realtime modular synthesizer and effect processor") (description @@ -3097,7 +3097,7 @@ different audio devices such as ALSA or PulseAudio.") (inputs (list jack-1 alsa-lib portaudio qtbase-5 qtx11extras)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://qjackctl.sourceforge.io/") (synopsis "Jack server control application") (description "Control a Jack server. Allows you to plug various sources @@ -3218,7 +3218,7 @@ link REQUIRED)")))))) (string-append ide "/bin")) (delete-file scide))))))) (native-inputs - (list ableton-link pkg-config qttools xorg-server-for-tests)) + (list ableton-link pkg-config qttools-5 xorg-server-for-tests)) (inputs (list jack-1 libsndfile fftw @@ -3903,7 +3903,7 @@ interface.") (arguments `(#:tests? #f)) ; no "check" phase (native-inputs - (list qttools pkg-config)) + (list qttools-5 pkg-config)) (inputs (list fluidsynth qtbase-5 qtx11extras)) (home-page "https://qsynth.sourceforge.io") @@ -5456,7 +5456,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.") portaudio ;for portaudio examples qtbase-5 ;for Qt examples qtdeclarative-5 - qttools)) + qttools-5)) (inputs (list jack-1 ;for JACK examples qtquickcontrols-5)) ;for Qt examples diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 4ea12e4cf36..7be932f5284 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -499,7 +499,7 @@ and options. With careful benchmarking, different hardware can be compared.") (substitute* "src/benchmark.cpp" (("\"fio\"") (format #f "~s" (search-input-file inputs "bin/fio"))))))))) - (native-inputs (list extra-cmake-modules qttools)) + (native-inputs (list extra-cmake-modules qttools-5)) (inputs (list fio qtbase-5)) (home-page "https://github.com/JonMagon/KDiskMark") (synopsis "Simple disk benchmark tool") diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index fe235d4b3b7..43fc287b954 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -470,7 +470,7 @@ desktops.") (wrap-qt-program "qbittorrent" #:output out #:inputs inputs)) #t))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs `(("boost" ,boost) ("libtorrent-rasterbar" ,libtorrent-rasterbar) diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm index 71dff3588fa..f4e6e43ec84 100644 --- a/gnu/packages/connman.scm +++ b/gnu/packages/connman.scm @@ -165,7 +165,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and Bluetooth.") (inputs (list qtbase-5)) (native-inputs - (list qttools)) + (list qttools-5)) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 4a28aa79cbc..9535b65dbd3 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -4782,7 +4782,7 @@ a Gtk.Grid Widget.") qscintilla qtbase-5 sqlite)) - (native-inputs (list qttools)) + (native-inputs (list qttools-5)) (home-page "https://sqlitebrowser.org/") (synopsis "Database browser for SQLite") (description "Sqlitebrowser is a high quaility, visual, open source tool to diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 32ec5c3141d..efeea2924d4 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -78,7 +78,7 @@ "0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list elogind glib diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index b85193ccdb8..92b4b6dce73 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm @@ -107,7 +107,7 @@ utilities.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - (list autoconf automake libtool pkg-config qttools)) + (list autoconf automake libtool pkg-config qttools-5)) (inputs (list djvulibre glib libxt libtiff qtbase-5)) (arguments diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index aabf3dfc210..c5666fb02ed 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -174,7 +174,7 @@ of categories with some of the activities available in that category. gettext-minimal kdoctools perl - qttools + qttools-5 xorg-server-for-tests)) (inputs (list openssl @@ -540,7 +540,7 @@ specialized device.") (symlink (string-append openboard "/OpenBoard") (string-append bin "/openboard"))))))))) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list alsa-lib coreutils-minimal ;for patched 'env' shebang @@ -991,7 +991,7 @@ formats.") (arguments '(#:tests? #f)) ; no test target (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list libeb qtbase-5 diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 342294de130..15e73189262 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -373,7 +373,7 @@ such as: (rmdir "doc/pulseview") (rmdir "doc")))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list boost glib diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index ba7fa1dbe2e..386e127e1e6 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -744,7 +744,7 @@ The following systems are supported: (list "-DUSE_LZMA=OFF" ;do not use bundled LZMA "-DUSE_LIBZIP=OFF"))) ;use "zlib" instead (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list ffmpeg libedit diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 303dd0b737a..57efaee50b3 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -762,7 +762,7 @@ ready for production.") (substitute* "qelectrotech.pro" (("\\/usr\\/local") out)) (invoke "qmake"))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg-5 sqlite)) (home-page "https://qelectrotech.org/") @@ -2120,7 +2120,7 @@ parallel computing platforms. It also supports serial execution.") (inputs (list qtbase-5 qtsvg-5 zlib)) (native-inputs - (list qttools ; for lrelease + (list qttools-5 ; for lrelease unzip)) (arguments `(#:phases @@ -2452,7 +2452,7 @@ comments."))) (native-inputs (list doxygen graphviz - qttools + qttools-5 pkg-config python-pyside-2-tools swig)) @@ -3715,7 +3715,7 @@ netlists from the drawn schematic, allowing the simulation of the circuit.") (base32 "08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783")))) (build-system gnu-build-system) - (native-inputs (list qttools)) + (native-inputs (list qttools-5)) (inputs (list qtbase-5 qtserialport)) (arguments (list #:tests? #f ; no tests. diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b7937a310a8..5ff345acc0a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -143,7 +143,7 @@ pkg-config python ; for the tests util-linux ; provides the hexdump command for tests - qttools)) + qttools-5)) (inputs (list bdb-4.8 ; 4.8 required for compatibility boost @@ -159,12 +159,12 @@ (assoc-ref %build-inputs "boost")) ;; XXX: The configure script looks up Qt paths by ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick - ;; up executables residing in 'qttools', so we specify them here. + ;; up executables residing in 'qttools-5', so we specify them here. (string-append "ac_cv_path_LRELEASE=" - (assoc-ref %build-inputs "qttools") + (assoc-ref %build-inputs "qttools-5") "/bin/lrelease") (string-append "ac_cv_path_LUPDATE=" - (assoc-ref %build-inputs "qttools") + (assoc-ref %build-inputs "qttools-5") "/bin/lupdate")) #:phases (modify-phases %standard-phases @@ -698,7 +698,7 @@ blockchain.") pkg-config protobuf python - qttools)) + qttools-5)) (inputs (list boost cppzmq @@ -1543,7 +1543,7 @@ Trezor wallet.") (list pkg-config python ; for the tests util-linux ; provides the hexdump command for tests - qttools)) + qttools-5)) (inputs (list bdb-5.3 boost @@ -1657,7 +1657,7 @@ following three utilities are included with the library: pkg-config python ; for the tests util-linux ; provides the hexdump command for tests - qttools)) + qttools-5)) (inputs (list bdb-4.8 boost @@ -1677,12 +1677,12 @@ following three utilities are included with the library: (assoc-ref %build-inputs "boost")) ;; XXX: The configure script looks up Qt paths by ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick - ;; up executables residing in 'qttools', so we specify them here. + ;; up executables residing in 'qttools-5', so we specify them here. (string-append "ac_cv_path_LRELEASE=" - (assoc-ref %build-inputs "qttools") + (assoc-ref %build-inputs "qttools-5") "/bin/lrelease") (string-append "ac_cv_path_LUPDATE=" - (assoc-ref %build-inputs "qttools") + (assoc-ref %build-inputs "qttools-5") "/bin/lupdate") "--disable-static") #:phases @@ -1731,7 +1731,7 @@ a Qt GUI.") (string-append "PREFIX=" %output) "features=")))))) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list python qtbase-5 rocksdb zlib)) (home-page "https://gitlab.com/FloweeTheHub/fulcrum/") @@ -1798,7 +1798,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.") openssl qtbase-5)) (native-inputs - (list pkg-config qttools util-linux)) ; provides the hexdump command for tests + (list pkg-config qttools-5 util-linux)) ; provides the hexdump command for tests (home-page "https://flowee.org") (synopsis "Flowee infrastructure tools and services") (description diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f426532cb13..70bd4c0251f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -522,7 +522,7 @@ formats such as PNG.") (inputs (list qtbase-5 qtdeclarative-5 qtsvg-5 zlib)) (native-inputs - (list qttools)) + (list qttools-5)) (arguments '(#:phases (modify-phases %standard-phases @@ -531,7 +531,7 @@ formats such as PNG.") (substitute* "translations/translations.pro" (("LRELEASE =.*") (string-append "LRELEASE = " - (assoc-ref inputs "qttools") + (assoc-ref inputs "qttools-5") "/bin/lrelease\n"))) (let ((out (assoc-ref outputs "out"))) (invoke "qmake" diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a851a6853a9..8b655cc0e43 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -995,7 +995,7 @@ want what you have.") qtbase-5 qtmultimedia-5 qtsvg-5 - qttools + qttools-5 qtwebsockets-5 xz zlib)) @@ -2504,7 +2504,7 @@ and defeat them with your bubbles!") (setenv "XDG_RUNTIME_DIR" (getcwd)) #t))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs `(("glm" ,glm) ("libmodplug" ,libmodplug) @@ -7203,7 +7203,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available. (native-inputs `(("cmake" ,cmake-minimal) ("gettext-minimal" ,gettext-minimal) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (synopsis "Realistic physics puzzle game") (description "The Butterfly Effect (tbe) is a game that uses realistic physics simulations to combine lots of simple mechanical @@ -9279,7 +9279,7 @@ and also provides the base for the FlightGear Flight Simulator.") (native-inputs `(("cppunit" ,cppunit) ("pkg-config" ,pkg-config) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("flightgear-data" ,(origin (method url-fetch) @@ -9407,7 +9407,7 @@ play with up to four players simultaneously. It has network support.") ("sdl" ,(sdl-union (list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image))))) (native-inputs - (list clang-9 ghc pkg-config qttools)) + (list clang-9 ghc pkg-config qttools-5)) (home-page "https://hedgewars.org/") (synopsis "Turn-based artillery game featuring fighting hedgehogs") (description @@ -11883,7 +11883,7 @@ and chess engines.") (base32 "01fjchil2h6ry2ywr0dwjw2g7zd29580cr4c74d5z74h999lp6nh")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib)) (arguments diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index b8125ffe6e0..fe2174b1068 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1495,7 +1495,7 @@ map display. Downloads map data from a number of websites, including (string-append "\"" font "/share/fonts/\""))))))) #:tests? #f)) ; no tests (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list bzip2 font-liberation @@ -1952,7 +1952,7 @@ using the dataset of topographical information collected by (base32 "184fqmsfzr3b333ssizjk6gvv7mncmygq8dj5r7rsvs5md26z2ys")))) (build-system qt-build-system) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list gdal libjpeg-turbo @@ -2199,7 +2199,7 @@ track your position right from your laptop.") ("zlib" ,zlib))) (native-inputs `(("doxygen" ,doxygen) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (home-page "https://www.openorienteering.org/apps/mapper/") (synopsis "OpenOrienteering Mapper (OOM)") (description @@ -2634,7 +2634,7 @@ growing set of geoscientific methods.") pkg-config python-mock python-nose2 - qttools + qttools-5 shellcheck xorg-server-for-tests)) (home-page "https://qgis.org") diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index b117ff4222f..e528807de7d 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -84,7 +84,7 @@ (inputs (list expat libusb qtbase-5 zlib)) (native-inputs - (list which qttools libxml2)) ;'xmllint' needed for the KML tests + (list which qttools-5 libxml2)) ;'xmllint' needed for the KML tests (home-page "https://www.gpsbabel.org/") (synopsis "Convert and exchange data with GPS and map programs") (description @@ -196,7 +196,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (inputs (list qtbase-5 qtlocation qtsvg-5)) (native-inputs - (list qttools)) + (list qttools-5)) (home-page "https://www.gpxsee.org") (synopsis "GPS log file viewer and analyzer") (description diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f7307e8f616..38e6533a43b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1438,7 +1438,7 @@ exec -a \"$0\" ~a/.brdf-real~%" (chmod "brdf" #o555))) #t))))) (native-inputs - (list qttools)) ;for 'qmake' + (list qttools-5)) ;for 'qmake' (inputs (list qtbase-5 mesa glew freeglut zlib)) (home-page "https://www.disneyanimation.com/technology/brdf.html") diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 27567bb38e6..68c4667662b 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -453,7 +453,7 @@ support.") (wrap-qt-program "ckb-next" #:output out #:inputs inputs))))))) - (native-inputs (list qttools pkg-config)) + (native-inputs (list qttools-5 pkg-config)) (inputs (list qtbase-5 zlib libdbusmenu-qt @@ -534,7 +534,7 @@ calibrated, and restored when the calibration is applied.") (arguments '(#:tests? #f)) ; No test suite (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list ddcutil glib qtbase-5)) (home-page "https://www.ddcutil.com/") diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index d4b13cc90e7..158d4708287 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -770,7 +770,7 @@ including 2D color images.") (add-after 'unpack 'qt-chdir (lambda _ (chdir "gmic-qt") #t)))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (modify-inputs (package-inputs gmic) (prepend gmic qtbase-5))) @@ -1109,7 +1109,7 @@ combine the information contained in both.") zlib)) (native-inputs `(("googletest" ,googletest) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("pkg-config" ,pkg-config) ("c3d-src" ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3") @@ -1224,7 +1224,7 @@ substituted by matching images.") "0kixwjb2x457dq7927hkh34c803p7yh1pmn6n61rk9shqrcg492h")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs `(("boost" ,boost) ("libjpeg" ,libjpeg-turbo) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 045fdae882e..88dbba866b6 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -516,7 +516,7 @@ It supports JPEG, PNG and GIF formats.") "188q0l63nfasqfvwbq4mwx2vh7wsfi2bq9n5nksddspl1qz01lnp")))) (build-system cmake-build-system) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list qtbase-5 qtdeclarative-5 @@ -671,7 +671,7 @@ For PDF support, install the @emph{mupdf} package.") (invoke "qmake" "tests.pro") (invoke "make" "tests")))))))) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtimageformats qtsvg-5)) (home-page "https://interversehq.com/qview/") @@ -924,7 +924,7 @@ archives.") ("qtsvg-5" ,qtsvg-5))) (native-inputs `(("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) + ("qtlinguist" ,qttools-5))) (synopsis "Image viewer supporting all common formats") (description "Nomacs is a simple to use image lounge featuring semi-transparent widgets that display additional information such as metadata, diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 90554143d01..4b31ba41a06 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1828,7 +1828,7 @@ parsing, viewing, modifying, and saving this metadata.") "1p7gqs5vqzbddlgl38lbanchwb14m6lx8f2cn2c5p0vyqwvqqv52")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtsvg-5)) (arguments diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 67a86cbfc15..efb32a39e07 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -126,7 +126,7 @@ (let ((inxi (search-input-file inputs "/bin/inxi"))) (symlink inxi "data/scripts/inxi"))))))) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list boost inxi-minimal diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 22d2f0c5ce5..e5c29981d39 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -598,7 +598,7 @@ decentralized calling using P2P-DHT.") (("Qt::AA_UseOpenGLES") "Qt::AA_UseDesktopOpenGL"))))))) (native-inputs - (list pkg-config python qttools doxygen graphviz)) + (list pkg-config python qttools-5 doxygen graphviz)) (inputs (list jami-libclient libnotify diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 6fc0b5f10c6..391db94f3ac 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -185,7 +185,7 @@ common build settings used in software produced by the KDE community.") (native-inputs ;; TODO: Think about adding pulseaudio. Is it required for sound? ;; TODO: Add building the super experimental QML support - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list qtbase-5)) (arguments @@ -222,7 +222,7 @@ common build settings used in software produced by the KDE community.") "1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list qtbase-5 phonon @@ -489,7 +489,7 @@ and the older vCalendar.") "0y9n2a5n18pasdmrp0xb84hla9l27yj2x3k4p1c041sd9nkwixpk")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules gperf qttools)) + (list extra-cmake-modules gperf qttools-5)) (inputs (list qtbase-5)) (home-page "https://community.kde.org/Frameworks") @@ -523,7 +523,7 @@ Internet).") "1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n")))) (build-system cmake-build-system) (native-inputs - (list dbus extra-cmake-modules inetutils qttools + (list dbus extra-cmake-modules inetutils qttools-5 xorg-server-for-tests)) (inputs (list qtbase-5)) @@ -585,7 +585,7 @@ propagate their changes to their respective configuration files.") "10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools shared-mime-info + (list extra-cmake-modules qttools-5 shared-mime-info ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam xorg-server-for-tests)) ; for the tests (inputs @@ -641,7 +641,7 @@ many more.") (patches (search-patches "kdbusaddons-kinit-file-name.patch")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules dbus qttools)) + (list extra-cmake-modules dbus qttools-5)) (inputs (list qtbase-5 qtx11extras kinit-bootstrap)) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons. (arguments @@ -681,7 +681,7 @@ as well as an API to create KDED modules.") "0wadknnf472rqg2xnqzs5v23qzqfr336wj6d96yg2ayqm0chbppy")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list avahi ; alternativly dnssd could be used qtbase-5)) @@ -773,7 +773,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (display "[testDefaultRegions]\n*\n"))) #t))))) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list qtbase-5 qtdeclarative-5)) (home-page "https://invent.kde.org/frameworks/kholidays") @@ -868,7 +868,7 @@ or user activity.") (properties `((upstream-name . "kirigami2"))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kwindowsystem ;; TODO: Find a way to activate this optional include without @@ -952,7 +952,7 @@ model to observers "04vlmkvc3y5h7cpb6kdv9gha5axxkimhqh44mdg2ncyn4sas6j68")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list qtbase-5)) (home-page "https://community.kde.org/Frameworks") @@ -977,7 +977,7 @@ to flat and hierarchical lists.") "1wj4n2a8iz9ml1y0012xkpsx3dfp5gl2dn80sifrzvkxjxrhwach")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list qtbase-5)) (home-page "https://community.kde.org/Frameworks") @@ -1004,7 +1004,7 @@ pixel units.") "12jn7lqsp86329spai7n1n8i65nwhxh8gp33wkq543h7w3i2a3jb")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules perl qttools + (list extra-cmake-modules perl qttools-5 ;; Optional, for compile-time validation of syntax definition files: qtxmlpatterns)) (inputs @@ -1088,7 +1088,7 @@ represented by a QPoint or a QSize.") "03l37lh219np7pqfa56r2v7n5s5xg4rjq005qng4b5izd95ri56j")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools xorg-server-for-tests)) + (list extra-cmake-modules qttools-5 xorg-server-for-tests)) (inputs (list qtbase-5)) (arguments @@ -1127,7 +1127,7 @@ configuration pages, message boxes, and password requests.") pkg-config dbus ; for the tests openbox ; for the tests - qttools + qttools-5 xorg-server-for-tests)) ; for the tests (inputs `(("libxrender" ,libxrender) @@ -1373,7 +1373,7 @@ feel.") (setenv "DBUS_FATAL_WARNINGS" "0") (invoke "dbus-launch" "ctest" ".")))))) (native-inputs - (list bison dbus extra-cmake-modules flex qttools)) + (list bison dbus extra-cmake-modules flex qttools-5)) (inputs `(("qtbase" ,qtbase-5) ("qtdeclarative-5" ,qtdeclarative-5) @@ -1401,7 +1401,7 @@ system.") "0b88h5fw1n8zyrg0vq3lj2jbjjyh0mk64lj6ab3643kxzqxbn30w")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list hunspell ;; TODO: hspell (for Hebrew), Voikko (for Finish) @@ -1503,7 +1503,7 @@ with other frameworks.") "0nmdz7ra3hpg0air4lfkzilv7cwx3zxs29k7sh8l3i1fs3qpjwxm")))) (build-system cmake-build-system) (native-inputs - (list dbus extra-cmake-modules qttools)) + (list dbus extra-cmake-modules qttools-5)) (inputs (list kcoreaddons polkit-qt qtbase-5)) (arguments @@ -1546,7 +1546,7 @@ utilities.") "1pjgya8wi28jx63hcdi9v5f5487gzbkw2j1iganhd7bhcb8s7zpy")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kconfig kwidgetsaddons qtbase-5)) (home-page "https://community.kde.org/Frameworks") @@ -1800,7 +1800,7 @@ formats.") "13kdczzyyh17hf6vlhh4li5bn4yq5bab5xa8mm63r9rynxihgclf")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras)) (home-page "https://community.kde.org/Frameworks") @@ -1824,7 +1824,7 @@ asynchronous jobs.") "01bn23xw2n53h9nl99lm3cjnqs8s66bmwkzf6fkpg9rzkykizbyc")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules dbus qttools)) + (list extra-cmake-modules dbus qttools-5)) (inputs (list kcodecs kconfig @@ -2134,7 +2134,7 @@ by which applications, and what documents have been linked to which activity.") (propagated-inputs (list kwidgetsaddons)) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kauth kcodecs @@ -2236,7 +2236,7 @@ KCModules can be created with the KConfigWidgets framework.") ki18n ;; todo: PythonModuleGeneration qtbase-5 - qttools)) + qttools-5)) (arguments `(#:phases (modify-phases %standard-phases @@ -2362,7 +2362,7 @@ started on demand.") "0dr6gcag2yzx8fvxis4x403jrcisywds95cywmiyz3pb5727cak2")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kconfig kcoreaddons @@ -2431,7 +2431,7 @@ with su and ssh respectively.") "0y9ja3znkvzdbjfs91dwr4cmvl9fk97zpz2lkf0f9zhm2nw6q008")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kconfig kcoreaddons @@ -2500,7 +2500,7 @@ emoticons coming from different providers.") "0hmqigc8myiwwh7m6y2cm4vn0d3kmrhia179hyb84vpvvn3lm93z")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list kconfig kcrash @@ -2534,7 +2534,7 @@ window does not need focus for them to be activated.") "09bqpf3drqyfc81vgab9bsh1wm5qbzdwqjlczhax38660nnvh0r9")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools shared-mime-info)) + (list extra-cmake-modules qttools-5 shared-mime-info)) (inputs (list karchive kauth @@ -2661,7 +2661,7 @@ consumption.") kxmlgui solid)) (native-inputs - (list dbus qttools extra-cmake-modules)) + (list dbus qttools-5 extra-cmake-modules)) (inputs `(;; TODO: LibACL , ("krb5" ,mit-krb5) @@ -3133,7 +3133,7 @@ library.") (propagated-inputs (list ki18n sonnet)) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list kauth kcodecs @@ -3213,7 +3213,7 @@ the passwords on KDE work spaces.") (propagated-inputs (list kconfig kconfigwidgets)) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list attica kauth @@ -3549,7 +3549,7 @@ workspace.") networkmanager-qt openssl qtsvg-5 - qttools + qttools-5 qtx11extras)) ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and ;; share/kf5/kssl/ca-bundle.crt @@ -3698,7 +3698,7 @@ support.") (base32 "0976faazhxhhi1wpvpcs8hwb2knz0z7j44v3ay3hw73rq4p3bipm")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools)) + (list extra-cmake-modules kdoctools qttools-5)) (inputs (list ki18n kjs qtbase-5 qtsvg-5)) (home-page "https://community.kde.org/Frameworks") @@ -3722,7 +3722,7 @@ QObjects, so you can script your applications.") (base32 "0lrm4y727nhwaivl37zpmnrwx048gfhyjw19m6q5z9p37lk43jja")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools)) + (list extra-cmake-modules kdoctools qttools-5)) (inputs (list kcompletion kcoreaddons @@ -3758,7 +3758,7 @@ KParts instead.") (base32 "12b527l12rcf421p613ydbacilp9v9iy90ma35w21sdf9a15k675")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools)) + (list extra-cmake-modules kdoctools qttools-5)) (inputs (list kcompletion kcoreaddons diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index ac86489a952..39295f589da 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -322,7 +322,7 @@ This package is part of the KDE multimedia module.") kdoctools libxslt python-wrapper - qttools)) + qttools-5)) (inputs (list chromaprint flac diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index f0f5683ac5d..faf5e702f31 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -58,7 +58,7 @@ "akonadi-not-relocatable.patch")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools shared-mime-info)) + (list extra-cmake-modules qttools-5 shared-mime-info)) (inputs (list boost kconfig @@ -537,7 +537,7 @@ one of the APIs mentioned above.") (properties `((upstream-name . "calendarsupport"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list akonadi akonadi-calendar @@ -769,7 +769,7 @@ package.") (properties `((upstream-name . "eventviews"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list akonadi akonadi-calendar @@ -1108,7 +1108,7 @@ manager from KDE.") (properties `((upstream-name . "mailcommon"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules dbus gnupg qttools)) + (list extra-cmake-modules dbus gnupg qttools-5)) (inputs (list akonadi akonadi-contacts @@ -1496,7 +1496,7 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") (base32 "04lz3ldrr0lpy9zpsg9ja1i9gxzlcjpqcwn3g7l4jjdky4frcr2r")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules dbus qttools kdoctools)) + (list extra-cmake-modules dbus qttools-5 kdoctools)) (inputs (list akonadi akonadi-calendar @@ -1620,7 +1620,7 @@ Virtual Contact File}) files to the KPeople contact management library.") (properties `((upstream-name . "pimcommon"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list karchive akonadi @@ -1678,7 +1678,7 @@ Virtual Contact File}) files to the KPeople contact management library.") (base32 "0j6d4sv405c3x0ww75qsww94apidsb8aaqf59akhv96zmv0vx5wy")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list grantlee kcodecs @@ -1791,7 +1791,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") (base32 "0bask561laxgkgm3rxfpyxqs6jx1l9xjk058lhycq0pik6vwhdha")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list akonadi akonadi-contacts @@ -1838,7 +1838,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") (base32 "0nvd5fqrvyb7c3g7rf1lxbbv38q9sqnhd6irgx7awwgw92inxky4")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list cyrus-sasl ki18n @@ -1873,7 +1873,7 @@ various Google services.") (base32 "0rijpmqyx4mrr7csik3vkfcra7kfywk6yz548fmq3ha8wa9ax8fv")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools)) + (list extra-cmake-modules kdoctools qttools-5)) (inputs (list boost gpgme diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 512c2acfef6..98bc8f7b865 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -407,7 +407,7 @@ either be created or generated from a image.") (base32 "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools shared-mime-info)) + (list extra-cmake-modules kdoctools qttools-5 shared-mime-info)) (inputs (list kbookmarks kcmutils diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index c43758ef7f1..933bfcd04b5 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -261,7 +261,7 @@ browser for easy news reading.") `("MLT_PREFIX" ":" = (,#$(this-package-input "mlt")))))))))) (native-inputs - (list extra-cmake-modules pkg-config qttools)) + (list extra-cmake-modules pkg-config qttools-5)) (inputs (list bash-minimal breeze ; make dark them available easily @@ -318,7 +318,7 @@ projects.") (base32 "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config shared-mime-info qttools)) + (list extra-cmake-modules pkg-config shared-mime-info qttools-5)) (inputs `(("boost" ,boost) ("clang" ,clang) @@ -436,7 +436,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") "kdiagram-Fix-missing-link-libraries.patch")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (inputs (list qtbase-5 qtsvg-5)) (home-page "https://invent.kde.org/graphics/kdiagram") @@ -690,7 +690,7 @@ cards.") (inputs (list qtbase-5)) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) (home-page "https://techbase.kde.org/Projects/Snorenotify") (synopsis "Qt notification framework") (description "Snorenotify is a multi platform Qt notification framework. @@ -804,7 +804,7 @@ communicate with each other. Here's a few things KDE Connect can do: ("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (inputs (list breeze ;for dark themes breeze-icons ;for icons @@ -917,7 +917,7 @@ unmount drives and view them in a file manager.") "0fx17s6fj1pxl1mgfrqhchk8sihkbji1x8y3nhb1r0971wzd1nsc")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules perl python qttools kdoctools)) + (list extra-cmake-modules perl python qttools-5 kdoctools)) (inputs (list qtbase-5 karchive ki18n kio kdbusaddons)) ;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on @@ -1007,7 +1007,7 @@ Python, PHP, and Perl.") "-DBUILD_TOUCH=YES" "-DBUILD_MARBLE_TESTS=FALSE"))) (native-inputs - (list extra-cmake-modules qttools)) + (list extra-cmake-modules qttools-5)) ;; One optional dependency missing: libwlocate. (inputs (list gpsd @@ -1216,7 +1216,7 @@ or Bonjour by other projects).") (build-system qt-build-system) (native-inputs (list extra-cmake-modules - qttools + qttools-5 ;; For optional component "Survey target expression parser" bison flex diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm index 19a4a5eba02..39823dfee8d 100644 --- a/gnu/packages/lego.scm +++ b/gnu/packages/lego.scm @@ -113,7 +113,7 @@ restrictions that stem from limitations of the standard RCX firmware.") "1ifbxngkbmg6d8vv08amxbnfvlyjdwzykrjp98lbwvgb0b843ygq")))) (build-system gnu-build-system) (native-inputs - (list qttools)) ; for lrelease + (list qttools-5)) ; for lrelease (inputs (list mesa qtbase-5 zlib)) (arguments diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 47fb94dc686..7b5efeb5882 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -843,7 +843,7 @@ and video calls or instant messaging capabilities to an application.") (symlink (string-append liblinphone "/share/belr/grammars") grammar-dest))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list bctoolbox belcard diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 9ff1de942cb..eab9a24d1d1 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -234,7 +234,7 @@ in Qt.") qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (home-page "https://lxqt-project.org") (synopsis "Core utility library for all LXQt components") (description "liblxqt provides the basic libraries shared by the @@ -287,7 +287,7 @@ and memory usage or network traffic.") qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -329,7 +329,7 @@ LXQt and the system it's running on.") qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -382,7 +382,7 @@ the operating system LXQt is running on.") xkeyboard-config zlib)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) ;; XXX: This is a workaround so libkscreen can find the backends as we ;; dont have a way specify them. We may want to patch like Nix does. (propagated-inputs @@ -446,7 +446,7 @@ configuration of both LXQt and the underlying operating system.") qtsvg-5 qtx11extras)) (native-inputs - (list pkg-config qttools lxqt-build-tools)) + (list pkg-config qttools-5 lxqt-build-tools)) (arguments '(#:tests? #f ; no tests #:phases @@ -492,7 +492,7 @@ as a whole and are not limited to distinct applications.") qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no test target #:phases @@ -537,7 +537,7 @@ according to the Desktop Notifications Specification.") qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -590,7 +590,7 @@ of other programs.") xcb-util xkeyboard-config)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (propagated-inputs ;; Propagating KWINDOWSYSTEM so that the list of opened applications ;; shows up in lxqt-panel's taskbar plugin. @@ -649,7 +649,7 @@ of other programs.") qtsvg-5 qtx11extras)) (native-inputs - (list pkg-config polkit lxqt-build-tools qttools)) + (list pkg-config polkit lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no test target #:phases @@ -696,7 +696,7 @@ LXQt.") qtx11extras solid)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -742,7 +742,7 @@ when laptop batteries are low on power.") qtsvg-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -782,7 +782,7 @@ Qt with LXQt.") qtsvg-5 qtx11extras)) (native-inputs - (list pkg-config qttools lxqt-build-tools)) + (list pkg-config qttools-5 lxqt-build-tools)) (arguments '(#:tests? #f ; no tests #:phases @@ -829,7 +829,7 @@ allows for launching applications or shutting down the system.") qtx11extras xdg-user-dirs)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (arguments `(#:tests? #f #:phases @@ -897,7 +897,7 @@ for the LXQt desktop environment.") qtx11extras sudo)) (native-inputs - (list pkg-config qttools lxqt-build-tools)) + (list pkg-config qttools-5 lxqt-build-tools)) (arguments '(#:tests? #f ; no tests #:phases @@ -978,7 +978,7 @@ for LXQt.") qtbase-5 qtx11extras)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (home-page "https://lxqt-project.org") (synopsis "Qt binding for libfm") (description "libfm-qt is the Qt port of libfm, a library providing @@ -1000,7 +1000,7 @@ components to build desktop file managers which belongs to LXDE.") (inputs (list libfm-qt qtbase-5 qtx11extras)) (native-inputs - (list pkg-config qttools lxqt-build-tools)) + (list pkg-config qttools-5 lxqt-build-tools)) (arguments '(#:tests? #f ; no tests #:phases @@ -1038,7 +1038,7 @@ LXDE.") (inputs (list libconfig qtbase-5)) (native-inputs - (list lxqt-build-tools pkg-config qttools)) + (list lxqt-build-tools pkg-config qttools-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -1070,7 +1070,7 @@ manager Compton.") (inputs (list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1103,7 +1103,7 @@ image viewer.") qtbase-5 qtx11extras)) (native-inputs - (list lxqt-build-tools pkg-config qttools)) + (list lxqt-build-tools pkg-config qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1127,7 +1127,7 @@ window manager OpenBox.") (inputs (list glib pcre pulseaudio qtbase-5 qtx11extras)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1156,7 +1156,7 @@ window manager OpenBox.") qtbase-5 qtx11extras)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1180,7 +1180,7 @@ processes currently in existence, much like code{top} or code{ps}.") (inputs (list qtbase-5 utf8proc)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1203,7 +1203,7 @@ processes currently in existence, much like code{top} or code{ps}.") (inputs (list qtbase-5 qtx11extras qtermwidget)) (native-inputs - (list lxqt-build-tools qttools)) + (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1227,7 +1227,7 @@ QTermWidget.") (inputs (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras)) (native-inputs - (list pkg-config perl qttools)) + (list pkg-config perl qttools-5)) (arguments '(#:tests? #f)) ; no tests (home-page "https://lxqt-project.org") @@ -1252,7 +1252,7 @@ easily publishing them on internet image hosting services.") (inputs (list glib json-glib libfm-qt qtbase-5 qtx11extras)) (native-inputs - (list pkg-config lxqt-build-tools qttools)) + (list pkg-config lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) (home-page "https://lxqt-project.org") @@ -1289,7 +1289,7 @@ like @command{tar} and @command{zip}.") libqtxdg)) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) - ("qtlinguist" ,qttools))) + ("qtlinguist" ,qttools-5))) (arguments `(#:tests? #f ; no tests #:phases diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 72a89572000..89f98ec2b62 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2783,7 +2783,7 @@ script files.") ("qt" ,qtbase-5) ,@(package-inputs octave-cli))) (native-inputs - `(("qttools" , qttools) ;for lrelease + `(("qttools-5" , qttools-5) ;for lrelease ("texlive" ,(texlive-updmap.cfg (list texlive-epsf))) ; for texi2dvi ,@(package-native-inputs octave-cli))) (arguments @@ -3069,7 +3069,7 @@ ASCII text files using Gmsh's own scripting language.") (native-inputs (list pkg-config ;;("python-astropy" ,python-astropy) ;; FIXME: Package this. - qttools python-sip-4)) + qttools-5 python-sip-4)) (inputs (list ghostscript ;optional, for EPS/PS output python-dbus @@ -5468,7 +5468,7 @@ evaluates expressions using the standard order of operations.") (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) ("qtbase" ,qtbase-5) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (inputs (list libx11 zlib libpng gsl)) ;; The upstream project file ("XaoS.pro") and the Makefile it generates are ;; not enough for this package to install properly. These phases fix that. @@ -7147,7 +7147,7 @@ functions.") "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk")))) (build-system cmake-build-system) (inputs (list qtbase-5)) - (native-inputs (list qttools)) + (native-inputs (list qttools-5)) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e5dd078561a..58ac95f42c7 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1810,7 +1810,7 @@ instant messenger with audio and video chat capabilities.") ,(list (search-input-directory inputs "lib/qt5/plugins/")))))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list ffmpeg filteraudio @@ -2468,7 +2468,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") xcb-util-wm zlib)) (native-inputs - (list asciidoc doxygen graphviz pkg-config qttools)) + (list asciidoc doxygen graphviz pkg-config qttools-5)) (home-page "https://github.com/Nheko-Reborn/nheko") (synopsis "Desktop client for Matrix using Qt and C++14") (description "@code{Nheko} want to provide a native desktop app for the @@ -2502,7 +2502,7 @@ notification, emojis, E2E encryption, and voip calls.") qtquickcontrols-5 qtquickcontrols2-5 qtsvg-5 - qttools + qttools-5 xdg-utils)) (arguments `(#:tests? #f)) ; no tests diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1147512980d..844e7560943 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -435,7 +435,7 @@ score, keyboard, guitar, drum and controller views.") `(("gettext" ,gettext-minimal) ("googletest" ,googletest) ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) + ("qtlinguist" ,qttools-5))) (inputs (list boost chromaprint @@ -529,7 +529,7 @@ playing your music.") `(("gettext" ,gettext-minimal) ("googletest" ,googletest) ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools) + ("qtlinguist" ,qttools-5) ("xorg-server" ,xorg-server-for-tests))) (inputs (list alsa-lib @@ -768,7 +768,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") (native-inputs `(("cppunit" ,cppunit) ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) + ("qtlinguist" ,qttools-5))) (inputs (list alsa-lib jack-1 @@ -2226,7 +2226,7 @@ users to select LV2 plugins and run them with jalv.") (list benchmark googletest python-wrapper - qttools + qttools-5 xorg-server-for-tests)) (inputs (list bash-minimal @@ -2303,7 +2303,7 @@ perform creative live mixes with digital music files.") qtbase-5 qtsvg-5)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://synthv1.sourceforge.io") (synopsis "Polyphonic subtractive synthesizer") (description @@ -2336,7 +2336,7 @@ oscillators and stereo effects.") qtbase-5 qtsvg-5)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://drumkv1.sourceforge.io") (synopsis "Drum-kit sampler synthesizer with stereo effects") (description @@ -2369,7 +2369,7 @@ effects.") qtbase-5 qtsvg-5)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://samplv1.sourceforge.io") (synopsis "Polyphonic sampler synthesizer with stereo effects") (description @@ -2402,7 +2402,7 @@ effects.") qtbase-5 qtsvg-5)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://padthv1.sourceforge.io") (synopsis "Polyphonic additive synthesizer") (description @@ -2928,7 +2928,7 @@ browser.") "/manpages/docbook.xsl"))) #t))))) (inputs - (list qtbase-5 qtsvg-5 qttools alsa-lib)) + (list qtbase-5 qtsvg-5 qttools-5 alsa-lib)) (native-inputs (list pkg-config libxslt ; for xsltproc @@ -2975,7 +2975,7 @@ backends, including ALSA, OSS, Network and FluidSynth.") (list drumstick qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list libxslt ;for xsltproc - docbook-xsl qttools pkg-config)) + docbook-xsl qttools-5 pkg-config)) (home-page "https://vmpk.sourceforge.io/") (synopsis "Virtual MIDI piano keyboard") (description @@ -3316,7 +3316,7 @@ from the command line.") suil zlib)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "https://qtractor.org/") (synopsis "Audio/MIDI multi-track sequencer") (description @@ -4423,7 +4423,7 @@ plugins, a switch trigger, a toggle switch, and a peakmeter.") (inputs (list qtbase-5 alsa-lib jack-1 liblo lv2)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "http://qmidiarp.sourceforge.net/") (synopsis "MIDI arpeggiator") (description "QMidiArp is an advanced MIDI arpeggiator, programmable step @@ -4449,7 +4449,7 @@ modules running in parallel.") (inputs (list qtbase-5 alsa-lib)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (home-page "http://alsamodular.sourceforge.net/") (synopsis "MIDI event router and filter") (description "QMidiRoute is a MIDI event router and filter. MIDI note, @@ -4592,7 +4592,7 @@ are a C compiler and glib. Full API documentation and examples are included.") "\""))))))) (native-inputs `(("pkg-config" ,pkg-config) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ;; rpmalloc is a public domain memory allocator. This version specified ;; below is the version required by LMMS. ;; To get the new commit of rpmalloc to use here, run @@ -4764,7 +4764,7 @@ includes LV2 plugins and a JACK standalone client.") qtsvg-5 qtxmlpatterns)) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (synopsis "Music composition and notation software") (description "MuseScore is a music score typesetter. Its main purpose is the creation @@ -4836,7 +4836,7 @@ sample library.") `(("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (home-page "https://muse-sequencer.github.io/") (synopsis "MIDI/Audio sequencer") (description "MusE is a MIDI/Audio sequencer with recording and editing @@ -5021,7 +5021,7 @@ specification and header.") wavpack zlib)) (native-inputs - (list pkg-config qttools)) ;for qtlinguist + (list pkg-config qttools-5)) ;for qtlinguist (synopsis "Music composition and editing environment based around a MIDI sequencer") (description "Rosegarden is a music composition and editing environment @@ -5569,7 +5569,7 @@ discard bad quality ones. `(("gettext" ,gettext-minimal) ("hicolor-icon-theme" ,hicolor-icon-theme) ("itstool" ,itstool) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (synopsis "Musical instrument tuner") (description "FMIT is a graphical utility for tuning musical instruments, with error and volume history, and advanced features.") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7c6d0757ea7..7ea5cd7d209 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1650,7 +1650,7 @@ of the same name.") perl pkg-config python-wrapper - qttools)) + qttools-5)) (synopsis "Network traffic analyzer") (description "Wireshark is a network protocol analyzer, or @dfn{packet sniffer}, that lets you capture and interactively browse the contents of diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 7db592549da..0069fdd74ce 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -165,7 +165,7 @@ human.") (lambda* (#:key inputs #:allow-other-keys) (wrap-qt-program "keepassxc" #:output #$output #:inputs inputs)))))) (native-inputs - (list qttools ruby-asciidoctor)) + (list qttools-5 ruby-asciidoctor)) (inputs (list argon2 botan @@ -697,7 +697,7 @@ key URIs using the standard otpauth:// scheme.") (setenv "QT_QPA_PLATFORM" "offscreen") #t))))) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtsvg-5)) (home-page "https://qtpass.org") diff --git a/gnu/packages/patches/xygrib-fix-finding-data.patch b/gnu/packages/patches/xygrib-fix-finding-data.patch index 0b718b0eff4..d1db2d8807b 100644 --- a/gnu/packages/patches/xygrib-fix-finding-data.patch +++ b/gnu/packages/patches/xygrib-fix-finding-data.patch @@ -124,7 +124,7 @@ index 2c9d3ab4da03..1190cc780182 100644 +- GEN_TRANSLATION (DEFAULT: ON) +``` +Create targets to generate translation files. -+Turning this off removes the need for qt-linguist, part of qttools qt5 submodule, during build. ++Turning this off removes the need for qt-linguist, part of qttools-5 qt5 submodule, during build. +``` ### macOS diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 45e951884b1..19c171a9bb9 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -609,7 +609,7 @@ and enhance them.") (string-append "PREFIX=" out) "Photoflare.pro"))))))) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list graphicsmagick libomp qtbase-5)) (home-page "https://photoflare.io") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ac7c0d60662..216970ace9d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25034,7 +25034,7 @@ with features similar to the @command{wget} utility.") python-translation-finder python-watchdog)) (native-inputs - (list qttools fontforge)) + (list qttools-5 fontforge)) (home-page "https://framagit.org/tyreunom/offlate") (synopsis "Offline translation interface for online translation tools") (description "Offlate offers a unified interface for different translation diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 488cfa61206..f0278c00a09 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -187,7 +187,7 @@ (add-after 'install 'qt-wrap (assoc-ref qt:%standard-phases 'qt-wrap))))) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtsvg-5)) (synopsis "Qt5 Configuration Tool") @@ -1701,7 +1701,7 @@ native APIs where it makes sense."))) (description "The Qt Location module provides an interface for location, positioning and geolocation plugins."))) -(define-public qttools +(define-public qttools-5 (package (inherit qtsvg-5) (name "qttools") (version "5.15.2") @@ -1735,7 +1735,7 @@ that helps in Qt development."))) "0gk74hk488k9ldacxbxcranr3arf8ifqg8kz9nm1rgdgd59p36d2")) (patches (search-patches "qtscript-disable-tests.patch")))) (native-inputs - (list perl qttools)) + (list perl qttools-5)) (inputs (list qtbase-5)) (synopsis "Qt Script module") @@ -2031,7 +2031,7 @@ message."))) (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") @@ -2915,7 +2915,7 @@ module provides support functions to the automatically generated code.") ("qtsensors" ,qtsensors) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("qtwebchannel-5" ,qtwebchannel-5) ("qtwebkit" ,qtwebkit) ("qtwebsockets-5" ,qtwebsockets-5) @@ -3260,7 +3260,7 @@ This package provides the Python bindings."))) "1zk6r2vc1q48qs7mw2h47bpgrfbb9r7lf9cwq4sb1a4nls87zznk")))) (build-system cmake-build-system) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list libsecret qtbase-5)) (arguments @@ -3404,7 +3404,7 @@ that can be only started once per user. (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 @@ -3552,7 +3552,7 @@ time Web content can be enhanced with native controls.") "09fz6v8rp28997f235yaifj8p4vvsyv45knc1iivgdvx7msgcd0m")))) (build-system cmake-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtdeclarative-5)) (home-page "https://filcuc.github.io/DOtherSide/index.html") @@ -3589,7 +3589,7 @@ a binding 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") @@ -3741,7 +3741,7 @@ color-related widgets.") (native-inputs `(("cmake" ,cmake-minimal) ("python" ,python-wrapper) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("which" ,which))) (arguments `(#:tests? #f @@ -3780,7 +3780,7 @@ color-related widgets.") "qtsensors" "qtspeech" "qtsvg-5" - "qttools" + "qttools-5" "qtwebchannel-5" "qtwebengine-5" "qtwebsockets-5" @@ -3873,7 +3873,7 @@ generate Python bindings for your C or C++ code.") (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") @@ -3928,7 +3928,7 @@ being fully customizable and easy to extend.") (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 diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 5f9767c8965..9cd64999a12 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1290,7 +1290,7 @@ instances over the network, and general QSO and DXpedition logging.") (base32 "0nciw9smrfcsirlwyny5r9h7sk2zvm40m56y1hxpgpmbnh6mqikh")))) (build-system qt-build-system) (native-inputs - (list asciidoc gfortran pkg-config qttools ruby-asciidoctor)) + (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor)) (inputs `(("boost" ,boost) ("fftw" ,fftw) @@ -1327,7 +1327,7 @@ weak-signal conditions.") (base32 "1lw9q7ggh2jlasipl3v5pkbabysjr6baw15lnmg664ah3fwdrvnx")))) (build-system qt-build-system) (native-inputs - (list asciidoc gfortran pkg-config qttools ruby-asciidoctor)) + (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor)) (inputs (list boost @@ -1373,7 +1373,7 @@ focused on DXing and being shaped by community of DXers.JTDX") #t)))) (build-system qt-build-system) (native-inputs - (list asciidoc gfortran pkg-config qttools ruby-asciidoctor)) + (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor)) (inputs `(("boost" ,boost) ("fftw" ,fftw) @@ -1745,7 +1745,7 @@ intended for people who want to learn receiving and sending morse code.") (base32 "1s1aj223n57rpc95rih98z08xnyhq2zp02byzrc3f7s01fv3nj0l")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list qtbase-5 qtmultimedia-5)) (arguments diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index 7266aa81f30..0b0ecaf0278 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -119,7 +119,7 @@ hundred times faster than real-time.") protobuf-3.5 ;for logging qtbase-5 qtsvg-5 - qttools ;for libQt5Help, needed by "studio" + qttools-5 ;for libQt5Help, needed by "studio" qtwebkit qtx11extras eudev diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 6f557d2b2ba..a1d81f56975 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -91,7 +91,7 @@ qtdeclarative-5 zlib)) (native-inputs - (list pkg-config qttools util-linux)) + (list pkg-config qttools-5 util-linux)) (home-page "https://www.scribus.net") (synopsis "Desktop publishing and page layout program") (description diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 5d95aebf140..84bd92b6f73 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -759,7 +759,7 @@ an unprivileged user.") (build-system cmake-build-system) (arguments '(#:configure-flags (list "-DBUILD_TESTING=on"))) - (native-inputs (list pkg-config qttools)) + (native-inputs (list pkg-config qttools-5)) (inputs (list catch-framework2)) (home-page "https://github.com/tplgy/cppcodec") (synopsis "Header library to encode/decode base64, base64url, etc.") @@ -783,7 +783,7 @@ base64url, base32, base32hex and hex.") (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no test suite - (native-inputs (list pkg-config qttools)) + (native-inputs (list pkg-config qttools-5)) (inputs (list cppcodec hidapi libnitrokey @@ -853,7 +853,7 @@ devices.") (build-system cmake-build-system) (native-inputs - (list pkg-config qttools)) + (list pkg-config qttools-5)) (inputs (list qtbase-5 qtsvg-5 diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 5b82e0ca3d1..8c174c98ba7 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -174,7 +174,7 @@ ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("ruby" ,ruby))) (inputs (list appstream @@ -347,7 +347,7 @@ See also: megacmd, the official tool set by MEGA.") ("extra-cmake-modules" ,extra-cmake-modules) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) + ("qtlinguist" ,qttools-5))) (inputs (list qtbase-5 qtkeychain sqlite zlib)) (home-page "https://owncloud.org") diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index df109e862bc..bae784d65c0 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -73,7 +73,7 @@ (("/usr") out)) #t)))))) (native-inputs - (list qttools)) ; for Qt5LinguistTools + (list qttools-5)) ; for Qt5LinguistTools (inputs `(("avahi" ,avahi) ("python" ,python-wrapper) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d62dc831b3c..873ff6246b4 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -383,7 +383,7 @@ Telegram project, for its use in telegram desktop client.") ("gtk+:bin" ,gtk+ "bin") ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (inputs `(("alsa" ,alsa-lib) ("c++-gsl" ,c++-gsl) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index c711c3512f1..14c7087125c 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -653,7 +653,7 @@ address of one of the participants.") ;; xiph-rnnoise ; TODO: unbundle rnnoise )) (native-inputs - (list pkg-config python qttools)) + (list pkg-config python qttools-5)) (synopsis "Low-latency, high quality voice chat software") (description "Mumble is an low-latency, high quality voice chat @@ -695,7 +695,7 @@ Mumble consists of two applications for separate usage: "-DWITH_G729=On" ; For G729 Codec Support "-DWITH_SPEEX=On"))) ; For Speex Codec Support (native-inputs - (list bison flex qttools)) + (list bison flex qttools-5)) (inputs (list alsa-lib bcg729 diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 345454bd62e..485661fe6b3 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -663,7 +663,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. "19cf55b86yj2b5hdazbyw4iyp6xq155243aiyg4m0vhwh0h79nwh")))) (build-system gnu-build-system) (native-inputs - (list pkg-config qttools)) ; for lrelease + (list pkg-config qttools-5)) ; for lrelease (inputs (list hunspell qtbase-5 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 184dca8effc..04049fd9c85 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1012,7 +1012,7 @@ H.264 (MPEG-4 AVC) video streams.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("ruby" ,ruby))) (arguments `(#:configure-flags @@ -2242,7 +2242,7 @@ projects while introducing many more.") "12nvcl0cfix1xay9hfi7856vg4lpv8y5b0a22212bsjbvl5g22rc")))) (build-system qt-build-system) (native-inputs - (list qttools)) + (list qttools-5)) (inputs (list bash-minimal qtbase-5 zlib mpv)) (arguments @@ -2875,7 +2875,7 @@ for use with HTML5 video.") `(("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("qttools" ,qttools) + ("qttools-5" ,qttools-5) ("yasm" ,yasm))) ;; FIXME: Once packaged, add libraries not found during the build. (inputs @@ -4844,7 +4844,7 @@ transitions, and effects and then export your film to many common formats.") (native-inputs `(("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) - ("qttools" ,qttools))) + ("qttools-5" ,qttools-5))) (inputs (list bash-minimal ffmpeg diff --git a/guix/lint.scm b/guix/lint.scm index 73581b518f9..edba1c26637 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -492,7 +492,7 @@ of a package, and INPUT-NAMES, a list of package specifications such as "kdoctools" "libtool" "m4" - "qttools" + "qttools-5" "yasm" "nasm" "fasm" "python-coverage" "python-cython" @@ -507,7 +507,7 @@ of a package, and INPUT-NAMES, a list of package specifications such as "scdoc" "swig" "qmake" - "qttools" + "qttools-5" "texinfo" "xorg-server-for-tests" "yelp-tools"))) -- cgit v1.2.3 From a4784b32731f7289a045515486adf26d001c45ef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 16:54:06 -0400 Subject: gnu: Add qttools, version 6.3.1. * gnu/packages/qt.scm (qttools): New variable. --- gnu/packages/qt.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f0278c00a09..342b872275e 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1723,6 +1723,33 @@ positioning and geolocation plugins."))) 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 (qt5-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") -- cgit v1.2.3 From 2e27ccec8307961feabbb85589ace67431672c70 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 20:23:12 -0400 Subject: gnu: qtnetworkauth: Rename to qtnetworkauth-5. Automated with: git grep -l qtnetworkauth | xargs sed 's/\bqtnetworkauth\b/\0-5/g' -i --- gnu/packages/kde-internet.scm | 2 +- gnu/packages/kde-pim.scm | 2 +- gnu/packages/kde.scm | 2 +- gnu/packages/qt.scm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 9de2c54ad3d..35d41887c2a 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -88,7 +88,7 @@ qca qoauth qtbase-5 - qtnetworkauth + qtnetworkauth-5 sonnet)) (home-page "https://kde.org/applications/internet/org.kde.choqok") (synopsis "Micro-Blogging Client") diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index faf5e702f31..f5b0c008ce6 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -725,7 +725,7 @@ for KDE PIM.") qca qtbase-5 qtdeclarative-5 - qtnetworkauth + qtnetworkauth-5 qtspeech qtwebchannel-5 qtwebengine-5 diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 933bfcd04b5..aa742df80f7 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -288,7 +288,7 @@ browser for easy news reading.") qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 - qtnetworkauth + qtnetworkauth-5 qtquickcontrols-5 qtquickcontrols2-5 qtscript diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 342b872275e..daed19085db 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1955,7 +1955,7 @@ data received from multiple sensors. The look and feel of graphs can be 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") -- cgit v1.2.3 From d9e8d7f4aa55877d81e1b6f276e5c26f28fef453 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 20:30:07 -0400 Subject: gnu: Add qtnetworkauth, version 6.3.1. * gnu/packages/qt.scm (qtnetworkauth): New variable. --- gnu/packages/qt.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index daed19085db..16ce44035a9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1981,6 +1981,26 @@ customized by using themes or by adding custom items and labels to them.") (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 (qt5-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") -- cgit v1.2.3 From a13a687989814380b65233f82a967c5475e33ad6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 19 Jul 2022 17:34:45 -0400 Subject: gnu: Add qtpositioning. * gnu/packages/qt.scm (qtpositioning): New variable. --- gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 16ce44035a9..dc51e18c451 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1893,6 +1893,36 @@ machines (loading the SCXML file and instantiating states and transitions) and 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 (qt5-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") -- cgit v1.2.3 From 4637de6a4144d99efd999c6e95d88d272b7c8193 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 1 Aug 2022 17:00:17 -0400 Subject: gnu: Add qtlottie. * gnu/packages/qt.scm (qtlottie): New variable. --- gnu/packages/qt.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index dc51e18c451..f74f84f2ac3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1701,6 +1701,38 @@ native APIs where it makes sense."))) (description "The Qt Location module provides an interface for location, positioning and geolocation plugins."))) +(define-public qtlottie + (package + (name "qtlottie") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (qt5-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") -- cgit v1.2.3 From 3d727b8334e88d641a8dc16314a7dd0cb5ccf66e Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Tue, 2 Aug 2022 22:00:02 -0400 Subject: gnu: qt5ct: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/qt.scm (qt5ct)[build-system]: Change to qt-build-system. [arguments]: Adjust accordingly. [inputs]: Remove qtbase-5. Signed-off-by: 宋文武 --- gnu/packages/qt.scm | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f74f84f2ac3..86f5d117144 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -159,37 +159,22 @@ (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-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 -- cgit v1.2.3 From 0aa98e064668767793d9437d27999b58a16f7309 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 3 Aug 2022 18:32:10 +0200 Subject: gnu: python-pyside-2: Fix build. * gnu/packages/qt.scm (python-pyside-2)[arguments]: Use the correct names for Qt inputs in the 'fix-qt-module-detection' phase. --- gnu/packages/qt.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 86f5d117144..7d0f1b4971f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3864,20 +3864,20 @@ color-related widgets.") (string-append (assoc-ref inputs name) "/include/qt5")) '("qtdatavis3d" - "qtdeclarative-5" + "qtdeclarative" "qtlocation" - "qtmultimedia-5" - "qtquickcontrols-5" - "qtquickcontrols2-5" + "qtmultimedia" + "qtquickcontrols" + "qtquickcontrols2" "qtscript" "qtscxml" "qtsensors" "qtspeech" - "qtsvg-5" + "qtsvg" "qttools-5" - "qtwebchannel-5" - "qtwebengine-5" - "qtwebsockets-5" + "qtwebchannel" + "qtwebengine" + "qtwebsockets" "qtx11extras" "qtxmlpatterns")))) (substitute* "cmake/Macros/PySideModules.cmake" -- cgit v1.2.3 From 88f976d1604e229c47ecfc16e0c95a36817d5043 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Aug 2022 19:43:05 +0200 Subject: gnu: qtwayland: Fix build with GCC 11. * gnu/packages/patches/qtwayland-gcc-11.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/qt.scm (qtwayland)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/patches/qtwayland-gcc-11.patch | 18 ++++++++++++++++++ gnu/packages/qt.scm | 1 + 3 files changed, 20 insertions(+) create mode 100644 gnu/packages/patches/qtwayland-gcc-11.patch (limited to 'gnu/packages/qt.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 247b9ec34f6..1bd791fb0cb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1750,6 +1750,7 @@ dist_patch_DATA = \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ + %D%/packages/patches/qtwayland-gcc-11.patch \ %D%/packages/patches/qtwebkit-pbutils-include.patch \ %D%/packages/patches/qtwebkit-fix-building-with-bison-3.7.patch \ %D%/packages/patches/qtwebkit-fix-building-with-python-3.9.patch \ diff --git a/gnu/packages/patches/qtwayland-gcc-11.patch b/gnu/packages/patches/qtwayland-gcc-11.patch new file mode 100644 index 00000000000..06983ff2f39 --- /dev/null +++ b/gnu/packages/patches/qtwayland-gcc-11.patch @@ -0,0 +1,18 @@ +Add missing import for newer libstdc++. + +Taken from upstream: + + https://github.com/qt/qtwayland/commit/1aa6ec2c778504d96543f6cdc2b9199a7b066fc1 + +diff --git a/tests/auto/client/shared/corecompositor.cpp b/tests/auto/client/shared/corecompositor.cpp +index 5c6c83baa..fa9b7662a 100644 +--- a/tests/auto/client/shared/corecompositor.cpp ++++ b/tests/auto/client/shared/corecompositor.cpp +@@ -27,6 +27,7 @@ + ****************************************************************************/ + + #include "corecompositor.h" ++#include + + namespace MockCompositor { + diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 7d0f1b4971f..be6665a57f9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1456,6 +1456,7 @@ set of plugins for interacting with pulseaudio and GStreamer.") (source (origin (method url-fetch) (uri (qt5-urls name version)) + (patches (search-patches "qtwayland-gcc-11.patch")) (sha256 (base32 "1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr")))) -- cgit v1.2.3 From 0a078b5a31f0c93bbd97f153828da4c14fe3429a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 10 Aug 2022 19:44:17 +0200 Subject: gnu: qtwayland: Remove input labels. * gnu/packages/qt.scm (qtwayland)[inputs]: Remove labels. --- gnu/packages/qt.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index be6665a57f9..8814f7cfd81 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1483,18 +1483,18 @@ set of plugins for interacting with pulseaudio and GStreamer.") (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."))) -- cgit v1.2.3