diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2011-11-20 03:47:02 +0400 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2011-11-20 03:47:29 +0400 |
| commit | d0dbec1f105f1c6ef7af11029a38eb39edf16915 (patch) | |
| tree | dd7dff550a33df9113a14ce6bc8e54704edcc6c8 /dev-db | |
| parent | [sets] Delete old, empty sets (diff) | |
| download | kde-d0dbec1f105f1c6ef7af11029a38eb39edf16915.tar.gz kde-d0dbec1f105f1c6ef7af11029a38eb39edf16915.tar.bz2 kde-d0dbec1f105f1c6ef7af11029a38eb39edf16915.zip | |
[dev-db/virtuoso-server] Fix patch
(Portage version: 2.2.0_alpha76/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch | 36 | ||||
| -rw-r--r-- | dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild | 4 |
2 files changed, 40 insertions, 0 deletions
diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch new file mode 100644 index 0000000000..143c35905b --- /dev/null +++ b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch @@ -0,0 +1,36 @@ +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) diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild index 6a1bf17cc1..d38a43ef34 100644 --- a/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild +++ b/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild @@ -49,6 +49,10 @@ VOS_EXTRACT=" DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README) +PATCHES=( + "${FILESDIR}/${P}-unbundle-minizip.patch" + ) + src_prepare() { sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \ || die "failed to disable installation of static lib" |