From d7df7c8c2da3a3258bc6bf1c6d44718050265dfb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 22 Mar 2017 00:52:18 -0300
Subject: pyqt5-5.8-2.parabola1: fix segfault when starting cura - FS#53371 ->
 https://bugs.archlinux.org/task/53371

---
 libre/pyqt5/pyqt-5.8-segfault.patch | 62 +++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 libre/pyqt5/pyqt-5.8-segfault.patch

(limited to 'libre/pyqt5/pyqt-5.8-segfault.patch')

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)
-- 
cgit v1.2.3