From f8dc84e497376f50fa4879bc454b52fe7a36555a Mon Sep 17 00:00:00 2001
From: Giova84 <musical777@gmail.com>
Date: Fri, 4 Aug 2017 18:10:14 +0200
Subject: [PATCH] psi+: enable build with QtWebkit (#1558)

* recipe clean up
---
 net-im/psi_plus/psi_plus-0.16.475.recipe | 60 ++++++++++++------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/net-im/psi_plus/psi_plus-0.16.475.recipe b/net-im/psi_plus/psi_plus-0.16.475.recipe
index 15b78cce4..b1b02d0e8 100644
--- a/net-im/psi_plus/psi_plus-0.16.475.recipe
+++ b/net-im/psi_plus/psi_plus-0.16.475.recipe
@@ -2,16 +2,17 @@ SUMMARY="A development branch of Psi IM XMPP/Jabber client"
 DESCRIPTION="Psi is a cross-platform powerful XMPP/Jabber client (Qt, C++) \
 designed for the Jabber power users."
 HOMEPAGE="https://code.google.com/p/psi-dev/"
+COPYRIGHT="2005-2015, Psi+ Project"
+LICENSE="GNU GPL v2"
+REVISION="2"
 SOURCE_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="d20f79845da742a0711c76834e4c3199648d032bf49267fe28c2f1a2b494adb7"
 SOURCE_FILENAME="psi-plus-$portVersion.tar.gz"
 SOURCE_DIR="psi-plus-snapshots-$portVersion"
-CHECKSUM_SHA256="d20f79845da742a0711c76834e4c3199648d032bf49267fe28c2f1a2b494adb7"
-REVISION="1"
-LICENSE="GNU GPL v2"
-COPYRIGHT="2005-2015, Psi+ Project"
+PATCHES="psi_plus_x86-0.16.475.patchset"
+ADDITIONAL_FILES="psi-plus.rdef"
 
 ARCHITECTURES="!x86_gcc2 x86"
-
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -19,19 +20,11 @@ PROVIDES="
 	app:Psi$secondaryArchSuffix
 	"
 REQUIRES="
-	haiku${secondaryArchSuffix}
-	libqt4${secondaryArchSuffix} >= 4.8
-	lib:libqca$secondaryArchSuffix	
+	haiku$secondaryArchSuffix
+	libqt4$secondaryArchSuffix >= 4.8
+	lib:libqca$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
-BUILD_PREREQUIRES="                               
-	cmd:g++${secondaryArchSuffix}
-	cmd:patch
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:cmake
-	cmd:make
-	cmd:which
-	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	libqt4${secondaryArchSuffix}_devel >= 4.8
@@ -40,22 +33,27 @@ BUILD_REQUIRES="
 	devel:libqca$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
+BUILD_PREREQUIRES="
+	cmd:g++$secondaryArchSuffix
+	cmd:patch
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:cmake
+	cmd:make
+	cmd:which
+	"
 
 PATCH()
 {
 	sed -i 's/ qca2-qt4//g' configure
 }
 
-PATCHES="psi_plus_x86-0.16.475.patchset"
-ADDITIONAL_FILES="psi-plus.rdef"
-
 BUILD()
 {
-	./configure --disable-qdbus --enable-plugins \
-	--prefix=$prefix \
-	--bindir=$appsDir/Psi-plus \
-	--libdir=$appsDir/Psi-plus/lib \
-	--datadir=$appsDir/Psi-plus/data
+	./configure --disable-qdbus --enable-plugins --enable-webkit \
+		--prefix=$prefix \
+		--bindir=$appsDir/Psi-plus \
+		--libdir=$appsDir/Psi-plus/lib \
+		--datadir=$appsDir/Psi-plus/data
 	make $jobArgs
 
 	cd src/plugins/generic
@@ -64,13 +62,13 @@ BUILD()
 # 	TODO: fix screenshotplugin, otrplugin and python plugins
 
 	for dir in attentionplugin autoreplyplugin birthdayreminderplugin \
-	captchaformsplugin cleanerplugin clientswitcherplugin \
-	conferenceloggerplugin contentdownloaderplugin chessplugin \
-	gomokugameplugin jabberdiskplugin \
-	extendedmenuplugin extendedoptionsplugin gmailserviceplugin gnupgplugin \
-	historykeeperplugin icqdieplugin imageplugin juickplugin \
-	pepchangenotifyplugin qipxstatusesplugin skinsplugin stopspamplugin \
-	storagenotesplugin translateplugin watcherplugin
+		captchaformsplugin cleanerplugin clientswitcherplugin \
+		conferenceloggerplugin contentdownloaderplugin chessplugin \
+		gomokugameplugin jabberdiskplugin \
+		extendedmenuplugin extendedoptionsplugin gmailserviceplugin gnupgplugin \
+		historykeeperplugin icqdieplugin imageplugin juickplugin \
+		pepchangenotifyplugin qipxstatusesplugin skinsplugin stopspamplugin \
+		storagenotesplugin translateplugin watcherplugin
 	do
 		pushd "$dir" && qmake && make && cp *.so $appsDir/Psi-plus/plugins && popd
 	done