[arch-commits] Commit in pyqt5/trunk (3 files)
Jelle van der Waa
jelle at archlinux.org
Mon Mar 20 14:16:29 UTC 2017
Date: Monday, March 20, 2017 @ 14:16:29
Author: jelle
Revision: 291108
upgpkg: pyqt5 5.8-2
fix FS#53371
Added:
pyqt5/trunk/pyqt-5.8-segfault.patch
Modified:
pyqt5/trunk/PKGBUILD
Deleted:
pyqt5/trunk/pyqt-qt5.8.patch
-------------------------+
PKGBUILD | 11 ++++----
pyqt-5.8-segfault.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++++
pyqt-qt5.8.patch | 12 --------
3 files changed, 68 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-03-20 13:41:18 UTC (rev 291107)
+++ PKGBUILD 2017-03-20 14:16:29 UTC (rev 291108)
@@ -9,7 +9,7 @@
pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
pkgver=5.8
_pkgver=$pkgver
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://riverbankcomputing.co.uk/software/pyqt/intro"
license=('GPL')
@@ -17,15 +17,16 @@
'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")
-md5sums=('ac04c0bfc1f05f5a1c2a1edd2640235c')
+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}
- # Support Qt 5.8
- # patch -p1 -i ../pyqt-qt5.8.patch
+ 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
Added: pyqt-5.8-segfault.patch
===================================================================
--- pyqt-5.8-segfault.patch (rev 0)
+++ pyqt-5.8-segfault.patch 2017-03-20 14:16:29 UTC (rev 291108)
@@ -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)
Deleted: pyqt-qt5.8.patch
===================================================================
--- pyqt-qt5.8.patch 2017-03-20 13:41:18 UTC (rev 291107)
+++ pyqt-qt5.8.patch 2017-03-20 14:16:29 UTC (rev 291108)
@@ -1,12 +0,0 @@
-diff -ru a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip
---- a/sip/QtCore/QtCoremod.sip 2016-12-25 18:56:11.000000000 +0100
-+++ b/sip/QtCore/QtCoremod.sip 2017-01-24 12:03:50.707514377 +0100
-@@ -22,7 +22,7 @@
-
- %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True)
-
--%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1}
-+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0}
-
- %Platforms {WS_X11 WS_WIN WS_MACX}
-
More information about the arch-commits
mailing list