diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-04-22 18:10:40 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-04-22 18:20:39 +0200 |
commit | 28b730a53ba8c2644e4632c4a42f8e87a4b9d3e4 (patch) | |
tree | f030911828149ce7f23172243d60d099cf6d7edf /kde-frameworks/kirigami | |
parent | kde-frameworks/kidletime: drop 5.102.0-r1 (diff) | |
download | gentoo-28b730a53ba8c2644e4632c4a42f8e87a4b9d3e4.tar.gz gentoo-28b730a53ba8c2644e4632c4a42f8e87a4b9d3e4.tar.bz2 gentoo-28b730a53ba8c2644e4632c4a42f8e87a4b9d3e4.zip |
kde-frameworks/kirigami: drop 5.102.0-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kirigami')
4 files changed, 0 insertions, 229 deletions
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest index 7d2155ae0fe2..9d3a2823a79d 100644 --- a/kde-frameworks/kirigami/Manifest +++ b/kde-frameworks/kirigami/Manifest @@ -1,3 +1,2 @@ -DIST kirigami2-5.102.0.tar.xz 371140 BLAKE2B 827f7a82f2a0b8c98516718aef5556d7f072d9fe2aa82115fbf5445d9cf19de8957c929a70f4c329ec0a4c1424d6bc926e028d4d19909c88997b80c791506108 SHA512 dee0dfbe8f4d7cc329707510f5ab4beef436de4887978b790bdd98ef001e3241768c9edcdfe39204b5c53997bdf7779457f7293b923282acd27a1dea4c1d911c DIST kirigami2-5.104.0.tar.xz 372976 BLAKE2B a9e4bd4cae9594b6760da32cf59532cb6787cc60de975862738537b5b32ad6ab5d2b59cf104e2276b68544aca99b9282b1850b39715d9b479fd5fac079a570f8 SHA512 20c2b2fad8e075f694b294691c382aa741442123e892eeac7a884ea890076d273318eaa22625656dd23763e14d0c82a58f88d5415891653f418d3e6fe9a2a7a9 DIST kirigami2-5.105.0.tar.xz 374020 BLAKE2B f726a3f024ca275f812a54850a4a965801c3aba77d01024616a3db7d4ae3a69f4ce1a52cc30ce20d49266ab40822f166c635fcc762b45e540c7bac51ba445151 SHA512 30f5b4a7833cee0bacc1b1793beab1b6f5a4501fff7ba063a694decbe8c051c920be3334aaf945bd479ae818b00643fe82bca08793a57c86ae3131cbaaafa7d6 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 deleted file mode 100644 index 31d38f3313b2..000000000000 --- a/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-1.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 4da10130a1b7..000000000000 --- a/kde-frameworks/kirigami/files/kirigami-5.102.0-fix-title-delegate-elision-glitch-2.patch +++ /dev/null @@ -1,114 +0,0 @@ -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 deleted file mode 100644 index 54e988bf0cbb..000000000000 --- a/kde-frameworks/kirigami/kirigami-5.102.0-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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 -} |