Date: Wednesday, August 16, 2017 @ 16:26:00
Author: spupykin
Revision: 251346
archrelease: copy trunk to community-i686, community-x86_64
Added:
psi-plus/repos/community-i686/
psi-plus/repos/community-i686/PKGBUILD
(from rev 251345, psi-plus/trunk/PKGBUILD)
psi-plus/repos/community-i686/conf.diff
(from rev 251345, psi-plus/trunk/conf.diff)
psi-plus/repos/community-i686/join.patch
(from rev 251345, psi-plus/trunk/join.patch)
psi-plus/repos/community-x86_64/
psi-plus/repos/community-x86_64/PKGBUILD
(from rev 251345, psi-plus/trunk/PKGBUILD)
psi-plus/repos/community-x86_64/conf.diff
(from rev 251345, psi-plus/trunk/conf.diff)
psi-plus/repos/community-x86_64/join.patch
(from rev 251345, psi-plus/trunk/join.patch)
-----------------------------+
community-i686/PKGBUILD | 54 ++++++++++++++++++++++++++++++++++++++++++
community-i686/conf.diff | 12 +++++++++
community-i686/join.patch | 26 ++++++++++++++++++++
community-x86_64/PKGBUILD | 54 ++++++++++++++++++++++++++++++++++++++++++
community-x86_64/conf.diff | 12 +++++++++
community-x86_64/join.patch | 26 ++++++++++++++++++++
6 files changed, 184 insertions(+)
Copied: psi-plus/repos/community-i686/PKGBUILD (from rev 251345,
psi-plus/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-08-16 16:26:00 UTC (rev 251346)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+
+pkgname="psi-plus"
+pkgver=1.2.32
+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=('i686' 'x86_64')
+depends=('qt5-base' 'qt5-webkit' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
+ 'libidn' 'aspell' 'libxss' 'qt5-svg')
+makedepends=('git' 'patch' 'qconf')
+optdepends=('qca-gnupg: encrypted client-to-client connection')
+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%.*}"
+ 'conf.diff'
+ 'join.patch')
+sha256sums=('SKIP'
+ 'SKIP'
+ '690770c7c8976d536d8c4078d01c28f187f510574ddffe91251f5045fa672e53'
+ '8b2ab645005fab4ca9c7fc84f57e94e1796309e780b535010b84eb0c191ad42c')
+
+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
+ 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
+ make
+ patch -Rp0 < "$srcdir"/conf.diff
+}
+
+package() {
+ cd psi-plus-snapshots
+
+ make INSTALL_ROOT="$pkgdir" install
+
+ install -dm755 "$pkgdir/usr/include/psi-plus/plugins"
+ install -m644 src/plugins/include/*.h "$pkgdir/usr/include/psi-plus/plugins"
+}
Copied: psi-plus/repos/community-i686/conf.diff (from rev 251345,
psi-plus/trunk/conf.diff)
===================================================================
--- community-i686/conf.diff (rev 0)
+++ community-i686/conf.diff 2017-08-16 16:26:00 UTC (rev 251346)
@@ -0,0 +1,12 @@
+--- configure.old 2016-04-16 16:10:54.312012000 +0300
++++ configure 2016-04-16 16:11:15.062012000 +0300
+@@ -994,7 +994,8 @@
+ conf->addIncludePath(inc);
+ }
+ conf->addLib(libs);
+-
++ conf->addExtra("CONFIG += psi-minizip");
++ return true;
+ #ifdef Q_OS_WIN
+ // HACK: on windows, always use psi's bundled minizip
+ conf->addExtra("CONFIG += psi-minizip");
Copied: psi-plus/repos/community-i686/join.patch (from rev 251345,
psi-plus/trunk/join.patch)
===================================================================
--- community-i686/join.patch (rev 0)
+++ community-i686/join.patch 2017-08-16 16:26:00 UTC (rev 251346)
@@ -0,0 +1,26 @@
+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;
+
+ 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, 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;
+ }
+
Copied: psi-plus/repos/community-x86_64/PKGBUILD (from rev 251345,
psi-plus/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-08-16 16:26:00 UTC (rev 251346)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+
+pkgname="psi-plus"
+pkgver=1.2.32
+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=('i686' 'x86_64')
+depends=('qt5-base' 'qt5-webkit' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
+ 'libidn' 'aspell' 'libxss' 'qt5-svg')
+makedepends=('git' 'patch' 'qconf')
+optdepends=('qca-gnupg: encrypted client-to-client connection')
+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%.*}"
+ 'conf.diff'
+ 'join.patch')
+sha256sums=('SKIP'
+ 'SKIP'
+ '690770c7c8976d536d8c4078d01c28f187f510574ddffe91251f5045fa672e53'
+ '8b2ab645005fab4ca9c7fc84f57e94e1796309e780b535010b84eb0c191ad42c')
+
+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
+ 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
+ make
+ patch -Rp0 < "$srcdir"/conf.diff
+}
+
+package() {
+ cd psi-plus-snapshots
+
+ make INSTALL_ROOT="$pkgdir" install
+
+ install -dm755 "$pkgdir/usr/include/psi-plus/plugins"
+ install -m644 src/plugins/include/*.h "$pkgdir/usr/include/psi-plus/plugins"
+}
Copied: psi-plus/repos/community-x86_64/conf.diff (from rev 251345,
psi-plus/trunk/conf.diff)
===================================================================
--- community-x86_64/conf.diff (rev 0)
+++ community-x86_64/conf.diff 2017-08-16 16:26:00 UTC (rev 251346)
@@ -0,0 +1,12 @@
+--- configure.old 2016-04-16 16:10:54.312012000 +0300
++++ configure 2016-04-16 16:11:15.062012000 +0300
+@@ -994,7 +994,8 @@
+ conf->addIncludePath(inc);
+ }
+ conf->addLib(libs);
+-
++ conf->addExtra("CONFIG += psi-minizip");
++ return true;
+ #ifdef Q_OS_WIN
+ // HACK: on windows, always use psi's bundled minizip
+ conf->addExtra("CONFIG += psi-minizip");
Copied: psi-plus/repos/community-x86_64/join.patch (from rev 251345,
psi-plus/trunk/join.patch)
===================================================================
--- community-x86_64/join.patch (rev 0)
+++ community-x86_64/join.patch 2017-08-16 16:26:00 UTC (rev 251346)
@@ -0,0 +1,26 @@
+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;
+
+ 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, 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;
+ }
+
