Commit 7e2c93a9 authored by Xuetian Weng's avatar Xuetian Weng

fix qca and qca-qt5 conflicts

parent 3947b4bf
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
pkgbase=qca pkgbase=qca
pkgname=("qca" "qca-qt5") pkgname=("qca" "qca-qt5")
pkgver=2.1.0.3 pkgver=2.1.0.3
pkgrel=2 pkgrel=3
arch=('x86_64') arch=('x86_64')
url="http://delta.affinix.com/qca/" url="http://delta.affinix.com/qca/"
license=('LGPL') license=('LGPL')
...@@ -27,7 +27,9 @@ build() { ...@@ -27,7 +27,9 @@ build() {
cd $srcdir/build-qt5 cd $srcdir/build-qt5
cmake ../${pkgbase} \ cmake ../${pkgbase} \
-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_PREFIX=/usr \
-DQCA_SUFFIX=qt5 \
-DQCA_INSTALL_IN_QT_PREFIX=ON
make make
} }
...@@ -42,7 +44,6 @@ package_qca() { ...@@ -42,7 +44,6 @@ package_qca() {
package_qca-qt5() { package_qca-qt5() {
pkgdesc="Qt5 Cryptographic Architecture" pkgdesc="Qt5 Cryptographic Architecture"
depends=('qt5-base' 'ca-certificates' 'nss') depends=('qt5-base' 'ca-certificates' 'nss')
conflicts=('qca')
cd $srcdir/build-qt5 cd $srcdir/build-qt5
make DESTDIR=${pkgdir} install make DESTDIR=${pkgdir} install
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment