[arch-commits] Commit in pyqt5/repos (6 files)
Jelle van der Waa
jelle at archlinux.org
Mon Mar 20 14:16:39 UTC 2017
Date: Monday, March 20, 2017 @ 14:16:38
Author: jelle
Revision: 291109
archrelease: copy trunk to community-i686, community-x86_64
Added:
pyqt5/repos/community-i686/
pyqt5/repos/community-i686/PKGBUILD
(from rev 291108, pyqt5/trunk/PKGBUILD)
pyqt5/repos/community-i686/pyqt-5.8-segfault.patch
(from rev 291108, pyqt5/trunk/pyqt-5.8-segfault.patch)
pyqt5/repos/community-x86_64/
pyqt5/repos/community-x86_64/PKGBUILD
(from rev 291108, pyqt5/trunk/PKGBUILD)
pyqt5/repos/community-x86_64/pyqt-5.8-segfault.patch
(from rev 291108, pyqt5/trunk/pyqt-5.8-segfault.patch)
------------------------------------------+
community-i686/PKGBUILD | 119 +++++++++++++++++++++++++++++
community-i686/pyqt-5.8-segfault.patch | 62 +++++++++++++++
community-x86_64/PKGBUILD | 119 +++++++++++++++++++++++++++++
community-x86_64/pyqt-5.8-segfault.patch | 62 +++++++++++++++
4 files changed, 362 insertions(+)
Copied: pyqt5/repos/community-i686/PKGBUILD (from rev 291108, pyqt5/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-03-20 14:16:38 UTC (rev 291109)
@@ -0,0 +1,119 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Yichao Yu <yyc1992 at gmail.com>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+# Contributor: riai <riai at bigfoot.com> Ben <ben at benmazer.net>
+
+pkgbase=pyqt5
+pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
+pkgver=5.8
+_pkgver=$pkgver
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
+ 'python2-dbus' 'python-dbus' 'qt5-connectivity'
+ 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
+ 'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras')
+source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" "pyqt-5.8-segfault.patch")
+md5sums=('ac04c0bfc1f05f5a1c2a1edd2640235c'
+ 'de7b2781874ff0c7c0d710f718cfa01a')
+
+prepare() {
+ pushd PyQt5_gpl-${_pkgver}
+ patch -Np1 -i "${srcdir}/pyqt-5.8-segfault.patch"
+ popd
+
+
+ # The additional include path was removed due to this line, I don't really know why they are doing this...
+ sed -i '/target_config.dbus_inc_dirs = \[\]/d' PyQt5_gpl-${_pkgver}/configure.py
+
+ cp -a PyQt5_gpl-${_pkgver}{,-py2}
+}
+
+build() {
+ cd "$srcdir"/PyQt5_gpl-${_pkgver}
+ python configure.py \
+ --confirm-license \
+ --no-sip-files \
+ --qsci-api \
+ -q /usr/bin/qmake-qt5
+
+ # Thanks Gerardo for the rpath fix
+ find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+ make
+
+ cd "$srcdir"/PyQt5_gpl-${_pkgver}-py2
+ python2 configure.py \
+ --confirm-license \
+ --no-sip-files \
+ --qsci-api \
+ -q /usr/bin/qmake-qt5
+
+ # Thanks Gerardo for the rpath fix
+ find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+ make
+}
+
+package_pyqt5-common(){
+ pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5"
+ depends=('qt5-base')
+
+ cd PyQt5_gpl-${_pkgver}
+ install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+
+ install -d "${pkgdir}"/usr/share/sip/PyQt5
+ cp -a sip/* "${pkgdir}"/usr/share/sip/PyQt5
+}
+
+package_python-pyqt5(){
+ pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit"
+ depends=('python-sip' 'pyqt5-common')
+ optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
+ 'python-dbus: for python-dbus mainloop support'
+ 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+ 'qt5-tools: QtHelp, QtDesigner'
+ 'qt5-svg: QtSvg'
+ 'qt5-webkit: QtWebKit, QtWebKitWidgets'
+ 'qt5-xmlpatterns: QtXmlPatterns'
+ 'qt5-declarative: QtQml, qmlplugin'
+ 'qt5-serialport: QtSerialPort')
+
+ cd PyQt5_gpl-${_pkgver}
+ # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by pyqt-common
+ rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
+
+package_python2-pyqt5(){
+ pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit"
+ depends=('python2-sip' 'pyqt5-common')
+ optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications'
+ 'python-dbus: for python-dbus mainloop support'
+ 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+ 'qt5-tools: QtHelp, QtDesigner'
+ 'qt5-svg: QtSvg'
+ 'qt5-webkit: QtWebKit, QtWebKitWidgets'
+ 'qt5-xmlpatterns: QtXmlPatterns'
+ 'qt5-declarative: QtQml, qmlplugin'
+ 'qt5-serialport: QtSerialPort')
+
+ cd PyQt5_gpl-${_pkgver}-py2
+ # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Fix conflicts with python-pyqt5
+ mv "${pkgdir}"/usr/bin/{,python2-}pyuic5
+ mv "${pkgdir}"/usr/bin/{,python2-}pylupdate5
+ mv "${pkgdir}"/usr/bin/{,python2-}pyrcc5
+
+ rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so
+ rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
+ rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
Copied: pyqt5/repos/community-i686/pyqt-5.8-segfault.patch (from rev 291108, pyqt5/trunk/pyqt-5.8-segfault.patch)
===================================================================
--- community-i686/pyqt-5.8-segfault.patch (rev 0)
+++ community-i686/pyqt-5.8-segfault.patch 2017-03-20 14:16:38 UTC (rev 291109)
@@ -0,0 +1,62 @@
+--- a/qpy/QtQml/qpyqml_register_type.cpp 2017-02-23 03:32:51.000000000 +0100
++++ b/qpy/QtQml/qpyqml_register_type.cpp 2017-02-25 03:32:58.000000000 +0100
+@@ -124,13 +124,13 @@
+
+ #define QPYQML_TYPE_INIT(n) \
+ case n##U: \
+- QPyQmlObject##n::staticMetaObject = *mo; \
++ QPyQmlObject##n::staticMetaObject = static_mo; \
+ QPyQmlObject##n::attachedPyType = attached; \
+ rt->typeId = qRegisterNormalizedMetaType<QPyQmlObject##n *>(ptr_name); \
+ rt->listId = qRegisterNormalizedMetaType<QQmlListProperty<QPyQmlObject##n> >(list_name); \
+ rt->objectSize = ctor ? sizeof(QPyQmlObject##n) : 0; \
+ if (ctor) rt->create = QQmlPrivate::createInto<QPyQmlObject##n>; else rt->create = 0; \
+- rt->metaObject = mo; \
++ rt->metaObject = &QPyQmlObject##n::staticMetaObject; \
+ rt->attachedPropertiesFunction = attached_mo ? QPyQmlObject##n::attachedProperties : 0; \
+ rt->attachedPropertiesMetaObject = attached_mo; \
+ rt->parserStatusCast = is_parser_status ? QQmlPrivate::StaticCastSelector<QPyQmlObject##n,QQmlParserStatus>::cast() : -1; \
+@@ -219,7 +219,33 @@
+ return 0;
+ }
+
+- const QMetaObject *mo = pyqt5_qtqml_get_qmetaobject(py_type);
++ const QMetaObject *orig_mo = pyqt5_qtqml_get_qmetaobject(py_type);
++ QMetaObject static_mo = *orig_mo;
++
++#if QT_VERSION >= 0x050800
++ // Qt v5.8.0 changed the way properties are handled by directly calling a
++ // class's static meta-call (if there was one) directly. This bypasses the
++ // proxy and calls the static meta-call with a pointer to the proxy rather
++ // than a pointer to the real object. To work round this we clone the
++ // QMetaObject chain and remove the references to the static meta-call
++ // forcing the earlier behaviour. This approach may also work with earlier
++ // versions of Qt - but if it ain't broke...
++ static_mo.d.static_metacall = 0;
++
++ QMetaObject *sub_mo = &static_mo;
++
++ // By retaining the QObject static meta-object we don't appear to be a
++ // gadget.
++ for (const QMetaObject *mo = sub_mo->d.superdata; mo != &QObject::staticMetaObject; mo = mo->d.superdata)
++ {
++ QMetaObject *new_mo = new QMetaObject;
++ *new_mo = *mo;
++ new_mo->d.static_metacall = 0;
++
++ sub_mo->d.superdata = new_mo;
++ sub_mo = new_mo;
++ }
++#endif
+
+ // See if the type is a parser status.
+ bool is_parser_status = PyType_IsSubtype(py_type,
+@@ -272,7 +298,7 @@
+
+ if (qquickitem_register)
+ {
+- sipErrorState estate = qquickitem_register(py_type, mo, ptr_name,
++ sipErrorState estate = qquickitem_register(py_type, orig_mo, ptr_name,
+ list_name, &rt);
+
+ if (estate == sipErrorFail)
Copied: pyqt5/repos/community-x86_64/PKGBUILD (from rev 291108, pyqt5/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-03-20 14:16:38 UTC (rev 291109)
@@ -0,0 +1,119 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Yichao Yu <yyc1992 at gmail.com>
+# Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
+# Contributor: riai <riai at bigfoot.com> Ben <ben at benmazer.net>
+
+pkgbase=pyqt5
+pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
+pkgver=5.8
+_pkgver=$pkgver
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
+ 'python2-dbus' 'python-dbus' 'qt5-connectivity'
+ 'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
+ 'qt5-webengine' 'qt5-webkit' 'qt5-websockets' 'qt5-x11extras')
+source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" "pyqt-5.8-segfault.patch")
+md5sums=('ac04c0bfc1f05f5a1c2a1edd2640235c'
+ 'de7b2781874ff0c7c0d710f718cfa01a')
+
+prepare() {
+ pushd PyQt5_gpl-${_pkgver}
+ patch -Np1 -i "${srcdir}/pyqt-5.8-segfault.patch"
+ popd
+
+
+ # The additional include path was removed due to this line, I don't really know why they are doing this...
+ sed -i '/target_config.dbus_inc_dirs = \[\]/d' PyQt5_gpl-${_pkgver}/configure.py
+
+ cp -a PyQt5_gpl-${_pkgver}{,-py2}
+}
+
+build() {
+ cd "$srcdir"/PyQt5_gpl-${_pkgver}
+ python configure.py \
+ --confirm-license \
+ --no-sip-files \
+ --qsci-api \
+ -q /usr/bin/qmake-qt5
+
+ # Thanks Gerardo for the rpath fix
+ find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+ make
+
+ cd "$srcdir"/PyQt5_gpl-${_pkgver}-py2
+ python2 configure.py \
+ --confirm-license \
+ --no-sip-files \
+ --qsci-api \
+ -q /usr/bin/qmake-qt5
+
+ # Thanks Gerardo for the rpath fix
+ find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+ make
+}
+
+package_pyqt5-common(){
+ pkgdesc="Common PyQt files shared between python-pyqt5 and python2-pyqt5"
+ depends=('qt5-base')
+
+ cd PyQt5_gpl-${_pkgver}
+ install -Dm644 PyQt5.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+
+ install -d "${pkgdir}"/usr/share/sip/PyQt5
+ cp -a sip/* "${pkgdir}"/usr/share/sip/PyQt5
+}
+
+package_python-pyqt5(){
+ pkgdesc="A set of Python 3.x bindings for the Qt5 toolkit"
+ depends=('python-sip' 'pyqt5-common')
+ optdepends=('python-opengl: enable OpenGL 3D graphics in PyQt applications'
+ 'python-dbus: for python-dbus mainloop support'
+ 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+ 'qt5-tools: QtHelp, QtDesigner'
+ 'qt5-svg: QtSvg'
+ 'qt5-webkit: QtWebKit, QtWebKitWidgets'
+ 'qt5-xmlpatterns: QtXmlPatterns'
+ 'qt5-declarative: QtQml, qmlplugin'
+ 'qt5-serialport: QtSerialPort')
+
+ cd PyQt5_gpl-${_pkgver}
+ # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Provided by pyqt-common
+ rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
+
+package_python2-pyqt5(){
+ pkgdesc="A set of Python 2.x bindings for the Qt5 toolkit"
+ depends=('python2-sip' 'pyqt5-common')
+ optdepends=('python2-opengl: enable OpenGL 3D graphics in PyQt applications'
+ 'python-dbus: for python-dbus mainloop support'
+ 'qt5-multimedia: QtMultimedia, QtMultimediaWidgets'
+ 'qt5-tools: QtHelp, QtDesigner'
+ 'qt5-svg: QtSvg'
+ 'qt5-webkit: QtWebKit, QtWebKitWidgets'
+ 'qt5-xmlpatterns: QtXmlPatterns'
+ 'qt5-declarative: QtQml, qmlplugin'
+ 'qt5-serialport: QtSerialPort')
+
+ cd PyQt5_gpl-${_pkgver}-py2
+ # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+ make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+ # Fix conflicts with python-pyqt5
+ mv "${pkgdir}"/usr/bin/{,python2-}pyuic5
+ mv "${pkgdir}"/usr/bin/{,python2-}pylupdate5
+ mv "${pkgdir}"/usr/bin/{,python2-}pyrcc5
+
+ rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpyqt5.so
+ rm "${pkgdir}"/usr/lib/qt/plugins/PyQt5/libpyqt5qmlplugin.so
+ rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt5.api
+}
Copied: pyqt5/repos/community-x86_64/pyqt-5.8-segfault.patch (from rev 291108, pyqt5/trunk/pyqt-5.8-segfault.patch)
===================================================================
--- community-x86_64/pyqt-5.8-segfault.patch (rev 0)
+++ community-x86_64/pyqt-5.8-segfault.patch 2017-03-20 14:16:38 UTC (rev 291109)
@@ -0,0 +1,62 @@
+--- a/qpy/QtQml/qpyqml_register_type.cpp 2017-02-23 03:32:51.000000000 +0100
++++ b/qpy/QtQml/qpyqml_register_type.cpp 2017-02-25 03:32:58.000000000 +0100
+@@ -124,13 +124,13 @@
+
+ #define QPYQML_TYPE_INIT(n) \
+ case n##U: \
+- QPyQmlObject##n::staticMetaObject = *mo; \
++ QPyQmlObject##n::staticMetaObject = static_mo; \
+ QPyQmlObject##n::attachedPyType = attached; \
+ rt->typeId = qRegisterNormalizedMetaType<QPyQmlObject##n *>(ptr_name); \
+ rt->listId = qRegisterNormalizedMetaType<QQmlListProperty<QPyQmlObject##n> >(list_name); \
+ rt->objectSize = ctor ? sizeof(QPyQmlObject##n) : 0; \
+ if (ctor) rt->create = QQmlPrivate::createInto<QPyQmlObject##n>; else rt->create = 0; \
+- rt->metaObject = mo; \
++ rt->metaObject = &QPyQmlObject##n::staticMetaObject; \
+ rt->attachedPropertiesFunction = attached_mo ? QPyQmlObject##n::attachedProperties : 0; \
+ rt->attachedPropertiesMetaObject = attached_mo; \
+ rt->parserStatusCast = is_parser_status ? QQmlPrivate::StaticCastSelector<QPyQmlObject##n,QQmlParserStatus>::cast() : -1; \
+@@ -219,7 +219,33 @@
+ return 0;
+ }
+
+- const QMetaObject *mo = pyqt5_qtqml_get_qmetaobject(py_type);
++ const QMetaObject *orig_mo = pyqt5_qtqml_get_qmetaobject(py_type);
++ QMetaObject static_mo = *orig_mo;
++
++#if QT_VERSION >= 0x050800
++ // Qt v5.8.0 changed the way properties are handled by directly calling a
++ // class's static meta-call (if there was one) directly. This bypasses the
++ // proxy and calls the static meta-call with a pointer to the proxy rather
++ // than a pointer to the real object. To work round this we clone the
++ // QMetaObject chain and remove the references to the static meta-call
++ // forcing the earlier behaviour. This approach may also work with earlier
++ // versions of Qt - but if it ain't broke...
++ static_mo.d.static_metacall = 0;
++
++ QMetaObject *sub_mo = &static_mo;
++
++ // By retaining the QObject static meta-object we don't appear to be a
++ // gadget.
++ for (const QMetaObject *mo = sub_mo->d.superdata; mo != &QObject::staticMetaObject; mo = mo->d.superdata)
++ {
++ QMetaObject *new_mo = new QMetaObject;
++ *new_mo = *mo;
++ new_mo->d.static_metacall = 0;
++
++ sub_mo->d.superdata = new_mo;
++ sub_mo = new_mo;
++ }
++#endif
+
+ // See if the type is a parser status.
+ bool is_parser_status = PyType_IsSubtype(py_type,
+@@ -272,7 +298,7 @@
+
+ if (qquickitem_register)
+ {
+- sipErrorState estate = qquickitem_register(py_type, mo, ptr_name,
++ sipErrorState estate = qquickitem_register(py_type, orig_mo, ptr_name,
+ list_name, &rt);
+
+ if (estate == sipErrorFail)
More information about the arch-commits
mailing list