diff --git a/recipes-kdab/kdsoap/kdsoap-native.bb b/recipes-kdab/kdsoap/kdsoap-native.bb new file mode 100644 index 00000000..268cda39 --- /dev/null +++ b/recipes-kdab/kdsoap/kdsoap-native.bb @@ -0,0 +1,5 @@ +require ${BPN}.inc + +inherit native + +SRC_URI += "file://0001-Just-build-bare-kdwsdl2cpp-for-native.patch" diff --git a/recipes-kdab/kdsoap/kdsoap.bb b/recipes-kdab/kdsoap/kdsoap.bb new file mode 100644 index 00000000..702e5bf9 --- /dev/null +++ b/recipes-kdab/kdsoap/kdsoap.bb @@ -0,0 +1,10 @@ +require ${BPN}.inc + +DEPENDS += " \ + ${BPN}-native \ + qtbase \ +" + +SRC_URI += "file://0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch" + +FILES_${PN}-dev += "${datadir}/mkspecs" diff --git a/recipes-kdab/kdsoap/kdsoap.inc b/recipes-kdab/kdsoap/kdsoap.inc new file mode 100644 index 00000000..2f981d77 --- /dev/null +++ b/recipes-kdab/kdsoap/kdsoap.inc @@ -0,0 +1,15 @@ +SUMMARY = "A Qt-based client-side and server-side SOAP component" +LICENSE = "(GPLv2 & LGPLv2.1 & AGPL-3.0) | KDAB-Commercial" +LIC_FILES_CHKSUM = " \ + file://LICENSE.GPL.txt;md5=63e3028b49eac8f84ab29661f079f159 \ + file://LICENSE.LGPL.txt;md5=ce198ec102c2f0b1d13f26967a934670 \ + file://LICENSE.AGPL3-modified.txt;md5=6b6dcd83ea786a77851d959c2797f78c \ + file://LICENSE.txt;md5=a0def7eadd11e7a9916a16e5d8bc1a82 \ +" + +inherit cmake_qt5 + +SRC_URI = "git://github.com/KDAB/KDSoap.git;protocol=https" +SRCREV = "fb0e905e242c2044fd25683a406eb6d369db052f" +S = "${WORKDIR}/git" +PV = "1.9.0" diff --git a/recipes-kdab/kdsoap/kdsoap/0001-Just-build-bare-kdwsdl2cpp-for-native.patch b/recipes-kdab/kdsoap/kdsoap/0001-Just-build-bare-kdwsdl2cpp-for-native.patch new file mode 100644 index 00000000..0cbaf81a --- /dev/null +++ b/recipes-kdab/kdsoap/kdsoap/0001-Just-build-bare-kdwsdl2cpp-for-native.patch @@ -0,0 +1,117 @@ +From 4c0ea920ab34615d3cf83ef018c8485e3c07fa4f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 22 May 2020 09:56:41 +0200 +Subject: [PATCH] Just build bare kdwsdl2cpp for native +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 4 ++-- + kdwsdl2cpp/common/fileprovider.cpp | 2 +- + kdwsdl2cpp/src/main.cpp | 6 +++--- + kdwsdl2cpp/src/settings.cpp | 2 +- + kdwsdl2cpp/src/settings.h | 4 ++-- + 5 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index addbafe2..596425e4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,9 +190,9 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) + ) + endif() + +-add_subdirectory(src) ++#add_subdirectory(src) + add_subdirectory(kdwsdl2cpp) +-if(${PROJECT_NAME}_IS_ROOT_PROJECT) ++if(false) + + export(TARGETS kdsoap kdsoap-server kdwsdl2cpp NAMESPACE KDSoap:: + FILE "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapTargets.cmake" +diff --git a/kdwsdl2cpp/common/fileprovider.cpp b/kdwsdl2cpp/common/fileprovider.cpp +index 1f23554d..45124850 100644 +--- a/kdwsdl2cpp/common/fileprovider.cpp ++++ b/kdwsdl2cpp/common/fileprovider.cpp +@@ -106,7 +106,7 @@ bool FileProvider::get( const QUrl &url, QString &target ) + + QNetworkAccessManager manager; + QNetworkRequest request(url); +-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) ++#if FALSE + if (Settings::self()->certificateLoaded()) { + QSslConfiguration sslConfig = request.sslConfiguration(); + sslConfig.setPrivateKey(Settings::self()->sslKey()); +diff --git a/kdwsdl2cpp/src/main.cpp b/kdwsdl2cpp/src/main.cpp +index 8905b6dc..8ac65f9e 100644 +--- a/kdwsdl2cpp/src/main.cpp ++++ b/kdwsdl2cpp/src/main.cpp +@@ -67,7 +67,7 @@ static void showHelp(const char *appName) + " use of the import-path option\n" + " -help-on-missing When groups or basic types could not be found, display\n" + " available types (helps with wrong namespaces)\n" +-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) ++#if FALSE + " -pkcs12file Load a certificate from a PKCS12 file. You can use this option\n" + " if the WSDL file (or files refering to it) is served from a \n" + " location which require certificate based authentication\n" +@@ -217,7 +217,7 @@ int main(int argc, char **argv) + useLocalFilesOnly = true; + } else if (opt == QLatin1String("-help-on-missing")) { + helpOnMissing = true; +-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) ++#if FALSE + } else if (opt == QLatin1String("-pkcs12file")) { + ++arg; + if (!argv[arg]) { +@@ -288,7 +288,7 @@ int main(int argc, char **argv) + Settings::self()->setHelpOnMissing(helpOnMissing); + + KWSDL::Compiler compiler; +-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) ++#if FALSE + if (!pkcs12File.isEmpty()) { + if (!Settings::self()->loadCertificate(pkcs12File, pkcs12Password)) + return -1; +diff --git a/kdwsdl2cpp/src/settings.cpp b/kdwsdl2cpp/src/settings.cpp +index 2e25e01a..db7b8aab 100644 +--- a/kdwsdl2cpp/src/settings.cpp ++++ b/kdwsdl2cpp/src/settings.cpp +@@ -252,7 +252,7 @@ bool Settings::helpOnMissing() const + return mHelpOnMissing; + } + +-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) ++#if FALSE + bool Settings::loadCertificate(const QString &certPath, const QString & password) + { + QFile certFile(certPath); +diff --git a/kdwsdl2cpp/src/settings.h b/kdwsdl2cpp/src/settings.h +index c5ca846f..f177ea77 100644 +--- a/kdwsdl2cpp/src/settings.h ++++ b/kdwsdl2cpp/src/settings.h +@@ -87,7 +87,7 @@ public: + bool helpOnMissing() const; + void setHelpOnMissing(bool b); + +-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) ++#if FALSE + bool loadCertificate(const QString & certPath, const QString &password = QString()); + bool certificateLoaded() const; + QSslKey sslKey() const; +@@ -115,7 +115,7 @@ private: + bool mKeepUnusedTypes; + bool mUseLocalFilesOnly; + bool mHelpOnMissing; +-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0) ++#if FALSE + QSslKey mSslKey; + QSslCertificate mCertificate; + QList mCaCertificates; +-- +2.21.1 + diff --git a/recipes-kdab/kdsoap/kdsoap/0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch b/recipes-kdab/kdsoap/kdsoap/0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch new file mode 100644 index 00000000..caef4780 --- /dev/null +++ b/recipes-kdab/kdsoap/kdsoap/0002-Do-not-export-kdwsdl2cpp-as-target-it-will-fin-it-s-.patch @@ -0,0 +1,46 @@ +From 1d666d5c6ea5e3b1633c6692572f480e86531a37 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 24 May 2020 00:27:46 +0200 +Subject: [PATCH] Do not export kdwsdl2cpp as target - it will fin it's way + into cross sysroot +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 2 +- + kdwsdl2cpp/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index addbafe2..3558dd48 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -194,7 +194,7 @@ add_subdirectory(src) + add_subdirectory(kdwsdl2cpp) + if(${PROJECT_NAME}_IS_ROOT_PROJECT) + +- export(TARGETS kdsoap kdsoap-server kdwsdl2cpp NAMESPACE KDSoap:: ++ export(TARGETS kdsoap kdsoap-server NAMESPACE KDSoap:: + FILE "${CMAKE_CURRENT_BINARY_DIR}/KDSoap/KDSoapTargets.cmake" + ) + +diff --git a/kdwsdl2cpp/CMakeLists.txt b/kdwsdl2cpp/CMakeLists.txt +index 82418be3..61c46688 100644 +--- a/kdwsdl2cpp/CMakeLists.txt ++++ b/kdwsdl2cpp/CMakeLists.txt +@@ -72,7 +72,7 @@ target_link_libraries(kdwsdl2cpp_lib ${QT_LIBRARIES}) + add_executable(kdwsdl2cpp ${SOURCES_EXE}) + target_link_libraries(kdwsdl2cpp kdwsdl2cpp_lib ${QT_LIBRARIES}) + +-install(TARGETS kdwsdl2cpp EXPORT "KDSoapTargets" ++install(TARGETS kdwsdl2cpp + RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR} + BUNDLE DESTINATION . + ) +-- +2.21.1 +