From 20325cfc3bd40d48d3c7034afaac4f5193d9c704 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Aug 2023 10:04:55 +0100 Subject: gentoo auto-resync : 29:08:2023 - 10:04:54 --- net-im/spectrum2/Manifest | 1 - .../files/spectrum2-2.1.3-log4cxx-1.0.0.patch | 63 ---------------------- 2 files changed, 64 deletions(-) delete mode 100644 net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch (limited to 'net-im/spectrum2') diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest index ab1f13ac95d6..a8be0e9b343f 100644 --- a/net-im/spectrum2/Manifest +++ b/net-im/spectrum2/Manifest @@ -1,4 +1,3 @@ -AUX spectrum2-2.1.3-log4cxx-1.0.0.patch 2375 BLAKE2B e2ef1dafeb4d79a4d8cbc5f545e119dfc6d10b48c26e5e552a7aab911ea2d45aab95edf12ef761bea35ae1a3ceaabe6e5682bf5cd8a1d5fa5bbd9a5f5834e98b SHA512 28891262ae6ef40f2fa04ed6a9ba9ec4b18bbaa88cd5745ab09800dd71cb52340ce40b45451cd709bc9230d29798d93dbc9d4cd0043b97afeee857f6cac52362 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 diff --git a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch deleted file mode 100644 index 852f4ad78027..000000000000 --- a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch +++ /dev/null @@ -1,63 +0,0 @@ -Description: (newer) Debian log4cxx needs C++17 and used smart pointers. - This patch just enables C++17 for the build and using smart pointers - where needed. -Author: Tobias Frost -Forwarded: not yet. log4cxx 0.14 will come with some preprocessor macros that will enable properly gating the new code. -Last-Update: 2022-11-21 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2,7 +2,7 @@ - - project(libtransport) - --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 17) - if(WIN32) - set(CMAKE_CXX_STANDARD 17) - endif(WIN32) ---- a/plugin/cpp/Logging.cpp -+++ b/plugin/cpp/Logging.cpp -@@ -26,6 +26,7 @@ - #include - #include - -+#include - - #include - #include -@@ -100,15 +101,17 @@ - #ifdef _MSC_VER - root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n"))); - #else -- root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n"))); -+ auto patternlayout = std::make_shared("%d %-5p %c: %m%n"); -+ auto consoleappender = std::make_shared(patternlayout); -+ root->addAppender(consoleappender); - #endif - } - else { - log4cxx::helpers::Properties p; - -- log4cxx::helpers::FileInputStream *istream = NULL; -+ log4cxx::helpers::InputStreamPtr istream; - try { -- istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key)); -+ istream.reset(new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key))); - } - catch(log4cxx::helpers::IOException &ex) { - std::cerr << "Can't create FileInputStream logger instance: " << ex.what() << "\n"; ---- a/tests/libtransport/main.cpp -+++ b/tests/libtransport/main.cpp -@@ -23,7 +23,9 @@ - #ifdef WITH_LOG4CXX - LoggerPtr root = Logger::getRootLogger(); - #ifndef _MSC_VER -- root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c: %m%n"), "libtransport_test.log", false)); -+ auto patternlayout = std::make_shared("%d %-5p %c: %m%n"); -+ auto fileappender = std::make_shared(patternlayout, "libtransport_test.log", false); -+ root->addAppender(fileappender); - #else - root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c: %m%n"), L"libtransport_test.log", false)); - #endif -- cgit v1.2.3