| 1 |
commit: d0dbec1f105f1c6ef7af11029a38eb39edf16915 |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 19 23:47:02 2011 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 19 23:47:29 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d0dbec1f |
| 7 |
|
| 8 |
[dev-db/virtuoso-server] Fix patch |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha76/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
.../virtuoso-server-6.1.4-unbundle-minizip.patch | 36 ++++++++++++++++++++ |
| 14 |
.../virtuoso-server/virtuoso-server-6.1.4.ebuild | 4 ++ |
| 15 |
2 files changed, 40 insertions(+), 0 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..143c359 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch |
| 22 |
@@ -0,0 +1,36 @@ |
| 23 |
+diff -urN virtuoso-opensource-6.1.4.orig/configure.in virtuoso-opensource-6.1.4/configure.in |
| 24 |
+--- virtuoso-opensource-6.1.4.orig/configure.in 2011-11-20 03:38:18.000000000 +0400 |
| 25 |
++++ virtuoso-opensource-6.1.4/configure.in 2011-11-20 03:42:44.000000000 +0400 |
| 26 |
+@@ -1550,14 +1550,15 @@ |
| 27 |
+ then |
| 28 |
+ AC_CHECK_HEADER(zlib.h) |
| 29 |
+ AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal]) |
| 30 |
++ AC_CHECK_LIB(minizip, main, [with_zlib=yes], [with_zlib=internal]) |
| 31 |
+ fi |
| 32 |
+ if test "x$with_zlib" = "xinternal" |
| 33 |
+ then |
| 34 |
+ ZLIB_INC='-I$(top_srcdir)/libsrc/zlib' |
| 35 |
+ ZLIB_LIB='$(top_builddir)/libsrc/zlib/libz.la' |
| 36 |
+ else |
| 37 |
+- ZLIB_INC="" |
| 38 |
+- ZLIB_LIB="-lz" |
| 39 |
++ ZLIB_INC=`pkg-config --cflags zlib minizip` |
| 40 |
++ ZLIB_LIB=`pkg-config --libs zlib minizip` |
| 41 |
+ fi |
| 42 |
+ AC_SUBST(ZLIB_INC) |
| 43 |
+ AC_SUBST(ZLIB_LIB) |
| 44 |
+diff -urN virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c |
| 45 |
+--- virtuoso-opensource-6.1.4.orig/libsrc/Wi/bif_file.c 2011-10-26 17:54:19.000000000 +0400 |
| 46 |
++++ virtuoso-opensource-6.1.4/libsrc/Wi/bif_file.c 2011-11-20 03:44:36.000000000 +0400 |
| 47 |
+@@ -6167,10 +6167,7 @@ |
| 48 |
+ #define fopen64 fopen |
| 49 |
+ #endif |
| 50 |
+ |
| 51 |
+-#include "zlib/contrib/minizip/unzip.h" |
| 52 |
+-#include "zlib/contrib/minizip/ioapi.h" |
| 53 |
+-#include "zlib/contrib/minizip/ioapi.c" |
| 54 |
+-#include "zlib/contrib/minizip/unzip.c" |
| 55 |
++#include "unzip.h" |
| 56 |
+ |
| 57 |
+ static caddr_t |
| 58 |
+ bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) |
| 59 |
|
| 60 |
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild |
| 61 |
index 6a1bf17..d38a43e 100644 |
| 62 |
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild |
| 63 |
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild |
| 64 |
@@ -49,6 +49,10 @@ VOS_EXTRACT=" |
| 65 |
|
| 66 |
DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README) |
| 67 |
|
| 68 |
+PATCHES=( |
| 69 |
+ "${FILESDIR}/${P}-unbundle-minizip.patch" |
| 70 |
+ ) |
| 71 |
+ |
| 72 |
src_prepare() { |
| 73 |
sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \ |
| 74 |
|| die "failed to disable installation of static lib" |
Archives