diff options
| author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2020-08-14 15:53:18 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2020-08-14 15:53:18 +0300 |
| commit | 2a98b7346cb701e4fd3066ab6bb3d906e30349cc (patch) | |
| tree | 10171543e72d723da50b90cdd71e0d9c6e088bc7 | |
| parent | baa03f424cac1f45cf0452907ae2cb6957b7b426 (diff) | |
spectrum-scm build fix
| -rw-r--r-- | packages/net-im/spectrum/files/scm-build-fix.patch | 13 | ||||
| -rw-r--r-- | packages/net-im/spectrum/spectrum-2.0.10.1.exheres-0 | 7 | ||||
| -rw-r--r-- | packages/net-im/spectrum/spectrum-2.0.9.exheres-0 | 7 | ||||
| -rw-r--r-- | packages/net-im/spectrum/spectrum.exlib | 9 |
4 files changed, 20 insertions, 16 deletions
diff --git a/packages/net-im/spectrum/files/scm-build-fix.patch b/packages/net-im/spectrum/files/scm-build-fix.patch new file mode 100644 index 0000000..f556be0 --- /dev/null +++ b/packages/net-im/spectrum/files/scm-build-fix.patch @@ -0,0 +1,13 @@ +diff --git a/spectrum/src/frontends/xmpp/carbonresponder.cpp b/spectrum/src/frontends/xmpp/carbonresponder.cpp +index 60d5bb9e..aeae0b49 100644 +--- a/spectrum/src/frontends/xmpp/carbonresponder.cpp ++++ b/spectrum/src/frontends/xmpp/carbonresponder.cpp +@@ -30,7 +30,7 @@ void CarbonResponder::start() { + + //Call when DiscoInfoResponder is available + void CarbonResponder::setDiscoInfoResponder(DiscoInfoResponder *discoInfoResponder) { +- LOG4CXX_TRACE(logger, "Registering disco#info features") ++ LOG4CXX_TRACE(logger, "Registering disco#info features"); + discoInfoResponder->addTransportFeature("urn:xmpp:carbons:2"); + } + diff --git a/packages/net-im/spectrum/spectrum-2.0.10.1.exheres-0 b/packages/net-im/spectrum/spectrum-2.0.10.1.exheres-0 deleted file mode 100644 index 5ff3942..0000000 --- a/packages/net-im/spectrum/spectrum-2.0.10.1.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 -# Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru> - -require spectrum - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/net-im/spectrum/spectrum-2.0.9.exheres-0 b/packages/net-im/spectrum/spectrum-2.0.9.exheres-0 deleted file mode 100644 index 5ff3942..0000000 --- a/packages/net-im/spectrum/spectrum-2.0.9.exheres-0 +++ /dev/null @@ -1,7 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 -# Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru> - -require spectrum - -PLATFORMS="~amd64 ~x86" - diff --git a/packages/net-im/spectrum/spectrum.exlib b/packages/net-im/spectrum/spectrum.exlib index 09b1be6..5ef1ff3 100644 --- a/packages/net-im/spectrum/spectrum.exlib +++ b/packages/net-im/spectrum/spectrum.exlib @@ -84,8 +84,13 @@ 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 "${CMAKE_SOURCE}"/cmake_modules/Findjsoncpp.cmake - edo cp "${FILES}"/Findjsoncpp.cmake "${CMAKE_SOURCE}"/cmake_modules/Findjsoncpp.cmake + if ever is_scm; then + edo rm "${CMAKE_SOURCE}"/cmake_modules/FindJsonCpp.cmake + edo cp "${FILES}"/Findjsoncpp.cmake "${CMAKE_SOURCE}"/cmake_modules/FindJsonCpp.cmake + else + edo rm "${CMAKE_SOURCE}"/cmake_modules/Findjsoncpp.cmake + edo cp "${FILES}"/Findjsoncpp.cmake "${CMAKE_SOURCE}"/cmake_modules/Findjsoncpp.cmake + fi } fi |