From c5dfb04b33f3b37d8cd867ab2ed895f15762032b Mon Sep 17 00:00:00 2001 From: Luciogi Date: Tue, 12 Mar 2024 10:42:13 +0500 Subject: [PATCH 1/2] KDSoap-qt5: update to 2.2.0, replaces KDSoap --- common/shlibs | 4 ++-- srcpkgs/KDSoap | 1 + srcpkgs/KDSoap-devel | 2 +- srcpkgs/KDSoap-qt5-devel | 1 + srcpkgs/{KDSoap => KDSoap-qt5}/template | 26 ++++++++++++++++++------- srcpkgs/KDSoap-qt5/update | 1 + 6 files changed, 25 insertions(+), 10 deletions(-) create mode 120000 srcpkgs/KDSoap create mode 120000 srcpkgs/KDSoap-qt5-devel rename srcpkgs/{KDSoap => KDSoap-qt5}/template (53%) create mode 100644 srcpkgs/KDSoap-qt5/update diff --git a/common/shlibs b/common/shlibs index d4f0da0bbba726..dc3ebb69f20dcc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3872,8 +3872,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.so.2 KDSoap-qt5-2.2.0_1 +libkdsoap-server.so.2 KDSoap-qt5-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 b/srcpkgs/KDSoap new file mode 120000 index 00000000000000..ee53f7b3d43102 --- /dev/null +++ b/srcpkgs/KDSoap @@ -0,0 +1 @@ +KDSoap-qt5 \ No newline at end of file diff --git a/srcpkgs/KDSoap-devel b/srcpkgs/KDSoap-devel index 4f36680df944df..ee53f7b3d43102 120000 --- a/srcpkgs/KDSoap-devel +++ b/srcpkgs/KDSoap-devel @@ -1 +1 @@ -KDSoap \ No newline at end of file +KDSoap-qt5 \ No newline at end of file diff --git a/srcpkgs/KDSoap-qt5-devel b/srcpkgs/KDSoap-qt5-devel new file mode 120000 index 00000000000000..ee53f7b3d43102 --- /dev/null +++ b/srcpkgs/KDSoap-qt5-devel @@ -0,0 +1 @@ +KDSoap-qt5 \ No newline at end of file diff --git a/srcpkgs/KDSoap/template b/srcpkgs/KDSoap-qt5/template similarity index 53% rename from srcpkgs/KDSoap/template rename to srcpkgs/KDSoap-qt5/template index 1d548327073c5f..b52c17a2ddc2e2 100644 --- a/srcpkgs/KDSoap/template +++ b/srcpkgs/KDSoap-qt5/template @@ -1,22 +1,22 @@ -# Template file for 'KDSoap' -pkgname=KDSoap -version=2.0.0 +# Template file for 'KDSoap-qt5' +pkgname=KDSoap-qt5 +version=2.2.0 revision=1 build_style=cmake hostmakedepends="qt5-qmake qt5-host-tools" makedepends="qt5-devel" -short_desc="Qt-based client-side and server-side SOAP component" +short_desc="Qt-based client-side and server-side SOAP component - Qt5" 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-qt5-devel" fi -KDSoap-devel_package() { +KDSoap-qt5-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { @@ -27,3 +27,15 @@ KDSoap-devel_package() { vmove usr/share/mkspecs } } + +KDSoap_package() { + build_style=meta + short_desc+=" - (Dummy transitional package)" + depends="${sourcepkg}-${version}_${revision}" +} + +KDSoap-devel_package() { + build_style=meta + short_desc+=" - (Dummy transitional package)" + depends="${sourcepkg}-devel-${version}_${revision}" +} diff --git a/srcpkgs/KDSoap-qt5/update b/srcpkgs/KDSoap-qt5/update new file mode 100644 index 00000000000000..45bccdf8f38875 --- /dev/null +++ b/srcpkgs/KDSoap-qt5/update @@ -0,0 +1 @@ +pkgname=${pkgname%-*} From 7e4d4956bca698e5581b527ad112eb80b9609d56 Mon Sep 17 00:00:00 2001 From: Luciogi Date: Tue, 12 Mar 2024 10:55:45 +0500 Subject: [PATCH 2/2] New package: KDSoap-qt6-2.2.0 --- common/shlibs | 2 ++ srcpkgs/KDSoap-qt6-devel | 1 + srcpkgs/KDSoap-qt6/template | 36 ++++++++++++++++++++++++++++++++++++ srcpkgs/KDSoap-qt6/update | 1 + 4 files changed, 40 insertions(+) create mode 120000 srcpkgs/KDSoap-qt6-devel create mode 100644 srcpkgs/KDSoap-qt6/template create mode 100644 srcpkgs/KDSoap-qt6/update diff --git a/common/shlibs b/common/shlibs index dc3ebb69f20dcc..c74f78dbf5bedf 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3874,6 +3874,8 @@ libtagparser.so.12 tagparser-12.0.0_1 libqtutilities.so.6 qtutilities-6.0.4_1 libkdsoap.so.2 KDSoap-qt5-2.2.0_1 libkdsoap-server.so.2 KDSoap-qt5-2.2.0_1 +libkdsoap-qt6.so.2 KDSoap-qt6-2.2.0_1 +libkdsoap-server-qt6.so.2 KDSoap-qt6-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-qt6-devel b/srcpkgs/KDSoap-qt6-devel new file mode 120000 index 00000000000000..50b53068baf31d --- /dev/null +++ b/srcpkgs/KDSoap-qt6-devel @@ -0,0 +1 @@ +KDSoap-qt6 \ No newline at end of file diff --git a/srcpkgs/KDSoap-qt6/template b/srcpkgs/KDSoap-qt6/template new file mode 100644 index 00000000000000..7706cce3d2efee --- /dev/null +++ b/srcpkgs/KDSoap-qt6/template @@ -0,0 +1,36 @@ +# Template file for 'KDSoap-qt6' +pkgname=KDSoap-qt6 +version=2.2.0 +revision=1 +build_style=cmake +configure_args="-DKDSoap_QT6=ON" +hostmakedepends="qt6-base qt6-tools" +makedepends="qt6-base-devel" +short_desc="Qt-based client-side and server-side SOAP component - Qt6" +maintainer="Luciogi " +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=d9ef11948442197c9fa44bd6fbadc842b7280a60dfc40577af66fded637af356 + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" KDSoap-qt5-devel" +fi + +post_install() { + if [[ $XBPS_TARGET_MACHINE == "arm"* ]]; then + mv -v ${DESTDIR}/usr/lib64/qt6 ${DESTDIR}/usr/lib/ + fi +} + +KDSoap-qt6-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/cmake + vmove usr/lib/qt6/mkspecs + vmove "usr/lib/*.so" + vmove usr/bin/kdwsdl2cpp-qt6 + } +} diff --git a/srcpkgs/KDSoap-qt6/update b/srcpkgs/KDSoap-qt6/update new file mode 100644 index 00000000000000..45bccdf8f38875 --- /dev/null +++ b/srcpkgs/KDSoap-qt6/update @@ -0,0 +1 @@ +pkgname=${pkgname%-*}