Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=1f0419bbf444fb48625e8f0f8e046b9aa7f7ee10
commit 1f0419bbf444fb48625e8f0f8e046b9aa7f7ee10
Author: bouleetbil <bouleet...@frogdev.info>
Date: Mon Mar 28 19:28:47 2011 +0200
gnome-disk-utility-2.91.7-2-x86_64
*fix crash on gnome startup
diff --git a/source/gnome/gnome-disk-utility/FrugalBuild
b/source/gnome/gnome-disk-utility/FrugalBuild
index a138211..a4d1601 100644
--- a/source/gnome/gnome-disk-utility/FrugalBuild
+++ b/source/gnome/gnome-disk-utility/FrugalBuild
@@ -3,19 +3,21 @@
pkgname=gnome-disk-utility
pkgver=2.91.7
-pkgrel=1
+pkgrel=2
pkgdesc="Disk Utility for GNOME using devicekit-disks"
depends=('gtk+3' 'unique' 'gnome-keyring>=2.90.0' 'libsexy' 'polkit-gnome'
'libavahi-ui' 'avahi-gtk3' \
'udisks' 'openssh-askpass' 'libnotify>=0.7')
makedepends=('intltool' 'nautilus>=2.90.0' 'gnome-doc-utils' 'gtk-doc')
groups=('gnome')
archs=('i686' 'ppc' 'x86_64')
-sha1sums=('2b5d82e796d64c295cb64841b6035a7bbd36c82a')
options=('scriptlet')
_F_gnome_iconcache="y"
_F_gnome_scrollkeeper="y"
_F_gnome_desktop="y"
Finclude gnome gnome-scriptlet
+source=($source utf8.diff)
+sha1sums=('2b5d82e796d64c295cb64841b6035a7bbd36c82a' \
+ 'c0f9d3d2b2a31635f3c457b69e13e0dd0b2411e0')
conflicts=('gnome-format')
provides=('gnome-format')
diff --git a/source/gnome/gnome-disk-utility/utf8.diff
b/source/gnome/gnome-disk-utility/utf8.diff
new file mode 100644
index 0000000..b7bf861
--- /dev/null
+++ b/source/gnome/gnome-disk-utility/utf8.diff
@@ -0,0 +1,33 @@
+From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001
+From: Pascal Terjan <pter...@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
+
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
