[kdebindings/f15] resurrect/rebase pykdeuic4 patch (#684419)

[Rex Dieter]

commit 1d9cfb944aeed8743e794f8ab7c59f2d75aae292
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 16 15:25:55 2011 -0500

    resurrect/rebase pykdeuic4 patch (#684419)

 kdebindings-4.6.3-python-bz#684419.patch |   21 +++++++++++++++++++++
 kdebindings.spec                         |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/kdebindings-4.6.3-python-bz#684419.patch b/kdebindings-4.6.3-python-bz#684419.patch
new file mode 100644
index 0000000..d33ff8c
--- /dev/null
+++ b/kdebindings-4.6.3-python-bz#684419.patch
@@ -0,0 +1,21 @@
+diff -up kdebindings-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py.python-bz#684419 kdebindings-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py
+--- kdebindings-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py.python-bz#684419	2011-06-02 05:03:32.000000000 -0500
++++ kdebindings-4.6.4/python/pykde4/tools/pykdeuic4/pykdeuic4.py	2011-06-16 15:22:04.791151529 -0500
+@@ -45,7 +45,7 @@ class kde_i18n_string(qtproxies.i18n_str
+     def __init__(self,string, disambig=None):
+         original_i18n_string.__init__(self,string, disambig)
+     def __str__(self):
+-        return "kdecore.i18n(%s)" % (qtproxies.escape(self.string),)
++        return "kdecore.i18n(%s)" % (qtproxies.as_string(self.string, encode=False),)
+ 
+ qtproxies.i18n_string = kde_i18n_string
+ 
+@@ -78,7 +78,7 @@ def processUI(uifile, output_filename=No
+     indenter.indentwidth = indent
+     comp = compiler.UICompiler()
+     comp.factory._cwFilters.append(kdeFilter())
+-    winfo = comp.compileUi(uifile, output)
++    winfo = comp.compileUi(uifile, output, False)
+ 
+     if exe:
+         output.write("""
diff --git a/kdebindings.spec b/kdebindings.spec
index ff3d2e6..5a3b034 100644
--- a/kdebindings.spec
+++ b/kdebindings.spec
@@ -41,7 +41,7 @@
 
 Name: kdebindings
 Version: 4.6.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -53,6 +53,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
 Patch50: kdebindings-4.5.95-valgrind.patch
+Patch51: kdebindings-4.6.3-python-bz#684419.patch
 
 ## upstream patches
 
@@ -312,6 +313,7 @@ Falcon plugin for the Kross archtecture in KDE4.
 %setup -q -n kdebindings-%{version}%{?alphatag}
 
 %patch50 -p1 -b .valgrind
+%patch51 -p1 -b .python-bz#684419
 
 
 %build
@@ -660,6 +662,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jun 16 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.4-2
+- resurrect/rebase pykdeuic4 patch (#684419)
+
 * Mon Jun 06 2011 Than Ngo <than at redhat.com> - 4.6.4-1
 - 4.6.4