dev-libs/log4cxx: add mozldap support

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

View File

@ -2,6 +2,12 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.26 2008/11/02 07:30:45 vapier Exp $ # $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/ChangeLog,v 1.26 2008/11/02 07:30:45 vapier Exp $
08 Dec 2008; Mario Fetka <mario.fetka@gmail.com>
-files/log4cxx-0.9.7-gcc41.patch, -files/log4cxx-0.9.7-gentoo.diff,
-files/log4cxx-0.9.7-tchar.patch, -files/log4cxx-0.9.7-use-SQLWCHAR.diff,
log4cxx-0.10.0-r100.ebuild:
add mozldap support
02 Nov 2008; Mike Frysinger <vapier@gentoo.org> log4cxx-0.10.0.ebuild: 02 Nov 2008; Mike Frysinger <vapier@gentoo.org> log4cxx-0.10.0.ebuild:
Add ppc/ppc64 love for KDE 4. Add ppc/ppc64 love for KDE 4.

View File

@ -1,21 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
AUX 0.10.0-missing_includes.patch 1554 RMD160 442e71ef3584b16dbe924fa9eccb38dccb1d2162 SHA1 ad67024a329223c815d3f6d14115ed2e00d2061f SHA256 7b78a7fe46ba1481af80fbf8e2a1c82bde00ce956a6ebe007a8f0b47f56cd735 AUX 0.10.0-missing_includes.patch 1554 RMD160 442e71ef3584b16dbe924fa9eccb38dccb1d2162 SHA1 ad67024a329223c815d3f6d14115ed2e00d2061f SHA256 7b78a7fe46ba1481af80fbf8e2a1c82bde00ce956a6ebe007a8f0b47f56cd735
AUX log4cxx-0.9.7-gcc41.patch 523 RMD160 4b066a4844a06e73f59e87c9410dc26159fa869e SHA1 7f55bf31bb2225cbdd43ca41be47b921c2d795b6 SHA256 de55161e96e70a48eb0408d3096c831bf30d7985bb19e2f285389476035c9ec4
AUX log4cxx-0.9.7-gentoo.diff 1989 RMD160 9f4cc34f71119b8e318db5315cf2807d6ef1c788 SHA1 b8f6c3c2b86aecb08fc0ed867ca986db85d1e133 SHA256 ed1e5ec3192f61ff6731816ea45dee35e2d257b4d3f01b7e2fcf6e64febc0807
AUX log4cxx-0.9.7-tchar.patch 350 RMD160 aa4d404e36fe3765fc020c7bc5538458d846622c SHA1 a5cf4faefadc06b5f7560d1ea9aba2606fff085a SHA256 654b9c7e1d10d8d3ce7396ceb7588b270a73643aa81890748b6da18fc6409397
AUX log4cxx-0.9.7-use-SQLWCHAR.diff 967 RMD160 a2972e6c6b4c840f14082a0ef8d29d6bf03ab961 SHA1 2f340f656e33b297cdd205d69e8fb60e397b978e SHA256 4831659f137cdbb9c188d64f00c4b20d69082044d3705d8c6409ea5ab218b212
DIST apache-log4cxx-0.10.0.tar.gz 1667425 RMD160 6df384e5c746c3c6903efae6c9f0d64e4f07a5ad SHA1 d79c053e8ac90f66c5e873b712bb359fd42b648d SHA256 0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c DIST apache-log4cxx-0.10.0.tar.gz 1667425 RMD160 6df384e5c746c3c6903efae6c9f0d64e4f07a5ad SHA1 d79c053e8ac90f66c5e873b712bb359fd42b648d SHA256 0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c
DIST log4cxx-0.9.7.tar.gz 256449 RMD160 e8bcb2b188615b4edb09b807cb763535432586e7 SHA1 a1e156f24530fea72fb2c4b11ae137eddda6fd5a SHA256 5b41b2fc267595bdb0fa4cd1152309413bc70e6d9196293113ebb82751eb7ec6 EBUILD log4cxx-0.10.0-r100.ebuild 1585 RMD160 f224ec52edc680cbab2e54f67a3df7a1386d3447 SHA1 305a7fcff4da228f1b6762506a941dd77be7c24a SHA256 d9dea68ba6edf4918f41ec476dbecb0a2b1d5e0b6f4053c6c04e6f785ffae481
EBUILD log4cxx-0.10.0.ebuild 1591 RMD160 158b24063c037e6b9f5151af054f9ff84866a03b SHA1 aa8460a1210fed69a074ecfb4d78bd3fbe5dfe1f SHA256 53c7378670a9174ffea7dc04d403e0e3d13a1438b180100bfed3f6c91ff9b810 MISC ChangeLog 4372 RMD160 629a86dc8967883de523b380c48d7f599ebd39a0 SHA1 ece5b0b9fb996c297f1edb8d87194153d64b04e6 SHA256 4c07aca436856276076ab2b4b121364d7183322457f850230e7c64e15f027451
EBUILD log4cxx-0.9.7-r4.ebuild 2386 RMD160 e2044c0266c183aad7f60050ce77c8a5cffc3a76 SHA1 2a15071ae8f99399f533dfc023f5838a8fec67d4 SHA256 4b658c9eaec6a91e9a28f189ce823fe8f4393674657a26cb22d7414c4e6ba193
MISC ChangeLog 4122 RMD160 be487eeb2849a6893755d15b16400bf33b4c6a52 SHA1 c70fc9f230b6a01fc2c5ecc3776ccbad911a5109 SHA256 6dfcf89d48993c52acfb55efa1c877326d2b2a3e18ba86c581841ef27247360a
MISC metadata.xml 367 RMD160 c0e5c79d5c0bf196d945dc117b75b6adf4a3e980 SHA1 4b108cd4a2bf0fcb7469c89693315c19b2363209 SHA256 198d92b692ab95eb4fe72d88dac8b8daf126da23e84304443fa5f69e37883ffc MISC metadata.xml 367 RMD160 c0e5c79d5c0bf196d945dc117b75b6adf4a3e980 SHA1 4b108cd4a2bf0fcb7469c89693315c19b2363209 SHA256 198d92b692ab95eb4fe72d88dac8b8daf126da23e84304443fa5f69e37883ffc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
iEYEARECAAYFAkkNVy0ACgkQ67wieSYcaxfnPACeN3ozLMvV5lPQRtjuLWL2/1Rz
cRMAoLfcgAQPUaT287DtAUeOCGcNutJ/
=tOj0
-----END PGP SIGNATURE-----

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;

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

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

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

View File

@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation # Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/log4cxx/log4cxx-0.10.0.ebuild,v 1.2 2008/11/02 07:30:45 vapier Exp $ # $Header: $
EAPI="1" EAPI="1"
@ -53,7 +53,7 @@ src_compile() {
fi fi
use unicode && myconf="${myconf} --with-charset=utf-8" use unicode && myconf="${myconf} --with-charset=utf-8"
use mozldap && LDFLAGS=/usr/$(get_libdir)/mozldap \ use mozldap && LDFLAGS=-L/usr/$(get_libdir)/mozldap \
econf \ econf \
--disable-doxygen \ --disable-doxygen \
--disable-html-docs \ --disable-html-docs \