Date: Wednesday, November 9, 2011 @ 13:50:28 Author: andrea Revision: 142435
archrelease: copy trunk to extra-i686, extra-x86_64 Added: virtuoso/repos/extra-i686/PKGBUILD (from rev 142434, virtuoso/trunk/PKGBUILD) virtuoso/repos/extra-x86_64/PKGBUILD (from rev 142434, virtuoso/trunk/PKGBUILD) Deleted: virtuoso/repos/extra-i686/PKGBUILD virtuoso/repos/extra-i686/fix-unicode.patch virtuoso/repos/extra-x86_64/PKGBUILD virtuoso/repos/extra-x86_64/fix-unicode.patch --------------------------------+ extra-i686/PKGBUILD | 81 ++++++++++++++++++--------------------- extra-i686/fix-unicode.patch | 21 ---------- extra-x86_64/PKGBUILD | 81 ++++++++++++++++++--------------------- extra-x86_64/fix-unicode.patch | 21 ---------- 4 files changed, 76 insertions(+), 128 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2011-11-09 18:49:42 UTC (rev 142434) +++ extra-i686/PKGBUILD 2011-11-09 18:50:28 UTC (rev 142435) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> - -pkgname=virtuoso -pkgver=6.1.3 -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') -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 \ - --disable-rendezvous \ - --disable-hslookup \ - --disable-all-vads - make -} - -package() { - # install server - cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/virtuoso - make DESTDIR=${pkgdir} install - - # install driver - cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/driver - make DESTDIR=${pkgdir} install -} Copied: virtuoso/repos/extra-i686/PKGBUILD (from rev 142434, virtuoso/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-11-09 18:50:28 UTC (rev 142435) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> + +pkgname=virtuoso +pkgver=6.1.4 +pkgrel=1 +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=('libldap') +makedepends=('bison' 'flex') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz") +md5sums=('7110a0b4b171b84850d346f4fe648172') + +build() { + cd ${srcdir}/${pkgname}-opensource-${pkgver} + + ./configure --prefix=/usr \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --disable-rendezvous \ + --disable-hslookup \ + --disable-all-vads + make +} + +package() { + # install server + cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/virtuoso + make DESTDIR=${pkgdir} install + + # install driver + cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/driver + make DESTDIR=${pkgdir} install +} Deleted: extra-i686/fix-unicode.patch =================================================================== --- extra-i686/fix-unicode.patch 2011-11-09 18:49:42 UTC (rev 142434) +++ extra-i686/fix-unicode.patch 2011-11-09 18:50:28 UTC (rev 142435) @@ -1,21 +0,0 @@ -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; Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2011-11-09 18:49:42 UTC (rev 142434) +++ extra-x86_64/PKGBUILD 2011-11-09 18:50:28 UTC (rev 142435) @@ -1,43 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <and...@archlinux.org> -# Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> - -pkgname=virtuoso -pkgver=6.1.3 -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') -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 \ - --disable-rendezvous \ - --disable-hslookup \ - --disable-all-vads - make -} - -package() { - # install server - cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/virtuoso - make DESTDIR=${pkgdir} install - - # install driver - cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/driver - make DESTDIR=${pkgdir} install -} Copied: virtuoso/repos/extra-x86_64/PKGBUILD (from rev 142434, virtuoso/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-11-09 18:50:28 UTC (rev 142435) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> + +pkgname=virtuoso +pkgver=6.1.4 +pkgrel=1 +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=('libldap') +makedepends=('bison' 'flex') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz") +md5sums=('7110a0b4b171b84850d346f4fe648172') + +build() { + cd ${srcdir}/${pkgname}-opensource-${pkgver} + + ./configure --prefix=/usr \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --disable-rendezvous \ + --disable-hslookup \ + --disable-all-vads + make +} + +package() { + # install server + cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/virtuoso + make DESTDIR=${pkgdir} install + + # install driver + cd ${srcdir}/${pkgname}-opensource-${pkgver}/binsrc/driver + make DESTDIR=${pkgdir} install +} Deleted: extra-x86_64/fix-unicode.patch =================================================================== --- extra-x86_64/fix-unicode.patch 2011-11-09 18:49:42 UTC (rev 142434) +++ extra-x86_64/fix-unicode.patch 2011-11-09 18:50:28 UTC (rev 142435) @@ -1,21 +0,0 @@ -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;