dbp/linamh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dev-libs/log4cxx: add mozldap support

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@630 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2008-12-08 23:35:09 +00:00
parent 9213349d49
commit 21a6f9046a
7 changed files with 10 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dev-libs/log4cxx/files/log4cxx-0.9.7-gcc41.patch
View File

@@ -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;

55
dev-libs/log4cxx/files/log4cxx-0.9.7-gentoo.diff
View File

@@ -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

12
dev-libs/log4cxx/files/log4cxx-0.9.7-tchar.patch
View File

@@ -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

25
dev-libs/log4cxx/files/log4cxx-0.9.7-use-SQLWCHAR.diff
View File

@@ -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)
{