diff options
Diffstat (limited to 'net-im/spectrum2')
-rw-r--r-- | net-im/spectrum2/Manifest | 4 | ||||
-rw-r--r-- | net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch | 21 | ||||
-rw-r--r-- | net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch | 54 | ||||
-rw-r--r-- | net-im/spectrum2/spectrum2-2.0.12-r4.ebuild | 112 |
4 files changed, 0 insertions, 191 deletions
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest index 1e6937975055..6832f24607bd 100644 --- a/net-im/spectrum2/Manifest +++ b/net-im/spectrum2/Manifest @@ -1,12 +1,8 @@ -AUX spectrum2-2.0.12-boost-173-compatibility.patch 652 BLAKE2B 496e0fb33f3e88775f91c028e6e89f74c3d7d72b09cd1818712b2da5a54b315fdbf00ab9a7525cca744070061d79f32fe3764f2700d695b37a8b308de08b8f88 SHA512 999e9330c4f0fbd1883df28d7fbe15fd40b1a492e6b925900734df2f493fa4241f2a234a1fd3db2b7dc77ddfef66026ab1a656806c17ae7f1fd8f75f9cdf0199 -AUX spectrum2-2.0.12-gcc-10-compatibility.patch 1731 BLAKE2B 5c0c828ee2bfc51affbb44e06b6a53414c608173be799e92c5ecc76a7411cd6cba5a818b7a4df80b209c64c8c0d543fa10077fe8e45f2014f84b614231b20c58 SHA512 228ccf52a17a88e18e5fe97da1ef39c207142286abc5b018fab08c2f3bc96f13fac89147406a23fbd986b35ad23da9b34239497a830396ae2864708f82925505 AUX spectrum2-2.0.13-libpqxx-7-compatibility.patch 3455 BLAKE2B d67edbcc8454b4f193684464cfccb418e63c8dbe2ac8ee304bc9a40b9eae5e7764f0b7b48bbe737ae3f6f119100463c65c525b4b272991ae6fb3ed4f10e31fe5 SHA512 a0b407f5611493e690a4f024f53672547dcf240d131e0c2ce5ec217f6270cf370846a69b6869a399c963c3dff735b3dfdac5265e6e8bfc78bbad16d84f555acf AUX spectrum2-2.0.13-musl-compatibility.patch 2958 BLAKE2B 319138a33a94bbe0e2c6c8487a7ed05b0782ad841ddd6cf926e38569ba058dc48e6167f3c2e618f95e62b2e4e056e8a75b1b92a5ba63006fc7d54d2b70b20023 SHA512 c2f89a28afa8890d599ce9de74a296c0c8bd9a48109e8979ff8d86d6c16da1016f5ef8c59ce90ad78b3dfd1eae57787c9ea46786150ee7420d5d5606d1a50c97 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53 -DIST spectrum2-2.0.12.tar.gz 839711 BLAKE2B 22dbc201135008effbd1aac52a708f5c942bd9a3c4a359622d1eb21ce104bdd3a6be64f1cb2ad5950b51e5f1772d77fce088d4a61a56532d970901656176d3f7 SHA512 bcd2797877583e6b59e5f1da430ed049e5bcdddfa9698f6d845f020847405ff8ee01b595d47d414105153e2a00e9a8fac171f45db5d39f72ddf0f6588bc71a36 DIST spectrum2-2.0.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7 -EBUILD spectrum2-2.0.12-r4.ebuild 2536 BLAKE2B a89ba62732e173101cb4b25c5f293e9a102fb9c1cecb4d16c2403b5cdc64a7142a0ffdd5edb2a3242a85d29e3eb35a00d377348dfddde25aa7b1c0c8d827222a SHA512 5cd211c7bb8dfc3adfc488ee85d803861fd337a508783af514d93a9180c861380800b2e679e304a92247de0dceb8fb7bebcbe10ad88313ab8d8398fe59612810 EBUILD spectrum2-2.0.13-r2.ebuild 2423 BLAKE2B c680cd87fb51c861b76c03c41496d3004672a9e17b0645d45d6b3b239e2a0d9cf054e5043d0efa94600c2868935e1d60615b1193f96d471bf521be88e4d12370 SHA512 fd9750e822e413f0493370c10ee3be8a80fbdac7eb284464e584b40f28ce2111230848b8c59b427a30a71d262197bfe5be9c737a385c49955dba1bada184c49e MISC metadata.xml 1140 BLAKE2B 279808a98359761ce2620d44575f320de77b5b19f795d55c9b3b16f13eec2ab5fd900c00adef81ba87aacd41d9527ca998bcd27fc6a7d3c3c61d668791f501a4 SHA512 8adf9a85df87528db06d13c830dd96bb2aa77a3d22bb5701c23db0951ac67d7b6b29c8ffa5af11a6bd15e84e7a0722ea99f18e7b6f9ca00b5b42dfc36d3a1a7d diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch deleted file mode 100644 index b9a8adeee5a8..000000000000 --- a/net-im/spectrum2/files/spectrum2-2.0.12-boost-173-compatibility.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 1a6ede2dbf0f621e3e6864675befcbc32e02c8b6 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <kostecki@his.de> -Date: Thu, 14 May 2020 10:34:43 +0200 -Subject: [PATCH] Fix compilation with boost-1.73 - -Signed-off-by: Conrad Kostecki <conrad@kostecki.com> ---- - include/transport/ThreadPool.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/transport/ThreadPool.h b/include/transport/ThreadPool.h -index 5902f965..ffd07c8e 100644 ---- a/include/transport/ThreadPool.h -+++ b/include/transport/ThreadPool.h -@@ -1,5 +1,6 @@ - #pragma once - -+#include <boost/bind.hpp> - #include <boost/thread.hpp> - #include <boost/thread/mutex.hpp> - #include <queue> diff --git a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch deleted file mode 100644 index ad13208b3e13..000000000000 --- a/net-im/spectrum2/files/spectrum2-2.0.12-gcc-10-compatibility.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 95e6968c0f8c95f6bd817e5081e0b10dea9d4269 Mon Sep 17 00:00:00 2001 -From: Conrad Kostecki <kostecki@his.de> -Date: Wed, 13 May 2020 14:22:27 +0200 -Subject: [PATCH] Fix dfrotz compilation with GCC >= 10 - -Since GCC enables by default -fno-common, -the compilation of dfrotz due multiple definitions will fail. - -Signed-off-by: Conrad Kostecki <conrad@kostecki.com> ---- - backends/frotz/dfrotz/dumb/dumb_init.c | 2 +- - backends/frotz/dfrotz/dumb/dumb_input.c | 2 +- - backends/frotz/dfrotz/dumb/dumb_output.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/backends/frotz/dfrotz/dumb/dumb_init.c b/backends/frotz/dfrotz/dumb/dumb_init.c -index 4b9c6704..35295b74 100644 ---- a/backends/frotz/dfrotz/dumb/dumb_init.c -+++ b/backends/frotz/dfrotz/dumb/dumb_init.c -@@ -7,7 +7,7 @@ - - #include "dumb_frotz.h" - --f_setup_t f_setup; -+extern f_setup_t f_setup; - - #define INFORMATION "\ - An interpreter for all Infocom and other Z-Machine games.\n\ -diff --git a/backends/frotz/dfrotz/dumb/dumb_input.c b/backends/frotz/dfrotz/dumb/dumb_input.c -index 4149b2b0..88fc8ae5 100644 ---- a/backends/frotz/dfrotz/dumb/dumb_input.c -+++ b/backends/frotz/dfrotz/dumb/dumb_input.c -@@ -5,7 +5,7 @@ - */ - - #include "dumb_frotz.h" --f_setup_t f_setup; -+extern f_setup_t f_setup; - - static char runtime_usage[] = - "DUMB-FROTZ runtime help:\n" -diff --git a/backends/frotz/dfrotz/dumb/dumb_output.c b/backends/frotz/dfrotz/dumb/dumb_output.c -index 9e505167..6dc7db82 100644 ---- a/backends/frotz/dfrotz/dumb/dumb_output.c -+++ b/backends/frotz/dfrotz/dumb/dumb_output.c -@@ -7,7 +7,7 @@ - - #include "dumb_frotz.h" - --f_setup_t f_setup; -+extern f_setup_t f_setup; - - static bool show_line_numbers = FALSE; - static bool show_line_types = -1; diff --git a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild b/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild deleted file mode 100644 index 3bbf840a5229..000000000000 --- a/net-im/spectrum2/spectrum2-2.0.12-r4.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd - -DESCRIPTION="An open source instant messaging transport" -HOMEPAGE="https://www.spectrum.im" -SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64" -IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp" -REQUIRED_USE=" - || ( mysql postgres sqlite ) - test? ( irc ) -" -RESTRICT="!test? ( test )" - -RDEPEND=" - acct-group/spectrum - acct-user/spectrum - dev-libs/boost:=[nls] - dev-libs/expat - dev-libs/libev:= - dev-libs/log4cxx - dev-libs/jsoncpp:= - dev-libs/openssl:0= - dev-libs/popt - dev-libs/protobuf:= - net-dns/libidn:0= - >=net-im/swift-4.0.2-r2:= - net-misc/curl - sys-libs/zlib:= - frotz? ( !games-engines/frotz ) - irc? ( net-im/libcommuni ) - mysql? ( - || ( - dev-db/mariadb-connector-c - dev-db/mysql-connector-c - ) - ) - postgres? ( dev-libs/libpqxx:= ) - purple? ( - dev-libs/glib - net-im/pidgin:= - ) - sms? ( app-mobilephone/smstools ) - sqlite? ( dev-db/sqlite:3 ) - twitter? ( net-misc/curl ) - whatsapp? ( net-im/transwhat )" - -DEPEND=" - ${RDEPEND} - doc? ( app-doc/doxygen ) - test? ( dev-util/cppunit ) -" - -PATCHES=( - "${FILESDIR}/${P}-boost-173-compatibility.patch" - "${FILESDIR}/${P}-gcc-10-compatibility.patch" - "${FILESDIR}/${PN}-2.0.13-libpqxx-7-compatibility.patch" - "${FILESDIR}/${PN}-2.0.13-musl-compatibility.patch" -) - -src_prepare() { - # Respect users LDFLAGS - sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_DOCS="$(usex doc)" - -DENABLE_FROTZ="$(usex frotz)" - -DENABLE_IRC="$(usex irc)" - -DENABLE_MYSQL="$(usex mysql)" - -DENABLE_PQXX="$(usex postgres)" - -DENABLE_PURPLE="$(usex purple)" - $(usex irc '-DENABLE_QT4=OFF' '') - -DENABLE_SMSTOOLS3="$(usex sms)" - -DENABLE_SQLITE3="$(usex sqlite)" - -DENABLE_TESTS="$(usex test)" - -DENABLE_TWITTER="$(usex twitter)" - -DENABLE_XMPP="$(usex xmpp)" - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - - cmake_src_configure -} - -src_test() { - cd "${BUILD_DIR}/tests/libtransport" || die - ./libtransport_test || die -} - -src_install() { - cmake_src_install - - diropts -o spectrum -g spectrum - keepdir /var/log/spectrum2 /var/lib/spectrum2 - diropts - - newinitd "${FILESDIR}"/spectrum2.initd spectrum2 - systemd_newunit "${FILESDIR}"/spectrum2.service spectrum2.service - systemd_newtmpfilesd "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf - - einstalldocs -} |