pyqt5-5.8-2.parabola1: fix segfault when starting cura - FS#53371 -> https://bugs.archlinux.org/task/53371

3 files changed, 70 insertions, 3 deletions

diff --git a/libre/pyqt5/PKGBUILD b/libre/pyqt5/PKGBUILD
index 9f1cd1186..d0ed3cf08 100644
--- a/libre/pyqt5/PKGBUILD
+++ b/libre/pyqt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 289071 2017-02-16 19:16:55Z arojas $
+# $Id: PKGBUILD 291120 2017-03-20 15:54:10Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Yichao Yu <yyc1992@gmail.com>
@@ -11,7 +11,7 @@ pkgbase=pyqt5
 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
 pkgver=5.8
 _pkgver=$pkgver
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
@@ -19,13 +19,15 @@ makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
              'python2-dbus' 'python-dbus' 'qt5-connectivity'
              'qt5-multimedia' 'qt5-tools' 'qt5-serialport' 'qt5-svg'
              'qt5-webkit' 'qt5-websockets' 'qt5-x11extras')
-source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz"
+source=("http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-$pkgver/PyQt5_gpl-$pkgver.tar.gz" "pyqt-5.8-segfault.patch"
         'opengles-hack.patch')
 md5sums=('ac04c0bfc1f05f5a1c2a1edd2640235c'
+         'de7b2781874ff0c7c0d710f718cfa01a'
          'ad09b1c84c26d5e92de192477cb3a2d1')
 
 prepare() {
   pushd PyQt5_gpl-${_pkgver}
+  patch -Np1 -i "${srcdir}/pyqt-5.8-segfault.patch"
   if [[ "$CARCH" =~ ^arm*|^aarch64$ ]]; then
     patch -p1 -i ../opengles-hack.patch
   fi
@@ -33,6 +35,9 @@ prepare() {
   # patch -p1 -i ../pyqt-qt5.8.patch
   popd
 
+  # Support new versions of Qt - don't remove, needs to be reapplied after every new Qt release
+  # patch -p1 -i ../pyqt-support-new-qt.patch
+
   # 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
 
diff --git a/libre/pyqt5/pyqt-5.8-segfault.patch b/libre/pyqt5/pyqt-5.8-segfault.patch
new file mode 100644
index 000000000..a8d1564af
--- /dev/null
+++ b/libre/pyqt5/pyqt-5.8-segfault.patch
@@ -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)
diff --git a/libre/pyqt5/pyqt-qt5.8.patch b/libre/pyqt5/pyqt-support-new-qt.patch
index 7d3a633c1..7d3a633c1 100644
--- a/libre/pyqt5/pyqt-qt5.8.patch
+++ b/libre/pyqt5/pyqt-support-new-qt.patch