[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdeclarative/files/

[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdeclarative/files/

[Andreas Sturmlechner]

commit:     aefade7ae0d3be5b6c432a7e6edef20d896ff3e9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  6 22:21:40 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr  6 22:24:50 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=aefade7a

dev-qt/qtdeclarative: Fix double inclusion of CMake plugin targets

See also: https://bugreports.qt.io/browse/QTBUG-83282

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...15.0_beta3-cmake-targets-double-inclusion.patch | 44 ++++++++++++++++++++++
 .../qtdeclarative-5.15.0_beta3.ebuild              |  2 +
 2 files changed, 46 insertions(+)

diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.0_beta3-cmake-targets-double-inclusion.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.0_beta3-cmake-targets-double-inclusion.patch
new file mode 100644
index 00000000..1abf58a9
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.0_beta3-cmake-targets-double-inclusion.patch
@@ -0,0 +1,44 @@
+From 1a2ab822fa24733f83d6720d2af8498ecbd5cbda Mon Sep 17 00:00:00 2001
+From: Alexandru Croitor <alexandru.croitor@qt.io>
+Date: Fri, 3 Apr 2020 10:04:04 +0200
+Subject: [PATCH] CMake: Fix double inclusion of CMake plugin targets
+
+After 99ace38d22c640e37bb1a41095ee3b126169816a, all plugin files are
+included automatically, not only the ones ending in Plugin.cmake.
+
+Thus the extra inclusion done by the QmlConfigExtras file should only
+be done if strict mode is set.
+
+This fixes errors of the following type when doing find_package(Qt5Qml)
+
+add_library cannot create imported target
+  "Qt5::QTcpServerConnectionFactory" because another target with the same
+  name already exists.
+
+Amends 99ace38d22c640e37bb1a41095ee3b126169816a
+Amends 2f2dd3b0c28db210ea1f00d569f6c1626894c5f4
+
+Task-number: QTBUG-83282
+Change-Id: I205036092bff9925aa95472f0aa6a212f0372227
+Reviewed-by: Kai Koehne <kai.koehne@qt.io>
+Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
+---
+ src/qml/Qt5QmlConfigExtras.cmake.in | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/qml/Qt5QmlConfigExtras.cmake.in b/src/qml/Qt5QmlConfigExtras.cmake.in
+index 9ddb9885cd..4242143bca 100644
+--- a/src/qml/Qt5QmlConfigExtras.cmake.in
++++ b/src/qml/Qt5QmlConfigExtras.cmake.in
+@@ -1,5 +1,7 @@
+-file(GLOB _qt5qml_other_plugins "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_*Factory.cmake")
++if(QT5_STRICT_PLUGIN_GLOB OR Qt5Qml_STRICT_PLUGIN_GLOB)
++    file(GLOB _qt5qml_other_plugins "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_*Factory.cmake")
+ 
+-foreach(_other_plugin ${_qt5qml_other_plugins})
+-    include(${_other_plugin} OPTIONAL)
+-endforeach()
++    foreach(_other_plugin ${_qt5qml_other_plugins})
++        include(${_other_plugin} OPTIONAL)
++    endforeach()
++endif()

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.0_beta3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.0_beta3.ebuild
index 5e576bf9..11037c81 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.0_beta3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.0_beta3.ebuild
@@ -27,6 +27,8 @@ RDEPEND="${DEPEND}
 	!<dev-qt/qtquickcontrols-5.7:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-cmake-targets-double-inclusion.patch" ) # QTBUG-83282
+
 src_prepare() {
 	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
 

[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdeclarative/files/

[Andreas Sturmlechner]

commit:     94bf4289184ee4f99674091abe08ec9f072dccb3
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 22:32:05 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 24 22:32:05 2020 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=94bf4289

dev-qt/qtdeclarative: Backport fixes from 5.15.1

- Fix subpixel positioned text
  QTBUG: https://bugreports.qt.io/browse/QTBUG-49646

- QQuickItemView: Fix max(X/Y)Extent()
  KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=419514
  QTBUG: https://bugreports.qt.io/browse/QTBUG-83890

Bug: https://bugs.gentoo.org/716992
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...ve-5.14.2-QQuickItemView-fix-maxXY-extent.patch | 42 ++++++++++++++
 ...ative-5.14.2-fix-subpixel-positioned-text.patch | 64 ++++++++++++++++++++++
 .../qtdeclarative/qtdeclarative-5.15.0_rc2.ebuild  |  5 ++
 3 files changed, 111 insertions(+)

diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch
new file mode 100644
index 00000000..c9ccb211
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch
@@ -0,0 +1,42 @@
+From cc5387ad22ca503d167fd66e2429107d45b937af Mon Sep 17 00:00:00 2001
+From: David Redondo <qt@david-redondo.de>
+Date: Wed, 13 May 2020 11:04:23 +0200
+Subject: [PATCH] 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.
+
+Fixes: QTBUG-83890
+Pick-to: 5.15
+Change-Id: I7f4060c2f46ae07611bedceca0d322c5f7f6affb
+---
+ src/quick/items/qquickitemview.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
+index 7fb392233e4..ab130ac6857 100644
+--- a/src/quick/items/qquickitemview.cpp
++++ b/src/quick/items/qquickitemview.cpp
+@@ -1393,7 +1393,7 @@ qreal QQuickItemView::maxYExtent() const
+ {
+     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 @@ qreal QQuickItemView::maxXExtent() const
+ {
+     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);
+-- 
+2.16.3

diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch
new file mode 100644
index 00000000..23eaa7d5
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch
@@ -0,0 +1,64 @@
+From e807f9d1d80559b8ff91f1c3cfdd755b3da56a6d Mon Sep 17 00:00:00 2001
+From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
+Date: Tue, 5 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
+Reviewed-by: Lars Knoll <lars.knoll@qt.io>
+Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
+---
+ src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+index cfa645bfd03..f73b64f537f 100644
+--- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
++++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
+@@ -789,11 +789,12 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
+                                    const QMargins &margins)
+ {
+     Q_ASSERT(m_font.isValid());
++    QPointF position(p.x(), p.y() - m_font.ascent());
+     QVector<QFixedPoint> 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 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
+     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; i<glyphIndexes.size(); ++i) {
++         QPointF glyphPosition = glyphPositions.at(i) + position;
+          QFixed subPixelPosition;
+          if (supportsSubPixelPositions)
+-             subPixelPosition = fontD->fontEngine->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
+-- 
+2.16.3

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.0_rc2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.0_rc2.ebuild
index 5e3c49a6..ffc90aff 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.0_rc2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.0_rc2.ebuild
@@ -27,6 +27,11 @@ RDEPEND="${DEPEND}
 	!<dev-qt/qtquickcontrols-5.7:5
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
+	"${FILESDIR}/${PN}-5.14.2-fix-subpixel-positioned-text.patch" # QTBUG-49646
+)
+
 src_prepare() {
 	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
 

[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdeclarative/files/

[Andreas Sturmlechner]

commit:     d841a158e7300cdacdf53c8e79c1fe368d36f7d5
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 15:18:56 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 18:33:01 2021 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=d841a158

dev-qt/qtdeclarative: riscv: fix missing atomic library

this will workaroud the error when build in ARCH=riscv,
tested with gcc-11

A likely better fix is to have qtcore detect the need for -latomic
at configure time and, if needed, link to it

Bug: https://bugs.gentoo.org/790689
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/qtdeclarative-5.15.2-riscv-atomic.patch            | 12 ++++++++++++
 dev-qt/qtdeclarative/qtdeclarative-5.15.9999.ebuild          |  1 +
 2 files changed, 13 insertions(+)

diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
new file mode 100644
index 00000000..a619f3db
--- /dev/null
+++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
@@ -0,0 +1,12 @@
+diff --git a/src/qml/qml.pro b/src/qml/qml.pro
+index 7d5a92a..01f3b79 100644
+--- a/src/qml/qml.pro
++++ b/src/qml/qml.pro
+@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+ 
+ # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT.
+ gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks
++gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic
+ 
+ DEFINES += QT_NO_FOREACH
+

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.9999.ebuild
index 47330e36..4b9b9920 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.9999.ebuild
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
+	"${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689
 )
 
 src_prepare() {

[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/, dev-qt/qtdeclarative/files/

[Andreas Sturmlechner]

commit:     56cf1c25f6c7c35a06adb2751cd8427640143d4e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 13:16:21 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 09:31:04 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=56cf1c25

dev-qt/qtdeclarative: Fix IUSE=jit by using qml-jit feature switch

Closes: https://bugs.gentoo.org/551318
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/qtdeclarative-5.4.2-disable-jit.patch        | 18 ------------------
 dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild  |  3 +--
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch
deleted file mode 100644
index 7799ef71..00000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
-index 4b08194..224ddb1 100644
---- a/src/qml/jsruntime/qv4global_p.h
-+++ b/src/qml/jsruntime/qv4global_p.h
-@@ -96,8 +96,13 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
- #    undef V4_ENABLE_JIT
- #endif
- #endif
- 
-+// Gentoo note: disable the JIT due to USE="-jit"
-+#ifdef V4_ENABLE_JIT
-+#undef V4_ENABLE_JIT
-+#endif
-+
- // Do certain things depending on whether the JIT is enabled or disabled
- 
- #ifdef V4_ENABLE_JIT
- #define ENABLE_YARR_JIT 1

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild
index 31bdbbb8..de20d2dc 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3.9999.ebuild
@@ -33,8 +33,6 @@ PATCHES=(
 )
 
 src_prepare() {
-	use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" )
-
 	qt_use_disable_mod localstorage sql \
 		src/imports/imports.pro
 
@@ -53,6 +51,7 @@ src_configure() {
 	local myqmakeargs=(
 		--
 		-qml-debug
+		$(qt_use jit feature-qml-jit)
 	)
 	qt5-build_src_configure
 }