[arch-commits] Commit in qt5-declarative/kde-unstable (PKGBUILD)
Date: Monday, April 6, 2020 @ 21:49:53 Author: arojas Revision: 379710 Fix double cmake targets Modified: qt5-declarative/kde-unstable/PKGBUILD --+ PKGBUILD | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-04-06 21:42:36 UTC (rev 379709) +++ PKGBUILD2020-04-06 21:49:53 UTC (rev 379710) @@ -4,7 +4,7 @@ pkgname=qt5-declarative _qtver=5.15.0-beta3 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('95accbf0543f75b9d3527f014144663fc101534346ae74ea83fa56331a35b640') +source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"; + qtbug-83282c.patch::"https://code.qt.io/cgit/qt/qtdeclarative.git/patch/?id=1a2ab822";) +sha256sums=('95accbf0543f75b9d3527f014144663fc101534346ae74ea83fa56331a35b640' +'806295dddba2faf05c7d9ff47ad6c3f7e2d6ad6b205af97d5236d5c1f0b08854') prepare() { mkdir -p build + + cd $_pkgfqn + patch -p1 -i ../qtbug-83282c.patch # Fix double cmake target } build() {
[arch-commits] Commit in qt5-declarative/kde-unstable (PKGBUILD qtbug-75203.patch)
Date: Saturday, May 18, 2019 @ 17:52:52 Author: arojas Revision: 353601 Fix crash in SDDM Breeze theme Added: qt5-declarative/kde-unstable/qtbug-75203.patch Modified: qt5-declarative/kde-unstable/PKGBUILD ---+ PKGBUILD | 11 --- qtbug-75203.patch | 28 2 files changed, 36 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-05-18 17:47:25 UTC (rev 353600) +++ PKGBUILD2019-05-18 17:52:52 UTC (rev 353601) @@ -4,7 +4,7 @@ pkgname=qt5-declarative _qtver=5.13.0-beta3 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/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('cd4d9c562c8a6e434a786fb288e53337f9e7f5d7a12f264ff274272dbc20cb18') +source=("https://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"; +qtbug-75203.patch) +sha256sums=('cd4d9c562c8a6e434a786fb288e53337f9e7f5d7a12f264ff274272dbc20cb18' +'458d8d4e5f2d96b4c1cb78937140ceaf966b57213fdbe84d0df33d5a41508028') prepare() { mkdir -p build + + cd $_pkgfqn + patch -p1 -i ../qtbug-75203.patch # Fix crash in SDDM Breeze theme } build() { Added: qtbug-75203.patch === --- qtbug-75203.patch (rev 0) +++ qtbug-75203.patch 2019-05-18 17:52:52 UTC (rev 353601) @@ -0,0 +1,28 @@ +From ea74f0c68cddf706c950d3910cf7b363fe24885b Mon Sep 17 00:00:00 2001 +From: Ulf Hermann +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 +--- + 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); +
[arch-commits] Commit in qt5-declarative/kde-unstable (PKGBUILD)
Date: Thursday, November 22, 2018 @ 17:17:49 Author: arojas Revision: 340289 Reverse xmlpatterns -> declarative dependency (FS#60889) Modified: qt5-declarative/kde-unstable/PKGBUILD --+ PKGBUILD |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-11-22 16:57:46 UTC (rev 340288) +++ PKGBUILD2018-11-22 17:17:49 UTC (rev 340289) @@ -4,16 +4,15 @@ pkgname=qt5-declarative _qtver=5.12.0-rc pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') pkgdesc='Classes for QML and JavaScript languages' -depends=('qt5-xmlpatterns') +depends=('qt5-base') makedepends=('python') groups=('qt' 'qt5') -conflicts=('qtchooser' 'qt5-declarative-render2d') -replaces=('qt5-declarative-render2d') +conflicts=('qtchooser') _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}" source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) sha256sums=('5aa4278b88eccfe3359a55c7e879e6959ee0aded3edfdb59d24d9adb0e127766')
[arch-commits] Commit in qt5-declarative/kde-unstable (PKGBUILD)
Date: Monday, April 24, 2017 @ 20:31:30 Author: arojas Revision: 294564 Fix Plasma crashes Modified: qt5-declarative/kde-unstable/PKGBUILD --+ PKGBUILD | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-04-24 20:27:08 UTC (rev 294563) +++ PKGBUILD2017-04-24 20:31:30 UTC (rev 294564) @@ -5,7 +5,7 @@ pkgname=qt5-declarative _qtver=5.9.0-beta2 pkgver=${_qtver/-/} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL3' 'FDL' 'custom') @@ -16,8 +16,10 @@ conflicts=('qtchooser' 'qt5-declarative-render2d') replaces=('qt5-declarative-render2d') _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}" -source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz";) -sha256sums=('9f2df211918d49b9dab66c169b90f1b1bc4a9d3096a958cdd5f78832f2da75c5') +source=("http://download.qt.io/development_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"; +https://github.com/qt/qtdeclarative/commit/9538cd7f.patch) +sha256sums=('9f2df211918d49b9dab66c169b90f1b1bc4a9d3096a958cdd5f78832f2da75c5' +'c6a4c96e17fc853854757d5c081e3344a2f932ba40abb0d955b13c6c951d43ff') prepare() { mkdir -p build @@ -24,6 +26,10 @@ # Use python2 for Python 2.x find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g' + + # Fix Plasma crashes + cd ${_pkgfqn} + patch -p1 -i ../9538cd7f.patch } build() {