Mon Jun 10 00:13:23 PDT 2013

18 files changed, 410 insertions, 78 deletions

diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index 1790e90e0..0f8935d76 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87122 2013-03-27 15:53:26Z arodseth $
+# $Id: PKGBUILD 92599 2013-06-09 16:04:05Z arodseth $
 # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -9,7 +9,7 @@
 pkgbase=erlang
 pkgname=('erlang' 'erlang-unixodbc')
 pkgver=R16B
-pkgrel=3
+pkgrel=5
 arch=('x86_64' 'i686')
 url='http://www.erlang.org/'
 license=('custom')
@@ -32,6 +32,9 @@ package_erlang() {
   optdepends=('erlang-unixodbc: database support'
               'java-environment: for Java support'
               'lksctp-tools: for SCTP support')
+  provides=('erlang-nox')
+  replaces=('erlang-nox')
+  conflicts=('erlang-nox')
 
   cd "$srcdir/otp_src_${pkgver/_1/}"
 
@@ -59,7 +62,7 @@ package_erlang() {
 
 package_erlang-unixodbc() {
   pkgdesc='Unixodbc support for Erlang'
-  depends=('unixodbc' 'erlang')
+  depends=('unixodbc' 'erlang-nox')
 
   # Get the files that should be packaged as erlang-unixodbc
   mkdir -p "$pkgdir/usr/lib/erlang/"{lib,man/man3}
diff --git a/community/gnome-hearts/PKGBUILD b/community/gnome-hearts/PKGBUILD
new file mode 100644
index 000000000..07984fbb4
--- /dev/null
+++ b/community/gnome-hearts/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 92595 2013-06-09 15:59:15Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Neil Darlow <neil@darlow.co.uk>
+
+pkgname=gnome-hearts
+pkgver=0.3.1
+pkgrel=1
+pkgdesc="A card game for GNOME"
+arch=('i686' 'x86_64')
+url="http://www.jejik.com/gnome-hearts/"
+license=('GPL')
+depends=('python2' 'libgnomeui' 'libglade' 'desktop-file-utils')
+makedepends=('intltool' 'rarian')
+install=gnome-hearts.install
+source=(http://www.jejik.com/files/$pkgname/$pkgname-$pkgver.tar.gz)
+sha256sums=('4b9477e8bb2d48a86021ae512a713fd405a96d52cf711ff549cfe0d119bf56b3')
+
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gnome-hearts/gnome-hearts.install b/community/gnome-hearts/gnome-hearts.install
new file mode 100644
index 000000000..686b22022
--- /dev/null
+++ b/community/gnome-hearts/gnome-hearts.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD
index acf305455..946886a2c 100644
--- a/community/i3lock/PKGBUILD
+++ b/community/i3lock/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 83283 2013-01-28 17:56:05Z ttoepper $
+# $Id: PKGBUILD 92605 2013-06-09 19:07:52Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=i3lock
-pkgver=2.4.1
-pkgrel=2
+pkgver=2.5
+pkgrel=1
 pkgdesc="An improved screenlocker based upon XCB and PAM"
 arch=('i686' 'x86_64')
 url="http://i3wm.org/i3lock/"
 license=('MIT')
 groups=("i3")
-depends=('xcb-util-image' 'xcb-util-keysyms' 'pam' 'libev' 'cairo')
+depends=('xcb-util-image' 'libev' 'cairo' 'libxkbcommon')
 options=('docs')
 backup=("etc/pam.d/i3lock")
-source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2")
-md5sums=('fbc954133a6335be89e394d9ec85fcfd')
+source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2"
+        "http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2.asc")
+md5sums=('a7d4f2519deb5a62acbc755b09b4faea' 'SKIP')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index 4f04a4680..7eb0e78e8 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90062 2013-05-06 19:38:27Z foutrelis $
+# $Id: PKGBUILD 92601 2013-06-09 16:56:19Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Martin Panter <vadmium+aur@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=mplayer2
-pkgver=20130309
-pkgrel=2
+pkgver=20130428
+pkgrel=1
 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,23 +17,22 @@ depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmp
          'libgl' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora' 'libvdpau'
          'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils'
          'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
-makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils')
+makedepends=('mesa' 'mesa-libgl' 'unzip' 'yasm' 'python' 'python-docutils' 'git')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 provides=('mplayer')
 conflicts=('mplayer')
 options=(!emptydirs)
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('03aeccbd82b3598e0656b54ae6ab60c79afdb78eabe1b2915e7912db7efbd343'
-            'SKIP')
+source=(git://git.mplayer2.org/mplayer2.git#commit=6c87a981baa)
+sha256sums=('SKIP')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
   find -type f -exec sed -e 's/python3/python/' -i {} \;
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
   ./configure --prefix=/usr --confdir=/etc/mplayer \
               --enable-translation --language=all \
@@ -47,7 +46,7 @@ build() {
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR=$pkgdir install
 
   install -Dm644 etc/{codecs.conf,input.conf,example.conf} $pkgdir/etc/mplayer/
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index 5763c57a1..5dbd5a16b 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87740 2013-04-05 21:06:47Z bpiotrowski $
+# $Id: PKGBUILD 92586 2013-06-09 13:32:10Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -7,34 +7,40 @@
 
 pkgname=mupdf
 pkgver=1.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64')
 url='http://mupdf.com'
 license=('GPL3')
 depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils' 'xdg-utils')
 install=mupdf.install
-source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.zip)
-sha256sums=('9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b')
+source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.zip
+        mupdf-1.2-fix-dirty-flag-handling.patch)
+sha256sums=('9bc9e31ec27c091dad37f70940bd799e46ab6da4299bc58e803bff3dbb07dc3b'
+            'd5c9ab3c5e9975909562230569a149a569f44fcd2b24c0b57e889b541a017f10')
+
+prepare() {
+  cd $pkgname-$pkgver-source
+  patch -Np1 -i "$srcdir"/mupdf-1.2-fix-dirty-flag-handling.patch
+}
 
 build() {
-    CFLAGS+=' -fPIC'
-    CXXFLAGS+=' -fPIC'
+  CFLAGS+=' -fPIC'
+  CXXFLAGS+=' -fPIC'
 
-	cd "$srcdir"/$pkgname-$pkgver-source
-	rm -rf thirdparty
-	make build=release prefix=/usr
+  cd $pkgname-$pkgver-source
+  rm -rf thirdparty
+  make build=release prefix=/usr
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver-source
-	make build=release prefix="$pkgdir"/usr install
-
-	sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop
-  	sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop
+  cd $pkgname-$pkgver-source
+  make build=release prefix="$pkgdir"/usr install
 
-	install -Dm644 debian/mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
-  	install -Dm644 debian/mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
+  sed -i 's/mupdf.xpm/mupdf/' debian/mupdf.desktop
+  sed -i 's/application\/x-pdf/application\/x-pdf/' debian/mupdf.desktop
+  install -Dm644 debian/mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop
+  install -Dm644 debian/mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm
 
-    chmod 644 "$pkgdir"/usr/lib/libfitz.a
+  chmod 644 "$pkgdir"/usr/lib/libfitz.a
 }
diff --git a/community/mupdf/mupdf-1.2-fix-dirty-flag-handling.patch b/community/mupdf/mupdf-1.2-fix-dirty-flag-handling.patch
new file mode 100644
index 000000000..ec22ac328
--- /dev/null
+++ b/community/mupdf/mupdf-1.2-fix-dirty-flag-handling.patch
@@ -0,0 +1,88 @@
+From a20d6a58ebc6c60ff44f0f385cf399ee6fca55bf Mon Sep 17 00:00:00 2001
+From: Robin Watts <Robin.Watts@artifex.com>
+Date: Fri, 26 Apr 2013 12:21:17 +0100
+Subject: [PATCH] Fix dirty flag handling bug in X11 event loop.
+
+When I added transition handling to mupdf, I broke the X11
+behaviour of coalescing all events and only blitting when
+idle.
+
+This commit restores that behaviour, except when transitions
+are actually in progress (when it still blits instantly).
+---
+ apps/pdfapp.c   | 6 +++++-
+ apps/x11_main.c | 8 ++++++--
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/apps/pdfapp.c b/apps/pdfapp.c
+index c3b7d54..ff23c4b 100644
+--- a/apps/pdfapp.c
++++ b/apps/pdfapp.c
+@@ -1677,7 +1677,6 @@ void pdfapp_postblit(pdfapp_t *app)
+ 	if (llama >= 256)
+ 	{
+ 		/* Completed. */
+-		app->in_transit = 0;
+ 		fz_drop_pixmap(app->ctx, app->image);
+ 		app->image = app->new_image;
+ 		app->new_image = NULL;
+@@ -1689,4 +1688,9 @@ void pdfapp_postblit(pdfapp_t *app)
+ 	else
+ 		fz_generate_transition(app->image, app->old_image, app->new_image, llama, &app->transition);
+ 	winrepaint(app);
++	if (llama >= 256)
++	{
++		/* Completed. */
++		app->in_transit = 0;
++	}
+ }
+diff --git a/apps/x11_main.c b/apps/x11_main.c
+index 364013c..987e359 100644
+--- a/apps/x11_main.c
++++ b/apps/x11_main.c
+@@ -79,6 +79,7 @@ static int mapped = 0;
+ static Cursor xcarrow, xchand, xcwait, xccaret;
+ static int justcopied = 0;
+ static int dirty = 0;
++static int transition_dirty = 0;
+ static int dirtysearch = 0;
+ static char *password = "";
+ static XColor xbgcolor;
+@@ -504,6 +505,8 @@ static void winblit(pdfapp_t *app)
+ void winrepaint(pdfapp_t *app)
+ {
+ 	dirty = 1;
++	if (app->in_transit)
++		transition_dirty = 1;
+ }
+ 
+ void winrepaintsearch(pdfapp_t *app)
+@@ -779,7 +782,7 @@ int main(int argc, char **argv)
+ 
+ 	while (!closing)
+ 	{
+-		while (!closing && XPending(xdpy) && !dirty)
++		while (!closing && XPending(xdpy) && !transition_dirty)
+ 		{
+ 			XNextEvent(xdpy, &xevt);
+ 
+@@ -886,6 +889,7 @@ int main(int argc, char **argv)
+ 			else if (dirtysearch)
+ 				winblitsearch(&gapp);
+ 			dirty = 0;
++			transition_dirty = 0;
+ 			dirtysearch = 0;
+ 			pdfapp_postblit(&gapp);
+ 		}
+@@ -899,7 +903,7 @@ int main(int argc, char **argv)
+ 			timeradd(&now, &tmo, &tmo_at);
+ 		}
+ 
+-		if (XPending(xdpy) || dirty)
++		if (XPending(xdpy) || transition_dirty)
+ 			continue;
+ 
+ 		timeout = NULL;
+-- 
+1.8.3
+
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index 6c8d434fd..895426e9b 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90085 2013-05-06 19:39:21Z foutrelis $
+# $Id: PKGBUILD 92590 2013-06-09 15:08:48Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=4.0.10
-pkgrel=4
+pkgver=4.0.11
+pkgrel=1
 epoch=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ depends=('fftw' 'gtkmm' 'libcanberra' 'libiptcdata' 'lcms2' 'desktop-file-utils'
 makedepends=('cmake')
 install=rawtherapee.install
 source=("http://rawtherapee.googlecode.com/files/rawtherapee-$pkgver.tar.xz")
-md5sums=('cf18a503a978a29af6275e17f7aa67ba')
+md5sums=('d30a54e6446326d8299c06ec76c281d8')
 
 build() {
   mkdir "$srcdir/$pkgname-build"
diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD
index cf6ac2eda..4fa6eaac3 100644
--- a/community/ruby-ncurses/PKGBUILD
+++ b/community/ruby-ncurses/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86883 2013-03-23 23:10:46Z td123 $
+# $Id: PKGBUILD 92582 2013-06-09 08:55:46Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Jeff Mickey <j@codemac.net>
@@ -6,14 +6,24 @@
 
 pkgname=ruby-ncurses
 pkgver=1.3.1
-pkgrel=4
+pkgrel=5
 pkgdesc='Module for interactive text console applications (ncurses)'
 arch=('x86_64' 'i686')
 url='http://ncurses-ruby.berlios.de/'
 license=('GPL')
 depends=('ruby' 'ncurses')
-source=("http://download.berlios.de/ncurses-ruby/ncurses-ruby-$pkgver.tar.bz2")
-sha256sums=('dca8ce452e989ce1399cb683184919850f2baf79e6af9d16a7eed6a9ab776ec5')
+makedepends=('addinclude')
+source=("http://download.berlios.de/ncurses-ruby/ncurses-ruby-$pkgver.tar.bz2"
+        'str2cstr.patch::http://pkgs.fedoraproject.org/cgit/ruby-ncurses.git/plain/0001-STR2CSTR-deprecated.patch')
+sha256sums=('dca8ce452e989ce1399cb683184919850f2baf79e6af9d16a7eed6a9ab776ec5'
+            '3a9fea87a0fa3eac58022e9e86e901601953939c15ebccede0ba64f4a011039d')
+
+prepare() {
+  cd "$srcdir/ncurses-ruby-$pkgver"
+
+  patch -i ../str2cstr.patch
+  addinclude ncurses_wrap.c sys/time.h
+}
 
 build()  {
   cd "$srcdir/ncurses-ruby-$pkgver"
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 1972b6636..d21ac7547 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 187115 2013-06-04 04:38:37Z heftig $
+# $Id: PKGBUILD 188094 2013-06-09 11:29:56Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
 pkgver=3.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GNOME Bluetooth Subsystem"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://live.gnome.org/GnomeBluetooth"
-license=('GPL' 'LGPL')
-depends=('gtk3' 'hicolor-icon-theme' 'libnotify')
-makedepends=('intltool' 'gobject-introspection' 'itstool' 'docbook-xsl')
-options=('!libtool' '!emptydirs')
+license=(GPL LGPL)
+depends=(gtk3 hicolor-icon-theme libnotify bluez4)
+makedepends=(intltool gobject-introspection itstool docbook-xsl)
+options=(!libtool !emptydirs)
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         61-gnome-bluetooth-rfkill.rules)
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index b72b168b1..9667b9e7e 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186492 2013-05-27 19:38:42Z giovanni $
+# $Id: PKGBUILD 188100 2013-06-09 13:12:36Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -65,6 +65,10 @@ build() {
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
   sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
 
+  # fix for flac-1.3.0
+  sed -i -e 's:stream_decoder.h:FLAC/stream_decoder.h:' modules/codec/flac.c
+  sed -i -e 's:stream_encoder.h:FLAC/stream_encoder.h:' modules/codec/flac.c
+
   CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
diff --git a/extra/wireshark/01_fix_encoding_asn2deb_pod.patch b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch
new file mode 100644
index 000000000..0b8b91363
--- /dev/null
+++ b/extra/wireshark/01_fix_encoding_asn2deb_pod.patch
@@ -0,0 +1,77 @@
+--- doc/asn2deb.pod.orig	2013-06-06 21:30:28.314150100 +0200
++++ doc/asn2deb.pod	2013-06-06 21:31:59.448850746 +0200
+@@ -5,8 +5,21 @@
+ 
+ =head1 SYNOPSIS
+ 
+-B<asn2deb> [-a I<ASN.1 file>] [--asn=I<ASN.1 file>] [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>]
+-[B<--email=>I<address>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
++B<asn2deb>
++S<[ B<-a> E<lt>ASN.1 fileE<gt> ]>
++S<[ B<--asn>=E<lt>ASN.1 fileE<gt> ]>
++S<[ B<-d> E<lt>optsE<gt> ]>
++S<[ B<--dbopts>=E<lt>optsE<gt> ]>
++S<[ B<-e> E<lt>addressE<gt> ]>
++S<[ B<--email>=E<lt>addressE<gt> ]>
++S<[ B<-h> ]>
++S<[ B<--help> ]>
++S<[ B<-n> E<lt>nameE<gt> ]>
++S<[ B<--name>=E<lt>nameE<gt> ]>
++S<[ B<-p> ]>
++S<[ B<--preserve> ]>
++S< [B<-v> ]>
++S<[ B<--version> ]>
+ 
+ =head1 DESCRIPTION
+ 
+@@ -19,31 +32,31 @@
+ 
+ =over 4
+ 
+-=item B<-a >I<ASN.1 file> B<--asn=>I<ASN.1 file>
++=item -a E<lt>ASN.1 fileE<gt> --asn=E<lt>ASN.1 fileE<gt>
+ 
+ ASN.1 file to use (mandatory).
+ 
+-=item B<-d >I<opts> B<--dbopts=>I<opts>
++=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
+ 
+ options for dpkg-buildpackage.
+ 
+-=item B<-e >I<address> B<--email=>I<address>
++=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
+ 
+ use e-mail address.
+ 
+-=item B<-h> B<--help>
++=item -h --help
+ 
+ print help and exit.
+ 
+-=item B<-n >I<name> B<--name=>I<name>
++=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
+ 
+ use user name.
+ 
+-=item B<-p> B<--preserve>
++=item -p --preserve
+ 
+ do not overwrite files.
+ 
+-=item B<-v> B<--version>
++=item -v --version
+ 
+ print version and exit.
+ 
+@@ -68,8 +81,8 @@
+ 
+ =head1 AUTHOR
+ 
+-B<W. Borgert> Author. 
++B<W. Borgert> Author.
+ 
+ =head1 COPYRIGHT
+ 
+-Copyright (C) 2003, 2005 W. Borger
+\ No newline at end of file
++Copyright (C) 2003, 2005 W. Borger
diff --git a/extra/wireshark/02_enable-version.diff b/extra/wireshark/02_enable-version.diff
deleted file mode 100644
index db2f3726e..000000000
--- a/extra/wireshark/02_enable-version.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.init	2013-02-02 22:11:42.863854681 +0100
-+++ configure.in	2013-02-02 22:13:40.888683191 +0100
-@@ -185,7 +185,7 @@
- 		  [use GnuTLS library @<:@default=yes@:>@]),
-   with_gnutls="$withval", with_gnutls="yes")
- if test "x$with_gnutls" = "xyes"; then
--  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0 gnutls < 3],
-+  PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 1.2.0],
-         [
-                 echo "GnuTLS found, enabling SSL decryption"
-                 AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to use GnuTLS library])
diff --git a/extra/wireshark/02_fix_encoding_idl2deb_pod.patch b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch
new file mode 100644
index 000000000..bc4000b8f
--- /dev/null
+++ b/extra/wireshark/02_fix_encoding_idl2deb_pod.patch
@@ -0,0 +1,77 @@
+--- doc/idl2deb.pod.orig	2013-06-06 21:31:06.674726010 +0200
++++ doc/idl2deb.pod	2013-06-06 21:35:38.522125866 +0200
+@@ -5,9 +5,21 @@
+ 
+ =head1 SYNOPSIS
+ 
+-B<idl2deb> [B<-d >I<opts>] [B<--dbopts=>I<opts>] [B<-e >I<address>] [B<--email=>I<address>] [-i I<idlfile>]
+-[--idl=I<idlfile>] [B<-h>] [B<--help>] [B<-n >I<name>] [B<--name=>I<name>] [B<-p>] [B<--preserve>] [B<-v>] [B<--version>]
+-
++B<idl2deb>
++S< [ B<-d> E<lt>optsE<gt> ]>
++S< [ B<--dbopts>=E<lt>optsE<gt> ]>
++S< [ B<-e> E<lt>addressE<gt> ]>
++S< [ B<--email>=E<lt>addressE<gt> ]>
++S< [ B<-h> ]>
++S< [ B<--help> ]>
++S< [ B<-i> E<lt>idlfileE<gt> ]>
++S< [ B<--idl>=E<lt>idlfileE<gt> ]>
++S< [ B<-n> E<lt>nameE<gt> ]>
++S< [ B<--name>=E<lt>nameE<gt> ]>
++S< [ B<-p> ]>
++S< [ B<--preserve> ]>
++S< [ B<-v> ]>
++S< [ B<--version> ]>
+ 
+ =head1 DESCRIPTION
+ 
+@@ -19,31 +31,31 @@
+ 
+ =over 4
+ 
+-=item B<-d>I<opts> B<--dbopts=>I<opts>
++=item -d E<lt>optsE<gt> --dbopts=E<lt>optsE<gt>
+ 
+ options for dpkg-buildpackage.
+ 
+-=item B<-e >I<address> B<--email=>I<address>
++=item -e E<lt>addressE<gt> --email=E<lt>addressE<gt>
+ 
+ use e-mail address.
+ 
+-=item B<-i >I<idlfile> B<--idl=>I<idlfile>
++=item -h --help
+ 
+-IDL file to use (mandatory)
++print help and exit.
+ 
+-=item B<-h> B<--help>
++=item -i E<lt>idlfileE<gt> --idl=E<lt>idlfileE<gt>
+ 
+-print help and exit.
++IDL file to use (mandatory)
+ 
+-=item B<-n >I<name> B<--name=>I<name>
++=item -n E<lt>nameE<gt> --name=E<lt>nameE<gt>
+ 
+ use user name.
+ 
+-=item B<-p> B<--preserve>
++=item -p --preserve
+ 
+ do not overwrite files.
+ 
+-=item B<-v> B<--version>
++=item -v --version
+ 
+ print version and exit.
+ 
+@@ -67,7 +79,7 @@
+ 
+ =head1 AUTHOR
+ 
+-B<W. Borgert> Author. 
++B<W. Borgert> Author.
+ 
+ =head1 COPYRIGHT
+ 
diff --git a/extra/wireshark/03_force_utf8_for_pod2man.patch b/extra/wireshark/03_force_utf8_for_pod2man.patch
new file mode 100644
index 000000000..ace641100
--- /dev/null
+++ b/extra/wireshark/03_force_utf8_for_pod2man.patch
@@ -0,0 +1,22 @@
+--- doc/Makefile.am	(revision 49837)
++++ doc/Makefile.am	(working copy)
+@@ -123,6 +123,7 @@ 
+ 	$(AM_V_POD2MAN)$(POD2MAN)                       \
+ 	--center="The Wireshark Network Analyzer"       \
+ 	--release=$(VERSION)                            \
++	--utf8                                          \
+ 	$< > $@
+ 
+ .pod.html: ../config.h $(top_srcdir)/docbook/ws.css
+--- doc/wireshark.pod.template	(revision 49837)
++++ doc/wireshark.pod.template	(working copy)
+@@ -1,4 +1,9 @@ 
++=begin man
++
++=encoding utf8
++
++=end man
+
+ =head1 NAME
+ 
+ wireshark - Interactively dump and analyze network traffic
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index 6692971ec..8a3f13e9e 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186024 2013-05-20 14:35:40Z guillaume $
+# $Id: PKGBUILD 188105 2013-06-09 20:39:09Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.8.7
+pkgver=1.10.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -12,14 +12,24 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls'
 url='http://www.wireshark.org/'
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
-        02_enable-version.diff)
-sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842'
-            'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b')
+        01_fix_encoding_asn2deb_pod.patch
+        02_fix_encoding_idl2deb_pod.patch
+        03_force_utf8_for_pod2man.patch)
+sha256sums=('1f4b377ba6284a51797bcc437aa2918bfaeb5d30908cd6194bd09f7054c65add'
+            '0dfe86b1e4bbf4090035fc1fcd36c2790d418a5749e23a2a7e7285699a6c147d'
+            'a46f6e87477fcbf8289bfde5e525e6c0b4c3268bd1a2e189e3120bd3ad4f7c27'
+            '902f72132b9e0dd95f89ca0bcb216ef9c866ac11c842866781d239b6b7873daf')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -p0 < ${srcdir}/02_enable-version.diff
+  # https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8774
+  for p in 01_fix_encoding_asn2deb_pod.patch \
+           02_fix_encoding_idl2deb_pod.patch \
+           03_force_utf8_for_pod2man.patch;
+  do
+    patch -p0 <${srcdir}/${p}
+  done
 
   ./autogen.sh
   ./configure \
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index f7dfe3489..caacdcfeb 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91579 2013-05-24 14:55:19Z dwallace $
+# $Id: PKGBUILD 92536 2013-06-07 19:48:55Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=0.9.32
+pkgver=0.9.34
 pkgrel=1
 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -30,11 +30,10 @@ install=calibre.install
 source=("http://calibre-ebook.googlecode.com/files/${_pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('3b1c89a84872df900b9cfb706027df67'
+md5sums=('ce3e37758c2c0e85d940ff4b141b243f'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
-
 prepare(){
   cd "${srcdir}/${_pkgname}"
   #rm -rf src/{cherrypy,pyPdf}
@@ -60,7 +59,9 @@ build() {
 
   LANG='en_US.UTF-8' python2 setup.py build
   # LANG='en_US.UTF-8' python2 setup.py resources
-  LANG='en_US.UTF-8' python2 setup.py translations
+
+  # Don't build translations since building them is broken badly
+  # LANG='en_US.UTF-8' python2 setup.py translations
 }
 
 package() {
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index a5c04bec4..b8872fa5d 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90159 2013-05-07 13:40:35Z stativ $
+# $Id: PKGBUILD 92587 2013-06-09 14:53:02Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -7,7 +7,7 @@
 
 _pkgname=soundkonverter
 pkgname=soundkonverter-libre
-pkgver=2.0.2
+pkgver=2.0.3
 pkgrel=1
 pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation"
 arch=('i686' 'x86_64')
@@ -36,7 +36,7 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=$_pkgname.install
 source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
-md5sums=('08076f9d8c017d8c31f18b94bc9e6878')
+md5sums=('1c18d9227bac57a910e2a7b2e18870d8')
 
 build() {
   cd "$srcdir"/$_pkgname-$pkgver