Fri Feb 7 03:21:50 UTC 2014

16 files changed, 88 insertions, 670 deletions

diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index da6b00a57..49bb20157 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 201548 2013-12-14 21:56:57Z andyrtr $
+# $Id: PKGBUILD 205523 2014-02-06 16:23:04Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=claws-mail
 pkgver=3.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A GTK+ based e-mail client."
 arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://www.claws-mail.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' 'compface'
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface'
          'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('spamassassin' 'bogofilter' 'valgrind' 
              # dependencies for plugins
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index 90291eb21..a77caff88 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 199065 2013-11-08 03:17:34Z bisson $
+# $Id: PKGBUILD 205494 2014-02-06 05:24:01Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: James Rayner <james@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=conky
 pkgver=1.9.0
-pkgrel=2
+pkgrel=4
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 8d83f579f..cbfc30fc8 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 204248 2014-01-15 14:35:38Z dan $
+# $Id: PKGBUILD 205529 2014-02-06 18:45:30Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.5.3
+pkgver=1.8.5.4
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -107,6 +107,6 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('57b966065882f83ef5879620a1e329ca'
+md5sums=('25965b5973aae43848a4ba5ca91b6a52'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 0d8520e20..24910a3b0 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 205430 2014-02-04 18:28:47Z svenstaro $
+# $Id: PKGBUILD 205542 2014-02-06 20:54:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.11.6
+_pkgver=4.12.2
 pkgrel=1
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
@@ -25,7 +26,7 @@ optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces'
             'appmenu-qt: menu applications over dbus')
 install="${pkgname}.install"
 backup=('usr/share/config/kdm/kdmrc')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
+source=("http://download.kde.org/stable/${_pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
         'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
 sha1sums=('f1da23a472064307dcd244605a7004701982e5de'
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index 1ada0ba03..2a194feaa 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 205428 2014-02-04 17:15:14Z heftig $
+# $Id: PKGBUILD 205540 2014-02-06 20:50:44Z heftig $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=libchamplain
-pkgver=0.12.6
+pkgver=0.12.7
 pkgrel=1
 pkgdesc="Gtk3 widget for displaying rasterized maps"
 url="http://projects.gnome.org/libchamplain/"
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64')
 depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2400ff2f4b25e5441b3a7d988e8ff996c9d2107d0aca101fc22320969db22576')
+sha256sums=('b607fa7e32dd67e5d9541d620abb212a85d076d1def0252c0112a362bddeac5e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index 033e99d79..3c4e298ce 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -1,19 +1,28 @@
-# $Id: PKGBUILD 198154 2013-10-30 13:07:31Z allan $
+# $Id: PKGBUILD 205522 2014-02-06 16:23:03Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libetpan
-pkgver=1.1
-pkgrel=4
+pkgver=1.2
+pkgrel=1
 pkgdesc="A portable middleware for email access"
 arch=('i686' 'x86_64')
-url="http://www.etpan.org/"
+url="http://www.etpan.org/libetpan.html"
 license=("custom:etpan")
 depends=('libsasl' 'curl' 'expat')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6fee60d08506e941642b8fa087e60b07')
+source=(https://github.com/dinhviethoa/${pkgname}/archive/${pkgver}.tar.gz)
+md5sums=('c15905ebc2ec620afb8bcca7b9d9c232')
 
 build() {
   cd ${pkgname}-${pkgver}
+  
+  # generate automake files that are not included in the tarball
+  libtoolize --force --copy
+  aclocal -I m4
+  autoheader
+  autoconf
+  automake --add-missing --foreign --force --copy
+  #autoreconf -vfi
+
   ./configure --prefix=/usr \
     --disable-static \
     --disable-db
diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD
deleted file mode 100644
index d269075a6..000000000
--- a/extra/libftdi/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 205481 2014-02-05 19:47:07Z eric $
-# Maintainer:
-
-pkgname=libftdi
-pkgver=1.1
-pkgrel=1
-pkgdesc="A library to talk to FTDI chips"
-arch=('i686' 'x86_64')
-url="http://www.intra2net.com/en/developer/libftdi/download.php"
-license=('GPL2' 'LGPL2.1')
-depends=('libusbx')
-makedepends=('boost' 'cmake')
-source=(http://www.intra2net.com/en/developer/libftdi/download/${pkgname}1-$pkgver.tar.bz2{,.sig})
-sha1sums=('f05ade5614aa31e64f91a30ce3782f7ca3704d18'
-          'SKIP')
-
-prepare() {
-  cd ${pkgname}1-$pkgver
-  sed -i 's|LIB_SUFFIX 64|LIB_SUFFIX ""|' CMakeLists.txt
-}
-
-build() {
-  cd ${pkgname}1-$pkgver
-  mkdir build
-  cd build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd ${pkgname}1-$pkgver/build
-  make DESTDIR="$pkgdir" install
-  find examples -type f -perm -755 -exec install {} "$pkgdir/usr/bin" \;
-  # Remove eepreom (conflict with i2c-tools FS#37925)
-  rm "$pkgdir/usr/bin/eeprom"
-}
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 5f5fe7725..059249cb8 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 198322 2013-10-30 14:09:45Z allan $
+# $Id: PKGBUILD 205535 2014-02-06 19:58:31Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
-pkgver=2.5beta1
-pkgrel=5
+pkgver=2.5.0beta2
+pkgrel=1
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to use"
 arch=('i686' 'x86_64')
 url="http://moc.daper.net/"
 license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file' 'popt')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug' 'faad2')
-optdepends=('speex: for using the speex plugin' 
+optdepends=('speex: for using the speex plugin'
 	    'ffmpeg: for using the ffmpeg plugin'
-	    'taglib: for using the musepack plugin' 
-	    'libmpcdec: for using the musepack plugin' 
-            'wavpack: for using the wavpack plugin' 
-            'faad2: for using the aac plugin' 
+	    'taglib: for using the musepack plugin'
+	    'libmpcdec: for using the musepack plugin'
+            'wavpack: for using the wavpack plugin'
+            'faad2: for using the aac plugin'
 	    'libmodplug: for using the modplug plugin')
-source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig} \
-        moc-ffmpeg.patch)
-sha1sums=('4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa'
-          '29c232c37e1f3737c3b670372732446e9c0786a8'
-          'f3b8b327dd27d50422b1ad8c9ef89a7366529307')
+source=(http://ftp.daper.net/pub/soft/moc/unstable/moc-${pkgver%b*}-${pkgver#*.*.?}.tar.bz2{,.sig})
+sha1sums=('bf786d719c853c22dec74bc2ee565aae4596fbe7'
+          'SKIP')
 
 # source PKGBUILD && mksource
 mksource() {
@@ -40,13 +38,8 @@ mksource() {
   gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
 }
 
-prepare() {
-  cd ${pkgname}-2.5.0-beta1
-  patch -p0 -i "${srcdir}/moc-ffmpeg.patch"
-}
-
 build() {
-  cd ${pkgname}-2.5.0-beta1
+  cd ${pkgname}-${pkgver%b*}-${pkgver#*.*.?}
   ./configure --prefix=/usr --without-rcc \
     --with-oss --with-alsa --with-jack --with-aac --with-mp3 \
     --with-musepack --with-vorbis --with-flac --with-wavpack \
@@ -56,6 +49,6 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-2.5.0-beta1
+  cd ${pkgname}-${pkgver%b*}-${pkgver#*.*.?}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch
deleted file mode 100644
index e268e5427..000000000
--- a/extra/moc/moc-ffmpeg.patch
+++ /dev/null
@@ -1,557 +0,0 @@
-Index: menu.c
-===================================================================
---- menu.c	(revision 2516)
-+++ menu.c	(working copy)
-@@ -90,9 +90,14 @@
- 	getyx (menu->win, y, x);
- 	if (title_width <= title_space || mi->align == MENU_ALIGN_LEFT)
- 		xwaddnstr (menu->win, mi->title, title_space);
--	else
--		xwaddstr (menu->win, mi->title + title_width - title_space);
-+	else {
-+		char *ptr;
- 
-+		ptr = xstrtail (mi->title, title_space);
-+		xwaddstr (menu->win, ptr);
-+		free (ptr);
-+	}
-+
- 	/* Fill the remainder of the title field with spaces. */
- 	if (mi == menu->selected) {
- 		getyx (menu->win, y, ix);
-Index: utf8.c
-===================================================================
---- utf8.c	(revision 2516)
-+++ utf8.c	(working copy)
-@@ -199,47 +199,50 @@
- 
- int xwaddnstr (WINDOW *win, const char *str, const int n)
- {
--	int res;
-+	int res, width, inv_char;
-+	wchar_t *ucs;
-+	char *mstr, *lstr;
-+	size_t size, num_chars;
- 
- 	assert (n > 0);
- 	assert (str != NULL);
- 
--	if (using_utf8) {
-+	mstr = iconv_str (iconv_desc, str);
- 
--		/* This nasty hack is because we need to count n in chars, but
--		 * [w]addnstr() takes arguments in bytes (in UTF-8 a char can be
--		 * longer than 1 byte).  There are also problems with [w]addnwstr()
--		 * (screen garbled).  I have no better idea. */
-+	size = xmbstowcs (NULL, mstr, -1, NULL) + 1;
-+	ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
-+	xmbstowcs (ucs, mstr, size, &inv_char);
-+	width = wcswidth (ucs, WIDTH_MAX);
- 
--		wchar_t *ucs;
--		size_t size;
--		size_t utf_num_chars;
--		int inv_char;
--
--		size = xmbstowcs (NULL, str, -1, NULL) + 1;
--		ucs = (wchar_t *)xmalloc (sizeof(wchar_t) * size);
--		xmbstowcs (ucs, str, size, &inv_char);
--		if ((size_t)n < size - 1)
--			ucs[n] = L'\0';
--		utf_num_chars = wcstombs (NULL, ucs, 0);
--		if (inv_char) {
--			char *utf8 = (char *)xmalloc (utf_num_chars + 1);
--
--			wcstombs (utf8, ucs, utf_num_chars + 1);
--			res = waddstr (win, utf8);
--			free (utf8);
-+	if (width == -1) {
-+		size_t clidx;
-+		for (clidx = 0; clidx < size - 1; clidx++) {
-+			if (wcwidth (ucs[clidx]) == -1)
-+				ucs[clidx] = L'?';
- 		}
--		else
--			res = waddnstr (win, str, utf_num_chars);
--		free (ucs);
-+		width = wcswidth (ucs, WIDTH_MAX);
-+		inv_char = 1;
- 	}
--	else {
--		char *lstr = iconv_str (iconv_desc, str);
- 
--		res = waddnstr (win, lstr, n);
--		free (lstr);
-+	if (width > n) {
-+		while (width > n)
-+			width -= wcwidth (ucs[--size]);
-+		ucs[size] = L'\0';
- 	}
- 
-+	num_chars = wcstombs (NULL, ucs, 0);
-+	lstr = (char *)xmalloc (num_chars + 1);
-+
-+	if (inv_char)
-+		wcstombs (lstr, ucs, num_chars + 1);
-+	else
-+		snprintf (lstr, num_chars + 1, "%s", mstr);
-+
-+	res = waddstr (win, lstr);
-+
-+	free (ucs);
-+	free (lstr);
-+	free (mstr);
- 	return res;
- }
- 
-Index: decoder_plugins/mp3/mp3.c
-===================================================================
---- decoder_plugins/mp3/mp3.c	(revision 2516)
-+++ decoder_plugins/mp3/mp3.c	(working copy)
-@@ -696,17 +696,19 @@
- {
- 	char *ext;
- 
-+	strcpy (buf, "MPx");
-+
- 	ext = ext_pos (file);
--	if (!strcasecmp (ext, "mp3"))
--		strcpy (buf, "MP3");
--	else if (!strcasecmp (ext, "mp2"))
--		strcpy (buf, "MP2");
--	else if (!strcasecmp (ext, "mp1"))
--		strcpy (buf, "MP1");
--	else if (!strcasecmp (ext, "mpga"))
--		strcpy (buf, "MPG");
--	else
--		strcpy (buf, "MPx");
-+	if (ext) {
-+		if (!strcasecmp (ext, "mp3"))
-+			strcpy (buf, "MP3");
-+		else if (!strcasecmp (ext, "mp2"))
-+			strcpy (buf, "MP2");
-+		else if (!strcasecmp (ext, "mp1"))
-+			strcpy (buf, "MP1");
-+		else if (!strcasecmp (ext, "mpga"))
-+			strcpy (buf, "MPG");
-+	}
- }
- 
- static int mp3_our_format_ext (const char *ext)
-Index: decoder_plugins/ffmpeg/ffmpeg.m4
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.m4	(revision 2516)
-+++ decoder_plugins/ffmpeg/ffmpeg.m4	(working copy)
-@@ -88,6 +88,25 @@
- 		                 [#include <libavcodec/avcodec.h>])
- 		AC_CHECK_DECLS([AV_CODEC_ID_OPUS], , ,
- 		                 [#include <libavcodec/avcodec.h>])
-+		AC_SEARCH_LIBS(avcodec_free_frame, avcodec,
-+			[AC_DEFINE([HAVE_AVCODEC_FREE_FRAME], 1,
-+				[Define to 1 if you have the `avcodec_free_frame' function.])])
-+		AC_CHECK_DECLS([CODEC_ID_PCM_S8_PLANAR], , ,
-+		                 [#include <libavcodec/avcodec.h>])
-+		AC_CHECK_DECLS([AV_SAMPLE_FMT_U8P], , ,
-+		                 [#include <libavcodec/avcodec.h>])
-+		AC_CHECK_DECLS([AV_SAMPLE_FMT_S16P], , ,
-+		                 [#include <libavcodec/avcodec.h>])
-+		AC_CHECK_DECLS([AV_SAMPLE_FMT_S32P], , ,
-+		                 [#include <libavcodec/avcodec.h>])
-+		AC_CHECK_DECLS([AV_SAMPLE_FMT_FLTP], , ,
-+		                 [#include <libavcodec/avcodec.h>])
-+		AC_SEARCH_LIBS(av_get_sample_fmt_name, avutil,
-+			[AC_DEFINE([HAVE_AV_GET_SAMPLE_FMT_NAME], 1,
-+				[Define to 1 if you have the `av_get_sample_fmt_name' function.])])
-+		AC_SEARCH_LIBS(av_lockmgr_register, avcodec,
-+			[AC_DEFINE([HAVE_LOCKMGR_REGISTER], 1,
-+				[Define to 1 if you have the `av_lockmgr_register' function.])])
- 		CPPFLAGS="$save_CPPFLAGS"
- 		CFLAGS="$save_CFLAGS"
- 		LIBS="$save_LIBS"
-Index: decoder_plugins/ffmpeg/ffmpeg.c
-===================================================================
---- decoder_plugins/ffmpeg/ffmpeg.c	(revision 2516)
-+++ decoder_plugins/ffmpeg/ffmpeg.c	(working copy)
-@@ -99,6 +99,7 @@
- 	bool okay; /* was this stream successfully opened? */
- 	struct decoder_error error;
- 	long fmt;
-+	int sample_width;
- 	int bitrate;            /* in bits per second */
- 	int avg_bitrate;        /* in bits per second */
- #if SEEK_IN_DECODER
-@@ -106,6 +107,7 @@
- 	int seek_sec;           /* second to which to seek */
- #endif
- 	bool seek_broken;       /* FFmpeg seeking is broken */
-+	bool timing_broken;     /* FFmpeg trashes duration and bit_rate */
- #if SEEK_IN_DECODER && defined(DEBUG)
- 	pthread_t thread_id;
- #endif
-@@ -277,8 +279,72 @@
- 	}
- }
- 
-+/* Handle FFmpeg's locking requirements. */
-+#ifdef HAVE_LOCKMGR_REGISTER
-+static int locking_cb (void **mutex, enum AVLockOp op)
-+{
-+	int result;
-+
-+	switch (op) {
-+	case AV_LOCK_CREATE:
-+		*mutex = xmalloc (sizeof (pthread_mutex_t));
-+		result = pthread_mutex_init (*mutex, NULL);
-+		break;
-+	case AV_LOCK_OBTAIN:
-+		result = pthread_mutex_lock (*mutex);
-+		break;
-+	case AV_LOCK_RELEASE:
-+		result = pthread_mutex_unlock (*mutex);
-+		break;
-+	case AV_LOCK_DESTROY:
-+		result = pthread_mutex_destroy (*mutex);
-+		free (*mutex);
-+		*mutex = NULL;
-+		break;
-+	}
-+
-+	return result;
-+}
-+#endif
-+
-+/* Here we attempt to determine if FFmpeg/LibAV has trashed the 'duration'
-+ * and 'bit_rate' fields in AVFormatContext for large files.  Determining
-+ * whether or not they are likely to be valid is imprecise and will vary
-+ * depending (at least) on:
-+ *
-+ * - The file's size,
-+ * - The file's codec,
-+ * - The number and size of tags,
-+ * - The version of FFmpeg/LibAV, and
-+ * - Whether it's FFmpeg or LibAV.
-+ *
-+ * This function represents a best guess.
-+*/
-+static bool is_timing_broken (AVFormatContext *ic)
-+{
-+	int64_t file_size;
-+
-+	if (ic->duration < 0 || ic->bit_rate < 0)
-+		return true;
-+
-+#ifdef HAVE_AVIO_SIZE
-+	file_size = avio_size (ic->pb);
-+#else
-+	file_size = ic->file_size;
-+#endif
-+
-+	if (file_size < UINT32_MAX)
-+		return false;
-+
-+	return true;
-+}
-+
- static void ffmpeg_init ()
- {
-+#ifdef HAVE_LOCKMGR_REGISTER
-+	int rc;
-+#endif
-+
- #ifdef DEBUG
- 	av_log_set_level (AV_LOG_INFO);
- #else
-@@ -291,10 +357,20 @@
- 	supported_extns = lists_strs_new (16);
- 	load_audio_extns (supported_extns);
- 	load_video_extns (supported_extns);
-+
-+#ifdef HAVE_LOCKMGR_REGISTER
-+	rc = av_lockmgr_register (locking_cb);
-+	if (rc < 0)
-+		fatal ("Lock manager initialisation failed");
-+#endif
- }
- 
- static void ffmpeg_destroy ()
- {
-+#ifdef HAVE_LOCKMGR_REGISTER
-+	av_lockmgr_register (NULL);
-+#endif
-+
- 	av_log_set_level (AV_LOG_QUIET);
- 	ffmpeg_log_repeats (NULL);
- 
-@@ -341,9 +417,9 @@
- 	}
- #endif
- 
--	if (tags_sel & TAGS_TIME) {
-+	if (!is_timing_broken (ic) && tags_sel & TAGS_TIME) {
- 		info->time = -1;
--		if (ic->duration >= 0)
-+		if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0)
- 			info->time = ic->duration / AV_TIME_BASE;
- 	}
- 
-@@ -426,12 +502,6 @@
- 
- #endif
- 
--	if (tags_sel & TAGS_TIME) {
--		info->time = -1;
--		if (ic->duration != (int64_t)AV_NOPTS_VALUE && ic->duration >= 0)
--			info->time = ic->duration / AV_TIME_BASE;
--	}
--
- end:
- #ifdef HAVE_AVFORMAT_CLOSE_INPUT
- 	avformat_close_input (&ic);
-@@ -450,12 +520,16 @@
- 		if (!strcmp (data->ic->iformat->name, "wav")) {
- 			switch (data->enc->codec_id) {
- 			case CODEC_ID_PCM_S8:
-+#if HAVE_DECL_CODEC_ID_PCM_S8_PLANAR
-+			case CODEC_ID_PCM_S8_PLANAR:
-+#endif
- 				result = SFMT_S8;
- 				break;
- 			case CODEC_ID_PCM_U8:
- 				result = SFMT_U8;
- 				break;
- 			case CODEC_ID_PCM_S16LE:
-+			case CODEC_ID_PCM_S16LE_PLANAR:
- 			case CODEC_ID_PCM_S16BE:
- 				result = SFMT_S16;
- 				break;
-@@ -490,15 +564,27 @@
- 
- 	switch (data->enc->sample_fmt) {
- 	case AV_SAMPLE_FMT_U8:
-+#if HAVE_DECL_AV_SAMPLE_FMT_U8P
-+	case AV_SAMPLE_FMT_U8P:
-+#endif
- 		result = SFMT_U8;
- 		break;
- 	case AV_SAMPLE_FMT_S16:
-+#if HAVE_DECL_AV_SAMPLE_FMT_S16P
-+	case AV_SAMPLE_FMT_S16P:
-+#endif
- 		result = SFMT_S16;
- 		break;
- 	case AV_SAMPLE_FMT_S32:
-+#if HAVE_DECL_AV_SAMPLE_FMT_S32P
-+	case AV_SAMPLE_FMT_S32P:
-+#endif
- 		result = SFMT_S32;
- 		break;
- 	case AV_SAMPLE_FMT_FLT:
-+#if HAVE_DECL_AV_SAMPLE_FMT_FLTP
-+	case AV_SAMPLE_FMT_FLTP:
-+#endif
- 		result = SFMT_FLOAT;
- 		break;
- 	default:
-@@ -597,6 +683,7 @@
- 	data->stream = NULL;
- 	data->enc = NULL;
- 	data->codec = NULL;
-+	data->sample_width = 0;
- 	data->bitrate = 0;
- 	data->avg_bitrate = 0;
- 
-@@ -624,6 +711,7 @@
- 	data->seek_sec = 0;
- #endif
- 	data->seek_broken = false;
-+	data->timing_broken = false;
- 
- 	decoder_error_init (&data->error);
- 
-@@ -702,27 +790,38 @@
- 	if (data->fmt == 0)
- 		data->fmt = fmt_from_sample_fmt (data);
- 	if (data->fmt == 0) {
-+#ifdef HAVE_AV_GET_SAMPLE_FMT_NAME
- 		decoder_error (&data->error, ERROR_FATAL, 0,
-+		               "Cannot get sample size from unknown sample format: %s",
-+		               av_get_sample_fmt_name (data->enc->sample_fmt));
-+#else
-+		decoder_error (&data->error, ERROR_FATAL, 0,
- 		               "Unsupported sample size!");
-+#endif
-+		avcodec_close (data->enc);
- 		goto end;
- 	}
-+	data->sample_width = sfmt_Bps (data->fmt);
- 	if (data->codec->capabilities & CODEC_CAP_DELAY)
- 		data->delay = true;
- 	data->seek_broken = is_seek_broken (data);
-+	data->timing_broken = is_timing_broken (data->ic);
- 
- 	data->okay = true;
- 
--	if (data->ic->duration >= AV_TIME_BASE) {
-+	if (!data->timing_broken && data->ic->duration >= AV_TIME_BASE) {
- #ifdef HAVE_AVIO_SIZE
- 		data->avg_bitrate = (int) (avio_size (data->ic->pb) /
--		                          (data->ic->duration / AV_TIME_BASE) * 8);
-+		                           (data->ic->duration / AV_TIME_BASE) * 8);
- #else
- 		data->avg_bitrate = (int) (data->ic->file_size /
--		                          (data->ic->duration / AV_TIME_BASE) * 8);
-+		                           (data->ic->duration / AV_TIME_BASE) * 8);
- #endif
- 	}
--	data->bitrate = data->ic->bit_rate;
- 
-+	if (!data->timing_broken && data->ic->bit_rate > 0)
-+		data->bitrate = data->ic->bit_rate;
-+
- 	return data;
- 
- end:
-@@ -943,12 +1042,14 @@
-                           char *buf, int buf_len)
- {
- 	int filled = 0;
-+	AVFrame *frame;
- 
-+	frame = avcodec_alloc_frame ();
-+
- 	do {
- 		int len, got_frame, is_planar, plane_size, data_size, copied;
--		AVFrame frame;
- 
--		len = avcodec_decode_audio4 (data->enc, &frame, &got_frame, pkt);
-+		len = avcodec_decode_audio4 (data->enc, frame, &got_frame, pkt);
- 
- 		if (len < 0)  {
- 			/* skip frame */
-@@ -968,33 +1069,46 @@
- 
- 		is_planar = av_sample_fmt_is_planar (data->enc->sample_fmt);
- 		data_size = av_samples_get_buffer_size (&plane_size,
--		                                        data->enc->channels,                                                   frame.nb_samples,
-+		                                        data->enc->channels,
-+		                                        frame->nb_samples,
- 		                                        data->enc->sample_fmt, 1);
- 
- 		if (data_size == 0)
- 			continue;
- 
--		copied = copy_or_buffer (data, (char *)frame.extended_data[0],
--		                         plane_size, buf, buf_len);
--		buf += copied;
--		filled += copied;
--		buf_len -= copied;
-+		if (is_planar && data->enc->channels > 1) {
-+			int offset, ch;
- 
--        if (is_planar && data->enc->channels > 1) {
--			int ch;
-+			for (offset = 0; offset < plane_size; offset += data->sample_width) {
-+				for (ch = 0; ch < data->enc->channels; ch += 1) {
-+					copied = copy_or_buffer (data,
-+					                         (char *)frame->extended_data[ch]
-+					                                               + offset,
-+				                             data->sample_width, buf, buf_len);
-+					buf += copied;
-+					filled += copied;
-+					buf_len -= copied;
-+				}
-+			}
-+		}
-+		else {
-+			copied = copy_or_buffer (data, (char *)frame->extended_data[0],
-+		                             plane_size, buf, buf_len);
-+			buf += copied;
-+			filled += copied;
-+			buf_len -= copied;
-+		}
- 
--            for (ch = 1; ch < data->enc->channels; ch += 1) {
--				copied = copy_or_buffer (data, (char *)frame.extended_data[ch],
--				                         plane_size, buf, buf_len);
--				buf += copied;
--				filled += copied;
--				buf_len -= copied;
--            }
--        }
--
- 		debug ("Copying %dB (%dB filled)", data_size, filled);
- 	} while (pkt->size > 0);
- 
-+	avcodec_get_frame_defaults (frame);
-+#ifdef HAVE_AVCODEC_FREE_FRAME
-+	avcodec_free_frame (&frame);
-+#else
-+	av_freep (&frame);
-+#endif
-+
- 	return filled;
- }
- #endif
-@@ -1122,9 +1236,10 @@
- 		free_packet (pkt);
- 	} while (!bytes_produced && !data->eos);
- 
--	data->bitrate = compute_bitrate (sound_params, bytes_used,
--	                                 bytes_produced + data->remain_buf_len,
--	                                 data->bitrate);
-+	if (!data->timing_broken)
-+		data->bitrate = compute_bitrate (sound_params, bytes_used,
-+		                                 bytes_produced + data->remain_buf_len,
-+		                                 data->bitrate);
- 
- 	return bytes_produced;
- }
-@@ -1185,20 +1300,23 @@
- {
- 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
- 
--	return data->bitrate / 1000;
-+	return data->timing_broken ? -1 : data->bitrate / 1000;
- }
- 
- static int ffmpeg_get_avg_bitrate (void *prv_data)
- {
- 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
- 
--	return data->avg_bitrate / 1000;
-+	return data->timing_broken ? -1 : data->avg_bitrate / 1000;
- }
- 
- static int ffmpeg_get_duration (void *prv_data)
- {
- 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
- 
-+	if (data->timing_broken)
-+		return -1;
-+
- 	if (!data->stream)
- 		return -1;
- 
-
-Index: configure.in
-===================================================================
---- configure.in	(revision 2518)
-+++ configure.in	(working copy)
-@@ -293,7 +293,6 @@
- 
- dnl optional functions
- AC_CHECK_FUNCS([strcasestr strerror_r syslog])
--AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize])
- AX_CHECK_UNAME_SYSCALL
- 
- dnl MIME magic
-@@ -322,6 +321,7 @@
- CC="$PTHREAD_CC"
- CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
- EXTRA_LIBS="$EXTRA_LIBS $PTHREAD_LIBS"
-+AC_CHECK_FUNCS([getrlimit pthread_attr_getstacksize])
- 
- dnl __FUNCTION__
- AC_TRY_COMPILE(,[printf(__FUNCTION__);], [AC_DEFINE([HAVE__FUNCTION__], 1,
-
-
diff --git a/extra/php-apcu/PKGBUILD b/extra/php-apcu/PKGBUILD
index 96e41a005..cd4cb9f08 100644
--- a/extra/php-apcu/PKGBUILD
+++ b/extra/php-apcu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194370 2013-09-14 20:47:48Z pierre $
+# $Id: PKGBUILD 205511 2014-02-06 14:49:36Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apcu
-pkgver=4.0.2
+pkgver=4.0.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='A userland caching module for PHP'
@@ -14,7 +14,7 @@ provides=("php-apc=${pkgver}")
 license=('PHP')
 source=("http://pecl.php.net/get/apcu-$pkgver.tgz")
 backup=('etc/php/conf.d/apcu.ini')
-md5sums=('c8a5c246b787eec81847017823099884')
+md5sums=('4db3d1ed48c447d9adebec13a8846d48')
 
 build() {
 	cd $srcdir/apcu-$pkgver
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 93f94a870..1daebb0da 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203430 2014-01-10 20:36:02Z pierre $
+# $Id: PKGBUILD 205510 2014-02-06 14:49:36Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.5.8
+pkgver=5.5.9
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -34,7 +34,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz"
         "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('1ed2b0193ecaca8b980a9b6a90357f1c'
+md5sums=('c018461604db38af48d1ca304cb592c6'
          'SKIP'
          '799cd5f91f5253f4b47ec4fd7fccf4f1'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
diff --git a/extra/python-iwscan/PKGBUILD b/extra/python-iwscan/PKGBUILD
index 752d224cb..2636d914b 100644
--- a/extra/python-iwscan/PKGBUILD
+++ b/extra/python-iwscan/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169016 2012-10-17 10:20:21Z allan $
+# $Id: PKGBUILD 205495 2014-02-06 05:24:02Z bisson $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgbase=python-iwscan
 pkgname=python2-iwscan
 pkgver=20090609
-pkgrel=4
+pkgrel=5
 pkgdesc="A Python interface to iwlist, using the iwlib library"
 arch=('i686' 'x86_64')
 url="http://projects.otaku42.de/browser/python-iwscan"
@@ -15,12 +15,17 @@ replaces=('python-iwscan<=20090609-3')
 source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz)
 md5sums=('30fbe8ad3b07e67c1c35db2de16077d8')
 
+prepare() {
+	cd ${pkgbase}
+	sed -i 's|PROC_NET_WIRELESS|"/proc/net/wireless"|' pyiwscan.c
+}
+
 build() {
-	cd "${srcdir}/${pkgbase}"
+	cd ${pkgbase}
 	python2 setup.py build
 }
 
 package_python2-iwscan() {
-	cd "${srcdir}/${pkgbase}"
+	cd ${pkgbase}
 	python2 setup.py install --root="${pkgdir}"
 }
diff --git a/extra/pycurl/PKGBUILD b/extra/python-pycurl/PKGBUILD
index 3db793090..86bd6201c 100644
--- a/extra/pycurl/PKGBUILD
+++ b/extra/python-pycurl/PKGBUILD
@@ -1,34 +1,37 @@
-# $Id: PKGBUILD 204461 2014-01-20 15:09:51Z eric $
-# Maintainer:
+# $Id: PKGBUILD 205506 2014-02-06 10:55:43Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
 
-pkgbase=pycurl
+_pypiname=pycurl
+pkgbase=python-$_pypiname
 pkgname=('python-pycurl' 'python2-pycurl')
-pkgver=7.19.3
+pkgver=7.19.3.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://pycurl.sourceforge.net/"
 license=('LGPL' 'MIT')
-makedepends=('python' 'python2' 'curl')
-source=("http://pycurl.sourceforge.net/download/${pkgbase}-${pkgver}.tar.gz")
-sha1sums=('5d8b7a7f869362421061d72f6d234bf805ebebb5')
+makedepends=('python' 'python2' 'curl' 'git')
+source=("git+https://github.com/pycurl/pycurl.git#tag=REL_${pkgver//./_}")
+sha1sums=('SKIP')
 
 prepare() {
-  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
+  cp -r ${_pypiname} python2-${_pypiname}
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${_pypiname}"
   find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python3|" {} +
-  sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py
-  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+    sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python-pycurl"/' setup.py
+
+  cd "${srcdir}/python2-${_pypiname}"
   find . -name '*.py' -exec sed -i -e "s|#! /usr/bin/env python|#!/usr/bin/env python2|" {} +
-  sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py
+    sed -i 's/"share", "doc", PACKAGE/"share", "doc", "python2-pycurl"/' setup.py
 }
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${_pypiname}"
   python3 setup.py build --with-ssl
-  cd "${srcdir}/python2-${pkgbase}-${pkgver}"
+
+  cd "${srcdir}/python2-${_pypiname}"
   python2 setup.py build --with-ssl
 }
 
@@ -36,8 +39,8 @@ package_python-pycurl() {
   pkgdesc="A Python 3.x interface to libcurl"
   depends=('python' 'curl')
 
-  cd ${pkgbase}-${pkgver}
-  python setup.py install --root="${pkgdir}"
+  cd ${_pypiname}
+  python setup.py install -O1 --root="${pkgdir}"
   install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
@@ -45,7 +48,7 @@ package_python2-pycurl() {
   pkgdesc="A Python 2.x interface to libcurl"
   depends=('python2' 'curl')
 
-  cd python2-${pkgbase}-${pkgver}
-  python2 setup.py install --root="${pkgdir}"
+  cd python2-${_pypiname}
+  python2 setup.py install -O1 --root="${pkgdir}"
   install -D -m644 COPYING-MIT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index ddec22a80..293ac8cb5 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204881 2014-01-30 08:57:40Z andrea $
+# $Id: PKGBUILD 205501 2014-02-06 09:24:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
@@ -21,8 +21,8 @@ pkgname=('qt5-base'
          'qt5-webkit'
          'qt5-x11extras'
          'qt5-xmlpatterns')
-pkgver=5.2.0
-pkgrel=4
+pkgver=5.2.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
@@ -37,7 +37,7 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
         'use-python2.patch')
-md5sums=('8f60b47ca9461831d940f579ee90517e'
+md5sums=('0c8d2aa45f38be9c3f7c9325eb059d9d'
          'b2897dd6a2967bccf8f10e397aafee55'
          '9638a78e502719ef8fe5f8d10d0361a9'
          '188da8f4c87316e730ebf1c6217bf5a0'
diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index 0097a14a0..a334b1380 100644
--- a/extra/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -7,9 +7,9 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname=qtcreator
-pkgver=3.0.0
-_pkgver=3.0.0
-pkgrel=2
+pkgver=3.0.1
+_pkgver=3.0.1
+pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -31,7 +31,7 @@ source=("git://gitorious.org/qt-creator/qt-creator.git#tag=v${_pkgver}"
         'qtcreator.desktop')
 md5sums=('SKIP'
          'SKIP'
-         '82888d4be900e7833d768050a135cd37')
+         '50880836fd62ccd87550940feb995f06')
 
 prepare() {
     cd qt-creator
diff --git a/extra/qtcreator/qtcreator.desktop b/extra/qtcreator/qtcreator.desktop
index 0e8f73e64..7db94d4a9 100644
--- a/extra/qtcreator/qtcreator.desktop
+++ b/extra/qtcreator/qtcreator.desktop
@@ -3,7 +3,7 @@ Exec=/usr/bin/qtcreator
 Name=Qt Creator
 GenericName=C++ IDE
 X-KDE-StartupNotify=true
-Icon=/usr/share/icons/hicolor/512x512/apps/QtProject-qtcreator.png
+Icon=QtProject-qtcreator.png
 Terminal=false
 Type=Application
 Categories=Qt;Development;