Fri Aug 26 23:14:45 UTC 2011

6 files changed, 50 insertions, 30 deletions

diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index 8a2634a96..31939a35f 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134977 2011-08-09 18:01:57Z ibiru $
+# $Id: PKGBUILD 136310 2011-08-25 17:39:52Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-settings-daemon
-pkgver=3.0.2
-pkgrel=2
+pkgver=3.0.3
+pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,8 +17,8 @@ url="http://www.gnome.org"
 groups=('gnome')
 replaces=(gnome-settings-daemon-pulse)
 conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f304aa54c59ab23f7ef55bfeefeecfd6f7a95cabbeed2ea802c94463d4234eec')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('9c6e3bb5c4b3a98ab83a917b7be15578d11831330f7f2deeecfbb625568e3e03')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index d2ec16e9a..253ac91ab 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134137 2011-08-02 08:56:19Z andrea $
+# $Id: PKGBUILD 136263 2011-08-25 08:59:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
 pkgver=4.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
 arch=('i686' 'x86_64')
@@ -14,13 +14,13 @@ makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2"
-        'gpsd-2.96.patch')
+        'gpsd3.patch')
 sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
-          'f44dfd3bb384e631d59b93d7dda3413795da8183')
+          '3916dd6307109d70d0dd538de913c91eede81d78')
 
 build() {
   cd "${srcdir}"/marble-${pkgver}
-  patch -p1 -i "${srcdir}"/gpsd-2.96.patch
+  patch -p1 -i "${srcdir}"/gpsd3.patch
 
   cd "${srcdir}"
   mkdir build
diff --git a/extra/libffi/PKGBUILD b/extra/libffi/PKGBUILD
index 555f0eb4e..167c7498a 100644
--- a/extra/libffi/PKGBUILD
+++ b/extra/libffi/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 72255 2010-03-13 20:43:14Z jgc $
+# $Id: PKGBUILD 136233 2011-08-25 06:36:16Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libffi
-pkgver=3.0.9
+pkgver=3.0.10
 pkgrel=1
-pkgdesc="A portable, high level programming interface to various calling conventions."
+pkgdesc="A portable, high level programming interface to various calling conventions"
 arch=('i686' 'x86_64')
-license=('MIT')
 url="http://sourceware.org/libffi"
-depends=('glibc' 'texinfo')
-options=('!libtool' 'force')
+license=('MIT')
+depends=('glibc')
+options=('!libtool')
 install=libffi.install
 source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('1f300a7a7f975d4046f51c3022fa5ff1')
+md5sums=('79390673f5d07a8fb342bc09b5055b6f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libffi/libffi.install b/extra/libffi/libffi.install
index 151b79b60..903bede10 100644
--- a/extra/libffi/libffi.install
+++ b/extra/libffi/libffi.install
@@ -1,7 +1,8 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(libffi.info.gz)
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
     install-info $infodir/$file $infodir/dir 2> /dev/null
   done
@@ -12,6 +13,7 @@ post_upgrade() {
 }
 
 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/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index 9c252849e..5217ae570 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135871 2011-08-19 21:48:29Z eric $
+# $Id: PKGBUILD 136236 2011-08-25 06:48:07Z tpowa $
 # Maintainer: andyrtr <andyrtr funnychar archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
 pkgname=thunar
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="modern file manager for Xfce"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
@@ -24,11 +24,13 @@ install=${pkgname}.install
 backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla')
 source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2
 	org.freedesktop.udisks.pkla
-        fix-gvfs.patch)
+        fix-gvfs.patch
+	fix-samba.patch)
 
 build() {
   cd ${srcdir}/Thunar-${pkgver}
   patch -Np1 -i ../fix-gvfs.patch
+  patch -Np1 -i ../fix-samba.patch
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
@@ -57,9 +59,8 @@ package() {
   install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d
   install -m644 ${srcdir}/org.freedesktop.udisks.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/
 }
+
 md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
          'a7ddb5eec02d9a8e91a2997862e73cd8'
-         '376c81af1ce5cf8b872d62a878163091')
-md5sums=('a86df0212db71e61f459bda6bc7b7fb6'
-         'a7ddb5eec02d9a8e91a2997862e73cd8'
-         '167c79462cddc5aaa1fcdc814041350b')
+         '167c79462cddc5aaa1fcdc814041350b'
+         'c8063873958d89402046f29b78c1d8d4')
diff --git a/extra/thunar/fix-samba.patch b/extra/thunar/fix-samba.patch
new file mode 100644
index 000000000..61d53bec3
--- /dev/null
+++ b/extra/thunar/fix-samba.patch
@@ -0,0 +1,14 @@
+--- thunar-file-ORIGINAL.c	2011-05-27 00:11:27.000000000 +0200
++++ thunar-1.2.2/thunar/thunar-file.c	2011-08-22 08:00:24.095066077 +0200
+@@ -754,7 +754,10 @@ thunar_file_load (ThunarFile   *file,
+           target_uri = 
+             g_file_info_get_attribute_string (file->info,
+                                               G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+-          file->is_mounted = (target_uri != NULL);
++          file->is_mounted = (target_uri != NULL)
++			? !g_file_info_get_attribute_boolean (file->info,
++                                                  G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT)
++            : FALSE;
+         }
+     }
+   else