[arch-commits] Commit in gnome-disk-utility/trunk (PKGBUILD fix-freeze.patch)

[Ionut Biru]

    Date: Thursday, October 7, 2010 @ 09:44:29
  Author: ibiru
Revision: 94500

upgpkg: gnome-disk-utility 2.32.0-2
fix freeze at startup when locale are not English. FS#19638

Added:
  gnome-disk-utility/trunk/fix-freeze.patch
Modified:
  gnome-disk-utility/trunk/PKGBUILD

------------------+
 PKGBUILD         |   15 +++++++++------
 fix-freeze.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-07 12:36:37 UTC (rev 94499)
+++ PKGBUILD	2010-10-07 13:44:29 UTC (rev 94500)
@@ -3,7 +3,7 @@
 
 pkgname=gnome-disk-utility
 pkgver=2.32.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME libraries and applications for dealing with storage devices"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -14,14 +14,17 @@
 conflicts=('gnome-mount')
 options=('!libtool' '!emptydirs' '!makeflags')
 install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
+        fix-freeze.patch)
+sha256sums=('03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98'
+            '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-freeze.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
       --libexecdir=/usr/lib/gnome-disk-utility \
-      --disable-scrollkeeper --disable-nautilus --disable-gtk-doc || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+      --disable-scrollkeeper --disable-nautilus --disable-gtk-doc
+  make
+  make DESTDIR="${pkgdir}" install
 }

Added: fix-freeze.patch
===================================================================
--- fix-freeze.patch	                        (rev 0)
+++ fix-freeze.patch	2010-10-07 13:44:29 UTC (rev 94500)
@@ -0,0 +1,32 @@
+From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001
+From: Pascal Terjan <pterjan at mandriva.com>
+Date: Mon, 3 May 2010 14:01:22 +0200
+Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198)
+
+GduPresentable created in gdu pool include intheir id some strings
+in local encoding like _("Peripheral Devices"). This patch
+enforces them to be UTF-8.
+
+This fixes a crash of gvfs-gdu-volume-monitor when USB devices are
+available on a non UTF-8 system.
+---
+ src/gdu/gdu-pool.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
+index bd5eccf..cf6be53 100644
+--- a/src/gdu/gdu-pool.c
++++ b/src/gdu/gdu-pool.c
+@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass)
+                               g_cclosure_marshal_VOID__OBJECT,
+                               G_TYPE_NONE, 1,
+                               GDU_TYPE_PRESENTABLE);
++#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
++	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++#endif
+ }
+ 
+ static void
+-- 
+1.7.1
+