From f5cca23035aeea689912b53895de22eda7f81c77 Mon Sep 17 00:00:00 2001
From: Gluzskiy Alexandr <sss@sss.chaoslab.ru>
Date: Fri, 27 Jul 2018 05:15:42 +0300
Subject: spectrum: build fix swiften: added latest release

---
 .../6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff  | 13 +++++++++++++
 packages/net-im/spectrum/spectrum.exlib            | 22 ++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 packages/net-im/spectrum/files/6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff

(limited to 'packages/net-im/spectrum')

diff --git a/packages/net-im/spectrum/files/6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff b/packages/net-im/spectrum/files/6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff
new file mode 100644
index 0000000..d66ddf5
--- /dev/null
+++ b/packages/net-im/spectrum/files/6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff
@@ -0,0 +1,13 @@
+diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp
+index bff05a6a..c4e19f70 100644
+--- a/libtransport/NetworkPluginServer.cpp
++++ b/libtransport/NetworkPluginServer.cpp
+@@ -1815,7 +1815,7 @@ void NetworkPluginServer::wrapIncomingImage(Swift::Message* msg, const pbnetwork
+             msg->addPayload(oob_payload);
+             msg->setBody(image_url);
+         } else {
+-            LOG4CXX_WARN(logger, "xhtml seems to contain an image, but doesn't match: " + payload.xhtml())
++            LOG4CXX_WARN(logger, "xhtml seems to contain an image, but doesn't match: " + payload.xhtml());
+         }
+     }
+ }
diff --git a/packages/net-im/spectrum/spectrum.exlib b/packages/net-im/spectrum/spectrum.exlib
index 38f2177..2fb8aac 100644
--- a/packages/net-im/spectrum/spectrum.exlib
+++ b/packages/net-im/spectrum/spectrum.exlib
@@ -1,6 +1,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
+if ! ever at_least 2.0.7; then
+    SCM_EXTERNAL_REFS="
+        msvc-deps/curl:curl
+    "
+    SCM_SECONDARY_REPOSITORIES="curl"
+    SCM_curl_REPOSITORY="https://github.com/curl/curl.git"
+fi
 
 require github [ user=hanzz project=libtransport force_git_clone=true ]
 require cmake [ api=2 ]
@@ -25,15 +32,16 @@ MYOPTIONS="
     ( providers: libressl openssl ) [[ number-selected = exactly-one ]]
 "
 
-DEPENDENCIES="
+
+DEPENDENCIES+="
     build:
-        dev-libs/jsoncpp
         sys-devel/gettext
     build+run:
-        net-im/swiften
+        dev-libs/jsoncpp
         dev-libs/popt
         dev-libs/libev
         dev-libs/log4cxx
+        net-im/swiften
         doc? ( app-doc/doxygen )
         frotz? ( dev-libs/protobuf )
         irc? (
@@ -53,6 +61,12 @@ DEPENDENCIES="
         dev-cpp/cppunit
 "
 
+if ! ever is_scm; then
+    DEFAULT_SRC_PREPARE_PATCHES=(
+        "${FILES}"/6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff
+    )
+fi
+
 
 CMAKE_SRC_CONFIGURE_OPTION_ENABLES=(
     'doc DOCS'
@@ -61,7 +75,7 @@ CMAKE_SRC_CONFIGURE_OPTION_ENABLES=(
     MYSQL
     'postgres PQXX'
     'smstools SMSTOOLS3'
-    SQLITE
+    'sqlite SQLITE3'
     TWITTER
 )
 
-- 
cgit v1.2.3