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

[Antonio Rojas]

    Date: Tuesday, August 21, 2018 @ 12:41:01
  Author: arojas
Revision: 332742

Drop qt4 support

Modified:
  qca/trunk/PKGBUILD

----------+
 PKGBUILD |   46 +++++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-21 12:09:38 UTC (rev 332741)
+++ PKGBUILD	2018-08-21 12:41:01 UTC (rev 332742)
@@ -3,16 +3,20 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
-pkgbase=qca
-pkgname=(qca-qt4 qca-qt5)
+pkgname=qca
 pkgver=2.1.3
-pkgrel=11
+pkgrel=1
 pkgdesc="Qt Cryptographic Architecture"
 arch=(x86_64)
 url="http://delta.affinix.com/qca/"
 license=(LGPL)
-makedepends=(qt4 qt5-base cmake doxygen nss pkcs11-helper botan)
-source=("http://download.kde.org/stable/$pkgbase/$pkgver/src/$pkgbase-$pkgver.tar.xz" qca-openssl-1.1.patch
+depends=(qt5-base nss ca-certificates)
+optdepends=('pkcs11-helper: PKCS-11 plugin' 'botan: botan plugin')
+makedepends=(cmake doxygen pkcs11-helper botan)
+conflicts=(qca-qt5)
+provides=(qca-qt5)
+replaces=(qca-qt5)
+source=("http://download.kde.org/stable/$pkgbase/$pkgver/src/$pkgname-$pkgver.tar.xz" qca-openssl-1.1.patch
         qca-botan2.patch::"https://cgit.kde.org/qca.git/patch/?id=47163784")
 sha256sums=('003fd86a32421057a03b18a8168db52e2940978f9db5ebbb6a08882f8ab1e353'
             'b1505bc313fd2f4e350cd4c94af69256c901afa419ae6700b208cb6e40e6926d'
@@ -19,48 +23,28 @@
             '2b2c3103e47166eee46604288ba343b9ed1ccb957c54650e8eea770faab515e9')
 
 prepare() {
-  mkdir -p build{4,5}
+  mkdir -p build
 
-  cd $pkgbase-$pkgver
+  cd $pkgname-$pkgver
   patch -p1 -i ../qca-openssl-1.1.patch # Fix build with OpenSSL 1.1 https://bugs.kde.org/show_bug.cgi?id=379810
   patch -p1 -i ../qca-botan2.patch      # Fix build with botan 2
 }
 
 build() {
-  cd build4
-  cmake ../$pkgbase-$pkgver \
+  cd build
+  cmake ../$pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -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 \
-    -DBUILD_TESTS=OFF \
     -DQCA_INSTALL_IN_QT_PREFIX=ON \
     -DQCA_MAN_INSTALL_DIR=/usr/share/man
   make
 }
 
-package_qca-qt4() {
-  depends=(qt4 nss)
-  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)
-
-  cd build4
-  make DESTDIR="$pkgdir" install
-}
-
-package_qca-qt5() {
+package() {
   depends=(qt5-base nss ca-certificates)
   optdepends=('pkcs11-helper: PKCS-11 plugin' 'botan: botan plugin')
 
-  cd build5
+  cd build
   make DESTDIR="$pkgdir" install
 }