diff --git a/.cvsignore b/.cvsignore index e69de29..426774c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +poco-1.3.5-all.tar.bz2 +poco-1.3.5-doc.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..d64e253 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +poco-1_3_5-8:EL-5:poco-1.3.5-8.src.rpm:1270560653 diff --git a/poco-1.3.5-RH-old-SQLite.patch b/poco-1.3.5-RH-old-SQLite.patch new file mode 100644 index 0000000..e829bd4 --- /dev/null +++ b/poco-1.3.5-RH-old-SQLite.patch @@ -0,0 +1,51 @@ +diff -up poco-1.3.5-all/Data/SQLite/include/Poco/Data/SQLite/SQLite.h.old-sqlite poco-1.3.5-all/Data/SQLite/include/Poco/Data/SQLite/SQLite.h +--- poco-1.3.5-all/Data/SQLite/include/Poco/Data/SQLite/SQLite.h.old-sqlite 2010-04-06 14:39:21.000000000 +0200 ++++ poco-1.3.5-all/Data/SQLite/include/Poco/Data/SQLite/SQLite.h 2010-04-06 14:40:44.000000000 +0200 +@@ -66,6 +66,11 @@ + #define SQLite_API + #endif + ++// Attempt to make this build compatible with more recent versions of SQLite ++// API. ++#ifndef SQLITE_LOCKED_SHAREDCACHE ++ #define SQLITE_LOCKED_SHAREDCACHE (SQLITE_LOCKED | (1<<8) ) ++#endif + + // + // Automatically link Data library. +diff -up poco-1.3.5-all/Data/SQLite/src/Connector.cpp.old-sqlite poco-1.3.5-all/Data/SQLite/src/Connector.cpp +--- poco-1.3.5-all/Data/SQLite/src/Connector.cpp.old-sqlite 2010-04-06 14:34:27.000000000 +0200 ++++ poco-1.3.5-all/Data/SQLite/src/Connector.cpp 2010-04-06 14:11:24.000000000 +0200 +@@ -84,7 +84,7 @@ void Connector::enableSharedCache(bool f + + void Connector::enableSoftHeapLimit(int limit) + { +- sqlite3_soft_heap_limit(limit); ++ //sqlite3_soft_heap_limit(limit); + } + + +diff -up poco-1.3.5-all/Data/SQLite/src/SessionImpl.cpp.old-sqlite poco-1.3.5-all/Data/SQLite/src/SessionImpl.cpp +--- poco-1.3.5-all/Data/SQLite/src/SessionImpl.cpp.old-sqlite 2009-05-12 20:22:14.000000000 +0200 ++++ poco-1.3.5-all/Data/SQLite/src/SessionImpl.cpp 2010-04-03 10:01:45.000000000 +0200 +@@ -115,7 +115,6 @@ void SessionImpl::open() + Utility::throwException(rc); + } + +- sqlite3_extended_result_codes(_pDB, 1); + _connected = true; + } + +diff -up poco-1.3.5-all/Data/SQLite/src/SQLiteStatementImpl.cpp.old-sqlite poco-1.3.5-all/Data/SQLite/src/SQLiteStatementImpl.cpp +--- poco-1.3.5-all/Data/SQLite/src/SQLiteStatementImpl.cpp.old-sqlite 2009-05-12 20:22:14.000000000 +0200 ++++ poco-1.3.5-all/Data/SQLite/src/SQLiteStatementImpl.cpp 2010-04-06 14:41:10.000000000 +0200 +@@ -103,7 +103,7 @@ void SQLiteStatementImpl::compileImplImp + + while (rc == SQLITE_OK && !pStmt && !queryFound) + { +- rc = sqlite3_prepare_v2(_pDB, pSql, -1, &pStmt, &pLeftover); ++ rc = sqlite3_prepare(_pDB, pSql, -1, &pStmt, &pLeftover); + if (rc != SQLITE_OK) + { + if (pStmt) +diff -up poco-1.3.5-all/Data/SQLite/src/Utility.cpp.old-sqlite poco-1.3.5-all/Data/SQLite/src/Utility.cpp diff --git a/poco-1.3.5-syslibs.patch b/poco-1.3.5-syslibs.patch new file mode 100644 index 0000000..d88f4a3 --- /dev/null +++ b/poco-1.3.5-syslibs.patch @@ -0,0 +1,203 @@ +diff -up poco-1.3.5-all/Data/SQLite/Makefile.orig poco-1.3.5-all/Data/SQLite/Makefile +--- poco-1.3.5-all/Data/SQLite/Makefile.orig 2009-05-12 22:22:14.000000000 +0400 ++++ poco-1.3.5-all/Data/SQLite/Makefile 2009-11-10 17:09:22.957867329 +0300 +@@ -8,13 +8,14 @@ + + include $(POCO_BASE)/build/rules/global + ++SYSLIBS += -lsqlite3 ++ + SYSFLAGS += -DSQLITE_THREADSAFE=1 -DSQLITE_DISABLE_LFS \ + -DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_COMPLETE \ + -DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_DEPRECATED + + objects = Binder Extractor SessionImpl Connector \ +- SQLiteException SQLiteStatementImpl Utility \ +- sqlite3 ++ SQLiteException SQLiteStatementImpl Utility + + target = PocoSQLite + target_version = $(LIBVERSION) +diff -up poco-1.3.5-all/Foundation/include/Poco/DeflatingStream.h.orig poco-1.3.5-all/Foundation/include/Poco/DeflatingStream.h +--- poco-1.3.5-all/Foundation/include/Poco/DeflatingStream.h.orig 2009-05-12 22:22:09.000000000 +0400 ++++ poco-1.3.5-all/Foundation/include/Poco/DeflatingStream.h 2009-11-10 12:38:48.314866556 +0300 +@@ -44,7 +44,7 @@ + #include "Poco/BufferedStreamBuf.h" + #include + #include +-#include "Poco/zlib.h" ++#include + + + namespace Poco { +diff -up poco-1.3.5-all/Foundation/include/Poco/InflatingStream.h.orig poco-1.3.5-all/Foundation/include/Poco/InflatingStream.h +--- poco-1.3.5-all/Foundation/include/Poco/InflatingStream.h.orig 2009-05-12 22:22:09.000000000 +0400 ++++ poco-1.3.5-all/Foundation/include/Poco/InflatingStream.h 2009-11-10 12:46:42.097867271 +0300 +@@ -44,7 +44,7 @@ + #include "Poco/BufferedStreamBuf.h" + #include + #include +-#include "Poco/zlib.h" ++#include + + + namespace Poco { +diff -up poco-1.3.5-all/Foundation/Makefile.orig poco-1.3.5-all/Foundation/Makefile +--- poco-1.3.5-all/Foundation/Makefile.orig 2009-05-12 22:22:09.000000000 +0400 ++++ poco-1.3.5-all/Foundation/Makefile 2009-11-10 17:14:06.332866868 +0300 +@@ -8,6 +8,8 @@ + + include $(POCO_BASE)/build/rules/global + ++SYSLIBS += -lz -lpcre ++ + objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \ + BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \ + CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \ +@@ -31,12 +33,7 @@ objects = ArchiveStrategy ASCIIEncoding + FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \ + UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \ + Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \ +- FileStream Unicode UTF8String AtomicCounter \ +- adler32 compress crc32 deflate gzio infback inffast inflate inftrees \ +- trees zutil \ +- pcre_chartables pcre_compile pcre_globals pcre_maketables pcre_study \ +- pcre_tables pcre_try_flipped pcre_ucd pcre_valid_utf8 \ +- pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass ++ FileStream Unicode UTF8String AtomicCounter + + ifeq ($(POCO_CONFIG),MinGW) + objects += EventLogChannel WindowsConsoleChannel +diff -up poco-1.3.5-all/Foundation/src/Checksum.cpp.orig poco-1.3.5-all/Foundation/src/Checksum.cpp +--- poco-1.3.5-all/Foundation/src/Checksum.cpp.orig 2009-05-12 22:22:09.000000000 +0400 ++++ poco-1.3.5-all/Foundation/src/Checksum.cpp 2009-11-10 12:43:27.317866563 +0300 +@@ -35,7 +35,7 @@ + + + #include "Poco/Checksum.h" +-#include "Poco/zlib.h" ++#include + + + namespace Poco { +diff -up poco-1.3.5-all/Foundation/src/Unicode.cpp.orig poco-1.3.5-all/Foundation/src/Unicode.cpp +--- poco-1.3.5-all/Foundation/src/Unicode.cpp.orig 2009-05-12 22:22:09.000000000 +0400 ++++ poco-1.3.5-all/Foundation/src/Unicode.cpp 2009-11-11 15:02:28.189540436 +0300 +@@ -37,56 +37,47 @@ + #include "Poco/Unicode.h" + + +-extern "C" +-{ +-#include "pcre_config.h" +-#include "pcre_internal.h" +-} ++#include ++#include + + + namespace Poco { + + +-void Unicode::properties(int ch, CharacterProperties& props) +-{ +- const ucd_record* ucd = GET_UCD(ch); +- props.category = static_cast(_pcre_ucp_gentype[ucd->chartype]); +- props.type = static_cast(ucd->chartype); +- props.script = static_cast