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

Conflicts: community/codeblocks/PKGBUILD community/gnash/PKGBUILD community/i3lock/PKGBUILD community/instead/PKGBUILD extra/asio/PKGBUILD extra/cups/PKGBUILD extra/libdrm/PKGBUILD extra/liborigin2/PKGBUILD extra/mesa/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/ocrad/PKGBUILD extra/qtiplot/PKGBUILD extra/scribus/PKGBUILD extra/xdg-user-dirs/PKGBUILD
author: Nicolás Reynolds <fauno@endefensadelsl.org> 2013-07-14 15:27:23 -0300
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2013-07-14 15:27:23 -0300
commit: a594ebe149ad81798984a410c036a0965df1581a (patch)
tree: 9f92df878175fe438860b196b7394ec8f0bac4cd /extra
parent: 03d128385c4ca773e67c93729a45899590d0d99e (diff)
parent: d525d9a731f5d79c1128a192b9d2977a2967570f (diff)
47 files changed, 787 insertions, 482 deletions
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 3d301b70d..5f2e409b9 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189912 2013-07-11 09:04:56Z andrea $
+# $Id: PKGBUILD 190032 2013-07-13 12:39:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://community.kde.org/KDE_PIM/Akonadi'
diff --git a/extra/asio/PKGBUILD b/extra/asio/PKGBUILD
index 1d86a8db5..27f94d9a4 100644
--- a/extra/asio/PKGBUILD
+++ b/extra/asio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143711 2011-11-28 16:30:10Z giovanni $
+# $Id: PKGBUILD 190033 2013-07-13 12:40:05Z svenstaro $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=asio
 pkgver=1.4.8
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Cross-platform C++ library for ASynchronous network I/O"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://asio.sourceforge.net"
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 9631d7030..197ff2368 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 181116 2013-03-31 19:16:38Z stephane $
+# $Id: PKGBUILD 190034 2013-07-13 12:40:13Z svenstaro $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Nick B <Shirakawasuna at gmail _dot_com>
 
 pkgname=avogadro
 pkgver=1.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="An advanced molecular editor based on Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://avogadro.openmolecules.net/wiki/Main_Page"
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index dc47b2857..3ec7e8cfa 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181117 2013-03-31 19:16:40Z stephane $
+# $Id: PKGBUILD 190035 2013-07-13 12:40:22Z svenstaro $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
@@ -8,7 +8,7 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.53.0
+pkgver=1.54.0
 _boostver=${pkgver//./_}
 pkgrel=2
 url="http://www.boost.org/"
@@ -16,17 +16,21 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        boost-1.53.0-python3.patch)
-sha1sums=('0e4ef26cc7780c6bbc63987ef2f29be920e2395b'
-          '34026072a7cb2534164f20e77bb71a5c75093307')
+        boost-1.53.0-python3.patch
+        boost-1.54.0-Fix-macro-for-int128-detection.patch)
+sha1sums=('069501636097d3f40ddfd996d29748bb23591c53'
+          '34026072a7cb2534164f20e77bb71a5c75093307'
+          'bf5177694ab8a0df6bc13aa47b05727c40febebb')
 
-_stagedir="${srcdir}/stagedir"
 
 build() {
+   export _stagedir="${srcdir}/stagedir"
    local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
 
    cd "${srcdir}/${pkgbase}_${_boostver}"
 
+   patch -Np2 -i ../boost-1.54.0-Fix-macro-for-int128-detection.patch
+
    # Fix build errors with python 3
    sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh
    patch -Np1 -i ../boost-1.53.0-python3.patch
diff --git a/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch b/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch
new file mode 100644
index 000000000..1f337bedf
--- /dev/null
+++ b/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch
@@ -0,0 +1,35 @@
+Index: /trunk/boost/lexical_cast.hpp
+===================================================================
+--- /trunk/boost/lexical_cast.hpp	(revision 84136)
++++ /trunk/boost/lexical_cast.hpp	(revision 84965)
+@@ -70,8 +70,8 @@
+ #endif
+ 
+-#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
++// GCC 4.6 has some issues with int128 and uint128. Issues were fixed in GCC 4.7
++#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
+ #define BOOST_LCAST_HAS_INT128
+ #endif
+-
+ 
+ namespace boost
+Index: /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp
+===================================================================
+--- /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp	(revision 83717)
++++ /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp	(revision 84965)
+@@ -49,5 +49,5 @@
+ #endif
+ 
+-#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
++#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
+ #define BOOST_LCAST_HAS_INT128
+ #endif
+@@ -445,6 +445,6 @@
+ 
+     // Overflow test case from David W. Birdsall
+-    std::string must_owerflow_str = "160000000000000000000";
+-    std::string must_owerflow_negative_str = "-160000000000000000000";
++    std::string must_owerflow_str =             (sizeof(T) < 16 ?  "160000000000000000000" :  "1600000000000000000000000000000000000000");
++    std::string must_owerflow_negative_str =    (sizeof(T) < 16 ? "-160000000000000000000" : "-1600000000000000000000000000000000000000");
+     for (int i = 0; i < 15; ++i) {
+         BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_str), bad_lexical_cast);
diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD
index 88d792a93..ff7ba1976 100644
--- a/extra/clucene/PKGBUILD
+++ b/extra/clucene/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 163973 2012-07-23 03:04:22Z allan $
+# $Id: PKGBUILD 190036 2013-07-13 12:40:33Z svenstaro $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Alexander Rødseth
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=clucene
 pkgver=2.3.3.4
-pkgrel=6
+pkgrel=7
 pkgdesc="C++ port of the high-performance text search engine Lucene"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://clucene.sourceforge.net/"
 license=('APACHE' 'LGPL')
 depends=('gcc-libs>=4.7.1-5' 'zlib' 'boost-libs')
-makedepends=('cmake' 'boost')
+makedepends=('cmake' 'boost>=1.54.0')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-core-$pkgver.tar.gz
 		# Fedora patches
 		clucene-core-2.3.3.4-pkgconfig.patch
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 9c7fb3531..991c98f64 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188723 2013-06-18 15:31:30Z andyrtr $
+# $Id: PKGBUILD 190057 2013-07-13 17:35:12Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.6.2
-pkgrel=3
+pkgver=1.6.3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
@@ -27,13 +27,10 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
         cups-1.6.0-fix-install-perms.patch
         cups-1.6.2-statedir.patch
         # Debian
-        usb-backend-more-quirk-rules.patch
         cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
         get-ppd-file-for-statically-configured-ipp-shared-queues.patch
-        ppd-poll-with-client-conf.patch
-        usb-backend-do-not-crash-if-usb-disabled-in-bios.patch)
-#options=('!emptydirs')
-md5sums=('8b8e40560b67e28607b1f04dafd9a94d'
+        ppd-poll-with-client-conf.patch)
+md5sums=('3c50d396fef2ba721224fe65880fe3c3'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
@@ -46,15 +43,14 @@ md5sums=('8b8e40560b67e28607b1f04dafd9a94d'
          'f30c2a161caaf27854581507cde8cac6'
          '5117f65342fcc69c6a506529e4daca9e'
          '9247e218eea94ebda0aebc8ee0e77db8'
-         '52675e2d7a7f77005f1fc0212b86dbe3'
          'cb58bf4e0b80eaee383712e5c84a1ab4'
          'b578bcd17949a7203237ba1e31f78ef9'
-         '0becd6ab8782b97f19a02c1dc174c75e'
-         'f1f0ee65296d438a8c83467ff03f652d')
+         '0becd6ab8782b97f19a02c1dc174c75e')
 
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
+prepare() {
 
+  cd ${pkgbase}-${pkgver}
+	
   # add systemd socket support - Fedora patch, also used in Gentoo
   # modified now to the changes done by Gentoo in their svn ebuild
   # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
@@ -74,9 +70,6 @@ build() {
   # Ensure attributes are valid UTF-8 in dbus notifier
   patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
 
-  # More USB quirks for the libusb-based backend (STR #4311)
-  # Fixed in 1.6.3
-  patch -Np1 -i ${srcdir}/usb-backend-more-quirk-rules.patch
   # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll.
   patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
   # Applications could not get the PPD file for statically-configured IPP-shared print queues
@@ -84,9 +77,6 @@ build() {
   # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs
   # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763
   patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
-  # Add more error handling to the libusb-based USB backend, especially to avoid a crash when USB is disabled in the BIOS. Also
-  # discard that error when counting warning messages.
-  patch -Np1 -i ${srcdir}/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
   # fix permissions on some files - alternative: cups-0755.patch by FC
   patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
   # move /var/run -> /run for pid file
@@ -101,6 +91,10 @@ build() {
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
   autoconf -I config-scripts
+}
+
+build() {
+  cd ${pkgbase}-${pkgver}
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --sbindir=/usr/bin \
@@ -122,7 +116,7 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd ${pkgbase}-${pkgver}
   #httpAddrGetList(workstation64): FAIL
   #1 TESTS FAILED!
   #make[1]: *** [testhttp] Error 1
@@ -134,7 +128,7 @@ pkgdesc="The CUPS Printing System - client libraries and headers"
 depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
 backup=(etc/cups/client.conf)
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-headers install-libs
   # put this into the libs pkg to make other software find the libs(no pkg-config file included)
   mkdir -p ${pkgdir}/usr/bin 
@@ -166,7 +160,7 @@ backup=(etc/cups/cupsd.conf
 depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
 optdepends=('xdg-utils: xdg .desktop file support')
 
-  cd ${srcdir}/${pkgbase}-${pkgver}
+  cd ${pkgbase}-${pkgver}
   make BUILDROOT=${pkgdir} install-data install-exec
 
   # this one we ship in the libcups pkg
diff --git a/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch b/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
deleted file mode 100644
index 711dab8ce..000000000
--- a/extra/cups/usb-backend-do-not-crash-if-usb-disabled-in-bios.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Add more error handling to the libusb-based USB backend,
- especially to avoid a crash when USB is disabled in the BIOS. Also
- discard that error when counting warning messages.
-Author: Till Kamppeter <till.kamppeter@gmail.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1108719
-Last-Update: 2013-05-03
---- a/backend/usb-libusb.c
-+++ b/backend/usb-libusb.c
-@@ -898,7 +898,8 @@
- 					/* Pointer to current alternate setting */
-   const struct libusb_endpoint_descriptor *endpptr = NULL;
- 					/* Pointer to current endpoint */
--  ssize_t               numdevs,        /* number of connected devices */
-+  ssize_t               err = 0,
-+                        numdevs,        /* number of connected devices */
-                         i = 0;
-   uint8_t		conf,		/* Current configuration */
- 			iface,		/* Current interface */
-@@ -917,7 +918,13 @@
-   * Initialize libusb...
-   */
- 
--  libusb_init(NULL);
-+  err = libusb_init(NULL);
-+  if (err)
-+  {
-+    fprintf(stderr, "WARNING: Unable to initialize USB access via libusb, libusb error %i\n", err);
-+    return (NULL);
-+  }
-+
-   numdevs = libusb_get_device_list(NULL, &list);
-   fprintf(stderr, "DEBUG: libusb_get_device_list=%d\n", (int)numdevs);
- 
-@@ -1087,7 +1094,8 @@
-   * Clean up ....
-   */
- 
--  libusb_free_device_list(list, 1);
-+  if (numdevs >= 0)
-+    libusb_free_device_list(list, 1);
-   libusb_exit(NULL);
- 
-   return (NULL);
---- a/test/run-stp-tests.sh
-+++ b/test/run-stp-tests.sh
-@@ -838,7 +838,7 @@
- fi
- 
- # Warning log messages
--count=`$GREP '^W ' /tmp/cups-$user/log/error_log | wc -l | awk '{print $1}'`
-+count=`$GREP '^W ' /tmp/cups-$user/log/error_log | grep -v 'Unable to initialize USB access via libusb, libusb error' | wc -l | awk '{print $1}'`
- if test $count != 9; then
- 	echo "FAIL: $count warning messages, expected 9."
- 	$GREP '^W ' /tmp/cups-$user/log/error_log
diff --git a/extra/cups/usb-backend-more-quirk-rules.patch b/extra/cups/usb-backend-more-quirk-rules.patch
deleted file mode 100644
index 3b72011d6..000000000
--- a/extra/cups/usb-backend-more-quirk-rules.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: USB backend quirk rule for Epson Stylus Photo 750 (and maybe others)
-Author: Didier Raboud <odyx@debian.org>
-Bugs-Debian: http://bugs.debian.org/697970
-Last-Update: 2013-03-11
-
---- a/backend/usb-libusb.c
-+++ b/backend/usb-libusb.c
-@@ -142,8 +142,12 @@
- 	{ 0x0409, 0xbef4, USBLP_QUIRK_BIDIR }, /* NEC Picty760 (HP OEM) */
- 	{ 0x0409, 0xf0be, USBLP_QUIRK_BIDIR }, /* NEC Picty920 (HP OEM) */
- 	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
-+	{ 0x043d, 0x00f3, USBLP_QUIRK_NO_REATTACH }, /* Lexmark International,
-+		       Inc. (e250d), https://bugs.launchpad.net/bugs/1084164 */
- 	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
- 						  by zut <kernel@zut.de> */
-+	{ 0x04a9, 0x1095, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP6000D
-+			    Printer, https://bugs.launchpad.net/bugs/1160638 */
- 	{ 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200
- 			    Printer, http://www.cups.org/str.php?L4155 */
- 	{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
-@@ -158,6 +162,8 @@
- 			    Printer, http://www.cups.org/str.php?L4155 */
- 	{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
- 			    Printer, http://www.cups.org/str.php?L4155 */
-+	{ 0x04a9, 0x26a3, USBLP_QUIRK_NO_REATTACH }, /* Canon, Inc. MF4150
-+		            Printer, https://bugs.launchpad.net/bugs/1160638 */
- 	{ 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
- 						  HL-1430 Laser Printer,
- 				     https://bugs.launchpad.net/bugs/1038695 */
-@@ -165,24 +171,33 @@
- 			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
- 						  HL-1440 Laser Printer,
- 				     https://bugs.launchpad.net/bugs/1000253 */
-+	{ 0x04f9, 0x000e, USBLP_QUIRK_BIDIR |
-+			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
-+						  HL-1450 Laser Printer,
-+				     https://bugs.launchpad.net/bugs/1000253 */
- 	{ 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp.
- 						  Okipage 14ex Printer,
- 				     https://bugs.launchpad.net/bugs/872483 */
- 	{ 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d,
- 				     https://bugs.launchpad.net/bugs/872483 */
--	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
-+	{ 0x04b8, 0x0001, USBLP_QUIRK_BIDIR |
-+			  USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 740 / Photo 750,
- 				     http://bugs.debian.org/697970 */
-+	{ 0x04b8, 0x0005, USBLP_QUIRK_NO_REATTACH }, /* Seiko Epson Corp. Stylus Color 670,
-+				     https://bugs.launchpad.net/bugs/872483 */
- 	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
- 						      Printer M129C */
- 	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
- 			  USBLP_QUIRK_NO_REATTACH |
- 	                  USBLP_QUIRK_RESET },
-+	/* Prolific Technology, Inc. PL2305 Parallel Port
-+	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
- 	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
- 			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
- 	{ 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210
- 				     https://bugs.launchpad.net/bugs/1102470 */
--	/* Prolific Technology, Inc. PL2305 Parallel Port
--	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
-+	{ 0x1a86, 0x7584, USBLP_QUIRK_NO_REATTACH }, /* QinHeng Electronics
-+   CH340S (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/1000253 */
- 	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,
- 				     https://bugs.launchpad.net/bugs/1032456 */
- 	{ 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices,
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 550c9c36f..a324d9bb3 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185578 2013-05-15 08:05:39Z bpiotrowski $
+# $Id: PKGBUILD 190037 2013-07-13 12:40:41Z svenstaro $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=4.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index 1ecd13eff..8633e1d17 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 183281 2013-04-20 16:41:14Z heftig $
+# $Id: PKGBUILD 190038 2013-07-13 12:40:51Z svenstaro $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=enblend-enfuse
 pkgver=4.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL')
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
index c7b564e55..51abbdd64 100644
--- a/extra/gst-libav/PKGBUILD
+++ b/extra/gst-libav/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183690 2013-04-26 16:10:07Z heftig $
+# $Id: PKGBUILD 190013 2013-07-12 20:37:31Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-libav
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="Gstreamer libav Plugin"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('yasm')
 options=(!libtool !emptydirs)
 provides=("gst-ffmpeg=$pkgver-$pkgrel")
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('aefa679d14e7a6558673cfbf401b9c01f1903bb52e5dc08332e9001d25a7ba7a')
+sha256sums=('e6e538290e585c993609337761d894dd1b6b53ef625798b2a511d5314579995f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
index a4502f3d4..ee250f344 100644
--- a/extra/gst-plugins-base/PKGBUILD
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183686 2013-04-26 16:05:42Z heftig $
+# $Id: PKGBUILD 190006 2013-07-12 20:19:50Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gst-plugins-base
 pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Base Plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv
 options=(!libtool !emptydirs)
 url="http://gstreamer.freedesktop.org/"
 source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('014805e50b696bc06c3862ea656df079fc0b5fef0c10f16e9f085f290545677a')
+sha256sums=('b55c9deea00acf789f82845c088b7c7c17b3ecef24a94831a819071b3dd8ef0d')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index ed95af3df..6219e1256 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184388 2013-05-06 19:37:41Z foutrelis $
+# $Id: PKGBUILD 190007 2013-07-12 20:23:55Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-good
-pkgver=1.0.7
-pkgrel=2
+pkgver=1.0.8
+pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -12,7 +12,7 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' '
 makedepends=('gstreamer' 'speex' 'flac' 'libraw1394')
 options=(!libtool !emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('a016a3b377c86658627aef902b9204108209100b2e88fcc3b695c392af1b4035')
+sha256sums=('97831570ccdd8e15557f18858b965e54433d572d27fdabebb8b710cee276cfad')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index a79ca738a..631682bf7 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183689 2013-04-26 16:08:19Z heftig $
+# $Id: PKGBUILD 190010 2013-07-12 20:29:57Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-ugly
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
 options=(!libtool !emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('b78b8cfabe322497da432a0f297dbb21862a033f95e8d4cd8f207eccb5288f2b')
+sha256sums=('58cbae3cad52a91526d599fc90793147e934078055126865ee019bf97f1e0b84')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index 59733108c..30f4661a1 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183685 2013-04-26 16:04:28Z heftig $
+# $Id: PKGBUILD 190004 2013-07-12 20:15:01Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ optdepends=('sh: feedback script')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
 options=('!libtool')
 source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('68cada7ee24ede23e15dc81ccde11898eed1a7a3c6a2d81a8c31596fccb1b5ce')
+sha256sums=('ff70f45509566b88e35986971ace5e89cb6cb232e9ca249f84502abceef1762d')
 
 build() {
   cd "${srcdir}/gstreamer-${pkgver}"
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 604b8ad6f..cdf426508 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182988 2013-04-16 16:24:02Z giovanni $
+# $Id: PKGBUILD 190025 2013-07-13 02:56:23Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.41.2
+pkgver=1.43.3
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('48cb7fa1d9cca2ebea1844694668c8a8')
+md5sums=('a84868db7c139238df8add5d86a0b54f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 7f91356de..3915aa1ec 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184392 2013-05-06 19:37:52Z foutrelis $
+# $Id: PKGBUILD 190039 2013-07-13 12:40:59Z svenstaro $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=hugin
 pkgver=2012.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc='Panorama photo stitcher'
 url='http://hugin.sourceforge.net/'
 license=('GPL')
@@ -19,6 +19,12 @@ sha1sums=('53f97d030716e66dc5a49c7e786686a9d5262b8d')
 
 install=install
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's/Luk.... Jirkovsk../Lukas Jirkovsky/g' -i doc/deghosting_mask.pod
+	# pod2man limitation (makepkg uses LC_ALL=C and Unicode chars take two bytes)
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	export CXXFLAGS+=" -fpermissive" 
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 93312bb7e..e60ba8abf 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,31 +1,35 @@
-# $Id: PKGBUILD 189301 2013-07-02 19:57:06Z lcarlier $
+# $Id: PKGBUILD 190056 2013-07-13 17:35:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
 pkgver=2.4.46
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
 depends=('glibc' 'libpciaccess')
-makedepends=('cairo')
+makedepends=('cairo' 'clang')
 [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 replaces=('libdrm-new' 'libdrm-nouveau')
 options=('!libtool')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
-        no-pthread-stubs.patch
         COPYING)
 sha256sums=('33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1'
-            'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../no-pthread-stubs.patch
 
-  #libtoolize --force
+  # pthread is useless in Linux
+  sed -i "/pthread-stubs/d" configure.ac
   autoreconf --force --install
+  
+  # gcc 4.8 introduces graphic corruption and X crashes with nouveau cards (nv44)
+  # http://gcc.gnu.org/ml/gcc-help/2013-07/msg00103.html
+  # we use clang compiler meanwhile
+  export CC=clang
+
   ./configure --prefix=/usr --enable-udev
   make
 }
diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
deleted file mode 100644
index d49e397b7..000000000
--- a/extra/libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	$(VALGRIND_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-@@ -35,7 +34,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm \
- 	-DDEBUG
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = nouveau.c \
- 			    pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.40/omap/Makefile.am	2012-06-14 23:32:50.000000000 +0200
-+++ libdrm-2.4.40/omap/Makefile.am	2012-11-06 19:24:44.183224706 +0100
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/omap \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_omap_la_LTLIBRARIES = libdrm_omap.la
- libdrm_omap_ladir = $(libdir)
- libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_omap_la_LIBADD = ../libdrm.la
- 
- libdrm_omap_la_SOURCES = omap_drm.c
- 
---- libdrm-2.4.40/exynos/Makefile.am	2012-06-14 23:32:50.000000000 +0200
-+++ libdrm-2.4.40/exynos/Makefile.am	2012-11-06 19:26:01.975323106 +0100
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/exynos \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la
- libdrm_exynos_ladir = $(libdir)
- libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_exynos_la_LIBADD = ../libdrm.la
- 
- libdrm_exynos_la_SOURCES = exynos_drm.c
- 
---- libdrm-2.4.44/freedreno/Makefile.am	2013-04-19 00:59:07.000000000 +0200
-+++ libdrm-2.4.44/freedreno/Makefile.am.new	2013-04-19 17:19:03.153950143 +0200
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/freedreno \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la
- libdrm_freedreno_ladir = $(libdir)
- libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_freedreno_la_LIBADD = ../libdrm.la
- 
- libdrm_freedreno_la_SOURCES = \
- 	freedreno_device.c \
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 4784fa300..ea824fdd0 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183429 2013-04-21 22:11:15Z heftig $
+# $Id: PKGBUILD 190014 2013-07-12 20:40:29Z heftig $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libgee
-pkgver=0.10.1
+pkgver=0.10.2
 pkgrel=1
 pkgdesc="GObject collection library"
 url="http://live.gnome.org/Libgee"
@@ -13,7 +13,7 @@ depends=(glib2)
 makedepends=(gobject-introspection vala)
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f50c103107314daee6dc68054e359d5169a19c562902e323ba798b380a2a2c96')
+sha256sums=('b365b3afccbf9a9ecf4282be0b8ce7dcd56afa3c59c19d2ca79bb7f2724a966c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index e1ba0323e..f5954e389 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188185 2013-06-11 20:41:28Z andrea $
+# $Id: PKGBUILD 190040 2013-07-13 12:41:09Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libindi
 pkgver=0.9.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
 license=('GPL2')
@@ -15,8 +15,11 @@ options=('!libtool')
 source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz")
 md5sums=('c1456544a36f543e2884f88913cf3eb0')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD
index bf56184d1..85d66d4ea 100644
--- a/extra/libkolabxml/PKGBUILD
+++ b/extra/libkolabxml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 182677 2013-04-12 14:30:48Z andrea $
+# $Id: PKGBUILD 190041 2013-07-13 12:41:18Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkolabxml
 pkgver=0.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Kolab XML Format Schema Definitions Library"
 url='http://git.kolab.org/libkolabxml/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,11 @@ source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.
 md5sums=('64887f52c6629bbd8e2390d591ef5892'
          '55fcdaff82818c4a0eac50570db31e53')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/liborigin2/PKGBUILD b/extra/liborigin2/PKGBUILD
index bbb3bd0b8..73c2fa1a6 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178967 2013-03-01 10:21:49Z andrea $
+# $Id: PKGBUILD 190042 2013-07-13 12:41:27Z svenstaro $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
 pkgver=20110829
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
@@ -22,11 +22,10 @@ sha1sums=('13851b17b21ec49375e4f5dfbd3ab4b9bf72f5be'
 build() {
 	cd "${srcdir}/${pkgbase}"
 
-    . /etc/profile.d/qt4.sh
-
 	install -Dm644 "${srcdir}/liborigin.pro.archlinux" ./liborigin2.pro
-        install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
-	qmake liborigin2.pro QMAKESPEC=linux-g++
+	install -Dm644 "${srcdir}/tree.hh" ./tree.hh # get the header back like it was in previous releases
+
+	qmake-qt4 liborigin2.pro QMAKESPEC=linux-g++
   	make QTDIR=/usr/ QMAKESPEC=linux-g++
 
 	 # create documentation
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index b00864a6e..fe99ba444 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186514 2013-05-28 09:58:04Z ioni $
+# $Id: PKGBUILD 190043 2013-07-13 12:41:37Z svenstaro $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
 pkgver=0.16.10
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
@@ -13,8 +13,15 @@ license=('BSD')
 depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('8b24442132e52f8765c79b20ffdea8b33bc5aa42')
+source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz
+        'boost-154.patch')
+sha1sums=('8b24442132e52f8765c79b20ffdea8b33bc5aa42'
+          'b1e66ffbeba5c2b217bc0d02bc2c49aa6b603fa3')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i "${srcdir}"/boost-154.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libtorrent-rasterbar/boost-154.patch b/extra/libtorrent-rasterbar/boost-154.patch
new file mode 100644
index 000000000..5d556310b
--- /dev/null
+++ b/extra/libtorrent-rasterbar/boost-154.patch
@@ -0,0 +1,11 @@
+--- libtorrent-rasterbar-0.16.10/include/libtorrent/disk_buffer_pool.hpp~	2013-07-11 07:37:03.057798742 +0000
++++ libtorrent-rasterbar-0.16.10/include/libtorrent/disk_buffer_pool.hpp	2013-07-11 07:37:27.110960260 +0000
+@@ -33,6 +33,8 @@
+ #ifndef TORRENT_DISK_BUFFER_POOL
+ #define TORRENT_DISK_BUFFER_POOL
+ 
++#include <boost/noncopyable.hpp>
++
+ #include "libtorrent/config.hpp"
+ #include "libtorrent/thread.hpp"
+ #include "libtorrent/session_settings.hpp"
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index ea2478447..003d8654e 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186068 2013-05-20 21:46:39Z foutrelis $
+# $Id: PKGBUILD 190044 2013-07-13 12:41:46Z svenstaro $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
 pkgver=1.7.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Advanced graphical ICQ clone and more for Unix"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.licq.org"
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index b997e25b3..4a2246fa2 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185005 2013-05-09 20:48:29Z ronald $
+# $Id: PKGBUILD 190045 2013-07-13 12:41:55Z svenstaro $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
 pkgver=2.0.6
-pkgrel=1
+pkgrel=3
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lyx.org"
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index a22906d59..d544f0ab8 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189755 2013-07-07 09:05:23Z andyrtr $
+# $Id: PKGBUILD 190055 2013-07-13 17:35:09Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('mesa' 'mesa-libgl')
 pkgver=9.1.4
-pkgrel=3
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'wayland' 'systemd')
@@ -17,10 +17,17 @@ url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+        git_fixes.patch
         LICENSE)
 md5sums=('a2c4e25d0e27918bc67f61bae04d0cb8'
+         '8ec30e1bd7abe5e8e540df4fa618540f'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
+prepare() {
+    cd ?esa-*
+    patch -Np1 -i ../git_fixes.patch
+}
+
 build() {
     cd ${srcdir}/?esa-*
 
@@ -55,7 +62,6 @@ build() {
     --enable-vdpau \
     $extraconf
     # --help
-    # --with-llvm-shared-libs \ # enabling this would force us to move llvm-amdgpu-snapshot from community to extra, delay it until llvm 3.3 / Mesa 9.2/10.0
 
     make
     # fake installation
diff --git a/extra/mesa/git_fixes.patch b/extra/mesa/git_fixes.patch
new file mode 100644
index 000000000..51b0b8f8e
--- /dev/null
+++ b/extra/mesa/git_fixes.patch
@@ -0,0 +1,476 @@
+From 6194644a49f841488e23ce021e7817ec02927eef Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 01 Jul 2013 21:31:03 +0000
+Subject: docs: Add 9.1.4 release md5sums
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+---
+diff --git a/docs/relnotes-9.1.4.html b/docs/relnotes-9.1.4.html
+index 48e421b..fa6fe67 100644
+--- a/docs/relnotes-9.1.4.html
++++ b/docs/relnotes-9.1.4.html
+@@ -30,7 +30,9 @@ because GL_ARB_compatibility is not supported.
+ 
+ <h2>MD5 checksums</h2>
+ <pre>
+-TBD
++a2c4e25d0e27918bc67f61bae04d0cb8  MesaLib-9.1.4.tar.bz2
++8c7e9ce5b05cb2223f0587396dd9dc08  MesaLib-9.1.4.tar.gz
++020459c5793d4279bdcb2daa1f7dd9f6  MesaLib-9.1.4.zip
+ </pre>
+ 
+ <h2>New features</h2>
+--
+cgit v0.9.0.2-2-gbebe
+
+From e94a89de4deeabd0f8347795385b2f098aa35365 Mon Sep 17 00:00:00 2001
+From: Vinson Lee <vlee@freedesktop.org>
+Date: Fri, 01 Feb 2013 07:28:41 +0000
+Subject: swrast: Fix memory leak.
+
+Fixes resource leak defect reported by Coverity.
+
+Signed-off-by: Vinson Lee <vlee@freedesktop.org>
+Reviewed-by: Brian Paul <brianp@vmware.com>
+(cherry picked from commit 985e710c0d1f4f3bbd18448f04e611bd57ae9100)
+---
+diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
+index 9638271..b380de3 100644
+--- a/src/mesa/drivers/dri/swrast/swrast.c
++++ b/src/mesa/drivers/dri/swrast/swrast.c
+@@ -363,6 +363,7 @@ swrast_new_renderbuffer(const struct gl_config *visual, __DRIdrawable *dPriv,
+ 	xrb->bpp = 8;
+ 	break;
+     default:
++	free(xrb);
+ 	return NULL;
+     }
+ 
+--
+cgit v0.9.0.2-2-gbebe
+
+From ab159327a7dc2dd41f9887d053d4abb3de69d195 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 10 Jun 2013 17:33:59 +0000
+Subject: glsl: Add a gl_shader_program parameter to _mesa_uniform_{merge,split}_location_offset
+
+This will be used in the next commit.
+
+NOTE: This is a candidate for stable release branches.
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com>
+(cherry picked from commit 5097f358419c067a71e96e39764b3bb0a716bdbb)
+---
+diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
+index b8335fe..fbbe577 100644
+--- a/src/mesa/main/uniform_query.cpp
++++ b/src/mesa/main/uniform_query.cpp
+@@ -234,7 +234,7 @@ validate_uniform_parameters(struct gl_context *ctx,
+       return false;
+    }
+ 
+-   _mesa_uniform_split_location_offset(location, loc, array_index);
++   _mesa_uniform_split_location_offset(shProg, location, loc, array_index);
+ 
+    if (*loc >= shProg->NumUserUniformStorage) {
+       _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)",
+diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
+index d902407..cee57a7 100644
+--- a/src/mesa/main/uniforms.c
++++ b/src/mesa/main/uniforms.c
+@@ -532,7 +532,7 @@ _mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name)
+    if (shProg->UniformStorage[index].block_index != -1)
+       return -1;
+ 
+-   return _mesa_uniform_merge_location_offset(index, offset);
++   return _mesa_uniform_merge_location_offset(shProg, index, offset);
+ }
+ 
+ GLuint GLAPIENTRY
+diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
+index a12ad9b..853a27c 100644
+--- a/src/mesa/main/uniforms.h
++++ b/src/mesa/main/uniforms.h
+@@ -268,7 +268,8 @@ struct gl_builtin_uniform_desc {
+  * Combine the uniform's base location and the offset
+  */
+ static inline GLint
+-_mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset)
++_mesa_uniform_merge_location_offset(const struct gl_shader_program *prog,
++                                    unsigned base_location, unsigned offset)
+ {
+    return (base_location << 16) | offset;
+ }
+@@ -277,7 +278,8 @@ _mesa_uniform_merge_location_offset(unsigned base_location, unsigned offset)
+  * Separate the uniform base location and parameter offset
+  */
+ static inline void
+-_mesa_uniform_split_location_offset(GLint location, unsigned *base_location,
++_mesa_uniform_split_location_offset(const struct gl_shader_program *prog,
++                                    GLint location, unsigned *base_location,
+ 				    unsigned *offset)
+ {
+    *offset = location & 0xffff;
+diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+index 4286f0e..1e04f64 100644
+--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
++++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+@@ -3052,7 +3052,7 @@ set_uniform_initializer(struct gl_context *ctx, void *mem_ctx,
+         	"Couldn't find uniform for initializer %s\n", name);
+       return;
+    }
+-   int loc = _mesa_uniform_merge_location_offset(index, offset);
++   int loc = _mesa_uniform_merge_location_offset(shader_program, index, offset);
+ 
+    for (unsigned int i = 0; i < (type->is_array() ? type->length : 1); i++) {
+       ir_constant *element;
+--
+cgit v0.9.0.2-2-gbebe
+
+From 4d12a9c67c850ff2c92f301317bc3fae0bcb448a Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 10 Jun 2013 17:35:05 +0000
+Subject: glsl: Add gl_shader_program::UniformLocationBaseScale
+
+This is used by _mesa_uniform_merge_location_offset and
+_mesa_uniform_split_location_offset to determine how the base and offset
+are packed.  Previously, this value was hard coded as (1U<<16) in those
+functions via the shift and mask contained therein.  The value is still
+(1U<<16), but it can be changed in the future.
+
+The next patch dynamically generates this value.
+
+NOTE: This is a candidate for stable release branches.
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com>
+(cherry picked from commit 26d86d26f9f972b19c7040bdb1b1daf48537ef3e)
+---
+diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
+index d457e4d..ac726f4 100644
+--- a/src/glsl/link_uniforms.cpp
++++ b/src/glsl/link_uniforms.cpp
+@@ -730,6 +730,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog)
+ 
+    assert(sizeof(prog->SamplerTargets) == sizeof(parcel.targets));
+    memcpy(prog->SamplerTargets, parcel.targets, sizeof(prog->SamplerTargets));
++   prog->UniformLocationBaseScale = (1U<<16);
+ 
+ #ifndef NDEBUG
+    for (unsigned i = 0; i < num_user_uniforms; i++) {
+diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
+index 23c3a0d..3e440f5 100644
+--- a/src/mesa/main/mtypes.h
++++ b/src/mesa/main/mtypes.h
+@@ -2419,6 +2419,21 @@ struct gl_shader_program
+    unsigned NumUniformBlocks;
+ 
+    /**
++    * Scale factor for the uniform base location
++    *
++    * This is used to generate locations (returned by \c glGetUniformLocation)
++    * of uniforms.  The base location of the uniform is multiplied by this
++    * value, and the array index is added.
++    *
++    * \note
++    * Must be >= 1.
++    *
++    * \sa
++    * _mesa_uniform_merge_location_offset, _mesa_uniform_split_location_offset
++    */
++   unsigned UniformLocationBaseScale;
++
++   /**
+     * Indices into the _LinkedShaders's UniformBlocks[] array for each stage
+     * they're used in, or -1.
+     *
+diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
+index 59daff5..0494320 100644
+--- a/src/mesa/main/shaderobj.c
++++ b/src/mesa/main/shaderobj.c
+@@ -283,6 +283,7 @@ _mesa_clear_shader_program_data(struct gl_context *ctx,
+       ralloc_free(shProg->UniformStorage);
+       shProg->NumUserUniformStorage = 0;
+       shProg->UniformStorage = NULL;
++      shProg->UniformLocationBaseScale = 0;
+    }
+ 
+    if (shProg->UniformHash) {
+diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h
+index 853a27c..421232d 100644
+--- a/src/mesa/main/uniforms.h
++++ b/src/mesa/main/uniforms.h
+@@ -271,7 +271,9 @@ static inline GLint
+ _mesa_uniform_merge_location_offset(const struct gl_shader_program *prog,
+                                     unsigned base_location, unsigned offset)
+ {
+-   return (base_location << 16) | offset;
++   assert(prog->UniformLocationBaseScale >= 0);
++   assert(offset < prog->UniformLocationBaseScale);
++   return (base_location * prog->UniformLocationBaseScale) + offset;
+ }
+ 
+ /**
+@@ -282,8 +284,8 @@ _mesa_uniform_split_location_offset(const struct gl_shader_program *prog,
+                                     GLint location, unsigned *base_location,
+ 				    unsigned *offset)
+ {
+-   *offset = location & 0xffff;
+-   *base_location = location >> 16;
++   *offset = location % prog->UniformLocationBaseScale;
++   *base_location = location / prog->UniformLocationBaseScale;
+ }
+ /*@}*/
+ 
+--
+cgit v0.9.0.2-2-gbebe
+
+From 307a703c759263bb37285b0919721ff2c413fc56 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 10 Jun 2013 17:39:28 +0000
+Subject: glsl: Generate smaller values for uniform locations
+
+Previously we would generate uniform locations as (slot << 16) +
+array_index.  We do this to handle applications that assume the location
+of a[2] will be +1 from the location of a[1].  This resulted in every
+uniform location being at least 0x10000.  The OpenGL 4.3 spec was
+amended to require this behavior, but previous versions did not require
+locations of array (or structure) members be sequential.
+
+We've now encountered two applications that assume uniform values will
+be "small."  As far as we can tell, these applications store the GLint
+returned by glGetUniformLocation in a int16_t or possibly an int8_t.
+
+THIS BEHAVIOR IS NOT GUARANTEED OR IMPLIED BY ANY VERSION OF OpenGL.
+
+Other implementations happen to have both these behaviors (sequential
+array elements and small values) since OpenGL 2.0, so let's just match
+their behavior.
+
+Fixes "3D Bowling" on Android.
+
+NOTE: This is a candidate for stable release branches.
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Reviewed-and-tested-by: Chad Versace <chad.versace@linux.intel.com>
+(cherry picked from commit cfa3c5ad828f56559a6cc2de299f993b8e748ea4)
+---
+diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
+index ac726f4..8e01d2e 100644
+--- a/src/glsl/link_uniforms.cpp
++++ b/src/glsl/link_uniforms.cpp
+@@ -730,7 +730,20 @@ link_assign_uniform_locations(struct gl_shader_program *prog)
+ 
+    assert(sizeof(prog->SamplerTargets) == sizeof(parcel.targets));
+    memcpy(prog->SamplerTargets, parcel.targets, sizeof(prog->SamplerTargets));
+-   prog->UniformLocationBaseScale = (1U<<16);
++
++   /* Determine the size of the largest uniform array queryable via
++    * glGetUniformLocation.  Using this as the location scale guarantees that
++    * there is enough "room" for the array index to be stored in the low order
++    * part of the uniform location.  It also makes the locations be more
++    * tightly packed.
++    */
++   unsigned max_array_size = 1;
++   for (unsigned i = 0; i < num_user_uniforms; i++) {
++      if (uniforms[i].array_elements > max_array_size)
++         max_array_size = uniforms[i].array_elements;
++   }
++
++   prog->UniformLocationBaseScale = max_array_size;
+ 
+ #ifndef NDEBUG
+    for (unsigned i = 0; i < num_user_uniforms; i++) {
+--
+cgit v0.9.0.2-2-gbebe
+
+From 2cfc0072a80cfd9503be7e57a1d8375d64d7eb98 Mon Sep 17 00:00:00 2001
+From: Richard Sandiford <r.sandiford@uk.ibm.com>
+Date: Mon, 17 Jun 2013 16:10:49 +0000
+Subject: st/xlib Fix XIMage bytes-per-pixel calculation
+
+Fixes a crash seen while running gnome on a 16-bit screen over vnc.
+
+NOTE: This is a candidate for stable release branches.
+
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com>
+(cherry picked from commit 876fefe2ff8901ae4b908cff89ac5dd4324f4fe5)
+---
+diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
+index 5c6d6a7..4f99e23 100644
+--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
++++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
+@@ -1392,9 +1392,8 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer,
+          return;
+       }
+ 
+-      /* The pipe transfer has a pitch rounded up to the nearest 64 pixels.
+-         We assume 32 bit pixels. */
+-      ximage_stride = w * 4;
++      /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */
++      ximage_stride = w * ((img->bits_per_pixel + 7) / 8);
+ 
+       for (line = 0; line < h; line++)
+          memcpy(&map[line * tex_xfer->stride],
+--
+cgit v0.9.0.2-2-gbebe
+
+From 8ed60f7f7fb060ccf939328bb03c9714b207236f Mon Sep 17 00:00:00 2001
+From: Richard Sandiford <r.sandiford@uk.ibm.com>
+Date: Mon, 17 Jun 2013 16:13:25 +0000
+Subject: st/xlib: Fix XImage stride calculation
+
+Fixes window skew seen while running gnome on a 16-bit screen over vnc.
+
+NOTE: This is a candidate for stable release branches.
+
+Reviewed-by: Brian Paul <brianp@vmware.com>
+Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com>
+(cherry picked from commit c132c2978b02da7140462a633605a0127dfcceb4)
+---
+diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
+index 4f99e23..9bfd372 100644
+--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
++++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
+@@ -1366,7 +1366,7 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer,
+       enum pipe_format internal_format = res->format;
+       struct pipe_transfer *tex_xfer;
+       char *map;
+-      int line, ximage_stride;
++      int line, byte_width;
+       XImage *img;
+ 
+       internal_format = choose_pixel_format(drawable->xm_visual);
+@@ -1393,12 +1393,12 @@ XMesaBindTexImage(Display *dpy, XMesaBuffer drawable, int buffer,
+       }
+ 
+       /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */
+-      ximage_stride = w * ((img->bits_per_pixel + 7) / 8);
++      byte_width = w * ((img->bits_per_pixel + 7) / 8);
+ 
+       for (line = 0; line < h; line++)
+          memcpy(&map[line * tex_xfer->stride],
+-                &img->data[line * ximage_stride],
+-                ximage_stride);
++                &img->data[line * img->bytes_per_line],
++                byte_width);
+ 
+       pipe_transfer_unmap(pipe, tex_xfer);
+ 
+--
+cgit v0.9.0.2-2-gbebe
+
+From 5412ae63dca1b1a6c43fccb5bafe56a0cd9c9a88 Mon Sep 17 00:00:00 2001
+From: Kristian Høgsberg <krh@bitplanet.net>
+Date: Tue, 18 Jun 2013 20:53:46 +0000
+Subject: wayland: Handle global_remove event as well
+
+We need to set up a handler for the global_remove event that gets sent
+out when a global gets removed.  Without the handler we end up calling
+a NULL pointer.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=65910
+
+NOTE: This is a candidate for the stable branches.
+
+Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
+(cherry picked from commit 712269d6744a8849d1d0cf01fa0132d969b79ed4)
+---
+diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
+index 99d8729..e106dc2 100644
+--- a/src/egl/drivers/dri2/platform_wayland.c
++++ b/src/egl/drivers/dri2/platform_wayland.c
+@@ -643,8 +643,15 @@ registry_handle_global(void *data, struct wl_registry *registry, uint32_t name,
+    }
+ }
+ 
++static void
++registry_handle_global_remove(void *data, struct wl_registry *registry,
++			      uint32_t name)
++{
++}
++
+ static const struct wl_registry_listener registry_listener = {
+-	registry_handle_global
++   registry_handle_global,
++   registry_handle_global_remove
+ };
+ 
+ EGLBoolean
+--
+cgit v0.9.0.2-2-gbebe
+
+From cda92f5191cd2ed4782dbdd41143d520857861c9 Mon Sep 17 00:00:00 2001
+From: Richard Sandiford <rsandifo@linux.vnet.ibm.com>
+Date: Tue, 18 Jun 2013 15:41:43 +0000
+Subject: st/dri/sw: Fix pitch calculation in drisw_update_tex_buffer
+
+swrastGetImage rounds the pitch up to 4 bytes for compatibility reasons
+that are explained in drisw_glx.c:bytes_per_line, so drisw_update_tex_buffer
+must do the same.
+
+Fixes window skew seen while running firefox over vnc on a 16-bit screen.
+
+NOTE: This is a candidate for the stable branches.
+
+[ajax: fixed typo in comment]
+
+Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
+Signed-off-by: Richard Sandiford <rsandifo@linux.vnet.ibm.com>
+(cherry picked from commit 5a0556f061d9db00dd7637433d393beead3b3d85)
+---
+diff --git a/src/gallium/state_trackers/dri/sw/drisw.c b/src/gallium/state_trackers/dri/sw/drisw.c
+index 7a5f797..41f66d5 100644
+--- a/src/gallium/state_trackers/dri/sw/drisw.c
++++ b/src/gallium/state_trackers/dri/sw/drisw.c
+@@ -265,8 +265,9 @@ drisw_update_tex_buffer(struct dri_drawable *drawable,
+    /* Copy the Drawable content to the mapped texture buffer */
+    get_image(dPriv, x, y, w, h, map);
+ 
+-   /* The pipe transfer has a pitch rounded up to the nearest 64 pixels. */
+-   ximage_stride = w * cpp;
++   /* The pipe transfer has a pitch rounded up to the nearest 64 pixels.
++      get_image() has a pitch rounded up to 4 bytes.  */
++   ximage_stride = ((w * cpp) + 3) & -4;
+    for (line = h-1; line; --line) {
+       memmove(&map[line * transfer->stride],
+               &map[line * ximage_stride],
+--
+cgit v0.9.0.2-2-gbebe
+
+From 26f802d0635fc247bbc3ebf6f7e9bf126b6b5e69 Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Thu, 31 Jan 2013 00:44:25 +0000
+Subject: svga: check for NaN shader immediates
+
+The svga device doesn't handle them.  Replace with zeros.
+Fixes several piglit tests, such as "glsl-const-builtin-inversesqrt".
+
+Reviewed-by: Reviewed-by: José Fonseca <jfonseca@vmware.com>
+(cherry picked from commit 3cb491534493a52e9a88cb88d31727569afb8167)
+---
+diff --git a/src/gallium/drivers/svga/svga_tgsi_insn.c b/src/gallium/drivers/svga/svga_tgsi_insn.c
+index 36ed008..d439e5b 100644
+--- a/src/gallium/drivers/svga/svga_tgsi_insn.c
++++ b/src/gallium/drivers/svga/svga_tgsi_insn.c
+@@ -2716,8 +2716,10 @@ static boolean svga_emit_immediate( struct svga_shader_emitter *emit,
+    unsigned i;
+ 
+    assert(1 <= imm->Immediate.NrTokens && imm->Immediate.NrTokens <= 5);
+-   for (i = 0; i < imm->Immediate.NrTokens - 1; i++)
+-      value[i] = imm->u[i].Float;
++   for (i = 0; i < imm->Immediate.NrTokens - 1; i++) {
++      float f = imm->u[i].Float;
++      value[i] = util_is_inf_or_nan(f) ? 0.0f : f;
++   }
+ 
+    for ( ; i < 4; i++ )
+       value[i] = id[i];
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index ea2db4660..ebe172536 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189221 2013-06-30 05:10:45Z giovanni $
+# $Id: PKGBUILD 190046 2013-07-13 12:42:05Z svenstaro $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
 pkgver=6.3.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
diff --git a/extra/ocrad/PKGBUILD b/extra/ocrad/PKGBUILD
index cb16b8f40..9bf2bef38 100644
--- a/extra/ocrad/PKGBUILD
+++ b/extra/ocrad/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 143923 2011-11-30 20:57:38Z giovanni $
+# $Id: PKGBUILD 190021 2013-07-12 22:00:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=ocrad
-pkgver=0.21
-pkgrel=2.1
+pkgver=0.22
+pkgrel=1
 pkgdesc="An Optical Character Recognition program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ocrad/ocrad.html"
 license=('GPL3')
 depends=('gcc-libs' 'texinfo')
 install=ocrad.install
-source=("http://ftp.gnu.org/gnu/ocrad/ocrad-$pkgver.tar.gz")
-md5sums=('83f9eae9d808f9d86c181538d3f64aed')
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz")
+md5sums=('e84f0fb0dcd9b7b067201f9a3b89e06c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index a677f6969..068e5c9b0 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189712 2013-07-05 15:55:50Z schiv $
+# $Id: PKGBUILD 189985 2013-07-12 13:37:23Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=opencv
 pkgname=('opencv' 'opencv-samples')
 _realname=OpenCV
-pkgver=2.4.6
+pkgver=2.4.6.1
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,10 +24,12 @@ if [ "$CARCH" != "mips64el" ]; then
 fi
 source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz"
         'pkgconfig.patch'
-        'fsh.patch')
-md5sums=('c5e8758a419b4f258611b17fc83aafaf'
+        'fsh.patch'
+        'cldetect.patch')
+md5sums=('d756bfa460891697571d5c90050e1cfe'
          'cb916260b5ec594fe7a0cc2e54fc569f'
-         '35256e3ccace373feba8131d1540a0de')
+         '35256e3ccace373feba8131d1540a0de'
+         '0dd6572405adc2387ded4c95be0f189c')
 
 if [ "$CARCH" != "mips64el" ]; then
   _cmakeopts=('-D WITH_OPENCL=ON'
@@ -38,7 +40,6 @@ fi
 _cmakeopts+=(
             '-D WITH_OPENGL=ON'
             '-D WITH_XINE=ON'
-            '-D BUILD_PACKAGE=OFF'
             '-D BUILD_WITH_DEBUG_INFO=OFF'
             '-D BUILD_TESTS=OFF'
             '-D BUILD_PERF_TESTS=OFF'
@@ -61,6 +62,11 @@ _cmakeopts+=(
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # fix missing opencl module
+  # see https://bugs.archlinux.org/task/36076
+  # and http://code.opencv.org/issues/3140
+  patch -Np1 -i "$srcdir/cldetect.patch"
+
   # fix pkg-config mess
   # see https://bugs.archlinux.org/task/32430
   # and http://code.opencv.org/issues/1925
diff --git a/extra/opencv/cldetect.patch b/extra/opencv/cldetect.patch
new file mode 100644
index 000000000..6dbe1608c
--- /dev/null
+++ b/extra/opencv/cldetect.patch
@@ -0,0 +1,23 @@
+diff -ur opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake
+--- opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake	2013-07-11 18:57:27.363199736 +0000
++++ opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake	2013-07-11 19:04:00.577069207 +0000
+@@ -17,8 +17,7 @@
+               NAMES OpenCL/cl.h CL/cl.h
+               HINTS ${OPENCL_ROOT_DIR}
+               PATH_SUFFIXES include include/nvidia-current
+-              DOC "OpenCL include directory"
+-              NO_DEFAULT_PATH)
++              DOC "OpenCL include directory")
+ 
+     if (X86_64)
+       set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64)
+@@ -30,8 +29,7 @@
+               NAMES OpenCL
+               HINTS ${OPENCL_ROOT_DIR}
+               PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES}
+-              DOC "OpenCL library"
+-              NO_DEFAULT_PATH)
++              DOC "OpenCL library")
+ 
+     mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
+     include(FindPackageHandleStandardArgs)
diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD
index 96d8d09df..692a2f15f 100644
--- a/extra/opus/PKGBUILD
+++ b/extra/opus/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 184222 2013-05-04 08:38:14Z heftig $
+# $Id: PKGBUILD 190019 2013-07-12 21:33:32Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
 # Contributor: pumbur
 
 pkgname=opus
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.3
+pkgrel=1
 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
 arch=(i686 x86_64 mips64el)
 url="http://www.opus-codec.org/"
@@ -14,7 +14,7 @@ license=(BSD)
 depends=(glibc)
 options=('!libtool')
 source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('c503ad05a59ddb44deab96204401be03')
+md5sums=('86eedbd3c5a0171d2437850435e6edff')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/perl-bit-vector/Bit-Vector-destroy.patch b/extra/perl-bit-vector/Bit-Vector-destroy.patch
deleted file mode 100644
index 580f4cf21..000000000
--- a/extra/perl-bit-vector/Bit-Vector-destroy.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0646f34fc3eeb47627822df860986cf7bee4ebed Mon Sep 17 00:00:00 2001
-From: Gisle Aas <gisle@activestate.com>
-Date: Thu, 28 Mar 2013 00:41:07 -0700
-Subject: [PATCH] eval { 1->method } triggers different error in 5.17.11
-
----
- t/02_____destroy.t |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/t/02_____destroy.t b/t/02_____destroy.t
-index 41e3aa3..adcf995 100644
---- a/t/02_____destroy.t
-+++ b/t/02_____destroy.t
-@@ -17,7 +17,9 @@ if (ref($set) eq '')
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- eval { $set->DESTROY(); };
--if ($@ =~ /Can't call method "DESTROY" without a package or object reference/)
-+if ($@ =~ /Can't call method "DESTROY" without a package or object reference/ ||
-+    $@ =~ /Can't locate object method "DESTROY" via package "1"/
-+)
- {print "ok $n\n";} else {print "not ok $n\n";}
- $n++;
- eval { Bit::Vector::DESTROY($set); };
--- 
-1.7.0.5
-
diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD
index e0852fbc8..08f175bfb 100644
--- a/extra/perl-bit-vector/PKGBUILD
+++ b/extra/perl-bit-vector/PKGBUILD
@@ -1,43 +1,31 @@
-# $Id: PKGBUILD 186393 2013-05-26 09:24:52Z bluewind $
+# $Id: PKGBUILD 189971 2013-07-12 02:57:43Z eric $
 # Maintainer:
 # Contributor: Kevin Piche <kevin@archlinux.org>
-# Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=perl-bit-vector
-_cpanname=Bit-Vector
-pkgver=7.2
-pkgrel=3
+pkgver=7.3
+pkgrel=1
 pkgdesc='Efficient bit vector, set of integers and "big int" math library'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/${_cpanname}/"
+url="http://search.cpan.org/dist/Bit-Vector/"
 depends=('perl-carp-clan' 'perl')
 options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz
-        Bit-Vector-destroy.patch)
-md5sums=('bc6ae34738b8f889290bf50099ff8aed'
-         'c86a55b84cb05dd04004ee8f56ee2ee3')
-
-prepare() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
-
-  # https://rt.cpan.org/Public/Bug/Display.html?id=84250
-  patch -Np1 -i "${srcdir}/Bit-Vector-destroy.patch"
-}
+source=(http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/Bit-Vector-${pkgver}.tar.gz)
+md5sums=('684e63a93db1e0eda25a103258b39725')
 
 build() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  cd Bit-Vector-$pkgver
+  perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
+  cd Bit-Vector-$pkgver
   make test
 }
 
 package() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
+  cd Bit-Vector-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD
index b18890417..e6d9d6f38 100644
--- a/extra/python-markupsafe/PKGBUILD
+++ b/extra/python-markupsafe/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 169021 2012-10-17 10:20:38Z allan $
+# $Id: PKGBUILD 189977 2013-07-12 06:16:17Z eric $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alex Anthony <alex.anthony28991@gmail.com>
 
 pkgname=('python-markupsafe' 'python2-markupsafe')
-pkgver=0.15
-pkgrel=2
+pkgver=0.18
+pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/MarkupSafe"
 license=('custom')
 makedepends=('python-distribute' 'python2-distribute')
 source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
-md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186')
+md5sums=('f8d252fd05371e51dec2fe9a36890687')
 
 build() {
   cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
@@ -22,10 +22,18 @@ build() {
   python2 setup.py build
 }
 
+check() {
+  cd "${srcdir}/MarkupSafe-${pkgver}"
+  python setup.py test
+
+  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+  python2 setup.py test
+}
+
 package_python-markupsafe() {
   depends=('python')
 
-  cd "${srcdir}/MarkupSafe-${pkgver}"
+  cd MarkupSafe-${pkgver}
   python setup.py install --root="${pkgdir}" --optimize=1
 
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE"
@@ -34,7 +42,7 @@ package_python-markupsafe() {
 package_python2-markupsafe() {
   depends=('python2')
 
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+  cd python2-MarkupSafe-${pkgver}
   python2 setup.py install --root="${pkgdir}" --optimize=1
 
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE"
diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD
index ea3c69e54..6bb1b7e90 100644
--- a/extra/qtiplot/PKGBUILD
+++ b/extra/qtiplot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 184803 2013-05-09 04:24:34Z bpiotrowski $
+# $Id: PKGBUILD 190047 2013-07-13 12:42:16Z svenstaro $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir.archlinux.org>
 # Contributor: Gergely Imreh <imrehg@gmail.com>
 
 pkgname=qtiplot
 pkgver=0.9.8.9
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 url="http://soft.proindependent.com/qtiplot.html"
 pkgdesc="Data analysis and scientific plotting - free clone of Origin"
diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD
index 1b19b9e24..b4cc1ea97 100644
--- a/extra/rtmpdump/PKGBUILD
+++ b/extra/rtmpdump/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 187070 2013-06-03 11:16:53Z allan $
+# $Id: PKGBUILD 189979 2013-07-12 06:44:58Z eric $
 # Maintainer:
 # Contributor: xduugu
 # Contributor: Elis Hughes <elishughes@googlemail.com>
 
 pkgname=rtmpdump
-pkgver=20121203
-pkgrel=2
+pkgver=20121230
+pkgrel=1
 pkgdesc="A tool to download rtmp streams"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://rtmpdump.mplayerhq.hu/"
@@ -14,16 +14,14 @@ depends=('openssl')
 options=(!makeflags)
 #git://git.ffmpeg.org/rtmpdump 
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('e5d9f7411bddd5a12be677f2a285c38100313db2b3b1f8d2a709d46e03741409')
+sha256sums=('89faf9df54204dbab211621809aa961ea6405e192cc0ce6633307e87aed400b7')
 
 build() {
-    make -C "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
+  make
 }
 
 package() {
-    make -C "$pkgname-$pkgver" prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install
-        # usrmove
-        cd "$pkgdir"
-        mv usr/sbin/* usr/bin
-        rmdir usr/sbin
+  cd $pkgname-$pkgver
+  make prefix=/usr sbindir=/usr/bin mandir=/usr/share/man DESTDIR="$pkgdir" install
 }
diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
index 51f2f93a6..ba4aad179 100644
--- a/extra/scribus/PKGBUILD
+++ b/extra/scribus/PKGBUILD
@@ -1,52 +1,49 @@
-# $Id: PKGBUILD 178994 2013-03-01 10:25:10Z andrea $
+# $Id: PKGBUILD 190048 2013-07-13 12:42:28Z svenstaro $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scribus
 pkgver=1.4.2
-pkgrel=2
-pkgdesc="A desktop publishing program"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.scribus.net"
+pkgrel=3
+pkgdesc='Desktop publishing software'
+url="http://www.scribus.net/"
 license=('GPL')
-install=scribus.install
-depends=('libcups>=1.3.11' 'lcms2' 'qt4' 'ghostscript>=8.70' \
-         'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
-         'desktop-file-utils' 'shared-mime-info' \
-         'hyphen' 'aspell' 'boost-libs')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('cmake' 'boost' 'mesa')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
+         'ghostscript' 'python2' 'aspell' 'boost-libs'
+         'desktop-file-utils' 'shared-mime-info')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
 
-build() {
-	cd "${srcdir}"
+options=('!libtool')
+install=install
 
-	sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
-	       -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-               scribus-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/*
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' -i scribus.desktop
+	sed \
+		-e 's|#!/usr/bin/python|#!/usr/bin/python2|' \
+		-e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+		-i scribus/plugins/scriptplugin/{samples,scripts}/*
+	install -d ../build
+}
 
-	mkdir build
-	cd build
-	cmake ../scribus-${pkgver} \
-	   -DCMAKE_INSTALL_PREFIX=/usr \
-	   -DCMAKE_BUILD_TYPE=Release \
-	   -DCMAKE_SKIP_RPATH=ON \
-	   -DWANT_CAIRO=1 \
-	   -DLIB_SUFFIX=""
+build() {
+	cd "${srcdir}/build"
+	cmake "../${pkgname}-${pkgver}" \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DLIB_SUFFIX=""
 	make
 }
 
 package() {
 	cd "${srcdir}/build"
 	make DESTDIR="${pkgdir}" install
-
-	# fix icon path in .desktop file
-	sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \
-	   "${srcdir}/scribus-${pkgver}/scribus.desktop"
-
-	install -Dm644 "${srcdir}/scribus-${pkgver}/scribus.desktop" \
-	   "${pkgdir}/usr/share/applications/scribus.desktop"
+	install -Dm644 "../${pkgname}-${pkgver}/scribus.desktop" "${pkgdir}/usr/share/applications/scribus.desktop"
 }
diff --git a/extra/scribus/install b/extra/scribus/install
new file mode 100644
index 000000000..8040f715b
--- /dev/null
+++ b/extra/scribus/install
@@ -0,0 +1,11 @@
+post_install() {
+	update-mime-database usr/share/mime &> /dev/null
+	update-desktop-database -q
+}
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/extra/scribus/scribus.install b/extra/scribus/scribus.install
deleted file mode 100644
index 52a6286ac..000000000
--- a/extra/scribus/scribus.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 5328e64ea..95e0062a5 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 181128 2013-03-31 19:16:57Z stephane $
+# $Id: PKGBUILD 190049 2013-07-13 12:42:47Z svenstaro $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=source-highlight
 pkgver=3.1.7
-pkgrel=5
+pkgrel=6
 pkgdesc="Convert source code to syntax highlighted document"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/src-highlite/"
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index 6b2f06e48..b78bd338a 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 187012 2013-06-03 08:51:25Z andrea $
+# $Id: PKGBUILD 190050 2013-07-13 12:42:56Z svenstaro $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=strigi
 pkgver=0.7.8
-pkgrel=3
+pkgrel=4
 pkgdesc="Fast crawling desktop search engine with Qt GUI"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://strigi.sourceforge.net/'
 license=('GPL2')
-depends=('dbus' 'exiv2' 'libxml2' 'boost-libs')
-makedepends=('cmake' 'pkg-config' 'boost')
+depends=('dbus' 'exiv2' 'libxml2' 'bzip2')
+makedepends=('cmake')
 optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
             'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
 source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
@@ -19,12 +19,13 @@ md5sums=('d69443234f4286d71997db9de543331a'
          'd48d65014650644ba61821813101c2f4')
 
 prepare() {
+  mkdir build
+  
   cd ${pkgname}-${pkgver}/libstreams
   patch -p1 -i "${srcdir}"/gcc48.patch
 }
 
 build() {
-  mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/xdg-user-dirs/PKGBUILD b/extra/xdg-user-dirs/PKGBUILD
index 3efdbd2fe..9a2b73d29 100644
--- a/extra/xdg-user-dirs/PKGBUILD
+++ b/extra/xdg-user-dirs/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 153519 2012-03-15 14:03:02Z heftig $
+# $Id: PKGBUILD 189993 2013-07-12 15:01:21Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor:  <mathieu.clabaut@gmail.com>
 
 pkgname=xdg-user-dirs
-pkgver=0.14
-pkgrel=3
+pkgver=0.15
+pkgrel=1
 pkgdesc="Manage user directories like ~/Desktop and ~/Music"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('sh')
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-license=('GPL')
-backup=('etc/xdg/user-dirs.conf' 'etc/xdg/user-dirs.defaults')
+license=(GPL)
+depends=(sh)
+makedepends=(docbook-xsl)
+backup=(etc/xdg/user-dirs.conf etc/xdg/user-dirs.defaults)
 source=(http://user-dirs.freedesktop.org/releases/$pkgname-$pkgver.tar.gz
         xdg-user-dirs)
-sha256sums=('5f4e84f57c113f642ffdd646126855f45f1da955103119dbd2382edb516e6255'
+sha256sums=('20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786'
             'f0f27de23d849b2fa4ebf59e448b5a843b577d14dc2c1070e228999091fa7f5e')
 
 build() {
diff --git a/extra/xsd/PKGBUILD b/extra/xsd/PKGBUILD
index 4a0cf2a7f..8309fe961 100644
--- a/extra/xsd/PKGBUILD
+++ b/extra/xsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 181130 2013-03-31 19:17:00Z stephane $
+# $Id: PKGBUILD 190051 2013-07-13 12:43:05Z svenstaro $
 # Maintainer:
 # Contributor: kevku <kevku@gmx.com>
 
 pkgname=xsd
 pkgver=3.3.0
 _pkgver=3.3.0-2+dep
-pkgrel=8
+pkgrel=9
 pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding compiler"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.codesynthesis.com/products/xsd"
@@ -17,10 +17,13 @@ source=("http://www.codesynthesis.com/download/${pkgname}/3.3/${pkgname}-${_pkgv
 sha1sums=('1c9de9271f589b8ecf2be18f2e9ac87330fc8281'
           '8f7ca8bf0440b30d8f5823e0f528db19810706f2')
 
-build() {
+prepare() {
   cd "${pkgname}-${_pkgver}"
   patch -p0 -i "${srcdir}/xsdcxx.patch"
+}
 
+build() {
+  cd "${pkgname}-${_pkgver}"
   make CXXFLAGS="${CXXFLAGS}"
 }
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2013-07-14 15:27:23 -0300
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2013-07-14 15:27:23 -0300
commit	a594ebe149ad81798984a410c036a0965df1581a (patch)
tree	9f92df878175fe438860b196b7394ec8f0bac4cd /extra
parent	03d128385c4ca773e67c93729a45899590d0d99e (diff)
parent	d525d9a731f5d79c1128a192b9d2977a2967570f (diff)