[Python-modules-commits] r8813 - in packages/python-qt3/trunk/debian (4 files)

shlomme at users.alioth.debian.org shlomme at users.alioth.debian.org
Thu Jun 18 18:32:25 UTC 2009 

    Date: Thursday, June 18, 2009 @ 18:32:23
  Author: shlomme
Revision: 8813

changes from 3.18-2

Added:
  packages/python-qt3/trunk/debian/patches/03_qdomdocument_setcontent.dpatch
  packages/python-qt3/trunk/debian/patches/04_qpixmap_loadfromdata.dpatch
Modified:
  packages/python-qt3/trunk/debian/changelog
  packages/python-qt3/trunk/debian/patches/00list

Modified: packages/python-qt3/trunk/debian/changelog
===================================================================
--- packages/python-qt3/trunk/debian/changelog	2009-06-18 18:22:48 UTC (rev 8812)
+++ packages/python-qt3/trunk/debian/changelog	2009-06-18 18:32:23 UTC (rev 8813)
@@ -1,3 +1,15 @@
+python-qt3 (3.18-2) unstable; urgency=low
+
+  * debian/patches/03_qdomdocument_setcontent.dpatch
+    - Picked from PyQt3 snapshots, fixes false assertion
+      when using QDomDocument.setContent
+  * debian/patches/04_qpixmap_loadfromdata.dpatch
+    - use Q_ULONG instead of uint as type for array size. On amd64,
+      sizeof(Q_ULONG) != sizeof(uint), which lead to a crash when a
+      uint* was handed in as a Q_ULONG*. (Closes: #529414)
+
+ -- Torsten Marek <shlomme at debian.org>  Thu, 11 Jun 2009 09:46:47 +0200
+
 python-qt3 (3.18-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-qt3/trunk/debian/patches/00list
===================================================================
--- packages/python-qt3/trunk/debian/patches/00list	2009-06-18 18:22:48 UTC (rev 8812)
+++ packages/python-qt3/trunk/debian/patches/00list	2009-06-18 18:32:23 UTC (rev 8813)
@@ -1,2 +1,4 @@
 01_configure
-02_pyobject_typecheck_cast
\ No newline at end of file
+02_pyobject_typecheck_cast
+03_qdomdocument_setcontent
+04_qpixmap_loadfromdata

Added: packages/python-qt3/trunk/debian/patches/03_qdomdocument_setcontent.dpatch
===================================================================
--- packages/python-qt3/trunk/debian/patches/03_qdomdocument_setcontent.dpatch	                        (rev 0)
+++ packages/python-qt3/trunk/debian/patches/03_qdomdocument_setcontent.dpatch	2009-06-18 18:32:23 UTC (rev 8813)
@@ -0,0 +1,89 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_qdomdocument_setcontent.dpatch by Phil Thompson
+##
+## DP: Fix QDomDocument.setContent, picked from 3.18.1 snapshots
+
+ at DPATCH@
+diff -Naur PyQt-x11-gpl-3.18/sip/qtxml/qdom.sip PyQt-x11-gpl-3.18.1-snapshot-20090610/sip/qtxml/qdom.sip
+--- PyQt-x11-gpl-3.18/sip/qtxml/qdom.sip	2009-06-05 10:58:25.000000000 +0200
++++ PyQt-x11-gpl-3.18.1-snapshot-20090610/sip/qtxml/qdom.sip	2009-06-11 04:30:14.000000000 +0200
+@@ -475,7 +475,8 @@
+ 		res = sipCpp -> QDomDocument::setContent(*a0,a1,emsg,&eline,&ecol);
+ 		Py_END_ALLOW_THREADS
+ 
+-		sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
++		sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
++                sipType_QString, (PyObject *)0, eline, ecol);
+ %End
+ 
+ 	SIP_PYTUPLE setContent(const QByteArray &,bool);
+@@ -488,7 +489,8 @@
+ 		res = sipCpp -> QDomDocument::setContent(*a0,a1,emsg,&eline,&ecol);
+ 		Py_END_ALLOW_THREADS
+ 
+-		sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
++		sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
++                sipType_QString, (PyObject *)0, eline, ecol);
+ %End
+ 
+ 	SIP_PYTUPLE setContent(const QString &,bool);
+@@ -501,7 +503,8 @@
+ 		res = sipCpp -> QDomDocument::setContent(*a0,a1,emsg,&eline,&ecol);
+ 		Py_END_ALLOW_THREADS
+ 
+-		sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
++		sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
++                sipType_QString, (PyObject *)0, eline, ecol);
+ %End
+ 
+ 	SIP_PYTUPLE setContent(QIODevice *,bool);
+@@ -514,7 +517,8 @@
+ 		res = sipCpp -> QDomDocument::setContent(a0,a1,emsg,&eline,&ecol);
+ 		Py_END_ALLOW_THREADS
+ 
+-		sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
++		sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
++                sipType_QString, (PyObject *)0, eline, ecol);
+ %End
+ 
+ 	SIP_PYTUPLE setContent(const QCString &);
+@@ -527,7 +531,8 @@
+ 		res = sipCpp -> QDomDocument::setContent(*a0,emsg,&eline,&ecol);
+ 		Py_END_ALLOW_THREADS
+ 
+-		sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
++		sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
++                sipType_QString, (PyObject *)0, eline, ecol);
+ %End
+ 
+ 	SIP_PYTUPLE setContent(const QByteArray &);
+@@ -540,7 +545,8 @@
+ 		res = sipCpp -> QDomDocument::setContent(*a0,emsg,&eline,&ecol);
+ 		Py_END_ALLOW_THREADS
+ 
+-		sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
++		sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
++                sipType_QString, (PyObject *)0, eline, ecol);
+ %End
+ 
+ 	SIP_PYTUPLE setContent(const QString &);
+@@ -553,7 +559,8 @@
+ 		res = sipCpp -> QDomDocument::setContent(*a0,emsg,&eline,&ecol);
+ 		Py_END_ALLOW_THREADS
+ 
+-		sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
++		sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
++                sipType_QString, (PyObject *)0, eline, ecol);
+ %End
+ 
+ 	SIP_PYTUPLE setContent(QIODevice *);
+@@ -566,7 +573,8 @@
+ 		res = sipCpp -> QDomDocument::setContent(a0,emsg,&eline,&ecol);
+ 		Py_END_ALLOW_THREADS
+ 
+-		sipRes = sipBuildResult(&sipIsErr,"(bNii)",res,emsg,sipClass_QString,eline,ecol);
++		sipRes = sipBuildResult(&sipIsErr, "(bNii)", res, emsg,
++                sipType_QString, (PyObject *)0, eline, ecol);
+ %End
+ 
+ %End

Added: packages/python-qt3/trunk/debian/patches/04_qpixmap_loadfromdata.dpatch
===================================================================
--- packages/python-qt3/trunk/debian/patches/04_qpixmap_loadfromdata.dpatch	                        (rev 0)
+++ packages/python-qt3/trunk/debian/patches/04_qpixmap_loadfromdata.dpatch	2009-06-18 18:32:23 UTC (rev 8813)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_qpixmap_loadfromdata.dpatch by Torsten Marek <marek at ifi.uzh.ch>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad python-qt3-3.18~/sip/qt/qpixmap.sip python-qt3-3.18/sip/qt/qpixmap.sip
+--- python-qt3-3.18~/sip/qt/qpixmap.sip	2009-06-05 10:58:25.000000000 +0200
++++ python-qt3-3.18/sip/qt/qpixmap.sip	2009-06-11 11:06:05.000000000 +0200
+@@ -245,7 +245,7 @@
+ 	static const char *imageFormat(const QString &);
+ 	bool load(const QString &,const char * = 0,ColorMode = Auto);
+ 	bool load(const QString &,const char *,int);
+-	bool loadFromData(const uchar * /Array/,uint /ArraySize/,
++	bool loadFromData(const uchar * /Array/,Q_ULONG /ArraySize/,
+ 			  const char * = 0,ColorMode = Auto);
+ //	bool loadFromData(const uchar *,uint,const char *,int);
+ 	bool loadFromData(QByteArray,const char * = 0,int = 0);

More information about the Python-modules-commits mailing list