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

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

    Date: Sunday, January 19, 2014 @ 08:05:32
  Author: mitya57-guest
Revision: 27324

Rename qpair_old_qt.diff to old_qt.diff, and include a fix for
QtX11Extras module.

Added:
  packages/pyqt5/trunk/debian/patches/old_qt.diff
    (from rev 27323, packages/pyqt5/trunk/debian/patches/qpair_old_qt.diff)
Modified:
  packages/pyqt5/trunk/debian/changelog
  packages/pyqt5/trunk/debian/patches/series
Deleted:
  packages/pyqt5/trunk/debian/patches/qpair_old_qt.diff

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2014-01-18 21:43:12 UTC (rev 27323)
+++ packages/pyqt5/trunk/debian/changelog	2014-01-19 08:05:32 UTC (rev 27324)
@@ -6,8 +6,10 @@
     - Don’t set -x in import autopkgtest.
     - Test QtDBus and QtX11Extras modules as well.
   * Split examples into their own package, pyqt5-examples.
+  * Rename qpair_old_qt.diff to old_qt.diff, and include a fix for
+    QtX11Extras module.
 
- -- Dmitry Shachnev <mitya57 at gmail.com>  Fri, 10 Jan 2014 21:36:59 +0400
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Sun, 19 Jan 2014 12:05:05 +0400
 
 pyqt5 (5.2+dfsg-1) unstable; urgency=low
 

Copied: packages/pyqt5/trunk/debian/patches/old_qt.diff (from rev 27323, packages/pyqt5/trunk/debian/patches/qpair_old_qt.diff)
===================================================================
--- packages/pyqt5/trunk/debian/patches/old_qt.diff	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/old_qt.diff	2014-01-19 08:05:32 UTC (rev 27324)
@@ -0,0 +1,65 @@
+Description: fix building against Qt versions older than 5.2
+Origin: upstream, changesets 5c798e751276 and 7d0f384170fd
+Last-Update: 2014-01-19
+
+--- a/configure.py
++++ b/configure.py
+@@ -1044,7 +1044,7 @@
+     check_module(target_config, verbose, 'QtSerialPort', 'qserialport.h',
+             'new QSerialPort()')
+     check_module(target_config, verbose, 'QtX11Extras', 'QX11Info',
+-            'QX11Info::isPlatformX11()')
++            'QX11Info::display()')
+ 
+ 
+ def check_5_2_modules(target_config, verbose):
+--- 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
+--- a/sip/QtX11Extras/qx11info_x11.sip
++++ b/sip/QtX11Extras/qx11info_x11.sip
+@@ -31,7 +31,9 @@
+ %End
+ 
+ public:
++%If (Qt_5_2_0 -)
+     static bool isPlatformX11();
++%End
+ 
+     static int appDpiX(int screen = -1);
+     static int appDpiY(int screen = -1);
+@@ -45,7 +47,9 @@
+     static void setAppTime(unsigned long time);
+     static void setAppUserTime(unsigned long time);
+ 
++%If (Qt_5_2_0 -)
+     static unsigned long getTimestamp();
++%End
+ 
+     static Display *display();
+     static xcb_connection_t *connection();

Deleted: packages/pyqt5/trunk/debian/patches/qpair_old_qt.diff
===================================================================
--- packages/pyqt5/trunk/debian/patches/qpair_old_qt.diff	2014-01-18 21:43:12 UTC (rev 27323)
+++ packages/pyqt5/trunk/debian/patches/qpair_old_qt.diff	2014-01-19 08:05:32 UTC (rev 27324)
@@ -1,32 +0,0 @@
-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

Modified: packages/pyqt5/trunk/debian/patches/series
===================================================================
--- packages/pyqt5/trunk/debian/patches/series	2014-01-18 21:43:12 UTC (rev 27323)
+++ packages/pyqt5/trunk/debian/patches/series	2014-01-19 08:05:32 UTC (rev 27324)
@@ -1 +1 @@
-qpair_old_qt.diff
+old_qt.diff