[arch-commits] Commit in pyqt6/repos/extra-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Wed Feb 24 21:06:59 UTC 2021
Date: Wednesday, February 24, 2021 @ 21:06:59
Author: arojas
Revision: 408768
archrelease: copy trunk to extra-x86_64
Added:
pyqt6/repos/extra-x86_64/PKGBUILD
(from rev 408767, pyqt6/trunk/PKGBUILD)
pyqt6/repos/extra-x86_64/fix-build.patch
(from rev 408767, pyqt6/trunk/fix-build.patch)
Deleted:
pyqt6/repos/extra-x86_64/PKGBUILD
pyqt6/repos/extra-x86_64/fix-build.patch
-----------------+
PKGBUILD | 76 +++++++++++++++++------------------
fix-build.patch | 116 +++++++++++++++++++++++++++---------------------------
2 files changed, 96 insertions(+), 96 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-02-24 21:06:47 UTC (rev 408767)
+++ PKGBUILD 2021-02-24 21:06:59 UTC (rev 408768)
@@ -1,38 +0,0 @@
-# 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.1
-pkgrel=1
-arch=(x86_64)
-url="https://riverbankcomputing.com/software/pyqt/intro"
-license=(GPL)
-groups=(pyqt6)
-depends=(qt6-base python-pyqt6-sip)
-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")
-sha256sums=('313f0f4bf0158e7ce3b892f1ec16b3378e505e0f2458394c1245eb6807695c0d')
-
-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/PKGBUILD (from rev 408767, pyqt6/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-02-24 21:06:59 UTC (rev 408768)
@@ -0,0 +1,38 @@
+# 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.2
+pkgrel=1
+arch=(x86_64)
+url="https://riverbankcomputing.com/software/pyqt/intro"
+license=(GPL)
+groups=(pyqt6)
+depends=(qt6-base python-pyqt6-sip)
+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")
+sha256sums=('aab1b58e287cd8c91d7f7b8c4f91d68b8980f07fcd2ad6d9adbf0bb75347fb9a')
+
+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
+}
Deleted: fix-build.patch
===================================================================
--- fix-build.patch 2021-02-24 21:06:47 UTC (rev 408767)
+++ fix-build.patch 2021-02-24 21:06:59 UTC (rev 408768)
@@ -1,58 +0,0 @@
-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;
-
Copied: pyqt6/repos/extra-x86_64/fix-build.patch (from rev 408767, pyqt6/trunk/fix-build.patch)
===================================================================
--- fix-build.patch (rev 0)
+++ fix-build.patch 2021-02-24 21:06:59 UTC (rev 408768)
@@ -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;
+
More information about the arch-commits
mailing list