From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B6EDD138350 for ; Wed, 12 Feb 2020 21:30:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB905E083D; Wed, 12 Feb 2020 21:30:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A3B1BE083D for ; Wed, 12 Feb 2020 21:30:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5763F34EC6E for ; Wed, 12 Feb 2020 21:30:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66C53133 for ; Wed, 12 Feb 2020 21:30:42 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1581543023.e4312207139bb1121f18823c3bc819ecd2aa2541.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kirigami/files/, kde-frameworks/kirigami/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-frameworks/kirigami/files/kirigami-5.67.1-sync-size-hints-w-state-machine.patch kde-frameworks/kirigami/kirigami-5.67.1-r1.ebuild X-VCS-Directories: kde-frameworks/kirigami/files/ kde-frameworks/kirigami/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e4312207139bb1121f18823c3bc819ecd2aa2541 X-VCS-Branch: master Date: Wed, 12 Feb 2020 21:30:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bc477ce0-c841-46c5-8a5b-8468db573916 X-Archives-Hash: 0b0be232170b7e8e7a441b317ea2f9e7 commit: e4312207139bb1121f18823c3bc819ecd2aa2541 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 12 21:22:28 2020 +0000 Commit: Andreas Sturmlechner gentoo 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 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 +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 +}