<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/51172d7aff7e79af73c0d8349bdfcb4b0643256c">https://github.com/macports/macports-ports/commit/51172d7aff7e79af73c0d8349bdfcb4b0643256c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 51172d7aff7e79af73c0d8349bdfcb4b0643256c
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Fri Aug 5 04:15:50 2022 +0545
<span style='display:block; white-space:pre;color:#404040;'> log4cxx: update to 1.1.0
</span>---
devel/log4cxx/Portfile | 63 +++++++++++-----------
devel/log4cxx/files/gcc43.patch | 12 -----
devel/log4cxx/files/patch-configure.ac.diff | 11 ----
devel/log4cxx/files/patch-fmt.diff | 15 ++++++
devel/log4cxx/files/patch-logstream.diff | 41 ++++++++++++++
.../files/patch-src-main-cpp-stringhelper.cpp.diff | 8 ---
...include-log4cxx-helpers-simpledateformat.h.diff | 14 -----
devel/log4cxx/files/warnings.patch | 23 --------
8 files changed, 88 insertions(+), 99 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/log4cxx/Portfile b/devel/log4cxx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f5800e5a790..e9943d4032d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/log4cxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/log4cxx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
name log4cxx
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.10.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license Apache-2
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,41 +22,42 @@ homepage https://logging.apache.org/log4cxx/
</span> distname apache-log4cxx-${version}
master_sites apache:logging/log4cxx/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 d79c053e8ac90f66c5e873b712bb359fd42b648d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6df384e5c746c3c6903efae6c9f0d64e4f07a5ad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ba8437437e90346e02d527fef2adbcb220224f57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1fc7d82697534184bc0f757348d969d24852b948f63d6b17283fd1ee29c2c28a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 564044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set port_libfmt libfmt9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.module_path-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/${port_libfmt}/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:apr-util \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:expat \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:${port_libfmt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span>
# gcc-4.2 fails to build this on darwin 10
# https://trac.macports.org/ticket/40090
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# This is redundant now, but can be retained for those who may wish to use fallback option of Boost instead of C++17.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/apache/logging-log4cxx/blob/master/src/site/markdown/development/dependencies.md
</span> platform darwin 10 {
compiler.blacklist-append *gcc-4.2
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles gcc43.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-main-cpp-stringhelper.cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-main-include-log4cxx-helpers-simpledateformat.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- warnings.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPREFER_BOOST:BOOL=OFF
</span>
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:apr-util
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append gcc43.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/fmtlib/fmt/issues/2759
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-fmt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This reverts a commit that doesn’t build on PPC:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/apache/logging-log4cxx/commit/23a85d7a711f1cd5bf7170ff2a4106d00995c079#commitcomment-80358572
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-logstream.diff
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Regenerate libtool to fix universal build with clang.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://issues.apache.org/jira/browse/LOGCXX-396
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# generating doxygen docu doesn’t work
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-doxygen=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --with-apr=${prefix}/bin/apr-1-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-apr-util=${prefix}/bin/apu-1-config
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/log4cxx/files/gcc43.patch b/devel/log4cxx/files/gcc43.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d04a787cb2d..5410f98689b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/log4cxx/files/gcc43.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/log4cxx/files/gcc43.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +1,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6a01d8a..a673a10 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/examples/cpp/console.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/examples/cpp/console.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <log4cxx/logmanager.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <locale.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstring>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace log4cxx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace log4cxx::helpers;
</span> diff --git a/src/main/cpp/inputstreamreader.cpp b/src/main/cpp/inputstreamreader.cpp
index 52b1c0a..cb45181 100644
--- a/src/main/cpp/inputstreamreader.cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/log4cxx/files/patch-configure.ac.diff b/devel/log4cxx/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 98e75bbf619..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/log4cxx/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac 2008-03-31 17:34:52.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac 2013-11-30 22:45:07.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,7 +138,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$CPPFLAGS `$apu_config --includes`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--APU_LIBS="`$apu_config --link-ld --libs`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+APU_LIBS="`$apu_config --ldflags --link-ld --libs`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(APU_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS="$LDFLAGS $APU_LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/log4cxx/files/patch-fmt.diff b/devel/log4cxx/files/patch-fmt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4aaa41311f7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/log4cxx/files/patch-fmt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://github.com/fmtlib/fmt/issues/2759
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/examples/cpp/format-string.cpp 2022-01-09 21:22:36.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/examples/cpp/format-string.cpp 2022-08-05 03:35:09.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -15,6 +15,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * limitations under the License.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef FMT_DEPRECATED_OSTREAM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define FMT_DEPRECATED_OSTREAM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <log4cxx/basicconfigurator.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <locale.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/log4cxx/files/patch-logstream.diff b/devel/log4cxx/files/patch-logstream.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a75e7d589ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/log4cxx/files/patch-logstream.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,41 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Reverts this commit: https://github.com/apache/logging-log4cxx/commit/23a85d7a711f1cd5bf7170ff2a4106d00995c079
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/main/include/CMakeLists.txt 2022-04-15 07:21:53.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/main/include/CMakeLists.txt 2022-08-05 02:08:12.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,10 +44,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(LOG4CXX_WCHAR_T "Enable wchar_t API methods" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(LOG4CXX_UNICHAR "Enable UniChar API methods" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(INIT_IOS_BASE 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ option(LOG4CXX_CFSTRING "Enable CFString API methods, requires Mac OS/X CoreFoundation" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(INIT_IOS_BASE 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CHAR_API 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach(varName WCHAR_T UNICHAR CFSTRING )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/main/cpp/logstream.cpp 2022-01-09 21:22:36.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/main/cpp/logstream.cpp 2022-08-05 02:08:58.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,9 +35,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset(this, 0, sizeof(*this));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if LOG4CXX_INIT_IOS_BASE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- init(NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags(initval);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ precision(initsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ width(initsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/main/include/log4cxx/private/log4cxx_private.h.in 2022-03-24 06:26:57.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/main/include/log4cxx/private/log4cxx_private.h.in 2022-08-05 02:06:51.000000000 +0545
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +40,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOG4CXX_HAS_MBSRTOWCS @HAS_MBSRTOWCS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOG4CXX_HAS_WCSTOMBS @HAS_WCSTOMBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOG4CXX_HAS_FWIDE @HAS_FWIDE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define LOG4CXX_INIT_IOS_BASE @INIT_IOS_BASE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOG4CXX_CHARSET_UTF8 @CHARSET_UTF8@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define LOG4CXX_CHARSET_ISO88591 @CHARSET_ISO88591@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/log4cxx/files/patch-src-main-cpp-stringhelper.cpp.diff b/devel/log4cxx/files/patch-src-main-cpp-stringhelper.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9835df18ca8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/log4cxx/files/patch-src-main-cpp-stringhelper.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/main/cpp/stringhelper.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/main/cpp/stringhelper.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,6 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <log4cxx/private/log4cxx_private.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <cctype>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstdlib>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <apr.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/log4cxx/files/patch-src-main-include-log4cxx-helpers-simpledateformat.h.diff b/devel/log4cxx/files/patch-src-main-include-log4cxx-helpers-simpledateformat.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fbf4d1f3139..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/log4cxx/files/patch-src-main-include-log4cxx-helpers-simpledateformat.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/main/include/log4cxx/helpers/simpledateformat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/main/include/log4cxx/helpers/simpledateformat.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,10 +27,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <log4cxx/helpers/dateformat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vector>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <locale>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace std { class locale; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace log4cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace helpers
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/log4cxx/files/warnings.patch b/devel/log4cxx/files/warnings.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6ac5b7bdad6..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/log4cxx/files/warnings.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** a/src/main/include/log4cxx/helpers/objectptr.h 2008-10-06 16:31:12.977510299 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- b/src/main/include/log4cxx/helpers/objectptr.h 2008-10-06 16:30:57.675742916 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-***************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-*** 28,36 ****
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // switching between the initialization styles.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if LOG4CXX_HELGRIND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-! #define _LOG4CXX_OBJECTPTR_INIT(x) { exchange(x);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-! #define _LOG4CXX_OBJECTPTR_INIT(x) : p(x) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace log4cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 28,36 ----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // switching between the initialization styles.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if LOG4CXX_HELGRIND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-! #define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase() { exchange(x);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-! #define _LOG4CXX_OBJECTPTR_INIT(x) : ObjectPtrBase(), p(x) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace log4cxx
</span></pre><pre style='margin:0'>
</pre>