[gentoo-commits] repo/gentoo:master commit in: dev-libs/log4cpp/files/

[gentoo-commits] repo/gentoo:master commit in: dev-libs/log4cpp/files/

[Sam James]

commit:     d9c28ef38291599d3d9407c07934a504ff8f4346
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  7 14:24:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  7 14:24:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c28ef3

dev-libs/log4cpp: restore patch

Closes: https://bugs.gentoo.org/764308
Fixes: 229496dcd84bd840c1e671105d6291b59b5b0368
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../log4cpp/files/log4cpp-1.1-glibc-2.31.patch     | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/dev-libs/log4cpp/files/log4cpp-1.1-glibc-2.31.patch b/dev-libs/log4cpp/files/log4cpp-1.1-glibc-2.31.patch
new file mode 100644
index 00000000000..5b927dfe20f
--- /dev/null
+++ b/dev-libs/log4cpp/files/log4cpp-1.1-glibc-2.31.patch
@@ -0,0 +1,22 @@
+diff --git a/tests/testDailyRollingFileAppender.cpp b/tests/testDailyRollingFileAppender.cpp
+index 9958f41..158c08b 100644
+--- a/tests/testDailyRollingFileAppender.cpp
++++ b/tests/testDailyRollingFileAppender.cpp
+@@ -22,6 +22,7 @@
+ 
+ #ifndef WIN32    // only available on Win32
+ #include <dirent.h>
++#include <sys/time.h>
+ #else
+ #include <direct.h>  
+ #endif
+@@ -232,7 +233,8 @@ namespace OnlyManualTesting {
+ 
+ 		now += seconds;
+ 
+-		if (stime(&now) == -1) {
++		struct timeval tv = {.tv_sec = now, .tv_usec = 0};
++		if (settimeofday(&tv, NULL) < 0) {
+ 			std::cerr << "Can not set date. Need admin privileges?" << std::endl;
+ 			return -1;
+ 		}

[gentoo-commits] repo/gentoo:master commit in: dev-libs/log4cpp/files/

[David Seifert]

commit:     7b72092d6f2fab986c4ffedc17141868e324cb92
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 20:09:50 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 20:09:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b72092d

dev-libs/log4cpp: fix building with clang

Closes: https://bugs.gentoo.org/737186
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-libs/log4cpp/files/1.0-gcc43.patch | 27 +++++++++++++++++----------
 1 file 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 {