summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-25 09:53:50 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-25 09:53:50 +0000
commitfde35e81f1fc083346e2bfd1ab0c0d760a688a82 (patch)
tree8aa4eff89d59ca1fb1428647f36c8bdc7e546ed3 /dev-libs/log4cxx/files
parentProperly fix linguas stuff, also brings back templates integration (diff)
downloadhistorical-fde35e81f1fc083346e2bfd1ab0c0d760a688a82.tar.gz
historical-fde35e81f1fc083346e2bfd1ab0c0d760a688a82.tar.bz2
historical-fde35e81f1fc083346e2bfd1ab0c0d760a688a82.zip
Remove old wrt #302501. Remove unused USE flag "doc".
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/log4cxx/files')
-rw-r--r--dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch12
-rw-r--r--dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff55
-rw-r--r--dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch12
-rw-r--r--dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff25
4 files changed, 0 insertions, 104 deletions
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch b/dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch
deleted file mode 100644
index 8b1305c44165..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr log4cxx-0.9.7.orig/include/log4cxx/xml/domconfigurator.h log4cxx-0.9.7/include/log4cxx/xml/domconfigurator.h
---- log4cxx-0.9.7.orig/include/log4cxx/xml/domconfigurator.h 2004-05-10 13:42:04.000000000 +0100
-+++ log4cxx-0.9.7/include/log4cxx/xml/domconfigurator.h 2006-03-19 13:15:30.000000000 +0000
-@@ -208,7 +208,7 @@
- spi::LoggerRepositoryPtr& repository);
-
- protected:
-- String DOMConfigurator::subst(const String& value);
-+ String subst(const String& value);
-
- protected:
- void * appenderBag;
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff b/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
deleted file mode 100644
index c169bd1c07e0..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-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 @@
- }
- }
-
--#endif
-\ No newline at end of file
-+#endif
-+
-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++)
- {
- if (::libsmtp_add_recipient(LIBSMTP_REC_TO,
-- (TCHAR *)T2A(i->c_str()),
-+ T2A((TCHAR *)i->c_str()),
- (libsmtp_session_struct *)session) != 0)
- {
- LogLog::error(_T("Could not add recipient ")+*i+_T("."));
-@@ -316,6 +316,8 @@
- */
- void SMTPAppender::sendBuffer()
- {
-+ USES_CONVERSION;
-+
- // 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
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch b/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch
deleted file mode 100644
index a3ba40fc864a..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- log4cxx-0.9.7.orig/include/log4cxx/helpers/tchar.h 2004-05-10 14:54:50.000000000 +0200
-+++ log4cxx-0.9.7/include/log4cxx/helpers/tchar.h 2007-01-17 12:46:44.000000000 +0100
-@@ -142,7 +142,9 @@
- #define _T(x) x
- #endif
-
-+#ifndef TCHAR
- typedef char TCHAR;
-+#endif
- #define totupper toupper
- #define totlower tolower
- #define tcout std::cout
diff --git a/dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff b/dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff
deleted file mode 100644
index 0456e57594a2..000000000000
--- a/dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -urN log4cxx-0.9.7.post-gentoo-diff/src/odbcappender.cpp log4cxx-0.9.7/src/odbcappender.cpp
---- log4cxx-0.9.7.post-gentoo-diff/src/odbcappender.cpp 2005-01-07 01:30:56.466447632 -0500
-+++ log4cxx-0.9.7/src/odbcappender.cpp 2005-01-07 01:31:29.045494864 -0500
-@@ -111,7 +111,7 @@
- ret = SQLExecDirect(stmt, (SQLTCHAR *)sql.c_str(), SQL_NTS);
- #else
- USES_CONVERSION;
-- ret = SQLExecDirect(stmt, (SQLCHAR *)T2A(sql.c_str()), SQL_NTS);
-+ ret = SQLExecDirect(stmt, (SQLWCHAR *)T2A(sql.c_str()), SQL_NTS);
- #endif
- if (ret < 0)
- {
-@@ -182,9 +182,9 @@
- std::string user = T2A(databaseUser.c_str());
- std::string password = T2A(databasePassword.c_str());
- ret = SQLConnect(connection,
-- (SQLCHAR *)URL.c_str(), SQL_NTS,
-- (SQLCHAR *)user.c_str(), SQL_NTS,
-- (SQLCHAR *)password.c_str(), SQL_NTS);
-+ (SQLWCHAR *)URL.c_str(), SQL_NTS,
-+ (SQLWCHAR *)user.c_str(), SQL_NTS,
-+ (SQLWCHAR *)password.c_str(), SQL_NTS);
- #endif
- if (ret < 0)
- {