gnu: kdsoap: Enable QT6 as default.

* gnu/packages/qt.scm (kdsoap)[inputs]: Remove qtbase-5.
[arguments]: Set #:qtbase to qtbase.
<#:configure-flags>: Add "-DKDSoap_QT6=true".
* gnu/packages/qt.scm (kdsoap-qt6): deprecated it.
* gnu/packages/kde-utils.scm (smb4k): Adjust inputs.
* gnu/packages/kde.scm (kdsoap-ws-discovery-client): Adjust inputs.
(kio-extras): Adjust inputs.

Change-Id: If3a6823b3081bb994ec981603cead02728f427da
This commit is contained in:
Zheng Junjie 2025-05-29 17:34:13 +08:00
parent 82d0ad2554
commit d3334af395
No known key found for this signature in database
GPG key ID: 3B5AA993E1A2DFF0
3 changed files with 10 additions and 14 deletions

View file

@ -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

View file

@ -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

View file

@ -28,7 +28,7 @@
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2022 Yash Tiwari <yasht@mailbox.org>
;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com>
;;; Copyright © 2022, 2024 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2022, 2024, 2025 Zheng Junjie <z572@z572.online>
;;; Copyright © 2023 Herman Rimm <herman@rimm.ee>
;;; Copyright © 2023 Simon South <simon@simonsouth.net>
;;; Copyright © 2024 Foundation Devices, Inc. <hello@foundation.xyz>
@ -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