| 1 |
dev-zero 08/11/23 10:27:26 |
| 2 |
|
| 3 |
Added: 1.3.3_p1-gentoo.patch 1.3.3_p1-unbundle_libs.patch |
| 4 |
Removed: 1.3.2-missing_includes.patch 1.3.2-gentoo.patch |
| 5 |
Log: |
| 6 |
Version bump, unbundled libs (bug #247242). Dropped old version. |
| 7 |
(Portage version: 2.2_rc14/cvs/Linux 2.6.27.5 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/poco/files/1.3.3_p1-gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/poco/files/1.3.3_p1-gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/poco/files/1.3.3_p1-gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.3.3_p1-gentoo.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur poco-1.3.3p1-all.orig/components poco-1.3.3p1-all/components |
| 18 |
--- poco-1.3.3p1-all.orig/components 2008-10-20 19:40:05.000000000 +0200 |
| 19 |
+++ poco-1.3.3p1-all/components 2008-10-20 20:11:19.000000000 +0200 |
| 20 |
@@ -1,12 +1,6 @@ |
| 21 |
-CppUnit |
| 22 |
Foundation |
| 23 |
XML |
| 24 |
Util |
| 25 |
Net |
| 26 |
-NetSSL_OpenSSL |
| 27 |
Data |
| 28 |
-Data/SQLite |
| 29 |
-Data/ODBC |
| 30 |
-Data/MySQL |
| 31 |
-Crypto |
| 32 |
Zip |
| 33 |
diff -Naur poco-1.3.3p1-all.orig/Data/ODBC/Makefile poco-1.3.3p1-all/Data/ODBC/Makefile |
| 34 |
--- poco-1.3.3p1-all.orig/Data/ODBC/Makefile 2008-10-20 19:40:05.000000000 +0200 |
| 35 |
+++ poco-1.3.3p1-all/Data/ODBC/Makefile 2008-10-20 19:54:07.000000000 +0200 |
| 36 |
@@ -11,19 +11,19 @@ |
| 37 |
ifeq ($(POCO_CONFIG),MinGW) |
| 38 |
# Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib |
| 39 |
else |
| 40 |
-ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 41 |
+ifeq (unixodbc, $(GENTOO_ODBC)) |
| 42 |
SYSLIBS += -lodbc -lodbcinst |
| 43 |
COMMONFLAGS += -DPOCO_UNIXODBC |
| 44 |
else |
| 45 |
-ifeq (0, $(shell test -h /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 46 |
+ifeq (unixodbc, $(GENTOO_ODBC)) |
| 47 |
SYSLIBS += -lodbc -lodbcinst |
| 48 |
COMMONFLAGS += -DPOCO_UNIXODBC |
| 49 |
else |
| 50 |
-ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 51 |
+ifeq (iodbc, $(GENTOO_ODBC)) |
| 52 |
SYSLIBS += -liodbc -liodbcinst |
| 53 |
COMMONFLAGS += -DPOCO_IODBC |
| 54 |
else |
| 55 |
-ifeq (0, $(shell test -h /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 56 |
+ifeq (iodbc, $(GENTOO_ODBC)) |
| 57 |
SYSLIBS += -liodbc -liodbcinst |
| 58 |
COMMONFLAGS += -DPOCO_IODBC |
| 59 |
else |
| 60 |
diff -Naur poco-1.3.3p1-all.orig/Makefile poco-1.3.3p1-all/Makefile |
| 61 |
--- poco-1.3.3p1-all.orig/Makefile 2008-10-20 19:40:05.000000000 +0200 |
| 62 |
+++ poco-1.3.3p1-all/Makefile 2008-10-20 20:12:09.000000000 +0200 |
| 63 |
@@ -21,7 +21,7 @@ |
| 64 |
|
| 65 |
.PHONY: all libexecs cppunit tests samples clean distclean install |
| 66 |
|
| 67 |
-all: libexecs tests samples |
| 68 |
+all: libexecs |
| 69 |
|
| 70 |
INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) |
| 71 |
COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Crypto Zip |
| 72 |
@@ -31,7 +31,7 @@ |
| 73 |
|
| 74 |
install: libexecs |
| 75 |
mkdir -p $(INSTALLDIR)/include/Poco |
| 76 |
- mkdir -p $(INSTALLDIR)/lib |
| 77 |
+ mkdir -p $(INSTALLDIR)/$(LIBDIR) |
| 78 |
mkdir -p $(INSTALLDIR)/bin |
| 79 |
for comp in $(COMPONENTS) ; do \ |
| 80 |
if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ |
| 81 |
@@ -41,11 +41,11 @@ |
| 82 |
find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \ |
| 83 |
fi ; \ |
| 84 |
done |
| 85 |
- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; |
| 86 |
- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; |
| 87 |
+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \; |
| 88 |
+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \; |
| 89 |
|
| 90 |
-libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Crypto-libexec Zip-libexec |
| 91 |
-tests = Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Crypto-tests Zip-tests |
| 92 |
+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec |
| 93 |
+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests |
| 94 |
samples = Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples Crypto-samples Zip-samples |
| 95 |
|
| 96 |
.PHONY: $(libexecs) |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
1.1 dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch |
| 101 |
|
| 102 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch?rev=1.1&view=markup |
| 103 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch?rev=1.1&content-type=text/plain |
| 104 |
|
| 105 |
Index: 1.3.3_p1-unbundle_libs.patch |
| 106 |
=================================================================== |
| 107 |
diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/Makefile poco-1.3.3p1-all/Data/SQLite/Makefile |
| 108 |
--- poco-1.3.3p1-all.orig/Data/SQLite/Makefile 2008-11-22 22:13:34.000000000 +0100 |
| 109 |
+++ poco-1.3.3p1-all/Data/SQLite/Makefile 2008-11-23 10:27:53.000000000 +0100 |
| 110 |
@@ -9,10 +9,10 @@ |
| 111 |
include $(POCO_BASE)/build/rules/global |
| 112 |
|
| 113 |
SYSFLAGS += -DTHREADSAFE -DNO_TCL -DSQLITE_DISABLE_LFS |
| 114 |
+SYSLIBS += -lsqlite3 |
| 115 |
|
| 116 |
objects = Binder Extractor SessionImpl Connector \ |
| 117 |
- SQLiteException SQLiteStatementImpl Utility \ |
| 118 |
- sqlite3 |
| 119 |
+ SQLiteException SQLiteStatementImpl Utility |
| 120 |
|
| 121 |
target = PocoSQLite |
| 122 |
target_version = $(LIBVERSION) |
| 123 |
diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp |
| 124 |
--- poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 125 |
+++ poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp 2008-11-23 10:30:43.000000000 +0100 |
| 126 |
@@ -38,7 +38,7 @@ |
| 127 |
#include "Poco/Data/SQLite/Utility.h" |
| 128 |
#include "Poco/Data/BLOB.h" |
| 129 |
#include "Poco/Exception.h" |
| 130 |
-#include "sqlite3.h" |
| 131 |
+#include <sqlite3.h> |
| 132 |
#include <cstdlib> |
| 133 |
|
| 134 |
|
| 135 |
diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp |
| 136 |
--- poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 137 |
+++ poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp 2008-11-23 10:29:32.000000000 +0100 |
| 138 |
@@ -37,7 +37,7 @@ |
| 139 |
#include "Poco/Data/SQLite/Connector.h" |
| 140 |
#include "Poco/Data/SQLite/SessionImpl.h" |
| 141 |
#include "Poco/Data/SessionFactory.h" |
| 142 |
-#include "sqlite3.h" |
| 143 |
+#include <sqlite3.h> |
| 144 |
|
| 145 |
|
| 146 |
namespace Poco { |
| 147 |
diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp |
| 148 |
--- poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 149 |
+++ poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp 2008-11-23 10:29:44.000000000 +0100 |
| 150 |
@@ -39,7 +39,7 @@ |
| 151 |
#include "Poco/Data/BLOB.h" |
| 152 |
#include "Poco/Data/DataException.h" |
| 153 |
#include "Poco/Exception.h" |
| 154 |
-#include "sqlite3.h" |
| 155 |
+#include <sqlite3.h> |
| 156 |
#include <cstdlib> |
| 157 |
|
| 158 |
|
| 159 |
diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp |
| 160 |
--- poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 161 |
+++ poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp 2008-11-23 10:30:05.000000000 +0100 |
| 162 |
@@ -37,7 +37,7 @@ |
| 163 |
#include "Poco/Data/SQLite/SessionImpl.h" |
| 164 |
#include "Poco/Data/SQLite/Utility.h" |
| 165 |
#include "Poco/Data/SQLite/SQLiteStatementImpl.h" |
| 166 |
-#include "sqlite3.h" |
| 167 |
+#include <sqlite3.h> |
| 168 |
#include <cstdlib> |
| 169 |
|
| 170 |
|
| 171 |
diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp |
| 172 |
--- poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 173 |
+++ poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-23 10:30:34.000000000 +0100 |
| 174 |
@@ -40,7 +40,7 @@ |
| 175 |
#include "Poco/String.h" |
| 176 |
#include <cstdlib> |
| 177 |
#include <cstring> |
| 178 |
-#include "sqlite3.h" |
| 179 |
+#include <sqlite3.h> |
| 180 |
|
| 181 |
|
| 182 |
namespace Poco { |
| 183 |
diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp |
| 184 |
--- poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 185 |
+++ poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp 2008-11-23 10:29:22.000000000 +0100 |
| 186 |
@@ -41,7 +41,7 @@ |
| 187 |
#include "Poco/NumberFormatter.h" |
| 188 |
#include "Poco/String.h" |
| 189 |
#include "Poco/Exception.h" |
| 190 |
-#include "sqlite3.h" |
| 191 |
+#include <sqlite3.h> |
| 192 |
|
| 193 |
|
| 194 |
namespace Poco { |
| 195 |
diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h |
| 196 |
--- poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:34.000000000 +0100 |
| 197 |
+++ poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:50.000000000 +0100 |
| 198 |
@@ -44,7 +44,7 @@ |
| 199 |
#include "Poco/BufferedStreamBuf.h" |
| 200 |
#include <istream> |
| 201 |
#include <ostream> |
| 202 |
-#include "Poco/zlib.h" |
| 203 |
+#include <zlib.h> |
| 204 |
|
| 205 |
|
| 206 |
namespace Poco { |
| 207 |
diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h |
| 208 |
--- poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:34.000000000 +0100 |
| 209 |
+++ poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:50.000000000 +0100 |
| 210 |
@@ -44,7 +44,7 @@ |
| 211 |
#include "Poco/BufferedStreamBuf.h" |
| 212 |
#include <istream> |
| 213 |
#include <ostream> |
| 214 |
-#include "Poco/zlib.h" |
| 215 |
+#include <zlib.h> |
| 216 |
|
| 217 |
|
| 218 |
namespace Poco { |
| 219 |
diff -Naur poco-1.3.3p1-all.orig/Foundation/Makefile poco-1.3.3p1-all/Foundation/Makefile |
| 220 |
--- poco-1.3.3p1-all.orig/Foundation/Makefile 2008-11-22 22:13:34.000000000 +0100 |
| 221 |
+++ poco-1.3.3p1-all/Foundation/Makefile 2008-11-23 10:04:10.000000000 +0100 |
| 222 |
@@ -8,6 +8,8 @@ |
| 223 |
|
| 224 |
include $(POCO_BASE)/build/rules/global |
| 225 |
|
| 226 |
+SYSLIBS += -lpcre -lz |
| 227 |
+ |
| 228 |
objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \ |
| 229 |
BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \ |
| 230 |
CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \ |
| 231 |
@@ -30,12 +32,7 @@ |
| 232 |
FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \ |
| 233 |
UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \ |
| 234 |
Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \ |
| 235 |
- FileStream Unicode UTF8String \ |
| 236 |
- adler32 compress crc32 deflate gzio infback inffast inflate inftrees \ |
| 237 |
- trees zutil \ |
| 238 |
- pcre_chartables pcre_compile pcre_globals pcre_maketables pcre_study \ |
| 239 |
- pcre_tables pcre_try_flipped pcre_ucd pcre_valid_utf8 \ |
| 240 |
- pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass |
| 241 |
+ FileStream Unicode UTF8String |
| 242 |
|
| 243 |
ifeq ($(POCO_CONFIG),MinGW) |
| 244 |
objects += EventLogChannel WindowsConsoleChannel |
| 245 |
diff -Naur poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp poco-1.3.3p1-all/Foundation/src/Checksum.cpp |
| 246 |
--- poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 247 |
+++ poco-1.3.3p1-all/Foundation/src/Checksum.cpp 2008-11-22 22:13:50.000000000 +0100 |
| 248 |
@@ -35,7 +35,7 @@ |
| 249 |
|
| 250 |
|
| 251 |
#include "Poco/Checksum.h" |
| 252 |
-#include "Poco/zlib.h" |
| 253 |
+#include <zlib.h> |
| 254 |
|
| 255 |
|
| 256 |
namespace Poco { |
| 257 |
diff -Naur poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp |
| 258 |
--- poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 259 |
+++ poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:50.000000000 +0100 |
| 260 |
@@ -37,7 +37,7 @@ |
| 261 |
#include "Poco/RegularExpression.h" |
| 262 |
#include "Poco/Exception.h" |
| 263 |
#include <sstream> |
| 264 |
-#include "pcre.h" |
| 265 |
+#include <pcre.h> |
| 266 |
|
| 267 |
|
| 268 |
namespace Poco { |
| 269 |
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 |
| 270 |
--- poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:34.000000000 +0100 |
| 271 |
+++ poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:50.000000000 +0100 |
| 272 |
@@ -40,7 +40,7 @@ |
| 273 |
|
| 274 |
|
| 275 |
#include "Poco/XML/XML.h" |
| 276 |
-#include "Poco/XML/expat.h" |
| 277 |
+#include <expat.h> |
| 278 |
#include "Poco/XML/XMLString.h" |
| 279 |
#include "Poco/XML/XMLStream.h" |
| 280 |
#include "Poco/SAX/Locator.h" |
| 281 |
diff -Naur poco-1.3.3p1-all.orig/XML/Makefile poco-1.3.3p1-all/XML/Makefile |
| 282 |
--- poco-1.3.3p1-all.orig/XML/Makefile 2008-11-22 22:13:34.000000000 +0100 |
| 283 |
+++ poco-1.3.3p1-all/XML/Makefile 2008-11-23 10:04:25.000000000 +0100 |
| 284 |
@@ -8,7 +8,9 @@ |
| 285 |
|
| 286 |
include $(POCO_BASE)/build/rules/global |
| 287 |
|
| 288 |
-COMMONFLAGS += -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H |
| 289 |
+COMMONFLAGS += -DXML_NS -DXML_DTD |
| 290 |
+ |
| 291 |
+SYSLIBS += -lexpat |
| 292 |
|
| 293 |
objects = AbstractContainerNode AbstractNode Attr AttrMap Attributes \ |
| 294 |
AttributesImpl CDATASection CharacterData ChildNodesList Comment \ |
| 295 |
@@ -22,7 +24,7 @@ |
| 296 |
NamespaceSupport Node NodeFilter NodeIterator NodeList Notation \ |
| 297 |
ParserEngine ProcessingInstruction SAXException SAXParser Text \ |
| 298 |
TreeWalker WhitespaceFilter XMLException XMLFilter XMLFilterImpl XMLReader \ |
| 299 |
- XMLString XMLWriter NodeAppender xmlparse xmlrole xmltok |
| 300 |
+ XMLString XMLWriter NodeAppender |
| 301 |
|
| 302 |
target = PocoXML |
| 303 |
target_version = $(LIBVERSION) |
Archives