Tue Nov 6 02:09:19 PST 2012

10 files changed, 71 insertions, 41 deletions

diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index 9f275feb5..3079ba025 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170057 2012-10-31 10:24:44Z andyrtr $
+# $Id: PKGBUILD 170234 2012-11-05 16:24:33Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-pkgver=1.12.6
-pkgrel=2
+pkgver=1.12.8
+pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
@@ -15,23 +15,11 @@ optdepends=('xcb-util: for XCB backend') # really needed?
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-        cairo-1.10.0-buggy_gradients.patch
-        git_fixes.diff)
-sha1sums=('a383c6cb4495e18848ea43e1031c294aa9417a43'
-          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04'
-          '31b3179cda0afa2e2f037d6850fd8607383cb95a')
+source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
+sha1sums=('56a10bf3b804367c97734d655c23a9f652d5c297')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-#  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
-
-  # status: http://cgit.freedesktop.org/cairo/commit/?id=66625cb46c985321c46b79d2163a4d676d6700ba
-  # 2012-10-30 12:40:41 (GMT)
-  # xlib: Apply the image offsets to the destination rather the source
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-
-#  autoreconf -vfi
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--localstatedir=/var \
@@ -45,7 +33,7 @@ build() {
 
 #check() {
 #  cd "$srcdir/$pkgname-$pkgver"
-#  make -k check || /bin/true # 161 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
+#  make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
 #}
 
 package() {
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index a8aa3b571..96f7ac061 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166907 2012-09-21 14:30:04Z andyrtr $
+# $Id: PKGBUILD 170236 2012-11-05 18:50:40Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -6,7 +6,7 @@
 
 pkgname=dovecot
 pkgver=2.1.10
-pkgrel=1
+pkgrel=2
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
@@ -32,6 +32,9 @@ build() {
 
   # fix build with recent clucene (FC)
   sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
+  
+  # fix path in helper script
+  sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
 
   # configure with openssl, mysql, and postgresql support
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
@@ -43,7 +46,8 @@ build() {
 	--with-mysql \
 	--with-pgsql \
 	--with-sqlite \
-	--with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
+	--with-ssl=openssl \
+	--with-ssldir=/etc/ssl \
 	--with-gssapi \
 	--with-ldap=plugin \
 	--with-zlib --with-bzlib \
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index b27ed16b5..725d2e28c 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169883 2012-10-30 22:25:57Z heftig $
+# $Id: PKGBUILD 170205 2012-11-05 11:32:48Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.34.0
+pkgver=2.34.1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
@@ -12,7 +12,7 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 options=('!libtool')
 url="http://www.gtkmm.org/"
-sha256sums=('ae5b8221fdace1771d2ae401b52afdca8b64ee12bd0f956fb4e92d482ddc1cbf')
+sha256sums=('b425a52c7e178aeaaaffd02c5497bfd68d0cb8be56cef3620558a80dd5d692c4')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index a70272fc4..3ff1544fd 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169939 2012-10-30 22:45:58Z heftig $
+# $Id: PKGBUILD 170209 2012-11-05 11:49:55Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.6.0
+pkgver=3.6.1
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection' 'glade')
 options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('7d268618fbe8c2960300a305d38255294c9f497fcbc0e53a1da1bf9bda0d1c7a')
+sha256sums=('a9d31df02acc6e9a9547b5ebaee19d1dc4c87b216eb561ee19da69bd1bb1bd0d')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index 74632215d..ace0b2486 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166399 2012-09-07 16:43:18Z tpowa $
+# $Id: PKGBUILD 170201 2012-11-05 08:17:35Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk2
 pkgver=2.16.0
-pkgrel=1
+pkgrel=2
 pkgdesc=" An Objective Caml interface to gtk2"
 arch=(i686 x86_64)
 license=('LGPL')
diff --git a/extra/libxml++/PKGBUILD b/extra/libxml++/PKGBUILD
index 198544cbb..8e7c83e0d 100644
--- a/extra/libxml++/PKGBUILD
+++ b/extra/libxml++/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 137178 2011-09-06 09:14:31Z ibiru $
+# $Id: PKGBUILD 170207 2012-11-05 11:38:10Z jgc $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgbase=libxml++
 pkgname=('libxml++' 'libxml++-docs')
-pkgver=2.34.2
+pkgver=2.36.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://libxmlplusplus.sourceforge.net/"
 makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.34/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('77daba20ab76631071d4ed4cc18fa2e981160ca05ae661e8d146f2b0728f9baa')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.36/${pkgbase}-${pkgver}.tar.xz)
+sha256sums=('bfdf327bf9ebd12946b7aa6a152045f209d5c9fecd06ebfcdf9b3e7c1af6e2e1')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/tdb/PKGBUILD b/extra/tdb/PKGBUILD
index 1f19f4400..bc04c1c9c 100644
--- a/extra/tdb/PKGBUILD
+++ b/extra/tdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169553 2012-10-23 13:47:25Z tpowa $
+# $Id: PKGBUILD 170223 2012-11-05 14:18:32Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=tdb
 pkgver=1.2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits"
 arch=(i686 x86_64)
 license=('GPL3')
@@ -21,6 +21,7 @@ build() {
    # Use system docbook.xsl
    #_manstyle="/usr/share/xml/docbook/xsl-stylesheets-1.76.1/manpages/docbook.xsl"
    #sed -i "s#http.*xsl#$_manstyle#" tdb.mk
+   export PYTHON=/usr/bin/python2
    ./configure --prefix=/usr \
                --localstatedir=/var \
                --sysconfdir=/etc/samba
@@ -29,6 +30,7 @@ build() {
 
 package() {
    cd ${srcdir}/${pkgname}-${pkgver}
+   export PYTHON=/usr/bin/python2
    make DESTDIR=$pkgdir/ install
 }
 md5sums=('cc28048309df19782b04359282e9f98b')
diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD
index 46b88cecf..5070e266c 100644
--- a/extra/testdisk/PKGBUILD
+++ b/extra/testdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149731 2012-02-09 19:52:20Z ibiru $
+# $Id: PKGBUILD 170219 2012-11-05 14:04:00Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=testdisk
 pkgver=6.13
-pkgrel=2
+pkgrel=3
 pkgdesc="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
 arch=('i686' 'x86_64')
 url="http://www.cgsecurity.org/index.html?testdisk.html"
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index f7c4a4b59..eb747321b 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158046 2012-05-01 19:51:23Z foutrelis $
+# $Id: PKGBUILD 170243 2012-11-05 22:45:59Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfdesktop
 pkgver=4.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A desktop manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -17,9 +17,11 @@ replaces=('xfce4-menueditor')
 options=('!libtool')
 install=xfdesktop.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        add-backgrounds-xfce-to-search-path.patch)
+        add-backgrounds-xfce-to-search-path.patch
+        avoid-duplicating-volume-icons.patch)
 sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b'
-            'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5')
+            'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5'
+            'f2ad30fe8fed9e2f5a65c214f03b65353527d285a4ea0ec22a1feac5c452446b')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -28,6 +30,11 @@ build() {
   # https://bugzilla.xfce.org/show_bug.cgi?id=8799
   patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch"
 
+  # Workaround for GVFS 1.14.0 which emits volume-added signals for
+  # pre-existing volumes.
+  # https://bugzilla.xfce.org/show_bug.cgi?id=9464
+  patch -Np1 -i "$srcdir/avoid-duplicating-volume-icons.patch"
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/extra/xfdesktop/avoid-duplicating-volume-icons.patch b/extra/xfdesktop/avoid-duplicating-volume-icons.patch
new file mode 100644
index 000000000..45e18ac11
--- /dev/null
+++ b/extra/xfdesktop/avoid-duplicating-volume-icons.patch
@@ -0,0 +1,29 @@
+From 7b8b5cb05bd870549dee2d159e246ce58e325b7f Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos@foutrelis.com>
+Date: Tue, 6 Nov 2012 00:10:48 +0200
+Subject: [PATCH] Avoid duplicating volume icons
+
+This is a workaround for GVFS 1.14.0 which emits volume-added signals
+for pre-existing volumes.
+---
+ src/xfdesktop-file-icon-manager.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c
+index 72b6d09..e039cb8 100644
+--- a/src/xfdesktop-file-icon-manager.c
++++ b/src/xfdesktop-file-icon-manager.c
+@@ -2521,6 +2521,10 @@ xfdesktop_file_icon_manager_volume_added(GVolumeMonitor *monitor,
+ {
+     XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data);
+ 
++    /* avoid duplicating volume icons -- workaround for GVFS 1.14.0 */
++    if (g_hash_table_lookup(fmanager->priv->removable_icons, volume))
++        return;
++
+     xfdesktop_file_icon_manager_add_removable_volume(fmanager, volume);
+ }
+ 
+-- 
+1.8.0
+