Package: release.debian.org
Severity: normal
X-Debbugs-Cc: kate@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:kate
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team,
please unblock package kate.
[ Reason ]
It contains the following changes:
* New upstream release (25.04.1).
- Add missing includes.
- Fix size limit, that is an int in MB, no bool.
- Fix type warnings.
* New upstream release (25.04.2).
- Check whether item is an object. (kde#505044)
- S&R: Fix canceling search in current file.
The complete debdiff is *huge* due to translation updates so I’m
attaching a simple diff trimmed down from these for your conveninence:
diff -ur --exclude=po kate-25.04.0 kate-25.04.2
[ Tests ]
- Tested basic file opening, saving, search.
- Upstream test suite passes in sbuild.
[ 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 kate/4:25.04.2-1
Attachment:
kate_25.04.0-1.dsc_kate_25.04.2-1.dsc.debdiff.gz
Description: application/gzip
diff -ur '--exclude=po' kate-25.04.0/addons/filetree/katefiletreemodel.cpp kate-25.04.2/addons/filetree/katefiletreemodel.cpp
--- kate-25.04.0/addons/filetree/katefiletreemodel.cpp 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/addons/filetree/katefiletreemodel.cpp 2025-06-02 22:10:33.000000000 +0200
@@ -23,7 +23,6 @@
#include <ktexteditor/application.h>
#include <ktexteditor/editor.h>
-#include "katefiletreedebug.h"
#include "ktexteditor_utils.h"
#include <variant>
@@ -229,7 +228,7 @@
item->m_parent->removeChild(item);
}
- const int item_row = m_children.size();
+ const int item_row = int(m_children.size());
item->m_row = item_row;
m_children.push_back(item);
item->m_parent = static_cast<ProxyItemDir *>(this);
@@ -247,7 +246,7 @@
auto idx = std::distance(m_children.begin(), it);
for (size_t i = idx; i < m_children.size(); i++) {
- m_children[i]->m_row = i;
+ m_children[i]->m_row = int(i);
}
item->m_parent = nullptr;
@@ -265,7 +264,7 @@
int ProxyItem::childCount() const
{
- return m_children.size();
+ return int(m_children.size());
}
int ProxyItem::row() const
@@ -725,7 +724,7 @@
childs.erase(childs.begin() + sourceRow);
// update row number of children
for (size_t i = 0; i < childs.size(); i++) {
- childs[i]->m_row = i;
+ childs[i]->m_row = int(i);
}
endMoveRows();
diff -ur '--exclude=po' kate-25.04.0/addons/lspclient/lspclientserver.cpp kate-25.04.2/addons/lspclient/lspclientserver.cpp
--- kate-25.04.0/addons/lspclient/lspclientserver.cpp 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/addons/lspclient/lspclientserver.cpp 2025-06-02 22:10:33.000000000 +0200
@@ -773,6 +773,11 @@
static LSPCompletionItem parseCompletionItem(const rapidjson::Value &item)
{
+ if (!item.IsObject()) {
+ qCWarning(LSPCLIENT) << "Unexpected, completion item is not an object";
+ return {};
+ }
+
auto label = GetStringValue(item, MEMBER_LABEL);
auto detail = GetStringValue(item, MEMBER_DETAIL);
LSPMarkupContent doc;
diff -ur '--exclude=po' kate-25.04.0/addons/search/SearchDiskFiles.cpp kate-25.04.2/addons/search/SearchDiskFiles.cpp
--- kate-25.04.0/addons/search/SearchDiskFiles.cpp 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/addons/search/SearchDiskFiles.cpp 2025-06-02 22:10:33.000000000 +0200
@@ -47,7 +47,7 @@
}
// skip files that hit the limit or files we can't get the size, that might lead to oom
- if (const auto s = file.size(); s <= 0 || (s / (1024 * 1024)) > m_sizeLimit) {
+ if (const auto s = file.size(); (s <= 0) || ((s / (1024 * 1024)) > m_sizeLimit)) {
continue;
}
diff -ur '--exclude=po' kate-25.04.0/addons/search/SearchDiskFiles.h kate-25.04.2/addons/search/SearchDiskFiles.h
--- kate-25.04.0/addons/search/SearchDiskFiles.h 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/addons/search/SearchDiskFiles.h 2025-06-02 22:10:33.000000000 +0200
@@ -180,5 +180,5 @@
SearchDiskFilesWorkList &m_worklist;
const QRegularExpression m_regExp;
const bool m_includeBinaryFiles;
- const bool m_sizeLimit;
+ const int m_sizeLimit;
};
diff -ur '--exclude=po' kate-25.04.0/addons/search/SearchOpenFiles.cpp kate-25.04.2/addons/search/SearchOpenFiles.cpp
--- kate-25.04.0/addons/search/SearchOpenFiles.cpp 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/addons/search/SearchOpenFiles.cpp 2025-06-02 22:10:33.000000000 +0200
@@ -57,6 +57,7 @@
m_nextFileIndex = -1;
m_cancelSearch = true;
m_nextLine = -1;
+ Q_EMIT searchDone();
return;
}
diff -ur '--exclude=po' kate-25.04.0/apps/kate/data/org.kde.kate.appdata.xml kate-25.04.2/apps/kate/data/org.kde.kate.appdata.xml
--- kate-25.04.0/apps/kate/data/org.kde.kate.appdata.xml 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/apps/kate/data/org.kde.kate.appdata.xml 2025-06-02 22:10:33.000000000 +0200
@@ -1003,7 +1003,7 @@
<li xml:lang="es">Compatibilidad con IntelliSense mediante LSP (Protocolo de servidor de lenguaje)</li>
<li xml:lang="eu">«Intellisense»ren euskarria LSP (Language Server Protocol / Lengoaia Zerbitzari Protokoloa) erabiliz</li>
<li xml:lang="fi">Intellisense-tuki LSP:n (Language Server Protocol) kautta</li>
- <li xml:lang="fr">Prise en charge de Intellisense à l'aide d'un module « LSP » (Language Server Protocol)</li>
+ <li xml:lang="fr">Prise en charge de IntelliSense à l'aide d'un module « LSP » (Language Server Protocol)</li>
<li xml:lang="gl">Permite completación automática mediante LSP (protocolo de servidor de linguaxes).</li>
<li xml:lang="he">תמיכה ב־Intellisense באמצעות LSP (פרוטוקול שרת שפה)</li>
<li xml:lang="ia">Supporto de Intellisense usante LSP (LKanguage Server Protocol)</li>
@@ -1488,6 +1488,8 @@
<color type="primary" scheme_preference="dark">#17529b</color>
</branding>
<releases>
+ <release version="25.04.2" date="2025-06-05"/>
+ <release version="25.04.1" date="2025-05-08"/>
<release version="25.04.0" date="2025-04-17"/>
<release version="24.12.3" date="2025-03-06"/>
<release version="24.12.2" date="2025-02-06"/>
diff -ur '--exclude=po' kate-25.04.0/apps/kwrite/data/org.kde.kwrite.appdata.xml kate-25.04.2/apps/kwrite/data/org.kde.kwrite.appdata.xml
--- kate-25.04.0/apps/kwrite/data/org.kde.kwrite.appdata.xml 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/apps/kwrite/data/org.kde.kwrite.appdata.xml 2025-06-02 22:10:33.000000000 +0200
@@ -573,6 +573,8 @@
</provides>
<content_rating type="oars-1.1"/>
<releases>
+ <release version="25.04.2" date="2025-06-05"/>
+ <release version="25.04.1" date="2025-05-08"/>
<release version="25.04.0" date="2025-04-17"/>
<release version="24.12.3" date="2025-03-06"/>
<release version="24.12.2" date="2025-02-06"/>
diff -ur '--exclude=po' kate-25.04.0/apps/lib/kateapp.cpp kate-25.04.2/apps/lib/kateapp.cpp
--- kate-25.04.0/apps/lib/kateapp.cpp 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/apps/lib/kateapp.cpp 2025-06-02 22:10:33.000000000 +0200
@@ -64,6 +64,7 @@
#include <QApplication>
#include <QCommandLineParser>
+#include <QElapsedTimer>
#include <QFileInfo>
#include <QFileOpenEvent>
#include <QJsonArray>
diff -ur '--exclude=po' kate-25.04.0/apps/lib/katemainwindow.cpp kate-25.04.2/apps/lib/katemainwindow.cpp
--- kate-25.04.0/apps/lib/katemainwindow.cpp 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/apps/lib/katemainwindow.cpp 2025-06-02 22:10:33.000000000 +0200
@@ -64,6 +64,7 @@
#include <QDir>
#include <QDragEnterEvent>
#include <QDropEvent>
+#include <QElapsedTimer>
#include <QEvent>
#include <QFontDatabase>
#include <QKeySequence>
diff -ur '--exclude=po' kate-25.04.0/CMakeLists.txt kate-25.04.2/CMakeLists.txt
--- kate-25.04.0/CMakeLists.txt 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/CMakeLists.txt 2025-06-02 22:10:33.000000000 +0200
@@ -4,7 +4,7 @@
# KDE Applications 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(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(kate VERSION ${RELEASE_SERVICE_VERSION})
diff -ur '--exclude=po' kate-25.04.0/debian/changelog kate-25.04.2/debian/changelog
--- kate-25.04.0/debian/changelog 2025-04-17 18:57:54.000000000 +0200
+++ kate-25.04.2/debian/changelog 2025-06-06 23:47:49.000000000 +0200
@@ -1,3 +1,16 @@
+kate (4:25.04.2-1) unstable; urgency=medium
+
+ [ Aurélien COUDERC ]
+ * New upstream release (25.04.1).
+ - Add missing includes.
+ - Fix size limit, that is an int in MB, no bool.
+ - Fix type warnings.
+ * New upstream release (25.04.2).
+ - Check whether item is an object. (kde#505044)
+ - S&R: Fix canceling search in current file.
+
+ -- Aurélien COUDERC <coucouf@debian.org> Fri, 06 Jun 2025 23:47:49 +0200
+
kate (4:25.04.0-1) unstable; urgency=medium
[ Aurélien COUDERC ]
diff -ur '--exclude=po' kate-25.04.0/snapcraft.yaml kate-25.04.2/snapcraft.yaml
--- kate-25.04.0/snapcraft.yaml 2025-04-08 05:17:03.000000000 +0200
+++ kate-25.04.2/snapcraft.yaml 2025-06-02 22:10:33.000000000 +0200
@@ -14,7 +14,7 @@
compression: lzo
environment:
QTWEBENGINEPROCESS_PATH: "$SNAP/usr/lib/qt6/libexec/QtWebEngineProcess"
- LD_LIBRARY_PATH: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio:$SNAP/usr/lib${LD_LIBRARY_PATH}
+ LD_LIBRARY_PATH: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libproxy:$SNAP/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR:$SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pulseaudio:$SNAP/usr/lib${LD_LIBRARY_PATH}
XDG_DATA_DIRS: "$XDG_DATA_DIRS:$SNAP/usr/share"
XDG_CONFIG_DIRS: "$XDG_CONFIG_DIRS:$SNAP/etc/xdg"
__EGL_VENDOR_LIBRARY_DIRS: "$SNAP/etc/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d"