* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/files/, kde-frameworks/kirigami/
@ 2020-02-12 21:30 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-02-12 21:30 UTC (permalink / raw
To: gentoo-commits
commit: e4312207139bb1121f18823c3bc819ecd2aa2541
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 21:22:28 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 21:30:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4312207
kde-frameworks/kirigami: Properly sync size hints with state machine
See also: https://mail.kde.org/pipermail/release-team/2020-February/011757.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=417351
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...mi-5.67.1-sync-size-hints-w-state-machine.patch | 55 ++++++++++++++++++++++
kde-frameworks/kirigami/kirigami-5.67.1-r1.ebuild | 47 ++++++++++++++++++
2 files changed, 102 insertions(+)
diff --git a/kde-frameworks/kirigami/files/kirigami-5.67.1-sync-size-hints-w-state-machine.patch b/kde-frameworks/kirigami/files/kirigami-5.67.1-sync-size-hints-w-state-machine.patch
new file mode 100644
index 00000000000..e5973abac16
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.67.1-sync-size-hints-w-state-machine.patch
@@ -0,0 +1,55 @@
+From 86f988434cd657e77cc9429e78f7290ce6b5713d Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Wed, 12 Feb 2020 12:43:12 +0100
+Subject: properly sync size hints with state machine
+
+define implicitWidth and width bindings in the states, in
+order to not break bindings
+BUG:417351
+---
+ src/controls/FormLayout.qml | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/controls/FormLayout.qml b/src/controls/FormLayout.qml
+index ff49dbd..61fbaf9 100644
+--- a/src/controls/FormLayout.qml
++++ b/src/controls/FormLayout.qml
+@@ -120,6 +120,11 @@ Item {
+ horizontalCenter: root.horizontalCenter
+ }
+ }
++ PropertyChanges {
++ target: lay
++ implicitWidth: undefined
++ width: undefined
++ }
+ },
+ State {
+ when: !root.wideMode
+@@ -131,10 +136,15 @@ Item {
+ horizontalCenter: undefined
+ }
+ }
++ PropertyChanges {
++ target: lay
++ implicitWidth: root.width
++ width: Math.min(implicitWidth, parent.width)
++ }
++
+ }
+ ]
+
+- implicitWidth: root.wideMode ? undefined : root.width
+ width: Math.min(implicitWidth, parent.width)
+ Timer {
+ id: hintCompression
+@@ -146,6 +156,7 @@ Item {
+ }
+ onImplicitWidthChanged: hintCompression.restart();
+ //This invisible row is used to sync alignment between multiple layouts
++
+ Item {
+ Layout.preferredWidth: {
+ var hint = 1;
+--
+cgit v1.1
diff --git a/kde-frameworks/kirigami/kirigami-5.67.1-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.67.1-r1.ebuild
new file mode 100644
index 00000000000..48fa493c20b
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.67.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0
+BDEPEND="
+ >=dev-qt/linguist-tools-${QTMIN}:5
+"
+DEPEND="
+ >=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
+"
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${P}-sync-size-hints-w-state-machine.patch" )
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/files/, kde-frameworks/kirigami/
@ 2020-09-29 12:49 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-09-29 12:49 UTC (permalink / raw
To: gentoo-commits
commit: 6d88a5390e3aa5e3fd050c3904c364a1c5447c69
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 22:22:43 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 12:45:28 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d88a539
kde-frameworks/kirigami: Fix blurry user avatars
Upstream commit aaaabf1ea84d9c5ae9cf50a306b79f15f44f5b35
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=422182
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...kirigami-5.74.0-revert-fix-avatar-loading.patch | 30 ++++++++++++++
kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild | 48 ++++++++++++++++++++++
2 files changed, 78 insertions(+)
diff --git a/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch b/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch
new file mode 100644
index 00000000000..60dae8389ab
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch
@@ -0,0 +1,30 @@
+From aaaabf1ea84d9c5ae9cf50a306b79f15f44f5b35 Mon Sep 17 00:00:00 2001
+From: Carson Black <uhhadd@gmail.com>
+Date: Sat, 19 Sep 2020 12:21:33 -0400
+Subject: [PATCH] Revert "Fix: avatar loading"
+
+This reverts commit 338d91be7254099c1ad4c1f475acb6368df2b114, which
+introduced a visual regression in the users KCM among other places
+that use the Avatar by causing the image to fail to resize according
+to the size of the avatar component.
+---
+ src/controls/Avatar.qml | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/controls/Avatar.qml b/src/controls/Avatar.qml
+index a4f59448..775e5987 100644
+--- a/src/controls/Avatar.qml
++++ b/src/controls/Avatar.qml
+@@ -133,9 +133,6 @@ QQC2.Control {
+ mipmap: true
+ smooth: true
+
+- sourceSize.width: avatarRoot.implicitWidth
+- sourceSize.height: avatarRoot.implicitHeight
+-
+ fillMode: Image.PreserveAspectFit
+ anchors.fill: parent
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild
new file mode 100644
index 00000000000..aa5b71a3f17
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.14.2
+inherit ecm kde.org
+
+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 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+ >=dev-qt/linguist-tools-${QTMIN}:5
+"
+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
+"
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${P}-revert-fix-avatar-loading.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/files/, kde-frameworks/kirigami/
@ 2021-01-23 13:29 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-01-23 13:29 UTC (permalink / raw
To: gentoo-commits
commit: 877fc600fd6370f74b9d2cc55b946bd1f8c1c1ea
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 13:05:31 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 13:29:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877fc600
kde-frameworks/kirigami: Fix runtime crash in e.g. systemsettings
Upstream commit b4a6c562cde4e064494e261bc3f64000cbf628a5
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=428461
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=431419
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...0-no-reverseTwinsChanged-destr-FormLayout.patch | 35 +++++++++++++++
kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild | 51 ++++++++++++++++++++++
kde-frameworks/kirigami/kirigami-5.78.0-r1.ebuild | 51 ++++++++++++++++++++++
3 files changed, 137 insertions(+)
diff --git a/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch b/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch
new file mode 100644
index 00000000000..5bda9da3824
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch
@@ -0,0 +1,35 @@
+From b4a6c562cde4e064494e261bc3f64000cbf628a5 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 14 Jan 2021 15:23:39 +0100
+Subject: [PATCH] Don't manually call reverseTwinsChanged when destructing
+ FormLayout
+
+This line causes a crash when destructing the screenlocker KCM.
+It doesn't seem to be caused by reverseTwinsChanged itself but rather by
+accessing the Qt object. I don't fully undestand the root cause.
+
+However the call itself appears to be unnecessary since in the line
+above we write to reverseTwins and that triggers the changed signal if
+needed.
+
+BUG: 431419
+BUG: 428461
+---
+ src/controls/FormLayout.qml | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/controls/FormLayout.qml b/src/controls/FormLayout.qml
+index 74292fda..a27903f2 100644
+--- a/src/controls/FormLayout.qml
++++ b/src/controls/FormLayout.qml
+@@ -84,7 +84,6 @@ Item {
+ Component.onDestruction: {
+ for (let i in twinFormLayouts) {
+ twinFormLayouts[i].children[0].reverseTwins = twinFormLayouts[i].children[0].reverseTwins.filter(function(value, index, arr){ return value != root;})
+- Qt.callLater(() => twinFormLayouts[i].children[0].reverseTwinsChanged());
+ }
+ }
+ GridLayout {
+--
+GitLab
+
diff --git a/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild
new file mode 100644
index 00000000000..ddd74143a26
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.77.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.15.1
+inherit ecm kde.org
+
+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 ~ppc64 ~x86"
+IUSE=""
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+BDEPEND="
+ >=dev-qt/linguist-tools-${QTMIN}:5
+"
+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
+"
+
+PATCHES=(
+ # KDE-Bugs #428461, #431419
+ "${FILESDIR}/${P}-no-reverseTwinsChanged-destr-FormLayout.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ )
+
+ ecm_src_configure
+}
diff --git a/kde-frameworks/kirigami/kirigami-5.78.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.78.0-r1.ebuild
new file mode 100644
index 00000000000..e44584cc323
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.78.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.15.1
+inherit ecm kde.org
+
+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 ~ppc64 ~x86"
+IUSE=""
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+BDEPEND="
+ >=dev-qt/linguist-tools-${QTMIN}:5
+"
+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
+"
+
+PATCHES=(
+ # KDE-Bugs #428461, #431419
+ "${FILESDIR}/${PN}-5.77.0-no-reverseTwinsChanged-destr-FormLayout.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/files/, kde-frameworks/kirigami/
@ 2021-04-04 13:23 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2021-04-04 13:23 UTC (permalink / raw
To: gentoo-commits
commit: 1a86f8153a3b23901d5511d43d9838b4b5c46495
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 4 11:37:08 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 4 13:19:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a86f815
kde-frameworks/kirigami: Fix systemsettings crash installing themes
Upstream commit 29dabab2f536827bc1ecec63f5a0b0a76f0809e5
See also: https://invent.kde.org/frameworks/kirigami/-/merge_requests/253
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=434079
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kirigami-5.80.0-fix-crash-in-SizeGroup.patch | 41 ++++++++++++++++++
kde-frameworks/kirigami/kirigami-5.80.0-r1.ebuild | 50 ++++++++++++++++++++++
2 files changed, 91 insertions(+)
diff --git a/kde-frameworks/kirigami/files/kirigami-5.80.0-fix-crash-in-SizeGroup.patch b/kde-frameworks/kirigami/files/kirigami-5.80.0-fix-crash-in-SizeGroup.patch
new file mode 100644
index 00000000000..7d13d2fa1bf
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.80.0-fix-crash-in-SizeGroup.patch
@@ -0,0 +1,41 @@
+From 29dabab2f536827bc1ecec63f5a0b0a76f0809e5 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Tue, 9 Mar 2021 14:30:44 +0000
+Subject: [PATCH] Fix potential crash in SizeGroup
+
+SizeGroup keeps a cache of a list of items, and when one updates does
+calculations based on all items.
+
+This list is stored as a list of QPointers as we don't explicitly track
+deletion.
+
+We have a list of items and guard for deletion, but they're QML owned.
+So there's a point in time when it's pending deletion with the garbage
+collector but the lower level object isn't managed by an engine.
+
+As we go via QQmlProperty(item, QStringLiteral("Layout.preferredWidth"),
+qmlContext(item)).write(maxWidth) this is problematic.
+
+BUG: 434079
+---
+ src/sizegroup.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/sizegroup.cpp b/src/sizegroup.cpp
+index 2035b6eb..a9a0ebf8 100644
+--- a/src/sizegroup.cpp
++++ b/src/sizegroup.cpp
+@@ -98,6 +98,10 @@ void SizeGroup::adjustItems(Mode whatChanged)
+ continue;
+ }
+
++ if (!qmlEngine(item)) {
++ continue;
++ }
++
+ switch (m_mode) {
+ case Mode::Width:
+ QQmlProperty(item, QStringLiteral("Layout.preferredWidth"), qmlContext(item)).write(maxWidth);
+--
+GitLab
+
diff --git a/kde-frameworks/kirigami/kirigami-5.80.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.80.0-r1.ebuild
new file mode 100644
index 00000000000..54823b83838
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.80.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_NAME="${PN}2"
+QTMIN=5.15.2
+inherit ecm kde.org
+
+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 ~ppc64 ~x86"
+IUSE=""
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+BDEPEND="
+ >=dev-qt/linguist-tools-${QTMIN}:5
+"
+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
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-crash-in-SizeGroup.patch" # KDE-bug #434079
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=$(usex examples)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/files/, kde-frameworks/kirigami/
@ 2023-01-29 0:12 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2023-01-29 0:12 UTC (permalink / raw
To: gentoo-commits
commit: dd0a11a066ff688e97175771791b0f8924f2eadf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 00:08:17 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 00:12:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd0a11a0
kde-frameworks/kirigami: Page: Fix title delegate elision glitch
Upstream commits:
f69ff1b0fec56486fd96fd1154160593c1ccedeb
eacfc6961158cc4f493a5d7e3c47619157f54291
See also:
https://invent.kde.org/frameworks/kirigami/-/merge_requests/900
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...102.0-fix-title-delegate-elision-glitch-1.patch | 59 +++++++++++
...102.0-fix-title-delegate-elision-glitch-2.patch | 114 +++++++++++++++++++++
kde-frameworks/kirigami/kirigami-5.102.0-r1.ebuild | 55 ++++++++++
3 files changed, 228 insertions(+)
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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/files/, kde-frameworks/kirigami/
@ 2024-01-04 13:33 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2024-01-04 13:33 UTC (permalink / raw
To: gentoo-commits
commit: aceaa84b71d81f9a8f1633b1f1910b77c83a873b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 4 13:22:51 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 4 13:22:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aceaa84b
kde-frameworks/kirigami: Make drawer actions accessible
See also:
https://invent.kde.org/frameworks/kirigami/-/merge_requests/1200
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...irigami-5.113.0-drawer-actions-accessible.patch | 38 +++++++++++++++
kde-frameworks/kirigami/kirigami-5.113.0-r1.ebuild | 54 ++++++++++++++++++++++
2 files changed, 92 insertions(+)
diff --git a/kde-frameworks/kirigami/files/kirigami-5.113.0-drawer-actions-accessible.patch b/kde-frameworks/kirigami/files/kirigami-5.113.0-drawer-actions-accessible.patch
new file mode 100644
index 000000000000..1a7dd0b98807
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.113.0-drawer-actions-accessible.patch
@@ -0,0 +1,38 @@
+From 31f8fbc0d1c55e0d4af02be309aae5cef29055e7 Mon Sep 17 00:00:00 2001
+From: Volker Krause <vkrause@kde.org>
+Date: Mon, 14 Aug 2023 17:38:20 +0200
+Subject: [PATCH] Make drawer actions accessible
+
+They could previously not be triggered at all, and had no label in
+the global drawer.
+---
+ src/controls/private/ContextDrawerActionItem.qml | 2 ++
+ src/controls/private/GlobalDrawerActionItem.qml | 3 +++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/src/controls/private/ContextDrawerActionItem.qml b/src/controls/private/ContextDrawerActionItem.qml
+index 430ff87e6..f5b2ca5c7 100644
+--- a/src/controls/private/ContextDrawerActionItem.qml
++++ b/src/controls/private/ContextDrawerActionItem.qml
+@@ -95,4 +95,6 @@ Kirigami.BasicListItem {
+ console.warning("Don't know how to trigger the action")
+ }
+ }
++
++ Accessible.onPressAction: listItem.clicked()
+ }
+diff --git a/src/controls/private/GlobalDrawerActionItem.qml b/src/controls/private/GlobalDrawerActionItem.qml
+index 07e63fa38..6d3c5fe35 100644
+--- a/src/controls/private/GlobalDrawerActionItem.qml
++++ b/src/controls/private/GlobalDrawerActionItem.qml
+@@ -177,4 +177,7 @@ Kirigami.AbstractListItem {
+
+ Keys.onDownPressed: event => nextItemInFocusChain().focus = true
+ Keys.onUpPressed: event => nextItemInFocusChain(false).focus = true
++
++ Accessible.onPressAction: listItem.clicked()
++ Accessible.name: modelData.text
+ }
+--
+GitLab
+
diff --git a/kde-frameworks/kirigami/kirigami-5.113.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.113.0-r1.ebuild
new file mode 100644
index 000000000000..5b726bad842f
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.113.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 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_TAR_PN="${PN}2"
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org toolchain-funcs
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+
+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}-drawer-actions-accessible.patch" ) # kf5 branch
+
+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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/files/, kde-frameworks/kirigami/
@ 2024-09-05 13:19 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-09-05 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 451c3c92ac0da2759ed0083867bb4d688441365d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 5 13:17:17 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 13:18:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=451c3c92
kde-frameworks/kirigami: backport System Settings cache fix
Was planning on pulling this in as a workaround for now given it's
a nasty bug but it's been merged upstream now too. Not doing
straight-to-stable as might introduce performance regressions so let's
give it a (small) amount of soaking time first.
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=488326
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/kirigami-6.5.0-disable-cachegen.patch | 35 ++++++++++++++
kde-frameworks/kirigami/kirigami-6.5.0-r1.ebuild | 53 ++++++++++++++++++++++
2 files changed, 88 insertions(+)
diff --git a/kde-frameworks/kirigami/files/kirigami-6.5.0-disable-cachegen.patch b/kde-frameworks/kirigami/files/kirigami-6.5.0-disable-cachegen.patch
new file mode 100644
index 000000000000..e7aac3c64576
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-6.5.0-disable-cachegen.patch
@@ -0,0 +1,35 @@
+https://bugs.kde.org/show_bug.cgi?id=488326
+https://invent.kde.org/frameworks/kirigami/-/commit/7dea849cc263ddb33986e1e93669459ddde6990e
+https://invent.kde.org/frameworks/kirigami/-/merge_requests/1589
+
+From 7dea849cc263ddb33986e1e93669459ddde6990e Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Sun, 21 Jul 2024 00:32:51 +0200
+Subject: [PATCH] Disable cachegen
+
+For some reason it breaks kirigami
+
+BUGS: 488326
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -9,12 +9,12 @@ add_subdirectory(layouts)
+ add_library(Kirigami)
+ add_library(KF6::Kirigami ALIAS Kirigami)
+
+-if (WIN32)
+- # Kirigami apparently adds too many sources so on Windows we end
+- # up running into command line length limits. So disable cache
+- # generation on Windows for now.
+- set(_extra_options NO_CACHEGEN)
+-endif()
++# On Windows Kirigami apparently adds too many sources so on Windows we end
++# up running into command line length limits. So disable cache
++# generation on Windows for now.
++# On Qt 6.7.2 cachegen is causing https://bugs.kde.org/show_bug.cgi?id=488326
++# investigate if future versions fix it and we can re-enable it
++set(_extra_options NO_CACHEGEN)
+ if (BUILD_SHARED_LIBS)
+ set(_extra_options ${_extra_options} NO_PLUGIN_OPTIONAL)
+ endif()
+--
+GitLab
diff --git a/kde-frameworks/kirigami/kirigami-6.5.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-6.5.0-r1.ebuild
new file mode 100644
index 000000000000..5557807a5eb2
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-6.5.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="true"
+ECM_QTHELP="false"
+ECM_TEST="true"
+QTMIN=6.6.2
+inherit ecm frameworks.kde.org toolchain-funcs
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://community.kde.org/Kirigami"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="openmp"
+
+# requires package to already be installed
+RESTRICT="test"
+
+# slot op: Uses Qt6::GuiPrivate for qguiapplication_p.h
+DEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+"
+RDEPEND="${DEPEND}
+ examples? ( !${CATEGORY}/${PN}:5[examples(-)] )
+ >=dev-qt/qt5compat-${QTMIN}:6[qml]
+"
+BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.5.0-disable-cachegen.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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/files/, kde-frameworks/kirigami/
@ 2024-11-15 13:46 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2024-11-15 13:46 UTC (permalink / raw
To: gentoo-commits
commit: a235d977cf0b2c0c8e0e4c8e60d5024f658444c8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 15 13:36:15 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 15 13:46:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a235d977
kde-frameworks/kirigami: Fix loading desktop theme
KDE-bug:
https://bugs.kde.org/show_bug.cgi?id=491294
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...irigami-5.116.0-fix-loading-desktop-theme.patch | 76 ++++++++++++++++++++++
kde-frameworks/kirigami/kirigami-5.116.0-r2.ebuild | 54 +++++++++++++++
2 files changed, 130 insertions(+)
diff --git a/kde-frameworks/kirigami/files/kirigami-5.116.0-fix-loading-desktop-theme.patch b/kde-frameworks/kirigami/files/kirigami-5.116.0-fix-loading-desktop-theme.patch
new file mode 100644
index 000000000000..fb22668fc371
--- /dev/null
+++ b/kde-frameworks/kirigami/files/kirigami-5.116.0-fix-loading-desktop-theme.patch
@@ -0,0 +1,76 @@
+From e8a1c49f7b83d0e06629a32c113eb9bd820e9969 Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Sat, 19 Oct 2024 22:15:56 +0400
+Subject: [PATCH 1/2] Fix presumable typos confusing background and foreground
+ colors
+
+CCBUG: 491294
+---
+ src/styles/org.kde.desktop/Theme.qml | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/styles/org.kde.desktop/Theme.qml b/src/styles/org.kde.desktop/Theme.qml
+index a6e83242..02c54f85 100644
+--- a/src/styles/org.kde.desktop/Theme.qml
++++ b/src/styles/org.kde.desktop/Theme.qml
+@@ -19,7 +19,7 @@ Kirigami.BasicThemeDefinition {
+ highlightedTextColor: palette.highlightedText
+ backgroundColor: palette.window
+ alternateBackgroundColor: Qt.darker(palette.window, 1.05)
+- activeTextColor: palette.highlight
++ activeTextColor: palette.highlightedText
+ activeBackgroundColor: palette.highlight
+ linkColor: "#2980B9"
+ linkBackgroundColor: "#2980B9"
+@@ -52,15 +52,15 @@ Kirigami.BasicThemeDefinition {
+ selectionHoverColor: palette.highlight
+ selectionFocusColor: palette.highlight
+
+- tooltipTextColor: palette.base
+- tooltipBackgroundColor: palette.text
+- tooltipAlternateBackgroundColor: Qt.darker(palette.text, 1.05)
++ tooltipTextColor: palette.text
++ tooltipBackgroundColor: palette.base
++ tooltipAlternateBackgroundColor: palette.alternateBase
+ tooltipHoverColor: palette.highlight
+ tooltipFocusColor: palette.highlight
+
+- complementaryTextColor: palette.base
+- complementaryBackgroundColor: palette.text
+- complementaryAlternateBackgroundColor: Qt.darker(palette.text, 1.05)
++ complementaryTextColor: palette.text
++ complementaryBackgroundColor: palette.base
++ complementaryAlternateBackgroundColor: palette.alternateBase
+ complementaryHoverColor: palette.highlight
+ complementaryFocusColor: palette.highlight
+
+--
+2.47.0
+
+
+From 7767fdbf15828d00d68b06c35f8d4805de678add Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010@ya.ru>
+Date: Sat, 19 Oct 2024 22:17:23 +0400
+Subject: [PATCH 2/2] Fix loading desktop theme
+
+BUG: 491294
+---
+ src/styles/org.kde.desktop/Theme.qml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/styles/org.kde.desktop/Theme.qml b/src/styles/org.kde.desktop/Theme.qml
+index 02c54f85..4a34b1e5 100644
+--- a/src/styles/org.kde.desktop/Theme.qml
++++ b/src/styles/org.kde.desktop/Theme.qml
+@@ -70,7 +70,7 @@ Kirigami.BasicThemeDefinition {
+ headerHoverColor: palette.highlight
+ headerFocusColor: palette.highlight
+
+- property font defaultFont: fontMetrics.font
++ defaultFont: fontMetrics.font
+
+ property list<QtObject> children: [
+ TextMetrics {
+--
+2.47.0
+
diff --git a/kde-frameworks/kirigami/kirigami-5.116.0-r2.ebuild b/kde-frameworks/kirigami/kirigami-5.116.0-r2.ebuild
new file mode 100644
index 000000000000..5f755953ba58
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.116.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_EXAMPLES="false"
+ECM_QTHELP="false"
+ECM_TEST="true"
+KDE_ORG_TAR_PN="${PN}2"
+QTMIN=5.15.9
+inherit ecm frameworks.kde.org toolchain-funcs
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://community.kde.org/Kirigami"
+
+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-loading-desktop-theme.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=OFF
+ $(cmake_use_find_package openmp OpenMP)
+ )
+
+ ecm_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-11-15 13:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-29 0:12 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/files/, kde-frameworks/kirigami/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-11-15 13:46 Andreas Sturmlechner
2024-09-05 13:19 Sam James
2024-01-04 13:33 Andreas Sturmlechner
2021-04-04 13:23 Andreas Sturmlechner
2021-01-23 13:29 Andreas Sturmlechner
2020-09-29 12:49 Andreas Sturmlechner
2020-02-12 21:30 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox