[arch-commits] Commit in psi-plus/trunk (PKGBUILD join.patch)

[Sergej Pupykin]

    Date: Friday, January 5, 2018 @ 18:23:53
  Author: spupykin
Revision: 279253

upgpkg: psi-plus 1.2.146-1

Modified:
  psi-plus/trunk/PKGBUILD
  psi-plus/trunk/join.patch

------------+
 PKGBUILD   |   32 ++++++++++++++------------------
 join.patch |   42 ++++++++++++++++++++----------------------
 2 files changed, 34 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-05 18:22:57 UTC (rev 279252)
+++ PKGBUILD	2018-01-05 18:23:53 UTC (rev 279253)
@@ -2,7 +2,7 @@
 # Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
 
 pkgname="psi-plus"
-pkgver=1.2.109
+pkgver=1.2.146
 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"
@@ -9,8 +9,8 @@
 license=('GPL2')
 arch=('x86_64')
 depends=('qt5-base' 'qt5-webkit' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
-	 'libidn' 'aspell' 'libxss' 'qt5-svg')
-makedepends=('git' 'patch' 'qconf')
+	 'libidn' 'aspell' 'libxss' 'qt5-svg' 'hunspell')
+makedepends=('git' 'patch' 'qconf' 'cmake' 'qca-qt4')
 conflicts=('psi-plus-qt5-git' 'psi-plus-webkit-qt5-git' 'psi-plus-webkit-git' 'psi-plus-git')
 source=("git://github.com/psi-plus/psi-plus-snapshots#tag=$pkgver"
 	"git://github.com/psi-plus/main.git#tag=${pkgver%.*}"
@@ -19,35 +19,31 @@
 sha256sums=('SKIP'
             'SKIP'
             '690770c7c8976d536d8c4078d01c28f187f510574ddffe91251f5045fa672e53'
-            '8b2ab645005fab4ca9c7fc84f57e94e1796309e780b535010b84eb0c191ad42c')
+            'ea25a58c7efe25979b8d257598608187380e8f35ace25e96cab9c357dcdbc974')
 
 prepare() {
   cd psi-plus-snapshots
   # make build date in --version output a bit more readable
   #sed "s/yyyyMMdd/yyyy-MM-dd/" -i qcm/conf.qcm
-  mkdir -p iconsets
-  cp -r "$srcdir"/main/iconsets/* ./iconsets
-  echo "$pkgver ($(date +"%Y-%m-%d"))" >version
+#  mkdir -p iconsets
+#  cp -r "$srcdir"/main/iconsets/* ./iconsets
+#  echo "$pkgver ($(date +"%Y-%m-%d"))" >version
   patch -p1 <"$srcdir"/join.patch
 }
 
 build() {
   cd psi-plus-snapshots
-  qconf
-  patch -p0 < "$srcdir"/conf.diff
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib \
-              --disable-enchant \
-              --enable-whiteboarding
+  mkdir -p build
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
   make
-  patch -Rp0 < "$srcdir"/conf.diff
 }
 
 package() {
-  cd psi-plus-snapshots
+  cd psi-plus-snapshots/build
 
-  make INSTALL_ROOT="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
-  install -dm755 "$pkgdir/usr/include/psi-plus/plugins"
-  install -m644 src/plugins/include/*.h "$pkgdir/usr/include/psi-plus/plugins"
+#  install -dm755 "$pkgdir/usr/include/psi-plus/plugins"
+#  install -m644 src/plugins/include/*.h "$pkgdir/usr/include/psi-plus/plugins"
 }

Modified: join.patch
===================================================================
--- join.patch	2018-01-05 18:22:57 UTC (rev 279252)
+++ join.patch	2018-01-05 18:23:53 UTC (rev 279253)
@@ -1,26 +1,24 @@
-diff --git a/src/groupchatdlg.cpp b/src/groupchatdlg.cpp
-index 294bee2..6473998 100644
---- a/src/groupchatdlg.cpp
-+++ b/src/groupchatdlg.cpp
-@@ -1508,7 +1508,7 @@ void GCMainDlg::goConn()
- 		QString nick = d->self;
+diff -wbBur psi-plus-snapshots.org/src/groupchatdlg.cpp psi-plus-snapshots/src/groupchatdlg.cpp
+--- psi-plus-snapshots.org/src/groupchatdlg.cpp	2018-01-05 19:34:53.698040879 +0300
++++ psi-plus-snapshots/src/groupchatdlg.cpp	2018-01-05 19:35:35.934708491 +0300
+@@ -1518,7 +1518,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 --git a/src/mucjoindlg.cpp b/src/mucjoindlg.cpp
-index 244c3e8..1a1d4e8 100644
---- a/src/mucjoindlg.cpp
-+++ b/src/mucjoindlg.cpp
-@@ -221,7 +221,7 @@ void MUCJoinDlg::doJoin(MucJoinReason r)
+         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-plus-snapshots.org/src/mucjoindlg.cpp psi-plus-snapshots/src/mucjoindlg.cpp
+--- psi-plus-snapshots.org/src/mucjoindlg.cpp	2018-01-05 19:34:53.711374212 +0300
++++ psi-plus-snapshots/src/mucjoindlg.cpp	2018-01-05 19:35:41.211375275 +0300
+@@ -262,7 +262,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;
- 	}
+     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;
+     }