dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch

   1 diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/Makefile poco-1.3.3p1-all/Data/SQLite/Makefile
   2 --- poco-1.3.3p1-all.orig/Data/SQLite/Makefile  2008-11-22 22:13:34.000000000 +0100
   3 +++ poco-1.3.3p1-all/Data/SQLite/Makefile       2008-11-23 10:27:53.000000000 +0100
   4 @@ -9,10 +9,10 @@
   5  include $(POCO_BASE)/build/rules/global
   6
   7  SYSFLAGS += -DTHREADSAFE -DNO_TCL -DSQLITE_DISABLE_LFS
   8 +SYSLIBS += -lsqlite3
   9
  10  objects = Binder Extractor SessionImpl Connector \
  11 -       SQLiteException SQLiteStatementImpl Utility \
  12 -       sqlite3
  13 +       SQLiteException SQLiteStatementImpl Utility
  14
  15  target         = PocoSQLite
  16  target_version = $(LIBVERSION)
  17 diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp
  18 --- poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp    2008-11-22 22:13:34.000000000 +0100
  19 +++ poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp 2008-11-23 10:30:43.000000000 +0100
  20 @@ -38,7 +38,7 @@
  21  #include "Poco/Data/SQLite/Utility.h"
  22  #include "Poco/Data/BLOB.h"
  23  #include "Poco/Exception.h"
  24 -#include "sqlite3.h"
  25 +#include <sqlite3.h>
  26  #include <cstdlib>
  27
  28
  29 diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp
  30 --- poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp 2008-11-22 22:13:34.000000000 +0100
  31 +++ poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp      2008-11-23 10:29:32.000000000 +0100
  32 @@ -37,7 +37,7 @@
  33  #include "Poco/Data/SQLite/Connector.h"
  34  #include "Poco/Data/SQLite/SessionImpl.h"
  35  #include "Poco/Data/SessionFactory.h"
  36 -#include "sqlite3.h"
  37 +#include <sqlite3.h>
  38
  39
  40  namespace Poco {
  41 diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp
  42 --- poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp 2008-11-22 22:13:34.000000000 +0100
  43 +++ poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp      2008-11-23 10:29:44.000000000 +0100
  44 @@ -39,7 +39,7 @@
  45  #include "Poco/Data/BLOB.h"
  46  #include "Poco/Data/DataException.h"
  47  #include "Poco/Exception.h"
  48 -#include "sqlite3.h"
  49 +#include <sqlite3.h>
  50  #include <cstdlib>
  51
  52
  53 diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp
  54 --- poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp       2008-11-22 22:13:34.000000000 +0100
  55 +++ poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp    2008-11-23 10:30:05.000000000 +0100
  56 @@ -37,7 +37,7 @@
  57  #include "Poco/Data/SQLite/SessionImpl.h"
  58  #include "Poco/Data/SQLite/Utility.h"
  59  #include "Poco/Data/SQLite/SQLiteStatementImpl.h"
  60 -#include "sqlite3.h"
  61 +#include <sqlite3.h>
  62  #include <cstdlib>
  63
  64
  65 diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp
  66 --- poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp       2008-11-22 22:13:34.000000000 +0100
  67 +++ poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp    2008-11-23 10:30:34.000000000 +0100
  68 @@ -40,7 +40,7 @@
  69  #include "Poco/String.h"
  70  #include <cstdlib>
  71  #include <cstring>
  72 -#include "sqlite3.h"
  73 +#include <sqlite3.h>
  74
  75
  76  namespace Poco {
  77 diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp
  78 --- poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp   2008-11-22 22:13:34.000000000 +0100
  79 +++ poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp        2008-11-23 10:29:22.000000000 +0100
  80 @@ -41,7 +41,7 @@
  81  #include "Poco/NumberFormatter.h"
  82  #include "Poco/String.h"
  83  #include "Poco/Exception.h"
  84 -#include "sqlite3.h"
  85 +#include <sqlite3.h>
  86
  87
  88  namespace Poco {
  89 diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h
  90 --- poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h     2008-11-22 22:13:34.000000000 +0100
  91 +++ poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h  2008-11-22 22:13:50.000000000 +0100
  92 @@ -44,7 +44,7 @@
  93  #include "Poco/BufferedStreamBuf.h"
  94  #include <istream>
  95  #include <ostream>
  96 -#include "Poco/zlib.h"
  97 +#include <zlib.h>
  98
  99
 100  namespace Poco {
 101 diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h
 102 --- poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h     2008-11-22 22:13:34.000000000 +0100
 103 +++ poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h  2008-11-22 22:13:50.000000000 +0100
 104 @@ -44,7 +44,7 @@
 105  #include "Poco/BufferedStreamBuf.h"
 106  #include <istream>
 107  #include <ostream>
 108 -#include "Poco/zlib.h"
 109 +#include <zlib.h>
 110
 111
 112  namespace Poco {
 113 diff -Naur poco-1.3.3p1-all.orig/Foundation/Makefile poco-1.3.3p1-all/Foundation/Makefile
 114 --- poco-1.3.3p1-all.orig/Foundation/Makefile   2008-11-22 22:13:34.000000000 +0100
 115 +++ poco-1.3.3p1-all/Foundation/Makefile        2008-11-23 10:04:10.000000000 +0100
 116 @@ -8,6 +8,8 @@
 117
 118  include $(POCO_BASE)/build/rules/global
 119
 120 +SYSLIBS += -lpcre -lz
 121 +
 122  objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \
 123         BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \
 124         CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \
 125 @@ -30,12 +32,7 @@
 126         FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \
 127         UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \
 128         Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \
 129 -       FileStream Unicode UTF8String \
 130 -       adler32 compress crc32  deflate gzio infback inffast inflate inftrees  \
 131 -       trees zutil \
 132 -       pcre_chartables pcre_compile pcre_globals pcre_maketables pcre_study \
 133 -       pcre_tables pcre_try_flipped pcre_ucd pcre_valid_utf8 \
 134 -       pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass
 135 +       FileStream Unicode UTF8String
 136
 137  ifeq ($(POCO_CONFIG),MinGW)
 138         objects += EventLogChannel WindowsConsoleChannel
 139 diff -Naur poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp poco-1.3.3p1-all/Foundation/src/Checksum.cpp
 140 --- poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp   2008-11-22 22:13:34.000000000 +0100
 141 +++ poco-1.3.3p1-all/Foundation/src/Checksum.cpp        2008-11-22 22:13:50.000000000 +0100
 142 @@ -35,7 +35,7 @@
 143
 144
 145  #include "Poco/Checksum.h"
 146 -#include "Poco/zlib.h"
 147 +#include <zlib.h>
 148
 149
 150  namespace Poco {
 151 diff -Naur poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp
 152 --- poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp  2008-11-22 22:13:34.000000000 +0100
 153 +++ poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp       2008-11-22 22:13:50.000000000 +0100
 154 @@ -37,7 +37,7 @@
 155  #include "Poco/RegularExpression.h"
 156  #include "Poco/Exception.h"
 157  #include <sstream>
 158 -#include "pcre.h"
 159 +#include <pcre.h>
 160
 161
 162  namespace Poco {
 163 diff -Naur poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h
 164 --- poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h   2008-11-22 22:13:34.000000000 +0100
 165 +++ poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h        2008-11-22 22:13:50.000000000 +0100
 166 @@ -40,7 +40,7 @@
 167
 168
 169  #include "Poco/XML/XML.h"
 170 -#include "Poco/XML/expat.h"
 171 +#include <expat.h>
 172  #include "Poco/XML/XMLString.h"
 173  #include "Poco/XML/XMLStream.h"
 174  #include "Poco/SAX/Locator.h"
 175 diff -Naur poco-1.3.3p1-all.orig/XML/Makefile poco-1.3.3p1-all/XML/Makefile
 176 --- poco-1.3.3p1-all.orig/XML/Makefile  2008-11-22 22:13:34.000000000 +0100
 177 +++ poco-1.3.3p1-all/XML/Makefile       2008-11-23 10:04:25.000000000 +0100
 178 @@ -8,7 +8,9 @@
 179
 180  include $(POCO_BASE)/build/rules/global
 181
 182 -COMMONFLAGS += -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H
 183 +COMMONFLAGS += -DXML_NS -DXML_DTD
 184 +
 185 +SYSLIBS += -lexpat
 186
 187  objects = AbstractContainerNode AbstractNode Attr AttrMap Attributes \
 188         AttributesImpl CDATASection CharacterData ChildNodesList Comment \
 189 @@ -22,7 +24,7 @@
 190         NamespaceSupport Node NodeFilter NodeIterator NodeList Notation \
 191         ParserEngine ProcessingInstruction SAXException SAXParser Text \
 192         TreeWalker WhitespaceFilter XMLException XMLFilter XMLFilterImpl XMLReader \
 193 -       XMLString XMLWriter NodeAppender xmlparse xmlrole xmltok
 194 +       XMLString XMLWriter NodeAppender
 195
 196  target         = PocoXML
 197  target_version = $(LIBVERSION)