summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2022-07-27 22:09:50 +0200
committerDavid Seifert <soap@gentoo.org>2022-07-27 22:09:50 +0200
commit7b72092d6f2fab986c4ffedc17141868e324cb92 (patch)
treea3249bf4327fb45835e5fb57b1caf6aef3dc72ea /dev-libs/log4cpp/files
parentdev-libs/log4cplus: drop 1.2.0 (diff)
downloadgentoo-7b72092d6f2fab986c4ffedc17141868e324cb92.tar.gz
gentoo-7b72092d6f2fab986c4ffedc17141868e324cb92.tar.bz2
gentoo-7b72092d6f2fab986c4ffedc17141868e324cb92.zip
dev-libs/log4cpp: fix building with clang
Closes: https://bugs.gentoo.org/737186 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-libs/log4cpp/files')
-rw-r--r--dev-libs/log4cpp/files/1.0-gcc43.patch27
1 files changed, 17 insertions, 10 deletions
diff --git a/dev-libs/log4cpp/files/1.0-gcc43.patch b/dev-libs/log4cpp/files/1.0-gcc43.patch
index a60f986e9c0d..53441d4a6ac7 100644
--- a/dev-libs/log4cpp/files/1.0-gcc43.patch
+++ b/dev-libs/log4cpp/files/1.0-gcc43.patch
@@ -1,8 +1,6 @@
-Index: log4cpp-1.0/src/BasicLayout.cpp
-===================================================================
---- log4cpp-1.0.orig/src/BasicLayout.cpp 2008-03-14 16:06:57.000000000 -0400
-+++ log4cpp-1.0/src/BasicLayout.cpp 2008-03-14 16:07:11.000000000 -0400
-@@ -15,6 +15,8 @@
+--- a/src/BasicLayout.cpp
++++ b/src/BasicLayout.cpp
+@@ -17,6 +17,8 @@
#include <sstream>
#endif
@@ -11,11 +9,9 @@ Index: log4cpp-1.0/src/BasicLayout.cpp
namespace log4cpp {
BasicLayout::BasicLayout() {
-Index: log4cpp-1.0/src/PatternLayout.cpp
-===================================================================
---- log4cpp-1.0.orig/src/PatternLayout.cpp 2008-03-14 16:07:33.000000000 -0400
-+++ log4cpp-1.0/src/PatternLayout.cpp 2008-03-14 16:07:49.000000000 -0400
-@@ -370,7 +370,7 @@
+--- a/src/PatternLayout.cpp
++++ b/src/PatternLayout.cpp
+@@ -373,7 +373,7 @@
literal = "";
}
if ((minWidth != 0) || (maxWidth != 0)) {
@@ -24,3 +20,14 @@ Index: log4cpp-1.0/src/PatternLayout.cpp
minWidth = maxWidth = 0;
}
_components.push_back(component);
+--- a/tests/testDailyRollingFileAppender.cpp
++++ b/tests/testDailyRollingFileAppender.cpp
+@@ -40,7 +40,7 @@
+ #else
+ #define PATHDELIMITER "\\"
+ #endif
+-const char* const nesteddirname = "nesteddir"PATHDELIMITER;
++const char* const nesteddirname = "nesteddir" PATHDELIMITER;
+
+
+ class DailyRollingTest {