summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorsirlucjan2018-01-15 22:25:54 +0100
committersirlucjan2018-01-15 22:25:54 +0100
commit688e13d6856d477b634f2bf2fe876ec79fb8c21b (patch)
tree55a8dc3b28fe367c441c8dee3f56377a4342b9ab /PKGBUILD
parent2fa371ac8633c538f3b5f916f694f268acf0fef1 (diff)
downloadaur-688e13d6856d477b634f2bf2fe876ec79fb8c21b.tar.gz
Update conflicts
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD6
1 files changed, 3 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 4b5a26859579..e20fab48f5cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Alexey D. <lq07829icatm@rambler.ru>
pkgname=psi-plus-git
-pkgver=1.2.161.1.gf3b641d3
+pkgver=1.2.162.0.g71b60606
pkgrel=2
pkgdesc="Psi+ is a powerful Jabber client (Qt, C++) designed for the Jabber power users (built with Qt 5.x)"
url="http://psi-plus.com"
@@ -14,7 +14,7 @@ depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
'libidn' 'libxss' 'qt5-svg' 'hunspell' 'qtkeychain')
makedepends=('git' 'patch' 'cmake')
provides=("psi-plus=$pkgver" "psi-plus-qt5-git=$pkgver")
-conflicts=('psi-plus' 'psi-plus-qt5-git' 'psi-plus-webkit-qt5-git')
+conflicts=('psi-plus' 'psi-plus-qt5-git' 'psi-plus-webkit-qt5-git' 'psi-plus-webkit-git')
source=("git://github.com/psi-plus/psi-plus-snapshots"
'join.patch')
sha256sums=('SKIP'
@@ -35,7 +35,7 @@ build() {
cd psi-plus-snapshots
mkdir -p build
cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
make
}