[arch-commits] Commit in qca/trunk (PKGBUILD qca-botan2.patch)

[Antonio Rojas]

    Date: Saturday, April 7, 2018 @ 01:26:36
  Author: arojas
Revision: 321291

Fix botan plugin build with Qt4

Modified:
  qca/trunk/PKGBUILD
  qca/trunk/qca-botan2.patch

------------------+
 PKGBUILD         |    9 ++++-----
 qca-botan2.patch |   19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-07 00:07:50 UTC (rev 321290)
+++ PKGBUILD	2018-04-07 01:26:36 UTC (rev 321291)
@@ -6,7 +6,7 @@
 pkgbase=qca
 pkgname=(qca-qt4 qca-qt5)
 pkgver=2.1.3
-pkgrel=8
+pkgrel=9
 pkgdesc="Qt Cryptographic Architecture"
 arch=(x86_64)
 url="http://delta.affinix.com/qca/"
@@ -15,7 +15,7 @@
 source=("http://download.kde.org/stable/$pkgbase/$pkgver/src/$pkgbase-$pkgver.tar.xz" qca-openssl-1.1.patch qca-botan2.patch)
 sha256sums=('003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353'
             'b1505bc313fd2f4e350cd4c94af69256c901afa419ae6700b208cb6e40e6926d'
-            '33369553e41ccfbd8b304cfb3e887ae8df56b0e1b3eec88cc32ddb07f98f6a4c')
+            '4fc5c0179367837ed73bd09aeb5b0aee74385a7aa6ebd99008de916ba02ef0ed')
 
 prepare() {
   mkdir -p build{4,5}
@@ -32,8 +32,7 @@
     -DBUILD_TESTS=OFF \
     -DQCA_LIBRARY_INSTALL_DIR=/usr/lib \
     -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features/ \
-    -DQT4_BUILD=ON \
-    -DWITH_botan_PLUGIN=OFF
+    -DQT4_BUILD=ON
   make
 
   cd ../build5
@@ -47,7 +46,7 @@
 
 package_qca-qt4() {
   depends=(qt4 nss)
-  optdepends=('pkcs11-helper: PKCS-11 plugin')
+  optdepends=('pkcs11-helper: PKCS-11 plugin' 'botan: botan plugin')
   conflicts=(qca qca-gnupg qca-ossl)
   provides=(qca qca-gnupg qca-ossl)
   replaces=(qca qca-gnupg qca-ossl)

Modified: qca-botan2.patch
===================================================================
--- qca-botan2.patch	2018-04-07 00:07:50 UTC (rev 321290)
+++ qca-botan2.patch	2018-04-07 01:26:36 UTC (rev 321291)
@@ -1,3 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7ef32ee..28b0169 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -131,8 +131,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wcast-align")
+      endif()
+ 
+-     set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+-     set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
++     set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
++     set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
+    endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ 
 diff --git a/cmake/modules/FindBotan.cmake b/cmake/modules/FindBotan.cmake
 index 0c4e24b..ce92df5 100644
 --- a/cmake/modules/FindBotan.cmake
@@ -36,7 +51,7 @@
  if (BOTAN_FOUND)
     if (NOT Botan_FIND_QUIETLY)
 diff --git a/plugins/qca-botan/qca-botan.cpp b/plugins/qca-botan/qca-botan.cpp
-index f387575..92820a0 100644
+index f387575..8822ab5 100644
 --- a/plugins/qca-botan/qca-botan.cpp
 +++ b/plugins/qca-botan/qca-botan.cpp
 @@ -23,13 +23,18 @@
@@ -178,7 +193,7 @@
 +	if(const std::unique_ptr<Botan::BlockCipher> bc = Botan::BlockCipher::create(m_algoName))
 +	    return bc->block_size();
 +        
-+        throw Botan::Algorithm_Not_Found(m_algoName);
++	throw Botan::Algorithm_Not_Found(m_algoName);
 +#endif
      }