summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiziano Müller <dev-zero@gentoo.org>2008-06-29 01:21:00 +0000
committerTiziano Müller <dev-zero@gentoo.org>2008-06-29 01:21:00 +0000
commit44885bd5a0bc3ca0790f516eb14a960a9cd186e4 (patch)
treec38a788b95c2197ce80a4331e1264da19bdd8833 /dev-libs/poco/files
parentp.mask dev-util/gambas:1, bug #157670 (diff)
downloadgentoo-2-44885bd5a0bc3ca0790f516eb14a960a9cd186e4.tar.gz
gentoo-2-44885bd5a0bc3ca0790f516eb14a960a9cd186e4.tar.bz2
gentoo-2-44885bd5a0bc3ca0790f516eb14a960a9cd186e4.zip
Initial commit (bug #162846), ebuild written by me.
(Portage version: 2.2_rc1/cvs/Linux 2.6.24-gentoo-r8 x86_64)
Diffstat (limited to 'dev-libs/poco/files')
-rw-r--r--dev-libs/poco/files/1.3.2-gentoo.patch71
-rw-r--r--dev-libs/poco/files/1.3.2-missing_includes.patch57
2 files changed, 128 insertions, 0 deletions
diff --git a/dev-libs/poco/files/1.3.2-gentoo.patch b/dev-libs/poco/files/1.3.2-gentoo.patch
new file mode 100644
index 000000000000..bed364c524fa
--- /dev/null
+++ b/dev-libs/poco/files/1.3.2-gentoo.patch
@@ -0,0 +1,71 @@
+diff -Naur poco-1.3.2-data.orig/components poco-1.3.2-data/components
+--- poco-1.3.2-data.orig/components 2008-05-29 16:54:08.000000000 +0200
++++ poco-1.3.2-data/components 2008-05-29 16:58:26.000000000 +0200
+@@ -2,8 +2,4 @@
+ XML
+ Util
+ Net
+-NetSSL_OpenSSL
+ Data
+-Data/SQLite
+-Data/ODBC
+-CppUnit
+diff -Naur poco-1.3.2-data.orig/Data/ODBC/Makefile poco-1.3.2-data/Data/ODBC/Makefile
+--- poco-1.3.2-data.orig/Data/ODBC/Makefile 2008-05-29 16:54:08.000000000 +0200
++++ poco-1.3.2-data/Data/ODBC/Makefile 2008-05-29 16:56:05.000000000 +0200
+@@ -8,11 +8,11 @@
+
+ include $(POCO_BASE)/build/rules/global
+
+-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 -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
++ifeq (iodbc, $(GENTOO_ODBC))
+ SYSLIBS += -liodbc -liodbcinst
+ COMMONFLAGS += -DPOCO_IODBC
+ else
+diff -Naur poco-1.3.2-data.orig/Makefile poco-1.3.2-data/Makefile
+--- poco-1.3.2-data.orig/Makefile 2008-05-29 16:54:08.000000000 +0200
++++ poco-1.3.2-data/Makefile 2008-05-29 20:32:35.000000000 +0200
+@@ -17,17 +17,17 @@
+
+ .PHONY: all libexecs cppunit tests samples install
+
+-all: libexecs tests samples
++all: libexecs
+
+ INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
+-COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL Data Data/SQLite Data/ODBC
++COMPONENTS = Foundation XML Util Net Data
+
+ cppunit:
+ $(MAKE) -C $(POCO_BASE)/CppUnit
+
+ 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 \
+@@ -37,14 +37,14 @@
+ find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -Rf {} $(INSTALLDIR)/bin \; ; \
+ fi ; \
+ done
+- find $(POCO_BUILD)/lib -name "libPoco*" -exec cp -Rf {} $(INSTALLDIR)/lib \;
++ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
+
+ .PHONY: Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec
+ .PHONY: Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests
+ .PHONY: Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples
+
+-libexecs: Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec
+-tests: Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests
++libexecs: Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec
++tests: Foundation-tests XML-tests Util-tests Net-tests Data-tests
+ samples: Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples
+
+ Foundation-libexec:
diff --git a/dev-libs/poco/files/1.3.2-missing_includes.patch b/dev-libs/poco/files/1.3.2-missing_includes.patch
new file mode 100644
index 000000000000..afcbe57560ff
--- /dev/null
+++ b/dev-libs/poco/files/1.3.2-missing_includes.patch
@@ -0,0 +1,57 @@
+diff -Naur poco-1.3.2-data.orig/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h poco-1.3.2-data/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h
+--- poco-1.3.2-data.orig/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h 2008-05-29 20:47:39.000000000 +0200
++++ poco-1.3.2-data/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h 2008-05-29 20:49:09.000000000 +0200
+@@ -42,6 +42,7 @@
+
+ #include "Poco/Data/ODBC/ODBC.h"
+ #include <vector>
++#include <cstring>
+ #ifdef POCO_OS_FAMILY_WINDOWS
+ #include <windows.h>
+ #endif
+diff -Naur poco-1.3.2-data.orig/Foundation/include/Poco/FIFOStrategy.h poco-1.3.2-data/Foundation/include/Poco/FIFOStrategy.h
+--- poco-1.3.2-data.orig/Foundation/include/Poco/FIFOStrategy.h 2008-05-29 20:47:40.000000000 +0200
++++ poco-1.3.2-data/Foundation/include/Poco/FIFOStrategy.h 2008-05-29 22:01:36.000000000 +0200
+@@ -42,7 +42,7 @@
+ #include "Poco/NotificationStrategy.h"
+ #include <map>
+ #include <list>
+-
++#include <memory>
+
+ namespace Poco {
+
+diff -Naur poco-1.3.2-data.orig/Foundation/include/Poco/HashTable.h poco-1.3.2-data/Foundation/include/Poco/HashTable.h
+--- poco-1.3.2-data.orig/Foundation/include/Poco/HashTable.h 2008-05-29 20:47:40.000000000 +0200
++++ poco-1.3.2-data/Foundation/include/Poco/HashTable.h 2008-05-29 22:08:33.000000000 +0200
+@@ -47,7 +47,7 @@
+ #include <vector>
+ #include <map>
+ #include <cstddef>
+-
++#include <cstring>
+
+ namespace Poco {
+
+diff -Naur poco-1.3.2-data.orig/Foundation/src/BinaryWriter.cpp poco-1.3.2-data/Foundation/src/BinaryWriter.cpp
+--- poco-1.3.2-data.orig/Foundation/src/BinaryWriter.cpp 2008-05-29 20:47:40.000000000 +0200
++++ poco-1.3.2-data/Foundation/src/BinaryWriter.cpp 2008-05-29 20:48:05.000000000 +0200
+@@ -33,6 +33,7 @@
+ // DEALINGS IN THE SOFTWARE.
+ //
+
++#include <cstring>
+
+ #include "Poco/BinaryWriter.h"
+ #include "Poco/ByteOrder.h"
+diff -Naur poco-1.3.2-data.orig/Foundation/src/File_UNIX.cpp poco-1.3.2-data/Foundation/src/File_UNIX.cpp
+--- poco-1.3.2-data.orig/Foundation/src/File_UNIX.cpp 2008-05-29 20:47:40.000000000 +0200
++++ poco-1.3.2-data/Foundation/src/File_UNIX.cpp 2008-05-29 20:48:05.000000000 +0200
+@@ -33,6 +33,7 @@
+ // DEALINGS IN THE SOFTWARE.
+ //
+
++#include <cstring>
+
+ #include "Poco/File_UNIX.h"
+ #include "Poco/Buffer.h"