[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1107668: marked as done (unblock: breeze/4:6.3.5-1)

Your message dated Thu, 12 Jun 2025 08:23:04 +0000
with message-id <E1uPdDE-00FQPY-2S@respighi.debian.org>
and subject line unblock breeze
has caused the Debian Bug report #1107668,
regarding unblock: breeze/4:6.3.5-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1107668: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1107668
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: breeze@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:breeze
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear Release Team,

please unblock package breeze.

[ Reason ]
It contains the following changes:
* New upstream release (6.3.5).
  - Kcursorgen: Add QDebug include.
  - Add missing includes.
* Backport upstream commits:
  - Fix truncated group box captions due to not taking actual font metrics.
  (kde#498582)
  - Fix radio button animation.

[ Tests ]
I’m daily driving Plasma using these changes and didn’t notice any
regression.

[ Risks ]
Only backport of upstream commits that apply cleanly. Further fixes can
easily be backported or the changes reverted.

[ Checklist ]
  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing


Thanks!


unblock breeze/4:6.3.5-1

diff -Nru breeze-6.3.4/CMakeLists.txt breeze-6.3.5/CMakeLists.txt
--- breeze-6.3.4/CMakeLists.txt	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/CMakeLists.txt	2025-05-06 19:55:40.000000000 +0200
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 project(breeze)
-set(PROJECT_VERSION "6.3.4")
+set(PROJECT_VERSION "6.3.5")
 set(PROJECT_VERSION_MAJOR 6)
 
 set(KF5_MIN_VERSION "5.102.0")
diff -Nru breeze-6.3.4/colors/BreezeClassic.colors breeze-6.3.5/colors/BreezeClassic.colors
--- breeze-6.3.4/colors/BreezeClassic.colors	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/colors/BreezeClassic.colors	2025-05-06 19:55:40.000000000 +0200
@@ -145,6 +145,7 @@
 Name[sk]=Klasický vánok
 Name[sl]=Sapica, klasična
 Name[sv]=Breeze klassisk
+Name[ta]=செந்தர பிரீஸ்
 Name[tr]=Esinti Klasik
 Name[uk]=Класична Breeze
 Name[x-test]=xxBreeze Classicxx
diff -Nru breeze-6.3.4/colors/BreezeDark.colors breeze-6.3.5/colors/BreezeDark.colors
--- breeze-6.3.4/colors/BreezeDark.colors	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/colors/BreezeDark.colors	2025-05-06 19:55:40.000000000 +0200
@@ -188,6 +188,7 @@
 Name[sr@ijekavianlatin]=Povetarac tamni
 Name[sr@latin]=Povetarac tamni
 Name[sv]=Breeze mörk
+Name[ta]=கரும் பிரீஸ்
 Name[tg]=Насими торик
 Name[tr]=Esinti Koyu
 Name[uk]=Темна Breeze
diff -Nru breeze-6.3.4/colors/BreezeLight.colors breeze-6.3.5/colors/BreezeLight.colors
--- breeze-6.3.4/colors/BreezeLight.colors	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/colors/BreezeLight.colors	2025-05-06 19:55:40.000000000 +0200
@@ -182,6 +182,7 @@
 Name[sk]=Svetlý vánok
 Name[sl]=Sapica, svetla
 Name[sv]=Breeze ljus
+Name[ta]=வெளிர் பிரீஸ்
 Name[tg]=Насими сабук
 Name[tr]=Esinti Açık
 Name[uk]=Світла Breeze
diff -Nru breeze-6.3.4/cursors/Breeze/Breeze/index.theme breeze-6.3.5/cursors/Breeze/Breeze/index.theme
--- breeze-6.3.4/cursors/Breeze/Breeze/index.theme	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/cursors/Breeze/Breeze/index.theme	2025-05-06 19:55:41.000000000 +0200
@@ -98,6 +98,7 @@
 Comment[sk]=Vánok od KDE VDG
 Comment[sl]=Sapica; izdelali pri KDE VDG
 Comment[sv]=Breeze av KDE:s visuella designgrupp
+Comment[ta]=கே.டீ.யீ. VDG வழங்கும் பிரீஸ்
 Comment[tg]=Насим аз KDE VDG
 Comment[tr]=KDE Görsel Tasarım grubundan Esinti
 Comment[uk]=Breeze, автори — KDE VDG
diff -Nru breeze-6.3.4/cursors/Breeze/src/index.theme breeze-6.3.5/cursors/Breeze/src/index.theme
--- breeze-6.3.4/cursors/Breeze/src/index.theme	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/cursors/Breeze/src/index.theme	2025-05-06 19:55:41.000000000 +0200
@@ -98,6 +98,7 @@
 Comment[sk]=Vánok od KDE VDG
 Comment[sl]=Sapica; izdelali pri KDE VDG
 Comment[sv]=Breeze av KDE:s visuella designgrupp
+Comment[ta]=கே.டீ.யீ. VDG வழங்கும் பிரீஸ்
 Comment[tg]=Насим аз KDE VDG
 Comment[tr]=KDE Görsel Tasarım grubundan Esinti
 Comment[uk]=Breeze, автори — KDE VDG
diff -Nru breeze-6.3.4/cursors/Breeze_Light/Breeze_Light/index.theme breeze-6.3.5/cursors/Breeze_Light/Breeze_Light/index.theme
--- breeze-6.3.4/cursors/Breeze_Light/Breeze_Light/index.theme	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/cursors/Breeze_Light/Breeze_Light/index.theme	2025-05-06 19:55:41.000000000 +0200
@@ -41,6 +41,7 @@
 Name[sk]=Svetlý vánok
 Name[sl]=Sapica, svetla
 Name[sv]=Breeze ljus
+Name[ta]=வெளிர் பிரீஸ்
 Name[tg]=Насими сабук
 Name[tr]=Esinti Açık
 Name[uk]=Світла Breeze
@@ -89,6 +90,7 @@
 Comment[sk]=Svetlý vánok od KDE VDG
 Comment[sl]=Sapica, svetla; izdelali pri KDE VDG
 Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
+Comment[ta]=கே.டீ.யீ. VDG வழங்கும் வெளிர் பிரீஸ்
 Comment[tg]=Насими сабук аз KDE VDG
 Comment[tr]=KDE Görsel Tasarım grubundan Esinti Açık
 Comment[uk]=Світла Breeze, автори — KDE VDG
diff -Nru breeze-6.3.4/cursors/Breeze_Light/src/index.theme breeze-6.3.5/cursors/Breeze_Light/src/index.theme
--- breeze-6.3.4/cursors/Breeze_Light/src/index.theme	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/cursors/Breeze_Light/src/index.theme	2025-05-06 19:55:41.000000000 +0200
@@ -41,6 +41,7 @@
 Name[sk]=Svetlý vánok
 Name[sl]=Sapica, svetla
 Name[sv]=Breeze ljus
+Name[ta]=வெளிர் பிரீஸ்
 Name[tg]=Насими сабук
 Name[tr]=Esinti Açık
 Name[uk]=Світла Breeze
@@ -89,6 +90,7 @@
 Comment[sk]=Svetlý vánok od KDE VDG
 Comment[sl]=Sapica, svetla; izdelali pri KDE VDG
 Comment[sv]=Breeze ljus av KDE:s visuella designgrupp
+Comment[ta]=கே.டீ.யீ. VDG வழங்கும் வெளிர் பிரீஸ்
 Comment[tg]=Насими сабук аз KDE VDG
 Comment[tr]=KDE Görsel Tasarım grubundan Esinti Açık
 Comment[uk]=Світла Breeze, автори — KDE VDG
diff -Nru breeze-6.3.4/cursors/src/kcursorgen/kcursorgen.cpp breeze-6.3.5/cursors/src/kcursorgen/kcursorgen.cpp
--- breeze-6.3.4/cursors/src/kcursorgen/kcursorgen.cpp	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/cursors/src/kcursorgen/kcursorgen.cpp	2025-05-06 19:55:41.000000000 +0200
@@ -7,6 +7,7 @@
 #include "options.h"
 
 #include <QCollator>
+#include <QDebug>
 #include <QDir>
 #include <QImage>
 #include <QJsonArray>
diff -Nru breeze-6.3.4/cursors/src/kcursorgen/main.cpp breeze-6.3.5/cursors/src/kcursorgen/main.cpp
--- breeze-6.3.4/cursors/src/kcursorgen/main.cpp	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/cursors/src/kcursorgen/main.cpp	2025-05-06 19:55:41.000000000 +0200
@@ -8,6 +8,7 @@
 
 #include <QCommandLineParser>
 #include <QCoreApplication>
+#include <QDebug>
 #include <QString>
 
 int main(int argc, char **argv)
diff -Nru breeze-6.3.4/debian/changelog breeze-6.3.5/debian/changelog
--- breeze-6.3.4/debian/changelog	2025-04-03 01:01:33.000000000 +0200
+++ breeze-6.3.5/debian/changelog	2025-05-19 00:58:39.000000000 +0200
@@ -1,3 +1,16 @@
+breeze (4:6.3.5-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (6.3.5).
+    - Kcursorgen: Add QDebug include.
+    - Add missing includes.
+  * Backport upstream commits:
+    - Fix truncated group box captions due to not taking actual font metrics.
+    (kde#498582)
+    - Fix radio button animation.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Mon, 19 May 2025 00:58:39 +0200
+
 breeze (4:6.3.4-1) unstable; urgency=medium
 
   [ Patrick Franz ]
diff -Nru breeze-6.3.4/debian/patches/series breeze-6.3.5/debian/patches/series
--- breeze-6.3.4/debian/patches/series	2025-02-12 01:37:36.000000000 +0100
+++ breeze-6.3.5/debian/patches/series	2025-05-19 00:58:39.000000000 +0200
@@ -1 +1,3 @@
 upstream_9c13ba31_colors_make_breeze_dark_darker.patch
+upstream_9f6f7eb6_kstyle-Take-into-account-widget-font-when-drawing-QGroupBox.patch
+upstream_b3a3b295_kstyle-Fix-radio-button-animation.patch
diff -Nru breeze-6.3.4/debian/patches/upstream_9f6f7eb6_kstyle-Take-into-account-widget-font-when-drawing-QGroupBox.patch breeze-6.3.5/debian/patches/upstream_9f6f7eb6_kstyle-Take-into-account-widget-font-when-drawing-QGroupBox.patch
--- breeze-6.3.4/debian/patches/upstream_9f6f7eb6_kstyle-Take-into-account-widget-font-when-drawing-QGroupBox.patch	1970-01-01 01:00:00.000000000 +0100
+++ breeze-6.3.5/debian/patches/upstream_9f6f7eb6_kstyle-Take-into-account-widget-font-when-drawing-QGroupBox.patch	2025-05-19 00:58:39.000000000 +0200
@@ -0,0 +1,29 @@
+From 9f6f7eb6f2bf61b66f0712e5975c5ed6ba2465f3 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Thu, 1 May 2025 18:06:51 +0200
+Subject: [PATCH] kstyle: Take into account widget font when drawing QGroupBox
+
+We do it when calculating the metrics but not when actually drawing
+the widget, causing it to draw out of bounds when there's a custom font.
+
+BUG: 498582
+---
+ kstyle/breezestyle.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
+index f76b0c9b5..09cee6003 100644
+--- a/kstyle/breezestyle.cpp
++++ b/kstyle/breezestyle.cpp
+@@ -7347,7 +7347,7 @@ bool Style::drawGroupBoxComplexControl(const QStyleOptionComplex *option, QPaint
+     }
+ 
+     // Text for label
+-    QFont font = qApp->font();
++    QFont font = widget ? widget->font() : qApp->font("QGroupBox");
+     if (groupBoxOption->features == QStyleOptionFrame::Flat && !(groupBoxOption->subControls & SC_GroupBoxCheckBox)) {
+         font.setPointSize(font.pointSize() + 1);
+         font.setBold(true);
+-- 
+GitLab
+
diff -Nru breeze-6.3.4/debian/patches/upstream_b3a3b295_kstyle-Fix-radio-button-animation.patch breeze-6.3.5/debian/patches/upstream_b3a3b295_kstyle-Fix-radio-button-animation.patch
--- breeze-6.3.4/debian/patches/upstream_b3a3b295_kstyle-Fix-radio-button-animation.patch	1970-01-01 01:00:00.000000000 +0100
+++ breeze-6.3.5/debian/patches/upstream_b3a3b295_kstyle-Fix-radio-button-animation.patch	2025-05-19 00:58:39.000000000 +0200
@@ -0,0 +1,57 @@
+From b3a3b2956d837061d0f7577671cbc780ea0a4d78 Mon Sep 17 00:00:00 2001
+From: Kai Uwe Broulik <kde@privat.broulik.de>
+Date: Tue, 27 May 2025 08:24:42 +0000
+Subject: [PATCH] kstyle: Fix radio button animation
+
+adjustFactor (it's not a factor though) is subtracted from markerRect
+on both sides which results in the circle shrinking past zero and then
+growing again.
+
+Instead, draw the ellipse by animating its radius.
+
+
+(cherry picked from commit 6a65378eea777f13144315e1831122e06f186016)
+
+Co-authored-by: Kai Uwe Broulik <kde@privat.broulik.de>
+---
+ kstyle/breezehelper.cpp | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/kstyle/breezehelper.cpp b/kstyle/breezehelper.cpp
+index 5d7ff5a88..547a6f368 100644
+--- a/kstyle/breezehelper.cpp
++++ b/kstyle/breezehelper.cpp
+@@ -1097,23 +1097,19 @@ void Helper::renderRadioButton(QPainter *painter,
+     painter->setBrush(palette.text());
+     painter->setPen(Qt::NoPen);
+ 
+-    QRectF markerRect;
+-    markerRect = frameRect.adjusted(6, 6, -6, -6);
+-
+-    qreal adjustFactor;
++    const int radius = (std::min(frameRect.width(), frameRect.height()) - 12) / 2;
++    const QPointF center = frameRect.center();
+ 
+     // mark
+     switch (state) {
+     case RadioOn:
+-        painter->drawEllipse(markerRect);
+-
++        painter->drawEllipse(center, radius, radius);
+         break;
+-    case RadioAnimated:
+-        adjustFactor = markerRect.height() * (1 - animation);
+-        markerRect.adjust(adjustFactor, adjustFactor, -adjustFactor, -adjustFactor);
+-        painter->drawEllipse(markerRect);
+-
++    case RadioAnimated: {
++        const qreal animationRadius = radius * animation;
++        painter->drawEllipse(center, animationRadius, animationRadius);
+         break;
++    }
+     default:
+         break;
+     }
+-- 
+GitLab
+
diff -Nru breeze-6.3.4/kstyle/breeze.themerc breeze-6.3.5/kstyle/breeze.themerc
--- breeze-6.3.4/kstyle/breeze.themerc	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/kstyle/breeze.themerc	2025-05-06 19:55:41.000000000 +0200
@@ -106,6 +106,7 @@
 Comment[sr@ijekavianlatin]=Stil vidžetâ̂ za Radne okvire KDE‑a
 Comment[sr@latin]=Stil vidžetâ̂ za Radne okvire KDE‑a
 Comment[sv]=Grafisk komponentstil för KDE Ramverk
+Comment[ta]=கே.டீ.யீ. நிரலகங்களுக்கான தோற்றத்திட்டம்
 Comment[tg]=Услуби виҷет барои сохторҳои KDE
 Comment[tr]=KDE Frameworks için araç takımı biçemi
 Comment[uk]=Стиль віджетів KDE Frameworks
diff -Nru breeze-6.3.4/po/es/breeze_kwin_deco.po breeze-6.3.5/po/es/breeze_kwin_deco.po
--- breeze-6.3.4/po/es/breeze_kwin_deco.po	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/po/es/breeze_kwin_deco.po	2025-05-06 19:55:41.000000000 +0200
@@ -1,15 +1,15 @@
 # Spanish translations for breeze_kwin_deco.po package.
-# Copyright (C) 2014 This_file_is_part_of_KDE
+# Copyright (C) 2014-2025 This file is copyright:
 # This file is distributed under the same license as the breeze package.
-#
 # Automatically generated, 2014.
+#
 # SPDX-FileCopyrightText: 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2022, 2023, 2025 Eloy Cuadra <ecuadra@eloihr.net>
 msgid ""
 msgstr ""
 "Project-Id-Version: breeze_kwin_deco\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2024-04-06 00:39+0000\n"
-"PO-Revision-Date: 2025-03-09 01:27+0100\n"
+"PO-Revision-Date: 2025-05-04 01:55+0100\n"
 "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
 "Language: es\n"
diff -Nru breeze-6.3.4/po/es/breeze_style_config.po breeze-6.3.5/po/es/breeze_style_config.po
--- breeze-6.3.4/po/es/breeze_style_config.po	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/po/es/breeze_style_config.po	2025-05-06 19:55:41.000000000 +0200
@@ -1,5 +1,5 @@
 # Spanish translations for breeze_style_config.po package.
-# Copyright (C) 2014 This_file_is_part_of_KDE
+# Copyright (C) 2014-2025 This file is copyright:
 # This file is distributed under the same license as the breeze package.
 #
 # Automatically generated, 2014.
@@ -9,7 +9,7 @@
 "Project-Id-Version: breeze_style_config\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2024-08-29 00:40+0000\n"
-"PO-Revision-Date: 2025-03-09 01:27+0100\n"
+"PO-Revision-Date: 2025-05-04 01:56+0100\n"
 "Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
 "Language-Team: Spanish <kde-l10n-es@kde.org>\n"
 "Language: es\n"
diff -Nru breeze-6.3.4/wallpapers/Next/metadata.json breeze-6.3.5/wallpapers/Next/metadata.json
--- breeze-6.3.4/wallpapers/Next/metadata.json	2025-04-02 05:35:08.000000000 +0200
+++ breeze-6.3.5/wallpapers/Next/metadata.json	2025-05-06 19:55:41.000000000 +0200
@@ -60,9 +60,11 @@
         "Name[is]": "Nuvole",
         "Name[it]": "Nuvole",
         "Name[ka]": "Nuvole",
+        "Name[ko]": "Nuvole",
         "Name[nl]": "Nuvole",
         "Name[pl]": "Nuvole",
         "Name[pt_BR]": "Nuvole",
+        "Name[ru]": "Nuvole",
         "Name[sl]": "Nuvole",
         "Name[sv]": "Nuvole",
         "Name[tr]": "Nuvole",

--- End Message ---
--- Begin Message --- 
Unblocked.

--- End Message ---
Reply to: