diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-26 13:21:55 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-09-26 13:21:55 -0300 |
| commit | 60e119a0f3297314f4bcd2b2b821eccd28992cd6 (patch) | |
| tree | 83078f34ba0e5220164fe3f3b5cdff27ce87aaf9 /extra/virtuoso | |
| parent | 8aa6cf7dacd74c155e7b2dd7af68a5cb4460e5b3 (diff) | |
| parent | 21efc9511d14394cc1d8426e2e0a6c668964fbe9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/lightspark/PKGBUILD
community/camlp5/PKGBUILD
community/gnote/PKGBUILD
community/gtk-gnutella/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/koffice/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/virtuoso/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/epiphany/PKGBUILD
gnome-unstable/folks/PKGBUILD
gnome-unstable/gdm/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/gnome-games/PKGBUILD
gnome-unstable/gnome-session/PKGBUILD
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
gnome-unstable/gthumb/PKGBUILD
gnome-unstable/libgnomekbd/PKGBUILD
gnome-unstable/libpeas/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/totem/PKGBUILD
multilib/lib32-libffi/PKGBUILD
multilib/wine/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/virtuoso')
| -rw-r--r-- | extra/virtuoso/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/virtuoso/fix-unicode.patch | 21 |
2 files changed, 31 insertions, 5 deletions
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index e64e3085f..988741d19 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' 'mips64el') 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; |