diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-07 02:29:26 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-07 02:29:26 -0300 |
| commit | 3357db80ffa8a795fb5cdad0fc726470887706b0 (patch) | |
| tree | 461a9d95f958d88aed12f371328b20d87b69323e /extra/raptor | |
| parent | 1921cc4951557545f38946cbed66431f42af26b4 (diff) | |
| parent | ff64a82ccedcb1690d2f0140d63432aa49676591 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/perl-file-path-expand/PKGBUILD
community/perl-file-slurp/PKGBUILD
community/perl-getopt-argvfile/PKGBUILD
community/perl-graphics-colornames/PKGBUILD
community/perl-html-tableextract/PKGBUILD
community/perl-xml-regexp/PKGBUILD
community/perlio-eol/PKGBUILD
community/virtualbox/PKGBUILD
community/xemacs/PKGBUILD
core/gawk/PKGBUILD
extra/bogofilter/PKGBUILD
extra/feh/PKGBUILD
extra/gnome-phone-manager/PKGBUILD
extra/redland/PKGBUILD
extra/ruby/PKGBUILD
extra/samba/PKGBUILD
extra/squirrelmail/PKGBUILD
extra/subversion/PKGBUILD
extra/vsftpd/PKGBUILD
extra/xawtv/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
multilib/lib32-glib2/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/raptor')
| -rw-r--r-- | extra/raptor/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/raptor/fix-soprano-bug.patch | 20 |
2 files changed, 34 insertions, 5 deletions
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index a2f657246..2200c4ea7 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,22 +1,31 @@ -# $Id: PKGBUILD 126317 2011-06-04 16:06:41Z andyrtr $ +# $Id: PKGBUILD 130397 2011-07-06 11:19:50Z andrea $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor pkgver=2.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64' 'mips64el') url="http://librdf.org/raptor" -depends=('libxml2>=2.7.8' 'curl>=7.21.2' 'zlib>=1.2.5' 'libxslt>=1.1.26') +depends=('libxml2>=2.7.8' 'curl>=7.21.7' 'zlib>=1.2.5' 'libxslt>=1.1.26') license=('LGPL') options=('!libtool') -source=(http://librdf.org/dist/source/raptor2-$pkgver.tar.gz) -md5sums=('46eff4b20f8752d1146a3e0c8b2168dd') +source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz" + 'fix-soprano-bug.patch') +md5sums=('46eff4b20f8752d1146a3e0c8b2168dd' + 'fd63150d1e9f83bb59af0d86c373c8fa') build() { cd ${srcdir}/raptor2-${pkgver} + + # see http://bugs.librdf.org/mantis/view.php?id=451 + patch -p1 -i "${srcdir}"/fix-soprano-bug.patch + + # fix build with curl >= 7.21.2 + sed -i '/#include <curl\/types.h>/d' src/raptor_internal.h + ./configure --prefix=/usr --disable-static make } diff --git a/extra/raptor/fix-soprano-bug.patch b/extra/raptor/fix-soprano-bug.patch new file mode 100644 index 000000000..ec7f087e0 --- /dev/null +++ b/extra/raptor/fix-soprano-bug.patch @@ -0,0 +1,20 @@ +diff --git a/src/turtle_lexer.l b/src/turtle_lexer.l +index c2f249b..f133747 100644 +--- a/src/turtle_lexer.l ++++ b/src/turtle_lexer.l +@@ -381,9 +381,13 @@ EXPONENT [eE][+-]?[0-9]+ + while(1) { + int c = yytext[yyleng - 1]; + if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' || +- c == ':' || c == '-') { ++ c == '=' ) { + yyleng--; +- } else ++ } ++ else if ( yyleng >= 2 && ( c == '-' && yytext[yyleng - 2] == ':' ) ) { ++ yyleng -= 2; ++ } ++ else + break; + } + yytext[yyleng] = '\0'; |