diff options
Diffstat (limited to 'dev-db/virtuoso-server/files')
| -rw-r--r-- | dev-db/virtuoso-server/files/virtuoso-opensource-6.1.4-gawk4.patch | 86 | ||||
| -rw-r--r-- | dev-db/virtuoso-server/files/virtuoso-server-6.1.4-unbundle-minizip.patch | 36 |
2 files changed, 86 insertions, 36 deletions
diff --git a/dev-db/virtuoso-server/files/virtuoso-opensource-6.1.4-gawk4.patch b/dev-db/virtuoso-server/files/virtuoso-opensource-6.1.4-gawk4.patch new file mode 100644 index 00000000000..6291907f7b0 --- /dev/null +++ b/dev-db/virtuoso-server/files/virtuoso-opensource-6.1.4-gawk4.patch @@ -0,0 +1,86 @@ +# HG changeset patch +# Parent 3c7b74d47ca39768baf9d91bba40141bf111bc21 +# User Nico R. <n-roeser@gmx.net> +# Date 1321439581 -3600 + +Fix problems with GNU awk 4.0. +Original patch taken from upstream CVS, and mechanism applied to all code parts +where ‘gsub’ is used. + + +diff --git a/binsrc/cached_resources/res_to_c.awk b/binsrc/cached_resources/res_to_c.awk +--- a/binsrc/cached_resources/res_to_c.awk ++++ b/binsrc/cached_resources/res_to_c.awk +@@ -30,7 +30,14 @@ + } + { + fun = $0 +- gsub ( /\\/, "\\\\", fun) ++ ++ q = "\\\\" ++ if (PROCINFO["version"] ~ /^4/) ++ gsub ( q, q q, fun) ++ else ++ gsub ( q, q, fun) ++ #WAS: gsub ( /\\/, "\\\\", fun) ++ + gsub ( /"/, "\\\"", fun) + gsub ( /\$/, "\\044", fun) + gsub ( /.*/, "\"&\\n\",", fun) +diff --git a/binsrc/hosting/perl/pl_to_c.awk b/binsrc/hosting/perl/pl_to_c.awk +--- a/binsrc/hosting/perl/pl_to_c.awk ++++ b/binsrc/hosting/perl/pl_to_c.awk +@@ -42,7 +42,14 @@ + } + + x = $0 +- gsub (/\\/, "\\\\", x) ++ ++ q = "\\\\" ++ if (PROCINFO["version"] ~ /^4/) ++ gsub ( q, q q, x) ++ else ++ gsub ( q, q, x) ++ #WAS: gsub (/\\/, "\\\\", x) ++ + gsub (/\"/, "\\\"", x) + print "\"" x "\\n\"" + } +diff --git a/binsrc/hosting/python/py_to_c.awk b/binsrc/hosting/python/py_to_c.awk +--- a/binsrc/hosting/python/py_to_c.awk ++++ b/binsrc/hosting/python/py_to_c.awk +@@ -48,7 +48,14 @@ + } + + x = $0 +- gsub (/\\/, "\\\\", x) ++ ++ q = "\\\\" ++ if (PROCINFO["version"] ~ /^4/) ++ gsub ( q, q q, x) ++ else ++ gsub ( q, q, x) ++ #WAS: gsub (/\\/, "\\\\", x) ++ + gsub (/\"/, "\\\"", x) + print "\"" x "\\n\"" + } +diff --git a/binsrc/ws/wsrm/xsd2sql.awk b/binsrc/ws/wsrm/xsd2sql.awk +--- a/binsrc/ws/wsrm/xsd2sql.awk ++++ b/binsrc/ws/wsrm/xsd2sql.awk +@@ -54,7 +54,14 @@ + print " ses := string_output ();" + } + str = $0 +- gsub ( /\\/, "\\\\", str) ++ ++ q = "\\\\" ++ if (PROCINFO["version"] ~ /^4/) ++ gsub ( q, q q, str) ++ else ++ gsub ( q, q, str) ++ #WAS: gsub ( /\\/, "\\\\", str) ++ + gsub ( /'/, "\\'", str) + + # 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 deleted file mode 100644 index 143c35905b2..00000000000 --- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.4-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) |