[arch-commits] Commit in psi/repos/community-x86_64 (7 files)
Balló György
bgyorgy at archlinux.org
Thu Jun 4 16:01:44 UTC 2020
Date: Thursday, June 4, 2020 @ 16:01:42
Author: bgyorgy
Revision: 638946
archrelease: copy trunk to community-x86_64
Added:
psi/repos/community-x86_64/PKGBUILD
(from rev 638945, psi/trunk/PKGBUILD)
psi/repos/community-x86_64/no-qca-qt4.patch
(from rev 638945, psi/trunk/no-qca-qt4.patch)
psi/repos/community-x86_64/qt-5.11.patch
(from rev 638945, psi/trunk/qt-5.11.patch)
psi/repos/community-x86_64/qt-5.15.patch
(from rev 638945, psi/trunk/qt-5.15.patch)
Deleted:
psi/repos/community-x86_64/PKGBUILD
psi/repos/community-x86_64/no-qca-qt4.patch
psi/repos/community-x86_64/qt-5.11.patch
------------------+
PKGBUILD | 121 ++++++++++++++++++++++++++++-------------------------
no-qca-qt4.patch | 72 +++++++++++++++----------------
qt-5.11.patch | 42 +++++++++---------
qt-5.15.patch | 70 ++++++++++++++++++++++++++++++
4 files changed, 191 insertions(+), 114 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-04 16:01:33 UTC (rev 638945)
+++ PKGBUILD 2020-06-04 16:01:42 UTC (rev 638946)
@@ -1,57 +0,0 @@
-# Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
-
-pkgname=('psi' 'psi-nowebengine')
-pkgver=1.4
-pkgrel=3
-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')
-source=("https://download.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
- "no-qca-qt4.patch"
- "qt-5.11.patch")
-sha256sums=('761934c1c62daf69215f085ba24d7f9cd4db05ef0ad735383d68fb03d21571ad'
- 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
- 'e56ec1a250488b2cf9d42887aac432ff2e0ef482eb7cc8500f3d52cb53949119')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -p1 <"$srcdir"/no-qca-qt4.patch
- patch -p1 <"$srcdir"/qt-5.11.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- mkdir -p build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
- make
- cd ..
-
- mkdir -p build-nowebengine
- cd build-nowebengine
- 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-nowebengine() {
- pkgdesc+=" without WebEngine support"
- depends=('hunspell' 'minizip' 'qca-qt5' 'qt5-svg' 'qt5-x11extras' 'libidn')
- provides=("$pkgbase=$pkgver")
- conflicts=("$pkgbase")
- replaces=('psi-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"
-}
Copied: psi/repos/community-x86_64/PKGBUILD (from rev 638945, psi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-04 16:01:42 UTC (rev 638946)
@@ -0,0 +1,64 @@
+# Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
+
+pkgname=('psi' 'psi-nowebengine')
+pkgver=1.4
+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-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.15.patch")
+sha256sums=('761934c1c62daf69215f085ba24d7f9cd4db05ef0ad735383d68fb03d21571ad'
+ 'a6ea9a62100b6990b8a6c8590a6d0e9df095b99b6527bb5490a7fd3f6929ac23'
+ '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() {
+ cd $pkgname-$pkgver
+ mkdir -p build
+ cd build
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+ make
+ cd ..
+
+ mkdir -p build-nowebengine
+ cd build-nowebengine
+ 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"
+ install -Dm644 ../$pkgbase.appdata.xml "$pkgdir/usr/share/metainfo/$pkgbase.appdata.xml"
+}
+
+package_psi-nowebengine() {
+ pkgdesc+=" without WebEngine support"
+ depends=('hunspell' 'minizip' 'qca-qt5' 'qt5-svg' 'qt5-x11extras' 'libidn')
+ provides=("$pkgbase=$pkgver")
+ conflicts=("$pkgbase")
+ replaces=('psi-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"
+
+ # Ignore package by AppStream to avoid duplicated IDs
+ echo 'X-AppStream-Ignore=true' >> "$pkgdir/usr/share/applications/$pkgbase.desktop"
+}
Deleted: no-qca-qt4.patch
===================================================================
--- no-qca-qt4.patch 2020-06-04 16:01:33 UTC (rev 638945)
+++ no-qca-qt4.patch 2020-06-04 16:01:42 UTC (rev 638946)
@@ -1,36 +0,0 @@
-From f3372d84595d10b757de4568399707bc721f6850 Mon Sep 17 00:00:00 2001
-From: sirlucjan <lucjan.lucjanov at 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)
Copied: psi/repos/community-x86_64/no-qca-qt4.patch (from rev 638945, psi/trunk/no-qca-qt4.patch)
===================================================================
--- no-qca-qt4.patch (rev 0)
+++ no-qca-qt4.patch 2020-06-04 16:01:42 UTC (rev 638946)
@@ -0,0 +1,36 @@
+From f3372d84595d10b757de4568399707bc721f6850 Mon Sep 17 00:00:00 2001
+From: sirlucjan <lucjan.lucjanov at 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)
Deleted: qt-5.11.patch
===================================================================
--- qt-5.11.patch 2020-06-04 16:01:33 UTC (rev 638945)
+++ qt-5.11.patch 2020-06-04 16:01:42 UTC (rev 638946)
@@ -1,21 +0,0 @@
-From 4b838c04fa90ab56974bc4c57aaf7d4e80b8fff8 Mon Sep 17 00:00:00 2001
-From: Vitozz <thetvg at 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"
Copied: psi/repos/community-x86_64/qt-5.11.patch (from rev 638945, psi/trunk/qt-5.11.patch)
===================================================================
--- qt-5.11.patch (rev 0)
+++ qt-5.11.patch 2020-06-04 16:01:42 UTC (rev 638946)
@@ -0,0 +1,21 @@
+From 4b838c04fa90ab56974bc4c57aaf7d4e80b8fff8 Mon Sep 17 00:00:00 2001
+From: Vitozz <thetvg at 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"
Copied: psi/repos/community-x86_64/qt-5.15.patch (from rev 638945, psi/trunk/qt-5.15.patch)
===================================================================
--- qt-5.15.patch (rev 0)
+++ qt-5.15.patch 2020-06-04 16:01:42 UTC (rev 638946)
@@ -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) :
More information about the arch-commits
mailing list