Attachment 193841 Details for Bug 228607 – svn diff changed Makefile, patch files

[patch] svn diff changed Makefile, patch files

log4cxx-0.10.0_17.diff (text/plain), 10.11 KB, created by waitman on 2018-05-30 14:08:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: waitman

Created: 2018-05-30 14:08:20 UTC

Size: 10.11 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 471133)
>+++ Makefile	(working copy)
>@@ -3,12 +3,12 @@
> 
> PORTNAME=	log4cxx
> PORTVERSION=	0.10.0
>-PORTREVISION=	16
>+PORTREVISION=	17
> CATEGORIES=	devel
> MASTER_SITES=	APACHE/logging/${PORTNAME}/${PORTVERSION}
> DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	waitman@waitman.net
> COMMENT=	C++ port of the Log4j project
> 
> LICENSE=	APACHE20
>Index: files/patch-include-clocale-and-cstdlib
>===================================================================
>--- files/patch-include-clocale-and-cstdlib	(revision 471133)
>+++ files/patch-include-clocale-and-cstdlib	(working copy)
>@@ -1,5 +1,5 @@
>---- src/main/cpp/stringhelper.cpp	2008-04-01 00:34:09.000000000 +0200
>-+++ src/main/cpp/stringhelper.cpp	2013-11-22 11:27:50.000000000 +0100
>+--- src/main/cpp/stringhelper.cpp.orig	2008-03-31 22:34:09 UTC
>++++ src/main/cpp/stringhelper.cpp
> @@ -28,6 +28,7 @@
>  #endif
>  #include <log4cxx/private/log4cxx_private.h>
>@@ -8,17 +8,16 @@
>  #include <apr.h>
>  
>  
>---- src/main/include/log4cxx/helpers/simpledateformat.h	2008-04-01 00:34:26.000000000 +0200
>-+++ src/main/include/log4cxx/helpers/simpledateformat.h	2013-11-22 11:27:27.000000000 +0100
>-@@ -27,10 +27,9 @@
>+--- src/main/include/log4cxx/helpers/simpledateformat.h.orig	2008-03-31 22:34:26 UTC
>++++ src/main/include/log4cxx/helpers/simpledateformat.h
>+@@ -27,9 +27,8 @@
>  
>  #include <log4cxx/helpers/dateformat.h>
>  #include <vector>
> +#include <locale>
>  #include <time.h>
>+-
>+-namespace std { class locale; }
>  
>--namespace std { class locale; }
>--
>  namespace log4cxx
>  {
>-         namespace helpers
>Index: files/patch-src_examples_cpp_console.cpp
>===================================================================
>--- files/patch-src_examples_cpp_console.cpp	(revision 471133)
>+++ files/patch-src_examples_cpp_console.cpp	(working copy)
>@@ -1,6 +1,6 @@
> $NetBSD: patch-src_examples_cpp_console.cpp,v 1.1 2011/11/25 21:45:52 joerg Exp $
> 
>---- src/examples/cpp/console.cpp.orig	2011-11-25 19:53:15.000000000 +0000
>+--- src/examples/cpp/console.cpp.orig	2008-03-31 22:34:52 UTC
> +++ src/examples/cpp/console.cpp
> @@ -16,6 +16,7 @@
>   */
>Index: files/patch-src_main_cpp_inputstreamreader.cpp
>===================================================================
>--- files/patch-src_main_cpp_inputstreamreader.cpp	(revision 471133)
>+++ files/patch-src_main_cpp_inputstreamreader.cpp	(working copy)
>@@ -1,6 +1,6 @@
> $NetBSD: patch-src_main_cpp_inputstreamreader.cpp,v 1.1 2011/11/25 21:45:52 joerg Exp $
> 
>---- src/main/cpp/inputstreamreader.cpp.orig	2011-11-25 19:46:39.000000000 +0000
>+--- src/main/cpp/inputstreamreader.cpp.orig	2008-03-31 22:34:09 UTC
> +++ src/main/cpp/inputstreamreader.cpp
> @@ -20,6 +20,7 @@
>  #include <log4cxx/helpers/exception.h>
>Index: files/patch-src_main_cpp_locationinfo.cpp
>===================================================================
>--- files/patch-src_main_cpp_locationinfo.cpp	(nonexistent)
>+++ files/patch-src_main_cpp_locationinfo.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- src/main/cpp/locationinfo.cpp.orig	2018-05-30 13:29:19 UTC
>++++ src/main/cpp/locationinfo.cpp
>+@@ -153,8 +153,8 @@ void LocationInfo::write(ObjectOutputStream& os, Pool&
>+          0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C, 
>+          0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, 
>+          0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, 
>+-         0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB, 
>+-         0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01, 
>++         0x6E, 0x49, 0x6E, 0x66, 0x6F, static_cast<char>(0xED), static_cast<char>(0x99), static_cast<char>(0xBB), 
>++         static_cast<char>(0xE1), 0x4A, static_cast<char>(0x91), static_cast<char>(0xA5), 0x7C, 0x02, 0x00, 0x01, 
>+          0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, 
>+          0x6E, 0x66, 0x6F, 
>+             0x74, 0x00, 0x12, 0x4C, 0x6A, 
>
>Property changes on: files/patch-src_main_cpp_locationinfo.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_main_cpp_loggingevent.cpp
>===================================================================
>--- files/patch-src_main_cpp_loggingevent.cpp	(nonexistent)
>+++ files/patch-src_main_cpp_loggingevent.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/main/cpp/loggingevent.cpp.orig	2018-05-30 13:42:18 UTC
>++++ src/main/cpp/loggingevent.cpp
>+@@ -242,7 +242,7 @@ void LoggingEvent::writeProlog(ObjectOutputStream& os,
>+         0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A, 
>+         0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67, 
>+         0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E, 
>+-        0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5, 
>++        0x74, static_cast<char>(0xF3), static_cast<char>(0xF2), static_cast<char>(0xB9), 0x23, 0x74, 0x0B, static_cast<char>(0xB5), 
>+         0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D, 
>+         0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F, 
>+         0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 
>
>Property changes on: files/patch-src_main_cpp_loggingevent.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_main_cpp_objectoutputstream.cpp
>===================================================================
>--- files/patch-src_main_cpp_objectoutputstream.cpp	(nonexistent)
>+++ files/patch-src_main_cpp_objectoutputstream.cpp	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/main/cpp/objectoutputstream.cpp.orig	2018-05-30 13:45:12 UTC
>++++ src/main/cpp/objectoutputstream.cpp
>+@@ -36,7 +36,7 @@ ObjectOutputStream::ObjectOutputStream(OutputStreamPtr
>+        objectHandle(0x7E0000),
>+        classDescriptions(new ClassDescriptionMap())
>+ {
>+-   char start[] = { 0xAC, 0xED, 0x00, 0x05 };
>++   char start[] = { static_cast<char>(0xAC), static_cast<char>(0xED), 0x00, 0x05 };
>+    ByteBuffer buf(start, sizeof(start));
>+    os->write(buf, p);
>+ }
>+@@ -85,7 +85,7 @@ void ObjectOutputStream::writeObject(const MDC::Map& v
>+         0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, 
>+         0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, 
>+         0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, 
>+-        0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03, 
>++        static_cast<char>(0xBB), 0x0F, 0x25, 0x21, 0x4A, static_cast<char>(0xE4), static_cast<char>(0xB8), 0x03, 
>+         0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, 
>+         0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, 
>+         0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, 
>
>Property changes on: files/patch-src_main_cpp_objectoutputstream.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_main_cpp_socketoutputstream.cpp
>===================================================================
>--- files/patch-src_main_cpp_socketoutputstream.cpp	(revision 471133)
>+++ files/patch-src_main_cpp_socketoutputstream.cpp	(working copy)
>@@ -1,6 +1,6 @@
> $NetBSD: patch-src_main_cpp_socketoutputstream.cpp,v 1.1 2011/11/25 21:45:52 joerg Exp $
> 
>---- src/main/cpp/socketoutputstream.cpp.orig	2011-11-25 19:49:58.000000000 +0000
>+--- src/main/cpp/socketoutputstream.cpp.orig	2008-03-31 22:34:09 UTC
> +++ src/main/cpp/socketoutputstream.cpp
> @@ -19,6 +19,7 @@
>  #include <log4cxx/helpers/socketoutputstream.h>
>Index: files/patch-src_test_cpp_xml_domtestcase.cpp
>===================================================================
>--- files/patch-src_test_cpp_xml_domtestcase.cpp	(nonexistent)
>+++ files/patch-src_test_cpp_xml_domtestcase.cpp	(working copy)
>@@ -0,0 +1,23 @@
>+--- src/test/cpp/xml/domtestcase.cpp.orig	2018-05-30 13:51:07 UTC
>++++ src/test/cpp/xml/domtestcase.cpp
>+@@ -190,9 +190,9 @@ LOGUNIT_CLASS(DOMTestCase) (public)
>+                 DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml"));
>+                 LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3");
>+ #if LOG4CXX_LOGCHAR_IS_UTF8
>+-                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 };
>++                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xC2), static_cast<logchar>(0xB3), 0 };
>+ #else
>+-                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 };
>++                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xB3), 0 };
>+ #endif
>+                 File file;
>+                 file.setPath(fname);
>+@@ -209,7 +209,7 @@ LOGUNIT_CLASS(DOMTestCase) (public)
>+                 DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml"));
>+                 LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4");
>+ #if LOG4CXX_LOGCHAR_IS_UTF8
>+-                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 };
>++                const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xE3), static_cast<logchar>(0x86), static_cast<logchar>(0x95), 0 };
>+ #else
>+                 const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 };
>+ #endif
>
>Property changes on: files/patch-src_test_cpp_xml_domtestcase.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 228607: 193841