Thu May 30 01:31:56 PDT 2013

15 files changed, 291 insertions, 78 deletions

diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD
index e1ae6bf4c..6c1d840d9 100644
--- a/extra/banshee/PKGBUILD
+++ b/extra/banshee/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=banshee
-pkgver=2.6.0
-pkgrel=2
+pkgver=2.6.1
+pkgrel=1
 pkgdesc="Music management and playback for GNOME"
 arch=('i686' 'x86_64')
 url="http://banshee.fm/"
@@ -18,7 +18,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
 options=('!libtool')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz)
-sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a')
+md5sums=('3c7775eecc079a018c468e9b4ab6cbe3')
 
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index 539c077fa..76b52c8a7 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183379 2013-04-21 22:09:51Z heftig $
+# $Id: PKGBUILD 186559 2013-05-29 01:23:46Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Silvio Knizek (killermoehre)
 
 pkgname=gnome-disk-utility
-pkgver=3.8.0
-pkgrel=2
+pkgver=3.8.2
+pkgrel=1
 pkgdesc="Disk Management Utility for GNOME"
 arch=(i686 x86_64)
 license=(GPL)
@@ -14,8 +14,17 @@ depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hi
 makedepends=(intltool docbook-xsl gnome-settings-daemon)
 options=('!libtool' '!emptydirs')
 install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        typefixes.patch)
+sha256sums=('6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3'
+            '0a1f2f80f1c741119639b3b2b8cf32d6261b126baa85189309d6473e171894d2')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Gets rid of warnings and compilation errors on i686
+  patch -Np1 -i ../typefixes.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-disk-utility/typefixes.patch b/extra/gnome-disk-utility/typefixes.patch
new file mode 100644
index 000000000..79439e4de
--- /dev/null
+++ b/extra/gnome-disk-utility/typefixes.patch
@@ -0,0 +1,97 @@
+diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c
+--- gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c	2013-05-14 07:15:48.000000000 +0200
++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c	2013-05-29 03:17:37.201963964 +0200
+@@ -610,7 +610,7 @@
+                                   error))
+     {
+       g_prefix_error (error,
+-                      "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ",
++                      "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ",
+                       num_bytes_to_write,
+                       offset);
+       goto out;
+diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c
+--- gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c	2013-05-14 07:15:48.000000000 +0200
++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c	2013-05-29 03:18:30.224935009 +0200
+@@ -429,7 +429,7 @@
+   if (widget->drive != NULL && udisks_drive_get_removable (widget->drive))
+     {
+       /* default FAT for flash and disks/media smaller than 20G (assumed to be flash cards) */
+-      if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < 20L * 1000L*1000L*1000L)
++      if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < (guint64)(20ULL * 1000ULL*1000ULL*1000ULL))
+         {
+           gtk_combo_box_set_active_id (GTK_COMBO_BOX (widget->type_combobox), "vfat");
+         }
+diff -u -r gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c
+--- gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c	2013-05-14 07:15:48.000000000 +0200
++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c	2013-05-29 03:17:37.338629696 +0200
+@@ -293,7 +293,7 @@
+   /* Default to MBR for removable drives < 2TB... GPT otherwise */
+   if (data->drive != NULL &&
+       udisks_drive_get_removable (data->drive) &&
+-      udisks_drive_get_size (data->drive) < 2 * 1000L*1000L*1000L*1000L)
++      udisks_drive_get_size (data->drive) < (guint64)(2ULL * 1000ULL*1000ULL*1000ULL*1000ULL))
+     {
+       gtk_combo_box_set_active_id (GTK_COMBO_BOX (data->type_combobox), "dos");
+     }
+diff -u -r gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c
+--- gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c	2013-05-14 07:15:48.000000000 +0200
++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c	2013-05-29 03:17:37.338629696 +0200
+@@ -91,11 +91,11 @@
+       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton)))
+         flags |= (1UL<<2);
+       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton)))
+-        flags |= (1UL<<60);
++        flags |= (1ULL<<60);
+       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton)))
+-        flags |= (1UL<<62);
++        flags |= (1ULL<<62);
+       if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton)))
+-        flags |= (1UL<<63);
++        flags |= (1ULL<<63);
+     }
+   else if (g_strcmp0 (data->partition_table_type, "dos") == 0)
+     {
+@@ -245,9 +245,9 @@
+       flags = udisks_partition_get_flags (data->partition);
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->system_checkbutton),           (flags & (1UL<< 0)) != 0);
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton),         (flags & (1UL<< 2)) != 0);
+-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton),         (flags & (1UL<<60)) != 0);
+-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton),           (flags & (1UL<<62)) != 0);
+-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1UL<<63)) != 0);
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton),         (flags & (1ULL<<60)) != 0);
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton),           (flags & (1ULL<<62)) != 0);
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1ULL<<63)) != 0);
+     }
+   else if (g_strcmp0 (data->partition_table_type, "dos") == 0)
+     {
+diff -u -r gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c
+--- gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c	2013-05-14 07:15:48.000000000 +0200
++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c	2013-05-29 03:17:37.485295361 +0200
+@@ -587,7 +587,7 @@
+                                     &error))
+         {
+           g_prefix_error (&error,
+-                          "Error reading %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ",
++                          "Error reading %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ",
+                           num_bytes_to_read,
+                           num_bytes_completed);
+           goto out;
+@@ -595,7 +595,7 @@
+       if (num_bytes_read != num_bytes_to_read)
+         {
+           g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
+-                       "Requested %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GUINT64_FORMAT " bytes",
++                       "Requested %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GSIZE_FORMAT " bytes",
+                        num_bytes_read,
+                        num_bytes_completed,
+                        num_bytes_to_read);
+@@ -610,7 +610,7 @@
+             goto copy_write_again;
+ 
+           g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
+-                       "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m",
++                       "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m",
+                        num_bytes_read,
+                        num_bytes_completed);
+           goto out;
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index 0edb3e7e8..7005adcff 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184889 2013-05-09 09:43:02Z andrea $
+# $Id: PKGBUILD 186565 2013-05-29 07:12:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
 pkgver=4.10.3
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
 arch=('i686' 'x86_64')
@@ -15,11 +15,17 @@ optdepends=('maxima: Maxima backend'
             'octave: Octave backend'
             'r: R backend')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz")
-sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886')
+source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz"
+        'sage58.patch')
+sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886'
+          'c02051c30ece57800d693da60280b0bdb5f45697')
+
+prepare() {
+  cd cantor-${pkgver}
+  patch -p1 -i "${srcdir}"/sage58.patch
+}
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../cantor-${pkgver} \
diff --git a/extra/kdeedu-cantor/sage58.patch b/extra/kdeedu-cantor/sage58.patch
new file mode 100644
index 000000000..d17b55a99
--- /dev/null
+++ b/extra/kdeedu-cantor/sage58.patch
@@ -0,0 +1,123 @@
+diff --git a/src/backends/sage/sagecompletionobject.cpp b/src/backends/sage/sagecompletionobject.cpp
+index dec0c8f..a132295 100644
+--- a/src/backends/sage/sagecompletionobject.cpp
++++ b/src/backends/sage/sagecompletionobject.cpp
+@@ -52,7 +52,7 @@ void SageCompletionObject::fetchCompletions()
+ 
+     //cache the value of the "_" variable into __hist_tmp__, so we can restore the previous result
+     //after complete() was evaluated
+-    m_expression=session()->evaluateExpression("__hist_tmp__=_; __IPYTHON__.complete(\""+command()+"\");_=__hist_tmp__");
++    m_expression=session()->evaluateExpression("__hist_tmp__=_; __CANTOR_IPYTHON_SHELL__.complete(\""+command()+"\");_=__hist_tmp__");
+     connect(m_expression, SIGNAL(gotResult()), this, 
+ 	    SLOT(extractCompletions()));
+ 
+@@ -71,11 +71,19 @@ void SageCompletionObject::extractCompletions()
+         kDebug()<<"something went wrong fetching tab completion";
+         return;
+     }
+-
++    
+     //the result looks like "['comp1', 'comp2']" parse it
++
++    //for sage version 5.7 this looks like
++    //('s1', ['comp1','comp2']) where s1 is the string we called complete with
++
+     QString txt=res->toHtml().trimmed();
++    txt.remove("<br/>");
++    txt=txt.mid(txt.indexOf(command())+command().length()+2).trimmed();
+     txt=txt.mid(1); //remove [
+-    txt.chop(1); //remove ]
++    txt.chop(2); //remove ]
++
++    kDebug()<<"completion string: "<<txt;
+ 
+     QStringList tmp=txt.split(',');
+     QStringList completions;
+diff --git a/src/backends/sage/sageexpression.cpp b/src/backends/sage/sageexpression.cpp
+index eabdda2..fbde7c1 100644
+--- a/src/backends/sage/sageexpression.cpp
++++ b/src/backends/sage/sageexpression.cpp
+@@ -122,7 +122,7 @@ void SageExpression::parseOutput(const QString& text)
+         //reset the indices
+         index=index2=-1;
+     }
+-
++    
+     m_outputCache+=output;
+ 
+     if(m_promptCount<=0)
+@@ -160,11 +160,9 @@ void SageExpression::addFileResult( const QString& path )
+ {
+   KUrl url( path );
+   KMimeType::Ptr type=KMimeType::findByUrl(url);
+-  kDebug()<<"MimeType: "<<type->name();
+-  if(type->name().contains("image"))
++  if(m_imagePath.isEmpty()||type->name().contains("image")||path.endsWith(".png")||path.endsWith(".gif"))
+   {
+-    kDebug()<<"adding file "<<path<<"   "<<url;
+-    m_imagePath=path;
++      m_imagePath=path;
+   }
+ }
+ 
+@@ -172,8 +170,11 @@ void SageExpression::evalFinished()
+ {
+     kDebug()<<"evaluation finished";
+     kDebug()<<m_outputCache;
++    
++    //check if our image path contains a valid image that we can try to show
++    bool hasImage=!m_imagePath.isNull();
+ 
+-    if ( m_imagePath.isNull() ) //If this result contains a file, drop the text information
++    if ( !hasImage ) //If this result contains a file, drop the text information
+     {
+         Cantor::TextResult* result=0;
+ 
+@@ -219,7 +220,7 @@ void SageExpression::evalFinished()
+     }
+     else
+     {
+-        KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath);
++	KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath);
+         if(type->is("image/gif"))
+             setResult( new Cantor::AnimationResult( KUrl(m_imagePath ),i18n("Result of %1" , command() ) ) );
+         else
+diff --git a/src/backends/sage/sagesession.cpp b/src/backends/sage/sagesession.cpp
+index a535277..d8ac325 100644
+--- a/src/backends/sage/sagesession.cpp
++++ b/src/backends/sage/sagesession.cpp
+@@ -38,10 +38,13 @@ const QByteArray SageSession::SageAlternativePrompt="....: "; //Text, sage outpu
+ static QByteArray initCmd="os.environ['PAGER'] = 'cat'                     \n "\
+                            "sage.misc.pager.EMBEDDED_MODE = True           \n "\
+                            "sage.misc.viewer.BROWSER=''                    \n "\
++                           "sage.misc.viewer.viewer.png_viewer('')         \n" \
+                            "sage.plot.plot3d.base.SHOW_DEFAULTS['viewer'] = 'tachyon' \n"\
+                            "sage.misc.latex.EMBEDDED_MODE = True           \n "\
+                            "os.environ['PAGER'] = 'cat'                    \n "\
+-                           " __IPYTHON__.shell.autoindent=False            \n "\
++                           "%colors nocolor                                \n "\
++			   "__CANTOR_IPYTHON_SHELL__=get_ipython()           \n "\
++                           "__CANTOR_IPYTHON_SHELL__.autoindent=False        \n "\
+                            "print '____TMP_DIR____', sage.misc.misc.SAGE_TMP\n"\
+                            "print '____END_OF_INIT____'                    \n ";
+ 
+@@ -277,6 +280,7 @@ void SageSession::waitForNextPrompt()
+ 
+ void SageSession::fileCreated( const QString& path )
+ {
++    kDebug()<<"got a file "<<path;
+     SageExpression* expr=m_expressionQueue.first();
+     if ( expr )
+         expr->addFileResult( path );
+@@ -290,9 +294,9 @@ void SageSession::setTypesettingEnabled(bool enable)
+     //the _ and __IP.outputcache() are needed to keep the
+     // _ operator working
+     if (enable)
+-        evaluateExpression("sage.misc.latex.pretty_print_default(true);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish);
++        evaluateExpression("sage.misc.latex.pretty_print_default(true)", Cantor::Expression::DeleteOnFinish);
+     else
+-        evaluateExpression("sage.misc.latex.pretty_print_default(false);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish);
++        evaluateExpression("sage.misc.latex.pretty_print_default(false)", Cantor::Expression::DeleteOnFinish);
+ }
+ 
+ Cantor::CompletionObject* SageSession::completionFor(const QString& command, int index)
diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD
index 1ca34bd46..b726f455d 100644
--- a/extra/kwebkitpart/PKGBUILD
+++ b/extra/kwebkitpart/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179888 2013-03-10 21:31:07Z andrea $
+# $Id: PKGBUILD 186557 2013-05-28 23:46:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kwebkitpart
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.3.3
+pkgrel=1
 pkgdesc="A WebKit browser component for KDE"
 url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ license=('LGPL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2df1c70371b99e5f638fff702f789ba1')
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('0c90cc05b4f9b6cba9e62941ae4d3ba0')
 
 build() {
   sed -i '/add_subdirectory(kdelauncher)/d' ${pkgname}-${pkgver}/CMakeLists.txt
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 893d4b191..1a492c40b 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186480 2013-05-27 13:11:34Z andyrtr $
+# $Id: PKGBUILD 186572 2013-05-29 15:13:14Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.4.7
-pkgrel=2
+pkgver=4.4.8
+pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -12,18 +12,11 @@ depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
 optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
-source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 
-        f8ee088.diff)
-md5sums=('a4e7b88d6b7aca389010ce6d6dca8099'
-         'a8f1c1bb3f5ab60b48507c9722c64d1c')
+source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 )
+md5sums=('7140263fbe12f17f74183cf065a7d381')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
-  # fix sftp transfer - FS#35456
-  # upstream: https://github.com/lavv17/lftp/issues/39
-  patch -Np0 -i ${srcdir}/f8ee088.diff
-
   ./configure --prefix=/usr \
     --with-gnutls \
     --without-openssl \
diff --git a/extra/lftp/f8ee088.diff b/extra/lftp/f8ee088.diff
deleted file mode 100644
index 8b490a9dc..000000000
--- a/extra/lftp/f8ee088.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/SFtp.cc	2013-04-18 09:24:36.000000000 +0200
-+++ src/SFtp.cc.new	2013-05-27 15:06:40.998423663 +0200
-@@ -2256,7 +2256,7 @@
- 	 return MOVED;
-       }
-       if(b)
--	 return MOVED;
-+	 return m;
-       // eof
-       if(!result && session->IsOpen())
- 	 result=session.Cast<SFtp>()->GetFileSet();
diff --git a/extra/libdmx/PKGBUILD b/extra/libdmx/PKGBUILD
index 7265dc7ca..eda53d752 100644
--- a/extra/libdmx/PKGBUILD
+++ b/extra/libdmx/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 152803 2012-03-09 17:01:00Z andyrtr $
+# $Id: PKGBUILD 186576 2013-05-29 15:18:36Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdmx
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=1
 pkgdesc="X11 Distributed Multihead extension library"
 arch=('i686' 'x86_64')
@@ -12,7 +13,7 @@ depends=('dmxproto' 'libxext')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('76956d4127ded2e6d1bb5746a6d1603ee23b442a')
+sha256sums=('c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD
index ebcc30952..70b45ca81 100644
--- a/extra/libfs/PKGBUILD
+++ b/extra/libfs/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 151846 2012-03-03 13:40:06Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 186578 2013-05-29 15:21:31Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libfs
-pkgver=1.0.4
+pkgver=1.0.5
 pkgrel=1
 pkgdesc="X11 Font Services Library"
 arch=('i686' 'x86_64')
@@ -12,7 +13,7 @@ depends=('glibc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2")
-sha1sums=('f114f32f60eb84d3e1d0e6f0dfe7679b07e91295')
+sha256sums=('22eb3005dd8053aef7ff82758da5dd59ca9738410bcf847e675780e3a1f96107')
 
 build() {
   cd "${srcdir}/libFS-${pkgver}"
diff --git a/extra/libxfixes/PKGBUILD b/extra/libxfixes/PKGBUILD
index 535bfbafe..a07efbbdb 100644
--- a/extra/libxfixes/PKGBUILD
+++ b/extra/libxfixes/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 151418 2012-02-26 10:42:43Z pierre $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 186580 2013-05-29 15:23:58Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxfixes
-pkgver=5.0
-pkgrel=2
+pkgver=5.0.1
+pkgrel=1
 pkgdesc="X11 miscellaneous 'fixes' extension library"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -12,7 +13,7 @@ depends=('libx11' 'fixesproto>=5.0')
 makedepends=('xorg-util-macros')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2")
-sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0')
+sha256sums=('63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767')
 
 build() {
   cd "${srcdir}/libXfixes-${pkgver}"
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index a75c633b5..eb29c5d5f 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185203 2013-05-12 06:52:48Z eric $
+# $Id: PKGBUILD 186563 2013-05-29 04:09:51Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lm_sensors
-pkgver=3.3.3
-pkgrel=3
+pkgver=3.3.4
+pkgrel=1
 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
 arch=('i686' 'x86_64')
 url="http://www.lm-sensors.org/"
@@ -16,7 +16,7 @@ options=('!emptydirs')
 source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
 	healthd healthd.conf fancontrol.service sensord.service healthd.service \
         linux_3.0.patch lm_sensors-fancontrol.patch)
-sha1sums=('b55c06f425993e42f13553f204066c446da36fd3'
+sha1sums=('4e62538ca99973ff505f2eeb5b841bb402e996d8'
           'SKIP'
           '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5'
           '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
@@ -24,7 +24,7 @@ sha1sums=('b55c06f425993e42f13553f204066c446da36fd3'
           'cea1ff07374a784cc4be1d28dc6c80641fcae99d'
           'd72ec328e9303acef86342483b6f8537de6117d9'
           '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c'
-          'd3e419b4019451fb039ae3d3b8e0ec55121b9f17')
+          'b0bc977348610d6a008d75a43f65800251c4c9f7')
 
 prepare() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/lm_sensors/lm_sensors-fancontrol.patch b/extra/lm_sensors/lm_sensors-fancontrol.patch
index e58891695..c42d7b870 100644
--- a/extra/lm_sensors/lm_sensors-fancontrol.patch
+++ b/extra/lm_sensors/lm_sensors-fancontrol.patch
@@ -4,8 +4,8 @@
  cd $DIR
  
  # Check for configuration change
--if [ -z "$DEVPATH" -o -z "$DEVNAME" ]
-+if [ -z "$DEVPATH" ] || [ -z "$DEVNAME" ]
+-if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ]
++if [[ "$DIR" != "/"  && ( -z "$DEVPATH"  ||  -z "$DEVNAME" ) ]]
  then
  	echo "Configuration is too old, please run pwmconfig again" >&2
  	exit 1
diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD
index 2860395fc..c7a3a5a8e 100644
--- a/extra/perl-dbi/PKGBUILD
+++ b/extra/perl-dbi/PKGBUILD
@@ -1,37 +1,30 @@
-# $Id: PKGBUILD 186401 2013-05-26 09:25:07Z bluewind $
+# $Id: PKGBUILD 186584 2013-05-29 15:44:45Z eric $
 # Maintainer:
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor: Matt Thompson <mattt@defunct.ca>
 
 pkgname=perl-dbi
-_realname=DBI
-pkgver=1.625
-pkgrel=2
+pkgver=1.627
+pkgrel=1
 pkgdesc="Database independent interface for Perl"
 arch=('i686' 'x86_64')
 license=('GPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
 depends=('perl')
 options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz)
-md5sums=('b0521be412faff4ec8d511cd5f3f6a31')
+source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz)
+md5sums=('aab49be51b0f4867a1894145b023d2c5')
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  # install module in vendor directories.
+  cd DBI-${pkgver}
   perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd DBI-${pkgver}
   make test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd DBI-${pkgver}
   make install DESTDIR="${pkgdir}"
 }
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index bbde409ae..1e0a601f9 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183672 2013-04-26 12:52:31Z andyrtr $
+# $Id: PKGBUILD 186582 2013-05-29 15:27:30Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=292
+pkgver=293
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('d6e7d1bd31b23fb58ca213c912f32009'
+md5sums=('f9dc37486d5f1e550b6dc2e26a8a0439'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {