Package: release.debian.org
Severity: normal
X-Debbugs-Cc: umbrello@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:umbrello
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team,
please unblock package umbrello.
[ Reason ]
It contains the following changes:
* Point upstream source to invent git repo.
* New upstream release (25.04.1).
- Fix showing white diagram background on KDE desktop setup with dark
theme. (kde#502898)
* New upstream release (25.04.2).
- Fix 'Creating a new document after adding two diagrams segfaults'.
(kde#504940)
The complete debdiff contains a huge amount of translation updates so
I’m attaching a simple diff trimmed from these for your convenience :
diff -ur --exclude=po umbrello-25.04.0 umbrello-25.04.2
[ Tests ]
- Tested launching umbrello and creating / saving a simple diagram.
- Upstream test suite passes in sbuild.
[ Risks ]
Upstream point releases only contain targetted commits. 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 umbrello/4:25.04.2-1
Attachment:
umbrello_25.04.0-1.dsc_umbrello_25.04.2-1.dsc.debdiff.gz
Description: application/gzip
diff -ur '--exclude=po' umbrello-25.04.0/CMakeLists.txt umbrello-25.04.2/CMakeLists.txt
--- umbrello-25.04.0/CMakeLists.txt 2025-04-08 23:13:31.000000000 +0200
+++ umbrello-25.04.2/CMakeLists.txt 2025-06-02 22:00:12.000000000 +0200
@@ -9,7 +9,7 @@
# KDE Application Version, managed by release script
set (RELEASE_SERVICE_VERSION_MAJOR "25")
set (RELEASE_SERVICE_VERSION_MINOR "04")
-set (RELEASE_SERVICE_VERSION_MICRO "0")
+set (RELEASE_SERVICE_VERSION_MICRO "2")
set(UMBRELLO_VERSION_MAJOR ${RELEASE_SERVICE_VERSION_MAJOR})
set(UMBRELLO_VERSION_MINOR ${RELEASE_SERVICE_VERSION_MINOR})
diff -ur '--exclude=po' umbrello-25.04.0/debian/changelog umbrello-25.04.2/debian/changelog
--- umbrello-25.04.0/debian/changelog 2025-04-17 22:24:27.000000000 +0200
+++ umbrello-25.04.2/debian/changelog 2025-06-09 23:41:20.000000000 +0200
@@ -1,3 +1,16 @@
+umbrello (4:25.04.2-1) unstable; urgency=medium
+
+ [ Aurélien COUDERC ]
+ * Point upstream source to invent git repo.
+ * New upstream release (25.04.1).
+ - Fix showing white diagram background on KDE desktop setup with dark
+ theme. (kde#502898)
+ * New upstream release (25.04.2).
+ - Fix 'Creating a new document after adding two diagrams segfaults'.
+ (kde#504940)
+
+ -- Aurélien COUDERC <coucouf@debian.org> Mon, 09 Jun 2025 23:41:20 +0200
+
umbrello (4:25.04.0-1) unstable; urgency=medium
[ Aurélien COUDERC ]
diff -ur '--exclude=po' umbrello-25.04.0/debian/copyright umbrello-25.04.2/debian/copyright
--- umbrello-25.04.0/debian/copyright 2024-10-18 09:12:44.000000000 +0200
+++ umbrello-25.04.2/debian/copyright 2025-06-03 18:52:57.000000000 +0200
@@ -3,7 +3,7 @@
Upstream-Contact: Emmanuel Lepage Vallee <elv1313@gmail.com>
Jeremy Paul Whiting <jpwhiting@kde.org>
Ralf Habacker <ralf.habacker@freenet.de>
-Source: https://download.kde.org/stable/release-service/*/src/
+Source: https://invent.kde.org/sdk/umbrello
Files: *
Copyright: 2002, 2003 Roberto Raggi <roberto@kdevelop.org>
diff -ur '--exclude=po' umbrello-25.04.0/doc/xml/umbrello-diagrams.dtd umbrello-25.04.2/doc/xml/umbrello-diagrams.dtd
--- umbrello-25.04.0/doc/xml/umbrello-diagrams.dtd 2025-04-08 23:13:31.000000000 +0200
+++ umbrello-25.04.2/doc/xml/umbrello-diagrams.dtd 2025-06-02 22:00:12.000000000 +0200
@@ -63,6 +63,7 @@
snapy CDATA #IMPLIED
textcolor CDATA #IMPLIED
type CDATA #IMPLIED
+ usebackgroundcolor CDATA #IMPLIED
usefillcolor CDATA #IMPLIED
xmi.id CDATA #IMPLIED
zoom CDATA #IMPLIED
diff -ur '--exclude=po' umbrello-25.04.0/.gitlab-ci.yml umbrello-25.04.2/.gitlab-ci.yml
--- umbrello-25.04.0/.gitlab-ci.yml 2025-04-08 23:13:31.000000000 +0200
+++ umbrello-25.04.2/.gitlab-ci.yml 2025-06-02 22:00:12.000000000 +0200
@@ -9,9 +9,3 @@
- /gitlab-templates/windows.yml
- /gitlab-templates/flatpak.yml
- /gitlab-templates/craft-windows-mingw64.yml
-suse_tumbleweed_qt515:
- except:
- - qt4.8.6-kdelibs4.14.9
-freebsd14_qt515:
- except:
- - qt4.8.6-kdelibs4.14.9
diff -ur '--exclude=po' umbrello-25.04.0/umbrello/dialogs/pages/uioptionspage.cpp umbrello-25.04.2/umbrello/dialogs/pages/uioptionspage.cpp
--- umbrello-25.04.0/umbrello/dialogs/pages/uioptionspage.cpp 2025-04-08 23:13:31.000000000 +0200
+++ umbrello-25.04.2/umbrello/dialogs/pages/uioptionspage.cpp 2025-06-02 22:00:12.000000000 +0200
@@ -110,6 +110,7 @@
m_bgColorCB = new QCheckBox(i18n("Custom background color"), m_colorGB);
colorLayout->addWidget(m_bgColorCB, 4, 0);
+ m_bgColorCB->setChecked(m_options->uiState.useBackgroundColor);
m_bgColorB = new KColorButton(m_options->uiState.backgroundColor, m_colorGB);
colorLayout->addWidget(m_bgColorB, 4, 1);
@@ -176,6 +177,7 @@
m_options->uiState.lineColor = m_lineColorB->color();
m_options->uiState.lineWidth = m_lineWidthB->value();
m_options->uiState.backgroundColor = m_bgColorB->color();
+ m_options->uiState.useBackgroundColor = m_bgColorCB->isChecked();
m_options->uiState.gridDotColor = m_gridColorB->color();
m_options->generalState.layoutType = m_layoutTypeW->currentLayout();
UmbrelloSettings::setRightToLeftUI(m_rightToLeftUI->isChecked());
diff -ur '--exclude=po' umbrello-25.04.0/umbrello/optionstate.cpp umbrello-25.04.2/umbrello/optionstate.cpp
--- umbrello-25.04.0/umbrello/optionstate.cpp 2025-04-08 23:13:31.000000000 +0200
+++ umbrello-25.04.2/umbrello/optionstate.cpp 2025-06-02 22:00:12.000000000 +0200
@@ -147,6 +147,7 @@
textColor = UmbrelloSettings::textColor();
font = UmbrelloSettings::uiFont();
backgroundColor = UmbrelloSettings::backgroundColor();
+ useBackgroundColor = UmbrelloSettings::useBackgroundColor();
gridDotColor = UmbrelloSettings::gridDotColor();
}
@@ -159,6 +160,7 @@
UmbrelloSettings::setTextColor(textColor);
UmbrelloSettings::setUiFont(font);
UmbrelloSettings::setBackgroundColor(backgroundColor);
+ UmbrelloSettings::setUseBackgroundColor(useBackgroundColor);
UmbrelloSettings::setGridDotColor(gridDotColor);
}
@@ -169,6 +171,7 @@
void UIState::saveToXMI(QXmlStreamWriter& writer)
{
writer.writeAttribute(QStringLiteral("backgroundcolor"), backgroundColor.name());
+ writer.writeAttribute(QStringLiteral("usebackgroundcolor"), QString::number(useBackgroundColor));
writer.writeAttribute(QStringLiteral("fillcolor"), fillColor.name());
writer.writeAttribute(QStringLiteral("font"), font.toString());
writer.writeAttribute(QStringLiteral("griddotcolor"), gridDotColor.name());
@@ -209,6 +212,10 @@
QString textColor = element.attribute(QStringLiteral("textcolor"));
if (!textColor.isEmpty())
this->textColor = QColor(textColor);
+
+ QString usebackgroundcolor = element.attribute(QStringLiteral("usebackgroundcolor"), QStringLiteral("0"));
+ this->useBackgroundColor = (bool)usebackgroundcolor.toInt();
+
QString usefillcolor = element.attribute(QStringLiteral("usefillcolor"), QStringLiteral("0"));
this->useFillColor = (bool)usefillcolor.toInt();
diff -ur '--exclude=po' umbrello-25.04.0/umbrello/optionstate.h umbrello-25.04.2/umbrello/optionstate.h
--- umbrello-25.04.0/umbrello/optionstate.h 2025-04-08 23:13:31.000000000 +0200
+++ umbrello-25.04.2/umbrello/optionstate.h 2025-06-02 22:00:12.000000000 +0200
@@ -85,6 +85,7 @@
QColor textColor;
QFont font;
QColor backgroundColor;
+ bool useBackgroundColor;
QColor gridDotColor;
};
diff -ur '--exclude=po' umbrello-25.04.0/umbrello/umbrello.kcfg umbrello-25.04.2/umbrello/umbrello.kcfg
--- umbrello-25.04.0/umbrello/umbrello.kcfg 2025-04-08 23:13:31.000000000 +0200
+++ umbrello-25.04.2/umbrello/umbrello.kcfg 2025-06-02 22:00:12.000000000 +0200
@@ -178,6 +178,11 @@
<whatsthis>The Color of the diagram background</whatsthis>
<default>white</default>
</entry>
+ <entry name="useBackgroundColor" type="Bool">
+ <label>Use background color</label>
+ <whatsthis>Enables/Disables the usage of a custom background color</whatsthis>
+ <default>false</default>
+ </entry>
<entry name="gridDotColor" type="Color">
<label>Grid Dot Color</label>
<whatsthis>The Color of the grid dots</whatsthis>
diff -ur '--exclude=po' umbrello-25.04.0/umbrello/umlmodel/folder.cpp umbrello-25.04.2/umbrello/umlmodel/folder.cpp
--- umbrello-25.04.0/umbrello/umlmodel/folder.cpp 2025-04-08 23:13:31.000000000 +0200
+++ umbrello-25.04.2/umbrello/umlmodel/folder.cpp 2025-06-02 22:00:12.000000000 +0200
@@ -232,7 +232,7 @@
f->removeAllViews();
}
- for(UMLView *v : m_diagrams) {
+ for(UMLView *v : UMLViewList(m_diagrams)) {
// TODO ------------------ check this code - bad: calling back to UMLDoc::removeView()
v->umlScene()->removeAllAssociations(); // note : It may not be apparent, but when we remove all associations
// from a view, it also causes any UMLAssociations that lack parent
diff -ur '--exclude=po' umbrello-25.04.0/umbrello/umlscene.cpp umbrello-25.04.2/umbrello/umlscene.cpp
--- umbrello-25.04.0/umbrello/umlscene.cpp 2025-04-08 23:13:31.000000000 +0200
+++ umbrello-25.04.2/umbrello/umlscene.cpp 2025-06-02 22:00:12.000000000 +0200
@@ -596,7 +596,8 @@
void UMLScene::setOptionState(const Settings::OptionState& options)
{
m_Options = options;
- setBackgroundBrush(options.uiState.backgroundColor);
+ if (options.uiState.useBackgroundColor)
+ setBackgroundBrush(options.uiState.backgroundColor);
setGridDotColor(options.uiState.gridDotColor);
}
@@ -3884,7 +3885,8 @@
QString localid = qElement.attribute(QStringLiteral("localid"), QStringLiteral("0"));
// option state
m_Options.loadFromXMI(qElement);
- setBackgroundBrush(m_Options.uiState.backgroundColor);
+ if (m_Options.uiState.useBackgroundColor)
+ setBackgroundBrush(m_Options.uiState.backgroundColor);
setGridDotColor(m_Options.uiState.gridDotColor);
//misc
QString showgrid = qElement.attribute(QStringLiteral("showgrid"), QStringLiteral("0"));