diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/kde-internet.scm | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/kde-internet.scm')
| -rw-r--r-- | gnu/packages/kde-internet.scm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 617937002e..223e1aab7a 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -90,7 +90,7 @@ ("purpose" ,purpose) ("qca" ,qca) ("qoauth" ,qoauth) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtnetworkauth" ,qtnetworkauth) ("qtwebkit" ,qtwebkit) ("sonnet" ,sonnet))) @@ -162,7 +162,7 @@ Other notable features include: ("oxygen-icons" ,oxygen-icons) ; default icon set ("qca" ,qca) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) )) (home-page "http://www.kde.org/") (synopsis "Versatile and user-friendly download manager") @@ -213,7 +213,7 @@ This package is part of the KDE networking module.") ("kwindowsystem" ,kwindowsystem) ("oxygen-icons" ,oxygen-icons) ; default icon set ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qca" ,qca) ("solid" ,solid) ("sonnet" ,sonnet))) @@ -302,7 +302,7 @@ Features are: ("phonon" ,phonon) ("qca" ,qca) ("qgpgme" ,qgpgme) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("speex" ,speex) ("v4l-utils" ,v4l-utils) ;; TODO: Xmms @@ -358,7 +358,7 @@ This package is part of the KDE networking module.") ("libssh2" ,libssh) ;; TODO: libvnc{server,client} - is not tigervnc-{server,client} ("oxygen-icons" ,oxygen-icons) ; default icon set - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (home-page "https://kde.org/applications/internet/org.kde.krdc") (synopsis "Remote desktop client") (description "KRDC is a client application that allows you to view or even @@ -412,7 +412,7 @@ This package is part of the KDE networking module.") ;; TODO: LibKWorkspace -> plasma-workspace? ("oxygen-icons" ,oxygen-icons) ; default icon set ("phonon" ,phonon) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("qtwebkit" ,qtwebkit) ("solid" ,solid) @@ -447,7 +447,7 @@ a full-featured client for BitTorrent.") ("kpimcommon" ,kpimcommon) ("ktextwidgets" ,ktextwidgets) ("kwidgetsaddons" ,kwidgetsaddons) - ("qtbase" ,qtbase))) + ("qtbase" ,qtbase-5))) (arguments `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?) (home-page "https://invent.kde.org/pim/libgravatar") @@ -482,7 +482,7 @@ unnecessary network operations.") ("kio" ,kio) ("libgcrypt" ,libgcrypt) ("qca" ,qca) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("solid" ,solid))) (home-page "https://invent.kde.org/network/libktorrent") (synopsis "BitTorrent protocol library for C++ / Qt 5 / KDE Frameworks") |