aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.5-unbundle-minizip.patch')
-rw-r--r--dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.5-unbundle-minizip.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.5-unbundle-minizip.patch b/dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.5-unbundle-minizip.patch
deleted file mode 100644
index 143c359..0000000
--- a/dev-db/virtuoso-jdbc/files/virtuoso-jdbc-6.1.5-unbundle-minizip.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN virtuoso-opensource-6.1.4.orig/configure.in virtuoso-opensource-6.1.4/configure.in
---- virtuoso-opensource-6.1.4.orig/configure.in 2011-11-20 03:38:18.000000000 +0400
-+++ virtuoso-opensource-6.1.4/configure.in 2011-11-20 03:42:44.000000000 +0400
-@@ -1550,14 +1550,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 -urN virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c
---- virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c 2011-10-26 17:54:19.000000000 +0400
-+++ virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c 2011-11-20 03:44:36.000000000 +0400
-@@ -6167,10 +6167,7 @@
- #define fopen64 fopen
- #endif
-
--#include "zlib/contrib/minizip/unzip.h"
--#include "zlib/contrib/minizip/ioapi.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)