From: Luciogi <Luciogi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] KDSoap renamed KDSoap-qt5, new package: KDSoap-qt6, update to 2.2.0
Date: Sat, 27 Apr 2024 10:48:48 +0200 [thread overview]
Message-ID: <20240427084848.21E3721D58@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-49243@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 732 bytes --]
There is an updated pull request by Luciogi against master on the void-packages repository
https://github.com/Luciogi/void-packages KDSoap
https://github.com/void-linux/void-packages/pull/49243
KDSoap renamed KDSoap-qt5, new package: KDSoap-qt6, update to 2.2.0
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-GLIBC)
A patch file from https://github.com/void-linux/void-packages/pull/49243.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-KDSoap-49243.patch --]
[-- Type: text/x-diff, Size: 7215 bytes --]
From c5dfb04b33f3b37d8cd867ab2ed895f15762032b Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Tue, 12 Mar 2024 10:42:13 +0500
Subject: [PATCH 1/3] 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 <me@johnnynator.dev>"
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 a25cd3f377a375135cfac1732c0e168c76cd42cb Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Tue, 12 Mar 2024 10:55:45 +0500
Subject: [PATCH 2/3] New package: KDSoap-qt6-2.2.0
---
common/shlibs | 2 ++
srcpkgs/KDSoap-qt6-devel | 1 +
srcpkgs/KDSoap-qt6/template | 32 ++++++++++++++++++++++++++++++++
srcpkgs/KDSoap-qt6/update | 1 +
4 files changed, 36 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..49fe3406701fa1
--- /dev/null
+++ b/srcpkgs/KDSoap-qt6/template
@@ -0,0 +1,32 @@
+# 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 <lucigithubcommit@skiff.com>"
+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
+
+KDSoap-qt6-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ if [[ ! $XBPS_MACHINE == "arm" ]]; then
+ vmove usr/lib/qt6/mkspecs
+ fi
+ 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%-*}
From bd9f9a3071c8e75ef8e189ba8f12b1a3d6338f4e Mon Sep 17 00:00:00 2001
From: Luciogi <lucigithubcommit@skiff.com>
Date: Sat, 27 Apr 2024 13:30:23 +0500
Subject: [PATCH 3/3] fix arm
---
srcpkgs/KDSoap-qt6/template | 3 ---
1 file changed, 3 deletions(-)
diff --git a/srcpkgs/KDSoap-qt6/template b/srcpkgs/KDSoap-qt6/template
index 49fe3406701fa1..d541d26a21cc16 100644
--- a/srcpkgs/KDSoap-qt6/template
+++ b/srcpkgs/KDSoap-qt6/template
@@ -24,9 +24,6 @@ KDSoap-qt6-devel_package() {
vmove usr/include
vmove usr/lib/cmake
vmove "usr/lib/*.so"
- if [[ ! $XBPS_MACHINE == "arm" ]]; then
- vmove usr/lib/qt6/mkspecs
- fi
vmove usr/bin/kdwsdl2cpp-qt6
}
}
next prev parent reply other threads:[~2024-04-27 8:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-12 6:06 [PR PATCH] " Luciogi
2024-03-12 6:23 ` [PR PATCH] [Updated] " Luciogi
2024-03-12 6:53 ` Luciogi
2024-03-12 6:56 ` Luciogi
2024-03-12 8:36 ` Luciogi
2024-04-27 8:34 ` Luciogi
2024-04-27 8:48 ` Luciogi [this message]
2024-04-27 9:23 ` Luciogi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240427084848.21E3721D58@inbox.vuxu.org \
--to=luciogi@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).