[arch-commits] Commit in raptor/trunk (3 files)

[Andrea Scarpino]

    Date: Monday, July 11, 2011 @ 13:53:36
  Author: andrea
Revision: 131196

Use upstream version of the patch

Added:
  raptor/trunk/Allow-instead-of-in-TRiG.patch
Modified:
  raptor/trunk/PKGBUILD
Deleted:
  raptor/trunk/fix-soprano-bug.patch

--------------------------------+
 Allow-instead-of-in-TRiG.patch |   39 +++++++++++++++++++++++++++++++++++++++
 PKGBUILD                       |    6 +++---
 fix-soprano-bug.patch          |   20 --------------------
 3 files changed, 42 insertions(+), 23 deletions(-)

Added: Allow-instead-of-in-TRiG.patch
===================================================================
--- Allow-instead-of-in-TRiG.patch	                        (rev 0)
+++ Allow-instead-of-in-TRiG.patch	2011-07-11 17:53:36 UTC (rev 131196)
@@ -0,0 +1,39 @@
+From 37c5abe588d1ad63dc600cd9b9fd4d362f973a23 Mon Sep 17 00:00:00 2001
+From: Dave Beckett <dave at dajobe.org>
+Date: Mon, 11 Jul 2011 09:56:04 -0700
+Subject: [PATCH] Allow = instead of := in TRiG
+
+---
+ src/turtle_lexer.l |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/turtle_lexer.l b/src/turtle_lexer.l
+index c2f249b..e775771 100644
+--- a/src/turtle_lexer.l
++++ b/src/turtle_lexer.l
+@@ -345,7 +345,7 @@ EXPONENT [eE][+-]?[0-9]+
+                   yyterminate();  }
+ 
+ 
+-{QUOTEDURI}[\ \t\v\n]*(":-")?[\ \t\v\n]*"{"   {
++{QUOTEDURI}[\ \t\v\n]*("=")?[\ \t\v\n]*"{"   {
+                   raptor_stringbuffer* sb;
+                   unsigned char* uri_string;
+ 
+@@ -377,11 +377,11 @@ EXPONENT [eE][+-]?[0-9]+
+                     TURTLE_LEXER_OOM();
+                 return GRAPH_NAME_LEFT_CURLY; }
+ 
+-{QNAME}[\ \t\v\n]*(":-")?[\ \t\v\n]*"{"   {
++{QNAME}[\ \t\v\n]*("=")?[\ \t\v\n]*"{"   {
+                while(1) {
+                   int c = yytext[yyleng - 1];
+                   if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' ||
+-                     c == ':' || c == '-') {
++                     c == '=') {
+                     yyleng--;
+                   } else
+                     break;
+-- 
+1.7.6
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-11 17:46:45 UTC (rev 131195)
+++ PKGBUILD	2011-07-11 17:53:36 UTC (rev 131196)
@@ -13,15 +13,15 @@
 license=('LGPL')
 options=('!libtool')
 source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz"
-        'fix-soprano-bug.patch')
+        'Allow-instead-of-in-TRiG.patch')
 md5sums=('46eff4b20f8752d1146a3e0c8b2168dd'
-         'fd63150d1e9f83bb59af0d86c373c8fa')
+         '352645c72fb087a7309b07c47cd40062')
 
 build() {
   cd ${srcdir}/raptor2-${pkgver}
 
   # see http://bugs.librdf.org/mantis/view.php?id=451
-  patch -p1 -i "${srcdir}"/fix-soprano-bug.patch
+  patch -p1 -i "${srcdir}"/Allow-instead-of-in-TRiG.patch
 
   # fix build with curl >= 7.21.2
   sed -i '/#include <curl\/types.h>/d' src/raptor_internal.h

Deleted: fix-soprano-bug.patch
===================================================================
--- fix-soprano-bug.patch	2011-07-11 17:46:45 UTC (rev 131195)
+++ fix-soprano-bug.patch	2011-07-11 17:53:36 UTC (rev 131196)
@@ -1,20 +0,0 @@
-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';