[arch-commits] Commit in psi/repos (3 files)
Sergej Pupykin
spupykin at archlinux.org
Tue Feb 20 19:08:57 UTC 2018
Date: Tuesday, February 20, 2018 @ 19:08:57
Author: spupykin
Revision: 296576
archrelease: copy trunk to community-x86_64
Added:
psi/repos/community-x86_64/
psi/repos/community-x86_64/PKGBUILD
(from rev 296575, psi/trunk/PKGBUILD)
psi/repos/community-x86_64/join.patch
(from rev 296575, psi/trunk/join.patch)
------------+
PKGBUILD | 42 ++++++++++++++++++++++++++++++++++++++++++
join.patch | 24 ++++++++++++++++++++++++
2 files changed, 66 insertions(+)
Copied: psi/repos/community-x86_64/PKGBUILD (from rev 296575, psi/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2018-02-20 19:08:57 UTC (rev 296576)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
+
+pkgname="psi"
+pkgver=1.3
+pkgrel=1
+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"
+license=('GPL2')
+arch=('x86_64')
+depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
+ 'libidn' 'libxss' 'qt5-svg' 'hunspell' 'qtkeychain')
+makedepends=('git' 'patch' 'cmake')
+conflicts=('psi-plus-qt5-git' 'psi-plus-webkit-qt5-git' 'psi-plus-webkit-git' 'psi-plus-git' 'psi-plus')
+replaces=('psi-plus')
+source=("https://downloads.sourceforge.net/project/${pkgname}/Psi/${pkgver}/psi-${pkgver}.tar.xz"
+ "no-qca-qt4.patch::https://aur.archlinux.org/cgit/aur.git/plain/no-qca-qt4.patch?h=psi-plus-git&id=bc3ee431ca26d6294810636a514c50985540bd23"
+ "join.patch")
+sha256sums=('59debd16e61ab1d4ff88aca9f41b9caaaca8395f1576418fb99214d5e2c6fa8b'
+ 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
+ '67ff9fe4ebfc7b6a04cd325a677ad0cf6252bd7276bfb7968be80fc6f0ad5dc3')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 <"$srcdir"/join.patch
+ patch -p1 <"$srcdir"/no-qca-qt4.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ mkdir -p build
+ cd build
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver/build
+ make DESTDIR="$pkgdir" install
+ install -dm755 "$pkgdir/usr/include/psi/plugins"
+ install -m644 ../src/plugins/include/*.h "$pkgdir/usr/include/psi/plugins"
+}
Copied: psi/repos/community-x86_64/join.patch (from rev 296575, psi/trunk/join.patch)
===================================================================
--- community-x86_64/join.patch (rev 0)
+++ community-x86_64/join.patch 2018-02-20 19:08:57 UTC (rev 296576)
@@ -0,0 +1,24 @@
+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;
+ }
+
More information about the arch-commits
mailing list