[Python-modules-commits] r26602 - in packages/pyqt5/trunk/debian (3 files)

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

    Date: Thursday, November 28, 2013 @ 15:35:33
  Author: mitya57-guest
Revision: 26602

Backport upstream patch (gluint64.sip) to disable GLuint64 on GL ES.

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

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2013-11-28 15:35:06 UTC (rev 26601)
+++ packages/pyqt5/trunk/debian/changelog	2013-11-28 15:35:33 UTC (rev 26602)
@@ -1,3 +1,9 @@
+pyqt5 (5.1.1+dfsg-3) UNRELEASED; urgency=low
+
+  * Backport upstream patch (gluint64.sip) to disable GLuint64 on GL ES.
+
+ -- Dmitry Shachnev <mitya57 at gmail.com>  Thu, 28 Nov 2013 19:33:21 +0400
+
 pyqt5 (5.1.1+dfsg-2) unstable; urgency=low
 
   * Add pyqt5.qtopengl-dbg Breaks/Conflicts to fix file overwrite error

Added: packages/pyqt5/trunk/debian/patches/gluint64.diff
===================================================================
--- packages/pyqt5/trunk/debian/patches/gluint64.diff	                        (rev 0)
+++ packages/pyqt5/trunk/debian/patches/gluint64.diff	2013-11-28 15:35:33 UTC (rev 26602)
@@ -0,0 +1,33 @@
+Description: disable GLuint64 on GL ES
+Origin: upstream, changeset 3f0065d77ee3
+Last-Update: 2013-11-19
+
+--- a/sip/QtGui/opengl_types.sip
++++ b/sip/QtGui/opengl_types.sip
+@@ -29,7 +29,9 @@
+ typedef quint32 GLuint;
+ typedef quint32 GLenum;
+ typedef quint32 GLbitfield;
++%If (PyQt_Desktop_OpenGL)
+ typedef quint64 GLuint64;
++%End
+ typedef float GLfloat;
+ typedef float GLclampf;
+ typedef double GLdouble;
+--- a/sip/QtGui/qpyopengl_collections.sip
++++ b/sip/QtGui/qpyopengl_collections.sip
+@@ -19,6 +19,8 @@
+ // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ 
+ 
++%If (PyQt_Desktop_OpenGL)
++
+ // QVector<GLuint64> is implemented as a Python list of integers.
+ %MappedType QVector<GLuint64> /DocType="list-of-int"/
+ {
+@@ -69,3 +71,5 @@
+     return sipGetState(sipTransferObj);
+ %End
+ };
++
++%End

Modified: packages/pyqt5/trunk/debian/patches/series
===================================================================
--- packages/pyqt5/trunk/debian/patches/series	2013-11-28 15:35:06 UTC (rev 26601)
+++ packages/pyqt5/trunk/debian/patches/series	2013-11-28 15:35:33 UTC (rev 26602)
@@ -1 +1,2 @@
 use-qmake-variables.diff
+gluint64.diff