Date: Wednesday, April 18, 2018 @ 21:35:32
Author: spupykin
Revision: 316933
archrelease: copy trunk to community-x86_64
Added:
psi/repos/community-x86_64/PKGBUILD
(from rev 316932, psi/trunk/PKGBUILD)
psi/repos/community-x86_64/join.patch
(from rev 316932, psi/trunk/join.patch)
psi/repos/community-x86_64/no-qca-qt4.patch
(from rev 316932, psi/trunk/no-qca-qt4.patch)
Deleted:
psi/repos/community-x86_64/PKGBUILD
psi/repos/community-x86_64/join.patch
------------------+
PKGBUILD | 96 ++++++++++++++++++++++++++++++-----------------------
join.patch | 48 +++++++++++++-------------
no-qca-qt4.patch | 36 +++++++++++++++++++
3 files changed, 116 insertions(+), 64 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-04-18 21:35:16 UTC (rev 316932)
+++ PKGBUILD 2018-04-18 21:35:32 UTC (rev 316933)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <[email protected]>
-
-pkgname="psi"
-pkgver=1.3
-pkgrel=3
-pkgdesc="a powerful Jabber client (Qt, C++) designed for the Jabber power
users"
-url="https://psi-im.org";
-license=('GPL2')
-arch=('x86_64')
-depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
- 'libidn' 'libxss' 'qt5-svg' 'hunspell' 'qtkeychain')
-makedepends=('patch' 'cmake')
-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/PKGBUILD (from rev 316932,
psi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-04-18 21:35:32 UTC (rev 316933)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+
+pkgname=("psi" "psi-nowebkit")
+pkgver=1.3
+pkgrel=4
+pkgdesc="a powerful Jabber client (Qt, C++) designed for the Jabber power
users"
+url="https://psi-im.org";
+license=('GPL2')
+arch=('x86_64')
+depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
+ 'libidn' 'libxss' 'qt5-svg' 'hunspell' 'qtkeychain')
+makedepends=('patch' 'cmake')
+source=("https://downloads.sourceforge.net/project/${pkgname}/Psi/${pkgver}/psi-${pkgver}.tar.xz";
+ "no-qca-qt4.patch"
+ "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
+ cd ..
+
+ mkdir -p build-nowebkit
+ cd build-nowebkit
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
-DENABLE_WEBKIT=OFF ..
+ make
+}
+
+package_psi() {
+ cd "$srcdir"/psi-$pkgver/build
+ make DESTDIR="$pkgdir" install
+ install -dm755 "$pkgdir/usr/include/psi/plugins"
+ install -m644 ../src/plugins/include/*.h "$pkgdir/usr/include/psi/plugins"
+}
+
+package_psi-nowebkit() {
+ depends=('qt5-base' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
+ 'libidn' 'libxss' 'qt5-svg' 'hunspell' 'qtkeychain')
+
+ cd "$srcdir"/psi-$pkgver/build-nowebkit
+ make DESTDIR="$pkgdir" install
+ install -dm755 "$pkgdir/usr/include/psi/plugins"
+ install -m644 ../src/plugins/include/*.h "$pkgdir/usr/include/psi/plugins"
+}
Deleted: join.patch
===================================================================
--- join.patch 2018-04-18 21:35:16 UTC (rev 316932)
+++ join.patch 2018-04-18 21:35:32 UTC (rev 316933)
@@ -1,24 +0,0 @@
-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;
- }
-
Copied: psi/repos/community-x86_64/join.patch (from rev 316932,
psi/trunk/join.patch)
===================================================================
--- join.patch (rev 0)
+++ join.patch 2018-04-18 21:35:32 UTC (rev 316933)
@@ -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;
+ }
+
Copied: psi/repos/community-x86_64/no-qca-qt4.patch (from rev 316932,
psi/trunk/no-qca-qt4.patch)
===================================================================
--- no-qca-qt4.patch (rev 0)
+++ no-qca-qt4.patch 2018-04-18 21:35:32 UTC (rev 316933)
@@ -0,0 +1,36 @@
+From f3372d84595d10b757de4568399707bc721f6850 Mon Sep 17 00:00:00 2001
+From: sirlucjan <[email protected]>
+Date: Sun, 7 Jan 2018 21:04:37 +0100
+Subject: [PATCH] Update cmakelist.txt
+
+---
+ iris/CMakeLists.txt | 2 +-
+ src/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/iris/CMakeLists.txt b/iris/CMakeLists.txt
+index 50228489..85dcec60 100644
+--- a/iris/CMakeLists.txt
++++ b/iris/CMakeLists.txt
+@@ -39,7 +39,7 @@ if(USE_QJDNS)
+ add_definitions(-DNEED_JDNS)
+ endif()
+
+-find_package(Qca REQUIRED)
++find_package(Qca-qt5 REQUIRED)
+ set(QCA_INCLUDES ${Qca_INCLUDE_DIR})
+ set(qca_LIB ${Qca_LIBRARY})
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1f78cd05..57c73c4c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -73,7 +73,7 @@ if(APPLE)
+ list(APPEND EXTRA_LDFLAGS ${SPARKLE_LIBRARY} "-framework Carbon"
"-framework AppKit" "-framework IOKit" "-framework CoreAudio" "-framework
AudioToolbox")
+ endif()
+
+-find_package( Qca REQUIRED )
++find_package( Qca-qt5 REQUIRED )
+
+ if(LINUX)
+ find_package(X11 REQUIRED)
