Date: Friday, January 5, 2018 @ 18:24:09 Author: spupykin Revision: 279254
archrelease: copy trunk to community-x86_64 Added: psi-plus/repos/community-x86_64/PKGBUILD (from rev 279253, psi-plus/trunk/PKGBUILD) psi-plus/repos/community-x86_64/conf.diff (from rev 279253, psi-plus/trunk/conf.diff) psi-plus/repos/community-x86_64/join.patch (from rev 279253, psi-plus/trunk/join.patch) Deleted: psi-plus/repos/community-x86_64/PKGBUILD psi-plus/repos/community-x86_64/conf.diff psi-plus/repos/community-x86_64/join.patch ------------+ PKGBUILD | 102 ++++++++++++++++++++++++++++------------------------------- conf.diff | 24 ++++++------- join.patch | 50 +++++++++++++--------------- 3 files changed, 85 insertions(+), 91 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-01-05 18:23:53 UTC (rev 279253) +++ PKGBUILD 2018-01-05 18:24:09 UTC (rev 279254) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <arch+...@sergej.pp.ru> - -pkgname="psi-plus" -pkgver=1.2.109 -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-webkit' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5' - 'libidn' 'aspell' 'libxss' 'qt5-svg') -makedepends=('git' 'patch' 'qconf') -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/PKGBUILD (from rev 279253, psi-plus/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-01-05 18:24:09 UTC (rev 279254) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Sergej Pupykin <arch+...@sergej.pp.ru> + +pkgname="psi-plus" +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" +license=('GPL2') +arch=('x86_64') +depends=('qt5-base' 'qt5-webkit' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5' + '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%.*}" + 'conf.diff' + 'join.patch') +sha256sums=('SKIP' + 'SKIP' + '690770c7c8976d536d8c4078d01c28f187f510574ddffe91251f5045fa672e53' + '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 + patch -p1 <"$srcdir"/join.patch +} + +build() { + cd psi-plus-snapshots + mkdir -p build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd psi-plus-snapshots/build + + make DESTDIR="$pkgdir" install + +# install -dm755 "$pkgdir/usr/include/psi-plus/plugins" +# install -m644 src/plugins/include/*.h "$pkgdir/usr/include/psi-plus/plugins" +} Deleted: conf.diff =================================================================== --- conf.diff 2018-01-05 18:23:53 UTC (rev 279253) +++ conf.diff 2018-01-05 18:24:09 UTC (rev 279254) @@ -1,12 +0,0 @@ ---- 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/conf.diff (from rev 279253, psi-plus/trunk/conf.diff) =================================================================== --- conf.diff (rev 0) +++ conf.diff 2018-01-05 18:24:09 UTC (rev 279254) @@ -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"); Deleted: join.patch =================================================================== --- join.patch 2018-01-05 18:23:53 UTC (rev 279253) +++ join.patch 2018-01-05 18:24:09 UTC (rev 279254) @@ -1,26 +0,0 @@ -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/join.patch (from rev 279253, psi-plus/trunk/join.patch) =================================================================== --- join.patch (rev 0) +++ join.patch 2018-01-05 18:24:09 UTC (rev 279254) @@ -0,0 +1,24 @@ +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 -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; + } +