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

Antonio Rojas arojas at archlinux.org
Sat May 18 17:47:25 UTC 2019


    Date: Saturday, May 18, 2019 @ 17:47:25
  Author: arojas
Revision: 353600

archrelease: copy trunk to extra-x86_64

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

-------------------+
 PKGBUILD          |   97 +++++++++++++++++++++++++++-------------------------
 qtbug-75203.patch |   28 +++++++++++++++
 2 files changed, 79 insertions(+), 46 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-18 17:47:02 UTC (rev 353599)
+++ PKGBUILD	2019-05-18 17:47:25 UTC (rev 353600)
@@ -1,46 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=qt5-declarative
-_qtver=5.12.3
-pkgver=${_qtver/-/}
-pkgrel=1
-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')
-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=('839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7')
-
-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}
-}

Copied: qt5-declarative/repos/extra-x86_64/PKGBUILD (from rev 353599, qt5-declarative/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-05-18 17:47:25 UTC (rev 353600)
@@ -0,0 +1,51 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=qt5-declarative
+_qtver=5.12.3
+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')
+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-75203.patch)
+sha256sums=('839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7'
+            '458d8d4e5f2d96b4c1cb78937140ceaf966b57213fdbe84d0df33d5a41508028')
+
+prepare() {
+  mkdir -p build
+
+  cd $_pkgfqn
+  patch -p1 -i ../qtbug-75203.patch # Fix crash in SDDM Breeze theme
+}
+
+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/qtbug-75203.patch (from rev 353599, qt5-declarative/trunk/qtbug-75203.patch)
===================================================================
--- qtbug-75203.patch	                        (rev 0)
+++ qtbug-75203.patch	2019-05-18 17:47:25 UTC (rev 353600)
@@ -0,0 +1,28 @@
+From ea74f0c68cddf706c950d3910cf7b363fe24885b Mon Sep 17 00:00:00 2001
+From: Ulf Hermann <ulf.hermann at qt.io>
+Date: Wed, 17 Apr 2019 12:35:42 +0200
+Subject: Don't crash when accessing invalid properties through QObjectWrapper
+
+Change-Id: I613bf5dc685bb4235262b429d8f7318ea144fb9d
+Fixes: QTBUG-75203
+Reviewed-by: Erik Verbruggen <erik.verbruggen at qt.io>
+---
+ src/qml/jsruntime/qv4qobjectwrapper.cpp              |  2 +-
+ .../data/undefinedPropertiesInObjectWrapper.qml      | 20 ++++++++++++++++++++
+ tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 10 ++++++++++
+ 3 files changed, 31 insertions(+), 1 deletion(-)
+ create mode 100644 tests/auto/qml/qqmlecmascript/data/undefinedPropertiesInObjectWrapper.qml
+
+diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
+index 377c30617..5467e730e 100644
+--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
++++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
+@@ -856,7 +856,7 @@ ReturnedValue QObjectWrapper::virtualResolveLookupGetter(const Object *object, E
+     if (!ddata || !ddata->propertyCache) {
+         QQmlPropertyData local;
+         QQmlPropertyData *property = QQmlPropertyCache::property(engine->jsEngine(), qobj, name, qmlContext, local);
+-        return getProperty(engine, qobj, property);
++        return property ? getProperty(engine, qobj, property) : QV4::Encode::undefined();
+     }
+     QQmlPropertyData *property = ddata->propertyCache->property(name.getPointer(), qobj, qmlContext);
+ 


More information about the arch-commits mailing list