diff options
Diffstat (limited to 'packages/net-im')
4 files changed, 43 insertions, 5 deletions
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 ) diff --git a/packages/net-im/swiften/swiften-4.0.2.exheres-0 b/packages/net-im/swiften/swiften-4.0.2.exheres-0 new file mode 100644 index 0000000..d507be9 --- /dev/null +++ b/packages/net-im/swiften/swiften-4.0.2.exheres-0 @@ -0,0 +1,6 @@ +# Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru> +# Distributed under the terms of the GNU General Public License v2 + +require swiften + +PLATFORMS="~amd64 ~x86" diff --git a/packages/net-im/swiften/swiften.exlib b/packages/net-im/swiften/swiften.exlib index 5f2d75a..71560ce 100644 --- a/packages/net-im/swiften/swiften.exlib +++ b/packages/net-im/swiften/swiften.exlib @@ -2,7 +2,12 @@ # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru> SCM_REPOSITORY="git://swift.im/swift" -SCM_BRANCH="swift-4.x" + +if ever is_scm; then + SCM_BRANCH="swift-4.x" +else + SCM_TAG=swift-${PV} +fi require scons scm-git |