From 4c16129359ee61bf12652801e72f7053a8d043d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 13 May 2024 06:55:18 +0700 Subject: [PATCH] KDSoap: update to 2.2.0. --- common/shlibs | 4 ++-- srcpkgs/KDSoap/template | 23 +++++++++++++++-------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/common/shlibs b/common/shlibs index a9be9b7c9c6..cf2749eaf61 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3986,8 +3986,8 @@ libstk-4.6.1.so libstk-4.6.1_1 libc++utilities.so.5 cpp-utilities-5.2.0_1 libtagparser.so.12 tagparser-12.0.0_1 libqtutilities.so.6 qtutilities-6.0.4_1 -libkdsoap.so.2 KDSoap-2.0.0_1 -libkdsoap-server.so.2 KDSoap-2.0.0_1 +libkdsoap-qt6.so.2 KDSoap-2.2.0_1 +libkdsoap-server-qt6.so.2 KDSoap-2.2.0_1 libstoken.so.1 stoken-0.92_1 libjpegxr.so.0 jxrlib-0.2.2_1 libjxrglue.so.0 jxrlib-0.2.2_1 diff --git a/srcpkgs/KDSoap/template b/srcpkgs/KDSoap/template index 1d548327073..6cabb39192e 100644 --- a/srcpkgs/KDSoap/template +++ b/srcpkgs/KDSoap/template @@ -1,29 +1,36 @@ # Template file for 'KDSoap' pkgname=KDSoap -version=2.0.0 +version=2.2.0 revision=1 build_style=cmake -hostmakedepends="qt5-qmake qt5-host-tools" -makedepends="qt5-devel" +configure_args="-DKDSoap_QT6=TRUE + -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt6/mkspecs/modules" +hostmakedepends="qt6-base" +makedepends="qt6-base-devel" short_desc="Qt-based client-side and server-side SOAP component" maintainer="John " license="GPL-3.0-or-later" homepage="https://www.kdab.com/development-resources/qt-tools/kd-soap/" distfiles="https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz" -checksum=d18963104fa6f7d02b044631cddbe78f18f70e06c607af680c7ace04d6cf04ee +checksum=d9ef11948442197c9fa44bd6fbadc842b7280a60dfc40577af66fded637af356 if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" KDSoap-devel" + hostmakedepends+=" KDSoap" + configure_args+=" -DKDSOAP_KDWSDL2CPP_COMPILER=/usr/bin/kdwsdl2cpp-qt6" fi +post_install() { + sed -i '/kdwsdl2cpp-qt6/s,[$]{_IMPORT_PREFIX},/usr,' \ + "$DESTDIR/usr/lib/cmake/KDSoap-qt6/"KDSoapTargets-*.cmake +} + KDSoap-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} ${makedepends}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/cmake - vmove usr/bin/kdwsdl2cpp vmove "usr/lib/*.so" - vmove usr/share/mkspecs + vmove usr/lib/qt6/mkspecs } }