Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apvlv/PKGBUILD
	community/i3-wm/PKGBUILD
	community/jack2/PKGBUILD
	community/perl-list-moreutils/PKGBUILD
	community/qc-usb-messenger/PKGBUILD
	community/sword/PKGBUILD
	community/virtualbox/PKGBUILD
	community/vuze/PKGBUILD
	extra/archboot/PKGBUILD
	extra/ardour/PKGBUILD
	extra/boost/PKGBUILD
	extra/digikam/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdebase-runtime/PKGBUILD
	extra/kdebindings-kimono/PKGBUILD
	extra/kdebindings-korundum/PKGBUILD
	extra/kdebindings-kross/PKGBUILD
	extra/kdebindings-perlkde/PKGBUILD
	extra/kdebindings-perlqt/PKGBUILD
	extra/kdebindings-python/PKGBUILD
	extra/kdebindings-qtruby/PKGBUILD
	extra/kdebindings-qyoto/PKGBUILD
	extra/kdebindings-smokegen/PKGBUILD
	extra/kdebindings-smokekde/PKGBUILD
	extra/kdebindings-smokeqt/PKGBUILD
	extra/kdebindings/PKGBUILD
	extra/kdeedu-blinken/PKGBUILD
	extra/kdeedu-blinken/kdeedu-blinken.install
	extra/kdeedu-cantor/PKGBUILD
	extra/kdeedu-cantor/kdeedu-cantor.install
	extra/kdeedu-kalgebra/PKGBUILD
	extra/kdeedu-kalgebra/kdeedu-kalgebra.install
	extra/kdeedu-kalzium/PKGBUILD
	extra/kdeedu-kalzium/kdeedu-kalzium.install
	extra/kdeedu-kanagram/PKGBUILD
	extra/kdeedu-kanagram/kdeedu-kanagram.install
	extra/kdeedu-kbruch/PKGBUILD
	extra/kdeedu-kbruch/kdeedu-kbruch.install
	extra/kdeedu-kgeography/PKGBUILD
	extra/kdeedu-kgeography/kdeedu-kgeography.install
	extra/kdeedu-khangman/PKGBUILD
	extra/kdeedu-khangman/kdeedu-khangman.install
	extra/kdeedu-kig/PKGBUILD
	extra/kdeedu-kig/kdeedu-kig.install
	extra/kdeedu-kiten/PKGBUILD
	extra/kdeedu-kiten/kdeedu-kiten.install
	extra/kdeedu-klettres/PKGBUILD
	extra/kdeedu-klettres/kdeedu-klettres.install
	extra/kdeedu-kmplot/PKGBUILD
	extra/kdeedu-kmplot/kdeedu-kmplot.install
	extra/kdeedu-kstars/PKGBUILD
	extra/kdeedu-kstars/kdeedu-kstars.install
	extra/kdeedu-ktouch/PKGBUILD
	extra/kdeedu-ktouch/kdeedu-ktouch.install
	extra/kdeedu-kturtle/PKGBUILD
	extra/kdeedu-kturtle/kdeedu-kturtle.install
	extra/kdeedu-kwordquiz/PKGBUILD
	extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
	extra/kdeedu-marble/PKGBUILD
	extra/kdeedu-marble/gpsd-2.96.patch
	extra/kdeedu-marble/kdeedu-marble.install
	extra/kdeedu-parley/PKGBUILD
	extra/kdeedu-parley/kdeedu-parley.install
	extra/kdeedu-rocs/PKGBUILD
	extra/kdeedu-step/PKGBUILD
	extra/kdeedu-step/kdeedu-step.install
	extra/kdegraphics-gwenview/PKGBUILD
	extra/kdegraphics-gwenview/kdegraphics-gwenview.install
	extra/kdegraphics-kamera/PKGBUILD
	extra/kdegraphics-kcolorchooser/PKGBUILD
	extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
	extra/kdegraphics-kgamma/PKGBUILD
	extra/kdegraphics-kolourpaint/PKGBUILD
	extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
	extra/kdegraphics-kruler/PKGBUILD
	extra/kdegraphics-kruler/kdegraphics-kruler.install
	extra/kdegraphics-ksaneplugin/PKGBUILD
	extra/kdegraphics-ksnapshot/PKGBUILD
	extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
	extra/kdegraphics-okular/PKGBUILD
	extra/kdegraphics-okular/kdegraphics-okular.install
	extra/kdegraphics-strigi-analyzer/PKGBUILD
	extra/kdegraphics-svgpart/PKGBUILD
	extra/kdegraphics-thumbnailers/PKGBUILD
	extra/kdegraphics/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk-kate/kdebase-kwrite.install
	extra/kdesdk-kate/kdesdk-kate.install
	extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
	extra/kdeutils/PKGBUILD
	extra/kipi-plugins/PKGBUILD
	extra/koffice/PKGBUILD
	extra/konq-plugins/PKGBUILD
	extra/libkdcraw/PKGBUILD
	extra/libkdcraw/libkdcraw.install
	extra/libkdeedu/PKGBUILD
	extra/libkdeedu/libkdeedu.install
	extra/libkexiv2/PKGBUILD
	extra/libkipi/PKGBUILD
	extra/libkipi/libkipi.install
	extra/libksane/PKGBUILD
	extra/libksane/libksane.install
	extra/liblrdf/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mysql/PKGBUILD
	extra/partitionmanager/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/samba/PKGBUILD
	extra/sbcl/PKGBUILD
	extra/texlive-bin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libsndfile/PKGBUILD
	testing/mesa/PKGBUILD
	~fauno/notmuch/PKGBUILD

2 files changed, 204 insertions, 7 deletions

diff --git a/extra/liblrdf/PKGBUILD b/extra/liblrdf/PKGBUILD
index 0bd976da0..0059600cb 100644
--- a/extra/liblrdf/PKGBUILD
+++ b/extra/liblrdf/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 110602 2011-02-20 15:55:20Z andyrtr $
+# $Id: PKGBUILD 130976 2011-07-09 09:47:10Z andyrtr $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=liblrdf
 pkgver=0.4.0
-pkgrel=7
+pkgrel=8
 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/lrdf"
-depends=('raptor1' 'ladspa')
+url="http://sourceforge.net/projects/lrdf" #"http://sourceforge.net/projects/lrdf"
+depends=('raptor' 'ladspa')
 makedepends=('pkgconfig')
 license=('GPL')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/lrdf/${pkgname}-${pkgver}.tar.gz
-	md5.patch)
+	md5.patch
+	raptor2.diff)
 groups=('ladspa-plugins')
 md5sums=('327a5674f671c4b360c6353800226877'
-         'a6d231d052dc188cbc4c1039cf3a2003')
+         'a6d231d052dc188cbc4c1039cf3a2003'
+         '80e938469da06a178e03107ca5b41e55')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/md5.patch"
+  patch -Np1 -i ${srcdir}/md5.patch
+  patch -Np0 -i ${srcdir}/raptor2.diff
+  autoreconf -vfi
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/liblrdf/raptor2.diff b/extra/liblrdf/raptor2.diff
new file mode 100644
index 000000000..77f1ad0e3
--- /dev/null
+++ b/extra/liblrdf/raptor2.diff
@@ -0,0 +1,193 @@
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -4,5 +4,5 @@ lib_LTLIBRARIES = liblrdf.la
+ noinst_HEADERS = lrdf_md5.h md5_loc.h ladspa.h
+ 
+ liblrdf_la_SOURCES = lrdf.c lrdf_multi.c md5.c
+-liblrdf_la_LIBADD = -lraptor
++liblrdf_la_LIBADD = -lraptor2
+ liblrdf_la_LDFLAGS = -version-info @LRDF_LIBTOOL_VERSION@
+--- src/lrdf.c
++++ src/lrdf.c
+@@ -18,6 +18,7 @@
+ static unsigned int lrdf_uid = 0;	/* A unique(ish) id to append to genid's to
+ 					 * avoid clashses */
+ 
++static raptor_world *world = NULL;
+ static lrdf_statement *triples = NULL;
+ static lrdf_statement *free_triples;
+ static lrdf_string_hash *resources_hash[LRDF_HASH_SIZE];
+@@ -43,8 +44,7 @@ static void lrdf_remove_triple_hash(lrdf_triple_hash ** tbl,
+ 				    lrdf_hash hash, lrdf_statement * s);
+ static void lrdf_add_closure_hash(lrdf_closure_hash ** tbl,
+ 				  lrdf_hash subject, lrdf_hash object);
+-static void lrdf_store(void *user_data,
+-		       const raptor_statement * statement);
++static void lrdf_store(void *user_data, raptor_statement * statement);
+ void lrdf_free_statements(lrdf_statement * s);
+ void lrdf_copy_statement(lrdf_statement * from, lrdf_statement * to);
+ void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl,
+@@ -71,7 +71,7 @@ void lrdf_init()
+     unsigned int i;
+     struct timeval tv;
+ 
+-    raptor_init();
++    world = raptor_new_world();
+     lrdf_more_triples(256);
+ 
+     /* A UID to add to genids to make them safer */
+@@ -112,7 +112,8 @@ void lrdf_more_triples(int count)
+ 
+ void lrdf_cleanup()
+ {
+-    raptor_finish();
++    raptor_free_world(world);
++    world = NULL;
+ 
+     lrdf_free_string_hash(resources_hash);
+     lrdf_free_string_hash(literals_hash);
+@@ -232,26 +233,29 @@ void lrdf_remove_matches(lrdf_statement *pattern)
+     }
+ }
+ 
+-static void lrdf_store(void *user_data, const raptor_statement * statement)
++static const char *lrdf_term_as_string(char *tmp, int tmp_len,
++				       const raptor_term *term)
++{
++    switch (term->type) {
++    case RAPTOR_TERM_TYPE_URI:
++	return (const char *) raptor_uri_as_string(term->value.uri);
++    case RAPTOR_TERM_TYPE_LITERAL:
++	return (const char *) term->value.literal.string;
++    case RAPTOR_TERM_TYPE_BLANK:
++	snprintf(tmp, tmp_len, "_:%s.%x", term->value.blank.string, lrdf_uid);
++	return tmp;
++    default:
++	return "(?)";
++    }
++}
++
++static void lrdf_store(void *user_data, raptor_statement * statement)
+ {
+     lrdf_statement *s = lrdf_alloc_statement();
+     char tmps[128], tmpp[128], tmpo[128];
+-    char *subj = (char *) statement->subject,
+-	 *pred = (char *) statement->predicate,
+-	 *obj = (char *) statement->object;
+-
+-    if (statement->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+-	snprintf(tmps, 127, "_:%s.%x", subj, lrdf_uid);
+-	subj = tmps;
+-    }
+-    if (statement->predicate_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+-	snprintf(tmpp, 127, "_:%s.%x", pred, lrdf_uid);
+-	pred = tmpp;
+-    }
+-    if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+-	snprintf(tmpo, 127, "_:%s.%x", obj, lrdf_uid);
+-	obj = tmpo;
+-    }
++    const char *subj = lrdf_term_as_string(tmps, 128, statement->subject),
++	       *pred = lrdf_term_as_string(tmpp, 128, statement->predicate),
++	       *obj = lrdf_term_as_string(tmpo, 128, statement->object);
+ 
+     s->shash = lrdf_gen_hash(subj);
+     s->phash = lrdf_gen_hash(pred);
+@@ -261,7 +265,7 @@ static void lrdf_store(void *user_data, const raptor_statement * statement)
+ 
+     s->subject = lrdf_check_hash(resources_hash, s->shash, subj);
+     s->predicate = lrdf_check_hash(resources_hash, s->phash, pred);
+-    if (statement->object_type == RAPTOR_IDENTIFIER_TYPE_LITERAL) {
++    if (statement->object->type == RAPTOR_TERM_TYPE_LITERAL) {
+ 	s->object = lrdf_check_hash(literals_hash, s->ohash, obj);
+ 	s->object_type = lrdf_literal;
+     } else {
+@@ -537,28 +541,22 @@ void lrdf_rebuild_taxonomic_closure(lrdf_closure_hash ** fwd_tbl,
+     free(pathto);
+ }
+ 
+-static void lrdf_error_handler(void *data, raptor_locator * locator,
+-			       const char *message);
++static void lrdf_log_handler(void *data, raptor_log_message *message);
+ 
+-static void lrdf_error_handler(void *data, raptor_locator * locator,
+-			       const char *message)
++static void lrdf_log_handler(void *data, raptor_log_message *message)
+ {
+-    fprintf(stderr, "liblrdf: error - ");
+-    raptor_print_locator(stderr, locator);
+-    fprintf(stderr, " - %s\n", message);
+-
+-    raptor_parse_abort((raptor_parser*)data);
+-}
++    const char *severity = "error";
++    if (message->level == RAPTOR_LOG_LEVEL_WARN) {
++	severity = "warning";
++    }
+ 
+-static void lrdf_warning_handler(void *data, raptor_locator * locator,
+-				 const char *message);
++    fprintf(stderr, "liblrdf: %s - ", severity);
++    raptor_locator_print(message->locator, stderr);
++    fprintf(stderr, " - %s\n", message->text);
+ 
+-static void lrdf_warning_handler(void *data, raptor_locator * locator,
+-				 const char *message)
+-{
+-    fprintf(stderr, "liblrdf: warning - ");
+-    raptor_print_locator(stderr, locator);
+-    fprintf(stderr, " - %s\n", message);
++    if (message->level != RAPTOR_LOG_LEVEL_WARN) {
++	raptor_parser_parse_abort((raptor_parser*)data);
++    }
+ }
+ 
+ 
+@@ -593,15 +591,15 @@ int lrdf_read_file_intl(const char *uri)
+     lrdf_hash source;
+ 
+     //printf("lrdf: reading %s\n", uri);
+-    ruri = raptor_new_uri(uri);
+-    furi = raptor_new_uri(uri);
++    ruri = raptor_new_uri(world, (const unsigned char *) uri);
++    furi = raptor_new_uri(world, (const unsigned char *) uri);
+     source = lrdf_gen_hash(uri);
+     lrdf_check_hash(resources_hash, source, uri);
+ 
+     if (strstr(uri, ".rdf")) {
+-	parser = raptor_new_parser("rdfxml");
++	parser = raptor_new_parser(world, "rdfxml");
+     } else {
+-	parser = raptor_new_parser("ntriples");
++	parser = raptor_new_parser(world, "ntriples");
+     }
+     if (!parser) {
+ 	fprintf(stderr, "liblrdf: failed to create parser\n");
+@@ -609,12 +607,11 @@ int lrdf_read_file_intl(const char *uri)
+ 	return 1;
+     }
+ 
+-    raptor_set_error_handler(parser, parser, lrdf_error_handler);
+-    raptor_set_warning_handler(parser, NULL, lrdf_warning_handler);
+-    raptor_set_statement_handler(parser, &source, lrdf_store);
+-    raptor_set_default_generate_id_parameters(parser, NULL, ++lrdf_uid);
++    raptor_world_set_log_handler(world, parser, lrdf_log_handler);
++    raptor_parser_set_statement_handler(parser, &source, lrdf_store);
++    raptor_world_set_generate_bnodeid_parameters(world, NULL, ++lrdf_uid);
+ 
+-    if (raptor_parse_file(parser, furi, ruri)) {
++    if (raptor_parser_parse_file(parser, furi, ruri)) {
+ 	raptor_free_uri(furi);
+ 	raptor_free_uri(ruri);
+ 	raptor_free_parser(parser);
+--- configure.ac
++++ configure.ac
+@@ -18,7 +18,7 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([errno.h limits.h stdlib.h string.h unistd.h])
+ 
+-PKG_CHECK_MODULES(RAPTOR, raptor >= 0.9.11)
++PKG_CHECK_MODULES(RAPTOR, raptor2 >= 0.9.11)
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST