summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'kde-frameworks/kirigami')
-rw-r--r--kde-frameworks/kirigami/Manifest4
-rw-r--r--kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch56
-rw-r--r--kde-frameworks/kirigami/kirigami-5.115.0.ebuild (renamed from kde-frameworks/kirigami/kirigami-5.88.0-r1.ebuild)26
-rw-r--r--kde-frameworks/kirigami/kirigami-5.85.0.ebuild46
-rw-r--r--kde-frameworks/kirigami/kirigami-6.2.1.ebuild49
5 files changed, 66 insertions, 115 deletions
diff --git a/kde-frameworks/kirigami/Manifest b/kde-frameworks/kirigami/Manifest
index cdd855ec5343..5d95f2c49c2e 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,2 +1,2 @@
-DIST kirigami2-5.85.0.tar.xz 323312 BLAKE2B 4953b9d3f0114aa7f12b23c7c12092cc0de57ff67e73130a1428e7c334d34b5a87dc8c7b2095dbaa2f28f6a96cc8be67682a73b2785a19f39ac9396c20646213 SHA512 239a8f7e5e77ca19cd9b8e45a383959c0c5b07dda279862c3aa0474fd34d58d905ca947c7f19eec3bc2de53557e8ae7dd8cb5a4879a53c28436e6636931c2603
-DIST kirigami2-5.88.0.tar.xz 333324 BLAKE2B cac7a79d5d3fd75aab31f0c7d6fe51b6dd6bf8755822a85682db7742cafc88007012e541de09ef302e1b2208a055c9cb4cce208362323c558e547a256f3bd397 SHA512 adb20c007bd8d1206be87d936a9affe1f7e2203158ec5ee241bde8e60e2b6e1d701393c4d85841644321f70496de1e67cb4feb9009c2cd7d153eba2407c480fb
+DIST kirigami-6.2.1.tar.xz 469224 BLAKE2B 6886a9df0920334d9627754b67fde63267d3a9990b72c7273cad9329e6543a337ed5b070a76f80e37df4b3d4473a79dbf76e8d1bed0731343e826f4e39476094 SHA512 57e7f6facede8764ee792ebd41f24bf2b53651cc2bfae7c2c58e3e821a27c2021c8f2161ddc76b2b20a26d310a48045335405a753487f98c46c050df8dc0f9e0
+DIST kirigami2-5.115.0.tar.xz 383944 BLAKE2B ce95794319ebbda40d384896da4e94dcf5137d176b0c3cab53bf5223ed48e0c95486002010c74008b42857ce7d27d4840c2af0395e957d0eade18bc2f5796f87 SHA512 b99d9829f864ae59b0ae4064e0b0b24a0f33ce2c35c60b4609fd9746bb322cab26d3f9afe6ba0893b486d4c546ead98c5ba42dc33271d2fdf47e34caef35ea90
diff --git a/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch b/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch
deleted file mode 100644
index 85b2a24f5909..000000000000
--- a/kde-frameworks/kirigami/files/kirigami-5.88.0-PageRowGlobalToolBarUI-dont-animate-opacity.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 67ec2a1873e3d750529043b243043cfd2e2f9ec6 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Wed, 10 Nov 2021 20:44:53 -0700
-Subject: [PATCH] PageRowGlobalToolBarUI: don't animate opacity
-
-Doing so causes flickering in System Settings and KInfoCenter because of
-how the titles are rendered. It also doesn't make conceptual sense since
-the style of toolbar generally doesn't change so the user would never
-actually see the animated opacity change in the first place.
-
-BUG: 417636
-FIXED-IN: 5.89
----
- .../globaltoolbar/PageRowGlobalToolBarUI.qml | 13 +++----------
- 1 file changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml b/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
-index 640ab51e..c536fed7 100644
---- a/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
-+++ b/src/controls/private/globaltoolbar/PageRowGlobalToolBarUI.qml
-@@ -106,8 +106,8 @@ Kirigami.AbstractApplicationHeader {
- Layout.preferredHeight: -1
- property Kirigami.PageRow pageRow: root
-
-- opacity: layerIsMainRow && active
-- enabled: opacity > 0
-+ visible: layerIsMainRow && active
-+ enabled: visible
-
- asynchronous: true
-
-@@ -115,13 +115,6 @@ Kirigami.AbstractApplicationHeader {
-
- //TODO: different implementation?
- source: globalToolBar.actualStyle == Kirigami.ApplicationHeaderStyle.TabBar ? Qt.resolvedUrl("TabBarControl.qml") : Qt.resolvedUrl("BreadcrumbControl.qml")
--
-- Behavior on opacity {
-- OpacityAnimator {
-- duration: Kirigami.Units.longDuration
-- easing.type: Easing.InOutQuad
-- }
-- }
- }
-
- Item {
-@@ -137,6 +130,6 @@ Kirigami.AbstractApplicationHeader {
- Layout.preferredWidth: height
- }
- }
-- background.opacity: breadcrumbLoader.opacity
-+ background.visible: breadcrumbLoader.visible
- }
-
---
-GitLab
-
diff --git a/kde-frameworks/kirigami/kirigami-5.88.0-r1.ebuild b/kde-frameworks/kirigami/kirigami-5.115.0.ebuild
index a161344b23b0..730b8a18bb13 100644
--- a/kde-frameworks/kirigami/kirigami-5.88.0-r1.ebuild
+++ b/kde-frameworks/kirigami/kirigami-5.115.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,24 +6,20 @@ EAPI=8
ECM_EXAMPLES="true"
ECM_QTHELP="false"
ECM_TEST="true"
-KDE_ORG_NAME="${PN}2"
-QTMIN=5.15.2
-inherit ecm kde.org
+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"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE="openmp"
# 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
@@ -36,12 +32,20 @@ DEPEND="
RDEPEND="${DEPEND}
>=dev-qt/qtgraphicaleffects-${QTMIN}:5
"
+BDEPEND=">=dev-qt/linguist-tools-${QTMIN}:5"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
-PATCHES=( "${FILESDIR}"/${P}-PageRowGlobalToolBarUI-dont-animate-opacity.patch )
+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
diff --git a/kde-frameworks/kirigami/kirigami-5.85.0.ebuild b/kde-frameworks/kirigami/kirigami-5.85.0.ebuild
deleted file mode 100644
index 0bf786edb731..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.85.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 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.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 ~riscv 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
-"
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_EXAMPLES=$(usex examples)
- )
-
- ecm_src_configure
-}
diff --git a/kde-frameworks/kirigami/kirigami-6.2.1.ebuild b/kde-frameworks/kirigami/kirigami-6.2.1.ebuild
new file mode 100644
index 000000000000..c782a7f01808
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-6.2.1.ebuild
@@ -0,0 +1,49 @@
+# 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://techbase.kde.org/Kirigami"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+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]"
+
+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
+}