Date: Sunday, December 22, 2019 @ 21:33:09
Author: arojas
Revision: 372079
Revert change that breaks kdenlive (FS#64867)
Added:
qt5-declarative/trunk/qtbug-80963.patch
Modified:
qt5-declarative/trunk/PKGBUILD
-------------------+
PKGBUILD | 11 ++++++++---
qtbug-80963.patch | 21 +++++++++++++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-12-22 20:08:20 UTC (rev 372078)
+++ PKGBUILD 2019-12-22 21:33:09 UTC (rev 372079)
@@ -4,7 +4,7 @@
pkgname=qt5-declarative
_qtver=5.14.0
pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url='https://www.qt.io'
license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -14,11 +14,16 @@
groups=('qt' 'qt5')
conflicts=('qtchooser')
_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";)
-sha256sums=('bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";
+ qtbug-80963.patch)
+sha256sums=('bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e'
+ 'e773ddafe7f2465252f77ad4ad50046e1fe417068734652632a6bf4d505a0a28')
prepare() {
mkdir -p build
+
+ cd $_pkgfqn
+ patch -p1 -i ../qtbug-80963.patch # Revert change that crashes kdenlive
https://bugreports.qt.io/browse/QTBUG-80963
}
build() {
Added: qtbug-80963.patch
===================================================================
--- qtbug-80963.patch (rev 0)
+++ qtbug-80963.patch 2019-12-22 21:33:09 UTC (rev 372079)
@@ -0,0 +1,21 @@
+diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp
+index f75a076bcb..36080a4f38 100644
+--- a/src/qml/qml/qqmlcontext.cpp
++++ b/src/qml/qml/qqmlcontext.cpp
+@@ -318,11 +318,11 @@ void QQmlContext::setContextProperty(const QString
&name, const QVariant &value)
+ QMetaObject::activate(this, d->notifyIndex, idx, nullptr);
+ }
+
+- if (auto *obj = qvariant_cast<QObject *>(value)) {
+- connect(obj, &QObject::destroyed, this, [d, name](QObject *destroyed)
{
+- d->dropDestroyedQObject(name, destroyed);
+- });
+- }
++// if (auto *obj = qvariant_cast<QObject *>(value)) {
++// connect(obj, &QObject::destroyed, this, [d, name](QObject
*destroyed) {
++// d->dropDestroyedQObject(name, destroyed);
++// });
++// }
+ }
+
+ /*!
