From f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Sep 2020 17:27:54 +0100 Subject: gentoo resync : 30.09.2020 --- kde-frameworks/kirigami/Manifest | 4 +- ...actions-from-ToolBarLayout-when-destroyed.patch | 40 +++++++++++++++++ ...kirigami-5.74.0-revert-fix-avatar-loading.patch | 30 +++++++++++++ kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild | 51 ++++++++++++++++++++++ kde-frameworks/kirigami/kirigami-5.74.0.ebuild | 46 ------------------- 5 files changed, 124 insertions(+), 47 deletions(-) create mode 100644 kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch create mode 100644 kde-frameworks/kirigami/files/kirigami-5.74.0-revert-fix-avatar-loading.patch create mode 100644 kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild delete mode 100644 kde-frameworks/kirigami/kirigami-5.74.0.ebuild (limited to 'kde-frameworks/kirigami') diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest index a9d96ab8ddf4..1e87bafac8d3 100644 --- a/kde-frameworks/kirigami/Manifest +++ b/kde-frameworks/kirigami/Manifest @@ -1,5 +1,7 @@ +AUX kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch 1052 BLAKE2B 517e9e9956a8c773272a05b6217d18360742fd0ed72fb5179a6dcecc1426fd5eeae5b0d6b759612f13d3f88d5fe5659921631758ef98e9632d1a3f0474f1b03f SHA512 543ec519467800d4e27836834fbb9f846335a283a13e5414caf1fa8684d21a464a151709d8f238a37fc48ae2aee1cb5ebfdcd63c566d43406d3ec99c46f2ccdc +AUX kirigami-5.74.0-revert-fix-avatar-loading.patch 969 BLAKE2B a44a3d4961b523fabc79fdc8ea4abc9b036c7b51e16b88dcfd6167046066f4589860ff3d0d37cc00d473617a72f02b2130dcae686c0f93875915e71d2b240309 SHA512 3626e74ad0be79b0861f1b4fcf10ec6d07495cbc9a4879d12b93e5b14d70ea0b432d5174d40f2c0a370e932a30eba235a3d19a2f75e04cb07cae62b29cf25ea1 DIST kirigami2-5.70.0.tar.xz 257720 BLAKE2B 034d4ad0a6ab78c5ad1f5beffdc41e5702d956ee7e6e527f003da40ba0e55a4900404c2e2a58fd4d28b4169eb22407b8cb7c2a377c39d8ae1977558cf3eb54d4 SHA512 45c582110cc4d7595c6d467f16f77aba6d66ba0701fea2d1049e7c6af8a73376c0521126031cd1748a8735b0ea75917a8ba1c6f6f72497778d8a883671ef0afb DIST kirigami2-5.74.0.tar.xz 282820 BLAKE2B bd3cbdf3b98ee88518a9347180f59fb7cdb262fa6acf824da1de3103c516213a42cf106425eafaf497cab5be15f91bbf9dc4f3e10c7464cce19f0e0b564b4f4d SHA512 43059bc682e2d729a0a926e26ce5ba68947f275ffdd74836c124d9e063273429ccde8c0cebaef53168c46cfd62f41cb2c33d86f1f515ca619bde604aa7f5da5f EBUILD kirigami-5.70.0.ebuild 1032 BLAKE2B b82aa6be9a425c787d13fbe9fb3d00f5c2bb241579f6ca39276552e949fce5fde63d01dc74e2ba359e7be2b8c34de12dd70a91de02cb1a52a9127b0cb82a4bb0 SHA512 34b0076c28f6c3946780031d6deadd8d6cf1016164b67bd963c24d02af4100f6d9c1ac79da5e757a75444dca2848d0eddf5c1e4a21a4e32451badbe7284a68ec -EBUILD kirigami-5.74.0.ebuild 978 BLAKE2B a8fc110a4e61a5d381c094c04ab27ad0edc888bacfcaba4782ad1962aeb8d9eccb008ea1931c347442da2b9f649637f045ec39128b94a3d7e94fa17b8026f6f0 SHA512 b01e3b320b834f82b0c2e44fbf91fb3cef72db08ebeea4af45cf9813f4be906173c6022b0fd4650c992400e3e2f3ef2dcd8cf276e74c1dcbad0255d43112da39 +EBUILD kirigami-5.74.0-r1.ebuild 1118 BLAKE2B 262597aeb3de66d191b89f44aedd5595d79c2ae623788fb6def60efddb11a6eb9d5ef16d18218bbdeaf2c0319aef6641c750ac644139bf4e5b74967a7a8e3b48 SHA512 f51515bb6e7ce0f345e09da68657477d5dafd40783ac23376fe5ca3f35dee1fd5e7bdd58144911ccf1a14332360bc9ffd8254279a0f6f3aacbc440d358a8c1e2 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch b/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch new file mode 100644 index 000000000000..192ba9dcf67f --- /dev/null +++ b/kde-frameworks/kirigami/files/kirigami-5.74.0-remove-actions-from-ToolBarLayout-when-destroyed.patch @@ -0,0 +1,40 @@ +From 6eaefba5001445fa7e198e4caa0bde738240d66f Mon Sep 17 00:00:00 2001 +From: Arjen Hiemstra +Date: Wed, 9 Sep 2020 13:00:59 +0200 +Subject: [PATCH] Remove actions and delegates from ToolBarLayout when they get + destroyed + +Otherwise we're keeping around stale entries that no longer point to +valid stuff. + +BUG: 425670 +--- + src/toolbarlayout.cpp | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/src/toolbarlayout.cpp b/src/toolbarlayout.cpp +index cbf31062..c2df5998 100644 +--- a/src/toolbarlayout.cpp ++++ b/src/toolbarlayout.cpp +@@ -112,6 +112,18 @@ void ToolBarLayout::addAction(QObject* action) + d->actions.append(action); + d->actionsChanged = true; + ++ connect(action, &QObject::destroyed, this, [this](QObject *action) { ++ auto itr = d->delegates.find(action); ++ if (itr != d->delegates.end()) { ++ d->delegates.erase(itr); ++ } ++ ++ d->actions.removeOne(action); ++ d->actionsChanged = true; ++ ++ relayout(); ++ }); ++ + relayout(); + } + +-- +GitLab + 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 000000000000..60dae8389abf --- /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 +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 000000000000..0064f84f415c --- /dev/null +++ b/kde-frameworks/kirigami/kirigami-5.74.0-r1.ebuild @@ -0,0 +1,51 @@ +# 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 + "${FILESDIR}"/${P}-remove-actions-from-ToolBarLayout-when-destroyed.patch +) + +src_configure() { + local mycmakeargs=( + -DBUILD_EXAMPLES=$(usex examples) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/kirigami/kirigami-5.74.0.ebuild b/kde-frameworks/kirigami/kirigami-5.74.0.ebuild deleted file mode 100644 index a916f233d0b7..000000000000 --- a/kde-frameworks/kirigami/kirigami-5.74.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# 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" - -src_configure() { - local mycmakeargs=( - -DBUILD_EXAMPLES=$(usex examples) - ) - - ecm_src_configure -} -- cgit v1.2.3