Patch to prevent UTF-8 output when running zenity --help. Closes bug #45204

4 files changed, 45 insertions, 4 deletions

diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index c2f81e95baed..aa2ab28ba782 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/zenity
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.17 2004/03/21 16:55:16 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.18 2004/03/23 02:47:17 leonardop Exp $
+
+  22 Mar 2004; L. Boshell <leonardop@gentoo.org> zenity-1.8.ebuild,
+  files/zenity-1.8-utf8_fix.patch:
+  Patch that prevents codeset conversion to UTF-8 when parsing command
+  line arguments. Closes bug #45204.
 
 *zenity-2.5.91 (21 Mar 2004)
 
diff --git a/gnome-extra/zenity/files/zenity-1.8-utf8_fix.patch b/gnome-extra/zenity/files/zenity-1.8-utf8_fix.patch
new file mode 100644
index 000000000000..6321fc50ba9e
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-1.8-utf8_fix.patch
@@ -0,0 +1,27 @@
+diff -NurB zenity-1.8-orig/src/main.c zenity-1.8/src/main.c
+--- zenity-1.8-orig/src/main.c	2004-03-22 20:51:08.000000000 -0500
++++ zenity-1.8/src/main.c	2004-03-22 20:52:01.000000000 -0500
+@@ -25,7 +25,6 @@
+ 
+ #include "zenity.h"
+ #include <stdlib.h>
+-#include <locale.h>
+ #include <popt.h>
+ #include <langinfo.h>
+ #ifdef HAVE_LOCALE_H
+@@ -1024,7 +1023,6 @@
+ #endif
+ 
+   bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
+-  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+   textdomain(GETTEXT_PACKAGE);
+ 
+   zenity_init_parsing_options ();
+@@ -1048,6 +1046,7 @@
+     zenity_free_parsing_options (); 
+     exit (-1); 
+   }
++  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+   gtk_init (&argc, &argv);
+ 
+   /* 
diff --git a/gnome-extra/zenity/zenity-1.6.ebuild b/gnome-extra/zenity/zenity-1.6.ebuild
index f3a90ab8bf56..d1eab8c4b62e 100644
--- a/gnome-extra/zenity/zenity-1.6.ebuild
+++ b/gnome-extra/zenity/zenity-1.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-1.6.ebuild,v 1.13 2003/12/09 16:20:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-1.6.ebuild,v 1.14 2004/03/23 02:47:17 leonardop Exp $
 
 inherit gnome2
 
diff --git a/gnome-extra/zenity/zenity-1.8.ebuild b/gnome-extra/zenity/zenity-1.8.ebuild
index ea08a47f0abd..3ec05a441ccc 100644
--- a/gnome-extra/zenity/zenity-1.8.ebuild
+++ b/gnome-extra/zenity/zenity-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-1.8.ebuild,v 1.6 2004/03/17 01:04:18 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-1.8.ebuild,v 1.7 2004/03/23 02:47:17 leonardop Exp $
 
 inherit gnome2
 
@@ -24,3 +24,12 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README THANKS TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Don't set the UTF-8 codeset before parsing command line arguments.
+	# Closes bug #45204.
+	epatch ${FILESDIR}/${P}-utf8_fix.patch
+}