From 0da9a7ee626adabe352a7dbb600db3ec3afca816 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 8 Feb 2025 13:07:21 +0800 Subject: [PATCH] gnu: qtgamepad: Rename to qtgamepad-5. * gnu/packages/qt.scm (qtgamepad): Rename to qtgamepad-5. * gnu/packages/engineering.scm (openscad) [inputs]: Adjust accordingly. * gnu/packages/kde-utils.scm (kirogi) [inputs]: Likewise. * gnu/packages/radio.scm (sdrangel) [inputs]: Likewise. (wfview) [inputs]: Likewise. Change-Id: Icccd75150aefb957ef2b3c8b3453365e81bdfa9d Signed-off-by: Zheng Junjie --- gnu/packages/engineering.scm | 2 +- gnu/packages/kde-utils.scm | 2 +- gnu/packages/qt.scm | 2 +- gnu/packages/radio.scm | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index c82dd6e7fdd..a0c0bbec689 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3360,7 +3360,7 @@ ontinuous-time and discret-time expressions.") python-pillow qscintilla qtbase-5 - qtgamepad + qtgamepad-5 qtmultimedia-5 qtsvg-5 qtwayland-5 diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index c2fa6a6cdea..bc79975bef8 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -732,7 +732,7 @@ with support for QR scanning.") qtquickcontrols2-5 qtgraphicaleffects qtdeclarative-5 - qtgamepad + qtgamepad-5 qtlocation-5)) (propagated-inputs (list gstreamer)) (home-page "https://apps.kde.org/kirogi/") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f4e8970faf0..0f2163f42ad 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2722,7 +2722,7 @@ components. The API consists of over 20 effects provided as separate QML types. The effects cover functional areas such as blending, masking, blurring, coloring, and many more."))) -(define-public qtgamepad +(define-public qtgamepad-5 (package (inherit qtsvg-5) (name "qtgamepad") diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 024aa719862..5e05dd1bcf4 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2983,7 +2983,7 @@ voice formats.") qtbase-5 qtcharts-5 qtdeclarative-5 - qtgamepad + qtgamepad-5 qtgraphicaleffects qtlocation-5 qtmultimedia-5 @@ -3178,9 +3178,7 @@ software-defined radio receivers.") portaudio pulseaudio qcustomplot - ;; TODO: Needs to be renamed to qtgamepad-5 when version 6 is - ;; packed. - qtgamepad + qtgamepad-5 qtbase-5 qtmultimedia-5 qtserialport-5