Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/kde-plasma/breeze
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/breeze')
-rw-r--r--kde-plasma/breeze/Manifest4
-rw-r--r--kde-plasma/breeze/breeze-5.24.6-r1.ebuild54
-rw-r--r--kde-plasma/breeze/breeze-5.27.11.ebuild (renamed from kde-plasma/breeze/breeze-5.25.4.ebuild)24
-rw-r--r--kde-plasma/breeze/breeze-6.0.4.ebuild72
-rw-r--r--kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-progressbar-style-in-rtl.patch58
-rw-r--r--kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-sliders-in-rtl.patch76
-rw-r--r--kde-plasma/breeze/metadata.xml1
7 files changed, 84 insertions, 205 deletions
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 6d6b93ae65fd..48118648eab3 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,2 +1,2 @@
-DIST breeze-5.24.6.tar.xz 43037288 BLAKE2B 69245aa03eb5d8e8f26a45a7bbba246a19b07d96e0c193cdac7a4bf4e538810269a4fa575f68ee9f0c6a362a50dead58de484f06f4258f1fa773e654fb6b870c SHA512 976744eeeaddd2d165315f17491ee67cc63d03f935a29eda99afefed51e642daf60aa4d6a71621f15e1a87138d8d91a0e36f081ae30e80ef31796067e858ca93
-DIST breeze-5.25.4.tar.xz 31155744 BLAKE2B 7dcf307a562f9502296851d953407134b826992f39acadd960ef7c24e82ac6671ea3cbc0b98de53b1019b5b9fef764d5fa11ae1773bca7aa67eb3f60f6395786 SHA512 df5526f67cfc244564c8dd1d6aa3abed73a4bfbe16356fbaafb7add1bc4eb8a426b76094ec4e8166041055b62b34bf2cbfcc4d5df7b9c04327dc2528099fc691
+DIST breeze-5.27.11.tar.xz 87586968 BLAKE2B de90aa5203e6252c2e5400daf46f187d522319888f1c44006eeaaa4f57e87de97911511a9448fb286218b64b0526546ca341868c05f83f135bbe85ca9910ea1c SHA512 71d0b7421c7fa80e67410777fc37aa5ac0f51e74d593baa5ebd38e7f0313986974a1eb606e26c1b335b9ceb4b95717f43d6a45a25dd8de705d49d5a3f74e2bd6
+DIST breeze-6.0.4.tar.xz 58037172 BLAKE2B 1e54faf316cf5820bd5103b82034931c9ad15538d95ac9962cb6a00268ae0363446276e398bd46c471b0b8236bcafe1cb69d316fd6f8a9fce5e31d5cc67cf70f SHA512 47e7d94d4c7acbd350e1698361774534de2f0306716930fe38128fc80231f86614ed153471937eecd6cdab8df2f98f4e27747b2c2ff23d23ccb6b18aa2633b9a
diff --git a/kde-plasma/breeze/breeze-5.24.6-r1.ebuild b/kde-plasma/breeze/breeze-5.24.6-r1.ebuild
deleted file mode 100644
index 45ebac3dbbad..000000000000
--- a/kde-plasma/breeze/breeze-5.24.6-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.92.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.4
-inherit ecm plasma.kde.org
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/breeze"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="X"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}:5
- >=kde-frameworks/frameworkintegration-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-plasma/kdecoration-${PVCUT}:5
- X? ( x11-libs/libxcb )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
- >=kde-frameworks/breeze-icons-${KFMIN}:5
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-qqc2-sliders-in-rtl.patch" # KDE-bug #430101
- "${FILESDIR}/${P}-fix-qqc2-progressbar-style-in-rtl.patch" # KDE-bug #430101
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package X XCB)
- )
- ecm_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-5.25.4.ebuild b/kde-plasma/breeze/breeze-5.27.11.ebuild
index 1c1bcffb4086..3740421bc973 100644
--- a/kde-plasma/breeze/breeze-5.25.4.ebuild
+++ b/kde-plasma/breeze/breeze-5.27.11.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-KFMIN=5.95.0
+KFMIN=5.106.0
PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.5
+QTMIN=5.15.9
inherit ecm plasma.kde.org
DESCRIPTION="Breeze visual style for the Plasma desktop"
@@ -13,8 +13,8 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="X"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
+IUSE=""
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -30,20 +30,14 @@ RDEPEND="
>=kde-frameworks/kguiaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-plasma/kdecoration-${PVCUT}:5
- X? ( x11-libs/libxcb )
"
DEPEND="${RDEPEND}"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
PDEPEND="
- >=kde-frameworks/breeze-icons-${KFMIN}:5
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
+ >=kde-frameworks/breeze-icons-${KFMIN}:*
+ >=kde-plasma/kde-cli-tools-${PVCUT}:*
"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package X XCB)
- )
- ecm_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-6.0.4.ebuild b/kde-plasma/breeze/breeze-6.0.4.ebuild
new file mode 100644
index 000000000000..7e324701f8a9
--- /dev/null
+++ b/kde-plasma/breeze/breeze-6.0.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KF5MIN=5.115.0
+KFMIN=6.0
+PVCUT=$(ver_cut 1-3)
+QT5MIN=5.15.12
+QTMIN=6.6.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="Breeze visual style for the Plasma desktop"
+HOMEPAGE="https://invent.kde.org/plasma/breeze"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="qt5"
+
+# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras
+RDEPEND="
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=kde-frameworks/frameworkintegration-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kguiaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6[X]
+ >=kde-plasma/kdecoration-${PVCUT}:6
+ qt5? (
+ >=dev-qt/qtdbus-${QT5MIN}:5
+ >=dev-qt/qtdeclarative-${QT5MIN}:5
+ >=dev-qt/qtgui-${QT5MIN}:5
+ >=dev-qt/qtwidgets-${QT5MIN}:5
+ >=dev-qt/qtx11extras-${QT5MIN}:5
+ >=kde-frameworks/frameworkintegration-${KF5MIN}:5
+ >=kde-frameworks/kcmutils-${KF5MIN}:5
+ >=kde-frameworks/kconfig-${KF5MIN}:5
+ >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
+ >=kde-frameworks/kcoreaddons-${KF5MIN}:5
+ >=kde-frameworks/kguiaddons-${KF5MIN}:5
+ >=kde-frameworks/ki18n-${KF5MIN}:5
+ >=kde-frameworks/kiconthemes-${KF5MIN}:5
+ >=kde-frameworks/kirigami-${KF5MIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5
+ >=kde-frameworks/kwindowsystem-${KF5MIN}:5
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ qt5? ( >=kde-frameworks/kcmutils-${KF5MIN}:5 )
+"
+PDEPEND="
+ >=kde-frameworks/breeze-icons-${KFMIN}:*
+ >=kde-plasma/kde-cli-tools-${PVCUT}:*
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_QT6=ON
+ -DBUILD_QT5=$(usex qt5)
+ )
+ ecm_src_configure
+}
diff --git a/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-progressbar-style-in-rtl.patch b/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-progressbar-style-in-rtl.patch
deleted file mode 100644
index 36e4f952d980..000000000000
--- a/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-progressbar-style-in-rtl.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d7c0ab28df83eb4a4c39495a25e609047c735d59 Mon Sep 17 00:00:00 2001
-From: ivan tkachenko <me@ratijas.tk>
-Date: Sat, 4 Jun 2022 05:00:53 +0300
-Subject: [PATCH] KStyle: Fix QQC2 ProgressBar desktop style in RTL layout
- direction
-
-BUG: 430101
-
-(cherry picked from commit 2bf9fc4c7be280e2b77f7c150855e0fca0b80d9a)
-
-* asturm 2022-07-26: Merged with clang-format changes in commit
- 32149dc002ae574ed41f111bf52712b1765b906b
-
----
- kstyle/breezestyle.cpp | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
-index c9fba292..0d7a8432 100644
---- a/kstyle/breezestyle.cpp
-+++ b/kstyle/breezestyle.cpp
-@@ -1749,23 +1749,27 @@ namespace Breeze
- const bool horizontal( BreezePrivate::isProgressBarHorizontal( progressBarOption ) );
-
- // check inverted appearance
-- const bool inverted( progressBarOption->invertedAppearance );
-+ bool inverted(progressBarOption->invertedAppearance);
-+ if (horizontal) {
-+ // un-invert in RTL layout
-+ inverted ^= option->direction == Qt::RightToLeft;
-+ }
-
- // get progress and steps
-- const qreal progress( progressBarOption->progress - progressBarOption->minimum );
-+ const int progress(progressBarOption->progress - progressBarOption->minimum);
- const int steps( qMax( progressBarOption->maximum - progressBarOption->minimum, 1 ) );
-
- //Calculate width fraction
-- const qreal widthFrac = qMin( qreal(1), progress/steps );
-+ const qreal position = qreal(progress) / qreal(steps);
-+ const qreal visualPosition = inverted ? 1 - position : position;
-
- // convert the pixel width
-- const int indicatorSize( widthFrac*( horizontal ? rect.width():rect.height() ) );
-+ const int indicatorSize(visualPosition * (horizontal ? rect.width() : rect.height()));
-
- QRect indicatorRect;
- if( horizontal )
- {
--
-- indicatorRect = QRect( inverted ? ( rect.right() - indicatorSize + 1):rect.left(), rect.y(), indicatorSize, rect.height() );
-+ indicatorRect = QRect(rect.left(), rect.y(), indicatorSize, rect.height());
- indicatorRect = visualRect( option->direction, rect, indicatorRect );
-
- } else indicatorRect = QRect( rect.x(), inverted ? rect.top() : (rect.bottom() - indicatorSize + 1), rect.width(), indicatorSize );
---
-2.35.1
-
diff --git a/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-sliders-in-rtl.patch b/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-sliders-in-rtl.patch
deleted file mode 100644
index b8b3504a0a0e..000000000000
--- a/kde-plasma/breeze/files/breeze-5.24.6-fix-qqc2-sliders-in-rtl.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 53f24305536850b244b730f9a04024daf02e753b Mon Sep 17 00:00:00 2001
-From: Jan Blackquill <uhhadd@gmail.com>
-Date: Fri, 3 Jun 2022 17:34:02 -0400
-Subject: [PATCH] kstyle: fix qqc2 desktop style sliders in RtL
-
-We don't do any mirroring of the slider groove rects or tickmarks based on layout direction,
-and this causes qqc2-desktop-style sliders to render in the wrong direction.
-Swapping the leftRect and the rightRect when option->direction == Qt::RightToLeft
-fixes this.
-
-This wasn't broken with QWidgets because QSlider relies on (ab)using the upsideDown option
-in order to achieve mirroring of the groove instead of option->direction, and consequently,
-this change doesn't affect Qt widgets apps at all.
-
-BUG: 430101
-(cherry picked from commit e8b1d4aa47daf99041332f43c29fabdf70f25004)
-
-* asturm 2022-07-26: Merged with clang-format changes in commit
- 32149dc002ae574ed41f111bf52712b1765b906b
-
----
- kstyle/breezestyle.cpp | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
-index 2ef2ea98..c9fba292 100644
---- a/kstyle/breezestyle.cpp
-+++ b/kstyle/breezestyle.cpp
-@@ -51,6 +51,7 @@
- #include <QDialogButtonBox>
- #include <QGraphicsItem>
- #include <QGraphicsProxyWidget>
-+#include <qnamespace.h>
-
- #if BREEZE_HAVE_QTQUICK
- #include <QQuickWindow>
-@@ -6679,6 +6680,7 @@ namespace Breeze
- }
-
- // colors
-+ const auto reverseTicks = option->direction == Qt::LeftToRight ? upsideDown : !upsideDown;
- const auto base( _helper->separatorColor( palette ) );
- const auto &highlight = hasHighlightNeutral( widget, option, mouseOver, hasFocus ) ? _helper->neutralText( palette ) : palette.color( QPalette::Highlight );
-
-@@ -6693,8 +6695,8 @@ namespace Breeze
- int position( sliderPositionFromValue( sliderOption->minimum, sliderOption->maximum, current, available ) + fudge );
- foreach( const QLine& tickLine, tickLines )
- {
-- if( horizontal ) painter->drawLine( tickLine.translated( upsideDown ? (rect.width() - position) : position, 0 ) );
-- else painter->drawLine( tickLine.translated( 0, upsideDown ? (rect.height() - position):position ) );
-+ if( horizontal ) painter->drawLine(tickLine.translated(reverseTicks ? (rect.width() - position) : position, 0));
-+ else painter->drawLine(tickLine.translated(0, reverseTicks ? (rect.height() - position) : position));
- }
-
- // go to next position
-@@ -6729,11 +6731,15 @@ namespace Breeze
-
- auto leftRect( grooveRect );
- leftRect.setRight( handleRect.right() - Metrics::Slider_ControlThickness/2 );
-- _helper->renderSliderGroove( painter, leftRect, upsideDown ? grooveColor:highlight );
-
- auto rightRect( grooveRect );
- rightRect.setLeft( handleRect.left() + Metrics::Slider_ControlThickness/2 );
-- _helper->renderSliderGroove( painter, rightRect, upsideDown ? highlight:grooveColor );
-+
-+ if (option->direction == Qt::RightToLeft)
-+ std::swap(leftRect, rightRect);
-+
-+ _helper->renderSliderGroove(painter, leftRect, upsideDown ? grooveColor : highlight);
-+ _helper->renderSliderGroove(painter, rightRect, upsideDown ? highlight : grooveColor);
-
- } else {
-
---
-2.35.1
-
diff --git a/kde-plasma/breeze/metadata.xml b/kde-plasma/breeze/metadata.xml
index d925f2439758..691fe86ecc98 100644
--- a/kde-plasma/breeze/metadata.xml
+++ b/kde-plasma/breeze/metadata.xml
@@ -7,5 +7,6 @@
</maintainer>
<upstream>
<bugs-to>https://bugs.kde.org/</bugs-to>
+ <remote-id type="kde-invent">plasma/breeze</remote-id>
</upstream>
</pkgmetadata>