commit: 5321417d01656ad5b43f1e5d268e44a1e7a31973 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Nov 21 20:53:16 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Nov 22 21:52:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5321417d
kde-plasma/breeze: Fix accidental menu padding See also: https://mail.kde.org/pipermail/distributions/2025-November/001645.html Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/breeze/breeze-6.5.3-r1.ebuild | 54 ++++++++++++++++++++++ .../files/breeze-6.5.3-menu-itemspacing.patch | 29 ++++++++++++ .../files/breeze-6.5.3-menu-reduce-margins.patch | 32 +++++++++++++ 3 files changed, 115 insertions(+) diff --git a/kde-plasma/breeze/breeze-6.5.3-r1.ebuild b/kde-plasma/breeze/breeze-6.5.3-r1.ebuild new file mode 100644 index 000000000000..5b560f1d5f5d --- /dev/null +++ b/kde-plasma/breeze/breeze-6.5.3-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.18.0 +QTMIN=6.9.1 +inherit ecm plasma.kde.org xdg + +DESCRIPTION="Breeze visual style for the Plasma desktop" +HOMEPAGE="https://invent.kde.org/plasma/breeze"; + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/frameworkintegration-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcolorscheme-${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-${KDE_CATV}:6 +" +RDEPEND="${DEPEND} + !<${CATEGORY}/${PN}-6.5.0:5 +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" +PDEPEND=">=kde-frameworks/breeze-icons-${KFMIN}:*" + +PATCHES=( + "${FILESDIR}/${P}-menu-itemspacing.patch" + "${FILESDIR}/${P}-menu-reduce-margins.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_QT6=ON + -DBUILD_QT5=OFF + ) + ecm_src_configure +} diff --git a/kde-plasma/breeze/files/breeze-6.5.3-menu-itemspacing.patch b/kde-plasma/breeze/files/breeze-6.5.3-menu-itemspacing.patch new file mode 100644 index 000000000000..919810abe27a --- /dev/null +++ b/kde-plasma/breeze/files/breeze-6.5.3-menu-itemspacing.patch @@ -0,0 +1,29 @@ +From 4a8a46aba6b9e39bfb02c7f46933079b5a50eff5 Mon Sep 17 00:00:00 2001 +From: Akseli Lahtinen <[email protected]> +Date: Wed, 19 Nov 2025 11:49:40 +0200 +Subject: [PATCH] Menu: Set ItemSpacing to 2 + +This had been forgotten to change in +https://invent.kde.org/plasma/breeze/-/merge_requests/563 + +This is the same spacing as QtQuick styles use +--- + kstyle/breezemetrics.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kstyle/breezemetrics.h b/kstyle/breezemetrics.h +index efad51c3c..647929013 100644 +--- a/kstyle/breezemetrics.h ++++ b/kstyle/breezemetrics.h +@@ -55,7 +55,7 @@ struct Metrics { + static constexpr int MenuItem_HighlightGap = 4; + static constexpr int MenuItem_ExtraLeftMargin = 4; + static constexpr int MenuItem_MarginHeight = 5; +- static constexpr int MenuItem_ItemSpacing = 4; ++ static constexpr int MenuItem_ItemSpacing = 2; + static constexpr int MenuItem_AcceleratorSpace = 16; + static constexpr int MenuItem_TextLeftMargin = 8; + +-- +GitLab + diff --git a/kde-plasma/breeze/files/breeze-6.5.3-menu-reduce-margins.patch b/kde-plasma/breeze/files/breeze-6.5.3-menu-reduce-margins.patch new file mode 100644 index 000000000000..6c9d8882378e --- /dev/null +++ b/kde-plasma/breeze/files/breeze-6.5.3-menu-reduce-margins.patch @@ -0,0 +1,32 @@ +From 2cd5b37dad8f213aab4029b6d3b80ca7f159ea50 Mon Sep 17 00:00:00 2001 +From: Nate Graham <[email protected]> +Date: Wed, 19 Nov 2025 15:05:59 -0700 +Subject: [PATCH] Menu: Reduce margins to better match QQC2 style + +The vertical padding was 1px too high, causing the highlights to +be taller than the qqc2-desktop-style version with the default font +settings. + +Amends 35967f0a3c3d742b825a2ad7d6507a2c282857a5 + +Resolves #24 +--- + kstyle/breezemetrics.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kstyle/breezemetrics.h b/kstyle/breezemetrics.h +index 647929013..d9b031358 100644 +--- a/kstyle/breezemetrics.h ++++ b/kstyle/breezemetrics.h +@@ -54,7 +54,7 @@ struct Metrics { + static constexpr int MenuItem_MarginWidth = 4; + static constexpr int MenuItem_HighlightGap = 4; + static constexpr int MenuItem_ExtraLeftMargin = 4; +- static constexpr int MenuItem_MarginHeight = 5; ++ static constexpr int MenuItem_MarginHeight = 4; + static constexpr int MenuItem_ItemSpacing = 2; + static constexpr int MenuItem_AcceleratorSpace = 16; + static constexpr int MenuItem_TextLeftMargin = 8; +-- +GitLab +
