* [PR PATCH] qca: update to 2.3.8, add qt6 version
@ 2024-03-02 14:40 Johnnynator
2024-03-02 15:49 ` [PR REVIEW] " classabbyamp
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Johnnynator @ 2024-03-02 14:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1315 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qca
https://github.com/void-linux/void-packages/pull/49029
qca: update to 2.3.8, add qt6 version
- **qca-qt5: update to 2.3.8.**
- **New package: qca-qt6-2.3.8**
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### 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**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qca-49029.patch --]
[-- Type: text/x-diff, Size: 3946 bytes --]
From 64cd32e8623fd594d7a03aecdf26af7fcc0573ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 2 Mar 2024 15:24:20 +0100
Subject: [PATCH 1/2] qca-qt5: update to 2.3.8.
---
srcpkgs/qca-qt5/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index ab3b25f9e36fb7..31728b8b3b7c17 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,19 +1,20 @@
# Template file for 'qca-qt5'
pkgname=qca-qt5
-version=2.3.7
-revision=2
+version=2.3.8
+revision=1
build_style=cmake
configure_args="-DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
-DUSE_RELATIVE_PATHS=true"
hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel
+ botan-devel"
depends="ca-certificates"
short_desc="Qt5 Cryptographic Architecture"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://userbase.kde.org/QCA"
distfiles="${KDE_SITE}/qca/${version}/qca-${version}.tar.xz"
-checksum=fee2343b54687d5be3e30fb33ce296ee50ac7ae5e23d7ab725f63ffdf7af3f43
+checksum=48759ca86a0202461d908ba66134380cc3bb7d20fed3c031b9fc0289796a8264
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-devel"
From 9781e0de61c10203bc0c7719ab68b8b9afdaa7cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 2 Mar 2024 15:35:25 +0100
Subject: [PATCH 2/2] New package: qca-qt6-2.3.8
---
common/shlibs | 1 +
srcpkgs/qca-qt6-devel | 1 +
srcpkgs/qca-qt6/template | 32 ++++++++++++++++++++++++++++++++
srcpkgs/qca-qt6/update | 1 +
4 files changed, 35 insertions(+)
create mode 120000 srcpkgs/qca-qt6-devel
create mode 100644 srcpkgs/qca-qt6/template
create mode 100644 srcpkgs/qca-qt6/update
diff --git a/common/shlibs b/common/shlibs
index 44c8b34a3482ea..9cf16d09a85586 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,6 +2226,7 @@ libclamunrar.so.9 clamav-0.103.1_2
libclamunrar_iface.so.9 clamav-0.103.1_2
libfreshclam.so.2 clamav-0.103.1_2
libqca-qt5.so.2 qca-qt5-2.1.3_1
+libqca-qt6.so.2 qca-qt6-2.3.8_1
libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
libphonon4qt5.so.4 phonon-qt5-4.8.3_1
libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
diff --git a/srcpkgs/qca-qt6-devel b/srcpkgs/qca-qt6-devel
new file mode 120000
index 00000000000000..9c331700fe0ff6
--- /dev/null
+++ b/srcpkgs/qca-qt6-devel
@@ -0,0 +1 @@
+qca-qt6
\ No newline at end of file
diff --git a/srcpkgs/qca-qt6/template b/srcpkgs/qca-qt6/template
new file mode 100644
index 00000000000000..f4f6a0507c3a5e
--- /dev/null
+++ b/srcpkgs/qca-qt6/template
@@ -0,0 +1,32 @@
+# Template file for 'qca-qt6'
+pkgname=qca-qt6
+version=2.3.8
+revision=1
+build_style=cmake
+configure_args="-DQT6=ON -DUSE_RELATIVE_PATHS=true"
+hostmakedepends="pkg-config ca-certificates qt6-tools qt6-base"
+makedepends="nss-devel libgcrypt-devel ca-certificates openssl-devel
+ qt6-base-devel qt6-qt5compat-devel botan-devel"
+depends="ca-certificates"
+short_desc="Qt5 Cryptographic Architecture"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-2.1-or-later"
+homepage="https://userbase.kde.org/QCA"
+distfiles="${KDE_SITE}/qca/${version}/qca-${version}.tar.xz"
+checksum=48759ca86a0202461d908ba66134380cc3bb7d20fed3c031b9fc0289796a8264
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTS=1"
+else
+ configure_args+=" -DBUILD_TESTS=0"
+fi
+
+qca-qt6-devel_package() {
+ depends="qt6-base-devel ${sourcepkg}-${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/qca-qt6/update b/srcpkgs/qca-qt6/update
new file mode 100644
index 00000000000000..ea2d1e36bda238
--- /dev/null
+++ b/srcpkgs/qca-qt6/update
@@ -0,0 +1 @@
+pkgname=qca
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR REVIEW] qca: update to 2.3.8, add qt6 version
2024-03-02 14:40 [PR PATCH] qca: update to 2.3.8, add qt6 version Johnnynator
@ 2024-03-02 15:49 ` classabbyamp
2024-03-02 15:53 ` [PR PATCH] [Updated] " Johnnynator
2024-03-02 16:44 ` [PR PATCH] [Merged]: " Johnnynator
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2024-03-02 15:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 216 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/49029#discussion_r1509996017
Comment:
```suggestion
short_desc="Qt6 Cryptographic Architecture"
```
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] qca: update to 2.3.8, add qt6 version
2024-03-02 14:40 [PR PATCH] qca: update to 2.3.8, add qt6 version Johnnynator
2024-03-02 15:49 ` [PR REVIEW] " classabbyamp
@ 2024-03-02 15:53 ` Johnnynator
2024-03-02 16:44 ` [PR PATCH] [Merged]: " Johnnynator
2 siblings, 0 replies; 4+ messages in thread
From: Johnnynator @ 2024-03-02 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1320 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages qca
https://github.com/void-linux/void-packages/pull/49029
qca: update to 2.3.8, add qt6 version
- **qca-qt5: update to 2.3.8.**
- **New package: qca-qt6-2.3.8**
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### 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**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/49029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qca-49029.patch --]
[-- Type: text/x-diff, Size: 4829 bytes --]
From 64cd32e8623fd594d7a03aecdf26af7fcc0573ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 2 Mar 2024 15:24:20 +0100
Subject: [PATCH 1/2] qca-qt5: update to 2.3.8.
---
srcpkgs/qca-qt5/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template
index ab3b25f9e36fb7..31728b8b3b7c17 100644
--- a/srcpkgs/qca-qt5/template
+++ b/srcpkgs/qca-qt5/template
@@ -1,19 +1,20 @@
# Template file for 'qca-qt5'
pkgname=qca-qt5
-version=2.3.7
-revision=2
+version=2.3.8
+revision=1
build_style=cmake
configure_args="-DQCA_FEATURE_INSTALL_DIR=/usr/share/qca-qt5/mkspecs
-DUSE_RELATIVE_PATHS=true"
hostmakedepends="pkg-config ca-certificates"
-makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel"
+makedepends="nss-devel libgcrypt-devel qt5-devel ca-certificates openssl-devel
+ botan-devel"
depends="ca-certificates"
short_desc="Qt5 Cryptographic Architecture"
maintainer="John <me@johnnynator.dev>"
license="LGPL-2.1-or-later"
homepage="https://userbase.kde.org/QCA"
distfiles="${KDE_SITE}/qca/${version}/qca-${version}.tar.xz"
-checksum=fee2343b54687d5be3e30fb33ce296ee50ac7ae5e23d7ab725f63ffdf7af3f43
+checksum=48759ca86a0202461d908ba66134380cc3bb7d20fed3c031b9fc0289796a8264
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-host-tools qt5-devel"
From dc8eecffbf4e7ec9e0f63cd22b111fc27634c65f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 2 Mar 2024 15:35:25 +0100
Subject: [PATCH 2/2] New package: qca-qt6-2.3.8
---
common/shlibs | 1 +
srcpkgs/qca-qt6-devel | 1 +
srcpkgs/qca-qt6/patches/cross.patch | 12 +++++++++++
srcpkgs/qca-qt6/template | 32 +++++++++++++++++++++++++++++
srcpkgs/qca-qt6/update | 1 +
5 files changed, 47 insertions(+)
create mode 120000 srcpkgs/qca-qt6-devel
create mode 100644 srcpkgs/qca-qt6/patches/cross.patch
create mode 100644 srcpkgs/qca-qt6/template
create mode 100644 srcpkgs/qca-qt6/update
diff --git a/common/shlibs b/common/shlibs
index 44c8b34a3482ea..9cf16d09a85586 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2226,6 +2226,7 @@ libclamunrar.so.9 clamav-0.103.1_2
libclamunrar_iface.so.9 clamav-0.103.1_2
libfreshclam.so.2 clamav-0.103.1_2
libqca-qt5.so.2 qca-qt5-2.1.3_1
+libqca-qt6.so.2 qca-qt6-2.3.8_1
libqt5keychain.so.1 qtkeychain-qt5-0.7.0_1
libphonon4qt5.so.4 phonon-qt5-4.8.3_1
libphonon4qt5experimental.so.4 phonon-qt5-4.8.3_1
diff --git a/srcpkgs/qca-qt6-devel b/srcpkgs/qca-qt6-devel
new file mode 120000
index 00000000000000..9c331700fe0ff6
--- /dev/null
+++ b/srcpkgs/qca-qt6-devel
@@ -0,0 +1 @@
+qca-qt6
\ No newline at end of file
diff --git a/srcpkgs/qca-qt6/patches/cross.patch b/srcpkgs/qca-qt6/patches/cross.patch
new file mode 100644
index 00000000000000..ad3351ce3e16f2
--- /dev/null
+++ b/srcpkgs/qca-qt6/patches/cross.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt 2019-04-24 14:58:14.000000000 +0200
++++ b/CMakeLists.txt 2019-04-24 14:58:14.000000000 +0200
+@@ -264,7 +264,8 @@
+ QCA_LIBRARY_INSTALL_DIR
+ QCA_FEATURE_INSTALL_DIR
+ QCA_INCLUDE_INSTALL_DIR
+- QCA_PRIVATE_INCLUDE_INSTALL_DIR
++ QCA_FULL_INCLUDE_INSTALL_DIR
++ QCA_PRIVATE_INCLUDE_INSTALL_DIR
+ QCA_DOC_INSTALL_DIR
+ QCA_MAN_INSTALL_DIR
+ PKGCONFIG_INSTALL_PREFIX)
diff --git a/srcpkgs/qca-qt6/template b/srcpkgs/qca-qt6/template
new file mode 100644
index 00000000000000..3645ea91f8d657
--- /dev/null
+++ b/srcpkgs/qca-qt6/template
@@ -0,0 +1,32 @@
+# Template file for 'qca-qt6'
+pkgname=qca-qt6
+version=2.3.8
+revision=1
+build_style=cmake
+configure_args="-DQT6=ON -DUSE_RELATIVE_PATHS=true"
+hostmakedepends="pkg-config ca-certificates qt6-tools qt6-base"
+makedepends="nss-devel libgcrypt-devel ca-certificates openssl-devel
+ qt6-base-devel qt6-qt5compat-devel botan-devel"
+depends="ca-certificates"
+short_desc="Qt6 Cryptographic Architecture"
+maintainer="John <me@johnnynator.dev>"
+license="LGPL-2.1-or-later"
+homepage="https://userbase.kde.org/QCA"
+distfiles="${KDE_SITE}/qca/${version}/qca-${version}.tar.xz"
+checksum=48759ca86a0202461d908ba66134380cc3bb7d20fed3c031b9fc0289796a8264
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ configure_args+=" -DBUILD_TESTS=1"
+else
+ configure_args+=" -DBUILD_TESTS=0"
+fi
+
+qca-qt6-devel_package() {
+ depends="qt6-base-devel ${sourcepkg}-${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
+ }
+}
diff --git a/srcpkgs/qca-qt6/update b/srcpkgs/qca-qt6/update
new file mode 100644
index 00000000000000..ea2d1e36bda238
--- /dev/null
+++ b/srcpkgs/qca-qt6/update
@@ -0,0 +1 @@
+pkgname=qca
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: qca: update to 2.3.8, add qt6 version
2024-03-02 14:40 [PR PATCH] qca: update to 2.3.8, add qt6 version Johnnynator
2024-03-02 15:49 ` [PR REVIEW] " classabbyamp
2024-03-02 15:53 ` [PR PATCH] [Updated] " Johnnynator
@ 2024-03-02 16:44 ` Johnnynator
2 siblings, 0 replies; 4+ messages in thread
From: Johnnynator @ 2024-03-02 16:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1160 bytes --]
There's a merged pull request on the void-packages repository
qca: update to 2.3.8, add qt6 version
https://github.com/void-linux/void-packages/pull/49029
Description:
- **qca-qt5: update to 2.3.8.**
- **New package: qca-qt6-2.3.8**
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### 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**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-02 16:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-02 14:40 [PR PATCH] qca: update to 2.3.8, add qt6 version Johnnynator
2024-03-02 15:49 ` [PR REVIEW] " classabbyamp
2024-03-02 15:53 ` [PR PATCH] [Updated] " Johnnynator
2024-03-02 16:44 ` [PR PATCH] [Merged]: " Johnnynator
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).