Sun Nov 18 02:15:18 PST 2012

28 files changed, 877 insertions, 105 deletions

diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD
index afcbe30c9..a75faab38 100644
--- a/extra/aspell-pt/PKGBUILD
+++ b/extra/aspell-pt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150493 2012-02-18 03:34:52Z allan $
+# $Id: PKGBUILD 171362 2012-11-17 09:56:22Z eric $
 # Maintainer:
 # Contributor: Simo Leone <simo@archlinux.org>
 # Contributor: jlvsimoes <jlvsimoes@oninet.pt>
@@ -7,7 +7,7 @@ pkgname=aspell-pt
 _pkgverPT=20070510
 _pkgverBR=20090702
 pkgver=$_pkgverBR
-pkgrel=3
+pkgrel=4
 pkgdesc="Portuguese and Brazilian Portuguese dictionary for aspell"
 arch=('i686' 'x86_64')
 url="http://aspell.net/"
@@ -17,8 +17,8 @@ conflicts=('aspell-pt_br')
 replaces=('aspell-pt_br')
 source=(ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgverBR-0.tar.bz2
         ftp://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-$_pkgverPT-0.tar.bz2)
-md5sums=('e082a8956882eb94a67c12e1b8c4a324' 'a54267ce8f91de6e6a1baf1e8048cba0')
-sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26' 'e136c2f411b582897437b06b9068c98ee333be41')
+sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26'
+          'e136c2f411b582897437b06b9068c98ee333be41')
 
 build() {
   cd "$srcdir/aspell6-pt_BR-$_pkgverBR-0"
@@ -36,4 +36,6 @@ package() {
 
   cd "$srcdir/aspell6-pt_PT-$_pkgverPT-0"
   make DESTDIR="$pkgdir" install
+
+  echo "add pt_BR.multi" > "$pkgdir"/usr/lib/aspell-0.60/brasileiro.alias
 }
diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD
index 6a964a35c..d940edfb7 100644
--- a/extra/bigloo/PKGBUILD
+++ b/extra/bigloo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162148 2012-06-22 11:52:24Z juergen $
+# $Id: PKGBUILD 171315 2012-11-17 05:25:07Z eric $
 # Maintainer: Jürgen Hötzel <juergen@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=bigloo
-_pkgver=3.8c
+_pkgver=3.9a
 pkgver=${_pkgver/-/_}
 pkgrel=1
 pkgdesc="Fast scheme compiler"
@@ -12,12 +12,12 @@ arch=('i686' 'x86_64')
 url="http://www-sop.inria.fr/mimosa/fp/Bigloo/"
 license=('GPL' 'LGPL')
 depends=()
-makedepends=('java-environment' 'emacs' 'zip' 'openssl' 'sqlite' 'alsa-lib' 'flac' 'avahi')
-optdepends=('emacs' 'java-environment' 'zip' 'openssl' 'sqlite' 'alsa-lib' 'flac' 'avahi')
+makedepends=('java-environment' 'emacs' 'zip' 'sqlite' 'alsa-lib' 'flac' 'avahi')
+optdepends=('emacs' 'java-environment' 'zip' 'sqlite' 'alsa-lib' 'flac' 'avahi')
 options=('!makeflags')
 install=bigloo.install
 source=(ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${pkgname}${_pkgver}.tar.gz)
-md5sums=('ceea21b14c8f7270be5223dce713ec6d')
+md5sums=('7091f6f54cb5f63768a8152085d1bd02')
 
 build() {
   cd "${srcdir}/${pkgname}${_pkgver}"
diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD
new file mode 100644
index 000000000..6ab2354ba
--- /dev/null
+++ b/extra/check/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 171322 2012-11-17 08:55:42Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Jeremy Cowgar <jeremy@cowgar.com>
+
+pkgname=check
+pkgver=0.9.9
+pkgrel=1
+pkgdesc="A unit testing framework for C"
+arch=('i686' 'x86_64')
+url="http://check.sourceforge.net/"
+license=('LGPL')
+options=('!libtool')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('f3702f2fcfc19ce3f62dca66c241a168')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # get rid of the package's info directory,
+  # install-info adds entries for us at install-time
+  rm "$pkgdir/usr/share/info/dir"
+}
diff --git a/extra/check/check.install b/extra/check/check.install
new file mode 100644
index 000000000..c4092e298
--- /dev/null
+++ b/extra/check/check.install
@@ -0,0 +1,20 @@
+_infodir=/usr/share/info
+_filelist=(check.info)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${_filelist[@]}; do
+    install-info $_infodir/$file $_infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${_filelist[@]}; do
+    install-info --delete $_infodir/$file $_infodir/dir 2> /dev/null
+  done
+}
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 7f81e462d..40ecf7335 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170683 2012-11-09 12:41:46Z jgc $
+# $Id: PKGBUILD 171432 2012-11-17 14:39:23Z jgc $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=colord
 pkgver=0.1.24
-pkgrel=2
+pkgrel=3
 pkgdesc="System daemon for managing color devices"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/software/colord"
@@ -24,7 +24,8 @@ build() {
   ./configure --prefix=/usr \
     --sysconfdir=/etc --libexecdir=/usr/lib/colord \
     --localstatedir=/var --disable-static \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --enable-vala
   make
 }
 
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index b997bbbe2..19be26911 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159952 2012-05-27 10:21:37Z tomegun $
+# $Id: PKGBUILD 171355 2012-11-17 09:20:41Z eric $
 # Maintainer:
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -6,23 +6,25 @@
 
 pkgname=easytag
 pkgver=2.1.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Utility for viewing, editing and writing ID3 tags of your MP3 files"
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://easytag.sourceforge.net/'
-depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'desktop-file-utils')
+depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'libmp4v2' 'desktop-file-utils')
 install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('9df3e800d80e754670642f2ba5e03539')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" easytag-2.1.7-new_libmp4v2.patch)
+md5sums=('9df3e800d80e754670642f2ba5e03539'
+         '0d01887de463585d944777b638a28c85')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i "${srcdir}/easytag-2.1.7-new_libmp4v2.patch"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/easytag/easytag-2.1.7-new_libmp4v2.patch b/extra/easytag/easytag-2.1.7-new_libmp4v2.patch
new file mode 100644
index 000000000..4a6c315c2
--- /dev/null
+++ b/extra/easytag/easytag-2.1.7-new_libmp4v2.patch
@@ -0,0 +1,535 @@
+Compability with libmp4v2.so.2 (upstream revision r479)
+
+http://bugs.gentoo.org/409281
+
+--- src/mp4_header.c
++++ src/mp4_header.c
+@@ -204,7 +204,7 @@
+     /* Get size of file */
+     ETFileInfo->size = Get_File_Size(filename);
+ 
+-    if ((file = MP4Read(filename, 0)) == MP4_INVALID_FILE_HANDLE )
++    if ((file = MP4Read(filename)) == MP4_INVALID_FILE_HANDLE )
+     {
+         gchar *filename_utf8 = filename_to_display(filename);
+         //g_print(_("ERROR while opening file: '%s' (%s)."),filename_utf8,g_strerror(errno));
+@@ -218,7 +218,7 @@
+     {
+         gchar *filename_utf8 = filename_to_display(filename);
+         Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,("Contains no audio track"));
+-        MP4Close(file);
++        MP4Close(file, 0);
+         g_free(filename_utf8);
+         return FALSE;
+     }
+@@ -243,7 +243,7 @@
+     ETFileInfo->mode = MP4GetTrackAudioChannels(file, trackId);
+     ETFileInfo->duration = MP4ConvertFromTrackDuration(file, trackId, MP4GetTrackDuration(file, trackId), MP4_SECS_TIME_SCALE);
+ 
+-    MP4Close(file);
++    MP4Close(file, 0);
+     return TRUE;
+ }
+ 
+--- src/mp4_tag.c
++++ src/mp4_tag.c
+@@ -80,15 +80,9 @@
+ {
+     FILE   *file;
+     MP4FileHandle mp4file = NULL;
+-    uint16_t track, track_total;
+-    uint16_t disk, disktotal;
+-    u_int8_t *coverArt;
+-    u_int32_t coverSize;
+     Picture *prev_pic = NULL;
+-#ifdef NEWMP4
+     gint pic_num;
+-#endif
+-    
++
+     if (!filename || !FileTag)
+         return FALSE;
+ 
+@@ -102,7 +96,7 @@
+     fclose(file); // We close it cause mp4 opens/closes file itself
+ 
+     /* Get data from tag */
+-    mp4file = MP4Read(filename, 0);
++    mp4file = MP4Read(filename);
+     if (mp4file == MP4_INVALID_FILE_HANDLE)
+     {
+         gchar *filename_utf8 = filename_to_display(filename);
+@@ -111,109 +105,134 @@
+         return FALSE;
+     }
+ 
++    const MP4Tags* tags = MP4TagsAlloc();
++    MP4TagsFetch(tags, mp4file);
++
+     /* TODO Add error detection */
+ 
+     /*********
+      * Title *
+      *********/
+-    MP4GetMetadataName(mp4file, &FileTag->title);
++    if (tags->name)
++    {
++        FileTag->title = Try_To_Validate_Utf8_String(tags->name);
++    }
+ 
+     /**********
+      * Artist *
+      **********/
+-    MP4GetMetadataArtist(mp4file, &FileTag->artist);
++    if (tags->artist)
++    {
++        FileTag->artist = Try_To_Validate_Utf8_String(tags->artist);
++    }
++
++    /****************
++     * Album Artist *
++     ****************/
++    if (tags->albumArtist)
++    {
++        FileTag->album_artist = Try_To_Validate_Utf8_String(tags->albumArtist);
++    }
+ 
+     /*********
+      * Album *
+      *********/
+-    MP4GetMetadataAlbum(mp4file, &FileTag->album);
++    if (tags->album)
++    {
++        FileTag->album = Try_To_Validate_Utf8_String(tags->album);
++    }
+ 
+     /**********************
+      * Disk / Total Disks *
+      **********************/
+-    if (MP4GetMetadataDisk(mp4file, &disk, &disktotal))
++    if (tags->disk)
+     {
+-        if (disk != 0 && disktotal != 0)
+-            FileTag->disc_number = g_strdup_printf("%d/%d",(gint)disk,(gint)disktotal);
+-        else if (disk != 0)
+-            FileTag->disc_number = g_strdup_printf("%d",(gint)disk);
+-        else if (disktotal != 0)
+-            FileTag->disc_number = g_strdup_printf("/%d",(gint)disktotal);
+-        //if (disktotal != 0)
+-        //    FileTag->disk_number_total = g_strdup_printf("%d",(gint)disktotal);
++        if (tags->disk->index != 0 && tags->disk->total != 0)
++            FileTag->disc_number = g_strdup_printf("%d/%d",(gint)tags->disk->index,(gint)tags->disk->total);
++        else if (tags->disk->index != 0)
++            FileTag->disc_number = g_strdup_printf("%d",(gint)tags->disk->index);
++        else if (tags->disk->total != 0)
++            FileTag->disc_number = g_strdup_printf("/%d",(gint)tags->disk->total);
+     }
+ 
+     /********
+      * Year *
+      ********/
+-    MP4GetMetadataYear(mp4file, &FileTag->year);
++    if (tags->releaseDate)
++    {
++        FileTag->year = Try_To_Validate_Utf8_String(tags->releaseDate);
++    }
+ 
+     /*************************
+      * Track and Total Track *
+      *************************/
+-    if (MP4GetMetadataTrack(mp4file, &track, &track_total))
++    if (tags->track)
+     {
+-        if (track != 0)
+-            FileTag->track = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)track); // Just to have numbers like this : '01', '05', '12', ...
+-        if (track_total != 0)
+-            FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)track_total); // Just to have numbers like this : '01', '05', '12', ...
++        if (tags->track->index != 0)
++            FileTag->track = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)tags->track->index); // Just to have numbers like this : '01', '05', '12', ...
++        if (tags->track->total != 0)
++            FileTag->track_total = g_strdup_printf("%.*d",NUMBER_TRACK_FORMATED_SPIN_BUTTON,(gint)tags->track->total); // Just to have numbers like this : '01', '05', '12', ...
+     }
+ 
+     /*********
+      * Genre *
+      *********/
+-    MP4GetMetadataGenre(mp4file, &FileTag->genre);
++    if (tags->genre)
++    {
++        FileTag->genre = Try_To_Validate_Utf8_String(tags->genre);
++    }
+ 
+     /***********
+      * Comment *
+      ***********/
+-    MP4GetMetadataComment(mp4file, &FileTag->comment);
++    if (tags->comments)
++    {
++        FileTag->comment = Try_To_Validate_Utf8_String(tags->comments);
++    }
+ 
+     /**********************
+      * Composer or Writer *
+      **********************/
+-    MP4GetMetadataWriter(mp4file, &FileTag->composer);
++    if (tags->composer)
++    {
++        FileTag->composer = Try_To_Validate_Utf8_String(tags->composer);
++    }
+ 
+     /*****************
+      * Encoding Tool *
+      *****************/
+-    MP4GetMetadataTool(mp4file, &FileTag->encoded_by);
+-
+-    /* Unimplemented
+-    Tempo / BPM
+-    MP4GetMetadataTempo(file, &string)
+-    */
++    if (tags->encodedBy)
++    {
++        FileTag->encoded_by = Try_To_Validate_Utf8_String(tags->encodedBy);
++    }
+ 
+     /***********
+      * Picture *
+      ***********/
+-#ifdef NEWMP4
+-    // There version can handle multiple pictures!
+-    // Version 1.6 of libmp4v2 introduces an index argument for MP4GetMetadataCoverart
+-    for (pic_num = 0; (MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize,pic_num )); pic_num++)
+-#else
+-    // There version handle only one picture!
+-    if ( MP4GetMetadataCoverArt( mp4file, &coverArt, &coverSize ) )
+-#endif
+-    {
+-        Picture *pic;
+-        
+-        pic = Picture_Allocate();
+-        if (!prev_pic)
+-            FileTag->picture = pic;
+-        else
+-            prev_pic->next = pic;
+-        prev_pic = pic;
+-
+-        pic->size = coverSize;
+-        pic->data = coverArt;
+-        pic->type = PICTURE_TYPE_FRONT_COVER;
+-        pic->description = NULL;
++    if (tags->artworkCount) {
++        const MP4TagArtwork* art = tags->artwork; /* artwork != NULL when artworkCount > 0 */
++        for (pic_num = 0; pic_num < tags->artworkCount; pic_num++, art++)
++        {
++            Picture *pic;
++
++            pic = Picture_Allocate();
++            if (!prev_pic)
++                FileTag->picture = pic;
++            else
++                prev_pic->next = pic;
++            prev_pic = pic;
++
++            pic->size = art->size;
++            pic->data = g_memdup(art->data, pic->size);
++            pic->type = PICTURE_TYPE_FRONT_COVER;
++            pic->description = NULL;
++        }
+     }
+ 
+ 
+     /* Free allocated data */
+-    MP4Close(mp4file);
++    MP4TagsFree(tags);
++    MP4Close(mp4file, 0);
+ 
+     return TRUE;
+ }
+@@ -235,6 +254,7 @@
+     FILE     *file;
+     MP4FileHandle mp4file = NULL;
+     gint error = 0;
++    gint pic_num;
+ 
+     if (!ETFile || !ETFile->FileTag)
+         return FALSE;
+@@ -252,23 +272,25 @@
+     fclose(file);
+ 
+     /* Open file for writing */
+-    mp4file = MP4Modify(filename,0,0);
++    mp4file = MP4Modify(filename, 0);
+     if (mp4file == MP4_INVALID_FILE_HANDLE)
+     {
+         Log_Print(LOG_ERROR,_("ERROR while opening file: '%s' (%s)."),filename_utf8,_("MP4 format invalid"));
+         return FALSE;
+     }
+ 
++    const MP4Tags* tags = MP4TagsAlloc();
++    MP4TagsFetch(tags, mp4file);
++
+     /*********
+      * Title *
+      *********/
+     if (FileTag->title && g_utf8_strlen(FileTag->title, -1) > 0)
+     {
+-        MP4SetMetadataName(mp4file, FileTag->title);
++        MP4TagsSetName(tags, FileTag->title);
+     }else
+     {
+-        //MP4DeleteMetadataName(mp4file); // Not available on mpeg4ip-1.2 (only in 1.3)
+-        MP4SetMetadataName(mp4file, "");
++        MP4TagsSetName(tags, "");
+     }
+ 
+     /**********
+@@ -276,11 +298,21 @@
+      **********/
+     if (FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
+     {
+-        MP4SetMetadataArtist(mp4file, FileTag->artist);
++        MP4TagsSetArtist(tags, FileTag->artist);
++    }else
++    {
++        MP4TagsSetArtist(tags, "");
++    }
++
++    /****************
++     * Album Artist *
++     ****************/
++    if (FileTag->artist && g_utf8_strlen(FileTag->artist, -1) > 0)
++    {
++        MP4TagsSetAlbumArtist(tags, FileTag->album_artist);
+     }else
+     {
+-        //MP4DeleteMetadataArtist(mp4file);
+-        MP4SetMetadataArtist(mp4file, "");
++        MP4TagsSetAlbumArtist(tags, "");
+     }
+ 
+     /*********
+@@ -288,22 +320,19 @@
+      *********/
+     if (FileTag->album && g_utf8_strlen(FileTag->album, -1) > 0)
+     {
+-        MP4SetMetadataAlbum(mp4file, FileTag->album);
++        MP4TagsSetAlbum(tags, FileTag->album);
+     }else
+     {
+-        //MP4DeleteMetadataAlbum(mp4file);
+-        MP4SetMetadataAlbum(mp4file, "");
++        MP4TagsSetAlbum(tags, "");
+     }
+ 
+     /**********************
+      * Disk / Total Disks *
+      **********************/
++    MP4TagDisk td;
+     if (FileTag->disc_number && g_utf8_strlen(FileTag->disc_number, -1) > 0)
+     //|| FileTag->disc_number_total && g_utf8_strlen(FileTag->disc_number_total, -1) > 0)
+     {
+-        uint16_t disk      = 0;
+-        uint16_t disktotal = 0;
+-
+         /* At the present time, we manage only disk number like '1' or '1/2', we
+          * don't use disk number total... so here we try to decompose */
+         if (FileTag->disc_number)
+@@ -314,27 +343,24 @@
+             {
+                 // A disc_number_total was entered
+                 if ( (tmp+1) && atoi(tmp+1) )
+-                    disktotal = atoi(tmp+1);
++                    td.total = atoi(tmp+1);
+ 
+                 // Fill disc_number
+                 *tmp = '\0';
+-                disk = atoi(dn_tmp);
++                td.index = atoi(dn_tmp);
+             }else
+             {
+-                disk = atoi(FileTag->disc_number);
++                td.index = atoi(FileTag->disc_number);
++                td.total = NULL;
+             }
+             g_free(dn_tmp);
+         }
+-        /*if (FileTag->disc_number)
+-            disk = atoi(FileTag->disc_number);
+-        if (FileTag->disc_number_total)
+-            disktotal = atoi(FileTag->disc_number_total);
+-        */
+-        MP4SetMetadataDisk(mp4file, disk, disktotal);
++        MP4TagsSetDisk(tags, &td);
+     }else
+     {
+-        //MP4DeleteMetadataDisk(mp4file);
+-        MP4SetMetadataDisk(mp4file, 0, 0);
++        td.index = NULL;
++        td.total = NULL;
++        MP4TagsSetDisk(tags, &td);
+     }
+ 
+     /********
+@@ -342,30 +368,29 @@
+      ********/
+     if (FileTag->year && g_utf8_strlen(FileTag->year, -1) > 0)
+     {
+-        MP4SetMetadataYear(mp4file, FileTag->year);
++        MP4TagsSetReleaseDate(tags, FileTag->year);
+     }else
+     {
+-        //MP4DeleteMetadataYear(mp4file);
+-        MP4SetMetadataYear(mp4file, "");
++        MP4TagsSetReleaseDate(tags, "");
+     }
+ 
+     /*************************
+      * Track and Total Track *
+      *************************/
++    MP4TagTrack tt;
+     if ( (FileTag->track       && g_utf8_strlen(FileTag->track, -1) > 0)
+     ||   (FileTag->track_total && g_utf8_strlen(FileTag->track_total, -1) > 0) )
+     {
+-        uint16_t track       = 0;
+-        uint16_t track_total = 0;
+         if (FileTag->track)
+-            track = atoi(FileTag->track);
++            tt.index = atoi(FileTag->track);
+         if (FileTag->track_total)
+-            track_total = atoi(FileTag->track_total);
+-        MP4SetMetadataTrack(mp4file, track, track_total);
++            tt.total = atoi(FileTag->track_total);
++        MP4TagsSetTrack(tags, &tt);
+     }else
+     {
+-        //MP4DeleteMetadataTrack(mp4file);
+-        MP4SetMetadataTrack(mp4file, 0, 0);
++        tt.index = NULL;
++        tt.total = NULL;
++        MP4TagsSetTrack(tags, &tt);
+     }
+ 
+     /*********
+@@ -373,11 +398,10 @@
+      *********/
+     if (FileTag->genre && g_utf8_strlen(FileTag->genre, -1) > 0 )
+     {
+-        MP4SetMetadataGenre(mp4file, FileTag->genre);
++        MP4TagsSetGenre(tags, FileTag->genre);
+     }else
+     {
+-        //MP4DeleteMetadataGenre(mp4file);
+-        MP4SetMetadataGenre(mp4file, "");
++        MP4TagsSetGenre(tags, "");
+     }
+ 
+     /***********
+@@ -385,11 +409,10 @@
+      ***********/
+     if (FileTag->comment && g_utf8_strlen(FileTag->comment, -1) > 0)
+     {
+-        MP4SetMetadataComment(mp4file, FileTag->comment);
++        MP4TagsSetComments(tags, FileTag->comment);
+     }else
+     {
+-        //MP4DeleteMetadataComment(mp4file);
+-        MP4SetMetadataComment(mp4file, "");
++        MP4TagsSetComments(tags, "");
+     }
+ 
+     /**********************
+@@ -397,11 +420,10 @@
+      **********************/
+     if (FileTag->composer && g_utf8_strlen(FileTag->composer, -1) > 0)
+     {
+-        MP4SetMetadataWriter(mp4file, FileTag->composer);
++        MP4TagsSetComposer(tags, FileTag->composer);
+     }else
+     {
+-        //MP4DeleteMetadataWriter(mp4file);
+-        MP4SetMetadataWriter(mp4file, "");
++        MP4TagsSetComposer(tags, "");
+     }
+ 
+     /*****************
+@@ -409,33 +431,39 @@
+      *****************/
+     if (FileTag->encoded_by && g_utf8_strlen(FileTag->encoded_by, -1) > 0)
+     {
+-        MP4SetMetadataTool(mp4file, FileTag->encoded_by);
++        MP4TagsSetEncodedBy(tags, FileTag->encoded_by);
+     }else
+     {
+-        //MP4DeleteMetadataTool(mp4file);
+-        MP4SetMetadataTool(mp4file, "");
++        MP4TagsSetEncodedBy(tags, "");
+     }
+ 
+     /***********
+      * Picture *
+      ***********/
++    Picture *pic = FileTag->picture;
++    const gint artworkCount = tags->artworkCount;
++
++    for (pic_num = 0; pic_num < artworkCount; pic_num++)
+     {
+-        // Can handle only one picture...
+-        Picture *pic;
++        MP4TagsRemoveArtwork(tags, 0);
++    }
+ 
+-        //MP4DeleteMetadataCoverArt(mp4file);
+-        MP4SetMetadataCoverArt(mp4file, NULL, 0);
+-        for( pic = FileTag->picture; pic; pic = pic->next )
++    while (pic)
++    {
++        if (pic->data)
+         {
+-            if( pic->type == PICTURE_TYPE_FRONT_COVER )
+-            {
+-                MP4SetMetadataCoverArt(mp4file, pic->data, pic->size);
+-            }
++            MP4TagArtwork art;
++            art.data = pic->data;
++            art.size = pic->size;
++            art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2
++            MP4TagsAddArtwork(tags, &art);
+         }
++        pic = pic->next;
+     }
+ 
+-
+-    MP4Close(mp4file);
++    MP4TagsStore(tags, mp4file);
++    MP4TagsFree(tags);
++    MP4Close(mp4file, 0);
+ 
+     if (error) return FALSE;
+     else       return TRUE;
+--- src/picture.c
++++ src/picture.c
+@@ -326,24 +326,7 @@
+     else if (MESSAGE_BOX_POSITION_MOUSE)
+         gtk_window_set_position(GTK_WINDOW(FileSelectionWindow),GTK_WIN_POS_MOUSE);
+ 
+-    // Behaviour following the tag type...
+-    switch (ETCore->ETFileDisplayed->ETFileDescription->TagType)
+-    {
+-        case MP4_TAG:
+-        {
+-            // Only one file can be selected
+-            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), FALSE);
+-            break;
+-        }
+-
+-        // Other tag types
+-        default:
+-        {
+-            gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), TRUE);
+-            break;
+-        }
+-    }
+-
++    gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(FileSelectionWindow), TRUE);
+     gtk_dialog_set_default_response(GTK_DIALOG(FileSelectionWindow), GTK_RESPONSE_OK);
+ 
+     // Starting directory (the same of the current file)
diff --git a/extra/easytag/easytag.install b/extra/easytag/easytag.install
index 93908edac..660593cf5 100644
--- a/extra/easytag/easytag.install
+++ b/extra/easytag/easytag.install
@@ -1,5 +1,5 @@
 post_install() {
-    [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
+    update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index f9afaf39a..31df82630 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -3,37 +3,27 @@
 # Contributor: boromil@gmail.com
 
 pkgname=ffmpegthumbnailer
-pkgver=2.0.7
-pkgrel=5
+pkgver=2.0.8
+pkgrel=1
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('ffmpeg' 'libjpeg' 'libpng')
 optdepends=('gvfs: support for gio uris')
-source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
-        'ffmpegthumbnailer.desktop' 'ffmpegapi_fix_r241.patch')
+source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz")
 options=('!libtool')
-sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
-          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53'
-          '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6')
+sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Don't use deprecated (removed?) ffmpeg api
-  patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch"
+  ./configure --prefix=/usr --enable-gio --enable-thumbnailer
 
-  ./configure --prefix=/usr --enable-gio
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  # FS#24105: Generate thumbnails in nautilus
-  # FS#26540: Rename to .thumbnailer for nautilus
-  install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
-    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer"
 }
diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index 2f57928fe..6b1505a4f 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164767 2012-08-04 18:59:21Z ronald $
+# $Id: PKGBUILD 171437 2012-11-17 15:03:45Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 
 pkgname=fuse
-pkgver=2.9.1
+pkgver=2.9.2
 pkgrel=1
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ backup=(etc/fuse.conf)
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	'fuse.conf')
 options=(!libtool)
-sha1sums=('ed9e8ab740576a038856109cc587d52a387b223f'
+sha1sums=('fcfc005b1edcd5e8b325729a1b325ff0e8b2a5ab'
           '3b42e37a741d4651099225987dc40e7f02a716ad')
 
 build() {
diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD
index 970b2ce93..92619f7bb 100644
--- a/extra/glpk/PKGBUILD
+++ b/extra/glpk/PKGBUILD
@@ -1,21 +1,23 @@
+# $Id: PKGBUILD 171320 2012-11-17 07:46:20Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: bzklrm <bzklrm@gmail.com>
 # Additional contributors Senjin, Xavier, dundee
 
 pkgname=glpk
 pkgver=4.47
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/glpk/glpk.html"
 license=('GPL')
 depends=('glibc')
 options=('!libtool')
-source=("http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('35e16d3167389b6bc75eb51b4b48590db59f789c')
+source=(http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz{,.sig})
+sha1sums=('35e16d3167389b6bc75eb51b4b48590db59f789c'
+          'e29069fb4e8e34929a980a8659b3dd7ccd92a676')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr
 
@@ -27,6 +29,8 @@ build() {
 }
 
 package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
+  install -Dm644 doc/glpk.pdf "${pkgdir}/usr/share/doc/glpk/glpk.pdf"
+  install -Dm644 doc/gmpl.pdf "${pkgdir}/usr/share/doc/glpk/gmpl.pdf"
 }
diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD
index 290c911dc..3df3f01c4 100644
--- a/extra/gsl/PKGBUILD
+++ b/extra/gsl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151402 2012-02-26 10:25:31Z pierre $
+# $Id: PKGBUILD 171358 2012-11-17 09:32:49Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Juergen Hoetzel <juergen.archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -19,12 +19,17 @@ sha1sums=('d914f84b39a5274b0a589d9b83a66f44cd17ca8e')
 build() {
     unset LDFLAGS
 
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd "${srcdir}/${pkgname}-${pkgver}"
     ./configure --prefix=/usr
     make
 }
 
+check() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make check
+}
+
 package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/latex2rtf/PKGBUILD b/extra/latex2rtf/PKGBUILD
index ffdbb3d13..c7d15c6c7 100644
--- a/extra/latex2rtf/PKGBUILD
+++ b/extra/latex2rtf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164721 2012-08-04 06:54:39Z remy $
+# $Id: PKGBUILD 171488 2012-11-18 03:22:38Z eric $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=latex2rtf
 pkgver=2.2.1c
-pkgrel=1
+pkgrel=2
 pkgdesc="LaTeX to RTF converter"
 arch=('i686' 'x86_64')
 url="http://latex2rtf.sourceforge.net/"
@@ -15,12 +15,13 @@ checkdepends=(
   'texlive-core'
   'texlive-latexextra' # for a4wide package
 )
+install=latex2rtf.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('3fd5874de8988cf45f8862d2b3db8ed13a04caa4')
 
 build() {
   cd "${srcdir}/${pkgname}-2.2.1"
-  make
+  make DESTDIR=/usr
 }
 
 check() {
@@ -30,6 +31,6 @@ check() {
 
 package() {
   cd "${srcdir}/${pkgname}-2.2.1"
-  make DESTDIR=${pkgdir}/usr install
-  sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' ${pkgdir}/usr/bin/latex2png
+  make DESTDIR="${pkgdir}/usr" install install-info
+  sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' "${pkgdir}/usr/bin/latex2png"
 }
diff --git a/extra/latex2rtf/latex2rtf.install b/extra/latex2rtf/latex2rtf.install
new file mode 100644
index 000000000..8dbcca926
--- /dev/null
+++ b/extra/latex2rtf/latex2rtf.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file=latex2rtf.info
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD
index 84e3f4569..854293554 100644
--- a/extra/libgdiplus/PKGBUILD
+++ b/extra/libgdiplus/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 148818 2012-02-05 11:51:42Z ibiru $
+# $Id: PKGBUILD 171478 2012-11-18 00:00:45Z eric $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=libgdiplus
 pkgver=2.10
-pkgrel=2
+pkgrel=3
 pkgdesc="An Open Source Implementation of the GDI+ API"
 arch=(i686 x86_64)
 license=('MPL' 'LGPL')
 url="http://www.mono-project.com"
 depends=('libtiff>=3.9.2-2' 'cairo>=1.8.10' 'giflib' 'glib2>=2.24.0' 'libexif')
-makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 libpng15.patch)
 md5sums=('451966e8f637e3a1f02d1d30f900255d'
@@ -18,12 +17,12 @@ md5sums=('451966e8f637e3a1f02d1d30f900255d'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p0 <../libpng15.patch
-  ./configure --prefix=/usr --with-cairo=system || return 1
-  
-  make || return 1
+  ./configure --prefix=/usr --with-cairo=system
+
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index f7bf7799c..271602b72 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169336 2012-10-19 21:28:16Z foutrelis $
+# $Id: PKGBUILD 171485 2012-11-18 02:09:02Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,7 +11,7 @@
 
 pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
 pkgver=3.1
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -25,7 +25,8 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz
         clang-pure64.patch
         enable-lto.patch
         llvm-3.1-fix-debug-line-info.patch
-        clang-3.1-fix-libprofile_rt.a-location.patch)
+        clang-3.1-fix-libprofile_rt.a-location.patch
+        clang-3.1-fix-lwg-2141.patch)
 sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
             'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786'
             '563d8a5ef86123ed8775e115ad7f90c1aa3e80f70b4e587f1bccab2c10753558'
@@ -35,7 +36,8 @@ sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab'
             '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
             'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7'
             'db1f1aadebbc4c4232bdad49fb9b7dc61eac727085c63154b870fa9ce64fd18d'
-            '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137')
+            '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137'
+            'a3ac405a983643c9cb9081692a3f4d28e5d19571fa12b0517fb2b1f2acab0ad0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver.src"
@@ -81,6 +83,9 @@ build() {
   patch -d tools/clang -Np1 -i \
     "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch"
 
+  # Fix FS#32731: [clang] 3.1 fails to compile libstdc++ <chrono> 4.7.2
+  patch -d tools/clang -Np0 -i "$srcdir/clang-3.1-fix-lwg-2141.patch"
+
   # Fix FS#31098: LLVM 3.1 produces invalid debug information
   # http://llvm.org/bugs/show_bug.cgi?id=13211
   patch -Np1 -i "$srcdir/llvm-3.1-fix-debug-line-info.patch"
diff --git a/extra/llvm/clang-3.1-fix-lwg-2141.patch b/extra/llvm/clang-3.1-fix-lwg-2141.patch
new file mode 100644
index 000000000..af10a5c33
--- /dev/null
+++ b/extra/llvm/clang-3.1-fix-lwg-2141.patch
@@ -0,0 +1,65 @@
+Index: test/SemaCXX/libstdcxx_common_type_hack.cpp
+===================================================================
+--- test/SemaCXX/libstdcxx_common_type_hack.cpp	(revision 0)
++++ test/SemaCXX/libstdcxx_common_type_hack.cpp	(revision 166455)
+@@ -0,0 +1,33 @@
++// RUN: %clang_cc1 -fsyntax-only %s -std=c++11 -verify
++
++// This is a test for an egregious hack in Clang that works around
++// an issue with GCC's <type_traits> implementation. std::common_type
++// relies on pre-standard rules for decltype(), in which it doesn't
++// produce reference types so frequently.
++
++#ifdef BE_THE_HEADER
++
++#pragma GCC system_header
++namespace std {
++  template<typename T> T &&declval();
++
++  template<typename...Ts> struct common_type {};
++  template<typename A, typename B> struct common_type<A, B> {
++    // Under the rules in the standard, this always produces a
++    // reference type.
++    typedef decltype(true ? declval<A>() : declval<B>()) type;
++  };
++}
++
++#else
++
++#define BE_THE_HEADER
++#include "libstdcxx_common_type_hack.cpp"
++
++using T = int;
++using T = std::common_type<int, int>::type;
++
++using U = int; // expected-note {{here}}
++using U = decltype(true ? std::declval<int>() : std::declval<int>()); // expected-error {{different types}}
++
++#endif
+Index: lib/Sema/SemaTemplateInstantiateDecl.cpp
+===================================================================
+--- lib/Sema/SemaTemplateInstantiateDecl.cpp	(revision 166454)
++++ lib/Sema/SemaTemplateInstantiateDecl.cpp	(revision 166455)
+@@ -158,6 +158,22 @@
+     SemaRef.MarkDeclarationsReferencedInType(D->getLocation(), DI->getType());
+   }
+ 
++  // HACK: g++ has a bug where it gets the value kind of ?: wrong.
++  // libstdc++ relies upon this bug in its implementation of common_type.
++  // If we happen to be processing that implementation, fake up the g++ ?:
++  // semantics. See LWG issue 2141 for more information on the bug.
++  const DecltypeType *DT = DI->getType()->getAs<DecltypeType>();
++  CXXRecordDecl *RD = dyn_cast<CXXRecordDecl>(D->getDeclContext());
++  if (DT && RD && isa<ConditionalOperator>(DT->getUnderlyingExpr()) &&
++      DT->isReferenceType() &&
++      RD->getEnclosingNamespaceContext() == SemaRef.getStdNamespace() &&
++      RD->getIdentifier() && RD->getIdentifier()->isStr("common_type") &&
++      D->getIdentifier() && D->getIdentifier()->isStr("type") &&
++      SemaRef.getSourceManager().isInSystemHeader(D->getLocStart()))
++    // Fold it to the (non-reference) type which g++ would have produced.
++    DI = SemaRef.Context.getTrivialTypeSourceInfo(
++      DI->getType().getNonReferenceType());
++
+   // Create the new typedef
+   TypedefNameDecl *Typedef;
+   if (IsTypeAlias)
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 87fc70c20..6cf5a0a14 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164769 2012-08-04 19:30:05Z ronald $
+# $Id: PKGBUILD 171457 2012-11-17 16:07:22Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=lyx
-pkgver=2.0.4
+pkgver=2.0.5
 pkgrel=1
 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
 backup=('etc/lyx/lyxrc.dist')
 install=lyx.install
 options=('emptydirs')
-sha1sums=('4d384060553c74912e13f98e1788a6f978c58c2e'
+sha1sums=('afffd3fd2f2429c93402a4923d7a2838e0758d28'
           'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
           '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
 
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index c4cffbb3e..1be812e93 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168551 2012-10-13 11:42:56Z andyrtr $
+# $Id: PKGBUILD 171458 2012-11-17 21:07:48Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -12,7 +12,7 @@ _git=false
 if [ "${_git}" = "true" ]; then
     pkgver=8.99.git_$_gitdate
   else
-    pkgver=9.0
+    pkgver=9.0.1
 fi
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -21,8 +21,7 @@ makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
-source=(LICENSE
-        git_fixes.diff)
+source=(LICENSE)
 if [ "${_git}" = "true" ]; then
 	# mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
 	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
@@ -33,14 +32,11 @@ if [ "${_git}" = "true" ]; then
 )
 fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '2ebce12196dbb7b69bdf7ef53b8afdee'
-         '60e557ce407be3732711da484ab3db6c')
+         '97d6554c05ea7449398afe3a0ede7018')
 
 build() {
     cd ${srcdir}/?esa-*
 
-    patch -Np1 -i ${srcdir}/git_fixes.diff
-
     COMMONOPTS="--prefix=/usr \
     --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index 35f1d128f..4b756c939 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166521 2012-09-09 15:41:05Z heftig $
+# $Id: PKGBUILD 171364 2012-11-17 11:09:07Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp
 pkgver=0.9.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="NetworkManager VPN plugin for pptp "
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,11 +13,17 @@ makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 options=('!libtool')
 install=networkmanager-pptp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz)
-sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4')
+source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz
+        fix-path-to-auth-dialog.patch
+        gtk_table_to_gtk_grid.patch)
+sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4'
+            '35f9c2cb4d046c8f215617e1a0bfd8551965bd0655af0cd25f89c17ea5e9081a'
+            '17c194c605bca780bf657711e9cff910c63ab27eae70c11cb6c53e9c75ad3215')
 
 build() {
   cd NetworkManager-pptp-${pkgver}
+  patch -Np1 -i ../fix-path-to-auth-dialog.patch
+  patch -Np1 -i ../gtk_table_to_gtk_grid.patch
   ./configure --prefix=/usr \
   	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/networkmanager \
diff --git a/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch b/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch
new file mode 100644
index 000000000..28a4a5a44
--- /dev/null
+++ b/extra/networkmanager-pptp/fix-path-to-auth-dialog.patch
@@ -0,0 +1,26 @@
+From a2f52d4455bd81732b6b3c16bdab206c56818c07 Mon Sep 17 00:00:00 2001
+From: Clemens Buchacher <drizzd@aon.at>
+Date: Sun, 1 Jul 2012 18:35:50 +0200
+Subject: [PATCH] fix path to auth-dialog
+
+
+Signed-off-by: Clemens Buchacher <drizzd@aon.at>
+---
+ nm-pptp-service.name.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nm-pptp-service.name.in b/nm-pptp-service.name.in
+index 9ee79b8..ea5f0e5 100644
+--- a/nm-pptp-service.name.in
++++ b/nm-pptp-service.name.in
+@@ -4,6 +4,6 @@ service=org.freedesktop.NetworkManager.pptp
+ program=@LIBEXECDIR@/nm-pptp-service
+ 
+ [GNOME]
+-auth-dialog=nm-pptp-auth-dialog
++auth-dialog=@LIBEXECDIR@/nm-pptp-auth-dialog
+ properties=libnm-pptp-properties
+ supports-external-ui-mode=true
+-- 
+1.7.11.1
+
diff --git a/extra/networkmanager-pptp/gtk_table_to_gtk_grid.patch b/extra/networkmanager-pptp/gtk_table_to_gtk_grid.patch
new file mode 100644
index 000000000..3483b57cc
--- /dev/null
+++ b/extra/networkmanager-pptp/gtk_table_to_gtk_grid.patch
@@ -0,0 +1,40 @@
+From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
+Subject: Port GtkTable uses to GtkGrid.
+
+Index: network-manager-pptp/auth-dialog/vpn-password-dialog.c
+===================================================================
+--- network-manager-pptp.orig/auth-dialog/vpn-password-dialog.c	2012-02-15 11:24:03.803503000 -0500
++++ network-manager-pptp/auth-dialog/vpn-password-dialog.c	2012-02-15 11:30:20.344710680 -0500
+@@ -124,8 +124,8 @@
+ 	label = gtk_label_new_with_mnemonic (label_text);
+ 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ 
+-	gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, row, row + 1);
+-	gtk_table_attach_defaults (GTK_TABLE (table), entry, 1, 2, row, row + 1);
++	gtk_grid_attach (GTK_GRID (table), label, 0, row, 1, 1);
++	gtk_grid_attach (GTK_GRID (table), entry, 1, row, 1, 1);
+ 
+ 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
+ }
+@@ -154,7 +154,7 @@
+ 	if (priv->show_password_secondary)
+ 		add_row (priv->table, row++, priv->secondary_password_label,  priv->password_entry_secondary);
+ 
+-	gtk_table_attach_defaults (GTK_TABLE (priv->table), priv->show_passwords_checkbox, 1, 2, row, row + 1);
++	gtk_grid_attach (GTK_GRID (priv->table), priv->show_passwords_checkbox, 1, row, 1, 1);
+ 
+ 	gtk_widget_show_all (priv->table);
+ }
+@@ -228,9 +228,9 @@
+ 
+ 	priv->group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ 
+-	priv->table = gtk_table_new (4, 2, FALSE);
+-	gtk_table_set_col_spacings (GTK_TABLE (priv->table), 12);
+-	gtk_table_set_row_spacings (GTK_TABLE (priv->table), 6);
++	priv->table = gtk_grid_new ();
++	gtk_grid_set_column_spacing (GTK_GRID (priv->table), 12);
++	gtk_grid_set_row_spacing (GTK_GRID (priv->table), 6);
+ 	gtk_container_add (GTK_CONTAINER (priv->table_alignment), priv->table);
+ 
+ 	priv->password_entry = gtk_entry_new ();
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 177c70c77..4ee0514ca 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,24 +1,31 @@
-# $Id: PKGBUILD 170248 2012-11-06 10:20:15Z jgc $
+# $Id: PKGBUILD 171480 2012-11-18 00:28:26Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
 pkgver=2.98
-pkgrel=3
+pkgrel=4
 pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.rhythmbox.org"
-depends=('dconf' 'desktop-file-utils' 'grilo'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
-         'libdmapsharing' 'libgpod' 'libmtp' 'libnotify' 'libpeas'
-         'lirc-utils' 'media-player-info' 'python2-gobject' 'python2-mako' 'totem-plparser'
-         'tdb' 'libdiscid')
-makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala' 'gnome-common' 'gtk-doc')
+depends=('dconf' 'desktop-file-utils' 'gstreamer0.10-base-plugins' 
+         'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
+         'libnotify' 'libpeas' 'media-player-info' 'python2-gobject' 
+         'totem-plparser' 'tdb')
+makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 
+             'vala' 'gnome-common' 'gtk-doc' 'grilo' 'libdmapsharing' 'lirc-utils' 
+             'libgpod' 'libmtp')
 optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
             'gstreamer0.10-bad-plugins: Extra media codecs'
             'gstreamer0.10-ffmpeg: Extra media codecs'
-            'brasero: cd burning')
+            'brasero: Audio CD Recorder plugin'
+            'libdmapsharing: DAAP Music Sharing plugin'
+            'grilo-plugins: Grilo media browser plugin'
+            'lirc-utils: LIRC plugin'
+            'libgpod: Portable Players - iPod plugin'
+            'libmtp: Portable Players - MTP plugin'
+            'zeitgeist: Zeitgeist plugin')
 options=('!libtool' '!emptydirs')
 install=rhythmbox.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index ca3c36225..23c7b170b 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -1,32 +1,42 @@
-# $Id: PKGBUILD 154990 2012-04-01 08:33:19Z ronald $
+# $Id: PKGBUILD 171430 2012-11-17 14:28:35Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# Contributor: Christopher Reimer <c.reimer1993@gmail.com>
 
 pkgname=texmacs
-pkgver=1.0.7.15
+pkgver=1.0.7.16
 pkgrel=1
 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one."
 arch=('i686' 'x86_64')
 url="http://www.texmacs.org/"
 license=('GPL')
-depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info' 'desktop-file-utils')
+depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info'
+         'desktop-file-utils' 'qt')
 # do not remove texlive-core dependency, as it is needed!
-optdepends=('transfig: convert images using fig2ps' 'awk: conversion of some files')
+optdepends=('transfig: convert images using fig2ps'
+            'gawk: conversion of some files')
 #source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz)
 source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz)
 install=texmacs.install
-sha1sums=('d75d55fcf0c06bf7fd5d9afd1031b9cf8413cbd3')
+options=('!emptydirs')
+sha1sums=('bd73a8ff1c5361161cc65c57dfe8e706a1859231')
 
 build() {
   cd ${srcdir}/TeXmacs-${pkgver}-src
   sed -i 's/env python/env python2/' \
-    plugins/{mathematica/bin/realpath.py,python/bin/tm_python,sage/bin/tm_sage}
+    plugins/{mathematica/bin/realpath.py,python/bin/tm_python,sage/bin/tm_sage} \
+    TeXmacs/misc/inkscape_plugin/texmacs_reedit.py
   sed -i 's/"python"/"python2"/' plugins/python/progs/init-python.scm
   sed -i '/^LDPATH/d' src/makefile.in
+
+ # Don't generate icon-cache and mime-database (namcap tells that they should not be in a package)
+  sed -i '/update-mime-database/d' Makefile.in
+  sed -i '/gtk-update-icon-cache/d' Makefile.in
+  sed -i '\/icons\/gnome 2>\/dev\/null/d' Makefile.in
+
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
-              --libexecdir=/usr/lib \
-	      --disable-qt
+              --libexecdir=/usr/lib
   make
 }
 
diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD
index f4de039e3..e0de53cba 100644
--- a/extra/truecrypt/PKGBUILD
+++ b/extra/truecrypt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 153964 2012-03-21 06:20:49Z remy $
+# $Id: PKGBUILD 171369 2012-11-17 11:36:42Z eric $
 # Maintainer: Paul Mattal <paul.archlinux.org>
 
 pkgname=truecrypt
@@ -33,7 +33,7 @@ build() {
   patch -Np1 -i ../${pkgname}-arch-detection.patch
   
   # Build
-  make PKCS11_INC="${srcdir}/pkcs-2.20"
+  make PKCS11_INC="${srcdir}/pkcs-2.20" LFLAGS+="-ldl"
 }
 
 package() {
diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD
index 12bd261bb..65d3e1ff5 100644
--- a/extra/wxmaxima/PKGBUILD
+++ b/extra/wxmaxima/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Vinay S Shastry <vinayshastry@gmail.com>
 
 pkgname=wxmaxima
-pkgver=12.04.0
+pkgver=12.09.0
 pkgrel=1
 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL2')
 depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils')
 source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz)
 install=wxmaxima.install
-sha1sums=('f29134a212db77e3087321bc944e346e6976cb40')
+sha1sums=('9b56f674392eabb75183b228757df8834b45b2a6')
 
 build() {
   cd "${srcdir}/wxMaxima-${pkgver}"
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index f8c297f92..28bd195f9 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 164038 2012-07-24 20:46:25Z pierre $
+# $Id: PKGBUILD 171491 2012-11-18 04:23:42Z eric $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zsh
 pkgver=5.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
 arch=('i686' 'x86_64')
 url='http://www.zsh.org/'
 license=('custom')
 depends=('pcre' 'libcap' 'gdbm')
+backup=('etc/zsh/zprofile')
 install=zsh.install
 source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
         'zprofile')
-backup=('etc/zsh/zprofile')
 md5sums=('e8484468925cec8d9a84b8b04797e764'
          '24a9335edf77252a7b5f52e079f7aef7')
 
@@ -51,7 +51,7 @@ build() {
 		--enable-pcre \
 		--enable-cap \
 		--enable-zsh-secure-free
-	make
+	make all info
 }
 
 check() {
@@ -61,7 +61,7 @@ check() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
+	make DESTDIR="${pkgdir}/" install install.info
 	install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
 	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/zsh/zsh.install b/extra/zsh/zsh.install
index e2a53bea8..8e54d92ee 100644
--- a/extra/zsh/zsh.install
+++ b/extra/zsh/zsh.install
@@ -1,5 +1,12 @@
+infodir=usr/share/info
+filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6)
+
 post_install() {
 	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
+	[ -x usr/bin/install-info ] || return 0
+	for file in ${filelist[@]}; do
+	    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+	done
 }
 
 post_upgrade() {
@@ -8,4 +15,8 @@ post_upgrade() {
 
 pre_remove() {
 	sed -i '/^\/bin\/zsh/d' etc/shells
+	[ -x usr/bin/install-info ] || return 0
+	for file in ${filelist[@]}; do
+	    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+	done
 }