From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 56771@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#56771] [PATCH 23/33] gnu: qttools: Rename to qttools-5.
Date: Mon, 25 Jul 2022 19:07:53 -0400 [thread overview]
Message-ID: <20220725230803.10002-23-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20220725230803.10002-1-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(-)
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 "https://www.openorienteering.org/apps/mapper/")
(synopsis "OpenOrienteering Mapper (OOM)")
(description
@@ -2634,7 +2634,7 @@ (define-public qgis
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 @@ (define-public gpsbabel
(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 @@ (define-public gpxsee
(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 @@ (define-public brdf-explorer
(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 @@ (define-public ckb-next
(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 @@ (define-public ddcui
(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 @@ (define-public gmic-qt
(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 @@ (define-public itk-snap
zlib))
(native-inputs
`(("googletest" ,googletest)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("pkg-config" ,pkg-config)
("c3d-src"
,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3")
@@ -1224,7 +1224,7 @@ (define-public scantailor-advanced
"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 @@ (define-public luminance-hdr
"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 @@ (define-public qview
(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 @@ (define-public nomacs
("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 @@ (define-public flameshot
"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 @@ (define-public quassel
(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 @@ (define-public jami
(("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 @@ (define-public phonon
(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 @@ (define-public phonon-backend-gstreamer
"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 @@ (define-public kcodecs
"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 @@ (define-public kconfig
"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 @@ (define-public kcoreaddons
"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 @@ (define-public kdbusaddons
(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 @@ (define-public kdnssd
"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 @@ (define-public kholidays
(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 @@ (define-public kirigami
(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 @@ (define-public kitemviews
"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 @@ (define-public kplotting
"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 @@ (define-public ksyntaxhighlighting
"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 @@ (define-public kwidgetsaddons
"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 @@ (define-public kwindowsystem
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 @@ (define-public solid
(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 @@ (define-public sonnet
"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 @@ (define-public kauth
"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 @@ (define-public kcompletion
"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 @@ (define-public kjobwidgets
"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 @@ (define-public knotifications
"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 @@ (define-public kbookmarks
(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 @@ (define-public kconfigwidgets
ki18n
;; todo: PythonModuleGeneration
qtbase-5
- qttools))
+ qttools-5))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -2362,7 +2362,7 @@ (define-public kdesignerplugin
"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 @@ (define-public kdewebkit
"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 @@ (define-public kglobalaccel
"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 @@ (define-public kiconthemes
"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 @@ (define-public kio
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 @@ (define-public ktextwidgets
(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 @@ (define-public kxmlgui
(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 @@ (define-public kdelibs4support
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 @@ (define-public kjsembed
(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 @@ (define-public kmediaplayer
(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 @@ (define-public kross
(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 @@ (define-public kid3
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 @@ (define-public akonadi
"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 @@ (define-public kcalendarsupport
(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 @@ (define-public keventviews
(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 @@ (define-public kmailcommon
(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 @@ (define-public korganizer
(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 @@ (define-public kpimcommon
(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 @@ (define-public kpimtextedit
(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 @@ (define-public libkdepim
(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 @@ (define-public libkgapi
(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 @@ (define-public libkleo
(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 @@ (define-public okteta
(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 @@ (define-public kdenlive
`("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 @@ (define-public kdevelop
(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 @@ (define-public kdiagram
"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 @@ (define-public snorenotify
(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 @@ (define-public labplot
("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 @@ (define-public kcachegrind
"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 @@ (define-public marble-qt
"-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 @@ (define-public kuserfeedback
(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 @@ (define-public leocad
"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 @@ (define-public linphone-desktop
(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 @@ (define-public liblxqt
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 @@ (define-public lxqt-about
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 @@ (define-public lxqt-admin
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 @@ (define-public lxqt-config
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 @@ (define-public lxqt-globalkeys
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 @@ (define-public lxqt-notificationd
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 @@ (define-public lxqt-openssh-askpass
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 @@ (define-public lxqt-panel
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 @@ (define-public lxqt-policykit
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 @@ (define-public lxqt-powermanagement
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 @@ (define-public lxqt-qtplugin
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 @@ (define-public lxqt-runner
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 @@ (define-public lxqt-session
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 @@ (define-public lxqt-sudo
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 @@ (define-public libfm-qt
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 @@ (define-public pcmanfm-qt
(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 @@ (define-public compton-conf
(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 @@ (define-public lximage-qt
(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 @@ (define-public obconf-qt
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 @@ (define-public pavucontrol-qt
(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 @@ (define-public qps
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 @@ (define-public qtermwidget
(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 @@ (define-public qterminal
(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 @@ (define-public screengrab
(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 @@ (define-public lxqt-archiver
(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 @@ (define-public lxqt-connman-applet
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 @@ (define-public octave
("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 @@ (define-public veusz
(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 @@ (define-public xaos
(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 @@ (define-public speedcrunch
"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 b047ee0d9f..943daa968f 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1809,7 +1809,7 @@ (define-public qtox
,(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 @@ (define-public nheko
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 @@ (define-public quaternion
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 f7a2483b65..c8728edd20 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -435,7 +435,7 @@ (define-public clementine
`(("gettext" ,gettext-minimal)
("googletest" ,googletest)
("pkg-config" ,pkg-config)
- ("qtlinguist" ,qttools)))
+ ("qtlinguist" ,qttools-5)))
(inputs
(list boost
chromaprint
@@ -529,7 +529,7 @@ (define-public strawberry
`(("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 @@ (define-public hydrogen
(native-inputs
`(("cppunit" ,cppunit)
("pkg-config" ,pkg-config)
- ("qtlinguist" ,qttools)))
+ ("qtlinguist" ,qttools-5)))
(inputs
(list alsa-lib
jack-1
@@ -2226,7 +2226,7 @@ (define-public mixxx
(list benchmark
googletest
python-wrapper
- qttools
+ qttools-5
xorg-server-for-tests))
(inputs
(list bash-minimal
@@ -2303,7 +2303,7 @@ (define-public synthv1
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 @@ (define-public drumkv1
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 @@ (define-public samplv1
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 @@ (define-public padthv1
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 @@ (define-public drumstick
"/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 @@ (define-public vmpk
(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
@@ -3315,7 +3315,7 @@ (define-public qtractor
("liblo" ,liblo)
("zlib" ,zlib)))
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(home-page "https://qtractor.org/")
(synopsis "Audio/MIDI multi-track sequencer")
(description
@@ -4422,7 +4422,7 @@ (define-public qmidiarp
(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
@@ -4448,7 +4448,7 @@ (define-public qmidiroute
(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,
@@ -4591,7 +4591,7 @@ (define-public lmms
"\"")))))))
(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
@@ -4763,7 +4763,7 @@ (define-public musescore
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
@@ -4835,7 +4835,7 @@ (define-public muse-sequencer
`(("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
@@ -5020,7 +5020,7 @@ (define-public rosegarden
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
@@ -5568,7 +5568,7 @@ (define-public fmit
`(("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 7616cc77d1..16e33d238f 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1650,7 +1650,7 @@ (define-public wireshark
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 @@ (define-public keepassxc
(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 @@ (define-public qtpass
(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 eda9eadca2..e3d24c4939 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -607,7 +607,7 @@ (define-public photoflare
(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 @@ (define-public offlate
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 ae426558ec..e6ddad9c10 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -187,7 +187,7 @@ (define-public qt5ct
(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")
@@ -1703,7 +1703,7 @@ (define-public qtlocation
(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")
@@ -1737,7 +1737,7 @@ (define-public qtscript
"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")
@@ -2033,7 +2033,7 @@ (define-public qtspell
(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")
@@ -2917,7 +2917,7 @@ (define-public python-pyqt
("qtsensors" ,qtsensors)
("qtserialport" ,qtserialport)
("qtsvg-5" ,qtsvg-5)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("qtwebchannel-5" ,qtwebchannel-5)
("qtwebkit" ,qtwebkit)
("qtwebsockets-5" ,qtwebsockets-5)
@@ -3262,7 +3262,7 @@ (define-public qtkeychain
"1zk6r2vc1q48qs7mw2h47bpgrfbb9r7lf9cwq4sb1a4nls87zznk"))))
(build-system cmake-build-system)
(native-inputs
- (list pkg-config qttools))
+ (list pkg-config qttools-5))
(inputs
(list libsecret qtbase-5))
(arguments
@@ -3406,7 +3406,7 @@ (define-public qwt
(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
@@ -3554,7 +3554,7 @@ (define-public dotherside
"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")
@@ -3591,7 +3591,7 @@ (define-public qtcolorwidgets
(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")
@@ -3743,7 +3743,7 @@ (define-public python-pyside-2
(native-inputs
`(("cmake" ,cmake-minimal)
("python" ,python-wrapper)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("which" ,which)))
(arguments
`(#:tests? #f
@@ -3782,7 +3782,7 @@ (define-public python-pyside-2
"qtsensors"
"qtspeech"
"qtsvg-5"
- "qttools"
+ "qttools-5"
"qtwebchannel-5"
"qtwebengine-5"
"qtwebsockets-5"
@@ -3875,7 +3875,7 @@ (define-public libqglviewer
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke (cons "qmake" make-flags)))))))
(native-inputs
- (list qtbase-5 qttools))
+ (list qtbase-5 qttools-5))
(inputs
(list glu))
(home-page "http://libqglviewer.com")
@@ -3930,7 +3930,7 @@ (define-public qhexedit
(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 @@ (define-public wsjtx
(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 @@ (define-public jtdx
(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 @@ (define-public js8call
#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 @@ (define-public kochmorse
(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 @@ (define-public aseba
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 @@ (define-public scribus
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 c8fe460a26..3b925013dc 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -762,7 +762,7 @@ (define-public cppcodec
(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.")
@@ -786,7 +786,7 @@ (define-public nitrokey-app
(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
@@ -856,7 +856,7 @@ (define-public ausweisapp2
(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 @@ (define-public nextcloud-client
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("ruby" ,ruby)))
(inputs
(list appstream
@@ -347,7 +347,7 @@ (define-public owncloud-client
("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 @@ (define-public synergy
(("/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 @@ (define-public telegram-desktop
("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 @@ (define-public mumble
;; 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 @@ (define-public twinkle
"-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 @@ (define-public ghostwriter
"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 fd0c7897dd..891a049cda 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1012,7 +1012,7 @@ (define-public mkvtoolnix
("perl" ,perl)
("pkg-config" ,pkg-config)
("po4a" ,po4a)
- ("qttools" ,qttools)
+ ("qttools-5" ,qttools-5)
("ruby" ,ruby)))
(arguments
`(#:configure-flags
@@ -2242,7 +2242,7 @@ (define-public smplayer
"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 @@ (define-public avidemux
`(("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 @@ (define-public shotcut
(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 @@ (define (check-inputs-should-be-native package)
"kdoctools"
"libtool"
"m4"
- "qttools"
+ "qttools-5"
"yasm" "nasm" "fasm"
"python-coverage"
"python-cython"
@@ -507,7 +507,7 @@ (define (check-inputs-should-be-native package)
"scdoc"
"swig"
"qmake"
- "qttools"
+ "qttools-5"
"texinfo"
"xorg-server-for-tests"
"yelp-tools")))
--
2.36.1
next prev parent reply other threads:[~2022-07-25 23:14 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-25 21:17 [bug#56771] [PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 01/33] gnu: qtbase: Patch /bin/pwd in executable scripts Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 02/33] gnu: qtbase: Honor CMAKE_PREFIX_PATH Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 03/33] gnu: qtbase: Enable test suite Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 04/33] gnu: qtsvg: Rename variable to qtsvg-5 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 05/33] gnu: qtsvg-5: Fix indentation Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 06/33] gnu: Add qtsvg, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 07/33] gnu: qpwgraph: Migrate to Qt 6 and add libxkbcommon input Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 08/33] gnu: Add qtshadertools Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 09/33] gnu: qtmultimedia: Rename to qtmultimedia-5 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 10/33] gnu: Add qtmultimedia, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 11/33] gnu: qtdeclarative: Rename to qtdeclarative-5 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 12/33] gnu: Add qtdeclarative, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 13/33] gnu: qtquickcontrols: Rename to qtquickcontrols-5 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 14/33] gnu: qtquickcontrols2: Rename to qtquickcontrols2-5 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 15/33] gnu: qtquickcontrols2: Define as obsoleted by qtdeclarative Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 16/33] gnu: qtwebsockets: Rename to qtwebsockets-5 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 17/33] gnu: Add qtwebsockets, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 18/33] gnu: qtwebchannel: Rename to qtwebchannel-5 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 19/33] gnu: Add qtwebchannel, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 20/33] gnu: qtwebengine: Rename to qtwebengine-5 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 21/33] gnu: Add qtwebengine, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 22/33] gnu: Add qt5compat Maxim Cournoyer
2022-07-25 23:07 ` Maxim Cournoyer [this message]
2022-07-25 23:07 ` [bug#56771] [PATCH 24/33] gnu: Add qttools, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 25/33] gnu: qtnetworkauth: Rename to qtnetworkauth-5 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 26/33] gnu: Add qtnetworkauth, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 27/33] gnu: Add qtpositioning Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 28/33] build: qt: Add qtbase argument and wrap Qt environment variables exactly Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 29/33] gnu: jami: Update to 20220725.1128.fd5e6c6 Maxim Cournoyer
2022-07-25 23:08 ` [bug#56771] [PATCH 30/33] gnu: libjami: Enable test agent Maxim Cournoyer
2022-07-25 23:08 ` [bug#56771] [PATCH 31/33] gnu: Remove jami-libclient Maxim Cournoyer
2022-07-25 23:08 ` [bug#56771] [PATCH 32/33] gnu: Deprecate jami-gnome for jami Maxim Cournoyer
2022-07-25 23:08 ` [bug#56771] [PATCH 33/33] gnu: jami: Update to 20220725.1128.fd5e6c6 Maxim Cournoyer
2022-07-26 16:14 ` [bug#56771] [PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way Jack Hill
2022-07-27 5:28 ` Jack Hill
2022-08-01 4:22 ` bug#56771: " Maxim Cournoyer
2022-08-01 4:39 ` [bug#56771] " Jack Hill
2022-08-01 10:54 ` Maxime Devos
2022-08-01 15:39 ` Maxim Cournoyer
2022-08-01 22:00 ` Maxime Devos
2022-08-05 12:51 ` Maxime Devos
2022-08-06 4:56 ` Maxim Cournoyer
2022-08-06 19:15 ` Maxime Devos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220725230803.10002-23-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=56771@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.