[patch] 1.3.5-unbundle_libs.patch

1.3.5-unbundle_libs.patch (text/plain), 7.95 KB, created by Goran Sterjov on 2009-05-22 11:41:00 UTC

diff -ruN poco-1.3.5-all.orig/Data/SQLite/Makefile poco-1.3.5-all/Data/SQLite/Makefile
--- poco-1.3.5-all.orig/Data/SQLite/Makefile	2009-05-13 04:22:14.000000000 +1000
+++ poco-1.3.5-all/Data/SQLite/Makefile	2009-05-22 20:46:32.000000000 +1000
@@ -11,10 +11,10 @@
 SYSFLAGS += -DSQLITE_THREADSAFE=1 -DSQLITE_DISABLE_LFS \
 	-DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_COMPLETE \
 	-DSQLITE_OMIT_TCL_VARIABLE -DSQLITE_OMIT_DEPRECATED
+SYSLIBS += -lsqlite3
 
 objects = Binder Extractor SessionImpl Connector \
-	SQLiteException SQLiteStatementImpl Utility \
-	sqlite3
+	SQLiteException SQLiteStatementImpl Utility
 
 target         = PocoSQLite
 target_version = $(LIBVERSION)
diff -ruN poco-1.3.5-all.orig/Data/SQLite/src/Binder.cpp poco-1.3.5-all/Data/SQLite/src/Binder.cpp
--- poco-1.3.5-all.orig/Data/SQLite/src/Binder.cpp	2009-05-13 04:22:14.000000000 +1000
+++ poco-1.3.5-all/Data/SQLite/src/Binder.cpp	2009-05-22 20:47:11.000000000 +1000
@@ -38,7 +38,7 @@
 #include "Poco/Data/SQLite/Utility.h"
 #include "Poco/Data/BLOB.h"
 #include "Poco/Exception.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
 #include <cstdlib>
 
 
diff -ruN poco-1.3.5-all.orig/Data/SQLite/src/Connector.cpp poco-1.3.5-all/Data/SQLite/src/Connector.cpp
--- poco-1.3.5-all.orig/Data/SQLite/src/Connector.cpp	2009-05-13 04:22:14.000000000 +1000
+++ poco-1.3.5-all/Data/SQLite/src/Connector.cpp	2009-05-22 20:47:36.000000000 +1000
@@ -37,7 +37,7 @@
 #include "Poco/Data/SQLite/Connector.h"
 #include "Poco/Data/SQLite/SessionImpl.h"
 #include "Poco/Data/SessionFactory.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
 
 
 namespace Poco {
diff -ruN poco-1.3.5-all.orig/Data/SQLite/src/Extractor.cpp poco-1.3.5-all/Data/SQLite/src/Extractor.cpp
--- poco-1.3.5-all.orig/Data/SQLite/src/Extractor.cpp	2009-05-13 04:22:14.000000000 +1000
+++ poco-1.3.5-all/Data/SQLite/src/Extractor.cpp	2009-05-22 20:47:54.000000000 +1000
@@ -39,7 +39,7 @@
 #include "Poco/Data/BLOB.h"
 #include "Poco/Data/DataException.h"
 #include "Poco/Exception.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
 #include <cstdlib>
 
 
diff -ruN poco-1.3.5-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp poco-1.3.5-all/Data/SQLite/src/SQLiteStatementImpl.cpp
--- poco-1.3.5-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp	2009-05-13 04:22:14.000000000 +1000
+++ poco-1.3.5-all/Data/SQLite/src/SQLiteStatementImpl.cpp	2009-05-22 20:48:07.000000000 +1000
@@ -41,7 +41,7 @@
 #include "Poco/String.h"
 #include <cstdlib>
 #include <cstring>
-#include "sqlite3.h"
+#include <sqlite3.h>
 
 
 namespace Poco {
diff -ruN poco-1.3.5-all.orig/Data/SQLite/src/SessionImpl.cpp poco-1.3.5-all/Data/SQLite/src/SessionImpl.cpp
--- poco-1.3.5-all.orig/Data/SQLite/src/SessionImpl.cpp	2009-05-13 04:22:14.000000000 +1000
+++ poco-1.3.5-all/Data/SQLite/src/SessionImpl.cpp	2009-05-22 20:48:26.000000000 +1000
@@ -37,7 +37,7 @@
 #include "Poco/Data/SQLite/SessionImpl.h"
 #include "Poco/Data/SQLite/Utility.h"
 #include "Poco/Data/SQLite/SQLiteStatementImpl.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
 #include <cstdlib>
 
 
diff -ruN poco-1.3.5-all.orig/Data/SQLite/src/Utility.cpp poco-1.3.5-all/Data/SQLite/src/Utility.cpp
--- poco-1.3.5-all.orig/Data/SQLite/src/Utility.cpp	2009-05-13 04:22:14.000000000 +1000
+++ poco-1.3.5-all/Data/SQLite/src/Utility.cpp	2009-05-22 20:48:33.000000000 +1000
@@ -41,7 +41,7 @@
 #include "Poco/NumberFormatter.h"
 #include "Poco/String.h"
 #include "Poco/Exception.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
 
 
 namespace Poco {
diff -ruN poco-1.3.5-all.orig/Foundation/Makefile poco-1.3.5-all/Foundation/Makefile
--- poco-1.3.5-all.orig/Foundation/Makefile	2009-05-13 04:22:09.000000000 +1000
+++ poco-1.3.5-all/Foundation/Makefile	2009-05-22 20:51:42.000000000 +1000
@@ -7,7 +7,7 @@
 #
 
 include $(POCO_BASE)/build/rules/global
-
+SYSLIBS += -lpcre -lz
 objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \
 	BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \
 	CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \
@@ -31,12 +31,7 @@
 	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 -ruN poco-1.3.5-all.orig/Foundation/include/Poco/DeflatingStream.h poco-1.3.5-all/Foundation/include/Poco/DeflatingStream.h
--- poco-1.3.5-all.orig/Foundation/include/Poco/DeflatingStream.h	2009-05-13 04:22:09.000000000 +1000
+++ poco-1.3.5-all/Foundation/include/Poco/DeflatingStream.h	2009-05-22 20:52:42.000000000 +1000
@@ -44,7 +44,7 @@
 #include "Poco/BufferedStreamBuf.h"
 #include <istream>
 #include <ostream>
-#include "Poco/zlib.h"
+#include <zlib.h>
 
 
 namespace Poco {
diff -ruN poco-1.3.5-all.orig/Foundation/include/Poco/InflatingStream.h poco-1.3.5-all/Foundation/include/Poco/InflatingStream.h
--- poco-1.3.5-all.orig/Foundation/include/Poco/InflatingStream.h	2009-05-13 04:22:09.000000000 +1000
+++ poco-1.3.5-all/Foundation/include/Poco/InflatingStream.h	2009-05-22 20:53:07.000000000 +1000
@@ -44,7 +44,7 @@
 #include "Poco/BufferedStreamBuf.h"
 #include <istream>
 #include <ostream>
-#include "Poco/zlib.h"
+#include <zlib.h>
 
 
 namespace Poco {
diff -ruN poco-1.3.5-all.orig/Foundation/src/Checksum.cpp poco-1.3.5-all/Foundation/src/Checksum.cpp
--- poco-1.3.5-all.orig/Foundation/src/Checksum.cpp	2009-05-13 04:22:09.000000000 +1000
+++ poco-1.3.5-all/Foundation/src/Checksum.cpp	2009-05-22 20:53:27.000000000 +1000
@@ -35,7 +35,7 @@
 
 
 #include "Poco/Checksum.h"
-#include "Poco/zlib.h"
+#include <zlib.h>
 
 
 namespace Poco {
diff -ruN poco-1.3.5-all.orig/Foundation/src/RegularExpression.cpp poco-1.3.5-all/Foundation/src/RegularExpression.cpp
--- poco-1.3.5-all.orig/Foundation/src/RegularExpression.cpp	2009-05-13 04:22:09.000000000 +1000
+++ poco-1.3.5-all/Foundation/src/RegularExpression.cpp	2009-05-22 20:53:57.000000000 +1000
@@ -37,7 +37,7 @@
 #include "Poco/RegularExpression.h"
 #include "Poco/Exception.h"
 #include <sstream>
-#include "pcre.h"
+#include <pcre.h>
 
 
 namespace Poco {
diff -ruN poco-1.3.5-all.orig/XML/Makefile poco-1.3.5-all/XML/Makefile
--- poco-1.3.5-all.orig/XML/Makefile	2009-05-13 04:22:11.000000000 +1000
+++ poco-1.3.5-all/XML/Makefile	2009-05-22 20:55:24.000000000 +1000
@@ -8,8 +8,8 @@
 
 include $(POCO_BASE)/build/rules/global
 
-COMMONFLAGS += -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H
-
+COMMONFLAGS += -DXML_NS -DXML_DTD
+SYSLIBS += -lexpat
 objects = AbstractContainerNode AbstractNode Attr AttrMap Attributes \
 	AttributesImpl CDATASection CharacterData ChildNodesList Comment \
 	ContentHandler DOMBuilder DOMException DOMImplementation DOMObject \
@@ -22,7 +22,7 @@
 	NamespaceSupport Node NodeFilter NodeIterator NodeList Notation \
 	ParserEngine ProcessingInstruction SAXException SAXParser Text \
 	TreeWalker WhitespaceFilter XMLException XMLFilter XMLFilterImpl XMLReader \
-	XMLString XMLWriter NodeAppender xmlparse xmlrole xmltok
+	XMLString XMLWriter NodeAppender
 
 target         = PocoXML
 target_version = $(LIBVERSION)
diff -ruN poco-1.3.5-all.orig/XML/include/Poco/XML/ParserEngine.h poco-1.3.5-all/XML/include/Poco/XML/ParserEngine.h
--- poco-1.3.5-all.orig/XML/include/Poco/XML/ParserEngine.h	2009-05-13 04:22:11.000000000 +1000
+++ poco-1.3.5-all/XML/include/Poco/XML/ParserEngine.h	2009-05-22 20:56:02.000000000 +1000
@@ -40,7 +40,7 @@
 
 
 #include "Poco/XML/XML.h"
-#include "Poco/XML/expat.h"
+#include <expat.h>
 #include "Poco/XML/XMLString.h"
 #include "Poco/XML/XMLStream.h"
 #include "Poco/SAX/Locator.h"