* [gentoo-commits] repo/gentoo:master commit in: dev-libs/poco/files/
@ 2016-09-04 13:10 David Seifert
0 siblings, 0 replies; only message in thread
From: David Seifert @ 2016-09-04 13:10 UTC (permalink / raw
To: gentoo-commits
commit: 0a94f11955f1bbb9fead0319baf6780c5172eb9e
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Sep 4 11:56:09 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 4 13:08:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a94f119
dev-libs/poco: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/2223
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-libs/poco/files/1.3.3_p1-gcc44.patch | 16 --
dev-libs/poco/files/1.3.3_p1-gentoo.patch | 80 ---------
dev-libs/poco/files/1.3.3_p1-openssl-1.patch | 16 --
dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch | 197 -----------------------
dev-libs/poco/files/1.3.6_p2-gentoo.patch | 85 ----------
dev-libs/poco/files/1.4.3_p1-gentoo.patch | 85 ----------
dev-libs/poco/files/1.4.5-gentoo.patch | 74 ---------
dev-libs/poco/files/1.4.6_p1-gentoo.patch | 74 ---------
dev-libs/poco/files/libpcre-8.13.patch | 10 --
9 files changed, 637 deletions(-)
diff --git a/dev-libs/poco/files/1.3.3_p1-gcc44.patch b/dev-libs/poco/files/1.3.3_p1-gcc44.patch
deleted file mode 100644
index 990aff1..00000000
--- a/dev-libs/poco/files/1.3.3_p1-gcc44.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NrU5 poco-1.3.3p1-all.orig/Foundation/src/Environment.cpp poco-1.3.3p1-all/Foundation/src/Environment.cpp
---- poco-1.3.3p1-all.orig/Foundation/src/Environment.cpp 2009-05-15 20:44:37.000000000 -0600
-+++ poco-1.3.3p1-all/Foundation/src/Environment.cpp 2009-05-15 20:46:12.000000000 -0600
-@@ -34,11 +34,11 @@
- //
-
-
- #include "Poco/Environment.h"
- #include <cstdlib>
--
-+#include <cstdio>
-
- #if defined(POCO_OS_FAMILY_VMS)
- #include "Environment_VMS.cpp"
- #elif defined(POCO_OS_FAMILY_UNIX)
- #include "Environment_UNIX.cpp"
diff --git a/dev-libs/poco/files/1.3.3_p1-gentoo.patch b/dev-libs/poco/files/1.3.3_p1-gentoo.patch
deleted file mode 100644
index f162cd1..00000000
--- a/dev-libs/poco/files/1.3.3_p1-gentoo.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Naur poco-1.3.3p1-all.orig/components poco-1.3.3p1-all/components
---- poco-1.3.3p1-all.orig/components 2008-10-20 19:40:05.000000000 +0200
-+++ poco-1.3.3p1-all/components 2008-10-20 20:11:19.000000000 +0200
-@@ -1,12 +1,6 @@
--CppUnit
- Foundation
- XML
- Util
- Net
--NetSSL_OpenSSL
- Data
--Data/SQLite
--Data/ODBC
--Data/MySQL
--Crypto
- Zip
-diff -Naur poco-1.3.3p1-all.orig/Data/ODBC/Makefile poco-1.3.3p1-all/Data/ODBC/Makefile
---- poco-1.3.3p1-all.orig/Data/ODBC/Makefile 2008-10-20 19:40:05.000000000 +0200
-+++ poco-1.3.3p1-all/Data/ODBC/Makefile 2008-10-20 19:54:07.000000000 +0200
-@@ -11,19 +11,19 @@
- ifeq ($(POCO_CONFIG),MinGW)
- # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
- else
--ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -lodbc -lodbcinst
- COMMONFLAGS += -DPOCO_UNIXODBC
- else
--ifeq (0, $(shell test -h /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -lodbc -lodbcinst
- COMMONFLAGS += -DPOCO_UNIXODBC
- else
--ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (iodbc, $(GENTOO_ODBC))
- SYSLIBS += -liodbc -liodbcinst
- COMMONFLAGS += -DPOCO_IODBC
- else
--ifeq (0, $(shell test -h /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (iodbc, $(GENTOO_ODBC))
- SYSLIBS += -liodbc -liodbcinst
- COMMONFLAGS += -DPOCO_IODBC
- else
-diff -Naur poco-1.3.3p1-all.orig/Makefile poco-1.3.3p1-all/Makefile
---- poco-1.3.3p1-all.orig/Makefile 2008-10-20 19:40:05.000000000 +0200
-+++ poco-1.3.3p1-all/Makefile 2008-10-20 20:12:09.000000000 +0200
-@@ -21,7 +21,7 @@
-
- .PHONY: all libexecs cppunit tests samples clean distclean install
-
--all: libexecs tests samples
-+all: libexecs
-
- INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
- COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Crypto Zip
-@@ -31,7 +31,7 @@
-
- install: libexecs
- mkdir -p $(INSTALLDIR)/include/Poco
-- mkdir -p $(INSTALLDIR)/lib
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR)
- mkdir -p $(INSTALLDIR)/bin
- for comp in $(COMPONENTS) ; do \
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
-@@ -41,11 +41,11 @@
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
- fi ; \
- done
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
-
--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
--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
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
- samples = Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples Crypto-samples Zip-samples
-
- .PHONY: $(libexecs)
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
deleted file mode 100644
index 2377edd..00000000
--- a/dev-libs/poco/files/1.3.3_p1-openssl-1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/327769
-
---- NetSSL_OpenSSL/src/SecureSocketImpl.cpp
-+++ NetSSL_OpenSSL/src/SecureSocketImpl.cpp
-@@ -430,7 +430,11 @@
-
- if (!strcmp(extstr, "subjectAltName"))
- {
-+ #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+ const X509V3_EXT_METHOD* meth = X509V3_EXT_get(ext);
-+ #else
- X509V3_EXT_METHOD* meth = X509V3_EXT_get(ext);
-+ #endif
- if (!meth)
- break;
-
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
deleted file mode 100644
index 2ec2067..00000000
--- a/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/Makefile poco-1.3.3p1-all/Data/SQLite/Makefile
---- poco-1.3.3p1-all.orig/Data/SQLite/Makefile 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Data/SQLite/Makefile 2008-11-23 10:27:53.000000000 +0100
-@@ -9,10 +9,10 @@
- include $(POCO_BASE)/build/rules/global
-
- SYSFLAGS += -DTHREADSAFE -DNO_TCL -DSQLITE_DISABLE_LFS
-+SYSLIBS += -lsqlite3
-
- objects = Binder Extractor SessionImpl Connector \
-- SQLiteException SQLiteStatementImpl Utility \
-- sqlite3
-+ SQLiteException SQLiteStatementImpl Utility
-
- target = PocoSQLite
- target_version = $(LIBVERSION)
-diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp
---- poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp 2008-11-23 10:30:43.000000000 +0100
-@@ -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 -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp
---- poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp 2008-11-23 10:29:32.000000000 +0100
-@@ -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 -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp
---- poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp 2008-11-23 10:29:44.000000000 +0100
-@@ -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 -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp
---- poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp 2008-11-23 10:30:05.000000000 +0100
-@@ -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 -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp
---- poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-23 10:30:34.000000000 +0100
-@@ -40,7 +40,7 @@
- #include "Poco/String.h"
- #include <cstdlib>
- #include <cstring>
--#include "sqlite3.h"
-+#include <sqlite3.h>
-
-
- namespace Poco {
-diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp
---- poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp 2008-11-23 10:29:22.000000000 +0100
-@@ -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 -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h
---- poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:50.000000000 +0100
-@@ -44,7 +44,7 @@
- #include "Poco/BufferedStreamBuf.h"
- #include <istream>
- #include <ostream>
--#include "Poco/zlib.h"
-+#include <zlib.h>
-
-
- namespace Poco {
-diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h
---- poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:50.000000000 +0100
-@@ -44,7 +44,7 @@
- #include "Poco/BufferedStreamBuf.h"
- #include <istream>
- #include <ostream>
--#include "Poco/zlib.h"
-+#include <zlib.h>
-
-
- namespace Poco {
-diff -Naur poco-1.3.3p1-all.orig/Foundation/Makefile poco-1.3.3p1-all/Foundation/Makefile
---- poco-1.3.3p1-all.orig/Foundation/Makefile 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Foundation/Makefile 2008-11-23 10:04:10.000000000 +0100
-@@ -8,6 +8,8 @@
-
- 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 \
-@@ -30,12 +32,7 @@
- FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \
- UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \
- Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \
-- FileStream Unicode UTF8String \
-- 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
-
- ifeq ($(POCO_CONFIG),MinGW)
- objects += EventLogChannel WindowsConsoleChannel
-diff -Naur poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp poco-1.3.3p1-all/Foundation/src/Checksum.cpp
---- poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Foundation/src/Checksum.cpp 2008-11-22 22:13:50.000000000 +0100
-@@ -35,7 +35,7 @@
-
-
- #include "Poco/Checksum.h"
--#include "Poco/zlib.h"
-+#include <zlib.h>
-
-
- namespace Poco {
-diff -Naur poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp
---- poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:50.000000000 +0100
-@@ -37,7 +37,7 @@
- #include "Poco/RegularExpression.h"
- #include "Poco/Exception.h"
- #include <sstream>
--#include "pcre.h"
-+#include <pcre.h>
-
-
- namespace Poco {
-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
---- poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:50.000000000 +0100
-@@ -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"
-diff -Naur poco-1.3.3p1-all.orig/XML/Makefile poco-1.3.3p1-all/XML/Makefile
---- poco-1.3.3p1-all.orig/XML/Makefile 2008-11-22 22:13:34.000000000 +0100
-+++ poco-1.3.3p1-all/XML/Makefile 2008-11-23 10:04:25.000000000 +0100
-@@ -8,7 +8,9 @@
-
- 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 \
-@@ -22,7 +24,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 --git a/dev-libs/poco/files/1.3.6_p2-gentoo.patch b/dev-libs/poco/files/1.3.6_p2-gentoo.patch
deleted file mode 100644
index ec466f8..00000000
--- a/dev-libs/poco/files/1.3.6_p2-gentoo.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -ur poco-1.3.6p2-all.orig//components poco-1.3.6p2-all/components
---- poco-1.3.6p2-all.orig//components 2010-07-19 13:52:31.936802078 +0200
-+++ poco-1.3.6p2-all/components 2010-07-19 13:59:37.351927395 +0200
-@@ -1,13 +1,7 @@
--CppUnit
- Foundation
- XML
- Util
- Net
--Crypto
--NetSSL_OpenSSL
- Data
--Data/SQLite
--Data/ODBC
--Data/MySQL
- Zip
- PageCompiler
-diff -ur poco-1.3.6p2-all.orig//Data/ODBC/Makefile poco-1.3.6p2-all/Data/ODBC/Makefile
---- poco-1.3.6p2-all.orig//Data/ODBC/Makefile 2010-07-19 13:52:31.932802424 +0200
-+++ poco-1.3.6p2-all/Data/ODBC/Makefile 2010-07-19 13:55:24.976677962 +0200
-@@ -9,10 +9,10 @@
- include $(POCO_BASE)/build/rules/global
-
- # adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
--ODBCLIBDIR = /usr/lib
-+ODBCLIBDIR = /usr/$(LIBDIR)
-
- INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
--SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib
-+SYSLIBS += -L/usr/local/$(LIBDIR)/odbc -L/usr/$(LIBDIR)/odbc -L/usr/$(LIBDIR) -L/usr/local/$(LIBDIR)
-
- ifeq ($(POCO_CONFIG),MinGW)
- # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
-@@ -24,19 +24,19 @@
- # CYGWIN platform has its own ODBC library in /lib/w32api
- SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
- else
--ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -lodbc -lodbcinst
- COMMONFLAGS += -DPOCO_UNIXODBC
- else
--ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -lodbc -lodbcinst
- COMMONFLAGS += -DPOCO_UNIXODBC
- else
--ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (iodbc, $(GENTOO_ODBC))
- SYSLIBS += -liodbc -liodbcinst
- COMMONFLAGS += -DPOCO_IODBC
- else
--ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (iodbc, $(GENTOO_ODBC))
- SYSLIBS += -liodbc -liodbcinst
- COMMONFLAGS += -DPOCO_IODBC
- else
-diff -ur poco-1.3.6p2-all.orig//Makefile poco-1.3.6p2-all/Makefile
---- poco-1.3.6p2-all.orig//Makefile 2010-07-19 13:52:31.908802377 +0200
-+++ poco-1.3.6p2-all/Makefile 2010-07-19 14:00:03.814676950 +0200
-@@ -31,7 +31,7 @@
-
- install: libexecs
- mkdir -p $(INSTALLDIR)/include/Poco
-- mkdir -p $(INSTALLDIR)/lib
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR)
- mkdir -p $(INSTALLDIR)/bin
- for comp in $(COMPONENTS) ; do \
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
-@@ -41,11 +41,11 @@
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
- fi ; \
- done
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
-
--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
--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
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
- samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples
-
- .PHONY: $(libexecs)
diff --git a/dev-libs/poco/files/1.4.3_p1-gentoo.patch b/dev-libs/poco/files/1.4.3_p1-gentoo.patch
deleted file mode 100644
index 727015a..00000000
--- a/dev-libs/poco/files/1.4.3_p1-gentoo.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -ur poco-1.3.6p2-all.orig//components poco-1.3.6p2-all/components
---- poco-1.3.6p2-all.orig//components 2010-07-19 13:52:31.936802078 +0200
-+++ poco-1.3.6p2-all/components 2010-07-19 13:59:37.351927395 +0200
-@@ -1,13 +1,7 @@
--CppUnit
- Foundation
- XML
- Util
- Net
--Crypto
--NetSSL_OpenSSL
- Data
--Data/SQLite
--Data/ODBC
--Data/MySQL
- Zip
- PageCompiler
-diff -ur poco-1.3.6p2-all.orig//Data/ODBC/Makefile poco-1.3.6p2-all/Data/ODBC/Makefile
---- poco-1.3.6p2-all.orig//Data/ODBC/Makefile 2010-07-19 13:52:31.932802424 +0200
-+++ poco-1.3.6p2-all/Data/ODBC/Makefile 2010-07-19 13:55:24.976677962 +0200
-@@ -9,10 +9,10 @@
- include $(POCO_BASE)/build/rules/global
-
- # adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
--ODBCLIBDIR = /usr/lib
-+ODBCLIBDIR = /usr/$(LIBDIR)
-
- INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
--SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib
-+SYSLIBS += -L/usr/local/$(LIBDIR)/odbc -L/usr/$(LIBDIR)/odbc -L/usr/$(LIBDIR) -L/usr/local/$(LIBDIR)
-
- ifeq ($(POCO_CONFIG),MinGW)
- # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
-@@ -24,19 +24,19 @@
- # CYGWIN platform has its own ODBC library in /lib/w32api
- SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
- else
--ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -lodbc -lodbcinst
- COMMONFLAGS += -DPOCO_UNIXODBC
- else
--ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -lodbc -lodbcinst
- COMMONFLAGS += -DPOCO_UNIXODBC
- else
--ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (iodbc, $(GENTOO_ODBC))
- SYSLIBS += -liodbc -liodbcinst
- COMMONFLAGS += -DPOCO_IODBC
- else
--ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
-+ifeq (iodbc, $(GENTOO_ODBC))
- SYSLIBS += -liodbc -liodbcinst
- COMMONFLAGS += -DPOCO_IODBC
- else
-diff -ur poco-1.3.6p2-all.orig//Makefile poco-1.3.6p2-all/Makefile
---- poco-1.3.6p2-all.orig//Makefile 2010-07-19 13:52:31.908802377 +0200
-+++ poco-1.3.6p2-all/Makefile 2010-07-19 14:00:03.814676950 +0200
-@@ -31,7 +31,7 @@
-
- install: libexecs
- mkdir -p $(INSTALLDIR)/include/Poco
-- mkdir -p $(INSTALLDIR)/lib
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR)
- mkdir -p $(INSTALLDIR)/bin
- for comp in $(COMPONENTS) ; do \
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
-@@ -41,11 +41,11 @@
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
- fi ; \
- done
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
-
--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
--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
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
- samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples
-
- .PHONY: $(libexecs)
diff --git a/dev-libs/poco/files/1.4.5-gentoo.patch b/dev-libs/poco/files/1.4.5-gentoo.patch
deleted file mode 100644
index 243ee92..00000000
--- a/dev-libs/poco/files/1.4.5-gentoo.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -Nur poco-1.4.5-all_old/components poco-1.4.5-all/components
---- poco-1.4.5-all_old/components 2012-11-18 16:56:59.000000000 +0100
-+++ poco-1.4.5-all/components 2012-12-06 12:29:07.779546771 +0100
-@@ -1,14 +1,8 @@
--CppUnit
- Foundation
- XML
- Util
- Net
--Crypto
--NetSSL_OpenSSL
- Data
--Data/SQLite
--Data/ODBC
--Data/MySQL
- Zip
- PageCompiler
- PageCompiler/File2Page
-diff -Nur poco-1.4.5-all_old/Data/ODBC/ODBC.make poco-1.4.5-all/Data/ODBC/ODBC.make
---- poco-1.4.5-all_old/Data/ODBC/ODBC.make 2012-11-18 16:56:57.000000000 +0100
-+++ poco-1.4.5-all/Data/ODBC/ODBC.make 2012-12-06 12:29:07.779546771 +0100
-@@ -14,9 +14,9 @@
- ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?))
- ODBCLIBDIR = /usr/lib/$(OSARCH)-linux-gnu
- else ifeq (0, $(shell test -d /usr/lib64; echo $$?))
--ODBCLIBDIR = /usr/lib64
-+ODBCLIBDIR = /usr/$(LIBDIR)
- else
--ODBCLIBDIR = /usr/lib
-+ODBCLIBDIR = /usr/$(LIBDIR)
- endif
- endif
-
-@@ -39,10 +39,10 @@
- CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
- # CYGWIN platform has its own ODBC library in /lib/w32api
- SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?))
-+else ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -lodbc -lodbcinst
- COMMONFLAGS += -DPOCO_UNIXODBC
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?))
-+else ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -liodbc -liodbcinst
- COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
- else
-diff -Nur poco-1.4.5-all_old/Makefile poco-1.4.5-all/Makefile
---- poco-1.4.5-all_old/Makefile 2012-11-18 16:57:00.000000000 +0100
-+++ poco-1.4.5-all/Makefile 2012-12-06 12:29:07.779546771 +0100
-@@ -33,7 +33,7 @@
-
- install: libexecs
- mkdir -p $(INSTALLDIR)/include/Poco
-- mkdir -p $(INSTALLDIR)/lib
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR)
- mkdir -p $(INSTALLDIR)/bin
- for comp in $(COMPONENTS) ; do \
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
-@@ -43,11 +43,11 @@
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
- fi ; \
- done
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
-
--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
--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
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
- samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples
-
- .PHONY: $(libexecs)
diff --git a/dev-libs/poco/files/1.4.6_p1-gentoo.patch b/dev-libs/poco/files/1.4.6_p1-gentoo.patch
deleted file mode 100644
index 243ee92..00000000
--- a/dev-libs/poco/files/1.4.6_p1-gentoo.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -Nur poco-1.4.5-all_old/components poco-1.4.5-all/components
---- poco-1.4.5-all_old/components 2012-11-18 16:56:59.000000000 +0100
-+++ poco-1.4.5-all/components 2012-12-06 12:29:07.779546771 +0100
-@@ -1,14 +1,8 @@
--CppUnit
- Foundation
- XML
- Util
- Net
--Crypto
--NetSSL_OpenSSL
- Data
--Data/SQLite
--Data/ODBC
--Data/MySQL
- Zip
- PageCompiler
- PageCompiler/File2Page
-diff -Nur poco-1.4.5-all_old/Data/ODBC/ODBC.make poco-1.4.5-all/Data/ODBC/ODBC.make
---- poco-1.4.5-all_old/Data/ODBC/ODBC.make 2012-11-18 16:56:57.000000000 +0100
-+++ poco-1.4.5-all/Data/ODBC/ODBC.make 2012-12-06 12:29:07.779546771 +0100
-@@ -14,9 +14,9 @@
- ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?))
- ODBCLIBDIR = /usr/lib/$(OSARCH)-linux-gnu
- else ifeq (0, $(shell test -d /usr/lib64; echo $$?))
--ODBCLIBDIR = /usr/lib64
-+ODBCLIBDIR = /usr/$(LIBDIR)
- else
--ODBCLIBDIR = /usr/lib
-+ODBCLIBDIR = /usr/$(LIBDIR)
- endif
- endif
-
-@@ -39,10 +39,10 @@
- CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
- # CYGWIN platform has its own ODBC library in /lib/w32api
- SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?))
-+else ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -lodbc -lodbcinst
- COMMONFLAGS += -DPOCO_UNIXODBC
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?))
-+else ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -liodbc -liodbcinst
- COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
- else
-diff -Nur poco-1.4.5-all_old/Makefile poco-1.4.5-all/Makefile
---- poco-1.4.5-all_old/Makefile 2012-11-18 16:57:00.000000000 +0100
-+++ poco-1.4.5-all/Makefile 2012-12-06 12:29:07.779546771 +0100
-@@ -33,7 +33,7 @@
-
- install: libexecs
- mkdir -p $(INSTALLDIR)/include/Poco
-- mkdir -p $(INSTALLDIR)/lib
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR)
- mkdir -p $(INSTALLDIR)/bin
- for comp in $(COMPONENTS) ; do \
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
-@@ -43,11 +43,11 @@
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
- fi ; \
- done
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
-
--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
--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
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
- samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples
-
- .PHONY: $(libexecs)
diff --git a/dev-libs/poco/files/libpcre-8.13.patch b/dev-libs/poco/files/libpcre-8.13.patch
deleted file mode 100644
index e46dd5b..00000000
--- a/dev-libs/poco/files/libpcre-8.13.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Foundation/Makefile 2012-01-23 15:12:27.000000000 +0100
-+++ Foundation/Makefile.new 2012-04-11 14:58:14.000000000 +0200
-@@ -43,7 +43,6 @@
- pcre_utf8_objects = pcre_ucd pcre_tables
-
- ifdef POCO_UNBUNDLED
-- objects += $(pcre_utf8_objects)
- SYSLIBS += -lpcre -lz
- else
- objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-09-04 13:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-04 13:10 [gentoo-commits] repo/gentoo:master commit in: dev-libs/poco/files/ David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox