summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/cyrus-sasl-plugins/PKGBUILD52
-rw-r--r--extra/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch24
-rw-r--r--extra/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch23
-rw-r--r--extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch24
-rw-r--r--extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch21
-rw-r--r--extra/epplet-base/ChangeLog16
-rw-r--r--extra/gtkglext/gtkglext-1.0.6-pangox.patch30
-rw-r--r--extra/imlib/ChangeLog13
-rw-r--r--extra/libmms/libmms-0.5-this-keyword.patch18
-rw-r--r--extra/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch31
-rw-r--r--extra/libreoffice/buildfix_64bit_system_libjpeg.diff11
-rw-r--r--extra/mesa/gnome-shell-shader-fix.patch535
-rw-r--r--extra/mesa/nouveau-fix-header.patch86
-rw-r--r--extra/raptor/Allow-instead-of-in-TRiG.patch550
14 files changed, 0 insertions, 1434 deletions
diff --git a/extra/cyrus-sasl-plugins/PKGBUILD b/extra/cyrus-sasl-plugins/PKGBUILD
deleted file mode 100644
index 5817bb657..000000000
--- a/extra/cyrus-sasl-plugins/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 122144 2011-05-02 13:27:49Z stephane $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=cyrus-sasl-plugins
-pkgver=2.1.23
-pkgrel=5
-pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
-arch=('i686' 'x86_64')
-url="http://cyrusimap.web.cmu.edu/"
-license=('custom')
-depends=('postgresql-libs>=9.0.3' 'krb5' 'libldap>2.4'
- 'libmysqlclient>=5.5.10')
-source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
- cyrus-sasl-2.1.22-gcc44.patch
- cyrus-sasl-2.1.23-db5-fix.patch)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
- '5deb4d67b53ecba20c7887fc8fdebee1'
- '3ae4347705141145f31cf786c38ea9ef')
-options=('!libtool')
-
-build() {
- cd ${srcdir}/cyrus-sasl-${pkgver}
- patch -Np1 -i $srcdir/cyrus-sasl-2.1.22-gcc44.patch
- # from http://bugs.gentoo.org/show_bug.cgi?id=319935
- patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.23-db5-fix.patch
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-login \
- --disable-plain \
- --enable-sql \
- --disable-sqlite \
- --enable-gssapi=/usr/include/gssapi \
- --with-mysql=/usr \
- --with-pgsql=/usr \
- --enable-postgresql \
- --enable-ldapdb \
- --with-ldap=/usr
- cd sasldb
- make
- cd ../plugins
- make
-}
-
-package () {
- cd ${srcdir}/cyrus-sasl-${pkgver}/plugins
- make DESTDIR=${pkgdir} install
-
- install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-
- rm -f ${pkgdir}/usr/lib/sasl2/libsasldb.*
-}
diff --git a/extra/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch b/extra/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch
deleted file mode 100644
index e2621278b..000000000
--- a/extra/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-fix warnings with gcc-4.4
-
-http://bugs.gentoo.org/248738
-
---- cyrus-sasl-2.1.22/plugins/digestmd5.c
-+++ cyrus-sasl-2.1.22/plugins/digestmd5.c
-@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv
- "DIGEST-MD5", /* mech_name */
- #ifdef WITH_RC4
- 128, /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
-@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie
- "DIGEST-MD5",
- #ifdef WITH_RC4 /* mech_name */
- 128, /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
diff --git a/extra/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch b/extra/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch
deleted file mode 100644
index 2ccd6cdb3..000000000
--- a/extra/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- sasldb/db_berkeley.c.orig 2010-10-04 21:11:15.044010468 -0400
-+++ sasldb/db_berkeley.c 2010-10-04 21:12:18.921998718 -0400
-@@ -100,7 +100,7 @@
- ret = db_create(mbdb, NULL, 0);
- if (ret == 0 && *mbdb != NULL)
- {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5
- ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
- #else
- ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
-
---- utils/dbconverter-2.c.orig 2010-10-04 21:23:39.778000256 -0400
-+++ utils/dbconverter-2.c 2010-10-04 21:24:50.384999893 -0400
-@@ -214,7 +214,7 @@
- ret = db_create(mbdb, NULL, 0);
- if (ret == 0 && *mbdb != NULL)
- {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5
- ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
- #else
- ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
deleted file mode 100644
index 62df3e67e..000000000
--- a/extra/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c cyrus-sasl-2.1.23/sasldb/db_berkeley.c
---- cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c 2009-04-28 08:09:18.000000000 -0700
-+++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2011-05-02 07:16:42.748675977 -0700
-@@ -100,7 +100,7 @@
- ret = db_create(mbdb, NULL, 0);
- if (ret == 0 && *mbdb != NULL)
- {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
- ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
- #else
- ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
-diff -Naur cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c cyrus-sasl-2.1.23/utils/dbconverter-2.c
---- cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c 2003-02-13 11:56:17.000000000 -0800
-+++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2011-05-02 07:16:42.748675977 -0700
-@@ -214,7 +214,7 @@
- ret = db_create(mbdb, NULL, 0);
- if (ret == 0 && *mbdb != NULL)
- {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
- ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
- #else
- ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
deleted file mode 100644
index 0d8627b1f..000000000
--- a/extra/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c
---- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c 2009-04-28 08:09:17.000000000 -0700
-+++ cyrus-sasl-2.1.23/plugins/digestmd5.c 2011-05-02 07:56:55.375403814 -0700
-@@ -2715,7 +2715,7 @@
- "DIGEST-MD5", /* mech_name */
- #ifdef WITH_RC4
- 128, /* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
-@@ -4034,7 +4034,7 @@
- "DIGEST-MD5",
- #ifdef WITH_RC4 /* mech_name */
- 128, /* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 112,
- #else
- 1,
diff --git a/extra/epplet-base/ChangeLog b/extra/epplet-base/ChangeLog
deleted file mode 100644
index 85677b48e..000000000
--- a/extra/epplet-base/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-2010-05-07 Eric Belanger <eric@archlinux.org>
-
- * epplet-base 0.13-1
- * Upstream update
- * Removed uneeded depends
-
-2009-01-03 Eric Belanger <eric@archlinux.org>
-
- * epplet-base 0.12-1
- * Upstream update
-
-2008-07-05 Eric Belanger <eric@archlinux.org>
-
- * epplet-base 0.11-1
- * Upstream update
- * Added ChangeLog
diff --git a/extra/gtkglext/gtkglext-1.0.6-pangox.patch b/extra/gtkglext/gtkglext-1.0.6-pangox.patch
deleted file mode 100644
index 8cd589ed6..000000000
--- a/extra/gtkglext/gtkglext-1.0.6-pangox.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- gtkglext-1.0.6/configure.in 2005-09-10 16:45:06.000000000 +0200
-+++ gtkglext-1.0.6.az/configure.in 2005-09-10 16:46:01.000000000 +0200
-@@ -59,6 +59,10 @@
- m4_define([pango_pkg], [pango])
- m4_define([pango_required_version], [1.0.0])
-
-+# Pangox
-+m4_define([pangox_pkg], [pangox])
-+m4_define([pangox_required_version], [1.0.0])
-+
- # PangoFT2
- m4_define([pangoft2_pkg], [pangoft2])
- m4_define([pangoft2_required_version], [1.0.0])
-@@ -345,6 +349,7 @@
- gtk_pkg >= gtk_required_version \
- gdk_pkg >= gdk_required_version \
- pango_pkg >= pango_required_version \
-+pangox_pkg >= pango_required_version \
- gmodule_pkg >= gmodule_required_version \
- ])
-
-@@ -789,7 +794,7 @@
- # CFLAGS and LIBS
- ##################################################
-
--GDKGLEXT_PACKAGES="gdk_pkg pango_pkg gmodule_pkg"
-+GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
- GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
- GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
- GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
diff --git a/extra/imlib/ChangeLog b/extra/imlib/ChangeLog
deleted file mode 100644
index 3a4bcdf0f..000000000
--- a/extra/imlib/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-2009-07-01 Eric Belanger <eric@archlinux.org>
-
- * imlib 1.9.15-6
- * Rebuild for libjpeg 7
-
-2009-06-14 Eric Belanger <eric@archlinux.org>
-
- * imlib 1.9.15-5
- * Added libxt makedepends (close FS#15086)
- * Changed libungif depends to giflib
- * Updated url
- * FHS man pages
- * Added ChangeLog
diff --git a/extra/libmms/libmms-0.5-this-keyword.patch b/extra/libmms/libmms-0.5-this-keyword.patch
deleted file mode 100644
index 9d5ae762e..000000000
--- a/extra/libmms/libmms-0.5-this-keyword.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nurp libmms-0.5.orig//src/mmsx.h libmms-0.5//src/mmsx.h
---- libmms-0.5.orig//src/mmsx.h 2010-03-03 11:42:14.000000000 +0100
-+++ libmms-0.5//src/mmsx.h 2010-03-03 11:42:46.000000000 +0100
-@@ -55,11 +55,11 @@ int mmsx_peek_header (mmsx_t *inst
-
- mms_off_t mmsx_get_current_pos (mmsx_t *instance);
-
--uint32_t mmsx_get_asf_header_len (mmsx_t *this);
-+uint32_t mmsx_get_asf_header_len (mmsx_t *instance);
-
--uint64_t mmsx_get_asf_packet_len (mmsx_t *this);
-+uint64_t mmsx_get_asf_packet_len (mmsx_t *instance);
-
--int mmsx_get_seekable (mmsx_t *this);
-+int mmsx_get_seekable (mmsx_t *instance);
-
- #ifdef __cplusplus
- }
diff --git a/extra/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch b/extra/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch
deleted file mode 100644
index 31ad95d36..000000000
--- a/extra/libreoffice/0001-fix-configure-without-the-optional-translations-modu.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 900baff9ff400a6eba034089ed69362c2c2d61e4 Mon Sep 17 00:00:00 2001
-From: Petr Mladek <pmladek@suse.cz>
-Date: Wed, 22 Jun 2011 12:05:19 +0200
-Subject: [PATCH] fix configure without the optional translations module
-
----
- set_soenv.in | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/set_soenv.in b/set_soenv.in
-index f015bab..8e39314 100755
---- a/set_soenv.in
-+++ b/set_soenv.in
-@@ -1068,9 +1068,11 @@ $XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
- $L10N_MODULE = PathFormat($SRC_ROOT."/translations");
-
- # Check for poor help localizations, i.e. no help translation at all...
--opendir(DIR,$L10N_MODULE . "/source");
--@languages = readdir(DIR);
--closedir(DIR);
-+@languages=();
-+if (opendir(DIR,$L10N_MODULE . "/source"))
-+{ @languages = readdir(DIR);
-+ closedir(DIR);
-+}
- $WITH_POOR_HELP_LOCALIZATIONS = "";
-
- foreach $language (@languages)
---
-1.7.3.4
-
diff --git a/extra/libreoffice/buildfix_64bit_system_libjpeg.diff b/extra/libreoffice/buildfix_64bit_system_libjpeg.diff
deleted file mode 100644
index 1f4eb110f..000000000
--- a/extra/libreoffice/buildfix_64bit_system_libjpeg.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- solenv/inc/libs.mk 2009-07-02 09:44:33.084467312 +0000
-+++ solenv/inc/libs.mk.new 2009-07-02 10:44:03.420819776 +0000
-@@ -211,7 +211,7 @@
- .IF "$(OS)" == "FREEBSD"
- JPEG3RDLIB=/usr/local/lib/libjpeg.so
- .ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64"
--JPEG3RDLIB=/usr/lib64/libjpeg.so
-+JPEG3RDLIB=/usr/lib/libjpeg.so
- .ELSE
- JPEG3RDLIB=/usr/lib/libjpeg.so
- .ENDIF
diff --git a/extra/mesa/gnome-shell-shader-fix.patch b/extra/mesa/gnome-shell-shader-fix.patch
deleted file mode 100644
index 3b3f37591..000000000
--- a/extra/mesa/gnome-shell-shader-fix.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-From 3f625689acd570e4f14cc2ebaa43a425d13954ff Mon Sep 17 00:00:00 2001
-From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
-Date: Thu, 31 Mar 2011 13:49:33 +0000
-Subject: nv50: copy regalloc fixes from nvc0
-
-Should fix gnome-shell's fade shader.
-
-Unification of the shader backend which is supposed to remove the
-code duplication is still WIP.
----
-diff --git a/src/gallium/drivers/nv50/nv50_pc.h b/src/gallium/drivers/nv50/nv50_pc.h
-index e6f3815..a9a3248 100644
---- a/src/gallium/drivers/nv50/nv50_pc.h
-+++ b/src/gallium/drivers/nv50/nv50_pc.h
-@@ -228,6 +228,8 @@ struct nv_ref {
- ubyte flags; /* not used yet */
- };
-
-+#define NV_REF_FLAG_REGALLOC_PRIV (1 << 0)
-+
- struct nv_basic_block;
-
- struct nv_instruction {
-@@ -263,6 +265,15 @@ struct nv_instruction {
- ubyte quadop;
- };
-
-+static INLINE int
-+nvi_vector_size(struct nv_instruction *nvi)
-+{
-+ int i;
-+ assert(nvi);
-+ for (i = 0; i < 4 && nvi->def[i]; ++i);
-+ return i;
-+}
-+
- #define CFG_EDGE_FORWARD 0
- #define CFG_EDGE_BACK 1
- #define CFG_EDGE_LOOP_ENTER 2
-diff --git a/src/gallium/drivers/nv50/nv50_pc_regalloc.c b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
-index 39ae366..657df2c 100644
---- a/src/gallium/drivers/nv50/nv50_pc_regalloc.c
-+++ b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
-@@ -32,14 +32,39 @@
- #include "util/u_simple_list.h"
-
- #define NUM_REGISTER_FILES 4
-+#define MAX_REGISTER_COUNT 256
-
- struct register_set {
- struct nv_pc *pc;
-
- uint32_t last[NUM_REGISTER_FILES];
-- uint32_t bits[NUM_REGISTER_FILES][8];
-+ uint32_t bits[NUM_REGISTER_FILES][(MAX_REGISTER_COUNT + 31) / 32];
- };
-
-+/* using OR because a set bit means occupied/unavailable, aliasing is allowed */
-+static void
-+intersect_register_sets(struct register_set *dst,
-+ struct register_set *src1, struct register_set *src2)
-+{
-+ int i, j;
-+
-+ for (i = 0; i < NUM_REGISTER_FILES; ++i) {
-+ for (j = 0; j < (MAX_REGISTER_COUNT + 31) / 32; ++j)
-+ dst->bits[i][j] = src1->bits[i][j] | src2->bits[i][j];
-+ }
-+}
-+
-+static void
-+mask_register_set(struct register_set *set, uint32_t mask, uint32_t umask)
-+{
-+ int i, j;
-+
-+ for (i = 0; i < NUM_REGISTER_FILES; ++i) {
-+ for (j = 0; j < (MAX_REGISTER_COUNT + 31) / 32; ++j)
-+ set->bits[i][j] = (set->bits[i][j] | mask) & umask;
-+ }
-+}
-+
- struct nv_pc_pass {
- struct nv_pc *pc;
-
-@@ -61,11 +86,15 @@ ranges_coalesce(struct nv_range *range)
- }
- }
-
-+/* @return: TRUE if @new_range can be freed (i.e. was not reused) */
- static boolean
- add_range_ex(struct nv_value *val, int bgn, int end, struct nv_range *new_range)
- {
- struct nv_range *range, **nextp = &val->livei;
-
-+ if (bgn == end) /* [a, a) is invalid / empty */
-+ return TRUE;
-+
- for (range = val->livei; range; range = range->next) {
- if (end < range->bgn)
- break; /* insert before */
-@@ -251,6 +280,8 @@ reg_occupy(struct register_set *set, struct nv_value *val)
- id <<= s;
- m = (1 << (1 << s)) - 1;
-
-+ assert(s >= 0); /* XXX: remove me */
-+
- set->bits[f][id / 32] |= m << (id % 32);
-
- if (set->pc->max_reg[f] < id)
-@@ -286,15 +317,12 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b)
- if (a->join->reg.id == b->join->reg.id)
- return TRUE;
-
--#if 1
- /* either a or b or both have been assigned */
-
- if (a->join->reg.id >= 0 && b->join->reg.id >= 0)
- return FALSE;
- else
- if (b->join->reg.id >= 0) {
-- if (a->join->reg.id >= 0)
-- return FALSE;
- val = a;
- a = b;
- b = val;
-@@ -309,8 +337,6 @@ join_allowed(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b)
- return FALSE;
- }
- return TRUE;
--#endif
-- return FALSE;
- }
-
- static INLINE void
-@@ -336,14 +362,14 @@ do_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b)
- assert(b->join == a->join);
- }
-
--static INLINE void
-+static INLINE boolean
- try_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b)
- {
- if (!join_allowed(ctx, a, b)) {
- #ifdef NV50_RA_DEBUG_JOIN
- debug_printf("cannot join %i to %i: not allowed\n", b->n, a->n);
- #endif
-- return;
-+ return FALSE;
- }
- if (livei_have_overlap(a->join, b->join)) {
- #ifdef NV50_RA_DEBUG_JOIN
-@@ -351,10 +377,27 @@ try_join_values(struct nv_pc_pass *ctx, struct nv_value *a, struct nv_value *b)
- livei_print(a);
- livei_print(b);
- #endif
-- return;
-+ return FALSE;
- }
-
- do_join_values(ctx, a, b);
-+
-+ return TRUE;
-+}
-+
-+static void
-+join_values_nofail(struct nv_pc_pass *ctx,
-+ struct nv_value *a, struct nv_value *b, boolean type_only)
-+{
-+ if (type_only) {
-+ assert(join_allowed(ctx, a, b));
-+ do_join_values(ctx, a, b);
-+ } else {
-+ boolean ok = try_join_values(ctx, a, b);
-+ if (!ok) {
-+ NOUVEAU_ERR("failed to coalesce values\n");
-+ }
-+ }
- }
-
- static INLINE boolean
-@@ -369,20 +412,32 @@ need_new_else_block(struct nv_basic_block *b, struct nv_basic_block *p)
- return (b->num_in > 1) && (n == 2);
- }
-
-+/* Look for the @phi's operand whose definition reaches @b. */
- static int
- phi_opnd_for_bb(struct nv_instruction *phi, struct nv_basic_block *b,
- struct nv_basic_block *tb)
- {
-+ struct nv_ref *srci, *srcj;
- int i, j;
-
-- for (j = -1, i = 0; i < 4 && phi->src[i]; ++i) {
-- if (!nvbb_reachable_by(b, phi->src[i]->value->insn->bb, tb))
-+ for (j = -1, i = 0; i < 6 && phi->src[i]; ++i) {
-+ srci = phi->src[i];
-+ /* if already replaced, check with original source first */
-+ if (srci->flags & NV_REF_FLAG_REGALLOC_PRIV)
-+ srci = srci->value->insn->src[0];
-+ if (!nvbb_reachable_by(b, srci->value->insn->bb, NULL))
- continue;
- /* NOTE: back-edges are ignored by the reachable-by check */
-- if (j < 0 || !nvbb_reachable_by(phi->src[j]->value->insn->bb,
-- phi->src[i]->value->insn->bb, tb))
-+ if (j < 0 || !nvbb_reachable_by(srcj->value->insn->bb,
-+ srci->value->insn->bb, NULL)) {
- j = i;
-+ srcj = srci;
-+ }
- }
-+ if (j >= 0 && nvbb_reachable_by(b, phi->def[0]->insn->bb, NULL))
-+ if (!nvbb_reachable_by(srcj->value->insn->bb,
-+ phi->def[0]->insn->bb, NULL))
-+ j = -1;
- return j;
- }
-
-@@ -429,16 +484,21 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b)
- ctx->pc->current_block = pn;
-
- for (i = b->phi; i && i->opcode == NV_OP_PHI; i = i->next) {
-- if ((j = phi_opnd_for_bb(i, p, b)) < 0)
-- continue;
-- val = i->src[j]->value;
--
-- if (i->src[j]->flags) {
-- val = val->insn->src[0]->value;
-- while (j < 4 && i->src[j])
-- ++j;
-- assert(j < 4);
-+ j = phi_opnd_for_bb(i, p, b);
-+
-+ if (j < 0) {
-+ val = i->def[0];
-+ } else {
-+ val = i->src[j]->value;
-+ if (i->src[j]->flags & NV_REF_FLAG_REGALLOC_PRIV) {
-+ j = -1;
-+ /* use original value, we already encountered & replaced it */
-+ val = val->insn->src[0]->value;
-+ }
- }
-+ if (j < 0) /* need an additional source ? */
-+ for (j = 0; j < 5 && i->src[j] && i->src[j]->value != val; ++j);
-+ assert(j < 5);
-
- ni = new_instruction(ctx->pc, NV_OP_MOV);
-
-@@ -452,7 +512,7 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b)
-
- nv_reference(ctx->pc, &i->src[j], ni->def[0]);
-
-- i->src[j]->flags = 1;
-+ i->src[j]->flags |= NV_REF_FLAG_REGALLOC_PRIV;
- }
-
- if (pn != p && pn->exit) {
-@@ -470,45 +530,50 @@ pass_generate_phi_movs(struct nv_pc_pass *ctx, struct nv_basic_block *b)
- return 0;
- }
-
-+#define JOIN_MASK_PHI (1 << 0)
-+#define JOIN_MASK_SELECT (1 << 1)
-+#define JOIN_MASK_MOV (1 << 2)
-+#define JOIN_MASK_TEX (1 << 3)
-+
- static int
--pass_join_values(struct nv_pc_pass *ctx, int iter)
-+pass_join_values(struct nv_pc_pass *ctx, unsigned mask)
- {
- int c, n;
-
- for (n = 0; n < ctx->num_insns; ++n) {
-- struct nv_instruction *i = ctx->insns[n];
-+ struct nv_instruction *nvi, *i = ctx->insns[n];
-
- switch (i->opcode) {
- case NV_OP_PHI:
-- if (iter != 2)
-+ if (!(mask & JOIN_MASK_PHI))
- break;
-- for (c = 0; c < 4 && i->src[c]; ++c)
-- try_join_values(ctx, i->def[0], i->src[c]->value);
-+ for (c = 0; c < 5 && i->src[c]; ++c)
-+ join_values_nofail(ctx, i->def[0], i->src[c]->value, FALSE);
- break;
- case NV_OP_MOV:
-- if ((iter == 2) && i->src[0]->value->insn &&
-- !nv_is_vector_op(i->src[0]->value->join->insn->opcode))
-+ if (!(mask & JOIN_MASK_MOV))
-+ break;
-+ nvi = i->src[0]->value->join->insn;
-+ if (nvi && !nv_is_vector_op(nvi->opcode))
- try_join_values(ctx, i->def[0], i->src[0]->value);
- break;
- case NV_OP_SELECT:
-- if (iter != 1)
-+ if (!(mask & JOIN_MASK_SELECT))
- break;
-- for (c = 0; c < 4 && i->src[c]; ++c) {
-- assert(join_allowed(ctx, i->def[0], i->src[c]->value));
-- do_join_values(ctx, i->def[0], i->src[c]->value);
-- }
-+ for (c = 0; c < 5 && i->src[c]; ++c)
-+ join_values_nofail(ctx, i->def[0], i->src[c]->value, TRUE);
- break;
- case NV_OP_TEX:
- case NV_OP_TXB:
- case NV_OP_TXL:
- case NV_OP_TXQ:
-- if (iter)
-+ if (!(mask & JOIN_MASK_TEX))
- break;
-- for (c = 0; c < 4; ++c) {
-- if (!i->src[c])
-- break;
-- do_join_values(ctx, i->def[c], i->src[c]->value);
-- }
-+ /* This should work without conflicts because we always generate
-+ * extra MOVs for the sources of a TEX.
-+ */
-+ for (c = 0; c < 4 && i->src[c]; ++c)
-+ join_values_nofail(ctx, i->def[c], i->src[c]->value, TRUE);
- break;
- default:
- break;
-@@ -643,15 +708,15 @@ static void collect_live_values(struct nv_basic_block *b, const int n)
- {
- int i;
-
-- if (b->out[0]) {
-- if (b->out[1]) { /* what to do about back-edges ? */
-+ if (b->out[0] && b->out_kind[0] != CFG_EDGE_FAKE) {
-+ if (b->out[1] && b->out_kind[1] != CFG_EDGE_FAKE) {
- for (i = 0; i < n; ++i)
- b->live_set[i] = b->out[0]->live_set[i] | b->out[1]->live_set[i];
- } else {
- memcpy(b->live_set, b->out[0]->live_set, n * sizeof(uint32_t));
- }
- } else
-- if (b->out[1]) {
-+ if (b->out[1] && b->out_kind[1] != CFG_EDGE_FAKE) {
- memcpy(b->live_set, b->out[1]->live_set, n * sizeof(uint32_t));
- } else {
- memset(b->live_set, 0, n * sizeof(uint32_t));
-@@ -770,8 +835,8 @@ insert_ordered_tail(struct nv_value *list, struct nv_value *nval)
- struct nv_value *elem;
-
- for (elem = list->prev;
-- elem != list && elem->livei->bgn > nval->livei->bgn;
-- elem = elem->prev);
-+ elem != list && elem->livei->bgn > nval->livei->bgn;
-+ elem = elem->prev);
- /* now elem begins before or at the same time as val */
-
- nval->prev = elem;
-@@ -780,44 +845,49 @@ insert_ordered_tail(struct nv_value *list, struct nv_value *nval)
- elem->next = nval;
- }
-
--static int
--pass_linear_scan(struct nv_pc_pass *ctx, int iter)
-+static void
-+collect_register_values(struct nv_pc_pass *ctx, struct nv_value *head,
-+ boolean assigned_only)
- {
-- struct nv_instruction *i;
-- struct register_set f, free;
-+ struct nv_value *val;
- int k, n;
-- struct nv_value *cur, *val, *tmp[2];
-- struct nv_value active, inactive, handled, unhandled;
-
-- make_empty_list(&active);
-- make_empty_list(&inactive);
-- make_empty_list(&handled);
-- make_empty_list(&unhandled);
--
-- nv50_ctor_register_set(ctx->pc, &free);
-+ make_empty_list(head);
-
-- /* joined values should have range = NULL and thus not be added;
-- * also, fixed memory values won't be added because they're not
-- * def'd, just used
-- */
- for (n = 0; n < ctx->num_insns; ++n) {
-- i = ctx->insns[n];
-+ struct nv_instruction *i = ctx->insns[n];
-
-+ /* for joined values, only the representative will have livei != NULL */
- for (k = 0; k < 4; ++k) {
- if (i->def[k] && i->def[k]->livei)
-- insert_ordered_tail(&unhandled, i->def[k]);
-- else
-- if (0 && i->def[k])
-- debug_printf("skipping def'd value %i: no livei\n", i->def[k]->n);
-+ if (!assigned_only || i->def[k]->reg.id >= 0)
-+ insert_ordered_tail(head, i->def[k]);
- }
- if (i->flags_def && i->flags_def->livei)
-- insert_ordered_tail(&unhandled, i->flags_def);
-+ if (!assigned_only || i->flags_def->reg.id >= 0)
-+ insert_ordered_tail(head, i->flags_def);
- }
-
-- for (val = unhandled.next; val != unhandled.prev; val = val->next) {
-+ for (val = head->next; val != head->prev; val = val->next) {
- assert(val->join == val);
- assert(val->livei->bgn <= val->next->livei->bgn);
- }
-+}
-+
-+static int
-+pass_linear_scan(struct nv_pc_pass *ctx, int iter)
-+{
-+ struct register_set f, free;
-+ struct nv_value *cur, *val, *tmp[2];
-+ struct nv_value active, inactive, handled, unhandled;
-+
-+ make_empty_list(&active);
-+ make_empty_list(&inactive);
-+ make_empty_list(&handled);
-+
-+ nv50_ctor_register_set(ctx->pc, &free);
-+
-+ collect_register_values(ctx, &unhandled, FALSE);
-
- foreach_s(cur, tmp[0], &unhandled) {
- remove_from_list(cur);
-@@ -854,13 +924,7 @@ pass_linear_scan(struct nv_pc_pass *ctx, int iter)
- reg_occupy(&f, val);
-
- if (cur->reg.id < 0) {
-- boolean mem = FALSE;
--
-- if (nv_is_vector_op(cur->insn->opcode))
-- mem = !reg_assign(&f, &cur->insn->def[0], 4);
-- else
-- if (iter)
-- mem = !reg_assign(&f, &cur, 1);
-+ boolean mem = !reg_assign(&f, &cur, 1);
-
- if (mem) {
- NOUVEAU_ERR("out of registers\n");
-@@ -874,6 +938,67 @@ pass_linear_scan(struct nv_pc_pass *ctx, int iter)
- return 0;
- }
-
-+/* Allocate values defined by instructions such as TEX, which have to be
-+ * assigned to consecutive registers.
-+ * Linear scan doesn't really work here since the values can have different
-+ * live intervals.
-+ */
-+static int
-+pass_allocate_constrained_values(struct nv_pc_pass *ctx)
-+{
-+ struct nv_value regvals, *val;
-+ struct nv_instruction *i;
-+ struct nv_value *defs[4];
-+ struct register_set regs[4];
-+ int n, vsize, c;
-+ uint32_t mask;
-+ boolean mem;
-+
-+ collect_register_values(ctx, &regvals, TRUE);
-+
-+ for (n = 0; n < ctx->num_insns; ++n) {
-+ i = ctx->insns[n];
-+ vsize = nvi_vector_size(i);
-+ if (!(vsize > 1))
-+ continue;
-+ assert(vsize <= 4);
-+ for (c = 0; c < vsize; ++c)
-+ defs[c] = i->def[c]->join;
-+
-+ if (defs[0]->reg.id >= 0) {
-+ for (c = 1; c < vsize; ++c)
-+ assert(defs[c]->reg.id >= 0);
-+ continue;
-+ }
-+
-+ for (c = 0; c < vsize; ++c) {
-+ nv50_ctor_register_set(ctx->pc, &regs[c]);
-+
-+ foreach(val, &regvals) {
-+ if (val->reg.id >= 0 && livei_have_overlap(val, defs[c]))
-+ reg_occupy(&regs[c], val);
-+ }
-+ mask = 0x11111111;
-+ if (vsize == 2) /* granularity is 2 and not 4 */
-+ mask |= 0x11111111 << 2;
-+ mask_register_set(&regs[c], 0, mask << c);
-+
-+ if (defs[c]->livei)
-+ insert_ordered_tail(&regvals, defs[c]);
-+ }
-+ for (c = 1; c < vsize; ++c)
-+ intersect_register_sets(&regs[0], &regs[0], &regs[c]);
-+
-+ mem = !reg_assign(&regs[0], &defs[0], vsize);
-+
-+ if (mem) {
-+ NOUVEAU_ERR("out of registers\n");
-+ abort();
-+ }
-+ }
-+ return 0;
-+}
-+
- static int
- nv_pc_pass1(struct nv_pc *pc, struct nv_basic_block *root)
- {
-@@ -923,16 +1048,16 @@ nv_pc_pass1(struct nv_pc *pc, struct nv_basic_block *root)
- livei_print(&pc->values[i]);
- #endif
-
-- ret = pass_join_values(ctx, 0);
-+ ret = pass_join_values(ctx, JOIN_MASK_PHI);
- if (ret)
- goto out;
-- ret = pass_linear_scan(ctx, 0);
-+ ret = pass_join_values(ctx, JOIN_MASK_SELECT | JOIN_MASK_TEX);
- if (ret)
- goto out;
-- ret = pass_join_values(ctx, 1);
-+ ret = pass_join_values(ctx, JOIN_MASK_MOV);
- if (ret)
- goto out;
-- ret = pass_join_values(ctx, 2);
-+ ret = pass_allocate_constrained_values(ctx);
- if (ret)
- goto out;
- ret = pass_linear_scan(ctx, 1);
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/mesa/nouveau-fix-header.patch b/extra/mesa/nouveau-fix-header.patch
deleted file mode 100644
index 38aa996f1..000000000
--- a/extra/mesa/nouveau-fix-header.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 5c102dd94f435e97507213fbd128e50dd15f5f54 Mon Sep 17 00:00:00 2001
-From: Ben Skeggs <bskeggs@redhat.com>
-Date: Mon, 20 Dec 2010 03:39:36 +0000
-Subject: nouveau: fix includes for latest libdrm
-
-Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
----
-diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
-index ab480ca..747b084 100644
---- a/src/gallium/drivers/nouveau/nouveau_winsys.h
-+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
-@@ -10,7 +10,7 @@
- #include "nouveau/nouveau_grobj.h"
- #include "nouveau/nouveau_notifier.h"
- #include "nouveau/nouveau_resource.h"
--#include "nouveau/nouveau_pushbuf.h"
-+#include "nouveau/nv04_pushbuf.h"
-
- #ifndef NV04_PFIFO_MAX_PACKET_LEN
- #define NV04_PFIFO_MAX_PACKET_LEN 2047
-diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c
-index ce48022..a99df76 100644
---- a/src/gallium/drivers/nv50/nv50_surface.c
-+++ b/src/gallium/drivers/nv50/nv50_surface.c
-@@ -22,7 +22,7 @@
-
- #define __NOUVEAU_PUSH_H__
- #include <stdint.h>
--#include "nouveau/nouveau_pushbuf.h"
-+#include "nouveau/nv04_pushbuf.h"
- #include "nv50_context.h"
- #include "nv50_resource.h"
- #include "pipe/p_defines.h"
-diff --git a/src/gallium/drivers/nvfx/nv04_2d.c b/src/gallium/drivers/nvfx/nv04_2d.c
-index e0e65e7..e2fadd3 100644
---- a/src/gallium/drivers/nvfx/nv04_2d.c
-+++ b/src/gallium/drivers/nvfx/nv04_2d.c
-@@ -34,11 +34,11 @@
- #include <stdio.h>
- #include <stdint.h>
- #include <nouveau/nouveau_device.h>
--#include <nouveau/nouveau_pushbuf.h>
- #include <nouveau/nouveau_channel.h>
- #include <nouveau/nouveau_bo.h>
- #include <nouveau/nouveau_notifier.h>
- #include <nouveau/nouveau_grobj.h>
-+#include <nouveau/nv04_pushbuf.h>
- #include "nv04_2d.h"
-
- #include "nouveau/nv_object.xml.h"
-diff --git a/src/gallium/drivers/nvfx/nvfx_vbo.c b/src/gallium/drivers/nvfx/nvfx_vbo.c
-index 597664e..339b317 100644
---- a/src/gallium/drivers/nvfx/nvfx_vbo.c
-+++ b/src/gallium/drivers/nvfx/nvfx_vbo.c
-@@ -9,8 +9,7 @@
- #include "nvfx_resource.h"
-
- #include "nouveau/nouveau_channel.h"
--
--#include "nouveau/nouveau_pushbuf.h"
-+#include "nouveau/nv04_pushbuf.h"
-
- static inline unsigned
- util_guess_unique_indices_count(unsigned mode, unsigned indices)
-diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
-index 8036b18..c5ac128 100644
---- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
-+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
-@@ -38,7 +38,6 @@
- #include <assert.h>
-
- #include "nouveau_device.h"
--#include "nouveau_pushbuf.h"
- #include "nouveau_grobj.h"
- #include "nouveau_channel.h"
- #include "nouveau_bo.h"
-@@ -46,6 +45,7 @@
- #include "nouveau_screen.h"
- #include "nouveau_state.h"
- #include "nouveau_surface.h"
-+#include "nv04_pushbuf.h"
-
- #define DRIVER_DATE "20091015"
- #define DRIVER_AUTHOR "Nouveau"
---
-cgit v0.8.3-6-g21f6
diff --git a/extra/raptor/Allow-instead-of-in-TRiG.patch b/extra/raptor/Allow-instead-of-in-TRiG.patch
deleted file mode 100644
index 21639f600..000000000
--- a/extra/raptor/Allow-instead-of-in-TRiG.patch
+++ /dev/null
@@ -1,550 +0,0 @@
-diff -ur ../../raptor2-2.0.3/src/turtle_lexer.c ./src/turtle_lexer.c
---- ../../raptor2-2.0.3/src/turtle_lexer.c 2011-05-31 21:14:41.000000000 +0200
-+++ ./src/turtle_lexer.c 2011-07-12 15:31:39.620638699 +0200
-@@ -62,6 +62,7 @@
- typedef unsigned char flex_uint8_t;
- typedef unsigned short int flex_uint16_t;
- typedef unsigned int flex_uint32_t;
-+#endif /* ! C99 */
-
- /* Limits of integral types. */
- #ifndef INT8_MIN
-@@ -92,8 +93,6 @@
- #define UINT32_MAX (4294967295U)
- #endif
-
--#endif /* ! C99 */
--
- #endif /* ! FLEXINT_H */
-
- #ifdef __cplusplus
-@@ -167,15 +166,7 @@
-
- /* Size of default input buffer. */
- #ifndef YY_BUF_SIZE
--#ifdef __ia64__
--/* On IA-64, the buffer size is 16k, not 8k.
-- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
-- * Ditto for the __ia64__ case accordingly.
-- */
--#define YY_BUF_SIZE 32768
--#else
- #define YY_BUF_SIZE 16384
--#endif /* __ia64__ */
- #endif
-
- /* The state buf must be large enough to hold one state per character in the main buffer.
-@@ -371,7 +362,7 @@
- flex_int32_t yy_verify;
- flex_int32_t yy_nxt;
- };
--static yyconst flex_int16_t yy_accept[114] =
-+static yyconst flex_int16_t yy_accept[112] =
- { 0,
- 0, 0, 0, 0, 22, 22, 41, 39, 2, 1,
- 1, 39, 38, 13, 14, 39, 5, 4, 28, 25,
-@@ -384,8 +375,8 @@
- 26, 0, 0, 27, 0, 25, 0, 0, 33, 0,
- 0, 24, 36, 36, 21, 0, 27, 0, 27, 0,
-
-- 0, 0, 0, 24, 36, 17, 0, 10, 0, 18,
-- 0, 9, 0
-+ 0, 0, 24, 36, 17, 10, 0, 18, 0, 9,
-+ 0
- } ;
-
- static yyconst flex_int32_t yy_ec[256] =
-@@ -396,154 +387,157 @@
- 1, 2, 1, 5, 6, 1, 1, 1, 1, 7,
- 8, 1, 9, 10, 11, 12, 1, 13, 13, 13,
- 13, 13, 13, 13, 13, 13, 13, 14, 15, 16,
-- 1, 17, 1, 18, 19, 19, 19, 19, 20, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-- 21, 22, 23, 24, 25, 1, 26, 27, 19, 19,
--
-- 28, 29, 19, 19, 30, 19, 19, 31, 19, 19,
-- 19, 32, 19, 33, 34, 35, 36, 19, 19, 37,
-- 19, 19, 38, 1, 39, 1, 1, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
--
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
-- 40, 40, 40, 40, 40
-+ 17, 18, 1, 19, 20, 20, 20, 20, 21, 20,
-+ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-+ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-+ 22, 23, 24, 25, 26, 1, 27, 28, 20, 20,
-+
-+ 29, 30, 20, 20, 31, 20, 20, 32, 20, 20,
-+ 20, 33, 20, 34, 35, 36, 37, 20, 20, 38,
-+ 20, 20, 39, 1, 40, 1, 1, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-+ 41, 41, 41, 41, 41
- } ;
-
--static yyconst flex_int32_t yy_meta[41] =
-+static yyconst flex_int32_t yy_meta[42] =
- { 0,
- 1, 2, 3, 4, 5, 1, 1, 1, 1, 1,
-- 6, 1, 6, 7, 1, 1, 1, 1, 8, 8,
-- 1, 8, 1, 1, 8, 8, 8, 8, 8, 8,
-- 8, 8, 8, 8, 8, 8, 8, 2, 1, 8
-+ 6, 1, 6, 7, 1, 1, 2, 1, 1, 8,
-+ 8, 1, 8, 1, 1, 8, 8, 8, 8, 8,
-+ 8, 8, 8, 8, 8, 8, 8, 8, 2, 1,
-+ 8
- } ;
-
--static yyconst flex_int16_t yy_base[126] =
-+static yyconst flex_int16_t yy_base[124] =
- { 0,
-- 0, 0, 40, 0, 78, 79, 285, 299, 259, 299,
-- 257, 80, 83, 299, 299, 76, 299, 246, 78, 90,
-- 299, 227, 67, 81, 299, 229, 299, 207, 215, 83,
-- 93, 83, 299, 299, 299, 225, 299, 211, 105, 107,
-- 219, 108, 221, 299, 109, 217, 0, 114, 299, 218,
-- 207, 112, 117, 121, 133, 133, 208, 136, 299, 201,
-- 149, 191, 183, 189, 151, 200, 299, 0, 117, 86,
-- 211, 198, 299, 153, 154, 155, 206, 299, 299, 153,
-- 157, 169, 197, 196, 165, 170, 188, 196, 299, 172,
-- 177, 0, 135, 153, 299, 191, 188, 187, 186, 190,
--
-- 192, 170, 154, 0, 160, 133, 194, 299, 125, 100,
-- 83, 299, 299, 232, 240, 248, 255, 263, 266, 269,
-- 272, 280, 287, 88, 290
-+ 0, 0, 41, 0, 80, 81, 262, 301, 259, 301,
-+ 243, 82, 85, 301, 301, 78, 301, 232, 80, 93,
-+ 301, 215, 66, 83, 301, 217, 301, 205, 215, 84,
-+ 88, 85, 301, 301, 301, 226, 301, 212, 97, 105,
-+ 220, 111, 222, 301, 108, 218, 0, 114, 301, 219,
-+ 208, 109, 113, 114, 128, 142, 144, 146, 301, 202,
-+ 148, 192, 184, 190, 150, 202, 301, 0, 128, 96,
-+ 212, 199, 301, 133, 151, 159, 207, 301, 301, 157,
-+ 148, 162, 198, 197, 155, 176, 188, 193, 301, 174,
-+ 179, 0, 145, 155, 301, 194, 193, 191, 190, 195,
-+
-+ 173, 171, 0, 159, 173, 301, 168, 165, 138, 301,
-+ 301, 234, 242, 250, 257, 265, 268, 271, 274, 282,
-+ 289, 132, 292
- } ;
-
--static yyconst flex_int16_t yy_def[126] =
-+static yyconst flex_int16_t yy_def[124] =
- { 0,
-- 113, 1, 113, 3, 114, 114, 113, 113, 113, 113,
-- 113, 115, 116, 113, 113, 113, 113, 113, 113, 117,
-- 113, 118, 113, 119, 113, 120, 113, 113, 113, 119,
-- 119, 31, 113, 113, 113, 113, 113, 121, 122, 122,
-- 113, 122, 113, 113, 115, 113, 115, 116, 113, 113,
-- 113, 113, 113, 113, 113, 113, 113, 123, 113, 118,
-- 113, 113, 113, 31, 117, 120, 113, 124, 31, 31,
-- 113, 121, 113, 122, 122, 122, 113, 113, 113, 113,
-- 113, 113, 113, 113, 113, 123, 113, 113, 113, 113,
-- 113, 125, 31, 31, 113, 113, 113, 113, 113, 113,
--
-- 113, 113, 113, 125, 31, 31, 113, 113, 113, 31,
-- 113, 113, 0, 113, 113, 113, 113, 113, 113, 113,
-- 113, 113, 113, 113, 113
-+ 111, 1, 111, 3, 112, 112, 111, 111, 111, 111,
-+ 111, 113, 114, 111, 111, 111, 111, 111, 111, 115,
-+ 111, 116, 111, 117, 111, 118, 111, 111, 111, 117,
-+ 117, 31, 111, 111, 111, 111, 111, 119, 120, 120,
-+ 111, 120, 111, 111, 113, 111, 113, 114, 111, 111,
-+ 111, 111, 111, 111, 111, 111, 111, 121, 111, 116,
-+ 111, 111, 111, 31, 115, 118, 111, 122, 31, 31,
-+ 111, 119, 111, 120, 120, 120, 111, 111, 111, 111,
-+ 111, 111, 111, 111, 111, 121, 111, 111, 111, 111,
-+ 111, 123, 31, 31, 111, 111, 111, 111, 111, 111,
-+
-+ 111, 111, 123, 31, 31, 111, 111, 31, 111, 111,
-+ 0, 111, 111, 111, 111, 111, 111, 111, 111, 111,
-+ 111, 111, 111
- } ;
-
--static yyconst flex_int16_t yy_nxt[340] =
-+static yyconst flex_int16_t yy_nxt[343] =
- { 0,
- 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
-- 16, 18, 19, 20, 21, 22, 8, 23, 24, 24,
-- 25, 26, 27, 28, 29, 30, 24, 24, 31, 24,
-- 24, 24, 24, 24, 32, 24, 24, 33, 34, 26,
-- 35, 36, 35, 35, 35, 35, 35, 35, 35, 35,
-- 35, 35, 35, 37, 35, 35, 35, 35, 38, 38,
-- 35, 38, 35, 35, 35, 38, 38, 38, 38, 38,
-- 38, 38, 38, 38, 38, 38, 38, 35, 35, 38,
-- 40, 40, 41, 41, 46, 49, 50, 51, 52, 54,
-- 52, 56, 56, 62, 65, 92, 65, 55, 63, 42,
--
-- 42, 47, 66, 57, 66, 55, 65, 75, 64, 75,
-- 113, 64, 74, 78, 66, 70, 49, 50, 69, 112,
-- 66, 94, 66, 54, 52, 64, 76, 59, 76, 53,
-- 47, 55, 66, 81, 56, 56, 80, 56, 56, 55,
-- 82, 83, 64, 83, 80, 84, 57, 93, 82, 57,
-- 87, 87, 56, 56, 111, 75, 75, 113, 64, 74,
-- 64, 96, 88, 96, 57, 97, 100, 100, 105, 81,
-- 59, 56, 56, 59, 76, 76, 82, 98, 64, 98,
-- 106, 99, 109, 57, 82, 64, 89, 110, 59, 87,
-- 87, 100, 100, 107, 107, 107, 107, 108, 99, 99,
--
-- 97, 88, 59, 97, 103, 102, 101, 59, 84, 84,
-- 95, 73, 71, 65, 64, 91, 90, 61, 85, 53,
-- 49, 79, 43, 77, 73, 89, 71, 59, 68, 89,
-- 67, 89, 39, 39, 39, 39, 39, 39, 39, 39,
-- 45, 45, 65, 61, 45, 45, 45, 45, 48, 48,
-- 48, 48, 48, 48, 48, 48, 58, 58, 53, 44,
-- 43, 58, 58, 60, 60, 60, 60, 60, 60, 60,
-- 60, 64, 64, 64, 66, 66, 66, 72, 72, 72,
-- 74, 74, 74, 74, 113, 74, 74, 74, 86, 86,
-- 113, 113, 86, 86, 86, 104, 113, 104, 7, 113,
--
-- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
-- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
-- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
-- 113, 113, 113, 113, 113, 113, 113, 113, 113
-+ 16, 18, 19, 20, 21, 22, 8, 8, 23, 24,
-+ 24, 25, 26, 27, 28, 29, 30, 24, 24, 31,
-+ 24, 24, 24, 24, 24, 32, 24, 24, 33, 34,
-+ 26, 35, 36, 35, 35, 35, 35, 35, 35, 35,
-+ 35, 35, 35, 35, 37, 35, 35, 35, 35, 35,
-+ 38, 38, 35, 38, 35, 35, 35, 38, 38, 38,
-+ 38, 38, 38, 38, 38, 38, 38, 38, 38, 35,
-+ 35, 38, 40, 40, 41, 41, 46, 49, 50, 51,
-+ 52, 54, 52, 62, 56, 56, 65, 65, 63, 75,
-+
-+ 55, 65, 42, 42, 47, 66, 66, 75, 55, 57,
-+ 66, 64, 78, 111, 69, 74, 49, 50, 70, 76,
-+ 54, 52, 64, 66, 66, 53, 81, 76, 66, 55,
-+ 47, 59, 94, 80, 82, 75, 83, 55, 83, 92,
-+ 84, 80, 82, 56, 56, 85, 85, 56, 56, 87,
-+ 87, 56, 56, 75, 64, 76, 85, 85, 57, 93,
-+ 81, 111, 57, 74, 88, 96, 57, 96, 82, 97,
-+ 98, 64, 98, 76, 99, 110, 82, 56, 56, 104,
-+ 59, 64, 59, 105, 59, 64, 89, 108, 59, 87,
-+ 87, 64, 57, 59, 100, 100, 100, 100, 109, 64,
-+
-+ 107, 106, 99, 99, 88, 97, 97, 102, 101, 84,
-+ 84, 95, 73, 71, 59, 65, 64, 91, 90, 61,
-+ 53, 49, 79, 43, 77, 73, 89, 71, 68, 67,
-+ 65, 89, 61, 89, 39, 39, 39, 39, 39, 39,
-+ 39, 39, 45, 45, 53, 44, 45, 45, 45, 45,
-+ 48, 48, 48, 48, 48, 48, 48, 48, 58, 58,
-+ 43, 111, 111, 111, 58, 60, 60, 60, 60, 60,
-+ 60, 60, 60, 64, 64, 64, 66, 66, 66, 72,
-+ 72, 72, 74, 74, 74, 74, 111, 74, 74, 74,
-+ 86, 86, 111, 111, 86, 111, 86, 103, 111, 103,
-+
-+ 7, 111, 111, 111, 111, 111, 111, 111, 111, 111,
-+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
-+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
-+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
-+ 111, 111
- } ;
-
--static yyconst flex_int16_t yy_chk[340] =
-+static yyconst flex_int16_t yy_chk[343] =
- { 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-+ 1, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-- 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-- 5, 6, 5, 6, 12, 13, 13, 16, 16, 19,
-- 19, 20, 20, 23, 24, 124, 30, 19, 23, 5,
-+ 3, 3, 5, 6, 5, 6, 12, 13, 13, 16,
-+ 16, 19, 19, 23, 20, 20, 24, 30, 23, 39,
-
-- 6, 12, 24, 20, 30, 19, 31, 39, 32, 40,
-- 42, 70, 42, 45, 31, 32, 48, 48, 31, 111,
-- 24, 70, 30, 52, 52, 110, 39, 20, 40, 53,
-- 45, 52, 31, 54, 56, 56, 53, 58, 58, 52,
-- 54, 55, 69, 55, 53, 55, 56, 69, 54, 58,
-- 61, 61, 65, 65, 109, 74, 75, 76, 106, 76,
-- 93, 80, 61, 80, 65, 80, 85, 85, 93, 81,
-- 56, 86, 86, 58, 74, 75, 81, 82, 94, 82,
-- 94, 82, 103, 86, 81, 105, 61, 105, 65, 87,
-- 87, 100, 100, 101, 101, 107, 107, 102, 99, 98,
--
-- 97, 87, 85, 96, 91, 90, 88, 86, 84, 83,
-- 77, 72, 71, 66, 64, 63, 62, 60, 57, 51,
-- 50, 46, 43, 41, 38, 87, 36, 100, 29, 101,
-- 28, 107, 114, 114, 114, 114, 114, 114, 114, 114,
-- 115, 115, 26, 22, 115, 115, 115, 115, 116, 116,
-- 116, 116, 116, 116, 116, 116, 117, 117, 18, 11,
-- 9, 117, 117, 118, 118, 118, 118, 118, 118, 118,
-- 118, 119, 119, 119, 120, 120, 120, 121, 121, 121,
-- 122, 122, 122, 122, 7, 122, 122, 122, 123, 123,
-- 0, 0, 123, 123, 123, 125, 0, 125, 113, 113,
--
-- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
-- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
-- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
-- 113, 113, 113, 113, 113, 113, 113, 113, 113
-+ 19, 31, 5, 6, 12, 24, 30, 40, 19, 20,
-+ 31, 32, 45, 42, 31, 42, 48, 48, 32, 39,
-+ 52, 52, 70, 24, 30, 53, 54, 40, 31, 52,
-+ 45, 20, 70, 53, 54, 74, 55, 52, 55, 122,
-+ 55, 53, 54, 56, 56, 57, 57, 58, 58, 61,
-+ 61, 65, 65, 75, 69, 74, 85, 85, 56, 69,
-+ 81, 76, 58, 76, 61, 80, 65, 80, 81, 80,
-+ 82, 93, 82, 75, 82, 109, 81, 86, 86, 93,
-+ 56, 94, 57, 94, 58, 104, 61, 104, 65, 87,
-+ 87, 108, 86, 85, 88, 88, 100, 100, 107, 105,
-+
-+ 102, 101, 99, 98, 87, 97, 96, 91, 90, 84,
-+ 83, 77, 72, 71, 86, 66, 64, 63, 62, 60,
-+ 51, 50, 46, 43, 41, 38, 87, 36, 29, 28,
-+ 26, 88, 22, 100, 112, 112, 112, 112, 112, 112,
-+ 112, 112, 113, 113, 18, 11, 113, 113, 113, 113,
-+ 114, 114, 114, 114, 114, 114, 114, 114, 115, 115,
-+ 9, 7, 0, 0, 115, 116, 116, 116, 116, 116,
-+ 116, 116, 116, 117, 117, 117, 118, 118, 118, 119,
-+ 119, 119, 120, 120, 120, 120, 0, 120, 120, 120,
-+ 121, 121, 0, 0, 121, 0, 121, 123, 0, 123,
-+
-+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
-+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
-+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
-+ 111, 111, 111, 111, 111, 111, 111, 111, 111, 111,
-+ 111, 111
- } ;
-
- /* The intent behind this definition is that it'll catch
-@@ -704,7 +698,7 @@
- */
- /* similar to SPARQL but no need for <= check here */
-
--#line 708 "turtle_lexer.c"
-+#line 702 "turtle_lexer.c"
-
- #define INITIAL 0
- #define PREF 1
-@@ -791,6 +785,10 @@
-
- void turtle_lexer_set_lineno (int line_number ,yyscan_t yyscanner );
-
-+int turtle_lexer_get_column (yyscan_t yyscanner );
-+
-+void turtle_lexer_set_column (int column_no ,yyscan_t yyscanner );
-+
- /* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-@@ -823,12 +821,7 @@
-
- /* Amount of stuff to slurp up with each read. */
- #ifndef YY_READ_BUF_SIZE
--#ifdef __ia64__
--/* On IA-64, the buffer size is 16k, not 8k */
--#define YY_READ_BUF_SIZE 16384
--#else
- #define YY_READ_BUF_SIZE 8192
--#endif /* __ia64__ */
- #endif
-
- /* Copy whatever the last rule matched to the standard output. */
-@@ -847,7 +840,7 @@
- if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
- { \
- int c = '*'; \
-- size_t n; \
-+ unsigned n; \
- for ( n = 0; n < max_size && \
- (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
- buf[n] = (char) c; \
-@@ -945,7 +938,7 @@
-
-
-
--#line 949 "turtle_lexer.c"
-+#line 942 "turtle_lexer.c"
-
- if ( !yyg->yy_init )
- {
-@@ -998,13 +991,13 @@
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
-- if ( yy_current_state >= 114 )
-+ if ( yy_current_state >= 112 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- ++yy_cp;
- }
-- while ( yy_current_state != 113 );
-+ while ( yy_current_state != 111 );
- yy_cp = yyg->yy_last_accepting_cpos;
- yy_current_state = yyg->yy_last_accepting_state;
-
-@@ -1321,7 +1314,7 @@
- while(1) {
- int c = yytext[yyleng - 1];
- if(c == '{' || c == ' ' || c=='\t' || c == '\v' || c == '\n' ||
-- c == ':' || c == '-') {
-+ c == '=') {
- yyleng--;
- } else
- break;
-@@ -1398,7 +1391,7 @@
- #line 439 "./turtle_lexer.l"
- YY_FATAL_ERROR( "flex scanner jammed" );
- YY_BREAK
--#line 1402 "turtle_lexer.c"
-+#line 1395 "turtle_lexer.c"
- case YY_STATE_EOF(INITIAL):
- case YY_STATE_EOF(PREF):
- yyterminate();
-@@ -1694,7 +1687,7 @@
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
-- if ( yy_current_state >= 114 )
-+ if ( yy_current_state >= 112 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-@@ -1723,11 +1716,11 @@
- while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- {
- yy_current_state = (int) yy_def[yy_current_state];
-- if ( yy_current_state >= 114 )
-+ if ( yy_current_state >= 112 )
- yy_c = yy_meta[(unsigned int) yy_c];
- }
- yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-- yy_is_jam = (yy_current_state == 113);
-+ yy_is_jam = (yy_current_state == 111);
-
- return yy_is_jam ? 0 : yy_current_state;
- }
-@@ -2130,8 +2123,8 @@
-
- /** Setup the input buffer state to scan the given bytes. The next call to turtle_lexer_lex() will
- * scan from a @e copy of @a bytes.
-- * @param yybytes the byte buffer to scan
-- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
-+ * @param bytes the byte buffer to scan
-+ * @param len the number of bytes in the buffer pointed to by @a bytes.
- * @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
- */
-diff -ur ../../raptor2-2.0.3/src/turtle_lexer.h ./src/turtle_lexer.h
---- ../../raptor2-2.0.3/src/turtle_lexer.h 2011-05-31 21:14:41.000000000 +0200
-+++ ./src/turtle_lexer.h 2011-07-12 15:31:39.600648777 +0200
-@@ -58,6 +58,7 @@
- typedef unsigned char flex_uint8_t;
- typedef unsigned short int flex_uint16_t;
- typedef unsigned int flex_uint32_t;
-+#endif /* ! C99 */
-
- /* Limits of integral types. */
- #ifndef INT8_MIN
-@@ -88,8 +89,6 @@
- #define UINT32_MAX (4294967295U)
- #endif
-
--#endif /* ! C99 */
--
- #endif /* ! FLEXINT_H */
-
- #ifdef __cplusplus
-@@ -132,15 +131,7 @@
-
- /* Size of default input buffer. */
- #ifndef YY_BUF_SIZE
--#ifdef __ia64__
--/* On IA-64, the buffer size is 16k, not 8k.
-- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
-- * Ditto for the __ia64__ case accordingly.
-- */
--#define YY_BUF_SIZE 32768
--#else
- #define YY_BUF_SIZE 16384
--#endif /* __ia64__ */
- #endif
-
- #ifndef YY_TYPEDEF_YY_BUFFER_STATE
-@@ -274,6 +265,10 @@
-
- void turtle_lexer_set_lineno (int line_number ,yyscan_t yyscanner );
-
-+int turtle_lexer_get_column (yyscan_t yyscanner );
-+
-+void turtle_lexer_set_column (int column_no ,yyscan_t yyscanner );
-+
- /* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-@@ -300,12 +295,7 @@
-
- /* Amount of stuff to slurp up with each read. */
- #ifndef YY_READ_BUF_SIZE
--#ifdef __ia64__
--/* On IA-64, the buffer size is 16k, not 8k */
--#define YY_READ_BUF_SIZE 16384
--#else
- #define YY_READ_BUF_SIZE 8192
--#endif /* __ia64__ */
- #endif
-
- /* Number of entries by which start-condition stack grows. */
-@@ -341,6 +331,6 @@
- #line 439 "./turtle_lexer.l"
-
-
--#line 345 "turtle_lexer.h"
-+#line 335 "turtle_lexer.h"
- #undef turtle_lexer_IN_HEADER
- #endif /* turtle_lexer_HEADER_H */
-diff -ur ../../raptor2-2.0.3/src/turtle_lexer.l ./src/turtle_lexer.l
---- ../../raptor2-2.0.3/src/turtle_lexer.l 2011-05-31 21:14:36.000000000 +0200
-+++ ./src/turtle_lexer.l 2011-07-12 15:28:58.911660781 +0200
-@@ -345,7 +345,7 @@
- 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 @@
- 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; \ No newline at end of file
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-27 15:08:50 +0000