diff -Nru python-qt4-4.10/debian/changelog python-qt4-4.10/debian/changelog --- python-qt4-4.10/debian/changelog 2013-03-06 17:58:17.000000000 +0100 +++ python-qt4-4.10/debian/changelog 2013-03-29 11:32:10.000000000 +0100 @@ -1,3 +1,10 @@ +python-qt4 (4.10-0ubuntu2) raring; urgency=low + + * backport fix-QTextBlockUserData.patch from upstream snapshot + fixes e.g. syntax highlighting in editors + + -- Julian Taylor Fri, 29 Mar 2013 11:29:21 +0100 + python-qt4 (4.10-0ubuntu1) raring; urgency=low * New upstream release diff -Nru python-qt4-4.10/debian/patches/fix-QTextBlockUserData.patch python-qt4-4.10/debian/patches/fix-QTextBlockUserData.patch --- python-qt4-4.10/debian/patches/fix-QTextBlockUserData.patch 1970-01-01 01:00:00.000000000 +0100 +++ python-qt4-4.10/debian/patches/fix-QTextBlockUserData.patch 2013-03-29 11:28:51.000000000 +0100 @@ -0,0 +1,77 @@ +Description: fix QTextBlockUserData losing its data +Origin: pyqt4 4.10.1 snapshot +Bug: http://www.riverbankcomputing.com/pipermail/pyqt/2013-March/032457.html +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/1161818 +Author: phil@riverbankcomputing.com + +--- a/sip/QtGui/qsyntaxhighlighter.sip ++++ b/sip/QtGui/qsyntaxhighlighter.sip +@@ -1,4 +1,4 @@ +-// qsyntaxhighlighter.sip generated by MetaSIP on Fri Mar 1 21:42:08 2013 ++// qsyntaxhighlighter.sip generated by MetaSIP on Thu Mar 14 02:48:42 2013 + // + // This file is part of the QtGui Python extension module. + // +@@ -68,7 +68,25 @@ protected: + int previousBlockState() const; + int currentBlockState() const; + void setCurrentBlockState(int newState); +- void setCurrentBlockUserData(QTextBlockUserData *data /Transfer/); ++ void setCurrentBlockUserData(QTextBlockUserData *data /GetWrapper/); ++%MethodCode ++ // Ownership of the user data is with the document not the text block. ++ QTextDocument *td = sipCpp->document(); ++ ++ if (td) ++ { ++ PyObject *td_obj = sipConvertFromType(td, sipType_QTextDocument, 0); ++ ++ if (td_obj) ++ { ++ sipTransferTo(a0Wrapper, td_obj); ++ Py_DECREF(td_obj); ++ } ++ } ++ ++ sipCpp->setCurrentBlockUserData(a0); ++%End ++ + QTextBlockUserData *currentBlockUserData() const; + %If (Qt_4_4_0 -) + QTextBlock currentBlock() const; +--- a/sip/QtGui/qtextobject.sip ++++ b/sip/QtGui/qtextobject.sip +@@ -1,4 +1,4 @@ +-// qtextobject.sip generated by MetaSIP on Fri Mar 1 21:42:08 2013 ++// qtextobject.sip generated by MetaSIP on Thu Mar 14 02:48:42 2013 + // + // This file is part of the QtGui Python extension module. + // +@@ -193,7 +193,26 @@ public: + QTextBlock next() const; + QTextBlock previous() const; + QTextBlockUserData *userData() const; +- void setUserData(QTextBlockUserData *data /Transfer/); ++ void setUserData(QTextBlockUserData *data /GetWrapper/); ++%MethodCode ++ // Ownership of the user data is with the document not the text block. ++ const QTextDocument *td = sipCpp->document(); ++ ++ if (td) ++ { ++ PyObject *td_obj = sipConvertFromType(const_cast(td), ++ sipType_QTextDocument, 0); ++ ++ if (td_obj) ++ { ++ sipTransferTo(a0Wrapper, td_obj); ++ Py_DECREF(td_obj); ++ } ++ } ++ ++ sipCpp->setUserData(a0); ++%End ++ + int userState() const; + void setUserState(int state); + %If (Qt_4_4_0 -) diff -Nru python-qt4-4.10/debian/patches/series python-qt4-4.10/debian/patches/series --- python-qt4-4.10/debian/patches/series 2013-03-06 17:55:08.000000000 +0100 +++ python-qt4-4.10/debian/patches/series 2013-03-29 11:23:47.000000000 +0100 @@ -2,3 +2,4 @@ debian_configure_changes.diff config_extra_headers.diff invisiblerootitem.patch +fix-QTextBlockUserData.patch