diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2019-03-27 13:39:19 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2019-03-27 13:39:19 +0300 |
| commit | 251b4003390a403b21fe5a0fcbca092b57b75f6a (patch) | |
| tree | f9abf19159a6915bc5ed5a189636ee0be7f926b6 | |
| parent | 3a3cfaf4d5dc77892436ebc160f8c978ea2cdfbd (diff) | |
spectrum: build fix, cleanup, update
| -rw-r--r-- | packages/net-im/spectrum/files/6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff | 17 | ||||
| -rw-r--r-- | packages/net-im/spectrum/spectrum-2.0.10.1.exheres-0 (renamed from packages/net-im/spectrum/spectrum-2.0.7.exheres-0) | 0 | ||||
| -rw-r--r-- | packages/net-im/spectrum/spectrum-scm.exheres-0 | 5 | ||||
| -rw-r--r-- | packages/net-im/spectrum/spectrum.exlib | 12 |
4 files changed, 3 insertions, 31 deletions
diff --git a/packages/net-im/spectrum/files/6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff b/packages/net-im/spectrum/files/6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff deleted file mode 100644 index f16e44e..0000000 --- a/packages/net-im/spectrum/files/6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff +++ /dev/null @@ -1,17 +0,0 @@ -Source: upstream code repo -Reason: build fix (typo) -Upstream: fixed - -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-2.0.7.exheres-0 b/packages/net-im/spectrum/spectrum-2.0.10.1.exheres-0 index 5ff3942..5ff3942 100644 --- a/packages/net-im/spectrum/spectrum-2.0.7.exheres-0 +++ b/packages/net-im/spectrum/spectrum-2.0.10.1.exheres-0 diff --git a/packages/net-im/spectrum/spectrum-scm.exheres-0 b/packages/net-im/spectrum/spectrum-scm.exheres-0 index ba58455..5ff3942 100644 --- a/packages/net-im/spectrum/spectrum-scm.exheres-0 +++ b/packages/net-im/spectrum/spectrum-scm.exheres-0 @@ -1,12 +1,7 @@ # Distributed under the terms of the GNU General Public License v2 # Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru> -SCM_REVISION="61a247c5d4a748e43599e1733154bb29296fb21f" - require spectrum PLATFORMS="~amd64 ~x86" -#DEFAULT_SRC_PREPARE_PATCHES=( -# "${FILES}"/scm-build-fix.patch -#) diff --git a/packages/net-im/spectrum/spectrum.exlib b/packages/net-im/spectrum/spectrum.exlib index 65841c3..09b1be6 100644 --- a/packages/net-im/spectrum/spectrum.exlib +++ b/packages/net-im/spectrum/spectrum.exlib @@ -13,7 +13,6 @@ fi require github [ user=hanzz project=libtransport ] require cmake [ api=2 ] - LICENCES="GPL-2" SLOT="0" @@ -60,11 +59,7 @@ DEPENDENCIES+=" " if ! ever is_scm; then - if ever at_least 2.0.7; then - DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/6d220b0a083b3adf7fd4ae65ca011b29488493b7.diff - ) - fi + CMAKE_SOURCE="${WORKBASE}/spectrum2-${PV}" fi CMAKE_SRC_CONFIGURE_TESTS=( '-DENABLE_TESTS=ON -DENABLE_TESTS=OFF' ) @@ -89,9 +84,8 @@ if ever at_least 2.0.8; then # replace complicated broken module by simple pkg-config search # https://github.com/SpectrumIM/spectrum2/issues/300 - - edo rm "${WORKBASE}/${PNV}"/cmake_modules/Findjsoncpp.cmake - edo cp "${FILES}"/Findjsoncpp.cmake "${WORKBASE}/${PNV}"/cmake_modules/Findjsoncpp.cmake + edo rm "${CMAKE_SOURCE}"/cmake_modules/Findjsoncpp.cmake + edo cp "${FILES}"/Findjsoncpp.cmake "${CMAKE_SOURCE}"/cmake_modules/Findjsoncpp.cmake } fi |