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

[Balló György]

    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
===================================================================
--- PKGBUILD	2020-06-04 15:47:32 UTC (rev 638944)
+++ PKGBUILD	2020-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 <rion4ik at gmail.com>
+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 <QFile>
+ #include <QBuffer>
+ #include <QPainter>
++#include <QPainterPath>
+ 
+ #include "xmpp_xmlcommon.h"
+ #include "xmpp_vcard.h"
+From 1b0421f01b9c1cd5f27e0888469a53be34e92a40 Mon Sep 17 00:00:00 2001
+From: Sergey Ilinykh <rion4ik at gmail.com>
+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 <QMimeData>
+ #include <QMouseEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QScrollBar>
+ 
+ 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 <QPainterPath>
++
+ 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 <QGraphicsScene>
++#include <QPainterPath>
+ 
+ WbNewPath::WbNewPath(QGraphicsScene *s, QPointF startPos, int strokeWidth, const QColor &strokeColor,
+                      const QColor &fillColor) :