Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/libwebp/PKGBUILD
	extra/totem/PKGBUILD
	extra/webkitgtk/PKGBUILD

10 files changed, 39 insertions, 38 deletions

diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index 847ee4068..e1fa0bc9f 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170878 2012-11-12 21:33:49Z heftig $
+# $Id: PKGBUILD 173097 2012-12-10 22:25:55Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.6.2
+pkgver=2.6.3
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
 options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0d5321ce9fdd7d036b072ef28cba14088394606e1687183ec5d0ae6adea8c87e')
+sha256sums=('fc4487ae46e847cfd057b329b852cf99923772ecd2ddc29f29670c9f2b15d0ea')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 086a8e942..3ca5d4296 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166973 2012-09-23 22:56:56Z bisson $
+# $Id: PKGBUILD 173106 2012-12-11 04:42:07Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=3.3.2
+pkgver=3.3.3
 pkgrel=1
 pkgdesc='Lightweight, advanced audio player focused on audio quality'
 url='http://audacious-media-player.org/'
@@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
          'hicolor-icon-theme' 'desktop-file-utils')
 optdepends=('unzip-libre: zipped skins support')
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('bab3bcb267b8b333570c85cae9590470fe509eb9')
+sha1sums=('f0f954a6c08dbe840df70f24a1ac82cdecc58c66')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 9b259b50e..cf5783bb9 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 170534 2012-11-07 23:38:03Z eric $
+# $Id: PKGBUILD 173104 2012-12-11 02:30:13Z eric $
 # Maintainer:
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
-makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
+makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
              'alsa-lib' 'desktop-file-utils')
 source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
-md5sums=('b5b84ed63751ab3f76aa8d36cccf59e7')
+md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 4a3c717a3..ee37af961 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 170911 2012-11-12 22:46:39Z heftig $
+# $Id: PKGBUILD 173080 2012-12-10 11:56:21Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
 pkgver=3.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A text editor for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool')
+makedepends=('yelp-tools' 'intltool' 'libzeitgeist')
+optdepends=('libzeitgeist: Zeitgeist plugin')
 groups=('gnome-extra')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index b1b9121dc..2ba03df74 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170151 2012-11-03 17:55:00Z heftig $
+# $Id: PKGBUILD 173089 2012-12-10 21:30:33Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=gmime
-pkgver=2.6.12
+pkgver=2.6.13
 pkgrel=1
 pkgdesc="Core mime parsing library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib')
 [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('85ccdf29bc8c4801123e28c27d1afadf0b2c5618aae17e6ec78d40d03ef431a8')
+sha256sums=('42a47a7f9508db3e1cfbb374a23260e75d7fc7696f488a26aa59f5e2d8dac154')
 
 build() {
   # get rid of that .wapi errors in fakeroot
diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD
index 5e62b6ae1..0352443e1 100644
--- a/extra/libcanberra/PKGBUILD
+++ b/extra/libcanberra/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 170401 2012-11-07 07:11:35Z heftig $
+# $Id: PKGBUILD 173082 2012-12-10 12:00:17Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
-pkgrel=2
+pkgrel=3
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
 arch=(i686 x86_64 'mips64el')
 license=(LGPL)
-depends=(libvorbis libltdl alsa-lib tdb)
+depends=(libvorbis libltdl alsa-lib tdb sound-theme-freedesktop)
 makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3)
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
index c9b839c91..0f94f49b3 100644
--- a/extra/libwebp/PKGBUILD
+++ b/extra/libwebp/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 167975 2012-10-04 13:31:03Z heftig $
+# $Id: PKGBUILD 173085 2012-12-10 13:18:07Z heftig $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=libwebp
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=1
 pkgdesc="WebP library and conversion tools"
 arch=('x86_64' 'i686' 'mips64el')
-url="http://code.google.com/intl/en/speed/webp/"
+url="https://developers.google.com/speed/webp/"
 license=('BSD')
 depends=('libpng' 'libjpeg')
 options=('!libtool')
 source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('aa7d5e162826362c79d7c36d41484042ab7460dc08dc33d4ea6823a0c77d4bfb')
+sha256sums=('894e08b8b0043cf007cc1ca893f33d73784565a6e64b0e7aefb201a687392314')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index db0f32b1d..c6417adfd 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165891 2012-09-03 05:48:23Z giovanni $
+# $Id: PKGBUILD 173087 2012-12-10 17:45:41Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.8.0
+pkgver=5.9.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('8caa3d37d2442a525bad35dbb1babc56')
+md5sums=('033621461ef8eb922fc1366e0a9a6f16')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 4cd12d4ee..7bd46d5b9 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 170538 2012-11-08 11:31:05Z heftig $
+# $Id: PKGBUILD 173078 2012-12-10 11:38:58Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=totem
 pkgname=('totem' 'totem-plugin')
 pkgver=3.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL2 custom)
 depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
          hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst
-         clutter-gtk mx python2-gobject gst-plugins-bad)
-makedepends=(intltool gnome-doc-utils nautilus vala grilo pylint)
+         clutter-gtk python2-gobject gst-plugins-bad)
+makedepends=(intltool gnome-doc-utils nautilus vala grilo pylint dbus-glib libzeitgeist)
 [ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
@@ -39,8 +39,8 @@ package_totem() {
   optdepends=('gst-plugins-ugly: Extra media codecs'
               'gst-ffmpeg: Extra media codecs'
               'grilo-plugins: Browse sidebar (remote media)'
-              'pyxdg: opensubtitles plugin')
-  [ "$CARCH" != "mips64el" ] && optdepends+=('lirc-utils: Infrared Remote Control plugin')
+              'pyxdg: opensubtitles plugin'
+              'libzeitgeist: Zeitgeist plugin')
 
   cd "$pkgbase-$pkgver"
   make DESTDIR="${pkgdir}" install
@@ -56,7 +56,7 @@ package_totem() {
 
 package_totem-plugin() {
   pkgdesc="Totem plugin for web browsers"
-  depends=("totem=$pkgver")
+  depends=("totem=$pkgver" dbus-glib)
   backup=(etc/totem/browser-plugins.ini)
 
   cd "$pkgbase-$pkgver"
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index 2871ef17c..01cc9d202 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 171521 2012-11-18 10:28:10Z andyrtr $
+# $Id: PKGBUILD 173076 2012-12-10 11:26:50Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=webkitgtk
 pkgname=('webkitgtk2' 'webkitgtk3')
-pkgver=1.10.1
-pkgrel=3.1
+pkgver=1.10.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://webkitgtk.org/"
 license=('custom')
 makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
 options=('!libtool' '!emptydirs')
 source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha1sums=('3a2df2eb42ffdd7f3b39873d5461c347a6330493')
+sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c')
 
 build() {
   cd "$srcdir/webkitgtk-$pkgver"