summaryrefslogtreecommitdiff
path: root/extra/virtuoso
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-09-23 23:14:53 +0000
committerroot <root@rshg054.dnsready.net>2011-09-23 23:14:53 +0000
commitcb2a1951e9cd1de18c0ab88c9d741e91a423fc36 (patch)
tree97c7682d2038f33c83b0b3910cea44bb38a3533f /extra/virtuoso
parent919a63ffc80158b2a5610fa87eb51fd5f8f724ba (diff)
Fri Sep 23 23:14:53 UTC 2011
Diffstat (limited to 'extra/virtuoso')
-rw-r--r--extra/virtuoso/PKGBUILD15
-rw-r--r--extra/virtuoso/fix-unicode.patch21
2 files changed, 31 insertions, 5 deletions
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 63ea4be34..9df06d613 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 119933 2011-04-17 01:32:48Z andrea $
+# $Id: PKGBUILD 138426 2011-09-22 19:46:09Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
pkgname=virtuoso
pkgver=6.1.3
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality'
url='http://virtuoso.openlinksw.com/wiki/main/Main/'
license=('GPL')
depends=('openssl')
makedepends=('bison' 'flex')
-options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz")
-md5sums=('7d4b0497411ff1c34d7ca247618cdd17')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz"
+ 'fix-unicode.patch')
+md5sums=('7d4b0497411ff1c34d7ca247618cdd17'
+ '550dcc877dcbda707aa7ba53800e5d5b')
build() {
cd ${srcdir}/${pkgname}-opensource-${pkgver}
+ # Already fixed upstream
+ patch -p0 -i "${srcdir}"/fix-unicode.patch
+
./configure --prefix=/usr \
--localstatedir=/var \
--sysconfdir=/etc \
diff --git a/extra/virtuoso/fix-unicode.patch b/extra/virtuoso/fix-unicode.patch
new file mode 100644
index 000000000..30046d233
--- /dev/null
+++ b/extra/virtuoso/fix-unicode.patch
@@ -0,0 +1,21 @@
+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;