gentoo auto-resync : 29:01:2023 - 02:53:24

4 files changed, 231 insertions, 0 deletions

diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index f1d7f26378e4..5a86180fd26a 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,8 @@
+AUX kirigami-5.102.0-fix-title-delegate-elision-glitch-1.patch 2012 BLAKE2B 8f6a1dbadc5911096716ac603bd729dbe354906582e412d079ab4f0786b8ff0d6877710833f2bea47f913e09028aeae6a3087dddc2b24a6af40c75efbc6e520d SHA512 d2d173cc84086674e58dd9f5bb6530aa39de2dbb5aa9b56d12c3d943988843144d958d09d02d9152c582160844d294829d9119f2ac0f37b13669fe947520df55
+AUX kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch 3536 BLAKE2B c93834f6f0eef9c21bf194ea08ef43ee8b38aede8927dac4295cdd4fce768f8e6a59e12a2d85164fe3ab975597e53d2d81eaa3a2926acdd75abb3cd214d63138 SHA512 62abf63ee5758ecf52d4f4536e37ead4265eb208cc9cfa16ceb86dd79b0c047f9c90de7657c186fcea04a9a167e89f1b781c8607fc06eb4875969e5812211c0b
 DIST kirigami2-5.102.0.tar.xz 371140 BLAKE2B 827f7a82f2a0b8c98516718aef5556d7f072d9fe2aa82115fbf5445d9cf19de8957c929a70f4c329ec0a4c1424d6bc926e028d4d19909c88997b80c791506108 SHA512 dee0dfbe8f4d7cc329707510f5ab4beef436de4887978b790bdd98ef001e3241768c9edcdfe39204b5c53997bdf7779457f7293b923282acd27a1dea4c1d911c
 DIST kirigami2-5.99.0.tar.xz 365032 BLAKE2B 45d7691e2a5eba7a60c133436a8187c1af1d132d06e516057160b99769a2db5acd7d1b14425a6b4e28bf4f84b388a9e890c58c67ed0577e067db00af7ac00f1c SHA512 ca7fdd861483f22e7c028b65c0daed9756556053fd3db43e2fa991643a9f38ebec3e2840d9bc04f4caa81c50757a16c96609300aa7c85361a23267eff7985533
+EBUILD kirigami-5.102.0-r1.ebuild 1305 BLAKE2B 5305a08d489ef1a1331fe4b6c80635805c9609d5ac2f45f414f10228b72016306c6858a79bd3f48d5d66dcc7e2b9faae8fa4d5bc1e32eb6ddac88bcc79a78bd3 SHA512 844d23d3c4a1bc63457773978e9d537e3833573c041669af1ee97940ac30801cc0bdf88d5bc8ec4ef1562cacaf6b2cc3a4ed2daa50e3c2b35c18da7d93ad2c15
 EBUILD kirigami-5.102.0.ebuild 1227 BLAKE2B 649d51a9a91c0816c1ef4fd0507ad69b57cc6e227e1fee498d5d911b373fe208cc5b4be17756958b1c8d4b949dced295ddceb164fbf83e34a3eee2eb8e1ce4e0 SHA512 045f4caa93f67e444fe79dbb8cf54241b267d1265cfce7aa2f14b18e60f5a22a3087baf5464d1c8d29fc0ef20a6460a5e8c4928ba0cb6bfb710eb77eb0419336
 EBUILD kirigami-5.99.0.ebuild 998 BLAKE2B 527ae1e81dce244f53dff19e2c6aaae053781fecf519c9e2204d3fd15ccd936709707afb798ef28dbf1c382c1196e662977f053d2a26ae85c20716c54991b666 SHA512 56dcdf0c9bb3a46249011b2ab2183ff5b37d33476a37b0185083fc6acf23bccf9c88b759dfaeb2adf76011148deb033ea4c14ab3e8c3480b5d2ed60a0ec71c72
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-1.patch b/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-1.patch
new file mode 100644
index 000000000000..31d38f3313b2
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-1.patch
@@ -0,0 +1,59 @@
+From f69ff1b0fec56486fd96fd1154160593c1ccedeb Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Wed, 11 Jan 2023 02:50:10 +0300
+Subject: [PATCH] Page: Fix title delegate elision glitch
+
+Implicitly sized items like QtQuick/Text don't play nicely with Loader,
+and generally with kinda-recursive bindings on Layout.* properties.
+
+This combination of two fixes does the trick:
+
+1. Use extra TextMetrics for reliable width/height values.
+2. Round up text's advance width, so that container loader or layout
+won't ever round it down (which it did with implicitWidth before).
+
+(cherry picked from commit bc03a15b52c7512a1757da77963be5e1e48d5df1)
+---
+ src/controls/Page.qml | 24 ++++++++++++++++++------
+ 1 file changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/src/controls/Page.qml b/src/controls/Page.qml
+index fccb96ebb..8c9aa04ab 100644
+--- a/src/controls/Page.qml
++++ b/src/controls/Page.qml
+@@ -248,14 +248,26 @@ QQC2.Page {
+      */
+     property Component titleDelegate: Component {
+         id: defaultTitleDelegate
+-        Kirigami.Heading {
++        Item {
+             Layout.fillWidth: true
+-            Layout.maximumWidth: implicitWidth + 1 // The +1 is to make sure we do not trigger eliding at max width
+             Layout.minimumWidth: 0
+-            maximumLineCount: 1
+-            elide: Text.ElideRight
+-            text: root.title
+-            textFormat: Text.PlainText
++            Layout.maximumWidth: implicitWidth
++            implicitWidth: Math.ceil(metrics.advanceWidth)
++            implicitHeight: metrics.height
++
++            Kirigami.Heading {
++                id: heading
++                anchors.fill: parent
++                maximumLineCount: 1
++                elide: Text.ElideRight
++                text: root.title
++                textFormat: Text.PlainText
++            }
++            TextMetrics {
++                id: metrics
++                font: heading.font
++                text: heading.text
++            }
+         }
+     }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch b/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch
new file mode 100644
index 000000000000..4da10130a1b7
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch
@@ -0,0 +1,114 @@
+From eacfc6961158cc4f493a5d7e3c47619157f54291 Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Wed, 11 Jan 2023 23:00:03 +0300
+Subject: [PATCH] Page: Split default page title delegate into separate
+ component
+
+There's no need to clutter Page component with potentially unused Items
+and IDs, and an extra self-contained component wouldn't hurt.
+
+(cherry picked from commit e9f19ecd20a881a6bfeaf0676fc8d6f570fe387f)
+---
+ src/CMakeLists.txt                            |  1 +
+ src/controls/Page.qml                         | 22 +---------
+ .../private/DefaultPageTitleDelegate.qml      | 43 +++++++++++++++++++
+ 3 files changed, 46 insertions(+), 20 deletions(-)
+ create mode 100644 src/controls/private/DefaultPageTitleDelegate.qml
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 28c17c137..e3e7b3569 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -216,6 +216,7 @@ ecm_target_qml_sources(KirigamiPlugin PRIVATE PATH private SOURCES
+     controls/private/DefaultCardBackground.qml
+     controls/private/DefaultChipBackground.qml
+     controls/private/DefaultListItemBackground.qml
++    controls/private/DefaultPageTitleDelegate.qml
+     controls/private/EdgeShadow.qml
+     controls/private/GlobalDrawerActionItem.qml
+     controls/private/PageActionPropertyGroup.qml
+diff --git a/src/controls/Page.qml b/src/controls/Page.qml
+index 8c9aa04ab..2641b96cf 100644
+--- a/src/controls/Page.qml
++++ b/src/controls/Page.qml
+@@ -248,26 +248,8 @@ QQC2.Page {
+      */
+     property Component titleDelegate: Component {
+         id: defaultTitleDelegate
+-        Item {
+-            Layout.fillWidth: true
+-            Layout.minimumWidth: 0
+-            Layout.maximumWidth: implicitWidth
+-            implicitWidth: Math.ceil(metrics.advanceWidth)
+-            implicitHeight: metrics.height
+-
+-            Kirigami.Heading {
+-                id: heading
+-                anchors.fill: parent
+-                maximumLineCount: 1
+-                elide: Text.ElideRight
+-                text: root.title
+-                textFormat: Text.PlainText
+-            }
+-            TextMetrics {
+-                id: metrics
+-                font: heading.font
+-                text: heading.text
+-            }
++        P.DefaultPageTitleDelegate {
++            text: root.title
+         }
+     }
+ 
+diff --git a/src/controls/private/DefaultPageTitleDelegate.qml b/src/controls/private/DefaultPageTitleDelegate.qml
+new file mode 100644
+index 000000000..8c84d1b5c
+--- /dev/null
++++ b/src/controls/private/DefaultPageTitleDelegate.qml
+@@ -0,0 +1,43 @@
++/*
++ *  SPDX-FileCopyrightText: 2023 ivan tkachenko <me@ratijas.tk>
++ *
++ *  SPDX-License-Identifier: LGPL-2.0-or-later
++ */
++
++import QtQuick 2.15
++import QtQuick.Layouts 1.15
++import org.kde.kirigami 2.20 as Kirigami
++
++/**
++ * This component is used as a default representation for a page title within
++ * page's header/toolbar. It is just a Heading item with shrinking + eliding
++ * behavior.
++ *
++ * \private
++ */
++Item {
++    property alias text: heading.text
++
++    Layout.fillWidth: true
++    Layout.minimumWidth: 0
++    Layout.maximumWidth: implicitWidth
++
++    implicitWidth: Math.ceil(metrics.advanceWidth)
++    implicitHeight: metrics.height
++
++    Kirigami.Heading {
++        id: heading
++
++        anchors.fill: parent
++        maximumLineCount: 1
++        elide: Text.ElideRight
++        textFormat: Text.PlainText
++    }
++
++    TextMetrics {
++        id: metrics
++
++        font: heading.font
++        text: heading.text
++    }
++}
+-- 
+GitLab
+
diff --git a/kde-frameworks/kirigami/kirigami-5.102.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.102.0-r1.ebuild
new file mode 100644
index 000000000000..246e902cfecb
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.102.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.15.5
+inherit ecm frameworks.kde.org toolchain-funcs
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="+openmp"
+
+# requires package to already be installed
+RESTRICT="test"
+
+DEPEND="
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+PATCHES=( "${FILESDIR}"/${P}-fix-title-delegate-elision-glitch-{1,2}.patch )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+		$(cmake_use_find_package openmp OpenMP)
+	)
+
+	ecm_src_configure
+}