[arch-commits] Commit in psi/trunk (PKGBUILD)

[Sergej Pupykin via arch-commits]

Date: Sunday, September 6, 2020 @ 21:55:54
  Author: spupykin
Revision: 699366

upgpkg: psi 1.5-1

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-09-06 20:33:27 UTC (rev 699365)
+++ PKGBUILD2020-09-06 21:55:54 UTC (rev 699366)
@@ -1,8 +1,8 @@
 # Maintainer: Sergej Pupykin 
 
 pkgname=('psi' 'psi-nowebengine')
-pkgver=1.4
-pkgrel=5
+pkgver=1.5
+pkgrel=1
 pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for power users"
 url="https://psi-im.org;
 license=('GPL2')
@@ -14,7 +14,7 @@
 "qt-5.11.patch"
 "qt-5.15.patch"
 "appdata.patch")
-sha256sums=('761934c1c62daf69215f085ba24d7f9cd4db05ef0ad735383d68fb03d21571ad'
+sha256sums=('3167350fd43fab4dc948cb5179ca10159a7aa318472d1a8a7617e41f5aa8b5b7'
 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
 'e56ec1a250488b2cf9d42887aac432ff2e0ef482eb7cc8500f3d52cb53949119'
 '5786131a946f8d50a0ef35dac6f3ea4b3abfe40c6e281cf3f52b22922850e7bc'
@@ -23,12 +23,12 @@
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 <"$srcdir"/no-qca-qt4.patch
-  patch -p1 <"$srcdir"/qt-5.11.patch
-  patch -p1 <"$srcdir"/qt-5.15.patch
+#  patch -p1 <"$srcdir"/qt-5.11.patch
+#  patch -p1 <"$srcdir"/qt-5.15.patch
 
   # Upgrade appdata to meet with current spec
   # https://github.com/psi-im/psi/pull/590
-  patch -p1 <"$srcdir"/appdata.patch
+#  patch -p1 <"$srcdir"/appdata.patch
 }
 
 build() {

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

[Balló György via arch-commits]

Date: Thursday, June 4, 2020 @ 17:29:52
  Author: bgyorgy
Revision: 639014

upgpkg: psi 1.4-5: Fix AppStream metadata

Added:
  psi/trunk/appdata.patch
Modified:
  psi/trunk/PKGBUILD

---+
 PKGBUILD  |   12 +---
 appdata.patch |   44 
 2 files changed, 53 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-04 17:27:25 UTC (rev 639013)
+++ PKGBUILD2020-06-04 17:29:52 UTC (rev 639014)
@@ -2,7 +2,7 @@
 
 pkgname=('psi' 'psi-nowebengine')
 pkgver=1.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for power users"
 url="https://psi-im.org;
 license=('GPL2')
@@ -12,11 +12,13 @@
 
source=("https://download.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz;
 "no-qca-qt4.patch"
 "qt-5.11.patch"
-"qt-5.15.patch")
+"qt-5.15.patch"
+"appdata.patch")
 sha256sums=('761934c1c62daf69215f085ba24d7f9cd4db05ef0ad735383d68fb03d21571ad'
 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
 'e56ec1a250488b2cf9d42887aac432ff2e0ef482eb7cc8500f3d52cb53949119'
-'5786131a946f8d50a0ef35dac6f3ea4b3abfe40c6e281cf3f52b22922850e7bc')
+'5786131a946f8d50a0ef35dac6f3ea4b3abfe40c6e281cf3f52b22922850e7bc'
+'671bfebedbeebf3a159d3aa04caf62b8cb5f20bb31a95b0adb057619380cf6dd')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -23,6 +25,10 @@
   patch -p1 <"$srcdir"/no-qca-qt4.patch
   patch -p1 <"$srcdir"/qt-5.11.patch
   patch -p1 <"$srcdir"/qt-5.15.patch
+
+  # Upgrade appdata to meet with current spec
+  # https://github.com/psi-im/psi/pull/590
+  patch -p1 <"$srcdir"/appdata.patch
 }
 
 build() {

Added: appdata.patch
===
--- appdata.patch   (rev 0)
+++ appdata.patch   2020-06-04 17:29:52 UTC (rev 639014)
@@ -0,0 +1,44 @@
+From 52b16c046de34e2659766f06877a70c6611e4664 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= 
+Date: Thu, 4 Jun 2020 19:14:54 +0200
+Subject: [PATCH] Upgrade appdata to meet with current spec
+
+---
+ psi.appdata.xml | 13 +++--
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/psi.appdata.xml b/psi.appdata.xml
+index d3816ba3..f33280d4 100644
+--- a/psi.appdata.xml
 b/psi.appdata.xml
+@@ -1,7 +1,9 @@
+ 
+-
+-  psi.desktop
+-  GPL-2.0
++
++  org.psi_im.Psi
++  psi.desktop
++  CC0-1.0
++  GPL-2.0
+   Psi
+   Psi
+   The cross-platform XMPP client aimed at experienced 
users.
+@@ -13,7 +15,6 @@
+ 
+   Psi - это мессенджер для Windows, Linux и Mac OS X подключающийся к 
свободной и открытой XMPP сети.
+ 
+-
+ Features:
+ Features:
+ 
+@@ -31,7 +32,7 @@
+   https://github.com/psi-im/psi/issues
+   
+ 
+-  http://psi-im.org/content/home/feature_default.png
++  https://psi-im.org/content/home/feature_default.png
+ 
+   
+-
++

[arch-commits] Commit in psi/trunk (PKGBUILD qt-5.15.patch)

[Balló György via arch-commits]

Date: Thursday, June 4, 2020 @ 16:01:33
  Author: bgyorgy
Revision: 638945

upgpkg: psi 1.4-4: Fix build with Qt 5.15, add AppStream metadata

Added:
  psi/trunk/qt-5.15.patch
Modified:
  psi/trunk/PKGBUILD

---+
 PKGBUILD  |   15 
 qt-5.15.patch |   70 
 2 files changed, 81 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-04 15:47:32 UTC (rev 638944)
+++ PKGBUILD2020-06-04 16:01:33 UTC (rev 638945)
@@ -2,24 +2,27 @@
 
 pkgname=('psi' 'psi-nowebengine')
 pkgver=1.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for power users"
 url="https://psi-im.org;
 license=('GPL2')
 arch=('x86_64')
-depends=('hunspell' 'qca-qt5' 'qt5-svg' 'qt5-webengine' 'qt5-x11extras' 
'libidn')
+depends=('hunspell' 'qca' 'qt5-svg' 'qt5-webengine' 'qt5-x11extras' 'libidn')
 makedepends=('cmake' 'qt5-multimedia')
 
source=("https://download.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz;
 "no-qca-qt4.patch"
-"qt-5.11.patch")
+"qt-5.11.patch"
+"qt-5.15.patch")
 sha256sums=('761934c1c62daf69215f085ba24d7f9cd4db05ef0ad735383d68fb03d21571ad'
 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
-'e56ec1a250488b2cf9d42887aac432ff2e0ef482eb7cc8500f3d52cb53949119')
+'e56ec1a250488b2cf9d42887aac432ff2e0ef482eb7cc8500f3d52cb53949119'
+'5786131a946f8d50a0ef35dac6f3ea4b3abfe40c6e281cf3f52b22922850e7bc')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 <"$srcdir"/no-qca-qt4.patch
   patch -p1 <"$srcdir"/qt-5.11.patch
+  patch -p1 <"$srcdir"/qt-5.15.patch
 }
 
 build() {
@@ -41,6 +44,7 @@
   make DESTDIR="$pkgdir" install
   install -dm755 "$pkgdir/usr/include/psi/plugins"
   install -m644 ../src/plugins/include/*.h "$pkgdir/usr/include/psi/plugins"
+  install -Dm644 ../$pkgbase.appdata.xml 
"$pkgdir/usr/share/metainfo/$pkgbase.appdata.xml"
 }
 
 package_psi-nowebengine() {
@@ -54,4 +58,7 @@
   make DESTDIR="$pkgdir" install
   install -dm755 "$pkgdir/usr/include/psi/plugins"
   install -m644 ../src/plugins/include/*.h "$pkgdir/usr/include/psi/plugins"
+
+  # Ignore package by AppStream to avoid duplicated IDs
+  echo 'X-AppStream-Ignore=true' >> 
"$pkgdir/usr/share/applications/$pkgbase.desktop"
 }

Added: qt-5.15.patch
===
--- qt-5.15.patch   (rev 0)
+++ qt-5.15.patch   2020-06-04 16:01:33 UTC (rev 638945)
@@ -0,0 +1,70 @@
+From b6c9fddd0dbd0554d2c6ec096f42d0557101178a Mon Sep 17 00:00:00 2001
+From: Sergey Ilinykh 
+Date: Fri, 29 May 2020 14:50:56 +0300
+Subject: [PATCH] Added missing QPainterPath header
+
+---
+ src/avatars.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/avatars.cpp b/src/avatars.cpp
+index bc60ad14..b24f0799 100644
+--- a/src/avatars.cpp
 b/src/avatars.cpp
+@@ -50,6 +50,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "xmpp_xmlcommon.h"
+ #include "xmpp_vcard.h"
+From 1b0421f01b9c1cd5f27e0888469a53be34e92a40 Mon Sep 17 00:00:00 2001
+From: Sergey Ilinykh 
+Date: Fri, 29 May 2020 15:07:35 +0300
+Subject: [PATCH] Add include to QPainterPath wherever it's not added
+
+---
+ src/contactlistdragview.cpp   | 1 +
+ src/multifiletransferdelegate.cpp | 1 +
+ src/rosteravatarframe.cpp | 2 ++
+ src/whiteboarding/wbnewpath.cpp   | 1 +
+ 4 files changed, 5 insertions(+)
+
+diff --git a/src/contactlistdragview.cpp b/src/contactlistdragview.cpp
+index a3885a99..091984fe 100644
+--- a/src/contactlistdragview.cpp
 b/src/contactlistdragview.cpp
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ ContactListDragView::ContactListDragView(QWidget *parent) :
+diff --git a/src/rosteravatarframe.cpp b/src/rosteravatarframe.cpp
+index e3945aff..5a15db24 100644
+--- a/src/rosteravatarframe.cpp
 b/src/rosteravatarframe.cpp
+@@ -23,6 +23,8 @@
+ #include "iconset.h"
+ #include "qpainter.h"
+ 
++#include 
++
+ RosterAvatarFrame::RosterAvatarFrame(QWidget *parent)
+ : QFrame(parent)
+ , statusMessage_("")
+diff --git a/src/whiteboarding/wbnewpath.cpp b/src/whiteboarding/wbnewpath.cpp
+index fbd20c17..cbb4fbf4 100644
+--- a/src/whiteboarding/wbnewpath.cpp
 b/src/whiteboarding/wbnewpath.cpp
+@@ -23,6 +23,7 @@
+ #include "../sxe/sxesession.h"
+ 
+ #include 
++#include 
+ 
+ WbNewPath::WbNewPath(QGraphicsScene *s, QPointF startPos, int strokeWidth, 
const QColor ,
+  const QColor ) :

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Sergej Pupykin via arch-commits]

Date: Monday, October 7, 2019 @ 13:34:14
  Author: spupykin
Revision: 513740

upgpkg: psi 1.4-3

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-07 13:34:06 UTC (rev 513739)
+++ PKGBUILD2019-10-07 13:34:14 UTC (rev 513740)
@@ -2,7 +2,7 @@
 
 pkgname=('psi' 'psi-nowebengine')
 pkgver=1.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for power users"
 url="https://psi-im.org;
 license=('GPL2')

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Evangelos Foutras via arch-commits]

Date: Saturday, November 17, 2018 @ 16:46:36
  Author: foutrelis
Revision: 408575

hunspell 1.7.0 rebuild

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-17 16:39:01 UTC (rev 408574)
+++ PKGBUILD2018-11-17 16:46:36 UTC (rev 408575)
@@ -2,7 +2,7 @@
 
 pkgname=('psi' 'psi-nowebengine')
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for power users"
 url="https://psi-im.org;
 license=('GPL2')

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Sergej Pupykin via arch-commits]

Date: Friday, November 2, 2018 @ 13:16:56
  Author: spupykin
Revision: 401223

upgpkg: psi 1.4-1

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-02 13:12:37 UTC (rev 401222)
+++ PKGBUILD2018-11-02 13:16:56 UTC (rev 401223)
@@ -1,8 +1,8 @@
 # Maintainer: Sergej Pupykin 
 
 pkgname=('psi' 'psi-nowebengine')
-pkgver=1.3
-pkgrel=7
+pkgver=1.4
+pkgrel=1
 pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for power users"
 url="https://psi-im.org;
 license=('GPL2')
@@ -12,7 +12,7 @@
 
source=("https://download.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz;
 "no-qca-qt4.patch"
 "qt-5.11.patch")
-sha256sums=('59debd16e61ab1d4ff88aca9f41b9caaaca8395f1576418fb99214d5e2c6fa8b'
+sha256sums=('761934c1c62daf69215f085ba24d7f9cd4db05ef0ad735383d68fb03d21571ad'
 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
 'e56ec1a250488b2cf9d42887aac432ff2e0ef482eb7cc8500f3d52cb53949119')
 

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Antonio Rojas via arch-commits]

Date: Thursday, September 20, 2018 @ 19:53:20
  Author: arojas
Revision: 383788

Add missing libidn dependency

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-20 19:43:47 UTC (rev 383787)
+++ PKGBUILD2018-09-20 19:53:20 UTC (rev 383788)
@@ -2,12 +2,12 @@
 
 pkgname=('psi' 'psi-nowebengine')
 pkgver=1.3
-pkgrel=6
+pkgrel=7
 pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for power users"
 url="https://psi-im.org;
 license=('GPL2')
 arch=('x86_64')
-depends=('hunspell' 'qca-qt5' 'qt5-svg' 'qt5-webengine' 'qt5-x11extras')
+depends=('hunspell' 'qca-qt5' 'qt5-svg' 'qt5-webengine' 'qt5-x11extras' 
'libidn')
 makedepends=('cmake' 'qt5-multimedia')
 
source=("https://download.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz;
 "no-qca-qt4.patch"
@@ -45,7 +45,7 @@
 
 package_psi-nowebengine() {
   pkgdesc+=" without WebEngine support"
-  depends=('hunspell' 'minizip' 'qca-qt5' 'qt5-svg' 'qt5-x11extras')
+  depends=('hunspell' 'minizip' 'qca-qt5' 'qt5-svg' 'qt5-x11extras' 'libidn')
   provides=("$pkgbase=$pkgver")
   conflicts=("$pkgbase")
   replaces=('psi-nowebkit')

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Evangelos Foutras via arch-commits]

Date: Monday, September 10, 2018 @ 23:14:20
  Author: foutrelis
Revision: 379421

libidn 1.35 rebuild

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-10 23:03:48 UTC (rev 379420)
+++ PKGBUILD2018-09-10 23:14:20 UTC (rev 379421)
@@ -3,7 +3,7 @@
 
 pkgname=('psi' 'psi-nowebengine')
 pkgver=1.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for power users"
 url="https://psi-im.org;
 license=('GPL2')

[arch-commits] Commit in psi/trunk (PKGBUILD qt-5.11.patch)

[Evangelos Foutras via arch-commits]

Date: Monday, September 10, 2018 @ 23:03:40
  Author: foutrelis
Revision: 379419

Fix build with Qt 5.11

Added:
  psi/trunk/qt-5.11.patch
Modified:
  psi/trunk/PKGBUILD

---+
 PKGBUILD  |7 +--
 qt-5.11.patch |   21 +
 2 files changed, 26 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-10 22:56:57 UTC (rev 379418)
+++ PKGBUILD2018-09-10 23:03:40 UTC (rev 379419)
@@ -11,13 +11,16 @@
 depends=('hunspell' 'qca-qt5' 'qt5-svg' 'qt5-webengine' 'qt5-x11extras')
 makedepends=('cmake' 'qt5-multimedia')
 
source=("https://download.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz;
-   "no-qca-qt4.patch")
+"no-qca-qt4.patch"
+"qt-5.11.patch")
 sha256sums=('59debd16e61ab1d4ff88aca9f41b9caaaca8395f1576418fb99214d5e2c6fa8b'
-'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23')
+'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
+'e56ec1a250488b2cf9d42887aac432ff2e0ef482eb7cc8500f3d52cb53949119')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 <"$srcdir"/no-qca-qt4.patch
+  patch -p1 <"$srcdir"/qt-5.11.patch
 }
 
 build() {

Added: qt-5.11.patch
===
--- qt-5.11.patch   (rev 0)
+++ qt-5.11.patch   2018-09-10 23:03:40 UTC (rev 379419)
@@ -0,0 +1,21 @@
+From 4b838c04fa90ab56974bc4c57aaf7d4e80b8fff8 Mon Sep 17 00:00:00 2001
+From: Vitozz 
+Date: Mon, 28 May 2018 20:45:04 +0300
+Subject: [PATCH] Try to fix build with qt-5.11
+
+---
+ src/accountmanagedlg.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/accountmanagedlg.cpp b/src/accountmanagedlg.cpp
+index 3770906d..6150349f 100644
+--- a/src/accountmanagedlg.cpp
 b/src/accountmanagedlg.cpp
+@@ -28,6 +28,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "psicon.h"
+ #include "psiaccount.h"

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

[Balló György via arch-commits]

Date: Monday, April 23, 2018 @ 09:20:39
  Author: bgyorgy
Revision: 317355

upgpkg: psi 1.3-5

- Rename psi-nowebkit to psi-nowebengine
- Remove unused or already satisfied dependencies
- Add provides/conflicts to psi in psi-nowebengine

Modified:
  psi/trunk/PKGBUILD
Deleted:
  psi/trunk/join.patch

+
 PKGBUILD   |   35 +--
 join.patch |   24 
 2 files changed, 17 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-23 09:02:19 UTC (rev 317354)
+++ PKGBUILD2018-04-23 09:20:39 UTC (rev 317355)
@@ -1,26 +1,22 @@
 # $Id$
 # Maintainer: Sergej Pupykin 
 
-pkgname=("psi" "psi-nowebkit")
+pkgname=('psi' 'psi-nowebengine')
 pkgver=1.3
-pkgrel=4
-pkgdesc="a powerful Jabber client (Qt, C++) designed for the Jabber power 
users"
+pkgrel=5
+pkgdesc="Powerful XMPP (Jabber) client (Qt, C++) designed for 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")
+depends=('hunspell' 'qca-qt5' 'qt5-svg' 'qt5-webengine' 'qt5-x11extras')
+makedepends=('cmake' 'qt5-multimedia')
+source=("https://download.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz;
+   "no-qca-qt4.patch")
 sha256sums=('59debd16e61ab1d4ff88aca9f41b9caaaca8395f1576418fb99214d5e2c6fa8b'
-'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
-'67ff9fe4ebfc7b6a04cd325a677ad0cf6252bd7276bfb7968be80fc6f0ad5dc3')
+'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23')
 
 prepare() {
   cd $pkgname-$pkgver
-#  patch -p1 <"$srcdir"/join.patch
   patch -p1 <"$srcdir"/no-qca-qt4.patch
 }
 
@@ -32,8 +28,8 @@
   make
   cd ..
 
-  mkdir -p build-nowebkit
-  cd build-nowebkit
+  mkdir -p build-nowebengine
+  cd build-nowebengine
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release 
-DENABLE_WEBKIT=OFF ..
   make
 }
@@ -45,11 +41,14 @@
   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')
+package_psi-nowebengine() {
+  pkgdesc+=" without WebEngine support"
+  depends=('hunspell' 'minizip' 'qca-qt5' 'qt5-svg' 'qt5-x11extras')
+  provides=("$pkgbase=$pkgver")
+  conflicts=("$pkgbase")
+  replaces=('psi-nowebkit')
 
-  cd "$srcdir"/psi-$pkgver/build-nowebkit
+  cd "$srcdir"/psi-$pkgver/build-nowebengine
   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-23 09:02:19 UTC (rev 317354)
+++ join.patch  2018-04-23 09:20:39 UTC (rev 317355)
@@ -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.0 +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.0 +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;
-   }
- 

[arch-commits] Commit in psi/trunk (PKGBUILD no-qca-qt4.patch)

[Sergej Pupykin via arch-commits]

Date: Wednesday, April 18, 2018 @ 21:35:16
  Author: spupykin
Revision: 316932

upgpkg: psi 1.3-4

Added:
  psi/trunk/no-qca-qt4.patch
Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |   28 ++--
 no-qca-qt4.patch |   36 
 2 files changed, 58 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-18 21:30:16 UTC (rev 316931)
+++ PKGBUILD2018-04-18 21:35:16 UTC (rev 316932)
@@ -1,9 +1,9 @@
 # $Id$
 # Maintainer: Sergej Pupykin 
 
-pkgname="psi"
+pkgname=("psi" "psi-nowebkit")
 pkgver=1.3
-pkgrel=3
+pkgrel=4
 pkgdesc="a powerful Jabber client (Qt, C++) designed for the Jabber power 
users"
 url="https://psi-im.org;
 license=('GPL2')
@@ -12,7 +12,7 @@
 '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=bc3ee431ca26d6294810636a514c50985540bd23;
+   "no-qca-qt4.patch"
"join.patch")
 sha256sums=('59debd16e61ab1d4ff88aca9f41b9caaaca8395f1576418fb99214d5e2c6fa8b'
 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
@@ -20,7 +20,7 @@
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -p1 <"$srcdir"/join.patch
+#  patch -p1 <"$srcdir"/join.patch
   patch -p1 <"$srcdir"/no-qca-qt4.patch
 }
 
@@ -30,11 +30,27 @@
   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() {
-  cd $pkgname-$pkgver/build
+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"
+}

Added: no-qca-qt4.patch
===
--- no-qca-qt4.patch(rev 0)
+++ no-qca-qt4.patch2018-04-18 21:35:16 UTC (rev 316932)
@@ -0,0 +1,36 @@
+From f3372d84595d10b757de4568399707bc721f6850 Mon Sep 17 00:00:00 2001
+From: sirlucjan 
+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) 

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Sergej Pupykin via arch-commits]

Date: Monday, February 26, 2018 @ 13:07:55
  Author: spupykin
Revision: 298326

upgpkg: psi 1.3-3

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-26 12:59:48 UTC (rev 298325)
+++ PKGBUILD2018-02-26 13:07:55 UTC (rev 298326)
@@ -3,7 +3,7 @@
 
 pkgname="psi"
 pkgver=1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="a powerful Jabber client (Qt, C++) designed for the Jabber power 
users"
 url="https://psi-im.org;
 license=('GPL2')

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Sergej Pupykin via arch-commits]

Date: Thursday, February 22, 2018 @ 11:11:10
  Author: spupykin
Revision: 297076

fix homepage url

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-22 11:10:46 UTC (rev 297075)
+++ PKGBUILD2018-02-22 11:11:10 UTC (rev 297076)
@@ -5,7 +5,7 @@
 pkgver=1.3
 pkgrel=1
 pkgdesc="a powerful Jabber client (Qt, C++) designed for the Jabber power 
users"
-url="http://psi-plus.com;
+url="https://psi-im.org;
 license=('GPL2')
 arch=('x86_64')
 depends=('qt5-base' 'qt5-webengine' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Sergej Pupykin via arch-commits]

Date: Tuesday, February 20, 2018 @ 19:08:15
  Author: spupykin
Revision: 296575

upgpkg: psi 1.3-1

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-20 19:07:35 UTC (rev 296574)
+++ PKGBUILD2018-02-20 19:08:15 UTC (rev 296575)
@@ -37,6 +37,6 @@
 package() {
   cd $pkgname-$pkgver/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"
+  install -dm755 "$pkgdir/usr/include/psi/plugins"
+  install -m644 ../src/plugins/include/*.h "$pkgdir/usr/include/psi/plugins"
 }

[arch-commits] Commit in psi/trunk (PKGBUILD psi.install)

[Pierre Schmitz]

Date: Wednesday, April 27, 2016 @ 19:05:31
  Author: pierre
Revision: 266279

upgpkg: psi 0.15-4

Hooks rebuild

Modified:
  psi/trunk/PKGBUILD
Deleted:
  psi/trunk/psi.install

-+
 PKGBUILD|3 +--
 psi.install |   12 
 2 files changed, 1 insertion(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 17:02:55 UTC (rev 266278)
+++ PKGBUILD2016-04-27 17:05:31 UTC (rev 266279)
@@ -3,7 +3,7 @@
 
 pkgname=psi
 pkgver=0.15
-pkgrel=3
+pkgrel=4
 pkgdesc='Instant messaging application designed for the Jabber IM'
 url='http://psi-im.org/'
 license=('GPL')
@@ -10,7 +10,6 @@
 arch=('i686' 'x86_64')
 depends=('qca-qt4' 'enchant' 'libxss' 'xdg-utils')
 makedepends=('icu')
-install='psi.install'
 source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2;
 'archlinux.patch')
 md5sums=('aea15f17cf93e7cea52f305523f761be'

Deleted: psi.install
===
--- psi.install 2016-04-27 17:02:55 UTC (rev 266278)
+++ psi.install 2016-04-27 17:05:31 UTC (rev 266279)
@@ -1,12 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   update-desktop-database -q &> /dev/null
-}
-
-post_upgrade() {
-   post_install
-}
-
-post_remove() {
-   post_install
-}

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Evangelos Foutras]

Date: Sunday, December 6, 2015 @ 20:19:32
  Author: foutrelis
Revision: 252960

C++11 ABI rebuild

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 19:19:22 UTC (rev 252959)
+++ PKGBUILD2015-12-06 19:19:32 UTC (rev 252960)
@@ -3,7 +3,7 @@
 
 pkgname=psi
 pkgver=0.15
-pkgrel=2
+pkgrel=3
 pkgdesc='Instant messaging application designed for the Jabber IM'
 url='http://psi-im.org/'
 license=('GPL')

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Monday, October 21, 2013 @ 13:28:57
  Author: pierre
Revision: 196956

upgpkg: psi 0.15-2

rebuild old package

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-21 11:26:02 UTC (rev 196955)
+++ PKGBUILD2013-10-21 11:28:57 UTC (rev 196956)
@@ -3,7 +3,7 @@
 
 pkgname=psi
 pkgver=0.15
-pkgrel=1
+pkgrel=2
 pkgdesc='Instant messaging application designed for the Jabber IM'
 url='http://psi-im.org/'
 license=('GPL')
@@ -16,9 +16,13 @@
 md5sums=('aea15f17cf93e7cea52f305523f761be'
  '2ed44ef84007b5b7f9a3f0a4f5f6a86d')
 
+prepare() {
+   cd ${srcdir}/psi-${pkgver}
+   patch -p0 -i ${srcdir}/archlinux.patch
+}
+
 build() {
cd ${srcdir}/psi-${pkgver}
-   patch -p0 -i ${srcdir}/archlinux.patch
./configure --prefix=/usr --release --no-separate-debug-info
make
 }

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Friday, September 9, 2011 @ 17:38:01
  Author: pierre
Revision: 137578

upgpkg: psi 0.14-5

rebuild old package

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-09 21:31:02 UTC (rev 137577)
+++ PKGBUILD2011-09-09 21:38:01 UTC (rev 137578)
@@ -3,7 +3,7 @@
 
 pkgname=psi
 pkgver=0.14
-pkgrel=4
+pkgrel=5
 pkgdesc='Instant messaging application designed for the Jabber IM'
 url='http://psi-im.org/'
 license=('GPL')

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Thursday, January 20, 2011 @ 09:18:34
  Author: pierre
Revision: 107019

upgpkg: psi 0.14-4
remove debug build; general cleanup

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-20 13:12:02 UTC (rev 107018)
+++ PKGBUILD2011-01-20 14:18:34 UTC (rev 107019)
@@ -3,7 +3,7 @@
 
 pkgname=psi
 pkgver=0.14
-pkgrel=3
+pkgrel=4
 pkgdesc='Instant messaging application designed for the Jabber IM'
 url='http://psi-im.org/'
 license=('GPL')
@@ -16,13 +16,13 @@
  'a965c6a4ad1028f14a5897c3f5088ae8')
 
 build() {
-   cd $srcdir/psi-${pkgver}
-   patch -p1 -i $srcdir/archlinux.patch
-   ./configure --prefix=/usr --disable-bundled-qca || return 1
-   make || return 1
+   cd ${srcdir}/psi-${pkgver}
+   patch -p1 -i ${srcdir}/archlinux.patch
+   ./configure --prefix=/usr --disable-bundled-qca --release 
--no-separate-debug-info
+   make
 }
 
 package() {
-   cd $srcdir/psi-${pkgver}
-   make INSTALL_ROOT=$pkgdir install
+   cd ${srcdir}/psi-${pkgver}
+   make INSTALL_ROOT=${pkgdir} install
 }

[arch-commits] Commit in psi/trunk (PKGBUILD)

[Pierre Schmitz]

Date: Thursday, April 1, 2010 @ 07:59:26
  Author: pierre
Revision: 75362

upgpkg: psi 0.14-3
openssl/heimdal rebuild

Modified:
  psi/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 11:51:23 UTC (rev 75361)
+++ PKGBUILD2010-04-01 11:59:26 UTC (rev 75362)
@@ -3,8 +3,8 @@
 
 pkgname=psi
 pkgver=0.14
-pkgrel=2
-pkgdesc='instant messaging application designed for the Jabber IM'
+pkgrel=3
+pkgdesc='Instant messaging application designed for the Jabber IM'
 url='http://psi-im.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -20,5 +20,9 @@
patch -p1 -i $srcdir/archlinux.patch
./configure --prefix=/usr --disable-bundled-qca || return 1
make || return 1
+}
+
+package() {
+   cd $srcdir/psi-${pkgver}
make INSTALL_ROOT=$pkgdir install
 }