[PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way

  • Done
  • quality assurance status badge
Details
3 participants
  • Jack Hill
  • Maxim Cournoyer
  • Maxime Devos
Owner
unassigned
Submitted by
Maxim Cournoyer
Severity
normal
M
M
Maxim Cournoyer wrote on 25 Jul 2022 23:17
(address . guix-patches@gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725211704.4977-1-maxim.cournoyer@gmail.com
Hello Guix,

This series add the base Qt 6 components required by Jami and updates Jami
itself to its latest stable release (made today!). All the Qt components
updated have their test suite enabled except for qtwebengine, for which it was
already disabled.

Note that Jami no longer requires qtwebengine, which brings its closure size
down quite a bit!

While this was made to allow updating our Jami package, it opens the door to
migrate other of our Qt packages to Qt 6 as well.

Enjoy,

Maxim Cournoyer (33):
gnu: qtbase: Patch /bin/pwd in executable scripts.
gnu: qtbase: Honor CMAKE_PREFIX_PATH.
gnu: qtbase: Enable test suite.
gnu: qtsvg: Rename variable to qtsvg-5.
gnu: qtsvg-5: Fix indentation.
gnu: Add qtsvg, version 6.3.1.
gnu: qpwgraph: Migrate to Qt 6 and add libxkbcommon input.
gnu: Add qtshadertools.
gnu: qtmultimedia: Rename to qtmultimedia-5.
gnu: Add qtmultimedia, version 6.3.1.
gnu: qtdeclarative: Rename to qtdeclarative-5.
gnu: Add qtdeclarative, version 6.3.1.
gnu: qtquickcontrols: Rename to qtquickcontrols-5.
gnu: qtquickcontrols2: Rename to qtquickcontrols2-5.
gnu: qtquickcontrols2: Define as obsoleted by qtdeclarative.
gnu: qtwebsockets: Rename to qtwebsockets-5.
gnu: Add qtwebsockets, version 6.3.1.
gnu: qtwebchannel: Rename to qtwebchannel-5.
gnu: Add qtwebchannel, version 6.3.1.
gnu: qtwebengine: Rename to qtwebengine-5.
gnu: Add qtwebengine, version 6.3.1.
gnu: Add qt5compat.
gnu: qttools: Rename to qttools-5.
gnu: Add qttools, version 6.3.1.
gnu: qtnetworkauth: Rename to qtnetworkauth-5.
gnu: Add qtnetworkauth, version 6.3.1.
gnu: Add qtpositioning.
build: qt: Add qtbase argument and wrap Qt environment variables
exactly.
gnu: jami: Update to 20220725.1128.fd5e6c6.
gnu: libjami: Enable test agent.
gnu: Remove jami-libclient.
gnu: Deprecate jami-gnome for jami.
gnu: jami: Update to 20220725.1128.fd5e6c6.

gnu/local.mk | 4 -
gnu/packages/admin.scm | 4 +-
gnu/packages/animation.scm | 8 +-
gnu/packages/astronomy.scm | 4 +-
gnu/packages/audio.scm | 32 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/benchmark.scm | 2 +-
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/connman.scm | 2 +-
gnu/packages/databases.scm | 2 +-
gnu/packages/display-managers.scm | 10 +-
gnu/packages/djvu.scm | 2 +-
gnu/packages/documentation.scm | 10 +-
gnu/packages/ebook.scm | 4 +-
gnu/packages/education.scm | 46 +-
gnu/packages/electronics.scm | 4 +-
gnu/packages/emacs-xyz.scm | 2 +-
gnu/packages/emulators.scm | 4 +-
gnu/packages/engineering.scm | 38 +-
gnu/packages/fcitx5.scm | 6 +-
gnu/packages/finance.scm | 34 +-
gnu/packages/game-development.scm | 8 +-
gnu/packages/games.scm | 146 +-
gnu/packages/geo.scm | 20 +-
gnu/packages/gps.scm | 6 +-
gnu/packages/graphics.scm | 6 +-
gnu/packages/hardware.scm | 4 +-
gnu/packages/image-processing.scm | 12 +-
gnu/packages/image-viewers.scm | 20 +-
gnu/packages/image.scm | 4 +-
gnu/packages/irc.scm | 6 +-
gnu/packages/jami.scm | 234 ++--
gnu/packages/kde-frameworks.scm | 124 +-
gnu/packages/kde-internet.scm | 2 +-
gnu/packages/kde-multimedia.scm | 28 +-
gnu/packages/kde-pim.scm | 54 +-
gnu/packages/kde-plasma.scm | 6 +-
gnu/packages/kde-systemtools.scm | 2 +-
gnu/packages/kde-utils.scm | 4 +-
gnu/packages/kde.scm | 82 +-
gnu/packages/lego.scm | 2 +-
gnu/packages/linphone.scm | 10 +-
gnu/packages/lxqt.scm | 92 +-
gnu/packages/maths.scm | 12 +-
gnu/packages/messaging.scm | 48 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 68 +-
gnu/packages/networking.scm | 6 +-
gnu/packages/orange.scm | 4 +-
gnu/packages/password-utils.scm | 8 +-
.../patches/jami-fix-crash-on-quit.patch | 34 -
.../patches/jami-images-loading.patch | 152 ---
.../jami-libclient-audio-managers.patch | 23 -
gnu/packages/patches/jami-memory-usage.patch | 70 -
.../patches/xygrib-fix-finding-data.patch | 2 +-
gnu/packages/pdf.scm | 2 +-
gnu/packages/photo.scm | 2 +-
gnu/packages/printers.scm | 2 +-
gnu/packages/python-xyz.scm | 2 +-
gnu/packages/qt.scm | 1206 +++++++++++++++--
gnu/packages/radio.scm | 38 +-
gnu/packages/robotics.scm | 4 +-
gnu/packages/scribus.scm | 4 +-
gnu/packages/security-token.scm | 16 +-
gnu/packages/sync.scm | 16 +-
gnu/packages/synergy.scm | 2 +-
gnu/packages/telegram.scm | 4 +-
gnu/packages/telephony.scm | 12 +-
gnu/packages/terminals.scm | 6 +-
gnu/packages/tex.scm | 2 +-
gnu/packages/text-editors.scm | 20 +-
gnu/packages/video.scm | 32 +-
gnu/packages/vpn.scm | 12 +-
gnu/packages/web-browsers.scm | 12 +-
gnu/packages/web.scm | 8 +-
gnu/packages/xdisorg.scm | 2 +-
guix/build-system/qt.scm | 14 +
guix/build/qt-utils.scm | 44 +-
guix/lint.scm | 4 +-
80 files changed, 1796 insertions(+), 1199 deletions(-)
delete mode 100644 gnu/packages/patches/jami-fix-crash-on-quit.patch
delete mode 100644 gnu/packages/patches/jami-images-loading.patch
delete mode 100644 gnu/packages/patches/jami-libclient-audio-managers.patch
delete mode 100644 gnu/packages/patches/jami-memory-usage.patch

--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 01/33] gnu: qtbase: Patch /bin/pwd in executable scripts.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-1-maxim.cournoyer@gmail.com
* 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(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ae68317492..fd26264892 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -622,6 +622,9 @@ (define-public qtbase
(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 @@ (define-public qtbase
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
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 02/33] gnu: qtbase: Honor CMAKE_PREFIX_PATH.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-2-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtbase)[phases]{honor-CMAKE_PREFIX_PATH}: New phase.
---
gnu/packages/qt.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)

Toggle diff (34 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index fd26264892..c2e509fcdf 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -618,6 +618,27 @@ (define-public qtbase
"-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
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 03/33] gnu: qtbase: Enable test suite.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-3-maxim.cournoyer@gmail.com
* 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(-)

Toggle diff (142 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c2e509fcdf..001e6286fe 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -570,14 +570,10 @@ (define-public qtbase
(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 @@ (define-public qtbase
(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 @@ (define-public qtbase
(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)
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 05/33] gnu: qtsvg-5: Fix indentation.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-5-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtsvg-5): Fix indentation.
---
gnu/packages/qt.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)

Toggle diff (29 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 92b24fcb1e..40d3f8194b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -832,15 +832,16 @@ (define-public qtbase
(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
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 07/33] gnu: qpwgraph: Migrate to Qt 6 and add libxkbcommon input.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-7-maxim.cournoyer@gmail.com
* gnu/packages/audio.scm (qpwgraph)[inputs]: Replace qtbase-5 with qtbase,
qtsvg-5 with qtsvg. Add libxkbcommon.
---
gnu/packages/audio.scm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

Toggle diff (31 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index a519e4ac2a..dbe6870913 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -125,6 +125,7 @@ (define-module (gnu packages audio)
#:use-module (gnu packages web)
#:use-module (gnu packages webkit)
#:use-module (gnu packages wxwidgets)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
@@ -5848,12 +5849,12 @@ (define-public qpwgraph
(base32
"1xqmlbqj6ny4cpclzr8xyy6d6i392h9f1vmlbasp6xfy5b0yya94"))))
(build-system cmake-build-system)
- (arguments
- `(#:tests? #f)) ;; no tests
+ (arguments (list #:tests? #f)) ;; no tests
(inputs (list alsa-lib
+ libxkbcommon
pipewire-0.3
- qtbase-5
- qtsvg-5))
+ qtbase
+ qtsvg))
(native-inputs (list pkg-config))
(synopsis "PipeWire graph manager")
(description
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 06/33] gnu: Add qtsvg, version 6.3.1.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-6-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtsvg): New variable.
---
gnu/packages/qt.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)

Toggle diff (44 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 40d3f8194b..a5296bd17a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -902,6 +902,37 @@ (define-public qtsvg-5
(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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 13/33] gnu: qtquickcontrols: Rename to qtquickcontrols-5.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-13-maxim.cournoyer@gmail.com
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(-)

Toggle diff (264 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index b041ade63d..107deef3de 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -5459,7 +5459,7 @@ (define-public ableton-link
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 <asio.hpp>'.
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index e19935daa8..7e0218dbb7 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -91,7 +91,7 @@ (define-public sddm
;; 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 74356318a1..2f4755de55 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -385,7 +385,7 @@ (define-public zeal
("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 690de4d7de..cb0d71cc54 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -183,7 +183,7 @@ (define-public gcompris-qt
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 c05e4cdf0a..f4308cddd9 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3424,7 +3424,7 @@ (define-public uranium
qtbase
qtdeclarative-5
qtgraphicaleffects
- qtquickcontrols
+ qtquickcontrols-5
qtquickcontrols2
qtsvg-5))
(arguments
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index e753de7758..fea5fa4e77 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -805,7 +805,7 @@ (define-public monero-gui
("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 181068cc24..8d8d29c0db 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -610,7 +610,7 @@ (define-public jami
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 1c79cd16bc..34da2ef3f2 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -175,7 +175,7 @@ (define-public elisa
qtdeclarative-5
qtgraphicaleffects ; not listed as dependency
qtmultimedia-5
- qtquickcontrols
+ qtquickcontrols-5
qtquickcontrols2
qtsvg-5
qtx11extras
@@ -531,7 +531,7 @@ (define-public kamoso
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 a0d73b5252..143cb3b6a9 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -289,7 +289,7 @@ (define-public kdenlive
qtgraphicaleffects
qtmultimedia-5
qtnetworkauth
- qtquickcontrols
+ qtquickcontrols-5
qtquickcontrols2
qtscript
qtsvg-5
@@ -346,7 +346,7 @@ (define-public kdevelop
("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 @@ (define-public kdeconnect
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 d30f598c7e..a488fc3244 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -854,7 +854,7 @@ (define-public linphone-desktop
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 83615fedfe..fcfe9c2c50 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2499,7 +2499,7 @@ (define-public quaternion
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 7851509513..9a86b252b3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1589,7 +1589,7 @@ (define-public qtlocation
(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")
@@ -1638,7 +1638,7 @@ (define-public qtscript
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")
@@ -3270,7 +3270,7 @@ (define-public python-pyside-2
qtdeclarative-5
qtlocation
qtmultimedia-5
- qtquickcontrols
+ qtquickcontrols-5
qtquickcontrols2
qtscript
qtscxml
@@ -3319,7 +3319,7 @@ (define-public python-pyside-2
"qtdeclarative-5"
"qtlocation"
"qtmultimedia-5"
- "qtquickcontrols"
+ "qtquickcontrols-5"
"qtquickcontrols2"
"qtscript"
"qtscxml"
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 5ef93fc3f1..c711c3512f 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -707,7 +707,7 @@ (define-public twinkle
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 7abf5b6328..6642620155 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -669,7 +669,7 @@ (define-public ghostwriter
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 2a9ee09edf..726ed15e47 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4860,7 +4860,7 @@ (define-public shotcut
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 7c06fff070..bde96d6a90 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -257,7 +257,7 @@ (define-public bitmask
("qtbase" ,qtbase-5)
("qtdeclarative-5" ,qtdeclarative-5)
("qtgraphicaleffects" ,qtgraphicaleffects)
- ("qtquickcontrols" ,qtquickcontrols)
+ ("qtquickcontrols-5" ,qtquickcontrols-5)
("qtquickcontrols2" ,qtquickcontrols2)
("qtsvg-5" ,qtsvg-5)))
(propagated-inputs
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 08/33] gnu: Add qtshadertools.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-8-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtshadertools): New variable.
---
gnu/packages/qt.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)

Toggle diff (42 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a5296bd17a..4bb8e9ef00 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1173,6 +1173,35 @@ (define-public qtmultimedia
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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 09/33] gnu: qtmultimedia: Rename to qtmultimedia-5.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-9-maxim.cournoyer@gmail.com
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(-)

Toggle diff (566 lines)
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 89079ceb6e..c7f80a4b6a 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -435,7 +435,7 @@ (define-public papagayo
(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 @@ (define-public papagayo
#t))))))
(inputs
`(("qt" ,qtbase-5)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("libsndfile" ,libsndfile)))
(native-inputs
(list qttools))
@@ -474,7 +474,7 @@ (define-public pencil2d
"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 498252aaf4..041e8de438 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -607,7 +607,7 @@ (define-public stellarium
(inputs
(list qtbase-5
qtlocation
- qtmultimedia
+ qtmultimedia-5
qtscript
qtserialport
zlib))
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 0e3c8feaf9..998867918e 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -182,7 +182,7 @@ (define-public gcompris-qt
qtbase-5
qtdeclarative
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtsensors
qtsvg-5
@@ -302,7 +302,7 @@ (define-public tipp10
;; 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 @@ (define-public openboard
poppler
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
qtsvg-5
qtwebchannel
qtwebengine
@@ -995,7 +995,7 @@ (define-public qolibri
(inputs
(list libeb
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols2
qtdeclarative
qtwebchannel
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 5cff92ac89..ba7fa1dbe2 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -755,7 +755,7 @@ (define-public mgba
minizip
ncurses
qtbase-5
- qtmultimedia
+ qtmultimedia-5
sdl2
sqlite
zlib))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 86f25eee37..669d2010b5 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2356,7 +2356,7 @@ (define-public openscad
("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 cc246551a3..ceac1d3390 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -993,7 +993,7 @@ (define-public cockatrice
(inputs
(list protobuf
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtsvg-5
qttools
qtwebsockets
@@ -10153,7 +10153,7 @@ (define-public q5go
(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 @@ (define-public ktuberling
libkdegames
python-wrapper
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtdeclarative
qtsvg-5))
(home-page "https://games.kde.org/")
@@ -11885,7 +11885,7 @@ (define-public chessx
(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 915d9d79e1..f7307e8f61 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1965,7 +1965,7 @@ (define-public drawpile
;; ("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 e7ace9e6c4..67a86cbfc1 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -134,7 +134,7 @@ (define-public quassel
perl
qca
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtscript
qtsvg-5
snorenotify
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 726221b1e5..8f4c56842b 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -607,7 +607,7 @@ (define-public jami
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 0f1799edb2..3dffcdf813 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1715,7 +1715,7 @@ (define-public kfilemetadata
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 5b0d841445..b60b4ee489 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -174,7 +174,7 @@ (define-public elisa
qtbase-5
qtdeclarative
qtgraphicaleffects ; not listed as dependency
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtquickcontrols2
qtsvg-5
@@ -336,7 +336,7 @@ (define-public kid3
libvorbis
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
readline
taglib
zlib))
@@ -698,7 +698,7 @@ (define-public kwave
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 2dfd1348e7..ff02723ab1 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -287,7 +287,7 @@ (define-public kdenlive
qtbase-5
qtdeclarative
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtnetworkauth
qtquickcontrols
qtquickcontrols2
@@ -540,7 +540,7 @@ (define-public krita
poppler-qt5
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
qtsvg-5
qtx11extras
quazip-0
@@ -747,7 +747,7 @@ (define-public kdeconnect
qtbase-5
qtdeclarative
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtquickcontrols2
qtx11extras))
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 05beeacb2d..ef26f0486b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -232,7 +232,7 @@ (define-public psi
("libidn" ,libidn)
("qca" ,qca)
("qtbase" ,qtbase-5)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("qtsvg-5" ,qtsvg-5)
("qtwebkit" ,qtwebkit)
("qtx11extras" ,qtx11extras)
@@ -1480,7 +1480,7 @@ (define-public kaidan
qtlocation
qtquickcontrols2
qtsvg-5
- qtmultimedia
+ qtmultimedia-5
qtxmlpatterns
qqc2-desktop-style
qxmpp
@@ -2325,7 +2325,7 @@ (define-public libqmatrixclient
(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 @@ (define-public nheko
qtdeclarative
qtkeychain
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols2
qtsvg-5
spdlog
@@ -2498,7 +2498,7 @@ (define-public quaternion
(list libqmatrixclient
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtquickcontrols2
qtsvg-5
@@ -3039,7 +3039,7 @@ (define-public psi-plus
("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 67dd34b6fd..84a2ac1d7e 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -463,7 +463,7 @@ (define-public cantata
libmtp
mpg123
qtbase-5
- qtmultimedia
+ qtmultimedia-5
qtsvg-5
taglib
zlib))
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 19b96c330b..390ee18a43 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -253,7 +253,7 @@ (define-public audacious
(inputs
(list dbus
qtbase-5
- qtmultimedia
+ qtmultimedia-5
;; Plugin dependencies
alsa-lib
curl
@@ -5549,12 +5549,12 @@ (define-public fmit
,(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
@@ -5562,7 +5562,7 @@ (define-public fmit
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 8cce5f546d..7616cc77d1 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1636,7 +1636,7 @@ (define-public wireshark
`(,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 4bb8e9ef00..ffb2513781 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -140,7 +140,7 @@ (define-public qite
(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.")
@@ -1128,8 +1128,9 @@ (define-public qtsensors
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
@@ -1699,7 +1700,7 @@ (define-public qtspeech
(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
@@ -2024,7 +2025,7 @@ (define (delete-unwanted-files child stat flag base level)
pulseaudio
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
qtwebchannel
re2
snappy
@@ -2263,7 +2264,7 @@ (define-public python-pyqt
("qtconnectivity" ,qtconnectivity)
("qtdeclarative" ,qtdeclarative)
("qtlocation" ,qtlocation)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("qtsensors" ,qtsensors)
("qtserialport" ,qtserialport)
("qtsvg-5" ,qtsvg-5)
@@ -2844,7 +2845,7 @@ (define-public qtwebkit
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtlocation" ,qtlocation)
- ("qtmultimedia" ,qtmultimedia)
+ ("qtmultimedia-5" ,qtmultimedia-5)
("qtsensors" ,qtsensors)
("qtwebchannel" ,qtwebchannel)
("libxml2" ,libxml2)
@@ -3075,7 +3076,7 @@ (define-public python-pyside-2
qtdatavis3d
qtdeclarative
qtlocation
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtquickcontrols2
qtscript
@@ -3124,7 +3125,7 @@ (define-public python-pyside-2
'("qtdatavis3d"
"qtdeclarative"
"qtlocation"
- "qtmultimedia"
+ "qtmultimedia-5"
"qtquickcontrols"
"qtquickcontrols2"
"qtscript"
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index d9f8e1002d..8749a2be0e 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1298,7 +1298,7 @@ (define-public wsjtx
("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 @@ (define-public jtdx
libusb
qtbase-5
qtwebsockets
- qtmultimedia
+ qtmultimedia-5
qtserialport))
(arguments
`(#:tests? #f)) ; No test suite
@@ -1381,7 +1381,7 @@ (define-public js8call
("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 @@ (define-public kochmorse
(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 @@ (define-public welle-io
qtcharts
qtdeclarative
qtgraphicaleffects
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols2
soapysdr))
(arguments
@@ -2161,7 +2161,7 @@ (define-public sdrangel
qtcharts
qtdeclarative
qtlocation
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols2
qtserialport
qtspeech
@@ -2293,7 +2293,7 @@ (define-public wfview
(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 41e55db9c2..2e569ac17a 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -668,7 +668,7 @@ (define-public ghostwriter
(list hunspell
qtbase-5
qtdeclarative
- qtmultimedia
+ qtmultimedia-5
qtquickcontrols
qtsvg-5
qtwebchannel))
@@ -695,7 +695,7 @@ (define-public ghostwriter
,(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 c42c0165eb..e519f05ad5 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1000,7 +1000,7 @@ (define-public mkvtoolnix
pcre2
pugixml
qtbase-5
- qtmultimedia
+ qtmultimedia-5
utfcpp
zlib))
(nativ
This message was truncated. Download the full message here.
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 10/33] gnu: Add qtmultimedia, version 6.3.1.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-10-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtmultimedia): New variable.
---
gnu/packages/qt.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)

Toggle diff (78 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ffb2513781..1d7149e737 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1203,6 +1203,71 @@ (define-public qtshadertools
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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 12/33] gnu: Add qtdeclarative, version 6.3.1.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-12-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtdeclarative): New variable.
---
gnu/packages/qt.scm | 128 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 128 insertions(+)

Toggle diff (141 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ac4e125d2b..7851509513 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1058,6 +1058,134 @@ (define-public qtdeclarative-5
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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 04/33] gnu: qtsvg: Rename variable to qtsvg-5.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-4-maxim.cournoyer@gmail.com
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(-)

Toggle diff (480 lines)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 7a37cdda61..d03bc11e4a 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2140,7 +2140,7 @@ (define-public wpa-supplicant-gui
(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)
@@ -2160,7 +2160,7 @@ (define-public wpa-supplicant-gui
(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 c281772563..89079ceb6e 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -474,7 +474,7 @@ (define-public pencil2d
"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 66654b99fc..a519e4ac2a 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3232,7 +3232,7 @@ (define-public supercollider
yaml-cpp
qtbase-5
qtdeclarative
- qtsvg
+ qtsvg-5
qtwebchannel
qtwebsockets))
(propagated-inputs ;to get native-search-path
@@ -5852,9 +5852,8 @@ (define-public qpwgraph
`(#: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 7a361ce004..1116a91c8e 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1335,7 +1335,7 @@ (define-public vorta
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 325c159df1..d2a5d8514e 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -11262,7 +11262,7 @@ (define-public bandage
(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 bc0364d87c..fe235d4b3b 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -477,7 +477,7 @@ (define-public qbittorrent
("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 64375b8cfc..71d8fae7f1 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -93,7 +93,7 @@ (define-public sddm
qtgraphicaleffects
qtquickcontrols
qtquickcontrols2
- qtsvg
+ qtsvg-5
shadow
wayland))
(arguments
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 339a72ef91..5d864da281 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -293,7 +293,7 @@ (define-public calibre
(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 9e5a17a6ae..0e3c8feaf9 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -185,7 +185,7 @@ (define-public gcompris-qt
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 @@ (define-public openboard
qtbase-5
qtdeclarative
qtmultimedia
- qtsvg
+ qtsvg-5
qtwebchannel
qtwebengine
qtxmlpatterns
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 70d960aaab..342294de13 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -381,7 +381,7 @@ (define-public pulseview
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 6eefd14d7e..86f25eee37 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -213,7 +213,7 @@ (define-public librecad
(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 @@ (define-public fritzing
(inputs
`(("qtbase" ,qtbase-5)
("qtserialport" ,qtserialport)
- ("qtsvg" ,qtsvg)
+ ("qtsvg-5" ,qtsvg-5)
("libgit2" ,libgit2)
("boost" ,boost)
("zlib" ,zlib)
@@ -764,7 +764,7 @@ (define-public qelectrotech
(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 @@ (define-public valeronoi
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 @@ (define-public librepcb
(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 @@ (define-public cutter
(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 @@ (define-public freecad
python-wrapper
qtbase-5
qtdeclarative
- qtsvg
+ qtsvg-5
qtwebchannel
qtwebengine
qtx11extras
@@ -3426,7 +3426,7 @@ (define-public uranium
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 89f5fc055c..8f3d4842e5 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -651,7 +651,7 @@ (define-public electron-cash
python-requests
python-stem
python-trezor
- qtsvg
+ qtsvg-5
zlib))
(home-page "https://electroncash.org/")
(synopsis "Bitcoin Cash wallet")
@@ -807,7 +807,7 @@ (define-public monero-gui
("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 30512dcc80..f9e8baffd4 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -520,7 +520,7 @@ (define-public tiled
"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 d55a2ee867..cc246551a3 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -994,7 +994,7 @@ (define-public cockatrice
(list protobuf
qtbase-5
qtmultimedia
- qtsvg
+ qtsvg-5
qttools
qtwebsockets
xz
@@ -7199,7 +7199,7 @@ (define-public the-butterfly-effect
;; 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 @@ (define-public flightgear
plib
qtbase-5
qtdeclarative
- qtsvg
+ qtsvg-5
simgear
speexdsp
sqlite
@@ -10153,7 +10153,7 @@ (define-public q5go
(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 @@ (define-public ktuberling
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 @@ (define-public picmi
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 @@ (define-public libkmahjongg
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 @@ (define-public kmahjongg
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 @@ (define-public kajongg
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 @@ (define-public konquest
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 @@ (define-public kbounce
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 @@ (define-public kblocks
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 @@ (define-public ksudoku
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 @@ (define-public kfourinline
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 @@ (define-public kblackbox
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 @@ (define-public granatier
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 @@ (define-public ksirk
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 @@ (define-public palapeli
libkdegames
qtbase-5
qtdeclarative
- qtsvg
+ qtsvg-5
shared-mime-info))
(home-page "https://games.kde.org/")
(synopsis "Jigsaw puzzle game")
@@ -11259,7 +11259,7 @@ (define-public kigo
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 @@ (define-public kubrick
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 @@ (define-public lskat
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 @@ (define-public kapman
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 @@ (define-public kspaceduel
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Two player game with shooting sp
This message was truncated. Download the full message here.
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 14/33] gnu: qtquickcontrols2: Rename to qtquickcontrols2-5.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-14-maxim.cournoyer@gmail.com
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(-)

Toggle diff (344 lines)
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 7e0218dbb7..32ec5c3141 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -92,7 +92,7 @@ (define-public sddm
;; '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 cb0d71cc54..6a9de32ffb 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -674,7 +674,7 @@ (define-public ktouch
qtbase-5
qtdeclarative-5
qtgraphicaleffects
- qtquickcontrols2
+ qtquickcontrols2-5
qtx11extras
qtxmlpatterns))
(home-page "https://edu.kde.org/ktouch/")
@@ -996,7 +996,7 @@ (define-public qolibri
(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 f4308cddd9..3b16ceac6b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3425,7 +3425,7 @@ (define-public uranium
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 fea5fa4e77..f1f568fcb2 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -806,7 +806,7 @@ (define-public monero-gui
("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 8d8d29c0db..97475063dc 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -611,7 +611,7 @@ (define-public jami
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 1c10183f29..6fc0b5f10c 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -876,7 +876,7 @@ (define-public kirigami
;;("plasma-frameworks" ,plasma-framework) ;; Tier 3!
qtbase-5
qtdeclarative-5
- qtquickcontrols2
+ qtquickcontrols2-5
qtsvg-5
;; Run-time dependency
qtgraphicaleffects))
@@ -1342,7 +1342,7 @@ (define-public qqc2-desktop-style
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 @@ (define-public plasma-framework
("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 34da2ef3f2..ac86489a95 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -176,7 +176,7 @@ (define-public elisa
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 @@ (define-public kamoso
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 143cb3b6a9..f11419afb9 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -290,7 +290,7 @@ (define-public kdenlive
qtmultimedia-5
qtnetworkauth
qtquickcontrols-5
- qtquickcontrols2
+ qtquickcontrols2-5
qtscript
qtsvg-5
shared-mime-info))
@@ -347,7 +347,7 @@ (define-public kdevelop
("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 @@ (define-public kdeconnect
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 a488fc3244..47fb94dc68 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -855,7 +855,7 @@ (define-public linphone-desktop
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 fcfe9c2c50..bd2af2e732 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1478,7 +1478,7 @@ (define-public kaidan
qtdeclarative-5
qtgraphicaleffects
qtlocation
- qtquickcontrols2
+ qtquickcontrols2-5
qtsvg-5
qtmultimedia-5
qtxmlpatterns
@@ -2461,7 +2461,7 @@ (define-public nheko
qtkeychain
qtgraphicaleffects
qtmultimedia-5
- qtquickcontrols2
+ qtquickcontrols2-5
qtsvg-5
spdlog
single-application-qt5
@@ -2500,7 +2500,7 @@ (define-public quaternion
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 5c04382209..f7a2483b65 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4758,7 +4758,7 @@ (define-public musescore
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 9a86b252b3..6851dd22b6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1658,7 +1658,7 @@ (define-public qtquickcontrols-5
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")
@@ -3271,7 +3271,7 @@ (define-public python-pyside-2
qtlocation
qtmultimedia-5
qtquickcontrols-5
- qtquickcontrols2
+ qtquickcontrols2-5
qtscript
qtscxml
qtsensors
@@ -3320,7 +3320,7 @@ (define-public python-pyside-2
"qtlocation"
"qtmultimedia-5"
"qtquickcontrols-5"
- "qtquickcontrols2"
+ "qtquickcontrols2-5"
"qtscript"
"qtscxml"
"qtsensors"
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 1438d4fd7d..989d5670f4 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1931,7 +1931,7 @@ (define-public welle-io
qtdeclarative-5
qtgraphicaleffects
qtmultimedia-5
- qtquickcontrols2
+ qtquickcontrols2-5
soapysdr))
(arguments
`(#:configure-flags '("-DRTLSDR=ON"
@@ -2162,7 +2162,7 @@ (define-public sdrangel
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 a93278e016..41207318a1 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -863,7 +863,7 @@ (define-public ausweisapp2
qtdeclarative-5
qtwebsockets
qtgraphicaleffects
- qtquickcontrols2
+ qtquickcontrols2-5
pcsc-lite
openssl))
(arguments
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 23294e39f6..f364195341 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -192,7 +192,7 @@ (define-public nextcloud-client
qtdeclarative-5
qtgraphicaleffects
qtkeychain
- qtquickcontrols2
+ qtquickcontrols2-5
qtsolutions
qtsvg-5
qtwebchannel
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 2d43cfa493..7e5016f08f 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -783,7 +783,7 @@ (define-public cool-retro-term
(("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 @@ (define-public cool-retro-term
(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 726ed15e47..ed8ba06779 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4861,7 +4861,7 @@ (define-public shotcut
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 bde96d6a90..ccba5b9968 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -258,7 +258,7 @@ (define-public bitmask
("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
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 11/33] gnu: qtdeclarative: Rename to qtdeclarative-5.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-11-maxim.cournoyer@gmail.com
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(-)

Toggle diff (544 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index dbe6870913..b041ade63d 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3232,7 +3232,7 @@ (define-public supercollider
boost-sync
yaml-cpp
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5
qtwebchannel
qtwebsockets))
@@ -5455,7 +5455,7 @@ (define-public ableton-link
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 71d8fae7f1..e19935daa8 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -86,7 +86,7 @@ (define-public sddm
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 9f87e67043..74356318a1 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -382,7 +382,7 @@ (define-public zeal
`(("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 998867918e..690de4d7de 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -180,7 +180,7 @@ (define-public gcompris-qt
(list openssl
python-wrapper
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtgraphicaleffects
qtmultimedia-5
qtquickcontrols
@@ -558,7 +558,7 @@ (define-public openboard
opus
poppler
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtmultimedia-5
qtsvg-5
qtwebchannel
@@ -672,7 +672,7 @@ (define-public ktouch
libxcb
libxkbfile
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtgraphicaleffects
qtquickcontrols2
qtx11extras
@@ -997,7 +997,7 @@ (define-public qolibri
qtbase-5
qtmultimedia-5
qtquickcontrols2
- qtdeclarative
+ qtdeclarative-5
qtwebchannel
qtwebengine
zlib))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 669d2010b5..c05e4cdf0a 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2490,7 +2490,7 @@ (define-public freecad
python-shiboken-2
python-wrapper
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5
qtwebchannel
qtwebengine
@@ -3422,7 +3422,7 @@ (define-public uranium
python-trimesh
python-zeroconf
qtbase
- qtdeclarative
+ qtdeclarative-5
qtgraphicaleffects
qtquickcontrols
qtquickcontrols2
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index ca2d8f6827..749c170fc7 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -392,7 +392,7 @@ (define-public fcitx5-chinese-addons
("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 8f3d4842e5..e753de7758 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -803,7 +803,7 @@ (define-public monero-gui
("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 f9e8baffd4..f426532cb1 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -520,7 +520,7 @@ (define-public tiled
"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 @@ (define-public warsow-qfusion
("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 ceac1d3390..51dec55bd7 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9270,7 +9270,7 @@ (define-public flightgear
openscenegraph
plib
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5
simgear
speexdsp
@@ -10248,7 +10248,7 @@ (define-public ktuberling
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 @@ (define-public picmi
kxmlgui
libkdegames
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Number logic game")
@@ -10332,7 +10332,7 @@ (define-public kolf
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 @@ (define-public kmahjongg
libkdegames
libkmahjongg
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Tile laying patience")
@@ -10451,7 +10451,7 @@ (define-public kshisen
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 @@ (define-public kbreakout
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 @@ (define-public kmines
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 @@ (define-public konquest
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 @@ (define-public kbounce
kxmlgui
libkdegames
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Jezzball arcade game")
@@ -10699,7 +10699,7 @@ (define-public kblocks
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 @@ (define-public ksudoku
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 @@ (define-public klines
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 @@ (define-public kgoldrunner
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 @@ (define-public kdiamond
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 @@ (define-public kfourinline
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 @@ (define-public kblackbox
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 @@ (define-public knetwalk
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 @@ (define-public bomber
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 @@ (define-public granatier
kxmlgui
libkdegames
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Bomberman clone")
@@ -11117,7 +11117,7 @@ (define-public ksirk
phonon
qca
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5
zlib))
(home-page "https://games.kde.org/")
@@ -11178,7 +11178,7 @@ (define-public palapeli
kxmlgui
libkdegames
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5
shared-mime-info))
(home-page "https://games.kde.org/")
@@ -11219,7 +11219,7 @@ (define-public kiriki
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 @@ (define-public kigo
kxmlgui
libkdegames
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Go board game")
@@ -11303,7 +11303,7 @@ (define-public kubrick
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 @@ (define-public lskat
kxmlgui
libkdegames
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Lieutnant Skat card game")
@@ -11381,7 +11381,7 @@ (define-public kapman
kxmlgui
libkdegames
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Pac-Man clone")
@@ -11420,7 +11420,7 @@ (define-public kspaceduel
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 @@ (define-public bovo
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 @@ (define-public killbots
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 @@ (define-public ksnakeduel
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 @@ (define-public kollision
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 @@ (define-public knavalbattle
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 @@ (define-public kreversi
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 @@ (define-public ksquares
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 @@ (define-public kjumpingcube
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 0c98d57821..0eaa64375d 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1958,7 +1958,7 @@ (define-public qmapshack
libjpeg-turbo
proj
qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtlocation
qtwebchannel
qtwebengine
@@ -2618,7 +2618,7 @@ (define-public qgis
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 98d30d54ed..d4b13cc90e 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -1091,7 +1091,7 @@ (define-public itk-snap
,(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 @@ (define-public itk-snap
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 2d3b8aa46f..2a472fb633 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -519,7 +519,7 @@ (define-public luminance-hdr
(list pkg-config qttools))
(inputs
(list qtbase-5
- qtdeclarative
+ qtdeclarative-5
qtsvg-5
boost
eigen

This message was truncated. Download the full message here.
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 15/33] gnu: qtquickcontrols2: Define as obsoleted by qtdeclarative.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-15-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtquickcontrols2): New variable.
---
gnu/packages/qt.scm | 6 ++++++
1 file changed, 6 insertions(+)

Toggle diff (19 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6851dd22b6..c238d09486 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1679,6 +1679,12 @@ (define-public qtquickcontrols2-5
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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 17/33] gnu: Add qtwebsockets, version 6.3.1.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-17-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtwebsockets): New variable.
---
gnu/packages/qt.scm | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)

Toggle diff (52 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index bd43830391..d0b9e8ea9c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1227,6 +1227,45 @@ (define-public qtwebsockets-5
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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 16/33] gnu: qtwebsockets: Rename to qtwebsockets-5.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-16-maxim.cournoyer@gmail.com
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(-)

Toggle diff (147 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 107deef3de..4a8c2f0fba 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3235,7 +3235,7 @@ (define-public supercollider
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 51dec55bd7..a851a6853a 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -996,7 +996,7 @@ (define-public cockatrice
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 c238d09486..bd43830391 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1204,7 +1204,7 @@ (define-public qtconnectivity
(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")
@@ -1516,7 +1516,7 @@ (define-public qtwebchannel
(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
@@ -1544,7 +1544,7 @@ (define-public qtwebglplugin
#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
@@ -2470,7 +2470,7 @@ (define-public python-pyqt
("qttools" ,qttools)
("qtwebchannel" ,qtwebchannel)
("qtwebkit" ,qtwebkit)
- ("qtwebsockets" ,qtwebsockets)
+ ("qtwebsockets-5" ,qtwebsockets-5)
("qtx11extras" ,qtx11extras)
("qtxmlpatterns" ,qtxmlpatterns)))
(arguments
@@ -3285,7 +3285,7 @@ (define-public python-pyside-2
qtsvg-5
qtwebchannel
qtwebengine
- qtwebsockets
+ qtwebsockets-5
qtx11extras
qtxmlpatterns))
(propagated-inputs
@@ -3335,7 +3335,7 @@ (define-public python-pyside-2
"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 989d5670f4..5f9767c896 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1336,7 +1336,7 @@ (define-public jtdx
jtdx-hamlib
libusb
qtbase-5
- qtwebsockets
+ qtwebsockets-5
qtmultimedia-5
qtserialport))
(arguments
@@ -2165,7 +2165,7 @@ (define-public sdrangel
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 41207318a1..c8fe460a26 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -861,7 +861,7 @@ (define-public ausweisapp2
(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 f364195341..40385124fd 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -196,7 +196,7 @@ (define-public nextcloud-client
qtsolutions
qtsvg-5
qtwebchannel
- qtwebsockets
+ qtwebsockets-5
sqlite
xdg-utils
zlib))
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index ed8ba06779..fd0c7897dd 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4864,7 +4864,7 @@ (define-public shotcut
qtquickcontrols2-5
qtsvg-5
qtwebkit
- qtwebsockets
+ qtwebsockets-5
qtx11extras
sdl2))
(home-page "https://www.shotcut.org/")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 24/33] gnu: Add qttools, version 6.3.1.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-24-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qttools): New variable.
---
gnu/packages/qt.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)

Toggle diff (40 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index e6ddad9c10..96576c6f59 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1725,6 +1725,33 @@ (define-public qttools-5
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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 18/33] gnu: qtwebchannel: Rename to qtwebchannel-5.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-18-maxim.cournoyer@gmail.com
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(-)

Toggle diff (305 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 4a8c2f0fba..dc6fc94845 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3234,7 +3234,7 @@ (define-public supercollider
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 2f4755de55..32dc26868d 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -383,7 +383,7 @@ (define-public zeal
("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 6a9de32ffb..5551fd0594 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -561,7 +561,7 @@ (define-public openboard
qtdeclarative-5
qtmultimedia-5
qtsvg-5
- qtwebchannel
+ qtwebchannel-5
qtwebengine
qtxmlpatterns
quazip-0
@@ -998,7 +998,7 @@ (define-public qolibri
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 3b16ceac6b..463b90cd97 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2492,7 +2492,7 @@ (define-public freecad
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 749c170fc7..ea7f1be752 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -393,7 +393,7 @@ (define-public fcitx5-chinese-addons
("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 0eaa64375d..324178181c 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1960,7 +1960,7 @@ (define-public qmapshack
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 2a472fb633..81b097df07 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -533,7 +533,7 @@ (define-public luminance-hdr
openexr-2
qtwebengine
qtdeclarative-5
- qtwebchannel
+ qtwebchannel-5
fftwf
gsl
libtiff))
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 97475063dc..2583a59a26 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -606,7 +606,7 @@ (define-public jami
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 06da6db29a..b78c4b8c45 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -727,7 +727,7 @@ (define-public kdepim-runtime
qtdeclarative-5
qtnetworkauth
qtspeech
- qtwebchannel
+ qtwebchannel-5
qtwebengine
qtxmlpatterns))
(arguments
@@ -1071,7 +1071,7 @@ (define-public kmail
qgpgme
qtbase-5
qtdeclarative-5
- qtwebchannel
+ qtwebchannel-5
qtwebengine
sonnet))
(arguments
@@ -1323,7 +1323,7 @@ (define-public kmessagelib
qgpgme
qtbase-5
qtdeclarative-5
- qtwebchannel
+ qtwebchannel-5
qtwebengine
qtwebkit
sonnet))
@@ -1849,7 +1849,7 @@ (define-public libkgapi
kwindowsystem
qtbase-5
qtdeclarative-5
- qtwebchannel
+ qtwebchannel-5
qtwebengine))
(arguments
`(#:tests? #f)) ;; TODO 6/48 tests fail
@@ -1932,7 +1932,7 @@ (define-public libksieve
libkdepim
qtbase-5
qtdeclarative-5
- qtwebchannel
+ qtwebchannel-5
qtwebengine))
(arguments
`(#:phases
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index f11419afb9..6e9d9d125f 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -206,7 +206,7 @@ (define-public akregator
qgpgme
qtbase-5
qtdeclarative-5
- qtwebchannel
+ qtwebchannel-5
qtwebengine
syndication))
(home-page "https://apps.kde.org/en/akregator")
@@ -1028,7 +1028,7 @@ (define-public marble-qt
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 bd2af2e732..c7457022c0 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2910,7 +2910,7 @@ (define-public movim-desktop
"\"../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 d0b9e8ea9c..a16b1285b4 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1544,7 +1544,7 @@ (define-public qtserialbus
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")
@@ -2264,7 +2264,7 @@ (define (delete-unwanted-files child stat flag base level)
qtbase-5
qtdeclarative-5
qtmultimedia-5
- qtwebchannel
+ qtwebchannel-5
re2
snappy
eudev
@@ -2507,7 +2507,7 @@ (define-public python-pyqt
("qtserialport" ,qtserialport)
("qtsvg-5" ,qtsvg-5)
("qttools" ,qttools)
- ("qtwebchannel" ,qtwebchannel)
+ ("qtwebchannel-5" ,qtwebchannel-5)
("qtwebkit" ,qtwebkit)
("qtwebsockets-5" ,qtwebsockets-5)
("qtx11extras" ,qtx11extras)
@@ -2611,7 +2611,7 @@ (define-public python-pyqtwebengine
("qtbase" ,qtbase-5)
("qtsvg-5" ,qtsvg-5)
("qtdeclarative-5" ,qtdeclarative-5)
- ("qtwebchannel" ,qtwebchannel)
+ ("qtwebchannel-5" ,qtwebchannel-5)
("qtwebengine" ,qtwebengine)))
(arguments
`(#:modules ((srfi srfi-1)
@@ -3085,7 +3085,7 @@ (define-public qtwebkit
("qtlocation" ,qtlocation)
("qtmultimedia-5" ,qtmultimedia-5)
("qtsensors" ,qtsensors)
- ("qtwebchannel" ,qtwebchannel)
+ ("qtwebchannel-5" ,qtwebchannel-5)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("libx11" ,libx11)
@@ -3322,7 +3322,7 @@ (define-public python-pyside-2
qtsensors
qtspeech
qtsvg-5
- qtwebchannel
+ qtwebchannel-5
qtwebengine
qtwebsockets-5
qtx11extras
@@ -3372,7 +3372,7 @@ (define-public python-pyside-2
"qtspeech"
"qtsvg-5"
"qttools"
- "qtwebchannel"
+ "qtwebchannel-5"
"qtwebengine"
"qtwebsockets-5"
"qtx11extras"
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 40385124fd..10aef0c83a 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -195,7 +195,7 @@ (define-public nextcloud-client
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 6642620155..acf0400b75 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -671,7 +671,7 @@ (define-public ghostwriter
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 8892281f0d..5f68d401ac 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8092,7 +8092,7 @@ (define-public kiwix-desktop
pugixml
qtbase-5
qtdeclarative-5
- qtwebchannel
+ qtwebchannel-5
qtwebengine
xapian
zlib
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 19/33] gnu: Add qtwebchannel, version 6.3.1.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-19-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtwebchannel): New variable.
---
gnu/packages/qt.scm | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)

Toggle diff (50 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a16b1285b4..b051fc5fe5 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1563,6 +1563,43 @@ (define-public qtwebchannel-5
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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 26/33] gnu: Add qtnetworkauth, version 6.3.1.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-26-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtnetworkauth): New variable.
---
gnu/packages/qt.scm | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)

Toggle diff (33 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9bd276ac33..121ff8b4fe 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1983,6 +1983,26 @@ (define-public qtnetworkauth-5
(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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 20/33] gnu: qtwebengine: Rename to qtwebengine-5.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-20-maxim.cournoyer@gmail.com
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(-)

Toggle diff (438 lines)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index dc6fc94845..7a59530e89 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3237,7 +3237,7 @@ (define-public supercollider
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 32dc26868d..6f24149b5d 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -371,7 +371,7 @@ (define-public zeal
(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 @@ (define-public zeal
("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 5d864da281..ccc0bdf88d 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -202,7 +202,7 @@ (define-public calibre
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 5551fd0594..aabf3dfc21 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -448,7 +448,7 @@ (define-public toutenclic
(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 @@ (define-public openboard
qtmultimedia-5
qtsvg-5
qtwebchannel-5
- qtwebengine
+ qtwebengine-5
qtxmlpatterns
quazip-0
sdl
@@ -807,9 +807,9 @@ (define-public anki
("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 @@ (define-public qolibri
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 702378c206..a5ae7b9567 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -13111,7 +13111,7 @@ (define-public emacs-org-contrib
(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 463b90cd97..5a6560669d 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2493,7 +2493,7 @@ (define-public freecad
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 ea7f1be752..00648ea963 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -394,7 +394,7 @@ (define-public fcitx5-chinese-addons
("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 324178181c..b8125ffe6e 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1961,7 +1961,7 @@ (define-public qmapshack
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 81b097df07..045fdae882 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -531,7 +531,7 @@ (define-public luminance-hdr
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 2583a59a26..22d2f0c5ce 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -605,7 +605,7 @@ (define-public jami
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 b78c4b8c45..f0f5683ac5 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -728,7 +728,7 @@ (define-public kdepim-runtime
qtnetworkauth
qtspeech
qtwebchannel-5
- qtwebengine
+ qtwebengine-5
qtxmlpatterns))
(arguments
;; TODO: 5/45 tests fail for quite different reasons, even with
@@ -1072,7 +1072,7 @@ (define-public kmail
qtbase-5
qtdeclarative-5
qtwebchannel-5
- qtwebengine
+ qtwebengine-5
sonnet))
(arguments
`(#:phases
@@ -1324,7 +1324,7 @@ (define-public kmessagelib
qtbase-5
qtdeclarative-5
qtwebchannel-5
- qtwebengine
+ qtwebengine-5
qtwebkit
sonnet))
(arguments
@@ -1656,7 +1656,7 @@ (define-public kpimcommon
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 @@ (define-public libkgapi
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 @@ (define-public libksieve
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 6e9d9d125f..c43758ef7f 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -170,7 +170,7 @@ (define-public akregator
(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 @@ (define-public akregator
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 @@ (define-public marble-qt
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 c7457022c0..b047ee0d9f 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2912,7 +2912,7 @@ (define-public movim-desktop
(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 b051fc5fe5..578837fb14 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2013,7 +2013,7 @@ (define-public qtspell
;; COPYING file specify GPL3, but source code files all refer to GPL2+.
(license license:gpl2+)))
-(define-public qtwebengine
+(define-public qtwebengine-5
(package
(inherit qtsvg-5)
(name "qtwebengine")
@@ -2208,7 +2208,7 @@ (define (delete-unwanted-files child stat flag base level)
(_ #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"
@@ -2326,7 +2326,7 @@ (define (delete-unwanted-files child stat flag base level)
(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\\)")
@@ -2356,7 +2356,7 @@ (define (delete-unwanted-files child stat flag base level)
(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"
@@ -2649,7 +2649,7 @@ (define-public python-pyqtwebengine
("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))
@@ -3360,7 +3360,7 @@ (define-public python-pyside-2
qtspeech
qtsvg-5
qtwebchannel-5
- qtwebengine
+ qtwebengine-5
qtwebsockets-5
qtx11extras
qtxmlpatterns))
@@ -3410,7 +3410,7 @@ (define-public python-pyside-2
"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 10aef0c83a..5b82e0ca3d 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -201,7 +201,7 @@ (define-public nextcloud-client
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 acf0400b75..345454bd62 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -673,7 +673,7 @@ (define-public ghostwriter
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 ccba5b9968..df891ea09c 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -736,7 +736,7 @@ (define-public openconnect-sso
(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")
@@ -756,7 +756,7 @@ (define-public openconnect-sso
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 751478c3d1..f47db2e752 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -492,11 +492,11 @@ (define-public qutebrowser
;; 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 @@ (define-public qutebrowser
(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 5f68d401ac..7b84f18d4e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8078,7 +8078,7 @@ (define-public kiwix-desktop
(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 @@ (define-public kiwix-desktop
qtbase-5
qtdeclarative-5
qtwebchannel-5
- qtwebengine
+ qtwebengine-5
xapian
zlib
`(,zstd "lib")))
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 21/33] gnu: Add qtwebengine, version 6.3.1.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-21-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtwebengine): New variable.
---
gnu/packages/qt.scm | 345 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 345 insertions(+)

Toggle diff (372 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 578837fb14..5abd691665 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -88,6 +88,7 @@ (define-module (gnu packages qt)
#: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 @@ (define-module (gnu packages qt)
#: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)
@@ -2378,6 +2380,349 @@ (define (delete-unwanted-files child stat flag base level)
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"))
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:08
[PATCH 30/33] gnu: libjami: Enable test agent.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-30-maxim.cournoyer@gmail.com
* gnu/packages/jami.scm (libjami)[configure-flags]: Add '--enable-agent' and
remove FIXME.
[tests?]: Update comment.
---
gnu/packages/jami.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

Toggle diff (28 lines)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 617b477193..44052b03c4 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -409,15 +409,17 @@ (define-public libjami
(build-system gnu-build-system)
(arguments
(list
- ;; The test suite fails to link when building libjami as a shared library:
- ;; "testAccount_factory.cpp:(.text+0xc52): undefined reference to
- ;; `jami::AccountFactory::AccountFactory()'.
+ ;; The test suite fails to link when building libjami as a shared
+ ;; library: "sip_account/sip_empty_offer.cpp:228:1: error: no
+ ;; declaration matches ‘void
+ ;; jami::test::SipEmptyOfferTest::onCallStateChange(const string&, const
+ ;; string&, jami::test::CallData&)’".
#:tests? #f
;; The agent links the daemon binary with libguile, which enables the
;; execution of test plans described in Scheme. It may be useful in
;; user scripts too, until more general purpose Scheme bindings are made
;; available (see: test/agent/README.md).
- #:configure-flags #~(list "--disable-agent"
+ #:configure-flags #~(list "--enable-agent"
"--enable-debug"
;; Disable static libraries to avoid
;; installing a 98 MiB archive.
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:08
[PATCH 31/33] gnu: Remove jami-libclient.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-31-maxim.cournoyer@gmail.com
* gnu/packages/jami.scm (jami-libclient): Delete variable.
(libringclient): Likewise.
(jami-gnome)[inputs]: Remove jami-libclient.
(jami)[inputs]: Likewise.
---
gnu/packages/jami.scm | 48 +------------------------------------------
1 file changed, 1 insertion(+), 47 deletions(-)

Toggle diff (75 lines)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 44052b03c4..3a7e29ee8b 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -474,50 +474,6 @@ (define-public libjami
(define-public libring
(deprecated-package "libring" libjami))
-;;; Note: this package will eventually be absorbed into jami itself (the Qt
-;;; client).
-(define-public jami-libclient
- (package
- (name "jami-libclient")
- (version %jami-version)
- (source %jami-sources)
- (build-system cmake-build-system)
- (outputs '("out" "debug"))
- (arguments
- (list
- #:tests? #f ;no test suite
- #:configure-flags
- #~(list (string-append "-DRING_XML_INTERFACES_DIR="
- #$(this-package-input "libjami")
- "/share/dbus-1/interfaces")
- (string-append "-DRING_BUILD_DIR="
- #$(this-package-input "libjami")
- "/include")
- ;; Call to the libraries directly instead of going through DBus
- ;; to avoid issues (see: https://issues.guix.gnu.org/48538).
- "-DENABLE_LIBWRAP=true")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'change-directory/maybe
- (lambda _
- ;; Allow building from the tarball or a git checkout.
- (false-if-exception (chdir "lrc")))))))
- (native-inputs (list qttools vulkan-headers))
- (inputs (list ffmpeg-jami libjami libxkbcommon network-manager))
- (propagated-inputs (list qtbase)) ;qt included in several installed headers
- (synopsis "Jami client library")
- (description "This package provides a library common to all Jami clients.
-Jami is a secure and distributed voice, video and chat communication platform
-that requires no centralized server and leaves the power of privacy in the
-hands of the user. It supports the SIP and IAX protocols, as well as
-decentralized calling using P2P-DHT.")
- (home-page "https://jami.net")
- (license license:gpl3+)))
-
-;;; Remove when 2023 comes.
-(define-public libringclient
- (deprecated-package "libringclient" jami-libclient))
-
(define-public jami-gnome
(package
(name "jami-gnome")
@@ -557,7 +513,6 @@ (define-public jami-gnome
(list clutter
clutter-gtk
gtk+
- jami-libclient
libcanberra
libappindicator
libnotify
@@ -612,8 +567,7 @@ (define-public jami
(native-inputs
(list pkg-config python qttools-5 doxygen graphviz))
(inputs
- (list jami-libclient
- libnotify
+ (list libnotify
network-manager
qrencode
qtsvg-5
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 23/33] gnu: qttools: Rename to qttools-5.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-23-maxim.cournoyer@gmail.com
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 +-
.../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(-)

Toggle diff (449 lines)
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index c7f80a4b6a..ba8ce00fbd 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -448,7 +448,7 @@ (define-public papagayo
("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 041e8de438..ee09b4ccb2 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -615,7 +615,7 @@ (define-public stellarium
`(("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 7a59530e89..d8227ac7b3 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -587,7 +587,7 @@ (define-public alsa-modular-synth
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 @@ (define-public qjackctl
(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 @@ (define-public supercollider
(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 @@ (define-public qsynth
(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 @@ (define-public ableton-link
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 4ea12e4cf3..7be932f528 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -499,7 +499,7 @@ (define-public kdiskmark
(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 fe235d4b3b..43fc287b95 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -470,7 +470,7 @@ (define-public qbittorrent
(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 71dff3588f..f4e6e43ec8 100644
--- a/gnu/packages/connman.scm
+++ b/gnu/packages/connman.scm
@@ -165,7 +165,7 @@ (define-public cmst
(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 32c36fe337..aa2b17dda0 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -4782,7 +4782,7 @@ (define-public sqlitebrowser
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 32ec5c3141..efeea2924d 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -78,7 +78,7 @@ (define-public sddm
"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 b85193ccdb..92b4b6dce7 100644
--- a/gnu/packages/djvu.scm
+++ b/gnu/packages/djvu.scm
@@ -107,7 +107,7 @@ (define-public djview
(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 aabf3dfc21..c5666fb02e 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -174,7 +174,7 @@ (define-public gcompris-qt
gettext-minimal
kdoctools
perl
- qttools
+ qttools-5
xorg-server-for-tests))
(inputs
(list openssl
@@ -540,7 +540,7 @@ (define-public openboard
(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 @@ (define-public qolibri
(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 342294de13..15e7318926 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -373,7 +373,7 @@ (define-public pulseview
(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 ba7fa1dbe2..386e127e1e 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -744,7 +744,7 @@ (define-public mgba
(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 5a6560669d..b1558bb991 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -762,7 +762,7 @@ (define-public qelectrotech
(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 @@ (define-public librepcb
(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 @@ (define-public freecad
(native-inputs
(list doxygen
graphviz
- qttools
+ qttools-5
pkg-config
python-pyside-2-tools
swig))
@@ -3715,7 +3715,7 @@ (define-public candle
(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 f1f568fcb2..70c07d11b1 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -143,7 +143,7 @@ (define-public bitcoin-core-0.21
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 @@ (define-public bitcoin-core-0.21
(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 @@ (define-public monero
pkg-config
protobuf
python
- qttools))
+ qttools-5))
(inputs
(list boost
cppzmq
@@ -1543,7 +1543,7 @@ (define-public bitcoin-abc
(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 @@ (define-public bitcoin-unlimited
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 @@ (define-public bitcoin-unlimited
(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 @@ (define-public fulcrum
(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 @@ (define-public flowee
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 f426532cb1..70bd4c0251 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -522,7 +522,7 @@ (define-public tiled
(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 @@ (define-public tiled
(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 a851a6853a..8b655cc0e4 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -995,7 +995,7 @@ (define-public cockatrice
qtbase-5
qtmultimedia-5
qtsvg-5
- qttools
+ qttools-5
qtwebsockets-5
xz
zlib))
@@ -2504,7 +2504,7 @@ (define-public solarus
(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 @@ (define-public the-butterfly-effect
(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 @@ (define-public flightgear
(native-inputs
`(("cppunit" ,cppunit)
("pkg-config" ,pkg-config)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("flightgear-data"
,(origin
(method url-fetch)
@@ -9407,7 +9407,7 @@ (define-public hedgewars
("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 @@ (define-public chessx
(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 b8125ffe6e..fe2174b106 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1495,7 +1495,7 @@ (define-public xygrib
(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 @@ (define-public qmapshack
(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 @@ (define-public openorienteering-mapper
("zlib" ,zlib)))
(native-inputs
`(("doxygen" ,doxygen)
- ("qttools" ,qttools)))
+ ("qttools-5" ,qttools-5)))
(home-page "http
This message was truncated. Download the full message here.
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 22/33] gnu: Add qt5compat.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-22-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qt5compat): New variable.
---
gnu/packages/qt.scm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)

Toggle diff (42 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5abd691665..ae426558ec 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -833,6 +833,35 @@ (define-public qtbase
(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)
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 29/33] gnu: jami: Update to 20220725.1128.fd5e6c6.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-29-maxim.cournoyer@gmail.com
* gnu/packages/patches/jami-fix-crash-on-quit.patch: Delete file.
* gnu/packages/patches/jami-images-loading.patch: Likewise.
* gnu/packages/patches/jami-libclient-audio-managers.patch: Likewise.
* gnu/packages/patches/jami-memory-usage.patch: Likewise.
* gnu/local.mk (dist_patch_DATA): De-register removed patches.
* gnu/packages/jami.scm (%jami-version): Update to 20220725.1128.fd5e6c6.
(libjami)[configure-flags]: Add '--disable-static'.
(jami-apply-custom-patches): Adjust for top directory renaming.
(%ffmpeg-default-configure-flags): Add muxer support
for g726 and g726le. Add demuxer support for g723_1, g726 and g726le. Add
encoder/decoder support for g726, g726le and g723_1. Add decoder support for
g729.
(ffmpeg-jami)[patches]: Add 'libopusenc-reload-packet-loss-at-encode'.
(jami-libclient)[native-inputs]: New field.
[inputs]: Add ffmpeg-jami and libxkbcommon.
[propagated-inputs]: Replace qtbase-5 with qtbase.
---
gnu/local.mk | 4 -
gnu/packages/jami.scm | 48 +++---
.../patches/jami-fix-crash-on-quit.patch | 34 ----
.../patches/jami-images-loading.patch | 152 ------------------
.../jami-libclient-audio-managers.patch | 23 ---
gnu/packages/patches/jami-memory-usage.patch | 70 --------
6 files changed, 29 insertions(+), 302 deletions(-)
delete mode 100644 gnu/packages/patches/jami-fix-crash-on-quit.patch
delete mode 100644 gnu/packages/patches/jami-images-loading.patch
delete mode 100644 gnu/packages/patches/jami-libclient-audio-managers.patch
delete mode 100644 gnu/packages/patches/jami-memory-usage.patch

Toggle diff (176 lines)
diff --git a/gnu/local.mk b/gnu/local.mk
index 0c4edf6e56..9aab37b67b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1307,10 +1307,6 @@ dist_patch_DATA = \
%D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/jsoncpp-pkg-config-version.patch \
- %D%/packages/patches/jami-fix-crash-on-quit.patch \
- %D%/packages/patches/jami-images-loading.patch \
- %D%/packages/patches/jami-memory-usage.patch \
- %D%/packages/patches/jami-libclient-audio-managers.patch \
%D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \
%D%/packages/patches/jamvm-1.5.1-armv7-support.patch \
%D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index e5c29981d3..617b477193 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -51,7 +51,9 @@ (define-module (gnu packages jami)
#:use-module (gnu packages upnp)
#:use-module (gnu packages version-control)
#:use-module (gnu packages video)
+ #:use-module (gnu packages vulkan)
#:use-module (gnu packages webkit)
+ #:use-module (gnu packages xdisorg)
#:use-module (gnu packages xiph)
#:use-module (gnu packages xorg)
#:use-module (gnu packages)
@@ -64,7 +66,7 @@ (define-module (gnu packages jami)
#:use-module (guix packages)
#:use-module (guix utils))
-(define %jami-version "20211223.2.37be4c3")
+(define %jami-version "20220725.1128.fd5e6c6")
(define %jami-sources
;; Return an origin object of the tarball release sources archive of the
@@ -85,14 +87,10 @@ (define %jami-sources
(for-each delete-file-recursively '("client-android"
"client-ios"
"client-macosx"
- "client-uwp"))))
- (patches (search-patches "jami-libclient-audio-managers.patch"
- "jami-fix-crash-on-quit.patch"
- "jami-images-loading.patch"
- "jami-memory-usage.patch"))
+ "plugins"))))
(sha256
(base32
- "12h4a0nj3gh05w64gkywrrb64agrhn6y3q4b9cqnhvr1vdkzlj0h"))))
+ "0pyyw0lynfdxqdz44ld324hvhqbcmqd9zz4pbxvgk3z165njsdig"))))
;; Jami maintains a set of patches for some key dependencies (currently
;; pjproject and ffmpeg) of Jami that haven't yet been integrated upstream.
@@ -104,7 +102,7 @@ (define jami-apply-custom-patches
(invoke "tar" "-xvf" #$%jami-sources
"-C" patches-directory
"--strip-components=5"
- (string-append "ring-project/daemon/contrib/src/"
+ (string-append "jami-project/daemon/contrib/src/"
dep-name))
(for-each
(lambda (file)
@@ -178,6 +176,8 @@ (define %ffmpeg-default-configure-flags
"--disable-muxers"
"--enable-muxer=rtp"
"--enable-muxer=g722"
+ "--enable-muxer=g726"
+ "--enable-muxer=g726le"
"--enable-muxer=h263"
"--enable-muxer=h264"
"--enable-muxer=hevc"
@@ -202,6 +202,9 @@ (define %ffmpeg-default-configure-flags
"--enable-demuxer=wav"
"--enable-demuxer=ac3"
"--enable-demuxer=g722"
+ "--enable-demuxer=g723_1"
+ "--enable-demuxer=g726"
+ "--enable-demuxer=g726le"
"--enable-demuxer=pcm_mulaw"
"--enable-demuxer=pcm_alaw"
"--enable-demuxer=pcm_s16be"
@@ -222,6 +225,13 @@ (define %ffmpeg-default-configure-flags
;; Encoders/decoders.
"--enable-encoder=adpcm_g722"
"--enable-decoder=adpcm_g722"
+ "--enable-encoder=adpcm_g726"
+ "--enable-decoder=adpcm_g726"
+ "--enable-encoder=adpcm_g726le"
+ "--enable-decoder=adpcm_g726le"
+ "--enable-decoder=g729"
+ "--enable-encoder=g723_1"
+ "--enable-decoder=g723_1"
"--enable-encoder=rawvideo"
"--enable-decoder=rawvideo"
"--enable-encoder=libx264"
@@ -387,7 +397,7 @@ (define-public ffmpeg-jami
"change-RTCP-ratio"
"rtp_ext_abs_send_time"
"libopusdec-enable-FEC"
- "libopusenc-enable-FEC"
+ "libopusenc-reload-packet-loss-at-encode"
"screen-sharing-x11-fix"))))))))))
(define-public libjami
@@ -405,12 +415,13 @@ (define-public libjami
#:tests? #f
;; The agent links the daemon binary with libguile, which enables the
;; execution of test plans described in Scheme. It may be useful in
- ;; user scripts too, until more generalized Scheme bindings are made
- ;; (see: test/agent/README.md).
- ;; FIXME: Fails to link when building libjami as a shared library:
- ;; bindings.cpp:(.text+0x24): undefined reference to `jami::Logger::log
- ;; [...].
- #:configure-flags #~(list "--disable-agent" "--enable-debug")
+ ;; user scripts too, until more general purpose Scheme bindings are made
+ ;; available (see: test/agent/README.md).
+ #:configure-flags #~(list "--disable-agent"
+ "--enable-debug"
+ ;; Disable static libraries to avoid
+ ;; installing a 98 MiB archive.
+ "--disable-static")
#:make-flags #~(list "V=1") ;build verbosely
#:phases
#~(modify-phases %standard-phases
@@ -489,10 +500,9 @@ (define-public jami-libclient
(lambda _
;; Allow building from the tarball or a git checkout.
(false-if-exception (chdir "lrc")))))))
- (inputs
- (list libjami network-manager))
- (propagated-inputs
- (list qtbase-5)) ;Qt is included in several installed headers
+ (native-inputs (list qttools vulkan-headers))
+ (inputs (list ffmpeg-jami libjami libxkbcommon network-manager))
+ (propagated-inputs (list qtbase)) ;qt included in several installed headers
(synopsis "Jami client library")
(description "This package provides a library common to all Jami clients.
Jami is a secure and distributed voice, video and chat communication platform
diff --git a/gnu/packages/patches/jami-fix-crash-on-quit.patch b/gnu/packages/patches/jami-fix-crash-on-quit.patch
deleted file mode 100644
index c25bce588a..0000000000
--- a/gnu/packages/patches/jami-fix-crash-on-quit.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Retrieved from:
-https://git.jami.net/savoirfairelinux/jami-client-qt/-/commit/83f68573324a453a6d26e025fd6439f175a79d1b.diff.
-
-With the 'client-qt' prefix added to match the file hierarchy of the release tarball.
-
-diff --git a/client-qt/src/mainapplication.cpp b/client-qt/src/mainapplication.cpp
-index 0c3209fc6fa7c528bec197f1cf9332758170441c..278f19287b86dd2c916935ab0930cbe0abb35d26 100644
---- a/client-qt/src/mainapplication.cpp
-+++ b/client-qt/src/mainapplication.cpp
-@@ -155,7 +155,11 @@ MainApplication::MainApplication(int& argc, char** argv)
- QObject::connect(this, &QApplication::aboutToQuit, [this] { cleanup(); });
- }
-
--MainApplication::~MainApplication() {}
-+MainApplication::~MainApplication()
-+{
-+ engine_.reset();
-+ lrcInstance_.reset();
-+}
-
- bool
- MainApplication::init()
-diff --git a/src/mainapplication.h b/src/mainapplication.h
-index 51306be829478b9fbc1c61a08aeb96938be26dac..4047e3abb3cfd3e6250387a37fa5a896e9bc4161 100644
---- a/client-qt/src/mainapplication.h
-+++ b/client-qt/src/mainapplication.h
-@@ -80,7 +80,6 @@ private:
- private:
- QScopedPointer<QFile> debugFile_;
- QScopedPointer<QQmlApplicationEngine> engine_;
--
- QScopedPointer<LRCInstance> lrcInstance_;
-
- QScopedPointer<ConnectivityMonitor> connectivityMonitor_;
Toggle diff (227 lines)
diff --git a/gnu/packages/patches/jami-images-loading.patch b/gnu/packages/patches/jami-images-loading.patch
deleted file mode 100644
index caf9e1e198..0000000000
--- a/gnu/packages/patches/jami-images-loading.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From be9dd0d0d8cb4556cd930edd783c0a1699565ac0 Mon Sep 17 00:00:00 2001
-From: kkostiuk <kateryna.kostiuk@savoirfairelinux.com>
-Date: Mon, 1 Nov 2021 17:39:23 -0400
-Subject: [PATCH] conversation: fix long loading time for images
-
-Change-Id: Id88cfbd571f4b504f258758bd13b4e4a91bf1b49
----
- .../DataTransferMessageDelegate.qml | 52 +++++++++++++++++--
- src/messagesadapter.cpp | 20 +++++--
- src/messagesadapter.h | 2 +-
- 3 files changed, 66 insertions(+), 8 deletions(-)
-
-diff --git a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml
-index 7875e01..2e7dcc0 100644
---- a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml
-+++ b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml
-@@ -252,10 +252,11 @@ Loader {
- Loader {
- id: localMediaCompLoader
- anchors.right: isOutgoing ? parent.right : undefined
-+ asynchronous: true
- width: sourceComponent.width
- height: sourceComponent.height
- sourceComponent: mediaInfo.isImage !== undefined ?
-- imageComp :
-+ imageComp : mediaInfo.isAnimatedImage !== undefined ? animatedImageComp :
- avComp
- Component {
- id: avComp
-@@ -302,9 +303,9 @@ Loader {
- }
- }
- Component {
-- id: imageComp
-+ id: animatedImageComp
- AnimatedImage {
-- id: img
-+ id: animatedImg
- anchors.right: isOutgoing ? parent.right : undefined
- property real minSize: 192
- property real maxSize: 256
-@@ -327,6 +328,51 @@ Loader {
- anchors.fill: parent
- }
- layer.enabled: true
-+ layer.effect: OpacityMask {
-+ maskSource: MessageBubble {
-+ out: isOutgoing
-+ type: seq
-+ width: animatedImg.width
-+ height: animatedImg.height
-+ radius: msgRadius
-+ }
-+ }
-+ HoverHandler {
-+ target : parent
-+ onHoveredChanged: {
-+ localMediaMsgItem.hoveredLink = hovered ? animatedImg.source : ""
-+ }
-+ cursorShape: Qt.PointingHandCursor
-+ }
-+ }
-+ }
-+
-+ Component {
-+ id: imageComp
-+ Image {
-+ id: img
-+ anchors.right: isOutgoing ? parent.right : undefined
-+ property real minSize: 192
-+ property real maxSize: 256
-+ cache: true
-+ fillMode: Image.PreserveAspectCrop
-+ mipmap: true
-+ antialiasing: true
-+ autoTransform: false
-+ asynchronous: true
-+ source: "file:///" + Body
-+ property real aspectRatio: implicitWidth / implicitHeight
-+ property real adjustedWidth: Math.min(maxSize,
-+ Math.max(minSize,
-+ innerContent.width - senderMargin))
-+ width: adjustedWidth
-+ height: Math.ceil(adjustedWidth / aspectRatio)
-+ Rectangle {
-+ color: JamiTheme.previewImageBackgroundColor
-+ z: -1
-+ anchors.fill: parent
-+ }
-+ layer.enabled: true
- layer.effect: OpacityMask {
- maskSource: MessageBubble {
- out: isOutgoing
-diff --git a/client-qt/src/messagesadapter.cpp b/client-qt/src/messagesadapter.cpp
-index 91f8eed..ba38e53 100644
---- a/client-qt/src/messagesadapter.cpp
-+++ b/client-qt/src/messagesadapter.cpp
-@@ -458,13 +458,24 @@ MessagesAdapter::conversationTypersUrlToName(const QSet<QString>& typersSet)
- return nameList;
- }
-
--bool
-+QVariantMap
- MessagesAdapter::isLocalImage(const QString& msg)
- {
- QImageReader reader;
- reader.setDecideFormatFromContent(true);
- reader.setFileName(msg);
-- return !reader.read().isNull();
-+ QByteArray fileFormat = reader.format();
-+ if (fileFormat == "gif") {
-+ return {{"isAnimatedImage", true}};
-+ }
-+ QList<QByteArray> supportedFormats = reader.supportedImageFormats();
-+ auto iterator = std::find_if(supportedFormats.begin(),
-+ supportedFormats.end(),
-+ [fileFormat](QByteArray format) { return format == fileFormat; });
-+ if (iterator != supportedFormats.end()) {
-+ return {{"isImage", true}};
-+ }
-+ return {{"isImage", false}};
- }
-
- QVariantMap
-@@ -476,8 +487,9 @@ MessagesAdapter::getMediaInfo(const QString& msg)
- "<%1 style='width:100%;height:%2;outline:none;background-color:#f1f3f4;"
- "object-fit:cover;' "
- "controls controlsList='nodownload' src='file://%3' type='%4'/></body>";
-- if (isLocalImage(msg)) {
-- return {{"isImage", true}};
-+ QVariantMap fileInfo = isLocalImage(msg);
-+ if (fileInfo["isImage"].toBool() || fileInfo["isAnimatedImage"].toBool()) {
-+ return fileInfo;
- }
- QRegularExpression vPattern("[^\\s]+(.*?)\\.(avi|mov|webm|webp|rmvb)$",
- QRegularExpression::CaseInsensitiveOption);
-diff --git a/client-qt/src/messagesadapter.h b/client-qt/src/messagesadapter.h
-index bfa4e62..1965c5e 100644
---- a/client-qt/src/messagesadapter.h
-+++ b/client-qt/src/messagesadapter.h
-@@ -101,7 +101,7 @@ protected:
- Q_INVOKABLE void deleteInteraction(const QString& interactionId);
- Q_INVOKABLE void copyToDownloads(const QString& interactionId, const QString& displayName);
- Q_INVOKABLE void userIsComposing(bool isComposing);
-- Q_INVOKABLE bool isLocalImage(const QString& msg);
-+ Q_INVOKABLE QVariantMap isLocalImage(const QString& msg);
- Q_INVOKABLE QVariantMap getMediaInfo(const QString& msg);
- Q_INVOKABLE bool isRemoteImage(const QString& msg);
- Q_INVOKABLE QString getFormattedTime(const quint64 timestamp);
---
-GitLab
-
diff --git a/gnu/packages/patches/jami-libclient-audio-managers.patch b/gnu/packages/patches/jami-libclient-audio-managers.patch
deleted file mode 100644
index 1f8a5585e6..0000000000
--- a/gnu/packages/patches/jami-libclient-audio-managers.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f5e4619d02526d961c14012a6cae1a091aa149d4 Mon Sep 17 00:00:00 2001
-From: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
-Date: Thu, 27 Jan 2022 13:48:32 -0500
-Subject: [PATCH] misc: link getSupportedAudioManagers
-q
-Change-Id: I897e49cd131d3cbffef9fb1d5c9be3c0bc9bcb3f
-GitLab: #495
----
-
-diff --git a/lrc/src/qtwrapper/configurationmanager_wrap.h b/lrc/src/qtwrapper/configurationmanager_wrap.h
-index a680138..2807f8a 100644
---- a/lrc/src/qtwrapper/configurationmanager_wrap.h
-+++ b/lrc/src/qtwrapper/configurationmanager_wrap.h
-@@ -526,8 +526,7 @@
-
- QStringList getSupportedAudioManagers()
- {
-- QStringList temp;
-- return temp;
-+ return convertStringList(DRing::getSupportedAudioManagers());
- }
-
- QStringList getSupportedTlsMethod()
diff --git a/gnu/packages/patches/jami-memory-usage.patch b/gnu/packages/patches/jami-memory-usage.patch
deleted file mode 100644
index 75fcde8d0a..0000000000
--- a/gnu/packages/patches/jami-memory-usage.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From e796b3325d95b5ddd6162b5513c8325210f41fc5 Mon Sep 17 00:00:00 2001
-From: Sébastien Blin <sebastien.blin@savoirfairelinux.com>
-Date: Wed, 26 Jan 2022 11:37:07 -0500
-Subject: [PATCH] datatransferimage: improve memory usage
-
-+ Reduce listview caching' size by 50%
-+ use sourceSize to compress images and speedup loading
-+ use autoTransform: true to rotate images when needed
-
-Change-Id: Idf1babdc73f43aa6a79b89428c25c5d06856c0ef
-GitLab: #649
----
-
-diff --git a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml
-index d017c03..ca5913e 100644
---- a/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml
-+++ b/client-qt/src/commoncomponents/DataTransferMessageDelegate.qml
-@@ -255,9 +255,13 @@
- asynchronous: true
- width: sourceComponent.width
- height: sourceComponent.height
-- sourceComponent: mediaInfo.isImage !== undefined ?
-- imageComp : mediaInfo.isAnimatedImage !== undefined ? animatedImageComp :
-- avComp
-+ sourceComponent: {
-+ if (mediaInfo.isImage)
-+ return imageComp
-+ if (mediaInfo.isAnimatedImage)
-+ return animatedImageComp
-+ return avComp
-+ }
- Component {
- id: avComp
-
This message was truncated. Download the full message here.
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 25/33] gnu: qtnetworkauth: Rename to qtnetworkauth-5.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-25-maxim.cournoyer@gmail.com
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(-)

Toggle diff (54 lines)
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm
index 9de2c54ad3..35d41887c2 100644
--- a/gnu/packages/kde-internet.scm
+++ b/gnu/packages/kde-internet.scm
@@ -88,7 +88,7 @@ (define-public choqok
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 faf5e702f3..f5b0c008ce 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -725,7 +725,7 @@ (define-public kdepim-runtime
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 933bfcd04b..aa742df80f 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -288,7 +288,7 @@ (define-public kdenlive
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 96576c6f59..9bd276ac33 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1957,7 +1957,7 @@ (define-public qtdatavis3d
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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:08
[PATCH 33/33] gnu: jami: Update to 20220725.1128.fd5e6c6.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-33-maxim.cournoyer@gmail.com
* gnu/packages/jami.scm (jami): Update to 20220725.1128.fd5e6c6.
[configure-flags]: New argument.
[phases]{fix-version-string}: Adjust file name.
{use-desktop-opengl}: Delete obsolete phase.
{patch-source}: New phase.
[native-inputs]: Add googletest and vulkan-headers. Replace qttools-5 with
qttools.
[inputs]: Add libxkbcommon, qt5compat, qtnetworkauth, qtpositioning and
vulkan-loader. Remove qtwebengine-5, qtwebchannel-5, qtgraphicaleffects,
qtquickcontrols-5 and qtquickcontrols2-5. Update qtsvg-5, qtmultimedia-5 and
qtdeclarative-5 to their Qt 6 equivalent.
---
gnu/packages/jami.scm | 91 +++++++++++++++++++++++++++----------------
1 file changed, 58 insertions(+), 33 deletions(-)

Toggle diff (108 lines)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 71d5313181..b3539e7d5c 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -482,43 +482,68 @@ (define-public jami
(build-system qt-build-system)
(outputs '("out" "debug"))
(arguments
- `(#:tests? #f ;no test suite
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'change-directory/maybe
- (lambda _
- ;; Allow building from the tarball or a git checkout.
- (false-if-exception (chdir "client-qt"))))
- (add-after 'change-directory/maybe 'fix-version-string
- (lambda _
- (substitute* "src/version.h"
- (("VERSION_STRING")
- "BUILD_DATE") ;to avoid a redefinition error
- (("// clang-format on.*" anchor)
- (string-append "const char VERSION_STRING[] = \""
- ,version "\";\n"
- anchor)))))
- (add-after 'change-directory/maybe 'use-desktop-opengl
- ;; TODO: Remove after next release; this is no longer specified in
- ;; the source following the update to Qt 6.
- (lambda _
- (substitute* "src/main.cpp"
- (("Qt::AA_UseOpenGLES")
- "Qt::AA_UseDesktopOpenGL")))))))
+ (list
+ #:qtbase qtbase
+ #:tests? #f ;see comment below
+ #:configure-flags
+ ;; The test suite fails to build with:
+ ;; "../../../client-qt/src/app/utils.h:29:10: fatal error: QLabel: No
+ ;; such file or directory".
+ #~(list "-DENABLE_TESTS=OFF"
+ "-DWITH_WEBENGINE=OFF" ;reduce transitive closure size by 450 MiB
+ ;; Use libwrap to link directly to libjami instead of
+ ;; communicating via D-Bus to jamid, the Jami daemon.
+ "-DENABLE_LIBWRAP=ON"
+ (string-append "-DLIBJAMI_XML_INTERFACES_DIR="
+ #$(this-package-input "libjami")
+ "/share/dbus-1/interfaces")
+ (string-append "-DLIBJAMI_INCLUDE_DIR="
+ #$(this-package-input "libjami") "/include/jami"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'change-directory/maybe
+ (lambda _
+ ;; Allow building from the tarball or a git checkout.
+ (false-if-exception (chdir "client-qt"))))
+ (add-after 'change-directory/maybe 'fix-version-string
+ (lambda _
+ (substitute* "src/app/version.h"
+ (("VERSION_STRING")
+ "BUILD_DATE") ;to avoid a redefinition error
+ (("// clang-format on.*" anchor)
+ (string-append "const char VERSION_STRING[] = \""
+ #$version "\";\n"
+ anchor)))))
+ (add-after 'change-directory/maybe 'patch-source
+ (lambda _
+ (substitute* "src/libclient/CMakeLists.txt"
+ ;; Fix submitted upstream (see:
+ ;; https://review.jami.net/c/jami-client-qt/+/21830).
+ (("target_link_libraries\\(\\$\\{LIBCLIENT_NAME} qtwrapper.*" all)
+ (string-append
+ all " target_link_libraries(${LIBCLIENT_NAME} avutil)\n"))))))))
(native-inputs
- (list pkg-config python qttools-5 doxygen graphviz))
+ (list googletest
+ pkg-config
+ python
+ qttools
+ doxygen
+ graphviz
+ vulkan-headers))
(inputs
- (list libnotify
+ (list ffmpeg-jami
+ libjami
+ libnotify
+ libxkbcommon
network-manager
qrencode
- qtsvg-5
- qtwebengine-5
- qtwebchannel-5
- qtmultimedia-5
- qtdeclarative-5
- qtgraphicaleffects
- qtquickcontrols-5
- qtquickcontrols2-5))
+ qt5compat
+ qtdeclarative
+ qtmultimedia
+ qtnetworkauth
+ qtpositioning
+ qtsvg
+ vulkan-loader))
(home-page "https://jami.net")
(synopsis "Qt Jami client")
(description "This package provides the Jami Qt client. Jami is a secure
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 27/33] gnu: Add qtpositioning.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-27-maxim.cournoyer@gmail.com
* gnu/packages/qt.scm (qtpositioning): New variable.
---
gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)

Toggle diff (43 lines)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 121ff8b4fe..a2d65a7834 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1895,6 +1895,36 @@ (define-public qtscxml
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")
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:07
[PATCH 28/33] build: qt: Add qtbase argument and wrap Qt environment variables exactly.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-28-maxim.cournoyer@gmail.com
* guix/build-system/qt.scm (default-qtbase): New variable.
(lower) <#:qtbase>: Add argument...
[build-inputs]: ... and propagate it here.
(qt-build): Add qtbase argument.
(qt-cross-build): Likewise.
* guix/build/qt-utils.scm (%default-qt-major-version): New variable.
(variables-for-wrapping): Add qt-major-version argument, and use it to format
the various path prefixes. Wrap QT environment variables exactly.
(wrap-qt-program*): Add qt-major-version argument, and pass it to
variables-for-wrapping.
(wrap-qt-program): Add qt-major-version argument, and pass it to
wrap-qt-program*.
(wrap-all-qt-programs): Add qtbase argument, and extract the major version
from it, passing it to wrap-qt-program*.
---
guix/build-system/qt.scm | 14 +++++++++++++
guix/build/qt-utils.scm | 44 ++++++++++++++++++++++++++++------------
2 files changed, 45 insertions(+), 13 deletions(-)

Toggle diff (192 lines)
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index a0b968cef3..bd47ade3fc 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -4,6 +4,7 @@
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
+;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -67,11 +68,19 @@ (define (default-cmake)
(let ((module (resolve-interface '(gnu packages cmake))))
(module-ref module 'cmake-minimal)))
+(define (default-qtbase)
+ "Return the default qtbase package."
+
+ ;; Do not use `@' to avoid introducing circular dependencies.
+ (let ((module (resolve-interface '(gnu packages qt))))
+ (module-ref module 'qtbase-5)))
+
;; This barely is a copy from (guix build-system cmake), only adjusted to use
;; the variables defined here.
(define* (lower name
#:key source inputs native-inputs outputs system target
(cmake (default-cmake))
+ (qtbase (default-qtbase))
#:allow-other-keys
#:rest arguments)
"Return a bag for NAME."
@@ -87,6 +96,7 @@ (define private-keywords
`(("source" ,source))
'())
,@`(("cmake" ,cmake))
+ ,@`(("qtbase" ,qtbase))
,@native-inputs
,@(if target
;; Use the standard cross inputs of
@@ -112,6 +122,7 @@ (define private-keywords
(define* (qt-build name inputs
#:key
+ qtbase
source (guile #f)
(outputs '("out")) (configure-flags ''())
(search-paths '())
@@ -150,6 +161,7 @@ (define builder
#:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
+ #:qtbase #$qtbase
#:qt-wrap-excluded-outputs #$qt-wrap-excluded-outputs
#:qt-wrap-excluded-inputs #$qt-wrap-excluded-inputs
#:configure-flags #$configure-flags
@@ -181,6 +193,7 @@ (define* (qt-cross-build name
#:key
source target
build-inputs target-inputs host-inputs
+ qtbase
(guile #f)
(outputs '("out"))
(configure-flags ''())
@@ -237,6 +250,7 @@ (define %outputs
search-path-specification->sexp
native-search-paths)
#:phases #$phases
+ #:qtbase #$qtbase
#:configure-flags #$configure-flags
#:make-flags #$make-flags
#:out-of-source? #$out-of-source?
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index fa018a93ac..180b3aad77 100644
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2019, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Jakub K?dzio?ka <kuba@kadziolka.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; This file is part of GNU Guix.
@@ -26,10 +26,13 @@ (define-module (guix build qt-utils)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
+ #:use-module (srfi srfi-71)
#:export (wrap-qt-program
wrap-all-qt-programs
%qt-wrap-excluded-inputs))
+(define %default-qt-major-version "5")
+
(define %qt-wrap-excluded-inputs
'(list "cmake" "extra-cmake-modules" "qttools"))
@@ -37,7 +40,9 @@ (define %qt-wrap-excluded-inputs
;; facilities for per-application data directories, such as
;; /share/quassel. Thus, we include the output directory even if it doesn't
;; contain any of the standard subdirectories.
-(define (variables-for-wrapping base-directories output-directory)
+(define* (variables-for-wrapping base-directories output-directory
+ #:key
+ (qt-major-version %default-qt-major-version))
(define (collect-sub-dirs base-directories file-type subdirectory selectors)
;; Append SUBDIRECTORY and each of BASE-DIRECTORIES, and return the subset
@@ -82,17 +87,20 @@ (define exists? (match file-type
"/applications" "/cursors" "/fonts" "/icons" "/glib-2.0/schemas"
"/mime" "/sounds" "/themes" "/wallpapers")
'("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
- ;; The following variables can be extended by the user, but not
- ;; overridden, to ensure proper operation.
- '("QT_PLUGIN_PATH" prefix directory "/lib/qt5/plugins")
- '("QML2_IMPORT_PATH" prefix directory "/lib/qt5/qml")
+ ;; We wrap exactly to avoid potentially mixing Qt5/Qt6 components, which
+ ;; would cause warnings, perhaps problems.
+ `("QT_PLUGIN_PATH" = directory
+ ,(format #f "/lib/qt~a/plugins" qt-major-version))
+ `("QML2_IMPORT_PATH" = directory
+ ,(format #f "/lib/qt~a/qml" qt-major-version))
;; QTWEBENGINEPROCESS_PATH accepts a single value, which makes 'exact the
;; most suitable environment variable type for it.
- '("QTWEBENGINEPROCESS_PATH" = regular
- "/lib/qt5/libexec/QtWebEngineProcess"))))
+ `("QTWEBENGINEPROCESS_PATH" = regular
+ ,(format #f "/lib/qt~a/libexec/QtWebEngineProcess" qt-major-version)))))
(define* (wrap-qt-program* program #:key inputs output-dir
- qt-wrap-excluded-inputs)
+ qt-wrap-excluded-inputs
+ (qt-major-version %default-qt-major-version))
(define input-directories
(filter-map
@@ -104,12 +112,14 @@ (define input-directories
(let ((vars-to-wrap (variables-for-wrapping
(cons output-dir input-directories)
- output-dir)))
+ output-dir
+ #:qt-major-version qt-major-version)))
(when (not (null? vars-to-wrap))
(apply wrap-program program vars-to-wrap))))
(define* (wrap-qt-program program-name #:key inputs output
- (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs))
+ (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)
+ (qt-major-version %default-qt-major-version))
"Wrap the specified program (which must reside in the OUTPUT's \"/bin\"
directory) with suitably set environment variables.
@@ -117,9 +127,11 @@ (define* (wrap-qt-program program-name #:key inputs output
is wrapped."
(wrap-qt-program* (string-append output "/bin/" program-name)
#:output-dir output #:inputs inputs
- #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs))
+ #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs
+ #:qt-major-version qt-major-version))
(define* (wrap-all-qt-programs #:key inputs outputs
+ qtbase
(qt-wrap-excluded-outputs '())
(qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)
#:allow-other-keys)
@@ -131,6 +143,11 @@ (define* (wrap-all-qt-programs #:key inputs outputs
QT-WRAP-EXCLUDED-OUTPUTS. This is useful when an output is known not
to contain any Qt binaries, and where wrapping would gratuitously
add a dependency of that output on Qt."
+ (define qt-major-version
+ (let ((_ version (package-name->name+version
+ (strip-store-file-name qtbase))))
+ (first (string-split version #\.))))
+
(define (find-files-to-wrap output-dir)
(append-map
(lambda (dir)
@@ -149,7 +166,8 @@ (define handle-output
(unless (member output qt-wrap-excluded-outputs)
(for-each (cut wrap-qt-program* <>
#:output-dir output-dir #:inputs inputs
- #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)
+ #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs
+ #:qt-major-version qt-major-version)
(find-files-to-wrap output-dir))))))
(for-each handle-output outputs))
--
2.36.1
M
M
Maxim Cournoyer wrote on 26 Jul 2022 01:08
[PATCH 32/33] gnu: Deprecate jami-gnome for jami.
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
20220725230803.10002-32-maxim.cournoyer@gmail.com
* gnu/packages/jami.scm (jami-gnome): Delete package, deprecating it for jami.
---
gnu/packages/jami.scm | 63 +++----------------------------------------
1 file changed, 4 insertions(+), 59 deletions(-)

Toggle diff (83 lines)
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 3a7e29ee8b..71d5313181 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -474,65 +474,6 @@ (define-public libjami
(define-public libring
(deprecated-package "libring" libjami))
-(define-public jami-gnome
- (package
- (name "jami-gnome")
- (version %jami-version)
- (source %jami-sources)
- (outputs '("out" "debug"))
- (build-system cmake-build-system)
- (arguments
- `(#:tests? #f ;no test suite
- #:imported-modules (,@%cmake-build-system-modules
- (guix build glib-or-gtk-build-system))
- #:modules ((guix build cmake-build-system)
- ((guix build glib-or-gtk-build-system) #:prefix gtk:)
- (guix build utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'change-directory/maybe
- (lambda _
- ;; Allow building from the tarball or a git checkout.
- (false-if-exception (chdir "client-gnome"))))
- (add-after 'change-directory/maybe 'fix-webkit-detection
- (lambda _
- (substitute* "CMakeLists.txt"
- (("WEBKIT webkit2gtk-4.0")
- "WEBKIT webkit2gtk-4.1"))))
- (add-after 'change-directory/maybe 'fix-version-string
- (lambda _
- (substitute* "CMakeLists.txt"
- (("^# Set VERSION.*" anchor)
- (string-append anchor
- "set(PROJECT_VERSION \"" ,version "\")\n")))))
- (add-after 'install 'glib-or-gtk-compile-schemas
- (assoc-ref gtk:%standard-phases 'glib-or-gtk-compile-schemas))
- (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
- (assoc-ref gtk:%standard-phases 'glib-or-gtk-wrap)))))
- (inputs
- (list clutter
- clutter-gtk
- gtk+
- libcanberra
- libappindicator
- libnotify
- network-manager
- qrencode
- sqlite
- webkitgtk))
- (native-inputs
- (list pkg-config
- gettext-minimal
- `(,glib "bin"))) ;for glib-compile-resources
- (synopsis "Jami client for GNOME")
- (description "This package provides a Jami client for the GNOME desktop.
-Jami is a secure and distributed voice, video and chat communication platform
-that requires no centralized server and leaves the power of privacy in the
-hands of the user. It supports the SIP and IAX protocols, as well as
-decentralized calling using P2P-DHT.")
- (home-page "https://jami.net")
- (license license:gpl3+)))
-
(define-public jami
(package
(name "jami")
@@ -587,6 +528,10 @@ (define-public jami
P2P-DHT.")
(license license:gpl3+)))
+;;; Remove when 2023 comes.
+(define-public jami-gnome
+ (deprecated-package "jami-gnome" jami))
+
;;; Remove when 2023 comes.
(define-public jami-qt
(deprecated-package "jami-qt" jami))
--
2.36.1
J
J
Jack Hill wrote on 26 Jul 2022 18:14
Re: [bug#56771] [PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 56771@debbugs.gnu.org)
2b967958-273c-bdc4-6659-71512a5a6113@jackhill.us
On Mon, 25 Jul 2022, Maxim Cournoyer wrote:

Toggle quote (7 lines)
> Hello Guix,
>
> This series add the base Qt 6 components required by Jami and updates Jami
> itself to its latest stable release (made today!). All the Qt components
> updated have their test suite enabled except for qtwebengine, for which it was
> already disabled.

I'm having trouble applying these patches on top of commit
dbcd7876566840f31b763e28bb74394f0914b397

I've tried both with emacs-debbugs and by downloading the mbox manually
from the debbugs web interface. With the mbox, I get:

$ git am ~/Downloads/bug_56771.mbox
Applying: gnu: qtbase: Patch /bin/pwd in executable scripts.
error: patch failed: gnu/packages/qt.scm:832
error: gnu/packages/qt.scm: patch does not apply
error: patch failed: gnu/packages/audio.scm:5848
error: gnu/packages/audio.scm: patch does not apply
error: patch failed: gnu/packages/qt.scm:902

Toggle quote (3 lines)
> Note that Jami no longer requires qtwebengine, which brings its closure size
> down quite a bit!

Yay, awesome!

Thanks for preparing these,
Jack
J
J
Jack Hill wrote on 27 Jul 2022 07:28
(address . 56771@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
a10f0924-5a24-0961-acb1-cf5c0852b50c@jackhill.us
On Tue, 26 Jul 2022, Jack Hill wrote:

Toggle quote (16 lines)
> On Mon, 25 Jul 2022, Maxim Cournoyer wrote:
>
>> Hello Guix,
>>
>> This series add the base Qt 6 components required by Jami and updates Jami
>> itself to its latest stable release (made today!). All the Qt components
>> updated have their test suite enabled except for qtwebengine, for which it
>> was
>> already disabled.
>
> I'm having trouble applying these patches on top of commit
> dbcd7876566840f31b763e28bb74394f0914b397
>
> I've tried both with emacs-debbugs and by downloading the mbox manually from
> the debbugs web interface. With the mbox, I get:

I ended up getting the patches via `git pull` from Maxim's repository.
Once doing so, I was able to build and run Jami. I was able to make a SIP
call and a Jami call and chat (the Jami call and chat was on the local
network). This was all on x86-64.

I didn't verify any hashes, have an in-depth look at the patches, or try
any of the other Qt applications that were adjusted.

Best,
Jack
M
M
Maxim Cournoyer wrote on 1 Aug 2022 06:22
Re: bug#56771: [PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way
(name . Jack Hill)(address . jackhill@jackhill.us)(address . 56771-done@debbugs.gnu.org)
87tu6w4mq7.fsf_-_@gmail.com
Hi Jack,

Jack Hill <jackhill@jackhill.us> writes:

Toggle quote (23 lines)
> On Tue, 26 Jul 2022, Jack Hill wrote:
>
>> On Mon, 25 Jul 2022, Maxim Cournoyer wrote:
>>
>>> Hello Guix,
>>> This series add the base Qt 6 components required by Jami and
>>> updates Jami
>>> itself to its latest stable release (made today!). All the Qt components
>>> updated have their test suite enabled except for qtwebengine, for
>>> which it was
>>> already disabled.
>>
>> I'm having trouble applying these patches on top of commit
>> dbcd7876566840f31b763e28bb74394f0914b397
>>
>> I've tried both with emacs-debbugs and by downloading the mbox
>> manually from the debbugs web interface. With the mbox, I get:
>
> I ended up getting the patches via `git pull` from Maxim's
> repository. Once doing so, I was able to build and run Jami. I was
> able to make a SIP call and a Jami call and chat (the Jami call and
> chat was on the local network). This was all on x86-64.

OK, thanks for testing. I've actually found a bug about the UI becoming
hidden on my ratpoison WM and it got fixed upstream quick so I've added
a small patch for it.

Toggle quote (3 lines)
> I didn't verify any hashes, have an in-depth look at the patches, or
> try any of the other Qt applications that were adjusted.

OK. Since I'm confident about the Qt upgrades (I went to great length
getting the test suites to run for example), I've now pushed that series
as 3a656ea836f87f30f1b34852cb4efc911363d2b4. Thanks for your testing!

Closing.

Maxim
Closed
J
J
Jack Hill wrote on 1 Aug 2022 06:39
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 56771@debbugs.gnu.org)
d91e7fa1-b365-6fbb-f6ec-e349d003eeb9@jackhill.us
On Mon, 1 Aug 2022, Maxim Cournoyer wrote:

Toggle quote (4 lines)
> OK. Since I'm confident about the Qt upgrades (I went to great length
> getting the test suites to run for example), I've now pushed that series
> as 3a656ea836f87f30f1b34852cb4efc911363d2b4. Thanks for your testing!

Awesome! Congratulations and thanks for finishing this chunk of work.

Best,
Jack
M
M
Maxime Devos wrote on 1 Aug 2022 12:54
Re: [bug#56771] [PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way
a2870d30-4a67-2abc-9feb-967680e2001a@telenet.be
On 25-07-2022 23:17, Maxim Cournoyer wrote:
Toggle quote (6 lines)
> Hello Guix,
>
> This series add the base Qt 6 components required by Jami and updates Jami
> itself to its latest stable release (made today!). All the Qt components
> updated have their test suite enabled except for qtwebengine, for which it was
> already disabled. [...]
This patch series appears to have caused some failures in other
packages:
could they be fixed?
Greetings,
Maxime.
Attachment: OpenPGP_signature
M
M
Maxim Cournoyer wrote on 1 Aug 2022 17:39
(name . Maxime Devos)(address . maximedevos@telenet.be)
87y1w82ct7.fsf@gmail.com
Hi Maxime,

Maxime Devos <maximedevos@telenet.be> writes:

Toggle quote (13 lines)
> On 25-07-2022 23:17, Maxim Cournoyer wrote:
>> Hello Guix,
>>
>> This series add the base Qt 6 components required by Jami and updates Jami
>> itself to its latest stable release (made today!). All the Qt components
>> updated have their test suite enabled except for qtwebengine, for which it was
>> already disabled. [...]
>
> This patch series appears to have caused some failures in other
> packages:
> <https://ci.guix.gnu.org/eval/504295?border-high-time=1659350617&border-high-id=1141372&status=failed>,
> could they be fixed?

Thanks for the heads-up. It appears the qt-build-system change
(introducing #:qtbase) broke all packages explicitly defining the build
arguments, in which case #:qtbase is #f.

The following change fixes it:

Toggle snippet (38 lines)
modified guix/build-system/qt.scm
@@ -122,7 +122,7 @@ (define private-keywords
(define* (qt-build name inputs
#:key
- qtbase
+ (qtbase (default-qtbase))
source (guile #f)
(outputs '("out")) (configure-flags ''())
(search-paths '())
@@ -161,7 +161,7 @@ (define builder
#:phases #$(if (pair? phases)
(sexp->gexp phases)
phases)
- #:qtbase #$qtbase
+ #:qtbase #+qtbase
#:qt-wrap-excluded-outputs #$qt-wrap-excluded-outputs
#:qt-wrap-excluded-inputs #$qt-wrap-excluded-inputs
#:configure-flags #$configure-flags
@@ -193,7 +193,7 @@ (define* (qt-cross-build name
#:key
source target
build-inputs target-inputs host-inputs
- qtbase
+ (qtbase (default-qtbase))
(guile #f)
(outputs '("out"))
(configure-flags ''())
@@ -250,7 +250,7 @@ (define %outputs
search-path-specification->sexp
native-search-paths)
#:phases #$phases
- #:qtbase #$qtbase
+ #:qtbase #+qtbase
#:configure-flags #$configure-flags
#:make-flags #$make-flags
#:out-of-source? #$out-of-source?
We could also refrain from introducing this argument, instead finding
the qtbase in use via search-input-file at the place where we need to
know its store output to figure out the version used; that'd be simpler,
but would remove the mechanism here that allows a user potentially
mixing qt5 and qt6 (probably not a very useful use case) and being able
to explicitly set the qtbase used for wrapping/building.

What do you think?

Thanks,

Maxim
M
M
Maxime Devos wrote on 2 Aug 2022 00:00
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
caffeb9c-466e-6fbb-c21b-883ca1340da9@telenet.be
On 01-08-2022 17:39, Maxim Cournoyer wrote:
Toggle quote (56 lines)
> Hi Maxime,
>
> Maxime Devos <maximedevos@telenet.be> writes:
>
>> On 25-07-2022 23:17, Maxim Cournoyer wrote:
>>> Hello Guix,
>>>
>>> This series add the base Qt 6 components required by Jami and updates Jami
>>> itself to its latest stable release (made today!). All the Qt components
>>> updated have their test suite enabled except for qtwebengine, for which it was
>>> already disabled. [...]
>> This patch series appears to have caused some failures in other
>> packages:
>> <https://ci.guix.gnu.org/eval/504295?border-high-time=1659350617&border-high-id=1141372&status=failed>,
>> could they be fixed?
> Thanks for the heads-up. It appears the qt-build-system change
> (introducing #:qtbase) broke all packages explicitly defining the build
> arguments, in which case #:qtbase is #f.
>
> The following change fixes it:
>
> --8<---------------cut here---------------start------------->8---
> modified guix/build-system/qt.scm
> @@ -122,7 +122,7 @@ (define private-keywords
>
> (define* (qt-build name inputs
> #:key
> - qtbase
> + (qtbase (default-qtbase))
> source (guile #f)
> (outputs '("out")) (configure-flags ''())
> (search-paths '())
> @@ -161,7 +161,7 @@ (define builder
> #:phases #$(if (pair? phases)
> (sexp->gexp phases)
> phases)
> - #:qtbase #$qtbase
> + #:qtbase #+qtbase
> #:qt-wrap-excluded-outputs #$qt-wrap-excluded-outputs
> #:qt-wrap-excluded-inputs #$qt-wrap-excluded-inputs
> #:configure-flags #$configure-flags
> @@ -193,7 +193,7 @@ (define* (qt-cross-build name
> #:key
> source target
> build-inputs target-inputs host-inputs
> - qtbase
> + (qtbase (default-qtbase))
> (guile #f)
> (outputs '("out"))
> (configure-flags ''())
> @@ -250,7 +250,7 @@ (define %outputs
> search-path-specification->sexp
> native-search-paths)
> #:phases #$phases
> - #:qtbase #$qtbase
> + #:qtbase #+qtbase
Why the #$ -> #+ change? qtbase looks like some library used by the Qt
program, so seems like a non-native input to me (and maybe it needs to
be moved from 'biild-inputs' to 'host-inputs').
Unfortunately some of the dependencies don't support cross-compilation
yet so it cannot yet be tested ...
$ LANG=en_US.UTF-8 guix build qtbase@5 --target=aarch64-linux-gnu
> guix build: error: gnu/packages/freedesktop.scm:1923:2:
perl-file-mimeinfo@0.29: build system `perl' does not support cross builds
Greetings,
Maxime
Attachment: OpenPGP_signature
M
M
Maxime Devos wrote on 5 Aug 2022 14:51
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
66a14530-2dbc-c700-4403-8fe86d77756f@telenet.be
On 01-08-2022 17:39, Maxim Cournoyer wrote:
Toggle quote (8 lines)
> We could also refrain from introducing this argument, instead finding
> the qtbase in use via search-input-file at the place where we need to
> know its store output to figure out the version used; that'd be simpler,
> but would remove the mechanism here that allows a user potentially
> mixing qt5 and qt6 (probably not a very useful use case) and being able
> to explicitly set the qtbase used for wrapping/building.
>
> What do you think?
Aside from the #$ / #+ the fix looks good to me, but I don't know about
arguments like #:qtbase, it's not something I've experimented with myself.
Greetings,
Maxime
Attachment: OpenPGP_signature
M
M
Maxim Cournoyer wrote on 6 Aug 2022 06:56
(name . Maxime Devos)(address . maximedevos@telenet.be)
87czdeotqk.fsf@gmail.com
Hi Maxime,

Maxime Devos <maximedevos@telenet.be> writes:

Toggle quote (15 lines)
> On 01-08-2022 17:39, Maxim Cournoyer wrote:
>
>> We could also refrain from introducing this argument, instead finding
>> the qtbase in use via search-input-file at the place where we need to
>> know its store output to figure out the version used; that'd be simpler,
>> but would remove the mechanism here that allows a user potentially
>> mixing qt5 and qt6 (probably not a very useful use case) and being able
>> to explicitly set the qtbase used for wrapping/building.
>>
>> What do you think?
>
> Aside from the #$ / #+ the fix looks good to me, but I don't know
> about arguments like #:qtbase, it's not something I've experimented
> with myself.

Apologies, I think your comment about me changing #$ to #+ fell into the
cracks. I made that change because qtbase was added as a build-inputs
(meaning, native input), as it provides tools that need to run on the
host, such as qmake. But you are right that Qt programs link to its
libraries, and thus a second qtbase would need to be added to host
inputs for cross-compilation. We should add qtbase there too, but it'd
be nice to confirm cross-compilation can work.

Thanks,

Maxim
M
M
Maxime Devos wrote on 6 Aug 2022 21:15
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
d202cd75-165f-58a8-7e6b-2f7a6bf11795@telenet.be
On 06-08-2022 06:56, Maxim Cournoyer wrote:
Toggle quote (7 lines)
> Apologies, I think your comment about me changing #$ to #+ fell into the
> cracks. I made that change because qtbase was added as a build-inputs
> (meaning, native input), as it provides tools that need to run on the
> host, such as qmake. But you are right that Qt programs link to its
> libraries, and thus a second qtbase would need to be added to host
> inputs for cross-compilation. We should add qtbase there too, but it'd
> be nice to confirm cross-compilation can work.
I think it can wait until Qt things are actually cross-compilable.
For the interested, the (merged!) 56882 makes one of the dependencies
cross-compilable, but some dependencies of GTK (which itself apparently
a dependency of Qt?) are failing to cross-compile.
Greetings,
Maxime.
Attachment: OpenPGP_signature
?
Your comment

This issue is archived.

To comment on this conversation send an email to 56771@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 56771
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch