[Python-modules-commits] r28578 - in packages/python-qt4/trunk/debian (3 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Saturday, April 19, 2014 @ 07:39:50
  Author: mitya57-guest
Revision: 28578

Backport upstream patch (qstring_conversion.diff) to fix a bug in
the conversion of QStrings with surrogate pairs.

Added:
  packages/python-qt4/trunk/debian/patches/qstring_conversion.diff
Modified:
  packages/python-qt4/trunk/debian/changelog
  packages/python-qt4/trunk/debian/patches/series

Modified: packages/python-qt4/trunk/debian/changelog
===================================================================
--- packages/python-qt4/trunk/debian/changelog	2014-04-19 03:10:33 UTC (rev 28577)
+++ packages/python-qt4/trunk/debian/changelog	2014-04-19 07:39:50 UTC (rev 28578)
@@ -1,3 +1,10 @@
+python-qt4 (4.10.4+dfsg-2) UNRELEASED; urgency=medium
+
+  * Backport upstream patch (qstring_conversion.diff) to fix a bug in
+    the conversion of QStrings with surrogate pairs.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Sat, 19 Apr 2014 11:38:14 +0400
+
 python-qt4 (4.10.4+dfsg-1) experimental; urgency=medium
 
   [ Bernd Zeimetz ]

Added: packages/python-qt4/trunk/debian/patches/qstring_conversion.diff
===================================================================
--- packages/python-qt4/trunk/debian/patches/qstring_conversion.diff	                        (rev 0)
+++ packages/python-qt4/trunk/debian/patches/qstring_conversion.diff	2014-04-19 07:39:50 UTC (rev 28578)
@@ -0,0 +1,22 @@
+Description: fix a bug in the conversion of QStrings with surrogate pairs
+Origin: upstream, changeset 850f2d2c1d2b
+Last-Update: 2014-04-19
+
+--- a/qpy/QtCore/qpycore_qstring.cpp
++++ b/qpy/QtCore/qpycore_qstring.cpp
+@@ -93,12 +93,13 @@
+                     {
+                         maxchar = 0x10ffff;
+                         --py_len;
+-                        ++i;
+                         ++qch;
+                     }
+                 }
++
++                uch = (++qch)->unicode();
+             }
+-            while (++i < qstr.length());
++            while (!qch->isNull());
+ 
+             // Create the correctly sized object.
+             if ((obj = PyUnicode_New(py_len, maxchar)) == NULL)

Modified: packages/python-qt4/trunk/debian/patches/series
===================================================================
--- packages/python-qt4/trunk/debian/patches/series	2014-04-19 03:10:33 UTC (rev 28577)
+++ packages/python-qt4/trunk/debian/patches/series	2014-04-19 07:39:50 UTC (rev 28578)
@@ -1,3 +1,4 @@
 debian_configure_changes.diff
 qreal_float_support.diff
 config_flags.diff
+qstring_conversion.diff