summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Walker <ka0ttic@gentoo.org>2005-03-16 11:12:41 +0000
committerAaron Walker <ka0ttic@gentoo.org>2005-03-16 11:12:41 +0000
commitd2176c20ddd8ed57f8ee3be763a6fa661789dcfe (patch)
tree4ec78c604d0549e89612f9a47897aff9e5900971 /dev-libs/log4cxx/files
parentVersion bump for bug 85371; cleaned up all the unnecessary crap in ${FILESDIR... (diff)
downloadhistorical-d2176c20ddd8ed57f8ee3be763a6fa661789dcfe.tar.gz
historical-d2176c20ddd8ed57f8ee3be763a6fa661789dcfe.tar.bz2
historical-d2176c20ddd8ed57f8ee3be763a6fa661789dcfe.zip
Revision bump; updated patch with fixes from Juraj Hercek in bug 81247.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'dev-libs/log4cxx/files')
-rw-r--r--dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r21
-rw-r--r--dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff35
2 files changed, 30 insertions, 6 deletions
diff --git a/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2 b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2
new file mode 100644
index 000000000000..aaac6045c159
--- /dev/null
+++ b/dev-libs/log4cxx/files/digest-log4cxx-0.9.7-r2
@@ -0,0 +1 @@
+MD5 fd09abc90b8c0c8af1d5146a75590792 log4cxx-0.9.7.tar.gz 256449
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff b/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
index 50ba4dd14aac..c169bd1c07e0 100644
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
+++ b/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
@@ -1,6 +1,17 @@
-diff -urN log4cxx-0.9.7.orig/src/msxml.cpp log4cxx-0.9.7/src/msxml.cpp
---- log4cxx-0.9.7.orig/src/msxml.cpp 2004-05-10 08:37:45.000000000 -0400
-+++ log4cxx-0.9.7/src/msxml.cpp 2005-01-07 01:29:54.013941856 -0500
+diff --exclude='*~' -urN log4cxx-0.9.7.orig/include/log4cxx/helpers/class.h log4cxx-0.9.7/include/log4cxx/helpers/class.h
+--- log4cxx-0.9.7.orig/include/log4cxx/helpers/class.h 2005-03-16 02:27:08.783682464 -0500
++++ log4cxx-0.9.7/include/log4cxx/helpers/class.h 2005-03-16 02:27:26.479992216 -0500
+@@ -53,6 +53,7 @@
+ {
+ public:
+ Class(const String& name);
++ virtual ~Class() {};
+ virtual ObjectPtr newInstance() const;
+ const String& toString() const;
+ const String& getName() const;
+diff --exclude='*~' -urN log4cxx-0.9.7.orig/src/msxml.cpp log4cxx-0.9.7/src/msxml.cpp
+--- log4cxx-0.9.7.orig/src/msxml.cpp 2005-03-16 02:27:08.733690064 -0500
++++ log4cxx-0.9.7/src/msxml.cpp 2005-03-16 02:27:38.852111368 -0500
@@ -289,4 +289,5 @@
}
}
@@ -9,9 +20,9 @@ diff -urN log4cxx-0.9.7.orig/src/msxml.cpp log4cxx-0.9.7/src/msxml.cpp
\ No newline at end of file
+#endif
+
-diff -urN log4cxx-0.9.7.orig/src/smtpappender.cpp log4cxx-0.9.7/src/smtpappender.cpp
---- log4cxx-0.9.7.orig/src/smtpappender.cpp 2004-05-10 08:38:01.000000000 -0400
-+++ log4cxx-0.9.7/src/smtpappender.cpp 2005-01-07 01:29:33.730025480 -0500
+diff --exclude='*~' -urN log4cxx-0.9.7.orig/src/smtpappender.cpp log4cxx-0.9.7/src/smtpappender.cpp
+--- log4cxx-0.9.7.orig/src/smtpappender.cpp 2005-03-16 02:27:08.725691280 -0500
++++ log4cxx-0.9.7/src/smtpappender.cpp 2005-03-16 02:27:38.853111216 -0500
@@ -134,7 +134,7 @@
for (i = recipients.begin(); i != recipients.end(); i++)
{
@@ -30,3 +41,15 @@ diff -urN log4cxx-0.9.7.orig/src/smtpappender.cpp log4cxx-0.9.7/src/smtpappender
// Note: this code already owns the monitor for this
// appender. This frees us from needing to synchronize on 'cb'.
try
+diff --exclude='*~' -urN log4cxx-0.9.7.orig/src/stringtokenizer.cpp log4cxx-0.9.7/src/stringtokenizer.cpp
+--- log4cxx-0.9.7.orig/src/stringtokenizer.cpp 2005-03-16 02:27:08.727690976 -0500
++++ log4cxx-0.9.7/src/stringtokenizer.cpp 2005-03-16 02:27:26.480992064 -0500
+@@ -39,7 +39,7 @@
+
+ StringTokenizer::~StringTokenizer()
+ {
+- delete this->str;
++ delete[] this->str;
+ }
+
+ bool StringTokenizer::hasMoreTokens() const