[kdebindings] apply patch to fix bz#684419, pykdeuic4 broken in 4.6.x

Than Ngo than at fedoraproject.org
Wed Mar 30 10:08:03 UTC 2011


commit aa0d6bdab496f4096361399a84bf9351587b32c3
Author: Than Ngo <than at redhat.com>
Date:   Wed Mar 30 12:07:50 2011 +0200

    apply patch to fix bz#684419, pykdeuic4 broken in 4.6.x

 kdebindings-4.6.1-python-bz#684419.patch |   32 ++++++++++++++++++++++++++++++
 kdebindings.spec                         |    7 +++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/kdebindings-4.6.1-python-bz#684419.patch b/kdebindings-4.6.1-python-bz#684419.patch
new file mode 100644
index 0000000..4f8f5cd
--- /dev/null
+++ b/kdebindings-4.6.1-python-bz#684419.patch
@@ -0,0 +1,32 @@
+Index: python/pykde4/tools/pykdeuic4/pykdeuic4.py
+===================================================================
+--- python/pykde4/tools/pykdeuic4/pykdeuic4.py.orig
++++ python/pykde4/tools/pykdeuic4/pykdeuic4.py
+@@ -33,13 +33,15 @@ header = """#!/usr/bin/env python
+ from PyKDE4 import kdecore
+ from PyKDE4 import kdeui
+ """
++
+ # Override how messages are translated.
+ original_i18n_string = qtproxies.i18n_string
+ class kde_i18n_string(qtproxies.i18n_string):
+-    def __init__(self,string):
+-        original_i18n_string.__init__(self,string)
++    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
+ 
+ def kdeFilter():
+@@ -71,7 +73,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 ac7edde..e4751a5 100644
--- a/kdebindings.spec
+++ b/kdebindings.spec
@@ -39,7 +39,7 @@
 
 Name: kdebindings
 Version: 4.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 # http://techbase.kde.org/Policies/Licensing_Policy
@@ -52,6 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
 Patch50: kdebindings-4.5.95-valgrind.patch
+Patch51: kdebindings-4.6.1-python-bz#684419.patch
 
 ## upstream patches
 
@@ -273,6 +274,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
@@ -553,6 +555,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Mar 30 2011 Than Ngo <than at redhat.com> - 4.6.1-2
+- apply patch to fix bz#684419, pykdeuic4 broken in 4.6.x
+
 * Sun Feb 27 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.1-1
 - 4.6.1
 


More information about the scm-commits mailing list