z572 pushed a commit to branch qt-team
in repository guix.
commit 4fb8da2f16f0dc854f8b16fbb478db9e8bc57302
Author: Zheng Junjie <z572@z572.online>
AuthorDate: Mon May 5 20:21:21 2025 +0800
gnu: kdsoap: Update to 2.2.0-0.46b89ee.
* gnu/packages/qt.scm (kdsoap)[source]: Switch to git-fetch.
[inputs]: Remove it.
[arguments]: Set #:qtbase to qtbase.
* gnu/packages/qt.scm (kdsoap-qt6): Remove it.
* gnu/packages/kde-utils.scm (smb4k): Replace kdsoap-qt6 ot kdsoap.
* gnu/packages/kde.scm (kdsoap-ws-discovery-client, kio-extras): Replace
kdsoap-qt6 ot kdsoap.
Change-Id: I926c9d6c77c4e3d1b8d152a0b20a7b5076755261
---
gnu/packages/kde-utils.scm | 2 +-
gnu/packages/kde.scm | 4 +--
gnu/packages/qt.scm | 67 +++++++++++++++++++++-------------------------
3 files changed, 34 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 874ed365c4..f098134260 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 6565106c93..8239e210f7 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -716,7 +716,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
@@ -763,7 +763,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 c7beaa9e12..44c21ebdb1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5751,44 +5751,39 @@ policy applications.")
license:expat)))) ; everything else
(define-public kdsoap
- (package
- (name "kdsoap")
- (version "2.2.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/KDAB/KDSoap/releases/download/";
- "kdsoap-" version "/kdsoap-" version ".tar.gz"))
- (sha256
- (base32
- "0mpkg9iyvzb6mxvhbi6zc052ids2r2nzpmjbljgpq6a2hja13vyr"))))
- (build-system qt-build-system)
- (inputs (list qtbase-5))
- (arguments
- (list #:configure-flags #~(list "-DKDSoap_TESTS=true")
- #:phases
- #~(modify-phases %standard-phases
- (replace 'check
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (invoke "ctest" "-E" ;; These tests try connect to the
internet.
-
"(kdsoap-test_webcalls|kdsoap-test_webcalls_wsdl|kdsoap-test_calc)")))))))
- (home-page "https://www.kdab.com/development-resources/qt-tools/kd-soap/";)
- (synopsis "Qt SOAP component")
- (description "KD SOAP is a tool for creating client applications for web
+ (let ((commit "46b89eee08fe4a608e243e619f48d02cb991e5d6")
+ (revision "0"))
+ (package
+ (name "kdsoap")
+ (version (git-version "2.2.0" revision commit ))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/KDAB/KDSoap";)
+ (commit commit)
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1f8ry0i0nf2pq6f3a5nkxd1a3vfhkn87yqk2jjq9wh98xxqs6jwg"))))
+ (build-system qt-build-system)
+ (arguments
+ (list #:qtbase qtbase
+ #:configure-flags #~(list "-DKDSoap_TESTS=true")
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (invoke "ctest" "-E" ;; These tests try connect to the
internet.
+
"(kdsoap-test_webcalls|kdsoap-test_webcalls_wsdl|kdsoap-test_calc)")))))))
+ (home-page
"https://www.kdab.com/development-resources/qt-tools/kd-soap/";)
+ (synopsis "Qt SOAP component")
+ (description "KD SOAP is a tool for creating client applications for web
services using the XML based SOAP protocol and without the need for a dedicated
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)))))
+ (license (list license:gpl2 license:gpl3)))))
(define-public libaccounts-qt
(package
