From 7a0e785aa5512758b73bc49b7a6a6b9a073578825af5e06e04ab0ef191ba6c29 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 19 Feb 2020 10:09:00 +0000 Subject: [PATCH 01/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=1 From 9dbc05bb1e2f230b8034a4cef5a097093df4cb2724258bbddd90e33d090f64bc Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 26 Feb 2020 12:43:14 +0000 Subject: [PATCH 02/10] Qt 5.15 Alpha OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=2 --- libqt5-qtdeclarative.changes | 8 ++++++++ libqt5-qtdeclarative.spec | 13 ++++++++----- qtdeclarative-everywhere-src-5.14.1.tar.xz | 3 --- qtdeclarative-everywhere-src-5.15.0-alpha.tar.xz | 3 +++ 4 files changed, 19 insertions(+), 8 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.14.1.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.15.0-alpha.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 596338d..168f8f3 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 19 10:16:19 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-alpha: + * New feature release + * For more details please see: + https://wiki.qt.io/New_Features_in_Qt_5.15 + ------------------------------------------------------------------- Mon Jan 27 13:14:12 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 0155f50..fe1841d 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -19,17 +19,17 @@ %define qt5_snapshot 0 %define libname libQtQuick5 %define base_name libqt5 -%define real_version 5.14.1 -%define so_version 5.14.1 -%define tar_version qtdeclarative-everywhere-src-5.14.1 +%define real_version 5.15.0-alpha +%define so_version 5.15.0 +%define tar_version qtdeclarative-everywhere-src-5.15.0-alpha Name: libqt5-qtdeclarative -Version: 5.14.1 +Version: 5.15.0~alpha Release: 0 Summary: Qt 5 Declarative Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Libraries/X11 URL: https://www.qt.io -Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz +Source: https://download.qt.io/development_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case Patch100: sse2_nojit.patch @@ -246,8 +246,11 @@ popd %{_libqt5_libdir}/libQt5Q*.so %{_libqt5_libdir}/libQt5*.a %{_libqt5_libdir}/pkgconfig/Qt5Q*.pc +%{_libqt5_libdir}/metatypes/qt5quick*_metatypes.json +%{_libqt5_libdir}/metatypes/qt5qml*_metatypes.json %{_libqt5_archdatadir}/mkspecs/modules/*.pri %{_libqt5_archdatadir}/mkspecs/features/qmlcache.prf +%{_libqt5_archdatadir}/mkspecs/features/qmltypes.prf %{_libqt5_archdatadir}/mkspecs/features/qtquickcompiler.prf %{_libqt5_archdatadir}/qml/QtTest diff --git a/qtdeclarative-everywhere-src-5.14.1.tar.xz b/qtdeclarative-everywhere-src-5.14.1.tar.xz deleted file mode 100644 index 15c6d45..0000000 --- a/qtdeclarative-everywhere-src-5.14.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a -size 21299728 diff --git a/qtdeclarative-everywhere-src-5.15.0-alpha.tar.xz b/qtdeclarative-everywhere-src-5.15.0-alpha.tar.xz new file mode 100644 index 0000000..071e461 --- /dev/null +++ b/qtdeclarative-everywhere-src-5.15.0-alpha.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1de74f8203ab3d1d8d0d1913078ce28d3df91db81df61d490cbb226743c73d16 +size 21467284 From 42ae622023a8a315cef696e5842de2ad773a4e174b1bdd76d5ffa6cca9d15f28 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 1 Mar 2020 08:57:56 +0000 Subject: [PATCH 03/10] Qt 5.15 Beta 1 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=3 --- libqt5-qtdeclarative.changes | 7 +++++++ libqt5-qtdeclarative.spec | 6 +++--- qtdeclarative-everywhere-src-5.15.0-alpha.tar.xz | 3 --- qtdeclarative-everywhere-src-5.15.0-beta1.tar.xz | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.15.0-alpha.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.15.0-beta1.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 168f8f3..db388f7 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 28 09:58:46 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-beta1: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Wed Feb 19 10:16:19 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index fe1841d..e75bb94 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -19,11 +19,11 @@ %define qt5_snapshot 0 %define libname libQtQuick5 %define base_name libqt5 -%define real_version 5.15.0-alpha +%define real_version 5.15.0-beta1 %define so_version 5.15.0 -%define tar_version qtdeclarative-everywhere-src-5.15.0-alpha +%define tar_version qtdeclarative-everywhere-src-5.15.0-beta1 Name: libqt5-qtdeclarative -Version: 5.15.0~alpha +Version: 5.15.0~beta1 Release: 0 Summary: Qt 5 Declarative Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) diff --git a/qtdeclarative-everywhere-src-5.15.0-alpha.tar.xz b/qtdeclarative-everywhere-src-5.15.0-alpha.tar.xz deleted file mode 100644 index 071e461..0000000 --- a/qtdeclarative-everywhere-src-5.15.0-alpha.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1de74f8203ab3d1d8d0d1913078ce28d3df91db81df61d490cbb226743c73d16 -size 21467284 diff --git a/qtdeclarative-everywhere-src-5.15.0-beta1.tar.xz b/qtdeclarative-everywhere-src-5.15.0-beta1.tar.xz new file mode 100644 index 0000000..25f81b1 --- /dev/null +++ b/qtdeclarative-everywhere-src-5.15.0-beta1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54aeb6278a9c55420c7358c8645cb8cfc1ae2623ed5a91ea94bdd41b8cf16f86 +size 21480744 From 65972a7509c6c1ae68145dc79d9723d9e3335c561e7ac129c19fcb1f5d0d1ae5 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 25 Mar 2020 07:19:57 +0000 Subject: [PATCH 04/10] Qt 5.15 Beta 2 - untested, as usual OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=4 --- libqt5-qtdeclarative.changes | 7 +++++++ libqt5-qtdeclarative.spec | 6 +++--- qtdeclarative-everywhere-src-5.15.0-beta1.tar.xz | 3 --- qtdeclarative-everywhere-src-5.15.0-beta2.tar.xz | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.15.0-beta1.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.15.0-beta2.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index db388f7..4a2b5ad 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Mar 24 12:13:33 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-beta2: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Fri Feb 28 09:58:46 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index e75bb94..882ab06 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -19,11 +19,11 @@ %define qt5_snapshot 0 %define libname libQtQuick5 %define base_name libqt5 -%define real_version 5.15.0-beta1 +%define real_version 5.15.0-beta2 %define so_version 5.15.0 -%define tar_version qtdeclarative-everywhere-src-5.15.0-beta1 +%define tar_version qtdeclarative-everywhere-src-5.15.0-beta2 Name: libqt5-qtdeclarative -Version: 5.15.0~beta1 +Version: 5.15.0~beta2 Release: 0 Summary: Qt 5 Declarative Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) diff --git a/qtdeclarative-everywhere-src-5.15.0-beta1.tar.xz b/qtdeclarative-everywhere-src-5.15.0-beta1.tar.xz deleted file mode 100644 index 25f81b1..0000000 --- a/qtdeclarative-everywhere-src-5.15.0-beta1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54aeb6278a9c55420c7358c8645cb8cfc1ae2623ed5a91ea94bdd41b8cf16f86 -size 21480744 diff --git a/qtdeclarative-everywhere-src-5.15.0-beta2.tar.xz b/qtdeclarative-everywhere-src-5.15.0-beta2.tar.xz new file mode 100644 index 0000000..e1bb153 --- /dev/null +++ b/qtdeclarative-everywhere-src-5.15.0-beta2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9967831ab178f118ffd2c7ed8846559360a011cd07704ac62475038aba638be2 +size 21483084 From ec982b817d4c27962d5a7811ddb898110f289bb8e7c445d33adae7025ae8607c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 15 Apr 2020 08:52:23 +0000 Subject: [PATCH 05/10] Qt 5.15.0 Beta 3 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=5 --- libqt5-qtdeclarative.changes | 7 +++++++ libqt5-qtdeclarative.spec | 6 +++--- qtdeclarative-everywhere-src-5.15.0-beta2.tar.xz | 3 --- qtdeclarative-everywhere-src-5.15.0-beta3.tar.xz | 3 +++ 4 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.15.0-beta2.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.15.0-beta3.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 4a2b5ad..5cf0cc4 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 14 06:47:24 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-beta3: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Tue Mar 24 12:13:33 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 882ab06..c62bf8d 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -19,11 +19,11 @@ %define qt5_snapshot 0 %define libname libQtQuick5 %define base_name libqt5 -%define real_version 5.15.0-beta2 +%define real_version 5.15.0-beta3 %define so_version 5.15.0 -%define tar_version qtdeclarative-everywhere-src-5.15.0-beta2 +%define tar_version qtdeclarative-everywhere-src-5.15.0-beta3 Name: libqt5-qtdeclarative -Version: 5.15.0~beta2 +Version: 5.15.0~beta3 Release: 0 Summary: Qt 5 Declarative Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) diff --git a/qtdeclarative-everywhere-src-5.15.0-beta2.tar.xz b/qtdeclarative-everywhere-src-5.15.0-beta2.tar.xz deleted file mode 100644 index e1bb153..0000000 --- a/qtdeclarative-everywhere-src-5.15.0-beta2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9967831ab178f118ffd2c7ed8846559360a011cd07704ac62475038aba638be2 -size 21483084 diff --git a/qtdeclarative-everywhere-src-5.15.0-beta3.tar.xz b/qtdeclarative-everywhere-src-5.15.0-beta3.tar.xz new file mode 100644 index 0000000..a712075 --- /dev/null +++ b/qtdeclarative-everywhere-src-5.15.0-beta3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95accbf0543f75b9d3527f014144663fc101534346ae74ea83fa56331a35b640 +size 21490700 From 0aa1d82e665d468f07d4bd08783dc327f6b7f1518a7b3b3dad1a3fbbdfd5353c Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 25 Apr 2020 19:51:51 +0000 Subject: [PATCH 06/10] Qt 5.15.0 Beta 4 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=6 --- libqt5-qtdeclarative.changes | 7 +++++++ libqt5-qtdeclarative.spec | 8 +++++--- qtdeclarative-everywhere-src-5.15.0-beta3.tar.xz | 3 --- qtdeclarative-everywhere-src-5.15.0-beta4.tar.xz | 3 +++ 4 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.15.0-beta3.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.15.0-beta4.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 5cf0cc4..24cdaae 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 24 07:11:08 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-beta4: + * New bugfix release + * No changelog available + ------------------------------------------------------------------- Tue Apr 14 06:47:24 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index c62bf8d..fe8bcbb 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -19,11 +19,11 @@ %define qt5_snapshot 0 %define libname libQtQuick5 %define base_name libqt5 -%define real_version 5.15.0-beta3 +%define real_version 5.15.0-beta4 %define so_version 5.15.0 -%define tar_version qtdeclarative-everywhere-src-5.15.0-beta3 +%define tar_version qtdeclarative-everywhere-src-5.15.0-beta4 Name: libqt5-qtdeclarative -Version: 5.15.0~beta3 +Version: 5.15.0~beta4 Release: 0 Summary: Qt 5 Declarative Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) @@ -226,6 +226,8 @@ popd %{_libqt5_archdatadir}/qml/Qt/labs/sharedimage/ %{_libqt5_archdatadir}/qml/Qt/labs/qmlmodels/ %{_libqt5_archdatadir}/qml/Qt/labs/wavefrontmesh/ +%dir %{_libqt5_archdatadir}/qml/Qt/test +%{_libqt5_archdatadir}/qml/Qt/test/qtestroot/ %{_libqt5_plugindir}/qmltooling %files private-headers-devel diff --git a/qtdeclarative-everywhere-src-5.15.0-beta3.tar.xz b/qtdeclarative-everywhere-src-5.15.0-beta3.tar.xz deleted file mode 100644 index a712075..0000000 --- a/qtdeclarative-everywhere-src-5.15.0-beta3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95accbf0543f75b9d3527f014144663fc101534346ae74ea83fa56331a35b640 -size 21490700 diff --git a/qtdeclarative-everywhere-src-5.15.0-beta4.tar.xz b/qtdeclarative-everywhere-src-5.15.0-beta4.tar.xz new file mode 100644 index 0000000..4355b0b --- /dev/null +++ b/qtdeclarative-everywhere-src-5.15.0-beta4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7cd7a3090e2df9907dc9a9c8798bf1968144575fe3dd11061bd93b40da73998 +size 21488884 From 6243d3142db5d7dd6c705bcd2e3a748d9c24bc27988094887466cd6d4d5a3ee2 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 5 May 2020 12:43:03 +0000 Subject: [PATCH 07/10] Accepting request 800355 from home:Vogtinator:qt5.15 - Add patch to fix kerning with certain labels (QTBUG-49646): * fix-subpixel-positioned-text.patch OBS-URL: https://build.opensuse.org/request/show/800355 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=7 --- fix-subpixel-positioned-text.patch | 59 ++++++++++++++++++++++++++++++ libqt5-qtdeclarative.changes | 6 +++ libqt5-qtdeclarative.spec | 2 + 3 files changed, 67 insertions(+) create mode 100644 fix-subpixel-positioned-text.patch diff --git a/fix-subpixel-positioned-text.patch b/fix-subpixel-positioned-text.patch new file mode 100644 index 0000000..b3f2bed --- /dev/null +++ b/fix-subpixel-positioned-text.patch @@ -0,0 +1,59 @@ +From 40ba29cae5cdb2ebd6330870a0f15e2e75d40de0 Mon Sep 17 00:00:00 2001 +From: Eskil Abrahamsen Blomfeldt +Date: Tue, 05 May 2020 11:36:24 +0200 +Subject: [PATCH] Fix subpixel positioned text with Text.NativeRendering + +We would be generating subpixel positioned glyphs based on the +relative positions of the glyphs, ignoring the fractional part +contributed by the origin of the text. So if the text origin was +inside a pixel, the subpixel antialiasing would be wrong and we +would see kerning errors. + +This was especially visible when using AlignHCenter on text +with hinting disabled and resizing the item it was aligning to. + +Pick-to: 5.15 +Task-number: QTBUG-49646 +Change-Id: I0e709ba2b5d2440e34c94c6f819befe0a65a113a +--- + +diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp +index be6ef25..831586c 100644 +--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp ++++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp +@@ -789,11 +789,12 @@ + const QMargins &margins) + { + Q_ASSERT(m_font.isValid()); ++ QPointF position(p.x(), p.y() - m_font.ascent()); + QVector fixedPointPositions; + const int glyphPositionsSize = glyphPositions.size(); + fixedPointPositions.reserve(glyphPositionsSize); + for (int i=0; i < glyphPositionsSize; ++i) +- fixedPointPositions.append(QFixedPoint::fromPointF(glyphPositions.at(i))); ++ fixedPointPositions.append(QFixedPoint::fromPointF(position + glyphPositions.at(i))); + + QTextureGlyphCache *cache = glyphCache(); + +@@ -815,18 +816,16 @@ + Q_ASSERT(geometry->sizeOfVertex() == sizeof(QVector4D)); + ushort *ip = geometry->indexDataAsUShort(); + +- QPointF position(p.x(), p.y() - m_font.ascent()); + bool supportsSubPixelPositions = fontD->fontEngine->supportsSubPixelPositions(); + for (int i=0; ifontEngine->subPixelPositionForX(QFixed::fromReal(glyphPositions.at(i).x())); ++ subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPosition.x())); + + QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition); + const QTextureGlyphCache::Coord &c = cache->coords.value(glyph); + +- QPointF glyphPosition = glyphPositions.at(i) + position; +- + // On a retina screen the glyph positions are not pre-scaled (as opposed to + // eg. the raster paint engine). To ensure that we get the same behavior as + // the raster engine (and CoreText itself) when it comes to rounding of the + diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 24cdaae..98587fb 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 5 11:16:16 UTC 2020 - Fabian Vogt + +- Add patch to fix kerning with certain labels (QTBUG-49646): + * fix-subpixel-positioned-text.patch + ------------------------------------------------------------------- Fri Apr 24 07:11:08 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index fe8bcbb..01486b2 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -31,6 +31,8 @@ Group: Development/Libraries/X11 URL: https://www.qt.io Source: https://download.qt.io/development_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM https://codereview.qt-project.org/c/qt/qtdeclarative/+/299258/1 +Patch1: fix-subpixel-positioned-text.patch # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case Patch100: sse2_nojit.patch # PATCH-FIX-OPENSUSE Switch to use python3 at build time From 377c22e9dcb5a0402f9855d76ce2612ae6f4c10ee494ce60a63feef72c1182ef Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 9 May 2020 06:33:23 +0000 Subject: [PATCH 08/10] Qt 5.15.0 RC OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=8 --- libqt5-qtdeclarative.changes | 8 ++++++++ libqt5-qtdeclarative.spec | 6 +++--- qtdeclarative-everywhere-src-5.15.0-beta4.tar.xz | 3 --- qtdeclarative-everywhere-src-5.15.0-rc.tar.xz | 3 +++ 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.15.0-beta4.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.15.0-rc.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index 98587fb..c13e4a6 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed May 6 11:26:52 UTC 2020 - Fabian Vogt + +- Update to 5.15.0-rc: + * New bugfix release + * For the changes between 5.14.2 and 5.15.0 please see: + http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.15.0/?h=5.15.0 + ------------------------------------------------------------------- Tue May 5 11:16:16 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 01486b2..4f6096f 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -19,11 +19,11 @@ %define qt5_snapshot 0 %define libname libQtQuick5 %define base_name libqt5 -%define real_version 5.15.0-beta4 +%define real_version 5.15.0-rc %define so_version 5.15.0 -%define tar_version qtdeclarative-everywhere-src-5.15.0-beta4 +%define tar_version qtdeclarative-everywhere-src-5.15.0-rc Name: libqt5-qtdeclarative -Version: 5.15.0~beta4 +Version: 5.15.0~rc Release: 0 Summary: Qt 5 Declarative Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) diff --git a/qtdeclarative-everywhere-src-5.15.0-beta4.tar.xz b/qtdeclarative-everywhere-src-5.15.0-beta4.tar.xz deleted file mode 100644 index 4355b0b..0000000 --- a/qtdeclarative-everywhere-src-5.15.0-beta4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7cd7a3090e2df9907dc9a9c8798bf1968144575fe3dd11061bd93b40da73998 -size 21488884 diff --git a/qtdeclarative-everywhere-src-5.15.0-rc.tar.xz b/qtdeclarative-everywhere-src-5.15.0-rc.tar.xz new file mode 100644 index 0000000..31598f2 --- /dev/null +++ b/qtdeclarative-everywhere-src-5.15.0-rc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24cfd261954b309cf362e16301362ad6b489c10646a7c7a1d260423234a81dfb +size 21493252 From 3b24c0a149e69a1e07b965857662286bc69624fd2189599e06e7e9b41958e0e6 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 22 May 2020 13:54:07 +0000 Subject: [PATCH 09/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=9 --- libqt5-qtdeclarative.changes | 6 ++++++ libqt5-qtdeclarative.spec | 6 +++--- qtdeclarative-everywhere-src-5.15.0-rc.tar.xz | 3 --- qtdeclarative-everywhere-src-5.15.0-rc2.tar.xz | 3 +++ 4 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 qtdeclarative-everywhere-src-5.15.0-rc.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.15.0-rc2.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index c13e4a6..a42db16 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 20 16:14:29 UTC 2020 - Callum Farmer + +- Update to 5.15.0-rc2: + * No changelog available + ------------------------------------------------------------------- Wed May 6 11:26:52 UTC 2020 - Fabian Vogt diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 4f6096f..8e07b65 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -19,11 +19,11 @@ %define qt5_snapshot 0 %define libname libQtQuick5 %define base_name libqt5 -%define real_version 5.15.0-rc +%define real_version 5.15.0-rc2 %define so_version 5.15.0 -%define tar_version qtdeclarative-everywhere-src-5.15.0-rc +%define tar_version qtdeclarative-everywhere-src-5.15.0-rc2 Name: libqt5-qtdeclarative -Version: 5.15.0~rc +Version: 5.15.0~rc2 Release: 0 Summary: Qt 5 Declarative Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) diff --git a/qtdeclarative-everywhere-src-5.15.0-rc.tar.xz b/qtdeclarative-everywhere-src-5.15.0-rc.tar.xz deleted file mode 100644 index 31598f2..0000000 --- a/qtdeclarative-everywhere-src-5.15.0-rc.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24cfd261954b309cf362e16301362ad6b489c10646a7c7a1d260423234a81dfb -size 21493252 diff --git a/qtdeclarative-everywhere-src-5.15.0-rc2.tar.xz b/qtdeclarative-everywhere-src-5.15.0-rc2.tar.xz new file mode 100644 index 0000000..ad8502a --- /dev/null +++ b/qtdeclarative-everywhere-src-5.15.0-rc2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dd0e36cbc98f43f12b55749fb6ef0310c66ed7d885d1c08f40967eb9614fb7c +size 21493748 From 71a9998ad0bac994418c837efcf753278aceb5db04d830372f0d5dc312d7be46 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 27 May 2020 08:38:44 +0000 Subject: [PATCH 10/10] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtdeclarative?expand=0&rev=10 --- libqt5-qtdeclarative.changes | 7 + libqt5-qtdeclarative.spec | 11 +- qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch | 336 ++++++++++++++++++ ...clarative-everywhere-src-5.15.0-rc2.tar.xz | 3 - qtdeclarative-everywhere-src-5.15.0.tar.xz | 3 + 5 files changed, 352 insertions(+), 8 deletions(-) create mode 100644 qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch delete mode 100644 qtdeclarative-everywhere-src-5.15.0-rc2.tar.xz create mode 100644 qtdeclarative-everywhere-src-5.15.0.tar.xz diff --git a/libqt5-qtdeclarative.changes b/libqt5-qtdeclarative.changes index a42db16..58f2118 100644 --- a/libqt5-qtdeclarative.changes +++ b/libqt5-qtdeclarative.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue May 26 09:50:22 UTC 2020 - Callum Farmer + +- Update to version 5.15.0: + * No changelog available + * Added qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch: fixes QTBUG-83890 + ------------------------------------------------------------------- Wed May 20 16:14:29 UTC 2020 - Callum Farmer diff --git a/libqt5-qtdeclarative.spec b/libqt5-qtdeclarative.spec index 8e07b65..94b32b1 100644 --- a/libqt5-qtdeclarative.spec +++ b/libqt5-qtdeclarative.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qtdeclarative # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,17 +19,17 @@ %define qt5_snapshot 0 %define libname libQtQuick5 %define base_name libqt5 -%define real_version 5.15.0-rc2 +%define real_version 5.15.0 %define so_version 5.15.0 -%define tar_version qtdeclarative-everywhere-src-5.15.0-rc2 +%define tar_version qtdeclarative-everywhere-src-5.15.0 Name: libqt5-qtdeclarative -Version: 5.15.0~rc2 +Version: 5.15.0 Release: 0 Summary: Qt 5 Declarative Library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Libraries/X11 URL: https://www.qt.io -Source: https://download.qt.io/development_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz +Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz Source1: baselibs.conf # PATCH-FIX-UPSTREAM https://codereview.qt-project.org/c/qt/qtdeclarative/+/299258/1 Patch1: fix-subpixel-positioned-text.patch @@ -37,6 +37,7 @@ Patch1: fix-subpixel-positioned-text.patch Patch100: sse2_nojit.patch # PATCH-FIX-OPENSUSE Switch to use python3 at build time Patch102: qtdeclarative-switch-to-python3.patch +Patch103: qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch BuildRequires: fdupes BuildRequires: libQt5Core-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version} diff --git a/qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch b/qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch new file mode 100644 index 0000000..7d8e743 --- /dev/null +++ b/qtdeclarative-5.15.0-FixMaxXMaxYExtent.patch @@ -0,0 +1,336 @@ +Parent: f5a4e984 (QQuickTextInputPrivate: refactor getImplicitWidth() to calculateImplicitWidth()) +Author: David Redondo +AuthorDate: 2020-05-13 11:04:23 +0200 +Commit: Mitch Curtis +CommitDate: 2020-05-25 10:58:35 +0200 + +QQuickItemView: Fix max(X/Y)Extent() + +QQuickFlickable maxXExtent() and maxYExtent() return the amount of space +that is not shown when inside a ScrollView. QQuickItemView however just +returned width() if vertical and height() if horizontal. In these cases +just defer to the QQuickFlickable base implementation like minXExtent() +and minYExtent() already do. + +This change also adds tst_qquicklistview2 to speed up development. +tst_QQuickListView is almost 9000 lines long, and compiling it +is slow. In addition, a similar approach (creating a second test to +avoid the slowness of a massive one) already exists for QQuickItem +tests. + +Fixes: QTBUG-83890 +Pick-to: 5.15 +Change-Id: I7f4060c2f46ae07611bedceca0d322c5f7f6affb +======================================================================================================================== +--- a/src/quick/items/qquickitemview.cpp ++++ b/src/quick/items/qquickitemview.cpp +@@ -1393,7 +1393,7 @@ + { + Q_D(const QQuickItemView); + if (d->layoutOrientation() == Qt::Horizontal) +- return height(); ++ return QQuickFlickable::maxYExtent(); + + if (d->vData.maxExtentDirty) { + d->maxExtent = d->maxExtentForAxis(d->vData, false); +@@ -1421,7 +1421,7 @@ + { + Q_D(const QQuickItemView); + if (d->layoutOrientation() == Qt::Vertical) +- return width(); ++ return QQuickFlickable::maxXExtent(); + + if (d->hData.maxExtentDirty) { + d->maxExtent = d->maxExtentForAxis(d->hData, true); + +--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp ++++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +@@ -73,6 +73,8 @@ + tst_QQuickListView(); + + private slots: ++ // WARNING: please add new tests to tst_qquicklistview2; this file is too slow to work with. ++ + void init(); + void cleanupTestCase(); + // Test QAbstractItemModel model types +@@ -297,6 +299,8 @@ + + void requiredObjectListModel(); + ++ // WARNING: please add new tests to tst_qquicklistview2; this file is too slow to work with. ++ + private: + template void items(const QUrl &source); + template void changed(const QUrl &source); +@@ -10042,6 +10046,8 @@ + } + } + ++// WARNING: please add new tests to tst_qquicklistview2; this file is too slow to work with. ++ + QTEST_MAIN(tst_QQuickListView) + + #include "tst_qquicklistview.moc" + +--- a/tests/auto/quick/qquicklistview2/data/maxXExtent.qml ++++ b/tests/auto/quick/qquicklistview2/data/maxXExtent.qml +@@ -0,0 +1,54 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2020 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3 as published by the Free Software ++** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++import QtQuick 2.15 ++ ++Item { ++ property alias view: view ++ ++ ListView { ++ id: view ++ model: 10 ++ width: 200 ++ height: 200 ++ ++ Rectangle { ++ anchors.fill: parent ++ color: "transparent" ++ border.color: "darkorange" ++ } ++ ++ delegate: Rectangle { ++ width: 100 ++ height: 100 ++ Text { ++ text: modelData ++ } ++ } ++ } ++} + +--- a/tests/auto/quick/qquicklistview2/data/maxYExtent.qml ++++ b/tests/auto/quick/qquicklistview2/data/maxYExtent.qml +@@ -0,0 +1,55 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2020 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3 as published by the Free Software ++** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++import QtQuick 2.15 ++ ++Item { ++ property alias view: view ++ ++ ListView { ++ id: view ++ model: 10 ++ width: 200 ++ height: 200 ++ orientation: ListView.Horizontal ++ ++ Rectangle { ++ anchors.fill: parent ++ color: "transparent" ++ border.color: "darkorange" ++ } ++ ++ delegate: Rectangle { ++ width: 100 ++ height: 100 ++ Text { ++ text: modelData ++ } ++ } ++ } ++} + +--- a/tests/auto/quick/qquicklistview2/qquicklistview2.pro ++++ b/tests/auto/quick/qquicklistview2/qquicklistview2.pro +@@ -0,0 +1,12 @@ ++CONFIG += testcase ++TARGET = tst_qquicklistview2 ++macos:CONFIG -= app_bundle ++ ++SOURCES += tst_qquicklistview2.cpp ++ ++include (../../shared/util.pri) ++include (../shared/util.pri) ++ ++TESTDATA = data/* ++ ++QT += core-private gui-private qml-private quick-private testlib qmltest + +--- a/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp ++++ b/tests/auto/quick/qquicklistview2/tst_qquicklistview2.cpp +@@ -0,0 +1,114 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2020 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the test suite of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3 as published by the Free Software ++** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "../../shared/util.h" ++#include "../shared/viewtestutil.h" ++ ++using namespace QQuickViewTestUtil; ++ ++class tst_QQuickListView2 : public QQmlDataTest ++{ ++ Q_OBJECT ++ ++public: ++ tst_QQuickListView2(); ++ ++private slots: ++ void maxExtent_data(); ++ void maxExtent(); ++}; ++ ++tst_QQuickListView2::tst_QQuickListView2() ++{ ++} ++ ++class FriendlyItemView : public QQuickItemView ++{ ++ friend class ItemViewAccessor; ++}; ++ ++class ItemViewAccessor ++{ ++public: ++ ItemViewAccessor(QQuickItemView *itemView) : ++ mItemView(reinterpret_cast(itemView)) ++ { ++ } ++ ++ qreal maxXExtent() const ++ { ++ return mItemView->maxXExtent(); ++ } ++ ++ qreal maxYExtent() const ++ { ++ return mItemView->maxYExtent(); ++ } ++ ++private: ++ FriendlyItemView *mItemView = nullptr; ++}; ++ ++void tst_QQuickListView2::maxExtent_data() ++{ ++ QTest::addColumn("qmlFilePath"); ++ ++ QTest::addRow("maxXExtent") << "maxXExtent.qml"; ++ QTest::addRow("maxYExtent") << "maxYExtent.qml"; ++} ++ ++void tst_QQuickListView2::maxExtent() ++{ ++ QFETCH(QString, qmlFilePath); ++ ++ QScopedPointer window(createView()); ++ QVERIFY(window); ++ window->setSource(testFileUrl(qmlFilePath)); ++ QVERIFY2(window->status() == QQuickView::Ready, qPrintable(QDebug::toString(window->errors()))); ++ window->resize(640, 480); ++ window->show(); ++ QVERIFY(QTest::qWaitForWindowExposed(window.data())); ++ ++ QQuickListView *view = window->rootObject()->property("view").value(); ++ QVERIFY(view); ++ ItemViewAccessor viewAccessor(view); ++ if (view->orientation() == QQuickListView::Vertical) ++ QCOMPARE(viewAccessor.maxXExtent(), 0); ++ else if (view->orientation() == QQuickListView::Horizontal) ++ QCOMPARE(viewAccessor.maxYExtent(), 0); ++} ++ ++QTEST_MAIN(tst_QQuickListView2) ++ ++#include "tst_qquicklistview2.moc" + +--- a/tests/auto/quick/quick.pro ++++ b/tests/auto/quick/quick.pro +@@ -65,6 +65,7 @@ + qquickitem2 \ + qquickitemlayer \ + qquicklistview \ ++ qquicklistview2 \ + qquicktableview \ + qquickloader \ + qquickmousearea \ diff --git a/qtdeclarative-everywhere-src-5.15.0-rc2.tar.xz b/qtdeclarative-everywhere-src-5.15.0-rc2.tar.xz deleted file mode 100644 index ad8502a..0000000 --- a/qtdeclarative-everywhere-src-5.15.0-rc2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6dd0e36cbc98f43f12b55749fb6ef0310c66ed7d885d1c08f40967eb9614fb7c -size 21493748 diff --git a/qtdeclarative-everywhere-src-5.15.0.tar.xz b/qtdeclarative-everywhere-src-5.15.0.tar.xz new file mode 100644 index 0000000..eda446e --- /dev/null +++ b/qtdeclarative-everywhere-src-5.15.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699 +size 21493268