Mon Feb 10 03:32:23 UTC 2014

17 files changed, 452 insertions, 196 deletions

diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 172a62a08..9a9e76bb9 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 200761 2013-12-04 19:37:05Z jgc $
+# $Id: PKGBUILD 205605 2014-02-09 10:29:36Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
 pkgver=1.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64')
 url="http://apr.apache.org/"
-depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
+depends=('apr' 'gdbm' 'expat' 'libldap' 'unixodbc')
 license=('APACHE')
 source=(http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2{,.asc})
 md5sums=('6f3417691c7a27090f36e7cf4d94b36e'
@@ -17,8 +17,8 @@ md5sums=('6f3417691c7a27090f36e7cf4d94b36e'
 build() {
   cd "${srcdir}/apr-util-${pkgver}"
   ./configure --prefix=/usr --with-apr=/usr \
-    --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
-    --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
+    --with-ldap \
+    --with-gdbm=/usr
   make
 }
 
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index c00a0962e..293fb9a9c 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197903 2013-10-30 11:35:00Z allan $
+# $Id: PKGBUILD 205606 2014-02-09 10:29:38Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,13 +8,13 @@ pkgbase=('cyrus-sasl')
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.26
-pkgrel=6
+pkgrel=7
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags')
-makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite')
 source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.22-qa.patch
         cyrus-sasl-2.1.26-size_t.patch
@@ -26,7 +26,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         saslauthd.service
         saslauthd.conf.d
         tmpfiles.conf
-        CVE-2013-4122.patch)
+        CVE-2013-4122.patch
+        cyrus-sasl-sql.patch)
 md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '79b8a5e8689989e2afd4b7bda595a7b1'
          'f45aa8c42b32e0569ab3d14a83485b37'
@@ -38,7 +39,8 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
          '3499dcd610ad1ad58e0faffde2aa7a23'
          '49219af5641150edec288a3fdb65e7c1'
          '45bb0192d2f188066240b9a66ee6365f'
-         'c5f0ec88c584a75c14d7f402eaeed7ef')
+         'c5f0ec88c584a75c14d7f402eaeed7ef'
+         '82c0f66fdc5c1145eb48ea9116c27931')
 
 prepare() {
   cd cyrus-sasl-$pkgver
@@ -50,6 +52,7 @@ prepare() {
   patch -Np1 -i ../0026_drop_krb5support_dependency.patch
   patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
   patch -Np1 -i ../CVE-2013-4122.patch
+  patch -Np0 -i ../cyrus-sasl-sql.patch
 
   sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
 }
@@ -100,11 +103,15 @@ build() {
       --enable-ntlm \
       --disable-passdss \
       --enable-sql \
+      --with-mysql \
+      --with-pgsql=/usr/lib \
+      --with-sqlite3=/usr/lib \
       --enable-ldapdb \
       --disable-macos-framework \
       --with-pam \
       --with-saslauthd=/var/run/saslauthd \
       --with-ldap \
+      --with-dblib=gdbm \
       --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
       --sysconfdir=/etc \
       --with-devrandom=/dev/urandom
@@ -174,7 +181,7 @@ package_cyrus-sasl-ldap() {
 
 package_cyrus-sasl-sql() {
   pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
+  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite')
   replaces=('cyrus-sasl-plugins')
 
   cd cyrus-sasl-$pkgver/plugins
diff --git a/extra/cyrus-sasl/cyrus-sasl-sql.patch b/extra/cyrus-sasl/cyrus-sasl-sql.patch
new file mode 100644
index 000000000..2dcdad822
--- /dev/null
+++ b/extra/cyrus-sasl/cyrus-sasl-sql.patch
@@ -0,0 +1,39 @@
+--- configure.in	2012-10-12 16:05:48.000000000 +0200
++++ configure.in	2013-05-11 18:48:59.021848013 +0200
+@@ -861,9 +860,9 @@
+     notfound) AC_WARN([SQLite Library not found]); true;;
+     *)
+      if test -d ${with_sqlite}/lib; then
+-         LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++         LIB_SQLITE="-L${with_sqlite}/lib"
+      else
+-         LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++         LIB_SQLITE="-L${with_sqlite}"
+      fi
+ 
+      LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -913,9 +912,9 @@
+     notfound) AC_WARN([SQLite3 Library not found]); true;;
+     *)
+      if test -d ${with_sqlite3}/lib; then
+-         LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++         LIB_SQLITE3="-L${with_sqlite3}/lib"
+      else
+-         LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++         LIB_SQLITE3="-L${with_sqlite3}"
+      fi
+ 
+      LIB_SQLITE3_DIR=$LIB_SQLITE3
+--- configure.in
++++ configure.in
+@@ -674,7 +674,9 @@
+      LIB_PGSQL_DIR=$LIB_PGSQL
+      LIB_PGSQL="$LIB_PGSQL -lpq"
+ 
+-     if test -d ${with_pgsql}/include/pgsql; then
++     if test -d ${with_pgsql}/include/postgresql/pgsql; then
++         CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql/pgsql"
++     elif test -d ${with_pgsql}/include/pgsql; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql"
+      elif test -d ${with_pgsql}/pgsql/include; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD
index 1124eb914..53a7bde44 100644
--- a/extra/festival/PKGBUILD
+++ b/extra/festival/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 137968 2011-09-13 09:17:12Z eric $
+# $Id: PKGBUILD 205607 2014-02-09 10:29:39Z andyrtr $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Simo Leone <neotuli@gmail.com>
 
 pkgname=festival
 pkgver=2.1
-_suffix=release
-pkgrel=3
+pkgrel=4
 pkgdesc="A general multi-lingual speech synthesis system"
 arch=('i686' 'x86_64')
 url="http://www.cstr.ed.ac.uk/projects/festival/"
 license=('BSD' 'GPL' 'custom')
 depends=('perl')
 options=('!makeflags')
-source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-${_suffix}.tar.gz"
-        "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-${_suffix}.tar.gz"
-	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz"
-	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz"
-	"http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz"
-	'speechconfig.patch'
-	'festconfig.patch'
-	'festival-shared-build.patch')
+source=(http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-release.tar.gz
+        http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-release.tar.gz
+        http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz
+        http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz
+        http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz
+        speechconfig.patch
+        festconfig.patch
+        festival-shared-build.patch
+        festival.gcc47.patch
+        festival-2.1-bettersonamehack.patch)
 md5sums=('c93eb3e389ed171ab9abd46afe8897a8'
          '6920ddc75b042910a3bcfee3ab106938'
          '6a2ee4fed7c3ebedf197a3b8524ccb87'
@@ -28,31 +29,38 @@ md5sums=('c93eb3e389ed171ab9abd46afe8897a8'
          'aa80f9250065b318325f16fdad3a4484'
          'c30ae990baca40c9c2b1d5cd27502139'
          '348cc033430aee7989463198818ae74c'
-         '46132b1cd86a982007312def49ab176a')
+         '02f589688182527308e3fe8d1a82c056'
+         'ed738fdf981aaddbae6d00c3a0120d62'
+         '85367db2b57bae214d1032e2fc896753')
+
+prepare() {
+  cd $srcdir
+  patch -Np0 -i ${srcdir}/speechconfig.patch
+  patch -Np0 -i ${srcdir}/festconfig.patch
+
+  # fix build with new gcc versions and build shared libs - taken from Mageia
+  patch -Np0 -i ${srcdir}/festival-shared-build.patch
+  patch -Np0 -i ${srcdir}/festival-2.1-bettersonamehack.patch
+  patch -Np0 -i ${srcdir}/festival.gcc47.patch
+  
+  # Avoid make failure on making scripts and docs
+  sed -i "s#examples bin doc#examples#" festival/Makefile
+}
 
 build() {
-  cd "$srcdir"
-  patch -Np0 -i "$srcdir/festival-shared-build.patch"
-
   # Build Speech Tools first
   cd "$srcdir/speech_tools"
-  patch -Np1 -i "$srcdir/speechconfig.patch"
   ./configure --prefix=/usr --sysconfdir=/etc
-  make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
+  make OPTIMISE_CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" OPTIMISE_CCFLAGS="${CFLAGS} -fno-strict-aliasing"
 
   # Build Festival itself
   cd "$srcdir/festival"
-  patch -Np1 -i "$srcdir/festconfig.patch"
-
-  # Avoid make failure on making scripts and docs
-  sed -i "s#examples bin doc#examples#" Makefile
-
   ./configure --prefix=/usr --sysconfdir=/etc
   make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
 }
 
 package() {
- # Install Speech Tools first
+  # Install Speech Tools first
   cd "$srcdir/speech_tools"
   install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
 
@@ -69,7 +77,6 @@ package() {
   ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so
   ln -sf libestools.so.${pkgver}.1 "$pkgdir"/usr/lib/libestools.so
   ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so
-  install -m644 -t "$pkgdir"/usr/lib lib/lib*.a
 
   #headers
   for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
@@ -95,7 +102,6 @@ package() {
   install -m755 examples/text2wave "$pkgdir"/usr/bin
 
   #libraries
-  install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/
   install -m755 src/lib/libFestival.so.* "$pkgdir"/usr/lib/
   ln -sf libFestival.so.2.1.0 "$pkgdir"/usr/lib/libFestival.so
 
@@ -105,8 +111,8 @@ package() {
 
   mkdir -p "$pkgdir"/usr/share/festival
   cp -aR lib/* "$pkgdir"/usr/share/festival
-  rm -f $(find "$pkgdir"/usr/share/festival -name Makefile)
-  rm -f $(find "$pkgdir"/usr/bin -name Makefile)
+  rm -fv $(find "$pkgdir"/usr/share/festival -name Makefile)
+  rm -fv $(find "$pkgdir"/usr/bin -name Makefile)
 
   #create voices directory
   install -dm755 "$pkgdir"/usr/share/festival/voices
diff --git a/extra/festival/festival-2.1-bettersonamehack.patch b/extra/festival/festival-2.1-bettersonamehack.patch
new file mode 100644
index 000000000..0830168c6
--- /dev/null
+++ b/extra/festival/festival-2.1-bettersonamehack.patch
@@ -0,0 +1,35 @@
+diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak
+--- speech_tools/config/compilers/gcc_defaults.mak.bettersoname	2010-12-06 10:25:35.000000000 +0100
++++ speech_tools/config/compilers/gcc_defaults.mak	2010-12-06 10:27:51.000000000 +0100
+@@ -78,7 +78,7 @@ SHARED_CXXFLAGS  = -fPIC
+ SHARED_LINKFLAGS = 
+ 
+ ifndef GCC_MAKE_SHARED_LIB
+-    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
++    MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname,YYY
+ else
+     MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
+ endif
+diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak
+--- speech_tools/config/rules/library.mak.bettersoname	2001-04-04 13:55:32.000000000 +0200
++++ speech_tools/config/rules/library.mak	2010-12-06 10:25:35.000000000 +0100
+@@ -103,14 +103,14 @@ endif
+  ###########################################################################
+ 
+ lib%.so : lib%.a
+-	@echo Make Shared Library $*
++	@echo Make Shared Library $(*F)
+ 	@if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
+ 	@(cd shared_space ; $(AR) x ../$< ) 
+-	@echo Link Shared Library $*
+-	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
+-	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
++	@echo Link Shared Library $(*F)
++	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
++	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs
+ 	@$(RM) -f shared_space/*.o $@
+-	@ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
++	@ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@
+ 
+  ###########################################################################
+  ##                                                                       ##
diff --git a/extra/festival/festival-shared-build.patch b/extra/festival/festival-shared-build.patch
index edfa38b17..ee824d458 100644
--- a/extra/festival/festival-shared-build.patch
+++ b/extra/festival/festival-shared-build.patch
@@ -1,3 +1,18 @@
+--- speech_tools/config/project.mak.orig	2007-03-13 15:27:53.000000000 -0400
++++ speech_tools/config/project.mak	2007-03-13 15:29:12.000000000 -0400
+@@ -99,8 +99,9 @@
+ PROJECT_LIBRARY_DIR_eststring = $(TOP)/lib
+ PROJECT_LIBRARY_DIR_estjava = $(TOP)/lib
+ 
+-PROJECT_LIBRARY_USES_estbase = eststring
+-
++PROJECT_LIBRARY_USES_estbase = eststring m
++PROJECT_LIBRARY_USES_estools = estbase m ncurses
++PROJECT_LIBRARY_USES_eststring = m
+ PROJECT_LIBRARY_USES_estjava = estbase eststring
+ 
+ PROJECT_LIBRARY_VERSION_estools = $(PROJECT_VERSION).1
+
 --- speech_tools/config/rules/defaults.mak.orig	2007-03-16 12:39:12.000000000 -0400
 +++ speech_tools/config/rules/defaults.mak	2007-03-16 12:39:19.000000000 -0400
 @@ -69,15 +69,21 @@
@@ -35,38 +50,3 @@
  # Libraries used from other projects
  
  REQUIRED_LIBRARIES = estools estbase eststring
-diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak
---- speech_tools/config/compilers/gcc_defaults.mak.bettersoname	2010-12-06 10:25:35.000000000 +0100
-+++ speech_tools/config/compilers/gcc_defaults.mak	2010-12-06 10:27:51.000000000 +0100
-@@ -78,7 +78,7 @@ SHARED_CXXFLAGS  = -fPIC
- SHARED_LINKFLAGS = 
- 
- ifndef GCC_MAKE_SHARED_LIB
--    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
-+    MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -Wl,-soname,YYY
- else
-     MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
- endif
-diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak
---- speech_tools/config/rules/library.mak.bettersoname	2001-04-04 13:55:32.000000000 +0200
-+++ speech_tools/config/rules/library.mak	2010-12-06 10:25:35.000000000 +0100
-@@ -103,14 +103,14 @@ endif
-  ###########################################################################
- 
- lib%.so : lib%.a
--	@echo Make Shared Library $*
-+	@echo Make Shared Library $(*F)
- 	@if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
- 	@(cd shared_space ; $(AR) x ../$< ) 
--	@echo Link Shared Library $*
--	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
--	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
-+	@echo Link Shared Library $(*F)
-+	if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
-+	$(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs
- 	@$(RM) -f shared_space/*.o $@
--	@ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
-+	@ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@
- 
-  ###########################################################################
-  ##                                                                       ##
diff --git a/extra/festival/festival.gcc47.patch b/extra/festival/festival.gcc47.patch
new file mode 100644
index 000000000..40c8c72b8
--- /dev/null
+++ b/extra/festival/festival.gcc47.patch
@@ -0,0 +1,121 @@
+--- speech_tools/base_class/EST_TSimpleMatrix.cc.gcc	2009-02-18 20:56:24.000000000 +0800
++++ speech_tools/base_class/EST_TSimpleMatrix.cc	2012-10-14 13:06:35.000000000 +0800
+@@ -44,6 +44,7 @@
+ #include "EST_TVector.h"
+ #include <fstream>
+ #include <iostream>
++#include <cstring>
+ #include "EST_cutils.h"
+ 
+ template<class T> 
+@@ -98,7 +99,7 @@
+ 	{
+ 	  int copy_r = Lof(this->num_rows(), new_rows);
+ 
+-	  just_resize(new_rows, new_cols, &old_vals);
++	  this->just_resize(new_rows, new_cols, &old_vals);
+ 
+           for (q=0; q<(copy_r*new_cols*sizeof(T)); q++) /* memcpy */
+               ((char *)this->p_memory)[q] = ((char *)old_vals)[q];
+@@ -127,9 +128,9 @@
+ 	  int copy_r = Lof(this->num_rows(), new_rows);
+ 	  int copy_c = Lof(this->num_columns(), new_cols);
+ 	  
+-	  just_resize(new_rows, new_cols, &old_vals);
++	  this->just_resize(new_rows, new_cols, &old_vals);
+ 
+-	  set_values(old_vals,
++	  this->set_values(old_vals,
+ 		     old_row_step, old_column_step,
+ 		     0, copy_r,
+ 		     0, copy_c);
+--- speech_tools/base_class/EST_TSimpleVector.cc.gcc	2009-02-18 20:52:55.000000000 +0800
++++ speech_tools/base_class/EST_TSimpleVector.cc	2012-10-14 13:09:37.000000000 +0800
+@@ -43,6 +43,7 @@
+ #include "EST_TSimpleVector.h"
+ #include "EST_matrix_support.h"
+ #include <fstream>
++#include <cstring>
+ #include "EST_cutils.h"
+ 
+ template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)
+@@ -70,7 +71,7 @@
+   int old_offset = this->p_offset;
+   unsigned int q;
+ 
+-  just_resize(newn, &old_vals);
++  this->just_resize(newn, &old_vals);
+ 
+   if (set && old_vals)
+     {
+--- speech_tools/include/EST_TIterator.h.gcc	2004-05-04 08:00:16.000000000 +0800
++++ speech_tools/include/EST_TIterator.h	2012-10-14 12:52:52.000000000 +0800
+@@ -101,7 +101,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TIterator(const Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   /// Copy an iterator by assignment
+   Iter &operator = (const Iter &orig)
+@@ -109,7 +109,7 @@
+ 
+   /// Assigning a container to an iterator sets it ready to start.
+   Iter &operator = (const Container &over)
+-    { begin(over); return *this;}
++    { this->begin(over); return *this;}
+ 
+   /// Set the iterator ready to run over this container.
+   void begin(const Container &over)
+@@ -209,7 +209,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TStructIterator(const Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   const Entry *operator ->() const
+     {return &this->current();}
+@@ -239,7 +239,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TRwIterator(Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   /// Set the iterator ready to run over this container.
+   void begin(Container &over)
+@@ -289,7 +289,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TRwStructIterator(Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   Entry *operator ->() const
+     {return &this->current();}
+--- speech_tools/include/EST_TNamedEnum.h.gcc	2004-09-30 20:53:36.000000000 +0800
++++ speech_tools/include/EST_TNamedEnum.h	2012-10-14 12:52:52.000000000 +0800
+@@ -130,7 +130,7 @@
+ 	{this->initialise((const void *)defs); };
+   EST_TNamedEnumI(EST_TValuedEnumDefinition<const char *,const char *,INFO> defs[], ENUM (*conv)(const char *))
+ 	{this->initialise((const void *)defs, conv); };
+-  const char *name(ENUM tok, int n=0) const {return value(tok,n); };
++  const char *name(ENUM tok, int n=0) const {return this->value(tok,n); };
+ 
+ };
+ 
+--- festival/src/modules/Text/text_modes.cc.gcc	2012-10-14 13:08:54.000000000 +0800
++++ festival/src/modules/Text/text_modes.cc	2012-10-14 13:09:09.000000000 +0800
+@@ -59,8 +59,8 @@
+ void tts_file_user_mode(LISP filename, LISP params)
+ {
+ 
+-    volatile EST_String tmpname = make_tmp_filename();
+-    volatile EST_String inname = (EST_String)get_c_string(filename);
++    EST_String tmpname = make_tmp_filename();
++    EST_String inname = (EST_String)get_c_string(filename);
+     volatile EST_String filter;
+     volatile EST_TokenStream ts;
+     volatile LISP func;
diff --git a/extra/gtkmathview/PKGBUILD b/extra/gtkmathview/PKGBUILD
index b09710324..d5e123ef6 100644
--- a/extra/gtkmathview/PKGBUILD
+++ b/extra/gtkmathview/PKGBUILD
@@ -1,33 +1,48 @@
-# $Id: PKGBUILD 198078 2013-10-30 12:40:13Z allan $
+# $Id: PKGBUILD 205608 2014-02-09 10:29:40Z andyrtr $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtkmathview
 pkgver=0.8.0
-pkgrel=3
+pkgrel=4
 pkgdesc="C++ rendering engine for MathML documents"
 arch=('i686' 'x86_64')
 url="http://helm.cs.unibo.it/mml-widget/"
-license=('GPL')
-depends=('popt' 'gtk2' 't1lib' 'gmetadom')
-source=("http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz"
-        'gtkmathview-0.8.0-gcc44.patch'
-        'gtkmathview-0.8.0-cond-t1.patch')
+license=('LGPL3')
+depends=('popt' 'gtk2' 't1lib' 'gmetadom' 'pangox-compat')
+source=(http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz
+        gtkmathview-0.8.0-gcc43.patch
+        gtkmathview-0.8.0-cond-t1.patch
+        gtkmathview-0.8.0-gcc47.patch
+        gtkmathview-0.8.0-includes.patch)
 md5sums=('b53564e553728d4b69f7d366dfeb5299'
-         '9fd261db865336c89ebf0f3545af9bc4'
-         'a79a27e00908e75712bc9453b669fe61')
+         '92eb2870c1922cbebd5566900cde220b'
+         'a79a27e00908e75712bc9453b669fe61'
+         '8c8620aee002b30975e1e175ef9af7a7'
+         '4fc8daefbf27d49067b0c66bba54f428')
 
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc44.patch
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc43.patch
+  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc47.patch
+  patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-includes.patch
   patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch
+  
+  # AM_BINRELOC missing, just ignore
+  echo 'AC_DEFUN([AM_BINRELOC], [])' > acinclude.m4
+  autoreconf -if
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
-              --sysconfdir=/etc
-  make
+    --sysconfdir=/etc \
+    --disable-static
+  make LIBTOOL=/usr/bin/libtool
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make DESTDIR=${pkgdir}/ install
 }
 
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch
new file mode 100644
index 000000000..437e3e2b1
--- /dev/null
+++ b/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch
@@ -0,0 +1,56 @@
+diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc43 gtkmathview-0.8.0/mathmlps/main.cc
+--- gtkmathview-0.8.0/mathmlps/main.cc.gcc43	2008-07-29 16:40:04.000000000 -0400
++++ gtkmathview-0.8.0/mathmlps/main.cc	2008-07-29 16:40:14.000000000 -0400
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstring>
+ #include <cassert>
+ #include <fstream>
+ 
+diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43 gtkmathview-0.8.0/mathmlsvg/main.cc
+--- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43	2007-08-17 06:02:46.000000000 -0400
++++ gtkmathview-0.8.0/mathmlsvg/main.cc	2008-07-29 16:33:03.000000000 -0400
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstring>
+ #include <cassert>
+ #include <fstream>
+ 
+diff -up gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43 gtkmathview-0.8.0/mathmlsvg/SMS.cc
+--- gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43	2008-07-29 16:39:01.000000000 -0400
++++ gtkmathview-0.8.0/mathmlsvg/SMS.cc	2008-07-29 16:39:07.000000000 -0400
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstring>
+ #include <sstream>
+ #include "defs.h"
+ #include "AbstractLogger.hh"
+diff -up gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43 gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc
+--- gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43	2008-07-29 16:35:24.000000000 -0400
++++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc	2008-07-29 16:35:28.000000000 -0400
+@@ -19,7 +19,7 @@
+ #include <t1lib.h>
+ #include <config.h>
+ #include <map>
+-#include <string>
++#include <cstring>
+ #include <stdlib.h>
+ #include <iostream>
+ #include <list>
+diff -up gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43 gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc
+--- gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43	2007-08-17 06:02:38.000000000 -0400
++++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc	2008-07-29 16:33:03.000000000 -0400
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <cstring>
+ #include <cassert>
+ 
+ #include "mathVariantAux.hh"
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch
deleted file mode 100644
index a9069056b..000000000
--- a/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -urN gtkmathview-0.8.0-orig/mathmlps/main.cc gtkmathview-0.8.0/mathmlps/main.cc
---- gtkmathview-0.8.0-orig/mathmlps/main.cc	2008-04-03 22:43:06.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlps/main.cc	2008-04-03 23:53:16.000000000 +0400
-@@ -20,6 +20,7 @@
- 
- #include <cassert>
- #include <fstream>
-+#include <cstring>
- 
- #include <popt.h>
- 
-diff -urN gtkmathview-0.8.0-orig/mathmlsvg/main.cc gtkmathview-0.8.0/mathmlsvg/main.cc
---- gtkmathview-0.8.0-orig/mathmlsvg/main.cc	2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlsvg/main.cc	2008-04-03 23:43:31.000000000 +0400
-@@ -20,6 +20,7 @@
- 
- #include <cassert>
- #include <fstream>
-+#include <cstring>
- 
- #include <popt.h>
- 
-diff -urN gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc gtkmathview-0.8.0/mathmlsvg/SMS.cc
---- gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc	2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlsvg/SMS.cc	2008-04-03 23:25:12.000000000 +0400
-@@ -19,6 +19,7 @@
- #include <config.h>
- 
- #include <sstream>
-+#include <cstring>
- #include "defs.h"
- #include "AbstractLogger.hh"
- #include "ValueConversion.hh"
-diff -urN gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc
---- gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc	2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc	2008-04-03 23:10:05.000000000 +0400
-@@ -20,6 +20,8 @@
- 
- #include <cassert>
- 
-+#include <cstring>
-+
- #include "mathVariantAux.hh"
- 
- static MathVariantAttributes vattr[] = {
-diff -urN gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc
---- gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc	2007-08-17 12:02:40.000000000 +0200
-+++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc		2008-06-07 12:26:01.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <iostream>
- #include <list>
-+#include <cstring>
- 
- #include "String.hh"
- #include "T1_FontDataBase.hh"
---- a/src/common/AbstractLogger.cc	2009-06-12 16:29:57.000000000 -0700
-+++ b/src/common/AbstractLogger.cc	2009-06-12 16:29:57.000000000 -0700
-@@ -18,6 +18,8 @@
- 
- #include <config.h>
- 
-+#include <cstdio>
-+
- #include <stdarg.h>
- 
- #include "AbstractLogger.hh"
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch
new file mode 100644
index 000000000..958617886
--- /dev/null
+++ b/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch
@@ -0,0 +1,67 @@
+diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc47 gtkmathview-0.8.0/mathmlps/main.cc
+--- gtkmathview-0.8.0/mathmlps/main.cc.gcc47	2012-02-27 13:12:01.218602317 -0500
++++ gtkmathview-0.8.0/mathmlps/main.cc	2012-02-27 13:12:06.596555579 -0500
+@@ -21,6 +21,13 @@
+ #include <cstring>
+ #include <cassert>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+ 
+ #include <popt.h>
+ 
+diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc47 gtkmathview-0.8.0/mathmlsvg/main.cc
+--- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc47	2012-02-27 13:10:33.335366105 -0500
++++ gtkmathview-0.8.0/mathmlsvg/main.cc	2012-02-27 13:10:33.374365766 -0500
+@@ -21,6 +21,13 @@
+ #include <cstring>
+ #include <cassert>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+ 
+ #include <popt.h>
+ 
+diff -up gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh.gcc47 gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh
+--- gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh.gcc47	2007-08-17 06:02:34.000000000 -0400
++++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh	2012-02-27 13:10:33.376365750 -0500
+@@ -47,12 +47,13 @@ protected:
+   SmartPtr<typename ElementBuilder::type>
+   getElement(const typename Model::Element& el) const
+   {
+-    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
++    SmartPtr<typename ElementBuilder::type> elem;
++    if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+       return elem;
+     else
+       {
+-	SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+-	linkerAdd(el, elem);
++	elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
++	this->linkerAdd(el, elem);
+ 	return elem;
+       }
+   }
+diff -up gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh.gcc47 gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh
+--- gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh.gcc47	2007-08-17 06:02:34.000000000 -0400
++++ gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh	2012-02-27 13:10:33.377365741 -0500
+@@ -43,7 +43,7 @@ protected:
+   findValidNodeForward(const typename Model::Node& p0) const
+   {
+     for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
+-      if (valid(p)) return Model::asElement(p);
++      if (this->valid(p)) return Model::asElement(p);
+     return typename Model::Element();
+   }
+     
+
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-includes.patch b/extra/gtkmathview/gtkmathview-0.8.0-includes.patch
new file mode 100644
index 000000000..665c7827e
--- /dev/null
+++ b/extra/gtkmathview/gtkmathview-0.8.0-includes.patch
@@ -0,0 +1,12 @@
+diff -ru gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc gtkmathview-0.8.0/src/common/AbstractLogger.cc
+--- gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc	2009-02-28 13:56:00.000000000 +0000
++++ gtkmathview-0.8.0/src/common/AbstractLogger.cc	2009-02-28 13:56:28.000000000 +0000
+@@ -19,6 +19,7 @@
+ #include <config.h>
+ 
+ #include <stdarg.h>
++#include <stdio.h>
+ 
+ #include "AbstractLogger.hh"
+ 
+
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index 6e2ba74c1..ab930d5c2 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 198325 2013-10-30 14:10:51Z allan $
+# $Id: PKGBUILD 205609 2014-02-09 10:29:41Z andyrtr $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
 pkgname=mono
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Free implementation of the .NET platform including runtime and compiler"
 arch=(i686 x86_64)
-license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
+license=('GPL' 'LGPL2.1' 'MPL' 'custom:MITX11')
 url="http://www.mono-project.com/"
-depends=('zlib' 'libgdiplus>=2.10' 'sh')
-makedepends=('pkgconfig')
+depends=('zlib' 'libgdiplus>=2.10' 'sh' 'python')
 options=('!makeflags')
 provides=('monodoc')
 conflicts=('monodoc')
-install=mono.install
 source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
         mono.binfmt.d
-	mono.install
-	sgen_fix.patch)
+        sgen_fix.patch)
 md5sums=('a66c6309fad071e21f77f4c6b67a0f10'
          'b9ef8a65fea497acf176cca16c1e2402'
-         'ca1108e9638b01c26453ee663592a4e5'
          '8a700b94bff7a913f920e95890d2fb4c')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   patch -p1 < ../sgen_fix.patch
   # build mono
-  ./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin --sbindir=/usr/bin
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --bindir=/usr/bin \
+    --sbindir=/usr/bin \
+    --disable-static
   make
 
   # build jay
@@ -41,9 +41,9 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   # install jay
-  cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
+  pushd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
   make DESTDIR="${pkgdir}" prefix=/usr INSTALL=../../install-sh install
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  popd
 
   # install binfmt conf file and pathes
   install -D -m644 "${srcdir}"/mono.binfmt.d "${pkgdir}"/usr/lib/binfmt.d/mono.conf
diff --git a/extra/mono/mini_amd64.patch b/extra/mono/mini_amd64.patch
deleted file mode 100644
index f8685c337..000000000
--- a/extra/mono/mini_amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mono/mini/mini-amd64.c	2009-03-19 21:08:18 UTC (rev 129824)
-+++ mono/mini/mini-amd64.c	2009-03-19 21:09:53 UTC (rev 129825)
-@@ -1009,7 +1009,7 @@
- 		locals_size += mono_type_size (ins->inst_vtype, &ialign);
- 	}
- 
--	if ((cfg->num_varinfo > 10000) || (locals_size >= (1 << 15))) {
-+	if ((cfg->num_varinfo > 5000) || (locals_size >= (1 << 15)) || (header->code_size > 110000)) {
- 		/* Avoid hitting the stack_alloc_size < (1 << 16) assertion in emit_epilog () */
- 		cfg->arch.omit_fp = FALSE;
- 	}
-
- 			
diff --git a/extra/mono/mono.install b/extra/mono/mono.install
deleted file mode 100644
index 6a57c2a70..000000000
--- a/extra/mono/mono.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-ln -sf /bin/mono-sgen /bin/mono
-}
-
-post_upgrade() {
-post_install
-} 
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index facd62271..0d44296a0 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 204645 2014-01-24 14:22:15Z tomegun $
+# $Id: PKGBUILD 205610 2014-02-09 10:29:42Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
 
 pkgbase=redland
 epoch=1
+# maybe rename redland-storage-mysql to redland-storage-mariadb or add a provide tag
 pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
 pkgver=1.0.17
-pkgrel=1
+pkgrel=2
 url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64')
-makedepends=('rasqal' 'raptor' 'db' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite')
+makedepends=('rasqal' 'raptor' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
         rpath.diff)
 sha256sums=('de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681'
@@ -25,7 +26,8 @@ build() {
 	--disable-static \
 	--with-raptor=system \
 	--with-rasqal=system \
-	--with-sqlite=3
+	--with-sqlite=3 \
+	--with-bdb=no
 
   # nuke rpath
   patch -Np0 -i "${srcdir}/rpath.diff"
@@ -62,7 +64,7 @@ package_redland-storage-postgresql() {
 
 package_redland-storage-virtuoso() {
  pkgdesc="Virtuoso storage support for Redland"
- depends=('redland' 'unixodbc' 'db')
+ depends=('redland' 'unixodbc')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   install -dm755 "${pkgdir}/usr/lib/redland"
@@ -71,7 +73,7 @@ package_redland-storage-virtuoso() {
 
 package_redland-storage-sqlite() {
  pkgdesc="SQLite storage support for Redland"
- depends=('redland' 'sqlite3' 'db')
+ depends=('redland' 'sqlite3')
  
   cd "${srcdir}/${pkgbase}-${pkgver}"
   install -dm755 "${pkgdir}/usr/lib/redland"
diff --git a/extra/shared-mime-info/PKGBUILD b/extra/shared-mime-info/PKGBUILD
index 014f72778..a68b03c25 100644
--- a/extra/shared-mime-info/PKGBUILD
+++ b/extra/shared-mime-info/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 197506 2013-10-26 08:14:56Z andyrtr $
+# $Id: PKGBUILD 205611 2014-02-09 10:29:43Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=shared-mime-info
 pkgver=1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org Shared MIME Info"
 arch=('i686' 'x86_64')
-license=('GPL')
+license=('GPL2')
 depends=('libxml2' 'glib2')
 makedepends=('intltool' 'pkgconfig')
 install=shared-mime-info.install
@@ -17,6 +17,9 @@ options=(!makeflags)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # https://bugs.archlinux.org/task/38836
+  # https://bugs.freedesktop.org/show_bug.cgi?id=70366
+  export ac_cv_func_fdatasync=no
   ./configure --prefix=/usr --disable-update-mimedb
   make
 }