| 1 |
commit: 0a94f11955f1bbb9fead0319baf6780c5172eb9e |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Sep 4 11:56:09 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 4 13:08:40 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a94f119 |
| 7 |
|
| 8 |
dev-libs/poco: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/2223 |
| 11 |
|
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-libs/poco/files/1.3.3_p1-gcc44.patch | 16 -- |
| 15 |
dev-libs/poco/files/1.3.3_p1-gentoo.patch | 80 --------- |
| 16 |
dev-libs/poco/files/1.3.3_p1-openssl-1.patch | 16 -- |
| 17 |
dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch | 197 ----------------------- |
| 18 |
dev-libs/poco/files/1.3.6_p2-gentoo.patch | 85 ---------- |
| 19 |
dev-libs/poco/files/1.4.3_p1-gentoo.patch | 85 ---------- |
| 20 |
dev-libs/poco/files/1.4.5-gentoo.patch | 74 --------- |
| 21 |
dev-libs/poco/files/1.4.6_p1-gentoo.patch | 74 --------- |
| 22 |
dev-libs/poco/files/libpcre-8.13.patch | 10 -- |
| 23 |
9 files changed, 637 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-libs/poco/files/1.3.3_p1-gcc44.patch b/dev-libs/poco/files/1.3.3_p1-gcc44.patch |
| 26 |
deleted file mode 100644 |
| 27 |
index 990aff1..00000000 |
| 28 |
--- a/dev-libs/poco/files/1.3.3_p1-gcc44.patch |
| 29 |
+++ /dev/null |
| 30 |
@@ -1,16 +0,0 @@ |
| 31 |
-diff -NrU5 poco-1.3.3p1-all.orig/Foundation/src/Environment.cpp poco-1.3.3p1-all/Foundation/src/Environment.cpp |
| 32 |
---- poco-1.3.3p1-all.orig/Foundation/src/Environment.cpp 2009-05-15 20:44:37.000000000 -0600 |
| 33 |
-+++ poco-1.3.3p1-all/Foundation/src/Environment.cpp 2009-05-15 20:46:12.000000000 -0600 |
| 34 |
-@@ -34,11 +34,11 @@ |
| 35 |
- // |
| 36 |
- |
| 37 |
- |
| 38 |
- #include "Poco/Environment.h" |
| 39 |
- #include <cstdlib> |
| 40 |
-- |
| 41 |
-+#include <cstdio> |
| 42 |
- |
| 43 |
- #if defined(POCO_OS_FAMILY_VMS) |
| 44 |
- #include "Environment_VMS.cpp" |
| 45 |
- #elif defined(POCO_OS_FAMILY_UNIX) |
| 46 |
- #include "Environment_UNIX.cpp" |
| 47 |
|
| 48 |
diff --git a/dev-libs/poco/files/1.3.3_p1-gentoo.patch b/dev-libs/poco/files/1.3.3_p1-gentoo.patch |
| 49 |
deleted file mode 100644 |
| 50 |
index f162cd1..00000000 |
| 51 |
--- a/dev-libs/poco/files/1.3.3_p1-gentoo.patch |
| 52 |
+++ /dev/null |
| 53 |
@@ -1,80 +0,0 @@ |
| 54 |
-diff -Naur poco-1.3.3p1-all.orig/components poco-1.3.3p1-all/components |
| 55 |
---- poco-1.3.3p1-all.orig/components 2008-10-20 19:40:05.000000000 +0200 |
| 56 |
-+++ poco-1.3.3p1-all/components 2008-10-20 20:11:19.000000000 +0200 |
| 57 |
-@@ -1,12 +1,6 @@ |
| 58 |
--CppUnit |
| 59 |
- Foundation |
| 60 |
- XML |
| 61 |
- Util |
| 62 |
- Net |
| 63 |
--NetSSL_OpenSSL |
| 64 |
- Data |
| 65 |
--Data/SQLite |
| 66 |
--Data/ODBC |
| 67 |
--Data/MySQL |
| 68 |
--Crypto |
| 69 |
- Zip |
| 70 |
-diff -Naur poco-1.3.3p1-all.orig/Data/ODBC/Makefile poco-1.3.3p1-all/Data/ODBC/Makefile |
| 71 |
---- poco-1.3.3p1-all.orig/Data/ODBC/Makefile 2008-10-20 19:40:05.000000000 +0200 |
| 72 |
-+++ poco-1.3.3p1-all/Data/ODBC/Makefile 2008-10-20 19:54:07.000000000 +0200 |
| 73 |
-@@ -11,19 +11,19 @@ |
| 74 |
- ifeq ($(POCO_CONFIG),MinGW) |
| 75 |
- # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib |
| 76 |
- else |
| 77 |
--ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 78 |
-+ifeq (unixodbc, $(GENTOO_ODBC)) |
| 79 |
- SYSLIBS += -lodbc -lodbcinst |
| 80 |
- COMMONFLAGS += -DPOCO_UNIXODBC |
| 81 |
- else |
| 82 |
--ifeq (0, $(shell test -h /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 83 |
-+ifeq (unixodbc, $(GENTOO_ODBC)) |
| 84 |
- SYSLIBS += -lodbc -lodbcinst |
| 85 |
- COMMONFLAGS += -DPOCO_UNIXODBC |
| 86 |
- else |
| 87 |
--ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 88 |
-+ifeq (iodbc, $(GENTOO_ODBC)) |
| 89 |
- SYSLIBS += -liodbc -liodbcinst |
| 90 |
- COMMONFLAGS += -DPOCO_IODBC |
| 91 |
- else |
| 92 |
--ifeq (0, $(shell test -h /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 93 |
-+ifeq (iodbc, $(GENTOO_ODBC)) |
| 94 |
- SYSLIBS += -liodbc -liodbcinst |
| 95 |
- COMMONFLAGS += -DPOCO_IODBC |
| 96 |
- else |
| 97 |
-diff -Naur poco-1.3.3p1-all.orig/Makefile poco-1.3.3p1-all/Makefile |
| 98 |
---- poco-1.3.3p1-all.orig/Makefile 2008-10-20 19:40:05.000000000 +0200 |
| 99 |
-+++ poco-1.3.3p1-all/Makefile 2008-10-20 20:12:09.000000000 +0200 |
| 100 |
-@@ -21,7 +21,7 @@ |
| 101 |
- |
| 102 |
- .PHONY: all libexecs cppunit tests samples clean distclean install |
| 103 |
- |
| 104 |
--all: libexecs tests samples |
| 105 |
-+all: libexecs |
| 106 |
- |
| 107 |
- INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) |
| 108 |
- COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Crypto Zip |
| 109 |
-@@ -31,7 +31,7 @@ |
| 110 |
- |
| 111 |
- install: libexecs |
| 112 |
- mkdir -p $(INSTALLDIR)/include/Poco |
| 113 |
-- mkdir -p $(INSTALLDIR)/lib |
| 114 |
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR) |
| 115 |
- mkdir -p $(INSTALLDIR)/bin |
| 116 |
- for comp in $(COMPONENTS) ; do \ |
| 117 |
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ |
| 118 |
-@@ -41,11 +41,11 @@ |
| 119 |
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \ |
| 120 |
- fi ; \ |
| 121 |
- done |
| 122 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; |
| 123 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; |
| 124 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \; |
| 125 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \; |
| 126 |
- |
| 127 |
--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 |
| 128 |
--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 |
| 129 |
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec |
| 130 |
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests |
| 131 |
- samples = Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples Crypto-samples Zip-samples |
| 132 |
- |
| 133 |
- .PHONY: $(libexecs) |
| 134 |
|
| 135 |
diff --git a/dev-libs/poco/files/1.3.3_p1-openssl-1.patch b/dev-libs/poco/files/1.3.3_p1-openssl-1.patch |
| 136 |
deleted file mode 100644 |
| 137 |
index 2377edd..00000000 |
| 138 |
--- a/dev-libs/poco/files/1.3.3_p1-openssl-1.patch |
| 139 |
+++ /dev/null |
| 140 |
@@ -1,16 +0,0 @@ |
| 141 |
-http://bugs.gentoo.org/327769 |
| 142 |
- |
| 143 |
---- NetSSL_OpenSSL/src/SecureSocketImpl.cpp |
| 144 |
-+++ NetSSL_OpenSSL/src/SecureSocketImpl.cpp |
| 145 |
-@@ -430,7 +430,11 @@ |
| 146 |
- |
| 147 |
- if (!strcmp(extstr, "subjectAltName")) |
| 148 |
- { |
| 149 |
-+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L |
| 150 |
-+ const X509V3_EXT_METHOD* meth = X509V3_EXT_get(ext); |
| 151 |
-+ #else |
| 152 |
- X509V3_EXT_METHOD* meth = X509V3_EXT_get(ext); |
| 153 |
-+ #endif |
| 154 |
- if (!meth) |
| 155 |
- break; |
| 156 |
- |
| 157 |
|
| 158 |
diff --git a/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch b/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch |
| 159 |
deleted file mode 100644 |
| 160 |
index 2ec2067..00000000 |
| 161 |
--- a/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch |
| 162 |
+++ /dev/null |
| 163 |
@@ -1,197 +0,0 @@ |
| 164 |
-diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/Makefile poco-1.3.3p1-all/Data/SQLite/Makefile |
| 165 |
---- poco-1.3.3p1-all.orig/Data/SQLite/Makefile 2008-11-22 22:13:34.000000000 +0100 |
| 166 |
-+++ poco-1.3.3p1-all/Data/SQLite/Makefile 2008-11-23 10:27:53.000000000 +0100 |
| 167 |
-@@ -9,10 +9,10 @@ |
| 168 |
- include $(POCO_BASE)/build/rules/global |
| 169 |
- |
| 170 |
- SYSFLAGS += -DTHREADSAFE -DNO_TCL -DSQLITE_DISABLE_LFS |
| 171 |
-+SYSLIBS += -lsqlite3 |
| 172 |
- |
| 173 |
- objects = Binder Extractor SessionImpl Connector \ |
| 174 |
-- SQLiteException SQLiteStatementImpl Utility \ |
| 175 |
-- sqlite3 |
| 176 |
-+ SQLiteException SQLiteStatementImpl Utility |
| 177 |
- |
| 178 |
- target = PocoSQLite |
| 179 |
- target_version = $(LIBVERSION) |
| 180 |
-diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp |
| 181 |
---- poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 182 |
-+++ poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp 2008-11-23 10:30:43.000000000 +0100 |
| 183 |
-@@ -38,7 +38,7 @@ |
| 184 |
- #include "Poco/Data/SQLite/Utility.h" |
| 185 |
- #include "Poco/Data/BLOB.h" |
| 186 |
- #include "Poco/Exception.h" |
| 187 |
--#include "sqlite3.h" |
| 188 |
-+#include <sqlite3.h> |
| 189 |
- #include <cstdlib> |
| 190 |
- |
| 191 |
- |
| 192 |
-diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp |
| 193 |
---- poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 194 |
-+++ poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp 2008-11-23 10:29:32.000000000 +0100 |
| 195 |
-@@ -37,7 +37,7 @@ |
| 196 |
- #include "Poco/Data/SQLite/Connector.h" |
| 197 |
- #include "Poco/Data/SQLite/SessionImpl.h" |
| 198 |
- #include "Poco/Data/SessionFactory.h" |
| 199 |
--#include "sqlite3.h" |
| 200 |
-+#include <sqlite3.h> |
| 201 |
- |
| 202 |
- |
| 203 |
- namespace Poco { |
| 204 |
-diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp |
| 205 |
---- poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 206 |
-+++ poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp 2008-11-23 10:29:44.000000000 +0100 |
| 207 |
-@@ -39,7 +39,7 @@ |
| 208 |
- #include "Poco/Data/BLOB.h" |
| 209 |
- #include "Poco/Data/DataException.h" |
| 210 |
- #include "Poco/Exception.h" |
| 211 |
--#include "sqlite3.h" |
| 212 |
-+#include <sqlite3.h> |
| 213 |
- #include <cstdlib> |
| 214 |
- |
| 215 |
- |
| 216 |
-diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp |
| 217 |
---- poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 218 |
-+++ poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp 2008-11-23 10:30:05.000000000 +0100 |
| 219 |
-@@ -37,7 +37,7 @@ |
| 220 |
- #include "Poco/Data/SQLite/SessionImpl.h" |
| 221 |
- #include "Poco/Data/SQLite/Utility.h" |
| 222 |
- #include "Poco/Data/SQLite/SQLiteStatementImpl.h" |
| 223 |
--#include "sqlite3.h" |
| 224 |
-+#include <sqlite3.h> |
| 225 |
- #include <cstdlib> |
| 226 |
- |
| 227 |
- |
| 228 |
-diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp |
| 229 |
---- poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 230 |
-+++ poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-23 10:30:34.000000000 +0100 |
| 231 |
-@@ -40,7 +40,7 @@ |
| 232 |
- #include "Poco/String.h" |
| 233 |
- #include <cstdlib> |
| 234 |
- #include <cstring> |
| 235 |
--#include "sqlite3.h" |
| 236 |
-+#include <sqlite3.h> |
| 237 |
- |
| 238 |
- |
| 239 |
- namespace Poco { |
| 240 |
-diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp |
| 241 |
---- poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 242 |
-+++ poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp 2008-11-23 10:29:22.000000000 +0100 |
| 243 |
-@@ -41,7 +41,7 @@ |
| 244 |
- #include "Poco/NumberFormatter.h" |
| 245 |
- #include "Poco/String.h" |
| 246 |
- #include "Poco/Exception.h" |
| 247 |
--#include "sqlite3.h" |
| 248 |
-+#include <sqlite3.h> |
| 249 |
- |
| 250 |
- |
| 251 |
- namespace Poco { |
| 252 |
-diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h |
| 253 |
---- poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:34.000000000 +0100 |
| 254 |
-+++ poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:50.000000000 +0100 |
| 255 |
-@@ -44,7 +44,7 @@ |
| 256 |
- #include "Poco/BufferedStreamBuf.h" |
| 257 |
- #include <istream> |
| 258 |
- #include <ostream> |
| 259 |
--#include "Poco/zlib.h" |
| 260 |
-+#include <zlib.h> |
| 261 |
- |
| 262 |
- |
| 263 |
- namespace Poco { |
| 264 |
-diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h |
| 265 |
---- poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:34.000000000 +0100 |
| 266 |
-+++ poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:50.000000000 +0100 |
| 267 |
-@@ -44,7 +44,7 @@ |
| 268 |
- #include "Poco/BufferedStreamBuf.h" |
| 269 |
- #include <istream> |
| 270 |
- #include <ostream> |
| 271 |
--#include "Poco/zlib.h" |
| 272 |
-+#include <zlib.h> |
| 273 |
- |
| 274 |
- |
| 275 |
- namespace Poco { |
| 276 |
-diff -Naur poco-1.3.3p1-all.orig/Foundation/Makefile poco-1.3.3p1-all/Foundation/Makefile |
| 277 |
---- poco-1.3.3p1-all.orig/Foundation/Makefile 2008-11-22 22:13:34.000000000 +0100 |
| 278 |
-+++ poco-1.3.3p1-all/Foundation/Makefile 2008-11-23 10:04:10.000000000 +0100 |
| 279 |
-@@ -8,6 +8,8 @@ |
| 280 |
- |
| 281 |
- include $(POCO_BASE)/build/rules/global |
| 282 |
- |
| 283 |
-+SYSLIBS += -lpcre -lz |
| 284 |
-+ |
| 285 |
- objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \ |
| 286 |
- BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \ |
| 287 |
- CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \ |
| 288 |
-@@ -30,12 +32,7 @@ |
| 289 |
- FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \ |
| 290 |
- UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \ |
| 291 |
- Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \ |
| 292 |
-- FileStream Unicode UTF8String \ |
| 293 |
-- adler32 compress crc32 deflate gzio infback inffast inflate inftrees \ |
| 294 |
-- trees zutil \ |
| 295 |
-- pcre_chartables pcre_compile pcre_globals pcre_maketables pcre_study \ |
| 296 |
-- pcre_tables pcre_try_flipped pcre_ucd pcre_valid_utf8 \ |
| 297 |
-- pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass |
| 298 |
-+ FileStream Unicode UTF8String |
| 299 |
- |
| 300 |
- ifeq ($(POCO_CONFIG),MinGW) |
| 301 |
- objects += EventLogChannel WindowsConsoleChannel |
| 302 |
-diff -Naur poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp poco-1.3.3p1-all/Foundation/src/Checksum.cpp |
| 303 |
---- poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 304 |
-+++ poco-1.3.3p1-all/Foundation/src/Checksum.cpp 2008-11-22 22:13:50.000000000 +0100 |
| 305 |
-@@ -35,7 +35,7 @@ |
| 306 |
- |
| 307 |
- |
| 308 |
- #include "Poco/Checksum.h" |
| 309 |
--#include "Poco/zlib.h" |
| 310 |
-+#include <zlib.h> |
| 311 |
- |
| 312 |
- |
| 313 |
- namespace Poco { |
| 314 |
-diff -Naur poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp |
| 315 |
---- poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:34.000000000 +0100 |
| 316 |
-+++ poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:50.000000000 +0100 |
| 317 |
-@@ -37,7 +37,7 @@ |
| 318 |
- #include "Poco/RegularExpression.h" |
| 319 |
- #include "Poco/Exception.h" |
| 320 |
- #include <sstream> |
| 321 |
--#include "pcre.h" |
| 322 |
-+#include <pcre.h> |
| 323 |
- |
| 324 |
- |
| 325 |
- namespace Poco { |
| 326 |
-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 |
| 327 |
---- poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:34.000000000 +0100 |
| 328 |
-+++ poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:50.000000000 +0100 |
| 329 |
-@@ -40,7 +40,7 @@ |
| 330 |
- |
| 331 |
- |
| 332 |
- #include "Poco/XML/XML.h" |
| 333 |
--#include "Poco/XML/expat.h" |
| 334 |
-+#include <expat.h> |
| 335 |
- #include "Poco/XML/XMLString.h" |
| 336 |
- #include "Poco/XML/XMLStream.h" |
| 337 |
- #include "Poco/SAX/Locator.h" |
| 338 |
-diff -Naur poco-1.3.3p1-all.orig/XML/Makefile poco-1.3.3p1-all/XML/Makefile |
| 339 |
---- poco-1.3.3p1-all.orig/XML/Makefile 2008-11-22 22:13:34.000000000 +0100 |
| 340 |
-+++ poco-1.3.3p1-all/XML/Makefile 2008-11-23 10:04:25.000000000 +0100 |
| 341 |
-@@ -8,7 +8,9 @@ |
| 342 |
- |
| 343 |
- include $(POCO_BASE)/build/rules/global |
| 344 |
- |
| 345 |
--COMMONFLAGS += -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H |
| 346 |
-+COMMONFLAGS += -DXML_NS -DXML_DTD |
| 347 |
-+ |
| 348 |
-+SYSLIBS += -lexpat |
| 349 |
- |
| 350 |
- objects = AbstractContainerNode AbstractNode Attr AttrMap Attributes \ |
| 351 |
- AttributesImpl CDATASection CharacterData ChildNodesList Comment \ |
| 352 |
-@@ -22,7 +24,7 @@ |
| 353 |
- NamespaceSupport Node NodeFilter NodeIterator NodeList Notation \ |
| 354 |
- ParserEngine ProcessingInstruction SAXException SAXParser Text \ |
| 355 |
- TreeWalker WhitespaceFilter XMLException XMLFilter XMLFilterImpl XMLReader \ |
| 356 |
-- XMLString XMLWriter NodeAppender xmlparse xmlrole xmltok |
| 357 |
-+ XMLString XMLWriter NodeAppender |
| 358 |
- |
| 359 |
- target = PocoXML |
| 360 |
- target_version = $(LIBVERSION) |
| 361 |
|
| 362 |
diff --git a/dev-libs/poco/files/1.3.6_p2-gentoo.patch b/dev-libs/poco/files/1.3.6_p2-gentoo.patch |
| 363 |
deleted file mode 100644 |
| 364 |
index ec466f8..00000000 |
| 365 |
--- a/dev-libs/poco/files/1.3.6_p2-gentoo.patch |
| 366 |
+++ /dev/null |
| 367 |
@@ -1,85 +0,0 @@ |
| 368 |
-diff -ur poco-1.3.6p2-all.orig//components poco-1.3.6p2-all/components |
| 369 |
---- poco-1.3.6p2-all.orig//components 2010-07-19 13:52:31.936802078 +0200 |
| 370 |
-+++ poco-1.3.6p2-all/components 2010-07-19 13:59:37.351927395 +0200 |
| 371 |
-@@ -1,13 +1,7 @@ |
| 372 |
--CppUnit |
| 373 |
- Foundation |
| 374 |
- XML |
| 375 |
- Util |
| 376 |
- Net |
| 377 |
--Crypto |
| 378 |
--NetSSL_OpenSSL |
| 379 |
- Data |
| 380 |
--Data/SQLite |
| 381 |
--Data/ODBC |
| 382 |
--Data/MySQL |
| 383 |
- Zip |
| 384 |
- PageCompiler |
| 385 |
-diff -ur poco-1.3.6p2-all.orig//Data/ODBC/Makefile poco-1.3.6p2-all/Data/ODBC/Makefile |
| 386 |
---- poco-1.3.6p2-all.orig//Data/ODBC/Makefile 2010-07-19 13:52:31.932802424 +0200 |
| 387 |
-+++ poco-1.3.6p2-all/Data/ODBC/Makefile 2010-07-19 13:55:24.976677962 +0200 |
| 388 |
-@@ -9,10 +9,10 @@ |
| 389 |
- include $(POCO_BASE)/build/rules/global |
| 390 |
- |
| 391 |
- # adjust for the target system (usually '/usr/lib' or '/usr/local/lib') |
| 392 |
--ODBCLIBDIR = /usr/lib |
| 393 |
-+ODBCLIBDIR = /usr/$(LIBDIR) |
| 394 |
- |
| 395 |
- INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc |
| 396 |
--SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib |
| 397 |
-+SYSLIBS += -L/usr/local/$(LIBDIR)/odbc -L/usr/$(LIBDIR)/odbc -L/usr/$(LIBDIR) -L/usr/local/$(LIBDIR) |
| 398 |
- |
| 399 |
- ifeq ($(POCO_CONFIG),MinGW) |
| 400 |
- # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib |
| 401 |
-@@ -24,19 +24,19 @@ |
| 402 |
- # CYGWIN platform has its own ODBC library in /lib/w32api |
| 403 |
- SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32 |
| 404 |
- else |
| 405 |
--ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 406 |
-+ifeq (unixodbc, $(GENTOO_ODBC)) |
| 407 |
- SYSLIBS += -lodbc -lodbcinst |
| 408 |
- COMMONFLAGS += -DPOCO_UNIXODBC |
| 409 |
- else |
| 410 |
--ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 411 |
-+ifeq (unixodbc, $(GENTOO_ODBC)) |
| 412 |
- SYSLIBS += -lodbc -lodbcinst |
| 413 |
- COMMONFLAGS += -DPOCO_UNIXODBC |
| 414 |
- else |
| 415 |
--ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 416 |
-+ifeq (iodbc, $(GENTOO_ODBC)) |
| 417 |
- SYSLIBS += -liodbc -liodbcinst |
| 418 |
- COMMONFLAGS += -DPOCO_IODBC |
| 419 |
- else |
| 420 |
--ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 421 |
-+ifeq (iodbc, $(GENTOO_ODBC)) |
| 422 |
- SYSLIBS += -liodbc -liodbcinst |
| 423 |
- COMMONFLAGS += -DPOCO_IODBC |
| 424 |
- else |
| 425 |
-diff -ur poco-1.3.6p2-all.orig//Makefile poco-1.3.6p2-all/Makefile |
| 426 |
---- poco-1.3.6p2-all.orig//Makefile 2010-07-19 13:52:31.908802377 +0200 |
| 427 |
-+++ poco-1.3.6p2-all/Makefile 2010-07-19 14:00:03.814676950 +0200 |
| 428 |
-@@ -31,7 +31,7 @@ |
| 429 |
- |
| 430 |
- install: libexecs |
| 431 |
- mkdir -p $(INSTALLDIR)/include/Poco |
| 432 |
-- mkdir -p $(INSTALLDIR)/lib |
| 433 |
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR) |
| 434 |
- mkdir -p $(INSTALLDIR)/bin |
| 435 |
- for comp in $(COMPONENTS) ; do \ |
| 436 |
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ |
| 437 |
-@@ -41,11 +41,11 @@ |
| 438 |
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \ |
| 439 |
- fi ; \ |
| 440 |
- done |
| 441 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; |
| 442 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; |
| 443 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \; |
| 444 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \; |
| 445 |
- |
| 446 |
--libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec |
| 447 |
--tests = Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests |
| 448 |
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec |
| 449 |
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests |
| 450 |
- samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples |
| 451 |
- |
| 452 |
- .PHONY: $(libexecs) |
| 453 |
|
| 454 |
diff --git a/dev-libs/poco/files/1.4.3_p1-gentoo.patch b/dev-libs/poco/files/1.4.3_p1-gentoo.patch |
| 455 |
deleted file mode 100644 |
| 456 |
index 727015a..00000000 |
| 457 |
--- a/dev-libs/poco/files/1.4.3_p1-gentoo.patch |
| 458 |
+++ /dev/null |
| 459 |
@@ -1,85 +0,0 @@ |
| 460 |
-diff -ur poco-1.3.6p2-all.orig//components poco-1.3.6p2-all/components |
| 461 |
---- poco-1.3.6p2-all.orig//components 2010-07-19 13:52:31.936802078 +0200 |
| 462 |
-+++ poco-1.3.6p2-all/components 2010-07-19 13:59:37.351927395 +0200 |
| 463 |
-@@ -1,13 +1,7 @@ |
| 464 |
--CppUnit |
| 465 |
- Foundation |
| 466 |
- XML |
| 467 |
- Util |
| 468 |
- Net |
| 469 |
--Crypto |
| 470 |
--NetSSL_OpenSSL |
| 471 |
- Data |
| 472 |
--Data/SQLite |
| 473 |
--Data/ODBC |
| 474 |
--Data/MySQL |
| 475 |
- Zip |
| 476 |
- PageCompiler |
| 477 |
-diff -ur poco-1.3.6p2-all.orig//Data/ODBC/Makefile poco-1.3.6p2-all/Data/ODBC/Makefile |
| 478 |
---- poco-1.3.6p2-all.orig//Data/ODBC/Makefile 2010-07-19 13:52:31.932802424 +0200 |
| 479 |
-+++ poco-1.3.6p2-all/Data/ODBC/Makefile 2010-07-19 13:55:24.976677962 +0200 |
| 480 |
-@@ -9,10 +9,10 @@ |
| 481 |
- include $(POCO_BASE)/build/rules/global |
| 482 |
- |
| 483 |
- # adjust for the target system (usually '/usr/lib' or '/usr/local/lib') |
| 484 |
--ODBCLIBDIR = /usr/lib |
| 485 |
-+ODBCLIBDIR = /usr/$(LIBDIR) |
| 486 |
- |
| 487 |
- INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc |
| 488 |
--SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib |
| 489 |
-+SYSLIBS += -L/usr/local/$(LIBDIR)/odbc -L/usr/$(LIBDIR)/odbc -L/usr/$(LIBDIR) -L/usr/local/$(LIBDIR) |
| 490 |
- |
| 491 |
- ifeq ($(POCO_CONFIG),MinGW) |
| 492 |
- # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib |
| 493 |
-@@ -24,19 +24,19 @@ |
| 494 |
- # CYGWIN platform has its own ODBC library in /lib/w32api |
| 495 |
- SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32 |
| 496 |
- else |
| 497 |
--ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 498 |
-+ifeq (unixodbc, $(GENTOO_ODBC)) |
| 499 |
- SYSLIBS += -lodbc -lodbcinst |
| 500 |
- COMMONFLAGS += -DPOCO_UNIXODBC |
| 501 |
- else |
| 502 |
--ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 503 |
-+ifeq (unixodbc, $(GENTOO_ODBC)) |
| 504 |
- SYSLIBS += -lodbc -lodbcinst |
| 505 |
- COMMONFLAGS += -DPOCO_UNIXODBC |
| 506 |
- else |
| 507 |
--ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 508 |
-+ifeq (iodbc, $(GENTOO_ODBC)) |
| 509 |
- SYSLIBS += -liodbc -liodbcinst |
| 510 |
- COMMONFLAGS += -DPOCO_IODBC |
| 511 |
- else |
| 512 |
--ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) |
| 513 |
-+ifeq (iodbc, $(GENTOO_ODBC)) |
| 514 |
- SYSLIBS += -liodbc -liodbcinst |
| 515 |
- COMMONFLAGS += -DPOCO_IODBC |
| 516 |
- else |
| 517 |
-diff -ur poco-1.3.6p2-all.orig//Makefile poco-1.3.6p2-all/Makefile |
| 518 |
---- poco-1.3.6p2-all.orig//Makefile 2010-07-19 13:52:31.908802377 +0200 |
| 519 |
-+++ poco-1.3.6p2-all/Makefile 2010-07-19 14:00:03.814676950 +0200 |
| 520 |
-@@ -31,7 +31,7 @@ |
| 521 |
- |
| 522 |
- install: libexecs |
| 523 |
- mkdir -p $(INSTALLDIR)/include/Poco |
| 524 |
-- mkdir -p $(INSTALLDIR)/lib |
| 525 |
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR) |
| 526 |
- mkdir -p $(INSTALLDIR)/bin |
| 527 |
- for comp in $(COMPONENTS) ; do \ |
| 528 |
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ |
| 529 |
-@@ -41,11 +41,11 @@ |
| 530 |
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \ |
| 531 |
- fi ; \ |
| 532 |
- done |
| 533 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; |
| 534 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; |
| 535 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \; |
| 536 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \; |
| 537 |
- |
| 538 |
--libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec |
| 539 |
--tests = Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests |
| 540 |
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec |
| 541 |
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests |
| 542 |
- samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples |
| 543 |
- |
| 544 |
- .PHONY: $(libexecs) |
| 545 |
|
| 546 |
diff --git a/dev-libs/poco/files/1.4.5-gentoo.patch b/dev-libs/poco/files/1.4.5-gentoo.patch |
| 547 |
deleted file mode 100644 |
| 548 |
index 243ee92..00000000 |
| 549 |
--- a/dev-libs/poco/files/1.4.5-gentoo.patch |
| 550 |
+++ /dev/null |
| 551 |
@@ -1,74 +0,0 @@ |
| 552 |
-diff -Nur poco-1.4.5-all_old/components poco-1.4.5-all/components |
| 553 |
---- poco-1.4.5-all_old/components 2012-11-18 16:56:59.000000000 +0100 |
| 554 |
-+++ poco-1.4.5-all/components 2012-12-06 12:29:07.779546771 +0100 |
| 555 |
-@@ -1,14 +1,8 @@ |
| 556 |
--CppUnit |
| 557 |
- Foundation |
| 558 |
- XML |
| 559 |
- Util |
| 560 |
- Net |
| 561 |
--Crypto |
| 562 |
--NetSSL_OpenSSL |
| 563 |
- Data |
| 564 |
--Data/SQLite |
| 565 |
--Data/ODBC |
| 566 |
--Data/MySQL |
| 567 |
- Zip |
| 568 |
- PageCompiler |
| 569 |
- PageCompiler/File2Page |
| 570 |
-diff -Nur poco-1.4.5-all_old/Data/ODBC/ODBC.make poco-1.4.5-all/Data/ODBC/ODBC.make |
| 571 |
---- poco-1.4.5-all_old/Data/ODBC/ODBC.make 2012-11-18 16:56:57.000000000 +0100 |
| 572 |
-+++ poco-1.4.5-all/Data/ODBC/ODBC.make 2012-12-06 12:29:07.779546771 +0100 |
| 573 |
-@@ -14,9 +14,9 @@ |
| 574 |
- ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?)) |
| 575 |
- ODBCLIBDIR = /usr/lib/$(OSARCH)-linux-gnu |
| 576 |
- else ifeq (0, $(shell test -d /usr/lib64; echo $$?)) |
| 577 |
--ODBCLIBDIR = /usr/lib64 |
| 578 |
-+ODBCLIBDIR = /usr/$(LIBDIR) |
| 579 |
- else |
| 580 |
--ODBCLIBDIR = /usr/lib |
| 581 |
-+ODBCLIBDIR = /usr/$(LIBDIR) |
| 582 |
- endif |
| 583 |
- endif |
| 584 |
- |
| 585 |
-@@ -39,10 +39,10 @@ |
| 586 |
- CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX |
| 587 |
- # CYGWIN platform has its own ODBC library in /lib/w32api |
| 588 |
- SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32 |
| 589 |
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?)) |
| 590 |
-+else ifeq (unixodbc, $(GENTOO_ODBC)) |
| 591 |
- SYSLIBS += -lodbc -lodbcinst |
| 592 |
- COMMONFLAGS += -DPOCO_UNIXODBC |
| 593 |
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?)) |
| 594 |
-+else ifeq (unixodbc, $(GENTOO_ODBC)) |
| 595 |
- SYSLIBS += -liodbc -liodbcinst |
| 596 |
- COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc |
| 597 |
- else |
| 598 |
-diff -Nur poco-1.4.5-all_old/Makefile poco-1.4.5-all/Makefile |
| 599 |
---- poco-1.4.5-all_old/Makefile 2012-11-18 16:57:00.000000000 +0100 |
| 600 |
-+++ poco-1.4.5-all/Makefile 2012-12-06 12:29:07.779546771 +0100 |
| 601 |
-@@ -33,7 +33,7 @@ |
| 602 |
- |
| 603 |
- install: libexecs |
| 604 |
- mkdir -p $(INSTALLDIR)/include/Poco |
| 605 |
-- mkdir -p $(INSTALLDIR)/lib |
| 606 |
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR) |
| 607 |
- mkdir -p $(INSTALLDIR)/bin |
| 608 |
- for comp in $(COMPONENTS) ; do \ |
| 609 |
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ |
| 610 |
-@@ -43,11 +43,11 @@ |
| 611 |
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \ |
| 612 |
- fi ; \ |
| 613 |
- done |
| 614 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; |
| 615 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; |
| 616 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \; |
| 617 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \; |
| 618 |
- |
| 619 |
--libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec |
| 620 |
--tests = Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests |
| 621 |
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec |
| 622 |
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests |
| 623 |
- samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples |
| 624 |
- |
| 625 |
- .PHONY: $(libexecs) |
| 626 |
|
| 627 |
diff --git a/dev-libs/poco/files/1.4.6_p1-gentoo.patch b/dev-libs/poco/files/1.4.6_p1-gentoo.patch |
| 628 |
deleted file mode 100644 |
| 629 |
index 243ee92..00000000 |
| 630 |
--- a/dev-libs/poco/files/1.4.6_p1-gentoo.patch |
| 631 |
+++ /dev/null |
| 632 |
@@ -1,74 +0,0 @@ |
| 633 |
-diff -Nur poco-1.4.5-all_old/components poco-1.4.5-all/components |
| 634 |
---- poco-1.4.5-all_old/components 2012-11-18 16:56:59.000000000 +0100 |
| 635 |
-+++ poco-1.4.5-all/components 2012-12-06 12:29:07.779546771 +0100 |
| 636 |
-@@ -1,14 +1,8 @@ |
| 637 |
--CppUnit |
| 638 |
- Foundation |
| 639 |
- XML |
| 640 |
- Util |
| 641 |
- Net |
| 642 |
--Crypto |
| 643 |
--NetSSL_OpenSSL |
| 644 |
- Data |
| 645 |
--Data/SQLite |
| 646 |
--Data/ODBC |
| 647 |
--Data/MySQL |
| 648 |
- Zip |
| 649 |
- PageCompiler |
| 650 |
- PageCompiler/File2Page |
| 651 |
-diff -Nur poco-1.4.5-all_old/Data/ODBC/ODBC.make poco-1.4.5-all/Data/ODBC/ODBC.make |
| 652 |
---- poco-1.4.5-all_old/Data/ODBC/ODBC.make 2012-11-18 16:56:57.000000000 +0100 |
| 653 |
-+++ poco-1.4.5-all/Data/ODBC/ODBC.make 2012-12-06 12:29:07.779546771 +0100 |
| 654 |
-@@ -14,9 +14,9 @@ |
| 655 |
- ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?)) |
| 656 |
- ODBCLIBDIR = /usr/lib/$(OSARCH)-linux-gnu |
| 657 |
- else ifeq (0, $(shell test -d /usr/lib64; echo $$?)) |
| 658 |
--ODBCLIBDIR = /usr/lib64 |
| 659 |
-+ODBCLIBDIR = /usr/$(LIBDIR) |
| 660 |
- else |
| 661 |
--ODBCLIBDIR = /usr/lib |
| 662 |
-+ODBCLIBDIR = /usr/$(LIBDIR) |
| 663 |
- endif |
| 664 |
- endif |
| 665 |
- |
| 666 |
-@@ -39,10 +39,10 @@ |
| 667 |
- CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX |
| 668 |
- # CYGWIN platform has its own ODBC library in /lib/w32api |
| 669 |
- SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32 |
| 670 |
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?)) |
| 671 |
-+else ifeq (unixodbc, $(GENTOO_ODBC)) |
| 672 |
- SYSLIBS += -lodbc -lodbcinst |
| 673 |
- COMMONFLAGS += -DPOCO_UNIXODBC |
| 674 |
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?)) |
| 675 |
-+else ifeq (unixodbc, $(GENTOO_ODBC)) |
| 676 |
- SYSLIBS += -liodbc -liodbcinst |
| 677 |
- COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc |
| 678 |
- else |
| 679 |
-diff -Nur poco-1.4.5-all_old/Makefile poco-1.4.5-all/Makefile |
| 680 |
---- poco-1.4.5-all_old/Makefile 2012-11-18 16:57:00.000000000 +0100 |
| 681 |
-+++ poco-1.4.5-all/Makefile 2012-12-06 12:29:07.779546771 +0100 |
| 682 |
-@@ -33,7 +33,7 @@ |
| 683 |
- |
| 684 |
- install: libexecs |
| 685 |
- mkdir -p $(INSTALLDIR)/include/Poco |
| 686 |
-- mkdir -p $(INSTALLDIR)/lib |
| 687 |
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR) |
| 688 |
- mkdir -p $(INSTALLDIR)/bin |
| 689 |
- for comp in $(COMPONENTS) ; do \ |
| 690 |
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ |
| 691 |
-@@ -43,11 +43,11 @@ |
| 692 |
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \ |
| 693 |
- fi ; \ |
| 694 |
- done |
| 695 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; |
| 696 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; |
| 697 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \; |
| 698 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \; |
| 699 |
- |
| 700 |
--libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec |
| 701 |
--tests = Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests |
| 702 |
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec |
| 703 |
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests |
| 704 |
- samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples |
| 705 |
- |
| 706 |
- .PHONY: $(libexecs) |
| 707 |
|
| 708 |
diff --git a/dev-libs/poco/files/libpcre-8.13.patch b/dev-libs/poco/files/libpcre-8.13.patch |
| 709 |
deleted file mode 100644 |
| 710 |
index e46dd5b..00000000 |
| 711 |
--- a/dev-libs/poco/files/libpcre-8.13.patch |
| 712 |
+++ /dev/null |
| 713 |
@@ -1,10 +0,0 @@ |
| 714 |
---- Foundation/Makefile 2012-01-23 15:12:27.000000000 +0100 |
| 715 |
-+++ Foundation/Makefile.new 2012-04-11 14:58:14.000000000 +0200 |
| 716 |
-@@ -43,7 +43,6 @@ |
| 717 |
- pcre_utf8_objects = pcre_ucd pcre_tables |
| 718 |
- |
| 719 |
- ifdef POCO_UNBUNDLED |
| 720 |
-- objects += $(pcre_utf8_objects) |
| 721 |
- SYSLIBS += -lpcre -lz |
| 722 |
- else |
| 723 |
- objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects) |
Archives