[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
24/35: gnu: qttools: Rename to qttools-5.
|
From: |
guix-commits |
|
Subject: |
24/35: gnu: qttools: Rename to qttools-5. |
|
Date: |
Mon, 1 Aug 2022 00:12:16 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit eef8e2ec46c4155980815e00a394428c0c3de075
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Jul 19 16:52:05 2022 -0400
gnu: qttools: Rename to qttools-5.
Automated with:
git grep -l qttools | xargs sed 's/\bqttools\b/\0-5/g' -i
git checkout NEWS
---
gnu/packages/animation.scm | 2 +-
gnu/packages/astronomy.scm | 2 +-
gnu/packages/audio.scm | 10 ++--
gnu/packages/benchmark.scm | 2 +-
gnu/packages/bittorrent.scm | 2 +-
gnu/packages/connman.scm | 2 +-
gnu/packages/databases.scm | 2 +-
gnu/packages/display-managers.scm | 2 +-
gnu/packages/djvu.scm | 2 +-
gnu/packages/education.scm | 6 +-
gnu/packages/electronics.scm | 2 +-
gnu/packages/emulators.scm | 2 +-
gnu/packages/engineering.scm | 8 +--
gnu/packages/finance.scm | 24 ++++----
gnu/packages/game-development.scm | 4 +-
gnu/packages/games.scm | 12 ++--
gnu/packages/geo.scm | 8 +--
gnu/packages/gps.scm | 4 +-
gnu/packages/graphics.scm | 2 +-
gnu/packages/hardware.scm | 4 +-
gnu/packages/image-processing.scm | 6 +-
gnu/packages/image-viewers.scm | 6 +-
gnu/packages/image.scm | 2 +-
gnu/packages/irc.scm | 2 +-
gnu/packages/jami.scm | 2 +-
gnu/packages/kde-frameworks.scm | 66 +++++++++++-----------
gnu/packages/kde-multimedia.scm | 2 +-
gnu/packages/kde-pim.scm | 20 +++----
gnu/packages/kde-utils.scm | 2 +-
gnu/packages/kde.scm | 16 +++---
gnu/packages/lego.scm | 2 +-
gnu/packages/linphone.scm | 2 +-
gnu/packages/lxqt.scm | 52 ++++++++---------
gnu/packages/maths.scm | 8 +--
gnu/packages/messaging.scm | 6 +-
gnu/packages/music.scm | 36 ++++++------
gnu/packages/networking.scm | 2 +-
gnu/packages/password-utils.scm | 4 +-
gnu/packages/patches/xygrib-fix-finding-data.patch | 2 +-
gnu/packages/photo.scm | 2 +-
gnu/packages/python-xyz.scm | 2 +-
gnu/packages/qt.scm | 26 ++++-----
gnu/packages/radio.scm | 8 +--
gnu/packages/robotics.scm | 2 +-
gnu/packages/scribus.scm | 2 +-
gnu/packages/security-token.scm | 6 +-
gnu/packages/sync.scm | 4 +-
gnu/packages/synergy.scm | 2 +-
gnu/packages/telegram.scm | 2 +-
gnu/packages/telephony.scm | 4 +-
gnu/packages/text-editors.scm | 2 +-
gnu/packages/video.scm | 8 +--
guix/lint.scm | 4 +-
53 files changed, 207 insertions(+), 207 deletions(-)
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 @@ language.")
("qtmultimedia-5" ,qtmultimedia-5)
("libsndfile" ,libsndfile)))
(native-inputs
- (list qttools))
+ (list qttools-5))
(home-page "https://www.lostmarble.com/papagayo/";)
(synopsis "Lip-syncing for animations")
(description
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 95659104ce..acac8449ab 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -615,7 +615,7 @@ deconvolution). Such post-processing is not performed by
Stackistry.")
`(("gettext" ,gettext-minimal) ; xgettext is used at compile time
("perl" ,perl) ; for pod2man
("qtbase" ,qtbase-5) ; Qt MOC is needed at compile time
- ("qttools" ,qttools)))
+ ("qttools-5" ,qttools-5)))
(arguments
`(#:test-target "test"
#:configure-flags (list "-DENABLE_TESTING=1"
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index f0ffeed210..aad86bac06 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -587,7 +587,7 @@ implementation of Adaptive Multi Rate Narrowband and
Wideband
liblo
qtbase-5))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(home-page "http://alsamodular.sourceforge.net/";)
(synopsis "Realtime modular synthesizer and effect processor")
(description
@@ -3097,7 +3097,7 @@ different audio devices such as ALSA or PulseAudio.")
(inputs
(list jack-1 alsa-lib portaudio qtbase-5 qtx11extras))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(home-page "https://qjackctl.sourceforge.io/";)
(synopsis "Jack server control application")
(description "Control a Jack server. Allows you to plug various sources
@@ -3218,7 +3218,7 @@ link REQUIRED)"))))))
(string-append ide "/bin"))
(delete-file scide)))))))
(native-inputs
- (list ableton-link pkg-config qttools xorg-server-for-tests))
+ (list ableton-link pkg-config qttools-5 xorg-server-for-tests))
(inputs (list jack-1
libsndfile
fftw
@@ -3903,7 +3903,7 @@ interface.")
(arguments
`(#:tests? #f)) ; no "check" phase
(native-inputs
- (list qttools pkg-config))
+ (list qttools-5 pkg-config))
(inputs
(list fluidsynth qtbase-5 qtx11extras))
(home-page "https://qsynth.sourceforge.io";)
@@ -5456,7 +5456,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio
systems.")
portaudio ;for portaudio examples
qtbase-5 ;for Qt examples
qtdeclarative-5
- qttools))
+ qttools-5))
(inputs
(list jack-1 ;for JACK examples
qtquickcontrols-5)) ;for Qt examples
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 4ea12e4cf3..7be932f528 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -499,7 +499,7 @@ and options. With careful benchmarking, different hardware
can be compared.")
(substitute* "src/benchmark.cpp"
(("\"fio\"")
(format #f "~s" (search-input-file inputs "bin/fio")))))))))
- (native-inputs (list extra-cmake-modules qttools))
+ (native-inputs (list extra-cmake-modules qttools-5))
(inputs (list fio qtbase-5))
(home-page "https://github.com/JonMagon/KDiskMark";)
(synopsis "Simple disk benchmark tool")
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index fe235d4b3b..43fc287b95 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -470,7 +470,7 @@ desktops.")
(wrap-qt-program "qbittorrent" #:output out #:inputs inputs))
#t)))))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
`(("boost" ,boost)
("libtorrent-rasterbar" ,libtorrent-rasterbar)
diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm
index 71dff3588f..f4e6e43ec8 100644
--- a/gnu/packages/connman.scm
+++ b/gnu/packages/connman.scm
@@ -165,7 +165,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and
Bluetooth.")
(inputs
(list qtbase-5))
(native-inputs
- (list qttools))
+ (list qttools-5))
(build-system gnu-build-system)
(arguments
'(#:phases
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 4a28aa79cb..9535b65dbd 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -4782,7 +4782,7 @@ a Gtk.Grid Widget.")
qscintilla
qtbase-5
sqlite))
- (native-inputs (list qttools))
+ (native-inputs (list qttools-5))
(home-page "https://sqlitebrowser.org/";)
(synopsis "Database browser for SQLite")
(description "Sqlitebrowser is a high quaility, visual, open source tool to
diff --git a/gnu/packages/display-managers.scm
b/gnu/packages/display-managers.scm
index 32ec5c3141..efeea2924d 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -78,7 +78,7 @@
"0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules pkg-config qttools))
+ (list extra-cmake-modules pkg-config qttools-5))
(inputs
(list elogind
glib
diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm
index b85193ccdb..92b4b6dce7 100644
--- a/gnu/packages/djvu.scm
+++ b/gnu/packages/djvu.scm
@@ -107,7 +107,7 @@ utilities.")
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(native-inputs
- (list autoconf automake libtool pkg-config qttools))
+ (list autoconf automake libtool pkg-config qttools-5))
(inputs
(list djvulibre glib libxt libtiff qtbase-5))
(arguments
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index aabf3dfc21..c5666fb02e 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -174,7 +174,7 @@ of categories with some of the activities available in that
category.
gettext-minimal
kdoctools
perl
- qttools
+ qttools-5
xorg-server-for-tests))
(inputs
(list openssl
@@ -540,7 +540,7 @@ specialized device.")
(symlink (string-append openboard "/OpenBoard")
(string-append bin "/openboard")))))))))
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list alsa-lib
coreutils-minimal ;for patched 'env' shebang
@@ -991,7 +991,7 @@ formats.")
(arguments
'(#:tests? #f)) ; no test target
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list libeb
qtbase-5
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 342294de13..15e7318926 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -373,7 +373,7 @@ such as:
(rmdir "doc/pulseview")
(rmdir "doc"))))))))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list boost
glib
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index ba7fa1dbe2..386e127e1e 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -744,7 +744,7 @@ The following systems are supported:
(list "-DUSE_LZMA=OFF" ;do not use bundled LZMA
"-DUSE_LIBZIP=OFF"))) ;use "zlib" instead
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list ffmpeg
libedit
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 303dd0b737..57efaee50b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -762,7 +762,7 @@ ready for production.")
(substitute* "qelectrotech.pro" (("\\/usr\\/local") out))
(invoke "qmake")))))))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list kcoreaddons kwidgetsaddons qtbase-5 qtsvg-5 sqlite))
(home-page "https://qelectrotech.org/";)
@@ -2120,7 +2120,7 @@ parallel computing platforms. It also supports serial
execution.")
(inputs
(list qtbase-5 qtsvg-5 zlib))
(native-inputs
- (list qttools ; for lrelease
+ (list qttools-5 ; for lrelease
unzip))
(arguments
`(#:phases
@@ -2452,7 +2452,7 @@ comments.")))
(native-inputs
(list doxygen
graphviz
- qttools
+ qttools-5
pkg-config
python-pyside-2-tools
swig))
@@ -3715,7 +3715,7 @@ netlists from the drawn schematic, allowing the
simulation of the circuit.")
(base32
"08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783"))))
(build-system gnu-build-system)
- (native-inputs (list qttools))
+ (native-inputs (list qttools-5))
(inputs (list qtbase-5 qtserialport))
(arguments
(list #:tests? #f ; no tests.
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index b7937a310a..5ff345acc0 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -143,7 +143,7 @@
pkg-config
python ; for the tests
util-linux ; provides the hexdump command for tests
- qttools))
+ qttools-5))
(inputs
(list bdb-4.8 ; 4.8 required for compatibility
boost
@@ -159,12 +159,12 @@
(assoc-ref %build-inputs "boost"))
;; XXX: The configure script looks up Qt paths by
;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick
- ;; up executables residing in 'qttools', so we specify them here.
+ ;; up executables residing in 'qttools-5', so we specify them here.
(string-append "ac_cv_path_LRELEASE="
- (assoc-ref %build-inputs "qttools")
+ (assoc-ref %build-inputs "qttools-5")
"/bin/lrelease")
(string-append "ac_cv_path_LUPDATE="
- (assoc-ref %build-inputs "qttools")
+ (assoc-ref %build-inputs "qttools-5")
"/bin/lupdate"))
#:phases
(modify-phases %standard-phases
@@ -698,7 +698,7 @@ blockchain.")
pkg-config
protobuf
python
- qttools))
+ qttools-5))
(inputs
(list boost
cppzmq
@@ -1543,7 +1543,7 @@ Trezor wallet.")
(list pkg-config
python ; for the tests
util-linux ; provides the hexdump command for tests
- qttools))
+ qttools-5))
(inputs
(list bdb-5.3
boost
@@ -1657,7 +1657,7 @@ following three utilities are included with the library:
pkg-config
python ; for the tests
util-linux ; provides the hexdump command for tests
- qttools))
+ qttools-5))
(inputs
(list bdb-4.8
boost
@@ -1677,12 +1677,12 @@ following three utilities are included with the library:
(assoc-ref %build-inputs "boost"))
;; XXX: The configure script looks up Qt paths by
;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick
- ;; up executables residing in 'qttools', so we specify them here.
+ ;; up executables residing in 'qttools-5', so we specify them here.
(string-append "ac_cv_path_LRELEASE="
- (assoc-ref %build-inputs "qttools")
+ (assoc-ref %build-inputs "qttools-5")
"/bin/lrelease")
(string-append "ac_cv_path_LUPDATE="
- (assoc-ref %build-inputs "qttools")
+ (assoc-ref %build-inputs "qttools-5")
"/bin/lupdate")
"--disable-static")
#:phases
@@ -1731,7 +1731,7 @@ a Qt GUI.")
(string-append "PREFIX=" %output)
"features="))))))
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list python qtbase-5 rocksdb zlib))
(home-page "https://gitlab.com/FloweeTheHub/fulcrum/";)
@@ -1798,7 +1798,7 @@ like Flowee the Hub, which Fulcrum connects to over RPC.")
openssl
qtbase-5))
(native-inputs
- (list pkg-config qttools util-linux)) ; provides the hexdump
command for tests
+ (list pkg-config qttools-5 util-linux)) ; provides the hexdump
command for tests
(home-page "https://flowee.org";)
(synopsis "Flowee infrastructure tools and services")
(description
diff --git a/gnu/packages/game-development.scm
b/gnu/packages/game-development.scm
index f426532cb1..70bd4c0251 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -522,7 +522,7 @@ formats such as PNG.")
(inputs
(list qtbase-5 qtdeclarative-5 qtsvg-5 zlib))
(native-inputs
- (list qttools))
+ (list qttools-5))
(arguments
'(#:phases
(modify-phases %standard-phases
@@ -531,7 +531,7 @@ formats such as PNG.")
(substitute* "translations/translations.pro"
(("LRELEASE =.*")
(string-append "LRELEASE = "
- (assoc-ref inputs "qttools")
+ (assoc-ref inputs "qttools-5")
"/bin/lrelease\n")))
(let ((out (assoc-ref outputs "out")))
(invoke "qmake"
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index a851a6853a..8b655cc0e4 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -995,7 +995,7 @@ want what you have.")
qtbase-5
qtmultimedia-5
qtsvg-5
- qttools
+ qttools-5
qtwebsockets-5
xz
zlib))
@@ -2504,7 +2504,7 @@ and defeat them with your bubbles!")
(setenv "XDG_RUNTIME_DIR" (getcwd))
#t)))))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
`(("glm" ,glm)
("libmodplug" ,libmodplug)
@@ -7203,7 +7203,7 @@ making Yamagi Quake II one of the most solid Quake II
implementations available.
(native-inputs
`(("cmake" ,cmake-minimal)
("gettext-minimal" ,gettext-minimal)
- ("qttools" ,qttools)))
+ ("qttools-5" ,qttools-5)))
(synopsis "Realistic physics puzzle game")
(description "The Butterfly Effect (tbe) is a game that uses
realistic physics simulations to combine lots of simple mechanical
@@ -9279,7 +9279,7 @@ and also provides the base for the FlightGear Flight
Simulator.")
(native-inputs
`(("cppunit" ,cppunit)
("pkg-config" ,pkg-config)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("flightgear-data"
,(origin
(method url-fetch)
@@ -9407,7 +9407,7 @@ play with up to four players simultaneously. It has
network support.")
("sdl" ,(sdl-union
(list sdl2 sdl2-mixer sdl2-net sdl2-ttf sdl2-image)))))
(native-inputs
- (list clang-9 ghc pkg-config qttools))
+ (list clang-9 ghc pkg-config qttools-5))
(home-page "https://hedgewars.org/";)
(synopsis "Turn-based artillery game featuring fighting hedgehogs")
(description
@@ -11883,7 +11883,7 @@ and chess engines.")
(base32 "01fjchil2h6ry2ywr0dwjw2g7zd29580cr4c74d5z74h999lp6nh"))))
(build-system qt-build-system)
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list qtbase-5 qtmultimedia-5 qtspeech qtsvg-5 zlib))
(arguments
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index b8125ffe6e..fe2174b106 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1495,7 +1495,7 @@ map display. Downloads map data from a number of
websites, including
(string-append "\"" font "/share/fonts/\"")))))))
#:tests? #f)) ; no tests
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list bzip2
font-liberation
@@ -1952,7 +1952,7 @@ using the dataset of topographical information collected
by
(base32 "184fqmsfzr3b333ssizjk6gvv7mncmygq8dj5r7rsvs5md26z2ys"))))
(build-system qt-build-system)
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list gdal
libjpeg-turbo
@@ -2199,7 +2199,7 @@ track your position right from your laptop.")
("zlib" ,zlib)))
(native-inputs
`(("doxygen" ,doxygen)
- ("qttools" ,qttools)))
+ ("qttools-5" ,qttools-5)))
(home-page "https://www.openorienteering.org/apps/mapper/";)
(synopsis "OpenOrienteering Mapper (OOM)")
(description
@@ -2634,7 +2634,7 @@ growing set of geoscientific methods.")
pkg-config
python-mock
python-nose2
- qttools
+ qttools-5
shellcheck
xorg-server-for-tests))
(home-page "https://qgis.org";)
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index b117ff4222..e528807de7 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -84,7 +84,7 @@
(inputs
(list expat libusb qtbase-5 zlib))
(native-inputs
- (list which qttools libxml2)) ;'xmllint' needed for the KML
tests
+ (list which qttools-5 libxml2)) ;'xmllint' needed for the
KML tests
(home-page "https://www.gpsbabel.org/";)
(synopsis "Convert and exchange data with GPS and map programs")
(description
@@ -196,7 +196,7 @@ coordinates as well as partial support for adjustments in
global coordinate syst
(inputs
(list qtbase-5 qtlocation qtsvg-5))
(native-inputs
- (list qttools))
+ (list qttools-5))
(home-page "https://www.gpxsee.org";)
(synopsis "GPS log file viewer and analyzer")
(description
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index f7307e8f61..38e6533a43 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1438,7 +1438,7 @@ exec -a \"$0\" ~a/.brdf-real~%"
(chmod "brdf" #o555)))
#t)))))
(native-inputs
- (list qttools)) ;for 'qmake'
+ (list qttools-5)) ;for 'qmake'
(inputs
(list qtbase-5 mesa glew freeglut zlib))
(home-page "https://www.disneyanimation.com/technology/brdf.html";)
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index 27567bb38e..68c4667662 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -453,7 +453,7 @@ support.")
(wrap-qt-program "ckb-next"
#:output out
#:inputs inputs)))))))
- (native-inputs (list qttools pkg-config))
+ (native-inputs (list qttools-5 pkg-config))
(inputs (list qtbase-5
zlib
libdbusmenu-qt
@@ -534,7 +534,7 @@ calibrated, and restored when the calibration is applied.")
(arguments
'(#:tests? #f)) ; No test suite
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list ddcutil glib qtbase-5))
(home-page "https://www.ddcutil.com/";)
diff --git a/gnu/packages/image-processing.scm
b/gnu/packages/image-processing.scm
index d4b13cc90e..158d470828 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -770,7 +770,7 @@ including 2D color images.")
(add-after 'unpack 'qt-chdir
(lambda _ (chdir "gmic-qt") #t))))))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(modify-inputs (package-inputs gmic)
(prepend gmic qtbase-5)))
@@ -1109,7 +1109,7 @@ combine the information contained in both.")
zlib))
(native-inputs
`(("googletest" ,googletest)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("pkg-config" ,pkg-config)
("c3d-src"
,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3")
@@ -1224,7 +1224,7 @@ substituted by matching images.")
"0kixwjb2x457dq7927hkh34c803p7yh1pmn6n61rk9shqrcg492h"))))
(build-system qt-build-system)
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
`(("boost" ,boost)
("libjpeg" ,libjpeg-turbo)
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 045fdae882..88dbba866b 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -516,7 +516,7 @@ It supports JPEG, PNG and GIF formats.")
"188q0l63nfasqfvwbq4mwx2vh7wsfi2bq9n5nksddspl1qz01lnp"))))
(build-system cmake-build-system)
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list qtbase-5
qtdeclarative-5
@@ -671,7 +671,7 @@ For PDF support, install the @emph{mupdf} package.")
(invoke "qmake" "tests.pro")
(invoke "make" "tests"))))))))
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list qtbase-5 qtimageformats qtsvg-5))
(home-page "https://interversehq.com/qview/";)
@@ -924,7 +924,7 @@ archives.")
("qtsvg-5" ,qtsvg-5)))
(native-inputs
`(("pkg-config" ,pkg-config)
- ("qtlinguist" ,qttools)))
+ ("qtlinguist" ,qttools-5)))
(synopsis "Image viewer supporting all common formats")
(description "Nomacs is a simple to use image lounge featuring
semi-transparent widgets that display additional information such as metadata,
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 90554143d0..4b31ba41a0 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1828,7 +1828,7 @@ parsing, viewing, modifying, and saving this metadata.")
"1p7gqs5vqzbddlgl38lbanchwb14m6lx8f2cn2c5p0vyqwvqqv52"))))
(build-system qt-build-system)
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list qtbase-5 qtsvg-5))
(arguments
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 67a86cbfc1..efb32a39e0 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -126,7 +126,7 @@
(let ((inxi (search-input-file inputs "/bin/inxi")))
(symlink inxi "data/scripts/inxi")))))))
(native-inputs
- (list extra-cmake-modules pkg-config qttools))
+ (list extra-cmake-modules pkg-config qttools-5))
(inputs
(list boost
inxi-minimal
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 22d2f0c5ce..e5c29981d3 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -598,7 +598,7 @@ decentralized calling using P2P-DHT.")
(("Qt::AA_UseOpenGLES")
"Qt::AA_UseDesktopOpenGL")))))))
(native-inputs
- (list pkg-config python qttools doxygen graphviz))
+ (list pkg-config python qttools-5 doxygen graphviz))
(inputs
(list jami-libclient
libnotify
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 6fc0b5f10c..391db94f3a 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -185,7 +185,7 @@ common build settings used in software produced by the KDE
community.")
(native-inputs
;; TODO: Think about adding pulseaudio. Is it required for sound?
;; TODO: Add building the super experimental QML support
- (list extra-cmake-modules pkg-config qttools))
+ (list extra-cmake-modules pkg-config qttools-5))
(inputs
(list qtbase-5))
(arguments
@@ -222,7 +222,7 @@ common build settings used in software produced by the KDE
community.")
"1wk1ip2w7fkh65zk6rilj314dna0hgsv2xhjmpr5w08xa8sii1y5"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules pkg-config qttools))
+ (list extra-cmake-modules pkg-config qttools-5))
(inputs
(list qtbase-5
phonon
@@ -489,7 +489,7 @@ and the older vCalendar.")
"0y9n2a5n18pasdmrp0xb84hla9l27yj2x3k4p1c041sd9nkwixpk"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules gperf qttools))
+ (list extra-cmake-modules gperf qttools-5))
(inputs
(list qtbase-5))
(home-page "https://community.kde.org/Frameworks";)
@@ -523,7 +523,7 @@ Internet).")
"1s3h4hfpw7c0894cifj66bj1yhx8g94ckvl71jm7qqsb5x5h6y9n"))))
(build-system cmake-build-system)
(native-inputs
- (list dbus extra-cmake-modules inetutils qttools
+ (list dbus extra-cmake-modules inetutils qttools-5
xorg-server-for-tests))
(inputs
(list qtbase-5))
@@ -585,7 +585,7 @@ propagate their changes to their respective configuration
files.")
"10a7zys3limsawl7lk9ggymk3msk2bp0y8hp0jmsvk3l405pd1ps"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules qttools shared-mime-info
+ (list extra-cmake-modules qttools-5 shared-mime-info
;; TODO: FAM: File alteration notification
http://oss.sgi.com/projects/fam
xorg-server-for-tests)) ; for the tests
(inputs
@@ -641,7 +641,7 @@ many more.")
(patches (search-patches "kdbusaddons-kinit-file-name.patch"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules dbus qttools))
+ (list extra-cmake-modules dbus qttools-5))
(inputs
(list qtbase-5 qtx11extras kinit-bootstrap)) ;; kinit-bootstrap: kinit
package which does not depend on kdbusaddons.
(arguments
@@ -681,7 +681,7 @@ as well as an API to create KDED modules.")
"0wadknnf472rqg2xnqzs5v23qzqfr336wj6d96yg2ayqm0chbppy"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list avahi ; alternativly dnssd could be used
qtbase-5))
@@ -773,7 +773,7 @@ interfaces in the areas of colors, fonts, text, images,
keyboard input.")
(display "[testDefaultRegions]\n*\n")))
#t)))))
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list qtbase-5 qtdeclarative-5))
(home-page "https://invent.kde.org/frameworks/kholidays";)
@@ -868,7 +868,7 @@ or user activity.")
(properties `((upstream-name . "kirigami2")))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list kwindowsystem
;; TODO: Find a way to activate this optional include without
@@ -952,7 +952,7 @@ model to observers
"04vlmkvc3y5h7cpb6kdv9gha5axxkimhqh44mdg2ncyn4sas6j68"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list qtbase-5))
(home-page "https://community.kde.org/Frameworks";)
@@ -977,7 +977,7 @@ to flat and hierarchical lists.")
"1wj4n2a8iz9ml1y0012xkpsx3dfp5gl2dn80sifrzvkxjxrhwach"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list qtbase-5))
(home-page "https://community.kde.org/Frameworks";)
@@ -1004,7 +1004,7 @@ pixel units.")
"12jn7lqsp86329spai7n1n8i65nwhxh8gp33wkq543h7w3i2a3jb"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules perl qttools
+ (list extra-cmake-modules perl qttools-5
;; Optional, for compile-time validation of syntax definition files:
qtxmlpatterns))
(inputs
@@ -1088,7 +1088,7 @@ represented by a QPoint or a QSize.")
"03l37lh219np7pqfa56r2v7n5s5xg4rjq005qng4b5izd95ri56j"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools xorg-server-for-tests))
+ (list extra-cmake-modules qttools-5 xorg-server-for-tests))
(inputs
(list qtbase-5))
(arguments
@@ -1127,7 +1127,7 @@ configuration pages, message boxes, and password
requests.")
pkg-config
dbus ; for the tests
openbox ; for the tests
- qttools
+ qttools-5
xorg-server-for-tests)) ; for the tests
(inputs
`(("libxrender" ,libxrender)
@@ -1373,7 +1373,7 @@ feel.")
(setenv "DBUS_FATAL_WARNINGS" "0")
(invoke "dbus-launch" "ctest" "."))))))
(native-inputs
- (list bison dbus extra-cmake-modules flex qttools))
+ (list bison dbus extra-cmake-modules flex qttools-5))
(inputs
`(("qtbase" ,qtbase-5)
("qtdeclarative-5" ,qtdeclarative-5)
@@ -1401,7 +1401,7 @@ system.")
"0b88h5fw1n8zyrg0vq3lj2jbjjyh0mk64lj6ab3643kxzqxbn30w"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules pkg-config qttools))
+ (list extra-cmake-modules pkg-config qttools-5))
(inputs
(list hunspell
;; TODO: hspell (for Hebrew), Voikko (for Finish)
@@ -1503,7 +1503,7 @@ with other frameworks.")
"0nmdz7ra3hpg0air4lfkzilv7cwx3zxs29k7sh8l3i1fs3qpjwxm"))))
(build-system cmake-build-system)
(native-inputs
- (list dbus extra-cmake-modules qttools))
+ (list dbus extra-cmake-modules qttools-5))
(inputs
(list kcoreaddons polkit-qt qtbase-5))
(arguments
@@ -1546,7 +1546,7 @@ utilities.")
"1pjgya8wi28jx63hcdi9v5f5487gzbkw2j1iganhd7bhcb8s7zpy"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list kconfig kwidgetsaddons qtbase-5))
(home-page "https://community.kde.org/Frameworks";)
@@ -1800,7 +1800,7 @@ formats.")
"13kdczzyyh17hf6vlhh4li5bn4yq5bab5xa8mm63r9rynxihgclf"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras))
(home-page "https://community.kde.org/Frameworks";)
@@ -1824,7 +1824,7 @@ asynchronous jobs.")
"01bn23xw2n53h9nl99lm3cjnqs8s66bmwkzf6fkpg9rzkykizbyc"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules dbus qttools))
+ (list extra-cmake-modules dbus qttools-5))
(inputs
(list kcodecs
kconfig
@@ -2134,7 +2134,7 @@ by which applications, and what documents have been
linked to which activity.")
(propagated-inputs
(list kwidgetsaddons))
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list kauth
kcodecs
@@ -2236,7 +2236,7 @@ KCModules can be created with the KConfigWidgets
framework.")
ki18n
;; todo: PythonModuleGeneration
qtbase-5
- qttools))
+ qttools-5))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -2362,7 +2362,7 @@ started on demand.")
"0dr6gcag2yzx8fvxis4x403jrcisywds95cywmiyz3pb5727cak2"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list kconfig
kcoreaddons
@@ -2431,7 +2431,7 @@ with su and ssh respectively.")
"0y9ja3znkvzdbjfs91dwr4cmvl9fk97zpz2lkf0f9zhm2nw6q008"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list kconfig
kcoreaddons
@@ -2500,7 +2500,7 @@ emoticons coming from different providers.")
"0hmqigc8myiwwh7m6y2cm4vn0d3kmrhia179hyb84vpvvn3lm93z"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules pkg-config qttools))
+ (list extra-cmake-modules pkg-config qttools-5))
(inputs
(list kconfig
kcrash
@@ -2534,7 +2534,7 @@ window does not need focus for them to be activated.")
"09bqpf3drqyfc81vgab9bsh1wm5qbzdwqjlczhax38660nnvh0r9"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules qttools shared-mime-info))
+ (list extra-cmake-modules qttools-5 shared-mime-info))
(inputs
(list karchive
kauth
@@ -2661,7 +2661,7 @@ consumption.")
kxmlgui
solid))
(native-inputs
- (list dbus qttools extra-cmake-modules))
+ (list dbus qttools-5 extra-cmake-modules))
(inputs
`(;; TODO: LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
("krb5" ,mit-krb5)
@@ -3133,7 +3133,7 @@ library.")
(propagated-inputs
(list ki18n sonnet))
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list kauth
kcodecs
@@ -3213,7 +3213,7 @@ the passwords on KDE work spaces.")
(propagated-inputs
(list kconfig kconfigwidgets))
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list attica
kauth
@@ -3549,7 +3549,7 @@ workspace.")
networkmanager-qt
openssl
qtsvg-5
- qttools
+ qttools-5
qtx11extras))
;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and
;; share/kf5/kssl/ca-bundle.crt
@@ -3698,7 +3698,7 @@ support.")
(base32 "0976faazhxhhi1wpvpcs8hwb2knz0z7j44v3ay3hw73rq4p3bipm"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules kdoctools qttools))
+ (list extra-cmake-modules kdoctools qttools-5))
(inputs
(list ki18n kjs qtbase-5 qtsvg-5))
(home-page "https://community.kde.org/Frameworks";)
@@ -3722,7 +3722,7 @@ QObjects, so you can script your applications.")
(base32 "0lrm4y727nhwaivl37zpmnrwx048gfhyjw19m6q5z9p37lk43jja"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules kdoctools qttools))
+ (list extra-cmake-modules kdoctools qttools-5))
(inputs
(list kcompletion
kcoreaddons
@@ -3758,7 +3758,7 @@ KParts instead.")
(base32 "12b527l12rcf421p613ydbacilp9v9iy90ma35w21sdf9a15k675"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules kdoctools qttools))
+ (list extra-cmake-modules kdoctools qttools-5))
(inputs
(list kcompletion
kcoreaddons
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index ac86489a95..39295f589d 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -322,7 +322,7 @@ This package is part of the KDE multimedia module.")
kdoctools
libxslt
python-wrapper
- qttools))
+ qttools-5))
(inputs
(list chromaprint
flac
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index f0f5683ac5..faf5e702f3 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -58,7 +58,7 @@
"akonadi-not-relocatable.patch"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools shared-mime-info))
+ (list extra-cmake-modules qttools-5 shared-mime-info))
(inputs
(list boost
kconfig
@@ -537,7 +537,7 @@ one of the APIs mentioned above.")
(properties `((upstream-name . "calendarsupport")))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list akonadi
akonadi-calendar
@@ -769,7 +769,7 @@ package.")
(properties `((upstream-name . "eventviews")))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list akonadi
akonadi-calendar
@@ -1108,7 +1108,7 @@ manager from KDE.")
(properties `((upstream-name . "mailcommon")))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules dbus gnupg qttools))
+ (list extra-cmake-modules dbus gnupg qttools-5))
(inputs
(list akonadi
akonadi-contacts
@@ -1496,7 +1496,7 @@ application \"Parts\" to be embedded as a Kontact
component (or plugin).")
(base32 "04lz3ldrr0lpy9zpsg9ja1i9gxzlcjpqcwn3g7l4jjdky4frcr2r"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules dbus qttools kdoctools))
+ (list extra-cmake-modules dbus qttools-5 kdoctools))
(inputs
(list akonadi
akonadi-calendar
@@ -1620,7 +1620,7 @@ Virtual Contact File}) files to the KPeople contact
management library.")
(properties `((upstream-name . "pimcommon")))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list karchive
akonadi
@@ -1678,7 +1678,7 @@ Virtual Contact File}) files to the KPeople contact
management library.")
(base32 "0j6d4sv405c3x0ww75qsww94apidsb8aaqf59akhv96zmv0vx5wy"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list grantlee
kcodecs
@@ -1791,7 +1791,7 @@ and allows one to view/extract message formatted text in
Rich Text Format.")
(base32 "0bask561laxgkgm3rxfpyxqs6jx1l9xjk058lhycq0pik6vwhdha"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list akonadi
akonadi-contacts
@@ -1838,7 +1838,7 @@ and allows one to view/extract message formatted text in
Rich Text Format.")
(base32 "0nvd5fqrvyb7c3g7rf1lxbbv38q9sqnhd6irgx7awwgw92inxky4"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list cyrus-sasl
ki18n
@@ -1873,7 +1873,7 @@ various Google services.")
(base32 "0rijpmqyx4mrr7csik3vkfcra7kfywk6yz548fmq3ha8wa9ax8fv"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules kdoctools qttools))
+ (list extra-cmake-modules kdoctools qttools-5))
(inputs
(list boost
gpgme
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 512c2acfef..98bc8f7b86 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -407,7 +407,7 @@ either be created or generated from a image.")
(base32 "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules kdoctools qttools shared-mime-info))
+ (list extra-cmake-modules kdoctools qttools-5 shared-mime-info))
(inputs
(list kbookmarks
kcmutils
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index c43758ef7f..933bfcd04b 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -261,7 +261,7 @@ browser for easy news reading.")
`("MLT_PREFIX" ":" =
(,#$(this-package-input "mlt"))))))))))
(native-inputs
- (list extra-cmake-modules pkg-config qttools))
+ (list extra-cmake-modules pkg-config qttools-5))
(inputs
(list bash-minimal
breeze ; make dark them available easily
@@ -318,7 +318,7 @@ projects.")
(base32 "02ip5r67hjfpywkm3mz86n6wbqcr7996ifzfd2fyzsvm4998hi4y"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules pkg-config shared-mime-info qttools))
+ (list extra-cmake-modules pkg-config shared-mime-info qttools-5))
(inputs
`(("boost" ,boost)
("clang" ,clang)
@@ -436,7 +436,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).")
"kdiagram-Fix-missing-link-libraries.patch"))))
(build-system qt-build-system)
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(inputs
(list qtbase-5 qtsvg-5))
(home-page "https://invent.kde.org/graphics/kdiagram";)
@@ -690,7 +690,7 @@ cards.")
(inputs
(list qtbase-5))
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
(home-page "https://techbase.kde.org/Projects/Snorenotify";)
(synopsis "Qt notification framework")
(description "Snorenotify is a multi platform Qt notification framework.
@@ -804,7 +804,7 @@ communicate with each other. Here's a few things KDE
Connect can do:
("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
- ("qttools" ,qttools)))
+ ("qttools-5" ,qttools-5)))
(inputs
(list breeze ;for dark themes
breeze-icons ;for icons
@@ -917,7 +917,7 @@ unmount drives and view them in a file manager.")
"0fx17s6fj1pxl1mgfrqhchk8sihkbji1x8y3nhb1r0971wzd1nsc"))))
(build-system cmake-build-system)
(native-inputs
- (list extra-cmake-modules perl python qttools kdoctools))
+ (list extra-cmake-modules perl python qttools-5 kdoctools))
(inputs
(list qtbase-5 karchive ki18n kio kdbusaddons))
;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on
@@ -1007,7 +1007,7 @@ Python, PHP, and Perl.")
"-DBUILD_TOUCH=YES"
"-DBUILD_MARBLE_TESTS=FALSE")))
(native-inputs
- (list extra-cmake-modules qttools))
+ (list extra-cmake-modules qttools-5))
;; One optional dependency missing: libwlocate.
(inputs
(list gpsd
@@ -1216,7 +1216,7 @@ or Bonjour by other projects).")
(build-system qt-build-system)
(native-inputs
(list extra-cmake-modules
- qttools
+ qttools-5
;; For optional component "Survey target expression parser"
bison
flex
diff --git a/gnu/packages/lego.scm b/gnu/packages/lego.scm
index 19a4a5eba0..39823dfee8 100644
--- a/gnu/packages/lego.scm
+++ b/gnu/packages/lego.scm
@@ -113,7 +113,7 @@ restrictions that stem from limitations of the standard RCX
firmware.")
"1ifbxngkbmg6d8vv08amxbnfvlyjdwzykrjp98lbwvgb0b843ygq"))))
(build-system gnu-build-system)
(native-inputs
- (list qttools)) ; for lrelease
+ (list qttools-5)) ; for lrelease
(inputs
(list mesa qtbase-5 zlib))
(arguments
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 47fb94dc68..7b5efeb588 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -843,7 +843,7 @@ and video calls or instant messaging capabilities to an
application.")
(symlink (string-append liblinphone "/share/belr/grammars")
grammar-dest)))))))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list bctoolbox
belcard
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 9ff1de942c..eab9a24d1d 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -234,7 +234,7 @@ in Qt.")
qtsvg-5
qtx11extras))
(native-inputs
- (list lxqt-build-tools qttools))
+ (list lxqt-build-tools qttools-5))
(home-page "https://lxqt-project.org";)
(synopsis "Core utility library for all LXQt components")
(description "liblxqt provides the basic libraries shared by the
@@ -287,7 +287,7 @@ and memory usage or network traffic.")
qtsvg-5
qtx11extras))
(native-inputs
- (list lxqt-build-tools qttools))
+ (list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no tests
#:phases
@@ -329,7 +329,7 @@ LXQt and the system it's running on.")
qtsvg-5
qtx11extras))
(native-inputs
- (list lxqt-build-tools qttools))
+ (list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no tests
#:phases
@@ -382,7 +382,7 @@ the operating system LXQt is running on.")
xkeyboard-config
zlib))
(native-inputs
- (list pkg-config lxqt-build-tools qttools))
+ (list pkg-config lxqt-build-tools qttools-5))
;; XXX: This is a workaround so libkscreen can find the backends as we
;; dont have a way specify them. We may want to patch like Nix does.
(propagated-inputs
@@ -446,7 +446,7 @@ configuration of both LXQt and the underlying operating
system.")
qtsvg-5
qtx11extras))
(native-inputs
- (list pkg-config qttools lxqt-build-tools))
+ (list pkg-config qttools-5 lxqt-build-tools))
(arguments
'(#:tests? #f ; no tests
#:phases
@@ -492,7 +492,7 @@ as a whole and are not limited to distinct applications.")
qtsvg-5
qtx11extras))
(native-inputs
- (list lxqt-build-tools qttools))
+ (list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no test target
#:phases
@@ -537,7 +537,7 @@ according to the Desktop Notifications Specification.")
qtsvg-5
qtx11extras))
(native-inputs
- (list lxqt-build-tools qttools))
+ (list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no tests
#:phases
@@ -590,7 +590,7 @@ of other programs.")
xcb-util
xkeyboard-config))
(native-inputs
- (list pkg-config lxqt-build-tools qttools))
+ (list pkg-config lxqt-build-tools qttools-5))
(propagated-inputs
;; Propagating KWINDOWSYSTEM so that the list of opened applications
;; shows up in lxqt-panel's taskbar plugin.
@@ -649,7 +649,7 @@ of other programs.")
qtsvg-5
qtx11extras))
(native-inputs
- (list pkg-config polkit lxqt-build-tools qttools))
+ (list pkg-config polkit lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no test target
#:phases
@@ -696,7 +696,7 @@ LXQt.")
qtx11extras
solid))
(native-inputs
- (list lxqt-build-tools qttools))
+ (list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no tests
#:phases
@@ -742,7 +742,7 @@ when laptop batteries are low on power.")
qtsvg-5
qtx11extras))
(native-inputs
- (list lxqt-build-tools qttools))
+ (list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f ; no tests
#:phases
@@ -782,7 +782,7 @@ Qt with LXQt.")
qtsvg-5
qtx11extras))
(native-inputs
- (list pkg-config qttools lxqt-build-tools))
+ (list pkg-config qttools-5 lxqt-build-tools))
(arguments
'(#:tests? #f ; no tests
#:phases
@@ -829,7 +829,7 @@ allows for launching applications or shutting down the
system.")
qtx11extras
xdg-user-dirs))
(native-inputs
- (list pkg-config lxqt-build-tools qttools))
+ (list pkg-config lxqt-build-tools qttools-5))
(arguments
`(#:tests? #f
#:phases
@@ -897,7 +897,7 @@ for the LXQt desktop environment.")
qtx11extras
sudo))
(native-inputs
- (list pkg-config qttools lxqt-build-tools))
+ (list pkg-config qttools-5 lxqt-build-tools))
(arguments
'(#:tests? #f ; no tests
#:phases
@@ -978,7 +978,7 @@ for LXQt.")
qtbase-5
qtx11extras))
(native-inputs
- (list pkg-config lxqt-build-tools qttools))
+ (list pkg-config lxqt-build-tools qttools-5))
(home-page "https://lxqt-project.org";)
(synopsis "Qt binding for libfm")
(description "libfm-qt is the Qt port of libfm, a library providing
@@ -1000,7 +1000,7 @@ components to build desktop file managers which belongs
to LXDE.")
(inputs
(list libfm-qt qtbase-5 qtx11extras))
(native-inputs
- (list pkg-config qttools lxqt-build-tools))
+ (list pkg-config qttools-5 lxqt-build-tools))
(arguments
'(#:tests? #f ; no tests
#:phases
@@ -1038,7 +1038,7 @@ LXDE.")
(inputs
(list libconfig qtbase-5))
(native-inputs
- (list lxqt-build-tools pkg-config qttools))
+ (list lxqt-build-tools pkg-config qttools-5))
(arguments
'(#:tests? #f ; no tests
#:phases
@@ -1070,7 +1070,7 @@ manager Compton.")
(inputs
(list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras))
(native-inputs
- (list pkg-config lxqt-build-tools qttools))
+ (list pkg-config lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org";)
@@ -1103,7 +1103,7 @@ image viewer.")
qtbase-5
qtx11extras))
(native-inputs
- (list lxqt-build-tools pkg-config qttools))
+ (list lxqt-build-tools pkg-config qttools-5))
(arguments
'(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org";)
@@ -1127,7 +1127,7 @@ window manager OpenBox.")
(inputs
(list glib pcre pulseaudio qtbase-5 qtx11extras))
(native-inputs
- (list pkg-config lxqt-build-tools qttools))
+ (list pkg-config lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org";)
@@ -1156,7 +1156,7 @@ window manager OpenBox.")
qtbase-5
qtx11extras))
(native-inputs
- (list lxqt-build-tools qttools))
+ (list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org";)
@@ -1180,7 +1180,7 @@ processes currently in existence, much like code{top} or
code{ps}.")
(inputs
(list qtbase-5 utf8proc))
(native-inputs
- (list lxqt-build-tools qttools))
+ (list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org";)
@@ -1203,7 +1203,7 @@ processes currently in existence, much like code{top} or
code{ps}.")
(inputs
(list qtbase-5 qtx11extras qtermwidget))
(native-inputs
- (list lxqt-build-tools qttools))
+ (list lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org";)
@@ -1227,7 +1227,7 @@ QTermWidget.")
(inputs
(list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras))
(native-inputs
- (list pkg-config perl qttools))
+ (list pkg-config perl qttools-5))
(arguments
'(#:tests? #f)) ; no tests
(home-page "https://lxqt-project.org";)
@@ -1252,7 +1252,7 @@ easily publishing them on internet image hosting
services.")
(inputs
(list glib json-glib libfm-qt qtbase-5 qtx11extras))
(native-inputs
- (list pkg-config lxqt-build-tools qttools))
+ (list pkg-config lxqt-build-tools qttools-5))
(arguments
'(#:tests? #f))
(home-page "https://lxqt-project.org";)
@@ -1289,7 +1289,7 @@ like @command{tar} and @command{zip}.")
libqtxdg))
(native-inputs
`(("lxqt-build-tools" ,lxqt-build-tools)
- ("qtlinguist" ,qttools)))
+ ("qtlinguist" ,qttools-5)))
(arguments
`(#:tests? #f ; no tests
#:phases
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 72a8957200..89f98ec2b6 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2783,7 +2783,7 @@ script files.")
("qt" ,qtbase-5)
,@(package-inputs octave-cli)))
(native-inputs
- `(("qttools" , qttools) ;for lrelease
+ `(("qttools-5" , qttools-5) ;for lrelease
("texlive" ,(texlive-updmap.cfg (list texlive-epsf))) ; for texi2dvi
,@(package-native-inputs octave-cli)))
(arguments
@@ -3069,7 +3069,7 @@ ASCII text files using Gmsh's own scripting language.")
(native-inputs
(list pkg-config
;;("python-astropy" ,python-astropy) ;; FIXME: Package this.
- qttools python-sip-4))
+ qttools-5 python-sip-4))
(inputs
(list ghostscript ;optional, for EPS/PS output
python-dbus
@@ -5468,7 +5468,7 @@ evaluates expressions using the standard order of
operations.")
(build-system gnu-build-system)
(native-inputs `(("gettext" ,gettext-minimal)
("qtbase" ,qtbase-5)
- ("qttools" ,qttools)))
+ ("qttools-5" ,qttools-5)))
(inputs (list libx11 zlib libpng gsl))
;; The upstream project file ("XaoS.pro") and the Makefile it generates are
;; not enough for this package to install properly. These phases fix that.
@@ -7147,7 +7147,7 @@ functions.")
"0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk"))))
(build-system cmake-build-system)
(inputs (list qtbase-5))
- (native-inputs (list qttools))
+ (native-inputs (list qttools-5))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index e5dd078561..58ac95f42c 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1810,7 +1810,7 @@ instant messenger with audio and video chat
capabilities.")
,(list (search-input-directory
inputs "lib/qt5/plugins/"))))))))))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list ffmpeg
filteraudio
@@ -2468,7 +2468,7 @@ for the Matrix protocol. It is built on to of
@code{Boost.Asio}.")
xcb-util-wm
zlib))
(native-inputs
- (list asciidoc doxygen graphviz pkg-config qttools))
+ (list asciidoc doxygen graphviz pkg-config qttools-5))
(home-page "https://github.com/Nheko-Reborn/nheko";)
(synopsis "Desktop client for Matrix using Qt and C++14")
(description "@code{Nheko} want to provide a native desktop app for the
@@ -2502,7 +2502,7 @@ notification, emojis, E2E encryption, and voip calls.")
qtquickcontrols-5
qtquickcontrols2-5
qtsvg-5
- qttools
+ qttools-5
xdg-utils))
(arguments
`(#:tests? #f)) ; no tests
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 1147512980..844e756094 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -435,7 +435,7 @@ score, keyboard, guitar, drum and controller views.")
`(("gettext" ,gettext-minimal)
("googletest" ,googletest)
("pkg-config" ,pkg-config)
- ("qtlinguist" ,qttools)))
+ ("qtlinguist" ,qttools-5)))
(inputs
(list boost
chromaprint
@@ -529,7 +529,7 @@ playing your music.")
`(("gettext" ,gettext-minimal)
("googletest" ,googletest)
("pkg-config" ,pkg-config)
- ("qtlinguist" ,qttools)
+ ("qtlinguist" ,qttools-5)
("xorg-server" ,xorg-server-for-tests)))
(inputs
(list alsa-lib
@@ -768,7 +768,7 @@ settings (aliasing, linear interpolation and cubic
interpolation).")
(native-inputs
`(("cppunit" ,cppunit)
("pkg-config" ,pkg-config)
- ("qtlinguist" ,qttools)))
+ ("qtlinguist" ,qttools-5)))
(inputs
(list alsa-lib
jack-1
@@ -2226,7 +2226,7 @@ users to select LV2 plugins and run them with jalv.")
(list benchmark
googletest
python-wrapper
- qttools
+ qttools-5
xorg-server-for-tests))
(inputs
(list bash-minimal
@@ -2303,7 +2303,7 @@ perform creative live mixes with digital music files.")
qtbase-5
qtsvg-5))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(home-page "https://synthv1.sourceforge.io";)
(synopsis "Polyphonic subtractive synthesizer")
(description
@@ -2336,7 +2336,7 @@ oscillators and stereo effects.")
qtbase-5
qtsvg-5))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(home-page "https://drumkv1.sourceforge.io";)
(synopsis "Drum-kit sampler synthesizer with stereo effects")
(description
@@ -2369,7 +2369,7 @@ effects.")
qtbase-5
qtsvg-5))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(home-page "https://samplv1.sourceforge.io";)
(synopsis "Polyphonic sampler synthesizer with stereo effects")
(description
@@ -2402,7 +2402,7 @@ effects.")
qtbase-5
qtsvg-5))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(home-page "https://padthv1.sourceforge.io";)
(synopsis "Polyphonic additive synthesizer")
(description
@@ -2928,7 +2928,7 @@ browser.")
"/manpages/docbook.xsl")))
#t)))))
(inputs
- (list qtbase-5 qtsvg-5 qttools alsa-lib))
+ (list qtbase-5 qtsvg-5 qttools-5 alsa-lib))
(native-inputs
(list pkg-config
libxslt ; for xsltproc
@@ -2975,7 +2975,7 @@ backends, including ALSA, OSS, Network and FluidSynth.")
(list drumstick qtbase-5 qtsvg-5 qtx11extras))
(native-inputs
(list libxslt ;for xsltproc
- docbook-xsl qttools pkg-config))
+ docbook-xsl qttools-5 pkg-config))
(home-page "https://vmpk.sourceforge.io/";)
(synopsis "Virtual MIDI piano keyboard")
(description
@@ -3316,7 +3316,7 @@ from the command line.")
suil
zlib))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(home-page "https://qtractor.org/";)
(synopsis "Audio/MIDI multi-track sequencer")
(description
@@ -4423,7 +4423,7 @@ plugins, a switch trigger, a toggle switch, and a
peakmeter.")
(inputs
(list qtbase-5 alsa-lib jack-1 liblo lv2))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(home-page "http://qmidiarp.sourceforge.net/";)
(synopsis "MIDI arpeggiator")
(description "QMidiArp is an advanced MIDI arpeggiator, programmable step
@@ -4449,7 +4449,7 @@ modules running in parallel.")
(inputs
(list qtbase-5 alsa-lib))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(home-page "http://alsamodular.sourceforge.net/";)
(synopsis "MIDI event router and filter")
(description "QMidiRoute is a MIDI event router and filter. MIDI note,
@@ -4592,7 +4592,7 @@ are a C compiler and glib. Full API documentation and
examples are included.")
"\"")))))))
(native-inputs
`(("pkg-config" ,pkg-config)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
;; rpmalloc is a public domain memory allocator. This version specified
;; below is the version required by LMMS.
;; To get the new commit of rpmalloc to use here, run
@@ -4764,7 +4764,7 @@ includes LV2 plugins and a JACK standalone client.")
qtsvg-5
qtxmlpatterns))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(synopsis "Music composition and notation software")
(description
"MuseScore is a music score typesetter. Its main purpose is the creation
@@ -4836,7 +4836,7 @@ sample library.")
`(("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
- ("qttools" ,qttools)))
+ ("qttools-5" ,qttools-5)))
(home-page "https://muse-sequencer.github.io/";)
(synopsis "MIDI/Audio sequencer")
(description "MusE is a MIDI/Audio sequencer with recording and editing
@@ -5021,7 +5021,7 @@ specification and header.")
wavpack
zlib))
(native-inputs
- (list pkg-config qttools)) ;for qtlinguist
+ (list pkg-config qttools-5)) ;for qtlinguist
(synopsis "Music composition and editing environment based around a MIDI
sequencer")
(description "Rosegarden is a music composition and editing environment
@@ -5569,7 +5569,7 @@ discard bad quality ones.
`(("gettext" ,gettext-minimal)
("hicolor-icon-theme" ,hicolor-icon-theme)
("itstool" ,itstool)
- ("qttools" ,qttools)))
+ ("qttools-5" ,qttools-5)))
(synopsis "Musical instrument tuner")
(description "FMIT is a graphical utility for tuning musical instruments,
with error and volume history, and advanced features.")
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 7c6d0757ea..7ea5cd7d20 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1650,7 +1650,7 @@ of the same name.")
perl
pkg-config
python-wrapper
- qttools))
+ qttools-5))
(synopsis "Network traffic analyzer")
(description "Wireshark is a network protocol analyzer, or @dfn{packet
sniffer}, that lets you capture and interactively browse the contents of
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 7db592549d..0069fdd74c 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -165,7 +165,7 @@ human.")
(lambda* (#:key inputs #:allow-other-keys)
(wrap-qt-program "keepassxc" #:output #$output #:inputs
inputs))))))
(native-inputs
- (list qttools ruby-asciidoctor))
+ (list qttools-5 ruby-asciidoctor))
(inputs
(list argon2
botan
@@ -697,7 +697,7 @@ key URIs using the standard otpauth:// scheme.")
(setenv "QT_QPA_PLATFORM" "offscreen")
#t)))))
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list qtbase-5 qtsvg-5))
(home-page "https://qtpass.org";)
diff --git a/gnu/packages/patches/xygrib-fix-finding-data.patch
b/gnu/packages/patches/xygrib-fix-finding-data.patch
index 0b718b0eff..d1db2d8807 100644
--- a/gnu/packages/patches/xygrib-fix-finding-data.patch
+++ b/gnu/packages/patches/xygrib-fix-finding-data.patch
@@ -124,7 +124,7 @@ index 2c9d3ab4da03..1190cc780182 100644
+- GEN_TRANSLATION (DEFAULT: ON)
+```
+Create targets to generate translation files.
-+Turning this off removes the need for qt-linguist, part of qttools qt5
submodule, during build.
++Turning this off removes the need for qt-linguist, part of qttools-5 qt5
submodule, during build.
+```
### macOS
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 45e951884b..19c171a9bb 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -609,7 +609,7 @@ and enhance them.")
(string-append "PREFIX=" out)
"Photoflare.pro")))))))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list graphicsmagick libomp qtbase-5))
(home-page "https://photoflare.io";)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ac7c0d6066..216970ace9 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -25034,7 +25034,7 @@ with features similar to the @command{wget} utility.")
python-translation-finder
python-watchdog))
(native-inputs
- (list qttools fontforge))
+ (list qttools-5 fontforge))
(home-page "https://framagit.org/tyreunom/offlate";)
(synopsis "Offline translation interface for online translation tools")
(description "Offlate offers a unified interface for different translation
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 488cfa6120..f0278c00a0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -187,7 +187,7 @@
(add-after 'install 'qt-wrap
(assoc-ref qt:%standard-phases 'qt-wrap)))))
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list qtbase-5 qtsvg-5))
(synopsis "Qt5 Configuration Tool")
@@ -1701,7 +1701,7 @@ native APIs where it makes sense.")))
(description "The Qt Location module provides an interface for location,
positioning and geolocation plugins.")))
-(define-public qttools
+(define-public qttools-5
(package (inherit qtsvg-5)
(name "qttools")
(version "5.15.2")
@@ -1735,7 +1735,7 @@ that helps in Qt development.")))
"0gk74hk488k9ldacxbxcranr3arf8ifqg8kz9nm1rgdgd59p36d2"))
(patches (search-patches "qtscript-disable-tests.patch"))))
(native-inputs
- (list perl qttools))
+ (list perl qttools-5))
(inputs
(list qtbase-5))
(synopsis "Qt Script module")
@@ -2031,7 +2031,7 @@ message.")))
(arguments
`(#:tests? #f)) ;no test
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list enchant qtbase-5))
(home-page "https://github.com/manisandro/qtspell";)
@@ -2915,7 +2915,7 @@ module provides support functions to the automatically
generated code.")
("qtsensors" ,qtsensors)
("qtserialport" ,qtserialport)
("qtsvg-5" ,qtsvg-5)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("qtwebchannel-5" ,qtwebchannel-5)
("qtwebkit" ,qtwebkit)
("qtwebsockets-5" ,qtwebsockets-5)
@@ -3260,7 +3260,7 @@ This package provides the Python bindings.")))
"1zk6r2vc1q48qs7mw2h47bpgrfbb9r7lf9cwq4sb1a4nls87zznk"))))
(build-system cmake-build-system)
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list libsecret qtbase-5))
(arguments
@@ -3404,7 +3404,7 @@ that can be only started once per user.
(base32 "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"))))
(build-system gnu-build-system)
(inputs
- (list qtbase-5 qtsvg-5 qttools))
+ (list qtbase-5 qtsvg-5 qttools-5))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -3552,7 +3552,7 @@ time Web content can be enhanced with native controls.")
"09fz6v8rp28997f235yaifj8p4vvsyv45knc1iivgdvx7msgcd0m"))))
(build-system cmake-build-system)
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list qtbase-5 qtdeclarative-5))
(home-page "https://filcuc.github.io/DOtherSide/index.html";)
@@ -3589,7 +3589,7 @@ a binding language:
(build-system cmake-build-system)
(arguments `(#:tests? #f)) ; There are no tests
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list qtbase-5))
(home-page "https://gitlab.com/mattia.basaglia/Qt-Color-Widgets";)
@@ -3741,7 +3741,7 @@ color-related widgets.")
(native-inputs
`(("cmake" ,cmake-minimal)
("python" ,python-wrapper)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("which" ,which)))
(arguments
`(#:tests? #f
@@ -3780,7 +3780,7 @@ color-related widgets.")
"qtsensors"
"qtspeech"
"qtsvg-5"
- "qttools"
+ "qttools-5"
"qtwebchannel-5"
"qtwebengine-5"
"qtwebsockets-5"
@@ -3873,7 +3873,7 @@ generate Python bindings for your C or C++ code.")
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke (cons "qmake" make-flags)))))))
(native-inputs
- (list qtbase-5 qttools))
+ (list qtbase-5 qttools-5))
(inputs
(list glu))
(home-page "http://libqglviewer.com";)
@@ -3928,7 +3928,7 @@ being fully customizable and easy to extend.")
(install-file file include-dir))
(find-files "." "\\.h$"))))))))
(inputs (list qtbase-5))
- (native-inputs (list qttools))
+ (native-inputs (list qttools-5))
(home-page "https://simsys.github.io";)
(synopsis "Binary editor widget for Qt")
(description
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 5f9767c896..9cd64999a1 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1290,7 +1290,7 @@ instances over the network, and general QSO and
DXpedition logging.")
(base32 "0nciw9smrfcsirlwyny5r9h7sk2zvm40m56y1hxpgpmbnh6mqikh"))))
(build-system qt-build-system)
(native-inputs
- (list asciidoc gfortran pkg-config qttools ruby-asciidoctor))
+ (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor))
(inputs
`(("boost" ,boost)
("fftw" ,fftw)
@@ -1327,7 +1327,7 @@ weak-signal conditions.")
(base32 "1lw9q7ggh2jlasipl3v5pkbabysjr6baw15lnmg664ah3fwdrvnx"))))
(build-system qt-build-system)
(native-inputs
- (list asciidoc gfortran pkg-config qttools ruby-asciidoctor))
+ (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor))
(inputs
(list
boost
@@ -1373,7 +1373,7 @@ focused on DXing and being shaped by community of
DXers.JTDX")
#t))))
(build-system qt-build-system)
(native-inputs
- (list asciidoc gfortran pkg-config qttools ruby-asciidoctor))
+ (list asciidoc gfortran pkg-config qttools-5 ruby-asciidoctor))
(inputs
`(("boost" ,boost)
("fftw" ,fftw)
@@ -1745,7 +1745,7 @@ intended for people who want to learn receiving and
sending morse code.")
(base32 "1s1aj223n57rpc95rih98z08xnyhq2zp02byzrc3f7s01fv3nj0l"))))
(build-system qt-build-system)
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list qtbase-5 qtmultimedia-5))
(arguments
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
index 7266aa81f3..0b0ecaf027 100644
--- a/gnu/packages/robotics.scm
+++ b/gnu/packages/robotics.scm
@@ -119,7 +119,7 @@ hundred times faster than real-time.")
protobuf-3.5 ;for logging
qtbase-5
qtsvg-5
- qttools ;for libQt5Help, needed by "studio"
+ qttools-5 ;for libQt5Help, needed by "studio"
qtwebkit
qtx11extras
eudev
diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm
index 6f557d2b2b..a1d81f5697 100644
--- a/gnu/packages/scribus.scm
+++ b/gnu/packages/scribus.scm
@@ -91,7 +91,7 @@
qtdeclarative-5
zlib))
(native-inputs
- (list pkg-config qttools util-linux))
+ (list pkg-config qttools-5 util-linux))
(home-page "https://www.scribus.net";)
(synopsis "Desktop publishing and page layout program")
(description
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 5d95aebf14..84bd92b6f7 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -759,7 +759,7 @@ an unprivileged user.")
(build-system cmake-build-system)
(arguments
'(#:configure-flags (list "-DBUILD_TESTING=on")))
- (native-inputs (list pkg-config qttools))
+ (native-inputs (list pkg-config qttools-5))
(inputs (list catch-framework2))
(home-page "https://github.com/tplgy/cppcodec";)
(synopsis "Header library to encode/decode base64, base64url, etc.")
@@ -783,7 +783,7 @@ base64url, base32, base32hex and hex.")
(build-system cmake-build-system)
(arguments
`(#:tests? #f)) ;no test suite
- (native-inputs (list pkg-config qttools))
+ (native-inputs (list pkg-config qttools-5))
(inputs (list cppcodec
hidapi
libnitrokey
@@ -853,7 +853,7 @@ devices.")
(build-system cmake-build-system)
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list qtbase-5
qtsvg-5
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 5b82e0ca3d..8c174c98ba 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -174,7 +174,7 @@
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("ruby" ,ruby)))
(inputs
(list appstream
@@ -347,7 +347,7 @@ See also: megacmd, the official tool set by MEGA.")
("extra-cmake-modules" ,extra-cmake-modules)
("perl" ,perl)
("pkg-config" ,pkg-config)
- ("qtlinguist" ,qttools)))
+ ("qtlinguist" ,qttools-5)))
(inputs
(list qtbase-5 qtkeychain sqlite zlib))
(home-page "https://owncloud.org";)
diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm
index df109e862b..bae784d65c 100644
--- a/gnu/packages/synergy.scm
+++ b/gnu/packages/synergy.scm
@@ -73,7 +73,7 @@
(("/usr") out))
#t))))))
(native-inputs
- (list qttools)) ; for Qt5LinguistTools
+ (list qttools-5)) ; for Qt5LinguistTools
(inputs
`(("avahi" ,avahi)
("python" ,python-wrapper)
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index d62dc831b3..873ff6246b 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -383,7 +383,7 @@ Telegram project, for its use in telegram desktop client.")
("gtk+:bin" ,gtk+ "bin")
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
- ("qttools" ,qttools)))
+ ("qttools-5" ,qttools-5)))
(inputs
`(("alsa" ,alsa-lib)
("c++-gsl" ,c++-gsl)
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index c711c3512f..14c7087125 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -653,7 +653,7 @@ address of one of the participants.")
;; xiph-rnnoise ; TODO: unbundle rnnoise
))
(native-inputs
- (list pkg-config python qttools))
+ (list pkg-config python qttools-5))
(synopsis "Low-latency, high quality voice chat software")
(description
"Mumble is an low-latency, high quality voice chat
@@ -695,7 +695,7 @@ Mumble consists of two applications for separate usage:
"-DWITH_G729=On" ; For G729 Codec Support
"-DWITH_SPEEX=On"))) ; For Speex Codec Support
(native-inputs
- (list bison flex qttools))
+ (list bison flex qttools-5))
(inputs
(list alsa-lib
bcg729
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 345454bd62..485661fe6b 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -663,7 +663,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB.
"19cf55b86yj2b5hdazbyw4iyp6xq155243aiyg4m0vhwh0h79nwh"))))
(build-system gnu-build-system)
(native-inputs
- (list pkg-config qttools)) ; for lrelease
+ (list pkg-config qttools-5)) ; for lrelease
(inputs
(list hunspell
qtbase-5
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 184dca8eff..04049fd9c8 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1012,7 +1012,7 @@ H.264 (MPEG-4 AVC) video streams.")
("perl" ,perl)
("pkg-config" ,pkg-config)
("po4a" ,po4a)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("ruby" ,ruby)))
(arguments
`(#:configure-flags
@@ -2242,7 +2242,7 @@ projects while introducing many more.")
"12nvcl0cfix1xay9hfi7856vg4lpv8y5b0a22212bsjbvl5g22rc"))))
(build-system qt-build-system)
(native-inputs
- (list qttools))
+ (list qttools-5))
(inputs
(list bash-minimal qtbase-5 zlib mpv))
(arguments
@@ -2875,7 +2875,7 @@ for use with HTML5 video.")
`(("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("yasm" ,yasm)))
;; FIXME: Once packaged, add libraries not found during the build.
(inputs
@@ -4844,7 +4844,7 @@ transitions, and effects and then export your film to
many common formats.")
(native-inputs
`(("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)
- ("qttools" ,qttools)))
+ ("qttools-5" ,qttools-5)))
(inputs
(list bash-minimal
ffmpeg
diff --git a/guix/lint.scm b/guix/lint.scm
index 73581b518f..edba1c2663 100644
--- a/guix/lint.scm
+++ b/guix/lint.scm
@@ -492,7 +492,7 @@ of a package, and INPUT-NAMES, a list of package
specifications such as
"kdoctools"
"libtool"
"m4"
- "qttools"
+ "qttools-5"
"yasm" "nasm" "fasm"
"python-coverage"
"python-cython"
@@ -507,7 +507,7 @@ of a package, and INPUT-NAMES, a list of package
specifications such as
"scdoc"
"swig"
"qmake"
- "qttools"
+ "qttools-5"
"texinfo"
"xorg-server-for-tests"
"yelp-tools")))
- branch master updated (ab59155c5a -> 3a656ea836), guix-commits, 2022/08/01
- 02/35: gnu: qtbase: Honor CMAKE_PREFIX_PATH., guix-commits, 2022/08/01
- 03/35: gnu: qtbase: Enable test suite., guix-commits, 2022/08/01
- 25/35: gnu: Add qttools, version 6.3.1., guix-commits, 2022/08/01
- 27/35: gnu: Add qtnetworkauth, version 6.3.1., guix-commits, 2022/08/01
- 31/35: gnu: libjami: Enable test agent., guix-commits, 2022/08/01
- 09/35: gnu: Add qtshadertools., guix-commits, 2022/08/01
- 05/35: gnu: qtsvg: Rename variable to qtsvg-5., guix-commits, 2022/08/01
- 11/35: gnu: Add qtmultimedia, version 6.3.1., guix-commits, 2022/08/01
- 16/35: gnu: qtquickcontrols2: Define as obsoleted by qtdeclarative., guix-commits, 2022/08/01
- 24/35: gnu: qttools: Rename to qttools-5.,
guix-commits <=
- 26/35: gnu: qtnetworkauth: Rename to qtnetworkauth-5., guix-commits, 2022/08/01
- 32/35: gnu: Remove jami-libclient., guix-commits, 2022/08/01
- 04/35: gnu: qtbase: Revert to gtk+ (3) instead of gtk (4)., guix-commits, 2022/08/01
- 18/35: gnu: Add qtwebsockets, version 6.3.1., guix-commits, 2022/08/01
- 15/35: gnu: qtquickcontrols2: Rename to qtquickcontrols2-5., guix-commits, 2022/08/01
- 14/35: gnu: qtquickcontrols: Rename to qtquickcontrols-5., guix-commits, 2022/08/01
- 13/35: gnu: Add qtdeclarative, version 6.3.1., guix-commits, 2022/08/01
- 12/35: gnu: qtdeclarative: Rename to qtdeclarative-5., guix-commits, 2022/08/01
- 23/35: gnu: Add qt5compat., guix-commits, 2022/08/01
- 33/35: gnu: Deprecate jami-gnome for jami., guix-commits, 2022/08/01