[arch-commits] Commit in qt5-declarative/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Wednesday, January 15, 2020 @ 13:22:10
  Author: arojas
Revision: 373508

archrelease: copy trunk to extra-x86_64

Added:
  qt5-declarative/repos/extra-x86_64/PKGBUILD
    (from rev 373507, qt5-declarative/trunk/PKGBUILD)
Deleted:
  qt5-declarative/repos/extra-x86_64/PKGBUILD
  qt5-declarative/repos/extra-x86_64/qtbug-80963.patch

-------------------+
 PKGBUILD          |   97 ++++++++++++++++++++++++----------------------------
 qtbug-80963.patch |   21 -----------
 2 files changed, 46 insertions(+), 72 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-15 13:21:42 UTC (rev 373507)
+++ PKGBUILD	2020-01-15 13:22:10 UTC (rev 373508)
@@ -1,51 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-declarative
-_qtver=5.14.0
-pkgver=${_qtver/-/}
-pkgrel=2
-arch=('x86_64')
-url='https://www.qt.io'
-license=('GPL3' 'LGPL3' 'FDL' 'custom')
-pkgdesc='Classes for QML and JavaScript languages'
-depends=('qt5-base')
-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"
-         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() {
-  cd build
-
-  qmake ../${_pkgfqn}
-  make
-}
-
-package() {
-  cd build
-  make INSTALL_ROOT="$pkgdir" install
-
-  # Symlinks for backwards compatibility
-  for b in "$pkgdir"/usr/bin/*; do
-    ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
-  done
-
-  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
-  find "$pkgdir/usr/lib" -type f -name '*.prl' \
-    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
-
-  install -d "$pkgdir"/usr/share/licenses
-  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
-}

Copied: qt5-declarative/repos/extra-x86_64/PKGBUILD (from rev 373507, qt5-declarative/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-01-15 13:22:10 UTC (rev 373508)
@@ -0,0 +1,46 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-declarative
+_qtver=5.14.0
+pkgver=${_qtver/-/}
+pkgrel=3
+arch=('x86_64')
+url='https://www.qt.io'
+license=('GPL3' 'LGPL3' 'FDL' 'custom')
+pkgdesc='Classes for QML and JavaScript languages'
+depends=('qt5-base')
+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')
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+
+  qmake ../${_pkgfqn}
+  make
+}
+
+package() {
+  cd build
+  make INSTALL_ROOT="$pkgdir" install
+
+  # Symlinks for backwards compatibility
+  for b in "$pkgdir"/usr/bin/*; do
+    ln -s $(basename $b) "$pkgdir"/usr/bin/$(basename $b)-qt5
+  done
+
+  # Drop QMAKE_PRL_BUILD_DIR because reference the build dir
+  find "$pkgdir/usr/lib" -type f -name '*.prl' \
+    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+
+  install -d "$pkgdir"/usr/share/licenses
+  ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/${pkgname}
+}

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