Mon Jul 8 01:44:07 PDT 2013

7 files changed, 45 insertions, 14 deletions

diff --git a/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch b/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch
new file mode 100644
index 000000000..99f084930
--- /dev/null
+++ b/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch
@@ -0,0 +1,26 @@
+From cfcad42ff1ddee8e64d120f18016a654152d0215 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Fri, 17 May 2013 11:32:03 +0100
+Subject: [PATCH] Fix failure to start with ENOTSOCK
+
+---
+ CHANGELOG     | 6 ++++++
+ src/dnsmasq.c | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/dnsmasq.c b/src/dnsmasq.c
+index 43b8cb1..b0f984d 100644
+--- a/src/dnsmasq.c
++++ b/src/dnsmasq.c
+@@ -248,7 +248,7 @@ int main (int argc, char **argv)
+ #endif
+ 
+ #if defined(HAVE_LINUX_NETWORK) && defined(HAVE_DHCP6)
+-      if (daemon->dhcp6)
++      if (daemon->doing_dhcp6)
+ 	bindtodevice(daemon->dhcp6fd);
+ #endif
+     }
+-- 
+1.8.3.2
+
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 38accba08..17a247520 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 183176 2013-04-18 12:45:45Z dreisner $
+# $Id: PKGBUILD 189772 2013-07-07 19:08:06Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
 pkgver=2.66
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 arch=('i686' 'x86_64')
@@ -15,15 +15,18 @@ install=$pkgname.install
 backup=('etc/dnsmasq.conf')
 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"
         '0001-Fix-wrong-size-in-memset-call.patch'
+        '0001-Fix-failure-to-start-with-ENOTSOCK.patch'
         'dnsmasq.service')
 md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20'
          '05ccefefde68ebdebce5e40d2b3c78be'
+         '98cc950a6b0482eb7e61969dafb4f764'
          '7ac45726cabef4145db40d758cc7fedf')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
   patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch"
+  patch -Np1 <"$srcdir/0001-Fix-failure-to-start-with-ENOTSOCK.patch"
 }
 
 build() {
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index aca17ca8c..6594afa02 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189266 2013-07-01 22:29:39Z lcarlier $
+# $Id: PKGBUILD 189755 2013-07-07 09:05:23Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=9.1.4
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'llvm-amdgpu-snapshot' 'systemd')
@@ -85,8 +85,10 @@ package_nouveau-dri() {
   pkgdesc="Mesa drivers for Nouveau"
   depends=("mesa-libgl=${pkgver}")
 
+  # vdpau driver is problematic, so remove it (FS#36004)
   install -m755 -d ${pkgdir}/usr/lib/vdpau/
   mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
+  rm -rf ${pkgdir}/usr/lib/vdpau/
 
   install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
   mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index a04ce1828..144a33204 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 188488 2013-06-15 00:05:52Z bisson $
+# $Id: PKGBUILD 189752 2013-07-07 08:50:55Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 
 pkgname=scim
 pkgver=1.4.14
-pkgrel=4
+pkgrel=5
 pkgdesc='Input method user interface and development platform'
 url='http://www.scim-im.org/projects/scim'
 license=('LGPL')
diff --git a/extra/scim/install b/extra/scim/install
index ae6ea9d56..66912523a 100644
--- a/extra/scim/install
+++ b/extra/scim/install
@@ -1,6 +1,6 @@
 post_install() {
-	[[ -x usr/bin/gtk-query-immodules-2.0 ]] && usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	[[ -x usr/bin/gtk-query-immodules-3.0 ]] && usr/bin/gtk-query-immodules-3.0 > /etc/gtk-3.0/gtk.immodules
+	[[ -x usr/bin/gtk-query-immodules-2.0 ]] && gtk-query-immodules-2.0 --update-cache
+	[[ -x usr/bin/gtk-query-immodules-3.0 ]] && gtk-query-immodules-3.0 --update-cache
 	true
 }
 
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index 5d4d826b4..2b472ad34 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 184294 2013-05-05 17:50:37Z foutrelis $
+# $Id: PKGBUILD 189759 2013-07-07 14:26:30Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-session
 pkgver=4.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
 depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'xorg-xinit'
-          'hicolor-icon-theme')
+         'xorg-xrdb' 'hicolor-icon-theme')
 makedepends=('intltool' 'xfce4-dev-tools')
 optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled'
             'xscreensaver: for locking screen with xflock4'
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index d96bef997..cf93c56ed 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189727 2013-07-06 09:34:39Z andyrtr $
+# $Id: PKGBUILD 189748 2013-07-07 08:14:03Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=294
+pkgver=295
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('9e62f812f0560e446f9d0908662677f9'
+md5sums=('5a11e78d3504c859e8b16f7bbe03b0d1'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {