diff options
| author |   Johannes Huber <johu@gentoo.org> | 2012-05-23 09:02:01 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-05-23 09:02:01 +0000 |
| commit | 29647dc074ebcd75f31deae9f2faaf2cdaa205e5 (patch) | |
| tree | 3271cbac8a5af5e93287799b0fcdae92a196b9d1 /dev-db/virtuoso-server/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-29647dc074ebcd75f31deae9f2faaf2cdaa205e5.tar.gz gentoo-2-29647dc074ebcd75f31deae9f2faaf2cdaa205e5.tar.bz2 gentoo-2-29647dc074ebcd75f31deae9f2faaf2cdaa205e5.zip | |
Remove old.
(Portage version: 2.2.0_alpha107/cvs/Linux i686)
Diffstat (limited to 'dev-db/virtuoso-server/files')
| -rw-r--r-- | dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch | 36 | ||||
| -rw-r--r-- | dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch | 21 |
2 files changed, 0 insertions, 57 deletions
diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch deleted file mode 100644 index e68903a2230e..000000000000 --- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ruN virtuoso-opensource-6.1.3/configure.in new/configure.in ---- virtuoso-opensource-6.1.3/configure.in 2011-03-30 01:20:19.000000000 +0200 -+++ new/configure.in 2011-09-21 23:04:42.372977092 +0200 -@@ -1568,14 +1568,15 @@ - then - AC_CHECK_HEADER(zlib.h) - AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal]) -+ AC_CHECK_LIB(minizip, main, [with_zlib=yes], [with_zlib=internal]) - fi - if test "x$with_zlib" = "xinternal" - then - ZLIB_INC='-I$(top_srcdir)/libsrc/zlib' - ZLIB_LIB='$(top_builddir)/libsrc/zlib/libz.la' - else -- ZLIB_INC="" -- ZLIB_LIB="-lz" -+ ZLIB_INC=`pkg-config --cflags zlib minizip` -+ ZLIB_LIB=`pkg-config --libs zlib minizip` - fi - AC_SUBST(ZLIB_INC) - AC_SUBST(ZLIB_LIB) -diff -ruN virtuoso-opensource-6.1.3/libsrc/Wi/bif_file.c new/libsrc/Wi/bif_file.c ---- virtuoso-opensource-6.1.3/libsrc/Wi/bif_file.c 2011-02-14 13:30:56.000000000 +0100 -+++ new/libsrc/Wi/bif_file.c 2011-09-21 22:44:52.638977417 +0200 -@@ -6139,10 +6139,7 @@ - return NULL; - } - -- --#include "zlib/contrib/minizip/unzip.h" --#include "zlib/contrib/minizip/ioapi.c" --#include "zlib/contrib/minizip/unzip.c" -+#include "unzip.h" - - static caddr_t - bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch deleted file mode 100644 index 30046d2332ad..000000000000 --- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: libsrc/Wi/xqf.c -=================================================================== -RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v -retrieving revision 1.21.2.9 -retrieving revision 1.21.2.12 -diff -u -r1.21.2.9 -r1.21.2.12 ---- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9 -+++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12 -@@ -3520,6 +3552,12 @@ - desc = xqf_str_parser_descs + desc_idx; - if (DV_DB_NULL == arg_dtp) - return NEW_DB_NULL; -+ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */ -+ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING) -+ { -+ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING); -+ goto res_ready; -+ } - if (DV_STRING != arg_dtp) - { - caddr_t err = NULL; |