From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 80F401581C1 for ; Tue, 16 Jul 2024 07:44:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3121E2A40; Tue, 16 Jul 2024 07:44:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A2B66E2A3F for ; Tue, 16 Jul 2024 07:44:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF40F340C3C for ; Tue, 16 Jul 2024 07:44:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F9561E1A for ; Tue, 16 Jul 2024 07:44:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1721115330.05128d7166f549276048bfbe43eca8e7ef683588.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/files/, net-im/spectrum2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/spectrum2/files/spectrum2-2.2.1-boost-1.85.patch net-im/spectrum2/files/spectrum2-2.2.1-use-c++14.patch net-im/spectrum2/spectrum2-2.2.1.ebuild X-VCS-Directories: net-im/spectrum2/ net-im/spectrum2/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 05128d7166f549276048bfbe43eca8e7ef683588 X-VCS-Branch: master Date: Tue, 16 Jul 2024 07:44:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8ebf0145-51a6-4b8a-9098-2ed962a2115c X-Archives-Hash: 6d24f7b77f67b00632cdc928216703db commit: 05128d7166f549276048bfbe43eca8e7ef683588 Author: Sam James gentoo org> AuthorDate: Tue Jul 16 07:35:30 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jul 16 07:35:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05128d71 net-im/spectrum2: fix build w/ boost-1.85 Closes: https://bugs.gentoo.org/933691 Thanks-to: Bill Prendergast baisenvar.info> Signed-off-by: Sam James gentoo.org> .../files/spectrum2-2.2.1-boost-1.85.patch | 103 +++++++++++++++++++++ .../files/spectrum2-2.2.1-use-c++14.patch | 13 +++ net-im/spectrum2/spectrum2-2.2.1.ebuild | 5 + 3 files changed, 121 insertions(+) diff --git a/net-im/spectrum2/files/spectrum2-2.2.1-boost-1.85.patch b/net-im/spectrum2/files/spectrum2-2.2.1-boost-1.85.patch new file mode 100644 index 000000000000..30e6a4cdeb81 --- /dev/null +++ b/net-im/spectrum2/files/spectrum2-2.2.1-boost-1.85.patch @@ -0,0 +1,103 @@ +Bug: https://bugs.gentoo.org/933691 + +From: Bill Prendergast + +Fix build with boost-1.85 (filesystem api v4 removed Deprecated Features) +see https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html + +--- a/plugin/cpp/Util.cpp ++++ b/plugin/cpp/Util.cpp +@@ -53,7 +53,7 @@ void createDirectories(Transport::Config *config, const boost::filesystem::path& + } + + // First create branch, by calling ourself recursively +- createDirectories(config, ph.branch_path()); ++ createDirectories(config, ph.parent_path()); + + // Now that parent's path exists, create the directory + create_directory(ph); +@@ -89,7 +89,7 @@ void removeEverythingOlderThan(const std::vector &dirs, time_t t) { + for (directory_iterator itr(p); itr != end_itr; ++itr) { + if (last_write_time(itr->path()) < t) { + try { +- if (is_regular(itr->path())) { ++ if (is_regular_file(itr->path())) { + remove(itr->path()); + } + else if (is_directory(itr->path())) { +--- a/spectrum/src/main.cpp ++++ b/spectrum/src/main.cpp +@@ -147,7 +147,7 @@ static void _createDirectories(Transport::Config *config, boost::filesystem::pat + } + + // First create branch, by calling ourself recursively +- _createDirectories(config, ph.branch_path()); ++ _createDirectories(config, ph.parent_path()); + + // Now that parent's path exists, create the directory + boost::filesystem::create_directory(ph); +--- a/spectrum_manager/src/methods.cpp ++++ b/spectrum_manager/src/methods.cpp +@@ -168,7 +168,7 @@ int start_instances(ManagerConfig *config, const std::string &_jid) { + + directory_iterator end_itr; + for (directory_iterator itr(p); itr != end_itr; ++itr) { +- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") { ++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") { + Config cfg; + if (cfg.load(itr->path().string()) == false) { + std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n"; +@@ -232,7 +232,7 @@ void stop_instances(ManagerConfig *config, const std::string &_jid) { + + directory_iterator end_itr; + for (directory_iterator itr(p); itr != end_itr; ++itr) { +- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") { ++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") { + Config cfg; + if (cfg.load(itr->path().string()) == false) { + std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n"; +@@ -315,7 +315,7 @@ int restart_instances(ManagerConfig *config, const std::string &_jid) { + + directory_iterator end_itr; + for (directory_iterator itr(p); itr != end_itr; ++itr) { +- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") { ++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") { + Config cfg; + if (cfg.load(itr->path().string()) == false) { + std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n"; +@@ -401,7 +401,7 @@ int show_status(ManagerConfig *config) { + + directory_iterator end_itr; + for (directory_iterator itr(p); itr != end_itr; ++itr) { +- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") { ++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") { + Config cfg; + if (cfg.load(itr->path().string()) == false) { + std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n"; +@@ -531,7 +531,7 @@ std::string get_config(ManagerConfig *config, const std::string &jid, const std: + + directory_iterator end_itr; + for (directory_iterator itr(p); itr != end_itr; ++itr) { +- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") { ++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") { + Config cfg; + if (cfg.load(itr->path().string()) == false) { + std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n"; +@@ -572,7 +572,7 @@ void ask_local_server(ManagerConfig *config, Swift::BoostNetworkFactories &netwo + bool found = false; + directory_iterator end_itr; + for (directory_iterator itr(p); itr != end_itr; ++itr) { +- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") { ++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") { + Config cfg; + if (cfg.load(itr->path().string()) == false) { + std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n"; +@@ -619,7 +619,7 @@ std::vector show_list(ManagerConfig *config, bool show) { + + directory_iterator end_itr; + for (directory_iterator itr(p); itr != end_itr; ++itr) { +- if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") { ++ if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") { + Config cfg; + if (cfg.load(itr->path().string()) == false) { + std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n"; diff --git a/net-im/spectrum2/files/spectrum2-2.2.1-use-c++14.patch b/net-im/spectrum2/files/spectrum2-2.2.1-use-c++14.patch new file mode 100644 index 000000000000..009f7cb4a3a8 --- /dev/null +++ b/net-im/spectrum2/files/spectrum2-2.2.1-use-c++14.patch @@ -0,0 +1,13 @@ +Don't focre c11 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,7 @@ + + project(libtransport) + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 14) + if(WIN32) + set(CMAKE_CXX_STANDARD 17) + endif(WIN32) diff --git a/net-im/spectrum2/spectrum2-2.2.1.ebuild b/net-im/spectrum2/spectrum2-2.2.1.ebuild index 659d8085be5d..bfeccf1de360 100644 --- a/net-im/spectrum2/spectrum2-2.2.1.ebuild +++ b/net-im/spectrum2/spectrum2-2.2.1.ebuild @@ -58,6 +58,11 @@ DEPEND=" test? ( dev-util/cppunit ) " +PATCHES=( + "${FILESDIR}"/${PN}-2.2.1-boost-1.85.patch + "${FILESDIR}"/${PN}-2.2.1-use-c++14.patch +) + src_prepare() { # Respect users LDFLAGS sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die