[arch-commits] Commit in pyqt6 (4 files)

[Antonio Rojas]

    Date: Thursday, January 7, 2021 @ 07:22:34
  Author: arojas
Revision: 405417

archrelease: copy trunk to extra-x86_64

Added:
  pyqt6/repos/
  pyqt6/repos/extra-x86_64/
  pyqt6/repos/extra-x86_64/PKGBUILD
    (from rev 405416, pyqt6/trunk/PKGBUILD)
  pyqt6/repos/extra-x86_64/fix-build.patch
    (from rev 405416, pyqt6/trunk/fix-build.patch)

-----------------+
 PKGBUILD        |   44 ++++++++++++++++++++++++++++++++++++++++
 fix-build.patch |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)

Copied: pyqt6/repos/extra-x86_64/PKGBUILD (from rev 405416, pyqt6/trunk/PKGBUILD)
===================================================================
--- repos/extra-x86_64/PKGBUILD	                        (rev 0)
+++ repos/extra-x86_64/PKGBUILD	2021-01-07 07:22:34 UTC (rev 405417)
@@ -0,0 +1,44 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgbase=pyqt6
+pkgname=python-pyqt6
+pkgdesc="A set of Python bindings for the Qt6 toolkit"
+pkgver=6.0.0
+pkgrel=1
+arch=(x86_64)
+url="https://riverbankcomputing.com/software/pyqt/intro"
+license=(GPL)
+groups=(pyqt6)
+depends=(qt6-base)
+optdepends=('qt6-tools: QtHelp, QtDesigner'
+            'qt6-svg: QtSvg'
+            'qt6-declarative: QtQml, qmlplugin'
+            'qt6-quick3d: QtQuick3D')
+makedepends=(sip pyqt-builder qt6-tools qt6-svg qt6-declarative qt6-quick3d python-opengl)
+source=("https://pypi.python.org/packages/source/P/PyQt6/PyQt6-$pkgver.tar.gz"
+         fix-build.patch)
+sha256sums=('c758b0568127bffd7147f461d74bbf06249177eae908efed8099eec30984f1b3'
+            '6cd36d08d38d8904a89ae40a4c18c1a6225e6dba2e6cef4d6f14005d2cd7895c')
+
+prepare() {
+  patch -d PyQt6-$pkgver -p1 -i ../fix-build.patch
+}
+
+build() {
+  cd PyQt6-$pkgver
+  sip-build \
+    --confirm-license \
+    --no-make \
+    --qmake=/usr/bin/qmake-qt6
+  cd build
+  make
+}
+
+package_python-pyqt6(){
+  cd PyQt6-$pkgver/build
+  make INSTALL_ROOT="$pkgdir" install
+
+  # compile Python bytecode
+  python -m compileall -d / "$pkgdir"/usr/lib
+  python -O -m compileall -d / "$pkgdir"/usr/lib
+}

Copied: pyqt6/repos/extra-x86_64/fix-build.patch (from rev 405416, pyqt6/trunk/fix-build.patch)
===================================================================
--- repos/extra-x86_64/fix-build.patch	                        (rev 0)
+++ repos/extra-x86_64/fix-build.patch	2021-01-07 07:22:34 UTC (rev 405417)
@@ -0,0 +1,58 @@
+diff -ru PyQt6-6.0.1.dev2101052155/sip/QtQuick/qsggeometry.sip PyQt6-6.0.1.dev2101060956/sip/QtQuick/qsggeometry.sip
+--- PyQt6-6.0.1.dev2101052155/sip/QtQuick/qsggeometry.sip       2021-01-06 01:30:33.889339000 +0100
++++ PyQt6-6.0.1.dev2101060956/sip/QtQuick/qsggeometry.sip       2021-01-07 01:30:34.746270000 +0100
+@@ -27,28 +27,6 @@
+ %End
+ 
+ public:
+-// Convenient primitives and drawing modes.
+-enum /NoScope/
+-{
+-    GL_BYTE,
+-%If (PyQt_OpenGL_ES2)
+-    GL_DOUBLE,
+-%End
+-    GL_FLOAT,
+-    GL_INT
+-};
+-
+-enum /NoScope/
+-{
+-    GL_POINTS,
+-    GL_LINES,
+-    GL_LINE_LOOP,
+-    GL_LINE_STRIP,
+-    GL_TRIANGLES,
+-    GL_TRIANGLE_STRIP,
+-    GL_TRIANGLE_FAN
+-};
+-
+     struct Attribute
+     {
+ %TypeHeaderCode
+@@ -125,21 +103,19 @@
+             
+                         switch (attr->type)
+                         {
+-                        case GL_BYTE:
++                        case QSGGeometry::ByteType:
+                             size = sizeof (qint8);
+                             break;
+             
+-            #if !defined(SIP_FEATURE_PyQt_OpenGL_ES2) && GL_DOUBLE != GL_FLOAT
+-                        case GL_DOUBLE:
++                        case QSGGeometry::DoubleType:
+                             size = sizeof (double);
+                             break;
+-            #endif
+             
+-                        case GL_FLOAT:
++                        case QSGGeometry::FloatType:
+                             size = sizeof (float);
+                             break;
+             
+-                        case GL_INT:
++                        case QSGGeometry::IntType:
+                             size = sizeof (qint32);
+                             break;
+