[arch-commits] Commit in psi/repos (4 files)

Evangelos Foutras foutrelis at archlinux.org
Sat Nov 17 16:46:42 UTC 2018


    Date: Saturday, November 17, 2018 @ 16:46:41
  Author: foutrelis
Revision: 408576

archrelease: copy trunk to community-staging-x86_64

Added:
  psi/repos/community-staging-x86_64/
  psi/repos/community-staging-x86_64/PKGBUILD
    (from rev 408575, psi/trunk/PKGBUILD)
  psi/repos/community-staging-x86_64/no-qca-qt4.patch
    (from rev 408575, psi/trunk/no-qca-qt4.patch)
  psi/repos/community-staging-x86_64/qt-5.11.patch
    (from rev 408575, psi/trunk/qt-5.11.patch)

------------------+
 PKGBUILD         |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 no-qca-qt4.patch |   36 +++++++++++++++++++++++++++++++++
 qt-5.11.patch    |   21 +++++++++++++++++++
 3 files changed, 114 insertions(+)

Copied: psi/repos/community-staging-x86_64/PKGBUILD (from rev 408575, psi/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2018-11-17 16:46:41 UTC (rev 408576)
@@ -0,0 +1,57 @@
+# Maintainer: Sergej Pupykin <arch+pub at sergej.pp.ru>
+
+pkgname=('psi' 'psi-nowebengine')
+pkgver=1.4
+pkgrel=2
+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-staging-x86_64/no-qca-qt4.patch (from rev 408575, psi/trunk/no-qca-qt4.patch)
===================================================================
--- community-staging-x86_64/no-qca-qt4.patch	                        (rev 0)
+++ community-staging-x86_64/no-qca-qt4.patch	2018-11-17 16:46:41 UTC (rev 408576)
@@ -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) 

Copied: psi/repos/community-staging-x86_64/qt-5.11.patch (from rev 408575, psi/trunk/qt-5.11.patch)
===================================================================
--- community-staging-x86_64/qt-5.11.patch	                        (rev 0)
+++ community-staging-x86_64/qt-5.11.patch	2018-11-17 16:46:41 UTC (rev 408576)
@@ -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"


More information about the arch-commits mailing list