From 4d199390739a714cf96abf3477cf84092ae1948a Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Thu, 3 Nov 2022 09:45:25 +0100
Subject: [PATCH] Update QCA to 2.3.5 and enable Qt6 building

---
 recipes-support/qca.inc                        | 7 +++++--
 recipes-support/{qca_2.3.4.bb => qca_2.3.5.bb} | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename recipes-support/{qca_2.3.4.bb => qca_2.3.5.bb} (62%)

diff --git a/recipes-support/qca.inc b/recipes-support/qca.inc
index d5cb04c..50d55b9 100644
--- a/recipes-support/qca.inc
+++ b/recipes-support/qca.inc
@@ -14,6 +14,7 @@ DEPENDS = " \
     libgcrypt \
     nss \
     qtbase \
+    qt5compat \
 "
 
 SRC_URI = "git://invent.kde.org/libraries/${BPN};nobranch=1;protocol=https"
@@ -23,6 +24,8 @@ inherit qt6-cmake
 inherit pkgconfig
 
 EXTRA_OECMAKE += " \
+    -DQT_MAJOR_VERSION=6 \
+    -DBUILD_WITH_QT6=ON \
     -DQCA_FEATURE_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/features \
     -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
 "
@@ -35,10 +38,10 @@ do_install:prepend() {
 }
 
 FILES:${PN} += " \
-    ${libdir}/qca-qt5/crypto/libqca-*.so \
+    ${libdir}/qca-qt6/crypto/libqca-*.so \
 "
 
 FILES:${PN}-dev += " \
     ${libdir}/mkspecs/features/*  \
-    ${libdir}/cmake/Qca-qt5/*.cmake \
+    ${libdir}/cmake/qca-qt6/*.cmake \
 "
diff --git a/recipes-support/qca_2.3.4.bb b/recipes-support/qca_2.3.5.bb
similarity index 62%
rename from recipes-support/qca_2.3.4.bb
rename to recipes-support/qca_2.3.5.bb
index 6a97c11..090507e 100644
--- a/recipes-support/qca_2.3.4.bb
+++ b/recipes-support/qca_2.3.5.bb
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: CC0-1.0
 
 require ${BPN}.inc
-SRCREV = "c4c772094d78160464aaefa5208230436c9daa12"
+SRCREV = "7162739b07450957fc27fe9859b55e98bbd77f92"