Add small patch to fix exo-mount on localized systems, patch from ALTLinux, bug 271441

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 94 insertions, 14 deletions

diff --git a/xfce-extra/exo/ChangeLog b/xfce-extra/exo/ChangeLog
index bce1602300ef..9489fb60527c 100644
--- a/xfce-extra/exo/ChangeLog
+++ b/xfce-extra/exo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for xfce-extra/exo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.85 2009/06/10 07:27:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/ChangeLog,v 1.86 2009/06/13 03:13:10 darkside Exp $
+
+*exo-0.3.101-r1 (13 Jun 2009)
+
+  13 Jun 2009; Jeremy Olexa <darkside@gentoo.org>
+  +files/exo-0.3.101-iocharset.patch, -exo-0.3.101.ebuild,
+  +exo-0.3.101-r1.ebuild:
+  Add small patch to fix exo-mount on localized systems, patch from ALTLinux,
+  bug 271441
 
   10 Jun 2009; Christian Faulhammer <fauli@gentoo.org> exo-0.3.101.ebuild:
   stable x86, bug 265587
diff --git a/xfce-extra/exo/Manifest b/xfce-extra/exo/Manifest
index 2d7146471532..04496ad51155 100644
--- a/xfce-extra/exo/Manifest
+++ b/xfce-extra/exo/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX exo-0.3.101-iocharset.patch 2052 RMD160 aad5f5b78fa01b9bf13cad9013ee99fb468f8bee SHA1 8b9c68550e090f91a653ef3f4b4a4931f8e92469 SHA256 d3e2b5fb2d012d6f9dddf3da5f350fc81a3d61c1a66eca7638d7c14a9b282769
 AUX exo-0.3.4-eject.patch 6692 RMD160 674aebb271c14f5cc1f1e285cea8fd4c4ad3d41f SHA1 4517c4226bdcdc5e325b7dfc56c500acd1f3b00f SHA256 cc4c3551a06b2161355956eced4345e5bdd50d738a8f8d22f0604d306234c289
 AUX exo-0.3.4-inline-functions.patch 814 RMD160 ea0bd51abc3a83678ff0a15a9372d5d3759721d8 SHA1 b60e164dfb6140300601f5254254ff8345d42095 SHA256 55dd08a015e70173dbf2da1f26f8eeb10c5a608f41339bc68706cbc95312df64
 AUX exo-0.3.4-remove-libmd5.patch 1929 RMD160 5f60292142bddb195a0dfdb88fab2f546d7bc8d2 SHA1 89483f5851ab962fbea85dc1a7755c5a3cdea153 SHA256 b7898b1410d973a89c4137ec2972f3b88d17438a495065d19a5b0f7a1f8d1833
 DIST exo-0.3.101.tar.bz2 1793815 RMD160 92dfc1e8f0bfa8ca74f151a2283f6988ce703649 SHA1 74194f58278a2b9d963264806f142e5d6d05336c SHA256 0016f6ff0d1d22ed42fb5c9bcecc5559a62572781446fdfd1444786b5d33e324
 DIST exo-0.3.4.tar.bz2 1300127 RMD160 e021f030a624c522c819ec0f3a8682a1007ae748 SHA1 4f7a3f46592fd0311be1f011f17431f211cc1fcb SHA256 a5373e9bd6055caa7cd5d06128f6236cfd2f4f6657ea4a85d7bd9eafe5bf0538
-EBUILD exo-0.3.101.ebuild 1244 RMD160 2098b8b252a9f19203dc51261bb45cf54509684c SHA1 f8c0bb769028fc23beed01af082485f7bb4730d4 SHA256 b88b5c1e9af076c118f222e3bb7c4aec6b2715c7f94c4802ec38b904535fc2b0
+EBUILD exo-0.3.101-r1.ebuild 1307 RMD160 3895fba150c4aa5228f076192ff44508e116c541 SHA1 b525f449e82477f2f6594bdb92d56e3c87f65fa2 SHA256 d7b6f98dd612654e0ce92bb885413e0da5ac7b9b8bff3c0b4b9dfdb7fa4cd070
 EBUILD exo-0.3.4-r2.ebuild 2007 RMD160 4744e5aabc045ddc4bc27bd62cf2ea19366b36b1 SHA1 b2a5202712457d193240529e6b149e48f89e094c SHA256 41bbe9a79d2e44f1a945b0bcc9a40751133f34ba2369096469470ed274020a7d
-MISC ChangeLog 10605 RMD160 b6a6c3be680e1900b15379fdd3913d1d8f8de91f SHA1 76fb2024d14b603e6cd51ab49231a1c87e53c02f SHA256 a09eb737e743a51860fcd532a42658c35817f05850228dd7f25211e59993554b
+MISC ChangeLog 10866 RMD160 7030fe857b3ee2b1383e0c59523c5c9a941bf5c5 SHA1 f9efca86c3aab7c667c297e03913601326132505 SHA256 c8ba91616294e0ca4a899cef299600c33e3a6276559530a8903845848264d65e
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkovYFgACgkQNQqtfCuFneNOIQCeLFbnd58yOOdugIAi/T1g9N4s
-tp4AnRj2LWQfJOpHnIe7/5z6DlQ0fITS
-=T/ek
------END PGP SIGNATURE-----
diff --git a/xfce-extra/exo/exo-0.3.101.ebuild b/xfce-extra/exo/exo-0.3.101-r1.ebuild
index 53e590d1710b..db5d5b160c0b 100644
--- a/xfce-extra/exo/exo-0.3.101.ebuild
+++ b/xfce-extra/exo/exo-0.3.101-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.101.ebuild,v 1.4 2009/06/10 07:27:09 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/exo/exo-0.3.101-r1.ebuild,v 1.1 2009/06/13 03:13:10 darkside Exp $
 
 EAPI="1"
 
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	doc? ( dev-util/gtk-doc )"
 
+XFCE4_PATCHES="${FILESDIR}/exo-0.3.101-iocharset.patch"
+
 pkg_setup() {
 	XFCE_CONFIG+=" $(use_enable doc gtk-doc) $(use_enable hal)
 	$(use_enable libnotify notifications) $(use_enable python)"
diff --git a/xfce-extra/exo/files/exo-0.3.101-iocharset.patch b/xfce-extra/exo/files/exo-0.3.101-iocharset.patch
new file mode 100644
index 000000000000..a667f116652b
--- /dev/null
+++ b/xfce-extra/exo/files/exo-0.3.101-iocharset.patch
@@ -0,0 +1,79 @@
+diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
+index 791a536..4b130c3 100644
+--- a/exo-mount/exo-mount-hal.c
++++ b/exo-mount/exo-mount-hal.c
+@@ -34,6 +34,8 @@
+ #include <unistd.h>
+ #endif
+ 
++#include <langinfo.h>
++
+ #include <libhal-storage.h>
+ 
+ #include <exo-hal/exo-hal.h>
+@@ -616,6 +618,30 @@ oom:  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOMEM, g_strerror (ENOMEM))
+ 
+ 
+ /**
++ * exo_mount_hal_iocharset:
++ *
++ * Determines the preferred iocharset for filesystems
++ * that support it.
++ *
++ * Return value: iocharset string or %NULL if none.
++ **/
++static const gchar*
++exo_mount_hal_iocharset ()
++{
++  const gchar* cs = g_getenv("EXO_MOUNT_IOCHARSET");
++  if (cs != NULL)
++    return cs;
++
++  const char* codeset = nl_langinfo (CODESET);
++  if (codeset && !strcmp (codeset, "UTF-8"))
++    return "utf8";
++
++  return NULL;
++}
++
++
++
++/**
+  * exo_mount_hal_device_mount:
+  * @device : an #ExoMountHalDevice.
+  * @error  : return location for errors or %NULL.
+@@ -676,6 +702,12 @@ exo_mount_hal_device_mount (ExoMountHalDevice *device,
+               /* however this one is FreeBSD specific */
+               options[n++] = g_strdup ("longnames");
+             }
++          else if (strcmp (device->fsoptions[m], "iocharset=") == 0)
++            {
++              const gchar* iocharset = exo_mount_hal_iocharset();
++              if (iocharset != NULL)
++                options[n++] = g_strdup_printf ("iocharset=%s", iocharset);
++            }
+         }
+     }
+ 
+diff --git a/exo-mount/main.c b/exo-mount/main.c
+index 80eae1d..f442019 100644
+--- a/exo-mount/main.c
++++ b/exo-mount/main.c
+@@ -39,6 +39,8 @@
+ #include <string.h>
+ #endif
+ 
++#include <locale.h>
++
+ #include <glib/gstdio.h>
+ 
+ #include <exo-hal/exo-hal.h>
+@@ -97,6 +99,8 @@ main (int argc, char **argv)
+   /* initialize the i18n support */
+   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+ 
++  setlocale(LC_CTYPE, "");
++
+   /* initialize GTK+ */
+   if (!gtk_init_with_args (&argc, &argv, "Xfce mount", entries, GETTEXT_PACKAGE, &err))
+     {