[Python-modules-commits] r27122 - in packages/pyqt5/trunk/debian (4 files)

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

    Date: Thursday, January 9, 2014 @ 05:08:17
  Author: mitya57-guest
Revision: 27122

Backport a patch (qpair_old_qt.diff) to fix building against
Qt 5.1.

Added:
  packages/pyqt5/trunk/debian/patches/
  packages/pyqt5/trunk/debian/patches/qpair_old_qt.diff
  packages/pyqt5/trunk/debian/patches/series
Modified:
  packages/pyqt5/trunk/debian/changelog

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2014-01-09 00:50:40 UTC (rev 27121)
+++ packages/pyqt5/trunk/debian/changelog	2014-01-09 05:08:17 UTC (rev 27122)
@@ -2,6 +2,8 @@
 
   * New upstream release.
   * Drop all patches, applied upstream.
+  * Backport a patch (qpair_old_qt.diff) to fix building against
+    Qt 5.1.
   * Bump required sip version to 4.15.4.
   * Bump Standards-Version to 3.9.5, no changes needed.
   * Add XS-Testsuite header for autopkgtest.

Added: packages/pyqt5/trunk/debian/patches/qpair_old_qt.diff
===================================================================
--- packages/pyqt5/trunk/debian/patches/qpair_old_qt.diff	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/qpair_old_qt.diff	2014-01-09 05:08:17 UTC (rev 27122)
@@ -0,0 +1,32 @@
+Description: fix qpygui_qpair.sip building against Qt older than 5.2
+Origin: upstream, changeset 5c798e751276
+Last-Update: 2013-01-09
+
+--- a/sip/QtGui/qpygui_qpair.sip
++++ b/sip/QtGui/qpygui_qpair.sip
+@@ -19,6 +19,8 @@
+ // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ 
+ 
++%If (Qt_5_2_0 -)
++
+ %MappedType QPair<QOpenGLTexture::Filter, QOpenGLTexture::Filter>
+         /DocType="tuple-of-QOpenGLTexture.Filter-QOpenGLTexture.Filter"/
+ {
+@@ -110,6 +112,10 @@
+ %End
+ };
+ 
++%End
++
++
++%If (Qt_5_2_0 -)
+ 
+ %MappedType QPair<float, float> /DocType="tuple-of-float-float"/
+ {
+@@ -202,3 +208,5 @@
+     return sipGetState(sipTransferObj);
+ %End
+ };
++
++%End

Added: packages/pyqt5/trunk/debian/patches/series
===================================================================
--- packages/pyqt5/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/series	2014-01-09 05:08:17 UTC (rev 27122)
@@ -0,0 +1 @@
+qpair_old_qt.diff