Date: Monday, April 23, 2018 @ 09:20:39 Author: bgyorgy Revision: 317355
upgpkg: psi 1.3-5 - Rename psi-nowebkit to psi-nowebengine - Remove unused or already satisfied dependencies - Add provides/conflicts to psi in psi-nowebengine Modified: psi/trunk/PKGBUILD Deleted: psi/trunk/join.patch ------------+ PKGBUILD | 35 +++++++++++++++++------------------ join.patch | 24 ------------------------ 2 files changed, 17 insertions(+), 42 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-04-23 09:02:19 UTC (rev 317354) +++ PKGBUILD 2018-04-23 09:20:39 UTC (rev 317355) @@ -1,26 +1,22 @@ # $Id$ # Maintainer: Sergej Pupykin <arch+...@sergej.pp.ru> -pkgname=("psi" "psi-nowebkit") +pkgname=('psi' 'psi-nowebengine') pkgver=1.3 -pkgrel=4 -pkgdesc="a powerful Jabber client (Qt, C++) designed for the Jabber power users" +pkgrel=5 +pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for power users" url="https://psi-im.org" license=('GPL2') arch=('x86_64') -depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5' - 'libidn' 'libxss' 'qt5-svg' 'hunspell' 'qtkeychain') -makedepends=('patch' 'cmake') -source=("https://downloads.sourceforge.net/project/${pkgname}/Psi/${pkgver}/psi-${pkgver}.tar.xz" - "no-qca-qt4.patch" - "join.patch") +depends=('hunspell' 'qca-qt5' 'qt5-svg' 'qt5-webengine' 'qt5-x11extras') +makedepends=('cmake' 'qt5-multimedia') +source=("https://download.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" + "no-qca-qt4.patch") sha256sums=('59debd16e61ab1d4ff88aca9f41b9caaaca8395f1576418fb99214d5e2c6fa8b' - 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23' - '67ff9fe4ebfc7b6a04cd325a677ad0cf6252bd7276bfb7968be80fc6f0ad5dc3') + 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23') prepare() { cd $pkgname-$pkgver -# patch -p1 <"$srcdir"/join.patch patch -p1 <"$srcdir"/no-qca-qt4.patch } @@ -32,8 +28,8 @@ make cd .. - mkdir -p build-nowebkit - cd build-nowebkit + mkdir -p build-nowebengine + cd build-nowebengine cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DENABLE_WEBKIT=OFF .. make } @@ -45,11 +41,14 @@ install -m644 ../src/plugins/include/*.h "$pkgdir/usr/include/psi/plugins" } -package_psi-nowebkit() { - depends=('qt5-base' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5' - 'libidn' 'libxss' 'qt5-svg' 'hunspell' 'qtkeychain') +package_psi-nowebengine() { + pkgdesc+=" without WebEngine support" + depends=('hunspell' 'minizip' 'qca-qt5' 'qt5-svg' 'qt5-x11extras') + provides=("$pkgbase=$pkgver") + conflicts=("$pkgbase") + replaces=('psi-nowebkit') - cd "$srcdir"/psi-$pkgver/build-nowebkit + cd "$srcdir"/psi-$pkgver/build-nowebengine make DESTDIR="$pkgdir" install install -dm755 "$pkgdir/usr/include/psi/plugins" install -m644 ../src/plugins/include/*.h "$pkgdir/usr/include/psi/plugins" Deleted: join.patch =================================================================== --- join.patch 2018-04-23 09:02:19 UTC (rev 317354) +++ join.patch 2018-04-23 09:20:39 UTC (rev 317355) @@ -1,24 +0,0 @@ -diff -wbBur psi-1.3.org/src/groupchatdlg.cpp psi-1.3/src/groupchatdlg.cpp ---- psi-1.3.org/src/groupchatdlg.cpp 2017-09-24 13:54:15.000000000 +0300 -+++ psi-1.3/src/groupchatdlg.cpp 2018-02-20 20:33:06.279033368 +0300 -@@ -1456,7 +1456,7 @@ - QString nick = d->self; - - if(!account()->groupChatJoin(host, room, nick, d->password)) { -- appendSysMsg(tr("Error: You are in or joining this room already!"), true); -+// appendSysMsg(tr("Error: You are in or joining this room already!"), true); - d->state = Private::Idle; - } - } -diff -wbBur psi-1.3.org/src/mucjoindlg.cpp psi-1.3/src/mucjoindlg.cpp ---- psi-1.3.org/src/mucjoindlg.cpp 2017-09-24 13:54:15.000000000 +0300 -+++ psi-1.3/src/mucjoindlg.cpp 2018-02-20 20:33:09.399033235 +0300 -@@ -181,7 +181,7 @@ - - - if (!account_->groupChatJoin(host, room, nick, pass, !ui_.ck_history->isChecked())) { -- QMessageBox::information(this, tr("Error"), tr("You are in or joining this room already!")); -+// QMessageBox::information(this, tr("Error"), tr("You are in or joining this room already!")); - return; - } -