From ad5073e81fd10317f7ef9d401c9a19887e08f614 Mon Sep 17 00:00:00 2001 From: jbu Date: Tue, 7 Jul 2015 09:42:27 +0200 Subject: [PATCH] qca-qt5: Fixes for Qt5-5.5.0 Since Qt5-5.5.0 it seems to be necessary to explicitly include if this class is used. Before this header may have been included as a side-effect by other Qt headers. --- srcpkgs/qca-qt5/patches/fix-qiodevice.patch | 34 +++++++++++++++++++++ srcpkgs/qca-qt5/template | 7 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/qca-qt5/patches/fix-qiodevice.patch diff --git a/srcpkgs/qca-qt5/patches/fix-qiodevice.patch b/srcpkgs/qca-qt5/patches/fix-qiodevice.patch new file mode 100644 index 0000000000..9d3d6db0f8 --- /dev/null +++ b/srcpkgs/qca-qt5/patches/fix-qiodevice.patch @@ -0,0 +1,34 @@ +Since Qt5-5.5.0 explicit include is required +if QIODevice is used in headers or source files. It seems +it was included as a side-effect by other header files before. + +--- src/qca_publickey.cpp 2014-11-06 09:15:45.000000000 +0100 ++++ src/qca_publickey.cpp 2015-07-07 09:26:59.819005743 +0200 +@@ -25,6 +25,7 @@ + + #include + #include ++#include + + namespace QCA { + +--- src/qca_keystore.cpp 2014-11-06 09:15:45.000000000 +0100 ++++ src/qca_keystore.cpp 2015-07-07 09:29:24.886016202 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include // abort + #include // fprintf +--- include/QtCrypto/qca_core.h 2014-11-06 09:15:45.000000000 +0100 ++++ include/QtCrypto/qca_core.h 2015-07-07 09:36:30.737046903 +0200 +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include "qca_export.h" + #include "qca_support.h" + #include "qca_tools.h" diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template index e6eadca5cd..af7b9d336b 100644 --- a/srcpkgs/qca-qt5/template +++ b/srcpkgs/qca-qt5/template @@ -1,7 +1,7 @@ # Template file for 'qca' pkgname=qca-qt5 version=2.1.0 -revision=2 +revision=3 wrksrc=${pkgname%-*}-${version} build_style=cmake configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca/mkspecs -DWITH_ossl_PLUGIN=yes" @@ -18,6 +18,11 @@ checksum=226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284 provides="qca-${version}_${revision}" replaces="qca>=0" +pre_configure() { + sed -e "s;-D_BSD_SOURCE;-D_DEFAULT_SOURCE;" \ + -i CMakeLists.txt +} + qca-qt5-ossl_package() { depends="${sourcepkg}-${version}_${revision}" short_desc+=" - QCA OSSL plugin"