[arch-commits] Commit in qt5-declarative/trunk (PKGBUILD qtbug-80963.patch)

[Antonio Rojas]

    Date: Wednesday, January 15, 2020 @ 13:21:42
  Author: arojas
Revision: 373507

Remove workaround for kdenlive crash, fixed already

Modified:
  qt5-declarative/trunk/PKGBUILD
Deleted:
  qt5-declarative/trunk/qtbug-80963.patch

-------------------+
 PKGBUILD          |   11 +++--------
 qtbug-80963.patch |   21 ---------------------
 2 files changed, 3 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-15 13:13:44 UTC (rev 373506)
+++ PKGBUILD	2020-01-15 13:21:42 UTC (rev 373507)
@@ -4,7 +4,7 @@
 pkgname=qt5-declarative
 _qtver=5.14.0
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -14,16 +14,11 @@
 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"
-         qtbug-80963.patch)
-sha256sums=('bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e'
-            'e773ddafe7f2465252f77ad4ad50046e1fe417068734652632a6bf4d505a0a28')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
+sha256sums=('bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e')
 
 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() {

Deleted: qtbug-80963.patch
===================================================================
--- qtbug-80963.patch	2020-01-15 13:13:44 UTC (rev 373506)
+++ qtbug-80963.patch	2020-01-15 13:21:42 UTC (rev 373507)
@@ -1,21 +0,0 @@
-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);
-+//         });
-+//     }
- }
- 
- /*!