author | Antonio Rojas
<arojas@archlinux.org> 2019-12-22 21:33:09 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2019-12-22 21:33:09 UTC |
parent | 329f18b9ee96f9f241f9a9720976a7d1731e839b |
PKGBUILD | +8 | -3 |
qtbug-80963.patch | +21 | -0 |
diff --git a/PKGBUILD b/PKGBUILD index 62ff231..d927617 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -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 @@ makedepends=('python' 'vulkan-headers') 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() { diff --git a/qtbug-80963.patch b/qtbug-80963.patch new file mode 100644 index 0000000..2a3c1ba --- /dev/null +++ b/qtbug-80963.patch @@ -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); ++// }); ++// } + } + + /*!