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 =================================================================== --- PKGBUILD 2018-04-18 21:30:16 UTC (rev 316931) +++ PKGBUILD 2018-04-18 21:35:16 UTC (rev 316932) @@ -1,9 +1,9 @@ # $Id$ # Maintainer: Sergej Pupykin <[email protected]> -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&id=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.patch 2018-04-18 21:35:16 UTC (rev 316932) @@ -0,0 +1,36 @@ +From f3372d84595d10b757de4568399707bc721f6850 Mon Sep 17 00:00:00 2001 +From: sirlucjan <[email protected]> +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)
