From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- net-im/spectrum2/Manifest | 6 +- .../spectrum2-2.0.13-libpqxx-7-compatibility.patch | 79 -------------- .../spectrum2-2.0.13-musl-compatibility.patch | 95 ----------------- net-im/spectrum2/spectrum2-2.0.13-r2.ebuild | 114 --------------------- net-im/spectrum2/spectrum2-2.1.0.ebuild | 2 +- 5 files changed, 2 insertions(+), 294 deletions(-) delete mode 100644 net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch delete mode 100644 net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch delete mode 100644 net-im/spectrum2/spectrum2-2.0.13-r2.ebuild (limited to 'net-im/spectrum2') diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest index 6b6711e4dc09..3be10a63b390 100644 --- a/net-im/spectrum2/Manifest +++ b/net-im/spectrum2/Manifest @@ -1,10 +1,6 @@ -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.13.tar.gz 840234 BLAKE2B 45cc26f5292094e51318a6137155061f78c539b1c2c86ba11483345650c544cd77ff676b25b6bed26da12b82b6a6fab7d2ee7d52a2a7268efc8ad914419ee792 SHA512 8ef981e322a2b0dff65c95233b4b77cd28655d6cbd70f1c17c7c8c787222c2b9e800b037712b42e1679db88276db089e3493b9fffe5d3792cf2df247be9d6ae7 DIST spectrum2-2.1.0.tar.gz 837296 BLAKE2B 3cff3cf700b08b3c061114e736b31f9ec1c44c6626173daacde3992d72c12e45c9ac60f57dc1fc426108aeb8b7d72a9d83a2aac3af64835f5f5155ecd0405f45 SHA512 53499b327edf280a87bdb334e3de2b54f8fc8ebc6a9a425e75676438561e47d144ae562d3c0c41d76330f0480a29cf08a0927de04158791f6d14671edc411321 -EBUILD spectrum2-2.0.13-r2.ebuild 2476 BLAKE2B a564a421adb89943b03d8877401effceab8c26d69d13fba8da20f4d259f67cc752b477a187df0f925980fd34b419607ceb37cd8d162ebb5d264e4d92f0b3115d SHA512 3a96447634d3197f58afc15815e5d6ee7520a974edf503b1879f5ae7210decf15d3556be687900c26eac7632f1401a20d260e7b6fcc8a1e857ac04a1d8c07a53 -EBUILD spectrum2-2.1.0.ebuild 2369 BLAKE2B fac0ea3acc36ae31d57746b4248be22b3220a8e032ad564fb95dac1a669749ff65034ea3ce63cc386d527fad5ddaaad7b4a06659f7c66df0d92553e35653d3a4 SHA512 18c9d5f6ae609b328e8f957c54f329818886301d92f1aa01b6025b871c6338e5d4cf4c564089c6360a8635c088b41c4f7e9296f99253a3350942989355e97ad8 +EBUILD spectrum2-2.1.0.ebuild 2368 BLAKE2B 5adf456ff9f5bc8218fea023468c87528dca066d369b1fe7aeee936eb750388e141167f14e364391664946f2c9ce61899363959ee45e5752145973bad692f831 SHA512 a4a1b3a4868b6c81c031bbe5a8ce325ff814f299f24a23b3fc440faceaf9d757b90e1871b2b99e1f7366e3148f69234ed672e26e68adda5b122a8ef286ad89d9 MISC metadata.xml 1141 BLAKE2B 8964184caabc03f6c5da13842bc5219b0d563baa5d9a1fc52020d686756953a2321d80ede5c5e9aa8321cad1f9a4ea753847c63230b8fb55c8c52e0b61bded23 SHA512 13c244aba5cf70af7e2555a05ba604e28b042d95f879a9f747702b13da7484d6ca3a941ee16d5ad0db864eceb51b55509d0a0761c9f8f7ab11328d67cbe8886c diff --git a/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch deleted file mode 100644 index 48a1f0a333a0..000000000000 --- a/net-im/spectrum2/files/spectrum2-2.0.13-libpqxx-7-compatibility.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/cmake_modules/Findpqxx.cmake b/cmake_modules/Findpqxx.cmake -index 9c53550..691ec0e 100644 ---- a/cmake_modules/Findpqxx.cmake -+++ b/cmake_modules/Findpqxx.cmake -@@ -1,16 +1,33 @@ --FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS) --MARK_AS_ADVANCED(PQXX_INCLUDE_DIR) -+if (NOT WIN32) -+ find_package(PkgConfig) -+ if (PKG_CONFIG_FOUND) -+ pkg_check_modules(PQXX libpqxx) -+ if (PQXX_FOUND) -+ if (PQXX_VERSION STRGREATER "7") -+ message(STATUS "libpqxx version ${PQXX_VERSION}, requesting c++17") -+ set (CMAKE_CXX_STANDARD 17) -+ endif() -+ endif() -+ endif() -+else() - --FIND_LIBRARY(PQXX_LIBRARY pqxx ) --MARK_AS_ADVANCED(PQXX_LIBRARY) -+ FIND_PATH(PQXX_INCLUDE_DIR pqxx/pqxx PATHS) -+ MARK_AS_ADVANCED(PQXX_INCLUDE_DIR) - --FIND_LIBRARY(PQ_LIBRARY pq ) --MARK_AS_ADVANCED(PQ_LIBRARY) -+ FIND_LIBRARY(PQXX_LIBRARIES pqxx ) -+ MARK_AS_ADVANCED(PQXX_LIBRARIES) - --if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR) -- set( PQXX_FOUND 1 ) -- message( STATUS "Found pqxx: ${PQXX_LIBRARY}, ${PQ_LIBRARY}, ${PQXX_INCLUDE_DIR}") --else() -- message(STATUS "Could NOT find pqxx and pq library") --endif() -+ FIND_LIBRARY(PQ_LIBRARY pq ) -+ MARK_AS_ADVANCED(PQ_LIBRARY) - -+ if(PQXX_LIBRARY AND PQ_LIBRARY AND PQXX_INCLUDE_DIR) -+ set( PQXX_FOUND 1 ) -+ message( STATUS "Found pqxx: ${PQXX_LIBRARIES}, ${PQ_LIBRARY}, ${PQXX_INCLUDE_DIR}") -+ if (PQXX_VERSION STRGREATER "7") -+ message(STATUS "libpqxx version ${PQXX_VERSION}, requesting c++17") -+ set (CMAKE_CXX_STANDARD 17) -+ endif() -+ else() -+ message(STATUS "Could NOT find pqxx and pq library") -+ endif() -+endif() -diff --git a/libtransport/CMakeLists.txt b/libtransport/CMakeLists.txt -index 8892241..2b5a0f9 100644 ---- a/libtransport/CMakeLists.txt -+++ b/libtransport/CMakeLists.txt -@@ -48,9 +48,9 @@ find_package(CURL) - - if(WIN32) - include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/sqlite3") -- target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib) -+ target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY} psapi.lib bcrypt.lib) - else() -- target_link_libraries(transport transport-plugin ${PQXX_LIBRARY} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY}) -+ target_link_libraries(transport transport-plugin ${PQXX_LIBRARIES} ${CURL_LIBRARIES} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY} ${JSONCPP_LIBRARY}) - endif() - - set_target_properties(transport PROPERTIES -diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp -index 31cce95..f5305aa 100644 ---- a/libtransport/NetworkPluginServer.cpp -+++ b/libtransport/NetworkPluginServer.cpp -@@ -1904,7 +1904,7 @@ NetworkPluginServer::wrapIncomingMedia(SWIFTEN_SHRPTR_NAMESPACE::shared_ptrs, quotes in quotes ("quote: 'text' end quote") - static boost::regex image_expr("]*src\\s*=\\s*[\"']([^\"']+)[\"'][^>]*>"); - -- bool matchCount = 0; -+ int matchCount = 0; - std::string firstUrl; - - std::string::const_iterator xhtml_pos = xhtml.begin(); diff --git a/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch b/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch deleted file mode 100644 index 07bde50b832d..000000000000 --- a/net-im/spectrum2/files/spectrum2-2.0.13-musl-compatibility.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 19b10896fa3426b2bd9e4e75a63ca52322373d33 Mon Sep 17 00:00:00 2001 -From: Vitaly Takmazov -Date: Fri, 24 Jul 2020 15:09:28 +0300 -Subject: [PATCH] musl compatibility - ---- - backends/libpurple/main.cpp | 6 +++--- - backends/swiften/main.cpp | 2 ++ - libtransport/UserManager.cpp | 2 ++ - spectrum/src/main.cpp | 2 ++ - 4 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp -index 54c618e0..4555edbc 100644 ---- a/backends/libpurple/main.cpp -+++ b/backends/libpurple/main.cpp -@@ -528,7 +528,7 @@ class SpectrumNetworkPlugin : public NetworkPlugin { - - purple_accounts_delete_wrapped(account); - #ifndef WIN32 --#if !defined(__FreeBSD__) && !defined(__APPLE__) -+#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__) - malloc_trim(0); - #endif - #endif -@@ -2287,7 +2287,7 @@ static void signed_on(PurpleConnection *gc, gpointer unused) { - PurpleAccount *account = purple_connection_get_account_wrapped(gc); - np->handleConnected(np->m_accounts[account]); - #ifndef WIN32 --#if !defined(__FreeBSD__) && !defined(__APPLE__) -+#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__) - // force returning of memory chunks allocated by libxml2 to kernel - malloc_trim(0); - #endif -@@ -2516,7 +2516,7 @@ int main(int argc, char **argv) { - boost::locale::generator gen; - std::locale::global(gen("")); - #ifndef WIN32 --#if !defined(__FreeBSD__) && !defined(__APPLE__) -+#if !defined(__FreeBSD__) && !defined(__APPLE__) && defined (__GLIBC__) - mallopt(M_CHECK_ACTION, 2); - mallopt(M_PERTURB, 0xb); - #endif -diff --git a/backends/swiften/main.cpp b/backends/swiften/main.cpp -index f0acdb6d..6c111464 100644 ---- a/backends/swiften/main.cpp -+++ b/backends/swiften/main.cpp -@@ -227,10 +227,12 @@ class SwiftenPlugin : public NetworkPlugin, Swift::XMPPParserClient { - #ifndef WIN32 - #ifndef __FreeBSD__ - #ifndef __MACH__ -+#if defined (__GLIBC__) - // force returning of memory chunks allocated by libxml2 to kernel - malloc_trim(0); - #endif - #endif -+#endif - #endif - } - -diff --git a/libtransport/UserManager.cpp b/libtransport/UserManager.cpp -index 73fcdae9..a622754f 100644 ---- a/libtransport/UserManager.cpp -+++ b/libtransport/UserManager.cpp -@@ -125,10 +125,12 @@ void UserManager::removeUser(User *user, bool onUserBehalf) { - #ifndef WIN32 - #ifndef __FreeBSD__ - #ifndef __MACH__ -+#if defined (__GLIBC__) - malloc_trim(0); - #endif - #endif - #endif -+#endif - // VALGRIND_DO_LEAK_CHECK; - } - -diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp -index 0f5985a2..89e5b9a1 100644 ---- a/spectrum/src/main.cpp -+++ b/spectrum/src/main.cpp -@@ -320,11 +320,13 @@ int main(int argc, char **argv) - #ifndef WIN32 - #ifndef __FreeBSD__ - #ifndef __MACH__ -+#if defined (__GLIBC__) - mallopt(M_CHECK_ACTION, 2); - mallopt(M_PERTURB, 0xb); - #endif - #endif - #endif -+#endif - - #ifndef WIN32 - if (signal(SIGINT, spectrum_sigint_handler) == SIG_ERR) { diff --git a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild b/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild deleted file mode 100644 index e270aa2de67e..000000000000 --- a/net-im/spectrum2/spectrum2-2.0.13-r2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd tmpfiles - -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}-libpqxx-7-compatibility.patch" - "${FILESDIR}/${P}-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 - newtmpfiles "${FILESDIR}"/spectrum2.tmpfiles-r1 spectrum2.conf - - einstalldocs -} - -pkg_postinst() { - tmpfiles_process spectrum2.conf -} diff --git a/net-im/spectrum2/spectrum2-2.1.0.ebuild b/net-im/spectrum2/spectrum2-2.1.0.ebuild index 2f4fdacf2aed..4678773061b0 100644 --- a/net-im/spectrum2/spectrum2-2.1.0.ebuild +++ b/net-im/spectrum2/spectrum2-2.1.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/SpectrumIM/spectrum2/archive/${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="doc frotz irc mysql postgres purple sms +sqlite test twitter whatsapp xmpp" REQUIRED_USE=" || ( mysql postgres sqlite ) -- cgit v1.2.3