Psi-plus: fix build

net-im/psi_plus/patches/psi_plus-1.4.628.patchset

@@ -1,69 +0,0 @@
-From dd8ea6aef2ada1c6f0b7f0a7cb58690eb757ea6d Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 26 Mar 2019 19:20:22 +1000
-Subject: Fix build for Haiku
-
-
-diff --git a/src/libpsi/tools/systemwatch/systemwatch_unix.h b/src/libpsi/tools/systemwatch/systemwatch_unix.h
-index 992f1b5..9016efc 100644
---- a/src/libpsi/tools/systemwatch/systemwatch_unix.h
-+++ b/src/libpsi/tools/systemwatch/systemwatch_unix.h
-@@ -19,6 +19,11 @@
- 
- #ifndef SYSTEMWATCH_UNIX_H
- #define SYSTEMWATCH_UNIX_H
-+
-+#ifdef __HAIKU__
-+#undef USE_DBUS
-+#endif
-+
- #ifdef USE_DBUS
- #include <QDBusUnixFileDescriptor>
- #endif
-diff --git a/src/popupmanager.cpp b/src/popupmanager.cpp
-index 0416b95..4881e41 100644
---- a/src/popupmanager.cpp
-+++ b/src/popupmanager.cpp
-@@ -27,6 +27,9 @@
- #include <QPluginLoader>
- #include <QtPlugin>
- 
-+#ifdef __HAIKU__
-+#undef USE_DBUS
-+#endif
- 
- static const int defaultTimeout = 5;
- static const QString defaultType = "Classic";
-diff --git a/src/psicon.cpp b/src/psicon.cpp
-index 10ca94a..0fabb4c 100644
---- a/src/psicon.cpp
-+++ b/src/psicon.cpp
-@@ -130,6 +130,10 @@
- #include "mac_dock/mac_dock.h"
- #endif
- 
-+#ifdef __HAIKU__
-+#undef USE_DBUS
-+#endif
-+
- static const char *tunePublishOptionPath = "options.extended-presence.tune.publish";
- static const char *tuneUrlFilterOptionPath = "options.extended-presence.tune.url-filter";
- static const char *tuneTitleFilterOptionPath = "options.extended-presence.tune.title-filter";
-diff --git a/src/tools/tunecontroller/tunecontrollermanager.cpp b/src/tools/tunecontroller/tunecontrollermanager.cpp
-index 88157e4..1ed70f0 100644
---- a/src/tools/tunecontroller/tunecontrollermanager.cpp
-+++ b/src/tools/tunecontroller/tunecontrollermanager.cpp
-@@ -24,6 +24,10 @@
- #include <QtCore>
- #include <QPluginLoader>
- 
-+#ifdef __HAIKU__
-+#undef USE_DBUS
-+#endif
-+
- #include "tunecontroller.h"
- #include "tunecontrollermanager.h"
- #include "tunecontrollerplugin.h"
--- 
-2.19.1
-

net-im/psi_plus/psi_plus-1.4.628.recipe

@@ -4,7 +4,7 @@ designed for the Jabber power users."
 HOMEPAGE="https://psi-plus.com/"
 COPYRIGHT="2005-2019, Psi+ Project"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/psi-plus/psi-plus-snapshots/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="e46026cdb37cdff91b1f56067e2fb448a87e36c1fea89590006ede57347ccbdd"
 SOURCE_DIR="psi-plus-snapshots-$portVersion"
@@ -17,7 +17,6 @@ SOURCE_URI_3="https://github.com/signalapp/libsignal-protocol-c/archive/v$spcVer
 CHECKSUM_SHA256_3="f3826f3045352e14027611c95449bfcfe39bfd3d093d578c70f70eee0c85000d"
 SOURCE_FILENAME_3="libsignal-protocol-c-$spcVersion.tar.gz"
 SOURCE_DIR_3="libsignal-protocol-c-$spcVersion"
-PATCHES="psi_plus-$portVersion.patchset"
 ADDITIONAL_FILES="psi-plus.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
@@ -64,7 +63,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:patch
 	cmd:pkg_config$secondaryArchSuffix