summaryrefslogtreecommitdiff
path: root/kde-frameworks/kirigami
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks/kirigami')
-rw-r--r--kde-frameworks/kirigami/Manifest7
-rw-r--r--kde-frameworks/kirigami/files/kirigami-5.80.0-fix-crash-in-SizeGroup.patch41
-rw-r--r--kde-frameworks/kirigami/kirigami-5.82.0.ebuild2
-rw-r--r--kde-frameworks/kirigami/kirigami-5.83.0.ebuild (renamed from kde-frameworks/kirigami/kirigami-5.80.0-r1.ebuild)6
4 files changed, 5 insertions, 51 deletions
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index a67219662bd5..527d8e39d2aa 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,6 +1,5 @@
-AUX kirigami-5.80.0-fix-crash-in-SizeGroup.patch 1285 BLAKE2B aba017ffe7ecbad6e681af81c5584e0e6ae3264753edd738919692e3d9c08ef08881a2ee6bed234d4282a8aa1d55e63bafe214826e8bcd205c983f835c890cf2 SHA512 f742e78b23c8f0ddc127271a5a97fe2aba072585dc193dd7d4d47d08f682a9d3d02705ad1db21605f5ea8e65854914c06296ddbd655ccf61e94c7314a8b75822
-DIST kirigami2-5.80.0.tar.xz 310608 BLAKE2B 3e3ad3190306ffc955c17ed783d6d231f7b5d37314bbc6a8a215c22d2cd0a13564b914ca7c482ad60dd1e54336f1af5833a6af7881d94cf584753007d7052ac5 SHA512 d40e95a4f5376eb16d45193c32d96a777e5045fbfdd3dbe4902edb561b6709dde8ab2e2c905042bc76b6a641575a05a876a0204090b0c705bdac9d8631b67971
DIST kirigami2-5.82.0.tar.xz 315952 BLAKE2B 470199ae252029e7abf78b1d3853f72635bd0a68a306695d2ba2a88ed2114e129a1b496cbc6084da17e9d39f5bff7c44fe0a72636f22654aad582b658484aa8f SHA512 d2a72879bca7151dfe07e55089bf61c8f3157ed78357b894a7834a05c78ee790b55afc2633e491b358b8b6c86ba73a000f17c7b224c88e19711a065debf0102e
-EBUILD kirigami-5.80.0-r1.ebuild 1055 BLAKE2B c2735fe93ef85962307a7bbdc39e16ec692b99dd24758418b82dd70c032914a3f7d2ec8cdd7da1f375e297c1cd45694588123d774c899155795c2954a362c6f2 SHA512 3535f0f27146781ef88f35f68db256b6df96b5cf9f74b18d6195639d33fe150e45a288ffd4debe152fefe902c373c83d2dc0cadc5cc0323d6611859561daef30
-EBUILD kirigami-5.82.0.ebuild 978 BLAKE2B ffff2c52d3be62943ce8d85ee2edbf207ba631331ba02c87f8c037f6fd1eb0c9f989e58e1cc519e7e280afe34a37f4b917e4472eb07112bcc5fc6a1e6f4028aa SHA512 af4dcdd9cf8ef4671ffa76268deba66ff550143f20f7c7005f5c70aa4384d4adf9d8744dd7fe21176f5925b370c840d6a3c8c755d61bf2a60fcf1b7dd8995aab
+DIST kirigami2-5.83.0.tar.xz 318804 BLAKE2B 96c7ae5336c5262854c77d0af70a1fd7bfe0e2adc8a7fbc5553c76cb51ae133de6684bbf15db895c60cb4af572ee49cbe92ab92267b9b357f6ee36c44137861b SHA512 3fa82231b918d73b6ccc46eb1bad9fec2e825d3e50e16635b51340c0305f05c133c806d735034def2c29a4ab1314039f2d13bd4888a05ec283e31d880ecd5556
+EBUILD kirigami-5.82.0.ebuild 975 BLAKE2B 14cf5456ee43bc83a9d5a3fe832f0fa1689484d635bf31c1cd43aec1164675a2ca2e005cc30007f39308691749ec132577bf3eaf55b220c0f6ee68af58cb5928 SHA512 e6ae1c47d36ec8351caed8ed168aeeeac91fcd5e2ad23ad1f197a1563c5c38bfa6b07bf3065a7b437f11ee987a9b5c81c72c4ccaf09223417cf6479783d8d515
+EBUILD kirigami-5.83.0.ebuild 978 BLAKE2B ffff2c52d3be62943ce8d85ee2edbf207ba631331ba02c87f8c037f6fd1eb0c9f989e58e1cc519e7e280afe34a37f4b917e4472eb07112bcc5fc6a1e6f4028aa SHA512 af4dcdd9cf8ef4671ffa76268deba66ff550143f20f7c7005f5c70aa4384d4adf9d8744dd7fe21176f5925b370c840d6a3c8c755d61bf2a60fcf1b7dd8995aab
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
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
deleted file mode 100644
index 7d13d2fa1bfa..000000000000
--- a/kde-frameworks/kirigami/files/kirigami-5.80.0-fix-crash-in-SizeGroup.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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.82.0.ebuild b/kde-frameworks/kirigami/kirigami-5.82.0.ebuild
index 22c5683da45e..3ac8f14e2561 100644
--- a/kde-frameworks/kirigami/kirigami-5.82.0.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.82.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE=""
# requires package to already be installed
diff --git a/kde-frameworks/kirigami/kirigami-5.80.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.83.0.ebuild
index 6190075bd2a2..22c5683da45e 100644
--- a/kde-frameworks/kirigami/kirigami-5.80.0-r1.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.83.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://techbase.kde.org/Kirigami"
EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE=""
# requires package to already be installed
@@ -37,10 +37,6 @@ 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)