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

[Antonio Rojas]

    Date: Monday, October 5, 2015 @ 21:54:30
  Author: arojas
Revision: 248377

Update to 2.1.1, merge Qt4 and Qt5 versions

Modified:
  qca/trunk/PKGBUILD
Deleted:
  qca/trunk/gcc47.patch

-------------+
 PKGBUILD    |   73 ++++++++++++++++++++++++++++++++++++++--------------------
 gcc47.patch |   17 -------------
 2 files changed, 49 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-05 19:35:08 UTC (rev 248376)
+++ PKGBUILD	2015-10-05 19:54:30 UTC (rev 248377)
@@ -1,37 +1,62 @@
 # $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
-pkgname=qca
-pkgver=2.0.3
-pkgrel=5
+pkgbase=qca
+pkgname=(qca-qt4 qca-qt5)
+pkgver=2.1.1
+pkgrel=1
 pkgdesc="Qt Cryptographic Architecture"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://delta.affinix.com/qca/"
-license=('LGPL')
-depends=('qt4' 'ca-certificates')
-source=("http://delta.affinix.com/download/${pkgname}/2.0/${pkgname}-${pkgver}.tar.bz2"
-        'gcc47.patch')
-md5sums=('fc15bd4da22b8096c51fcfe52d2fa309'
-         'dffc7367152d8888c1447253a0387a2a')
+license=(LGPL)
+makedepends=(qt4 qt5-base cmake doxygen nss pkcs11-helper)
+source=("http://download.kde.org/stable/$pkgbase/$pkgver/src/$pkgbase-$pkgver.tar.xz")
+md5sums=('657cc701316600199199a6b6cb2c73c9')
 
 prepare() {
-	cd ${pkgname}-${pkgver}
-	patch -p0 -i "${srcdir}"/gcc47.patch
+  mkdir -p build{4,5}
 }
 
 build() {
-	cd ${pkgname}-${pkgver}
-	./configure \
-		--prefix=/usr \
-		--disable-tests \
-		--certstore-path=/etc/ssl/certs/ca-certificates.crt \
-		--release \
-		--no-separate-debug-info
-	make
+  cd build4
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTS=OFF \
+    -DQCA_LIBRARY_INSTALL_DIR=/usr/lib \
+    -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features/ \
+    -DQT4_BUILD=ON
+  make
+
+  cd ../build5
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTS=OFF \
+    -DQCA_INSTALL_IN_QT_PREFIX=ON \
+    -DQCA_MAN_INSTALL_DIR=/usr/share/man
+  make  
 }
 
-package() {
-	cd ${pkgname}-${pkgver}
-	make INSTALL_ROOT="${pkgdir}" install
+package_qca-qt4() {
+  depends=(qt4 nss)
+  optdepends=('pkcs11-helper: PKCS-11 plugin')
+  conflicts=(qca qca-gnupg qca-ossl)
+  provides=(qca qca-gnupg qca-ossl)
+  replaces=(qca qca-gnupg qca-ossl)
+
+  cd build4
+  make DESTDIR="$pkgdir" install
 }
+
+package_qca-qt5() {
+  depends=(qt5-base nss)
+  optdepends=('pkcs11-helper: PKCS-11 plugin')
+
+  cd build5
+  make DESTDIR="$pkgdir" install
+}
+
+

Deleted: gcc47.patch
===================================================================
--- gcc47.patch	2015-10-05 19:35:08 UTC (rev 248376)
+++ gcc47.patch	2015-10-05 19:54:30 UTC (rev 248377)
@@ -1,17 +0,0 @@
---- ./src/botantools/botan/botan/secmem.h.orig	2012-01-07 20:09:35.427999593 +0100
-+++ ./src/botantools/botan/botan/secmem.h	2012-01-07 20:09:52.540001422 +0100
-@@ -214,11 +214,11 @@
- 
-       SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
-       SecureVector(const T in[], u32bit n)
--         { MemoryRegion<T>::init(true); set(in, n); }
-+         { MemoryRegion<T>::init(true); this->set(in, n); }
-       SecureVector(const MemoryRegion<T>& in)
--         { MemoryRegion<T>::init(true); set(in); }
-+         { MemoryRegion<T>::init(true); this->set(in); }
-       SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
--         { MemoryRegion<T>::init(true); set(in1); append(in2); }
-+         { MemoryRegion<T>::init(true); this->set(in1); append(in2); }
-    };
- 
- /*************************************************