[Python-modules-commits] r14217 - in packages/pyside/trunk/debian (3 files)

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

    Date: Tuesday, August 17, 2010 @ 19:07:17
  Author: odyx-guest
Revision: 14217

u_c130273_fix_py25_QtScript_property.patch
Import from upstream to fix the QtScript_property test on python2.5
(upstream bug #284)

Added:
  packages/pyside/trunk/debian/patches/u_c130273_fix_py25_QtScript_property.patch
Modified:
  packages/pyside/trunk/debian/changelog
  packages/pyside/trunk/debian/patches/series

Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog	2010-08-17 13:51:28 UTC (rev 14216)
+++ packages/pyside/trunk/debian/changelog	2010-08-17 19:07:17 UTC (rev 14217)
@@ -13,6 +13,9 @@
        Drop, was from upstream
     - fixTests.patch
        Drop as upstream changed the tests handling completely
+    + u_c130273_fix_py25_QtScript_property.patch
+       Import from upstream to fix the QtScript_property test on python2.5
+       (upstream bug #284)
     × Refresh the others
 
   * Remove custom cmake files in favour of cmake-data's.
@@ -28,7 +31,7 @@
   * Install the typesystem files in libpyside-dev.
   * Bump Standards to 3.9.1.0 without changes needed.
 
- -- Didier Raboud <didier at raboud.com>  Tue, 20 Jul 2010 19:10:41 +0200
+ -- Didier Raboud <didier at raboud.com>  Tue, 17 Aug 2010 21:03:14 +0200
 
 pyside (0.3.2-3) unstable; urgency=low
 

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2010-08-17 13:51:28 UTC (rev 14216)
+++ packages/pyside/trunk/debian/patches/series	2010-08-17 19:07:17 UTC (rev 14217)
@@ -1,3 +1,4 @@
+u_c130273_fix_py25_QtScript_property.patch
 libPythonVersionPostfix.patch
 usePySpecificShiboken.patch
 lessBuildVerbosity.patch

Added: packages/pyside/trunk/debian/patches/u_c130273_fix_py25_QtScript_property.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_c130273_fix_py25_QtScript_property.patch	                        (rev 0)
+++ packages/pyside/trunk/debian/patches/u_c130273_fix_py25_QtScript_property.patch	2010-08-17 19:07:17 UTC (rev 14217)
@@ -0,0 +1,39 @@
+From c130273ee0fd41be0ed756a90ab8a24934ddb7e9 Mon Sep 17 00:00:00 2001
+From: renato <renato at renato.note>
+Date: Fri, 13 Aug 2010 15:28:59 -0300
+Subject: [PATCH] Fixed arguments parser on QProperty constructor.
+
+Reviewer: Marcelo Lira <marcelo.lira at openbossa.org>
+          Luciano Wolf <luciano.wolf at openbossa.org>
+---
+ libpyside/qproperty.cpp |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/libpyside/qproperty.cpp b/libpyside/qproperty.cpp
+index 781c8cf..f20c387 100644
+--- a/libpyside/qproperty.cpp
++++ b/libpyside/qproperty.cpp
+@@ -139,15 +139,15 @@ int qproperty_init(PyObject* self, PyObject* args, PyObject* kwds)
+     data->scriptable = true;
+     data->stored = true;
+ 
+-    static const char *kwlist[] = {"fget", "fset", "freset", "fdel", "doc",
++    static const char *kwlist[] = {"type", "fget", "fset", "freset", "fdel", "doc",
+                                    "designable", "scriptable", "stored", "user",
+                                    "constant", "final", 0};
+     if (!PyArg_ParseTupleAndKeywords(args, kwds,
+                                      "O|OOOOsbbbbbb:QtCore.QProperty", (char**) kwlist,
+-                                     &type, &data->fget, &data->fset, &data->freset,
+-                                     &data->fdel, &data->doc, &data->designable,
+-                                     &data->scriptable, &data->stored, &data->user,
+-                                     &data->constant, &data->final))
++                                     /*O*/&type,
++				     /*OOOO*/ &(data->fget), &(data->fset), &(data->freset), &(data->fdel),
++				     /*s*/&(data->doc),
++				     /*bbbbbb*/&(data->designable), &(data->scriptable), &(data->stored), &(data->user), &(data->constant), &(data->final)))
+         return 0;
+ 
+     if (!data->fset && data->fget)
+-- 
+1.6.1
+