[skip-ci] psi: update to 1.3

psi/PKGBUILD

@@ -1,31 +1,40 @@
-#
-# Apps Packages for Chakra, part of chakra-project.org
-#
-# maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
-
 pkgname=psi
-pkgver=0.15
+pkgver=1.3
 pkgrel=1
-pkgdesc='Instant messaging application designed for the Jabber IM'
-url='http://psi-im.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
+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')
+makedepends=('cmake' 'qt5-multimedia')
 categories=('communication')
-install='psi.install'
-source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
-        'chakralinux.patch')
-md5sums=('aea15f17cf93e7cea52f305523f761be'
-         '4f41758f1ddff5cb2ac3396895da3530')
+source=("https://download.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+        "chakralinux.patch"
+        "no-qca-qt4.patch"
+        "qt-5.11.patch")
+sha256sums=('59debd16e61ab1d4ff88aca9f41b9caaaca8395f1576418fb99214d5e2c6fa8b'
+            'e6c44c4a2d0ebdc05cb317954931bbb4a2aab1c1cd447fcd9a70e13d5832558d'
+            'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
+            'e56ec1a250488b2cf9d42887aac432ff2e0ef482eb7cc8500f3d52cb53949119')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i $srcdir/chakralinux.patch
+  patch -p1 <"$srcdir"/no-qca-qt4.patch
+  patch -p1 <"$srcdir"/qt-5.11.patch
+}
 
 build() {
-	cd $srcdir/psi-${pkgver}
-	patch -p1 -i $srcdir/chakralinux.patch
-	./configure --prefix=/usr --release --no-separate-debug-info
-	make
+  cd $pkgname-$pkgver
+  mkdir -p build
+  cd build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+  make
 }
 
 package() {
-	cd $srcdir/psi-${pkgver}
-	make INSTALL_ROOT=$pkgdir install
+  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"
 }

psi/no-qca-qt4.patch

@@ -0,0 +1,36 @@
+From f3372d84595d10b757de4568399707bc721f6850 Mon Sep 17 00:00:00 2001
+From: sirlucjan <lucjan.lucjanov@gmail.com>
+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) 

psi/psi.install

@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

psi/qt-5.11.patch

@@ -0,0 +1,21 @@
+From 4b838c04fa90ab56974bc4c57aaf7d4e80b8fff8 Mon Sep 17 00:00:00 2001
+From: Vitozz <thetvg@gmail.com>
+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 <QTimer>
+ #include <QHeaderView>
+ #include <QDropEvent>
++#include <QButtonGroup>
+ 
+ #include "psicon.h"
+ #include "psiaccount.h"