diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 994597571c4..f2ca6ec6afb 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -1265,7 +1265,7 @@ remind you to take a break now and then.") kcrash kdbusaddons kdnssd - kdsoap-qt6 + kdsoap kdsoap-ws-discovery-client ki18n kiconthemes diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index fc21b296593..58fdb106c89 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -727,7 +727,7 @@ illustrate project schedules.") (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) - (inputs (list kdsoap-qt6)) + (inputs (list kdsoap)) (arguments (list ;; test require network. #:tests? #f @@ -788,7 +788,7 @@ KDSoap.") kcoreaddons kdnssd kdbusaddons - kdsoap-qt6 + kdsoap kdsoap-ws-discovery-client kguiaddons ktextwidgets diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 68ecdeb23da..be008f7b61b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 Yash Tiwari ;;; Copyright © 2023 Sharlatan Hellseher -;;; Copyright © 2022, 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022, 2024, 2025 Zheng Junjie ;;; Copyright © 2023 Herman Rimm ;;; Copyright © 2023 Simon South ;;; Copyright © 2024 Foundation Devices, Inc. @@ -5713,9 +5713,12 @@ policy applications.") (base32 "0mpkg9iyvzb6mxvhbi6zc052ids2r2nzpmjbljgpq6a2hja13vyr")))) (build-system qt-build-system) - (inputs (list qtbase-5)) (arguments - (list #:configure-flags #~(list "-DKDSoap_TESTS=true") + (list #:qtbase qtbase + #:configure-flags + #~(list "-DKDSoap_TESTS=true" + ;; remove when next version release. + "-DKDSoap_QT6=true") #:phases #~(modify-phases %standard-phases (replace 'check @@ -5731,14 +5734,7 @@ web server.") (license (list license:gpl2 license:gpl3)))) (define-public kdsoap-qt6 - (package - (inherit kdsoap) - (name "kdsoap-qt6") - (arguments (substitute-keyword-arguments (package-arguments kdsoap) - ((#:configure-flags flags #~(list)) - #~(cons "-DKDSoap_QT6=true" #$flags)))) - (inputs (modify-inputs (package-inputs kdsoap) - (replace "qtbase" qtbase))))) + (deprecated-package "kdsoap-qt6" kdsoap)) (define-public libaccounts-qt (package