[arch-commits] Commit in psi-plus/repos/community-x86_64 (5 files)
Sergej Pupykin
spupykin at archlinux.org
Mon Jan 8 14:16:00 UTC 2018
Date: Monday, January 8, 2018 @ 14:16:00
Author: spupykin
Revision: 280529
archrelease: copy trunk to community-x86_64
Added:
psi-plus/repos/community-x86_64/PKGBUILD
(from rev 280528, psi-plus/trunk/PKGBUILD)
psi-plus/repos/community-x86_64/join.patch
(from rev 280528, 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 | 94 ++++++++++++++++++++++++++++-------------------------------
conf.diff | 12 -------
join.patch | 48 +++++++++++++++---------------
3 files changed, 69 insertions(+), 85 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-08 14:15:46 UTC (rev 280528)
+++ PKGBUILD 2018-01-08 14:16:00 UTC (rev 280529)
@@ -1,49 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <arch+pub at 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"
-}
Copied: psi-plus/repos/community-x86_64/PKGBUILD (from rev 280528, psi-plus/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-08 14:16:00 UTC (rev 280529)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
+
+pkgname="psi-plus"
+pkgver=1.2.154
+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')
+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%.*}"
+ "no-qca-qt4.patch::https://aur.archlinux.org/cgit/aur.git/plain/no-qca-qt4.patch?h=psi-plus-git"
+ 'join.patch')
+sha256sums=('SKIP'
+ 'SKIP'
+ 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
+ 'ea25a58c7efe25979b8d257598608187380e8f35ace25e96cab9c357dcdbc974')
+
+prepare() {
+ cd psi-plus-snapshots
+ patch -p1 <"$srcdir"/join.patch
+ patch -p1 <"$srcdir"/no-qca-qt4.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-08 14:15:46 UTC (rev 280528)
+++ conf.diff 2018-01-08 14:16:00 UTC (rev 280529)
@@ -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");
Deleted: join.patch
===================================================================
--- join.patch 2018-01-08 14:15:46 UTC (rev 280528)
+++ join.patch 2018-01-08 14:16:00 UTC (rev 280529)
@@ -1,24 +0,0 @@
-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;
- }
-
Copied: psi-plus/repos/community-x86_64/join.patch (from rev 280528, psi-plus/trunk/join.patch)
===================================================================
--- join.patch (rev 0)
+++ join.patch 2018-01-08 14:16:00 UTC (rev 280529)
@@ -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;
+ }
+
More information about the arch-commits
mailing list