Package: release.debian.org
Severity: normal
X-Debbugs-Cc: okular@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:okular
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team,
please unblock package okular.
[ Reason ]
It contains the following changes:
* New upstream release (25.04.1).
- Fix build with Qt 6.10.
- Delete old kconf update script.
- Fax: Add a few bugprone-sizeof-expression exceptions.
* New upstream release (25.04.2).
- Fix detecting HTML in mobipocket document.
- Fix opening password protected files on builds without kwallet.
(kde#503852)
* Update the list of installed files.
The complete debdiff is *huge* due to tranlsation updates so I’m
attaching a simple diff trimmed down from these for your conveninence:
diff -ur --exclude=po okular-25.04.0 okular-25.04.2
[ Tests ]
- Test opening various PDF files, filling PDF forms.
[ 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 okular/4:25.04.2-1
Attachment:
okular_25.04.0-1.dsc_okular_25.04.2-1.dsc.debdiff.gz
Description: application/gzip
diff -ur '--exclude=po' okular-25.04.0/CMakeLists.txt okular-25.04.2/CMakeLists.txt
--- okular-25.04.0/CMakeLists.txt 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/CMakeLists.txt 2025-06-02 22:57:49.000000000 +0200
@@ -3,7 +3,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 (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(okular VERSION ${RELEASE_SERVICE_VERSION})
@@ -201,7 +201,11 @@
endif()
if(NOT WIN32 AND NOT ANDROID AND NOT APPLE AND NOT HAIKU)
- find_package(Qt6Gui REQUIRED COMPONENTS Private)
+ if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0")
+ find_package(Qt6GuiPrivate ${REQUIRED_QT_VERSION} REQUIRED)
+ else()
+ find_package(Qt6Gui REQUIRED COMPONENTS Private)
+ endif()
find_package(PlasmaActivities REQUIRED)
set_package_properties("PlasmaActivities" PROPERTIES
DESCRIPTION "Activities interface library"
@@ -632,7 +636,6 @@
########### install files ###############
-install(FILES okular.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR})
install(FILES okular.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
ki18n_install(po)
diff -ur '--exclude=po' okular-25.04.0/debian/changelog okular-25.04.2/debian/changelog
--- okular-25.04.0/debian/changelog 2025-04-26 09:04:22.000000000 +0200
+++ okular-25.04.2/debian/changelog 2025-06-09 23:18:58.000000000 +0200
@@ -1,3 +1,18 @@
+okular (4:25.04.2-1) unstable; urgency=medium
+
+ [ Aurélien COUDERC ]
+ * New upstream release (25.04.1).
+ - Fix build with Qt 6.10.
+ - Delete old kconf update script.
+ - Fax: Add a few bugprone-sizeof-expression exceptions.
+ * New upstream release (25.04.2).
+ - Fix detecting HTML in mobipocket document.
+ - Fix opening password protected files on builds without kwallet.
+ (kde#503852)
+ * Update the list of installed files.
+
+ -- Aurélien COUDERC <coucouf@debian.org> Mon, 09 Jun 2025 23:18:58 +0200
+
okular (4:25.04.0-1) unstable; urgency=medium
* Team upload.
diff -ur '--exclude=po' okular-25.04.0/debian/okular.install okular-25.04.2/debian/okular.install
--- okular-25.04.0/debian/okular.install 2025-02-09 02:00:08.000000000 +0100
+++ okular-25.04.2/debian/okular.install 2025-06-09 23:18:58.000000000 +0200
@@ -27,7 +27,6 @@
usr/share/config.kcfg/okular_core.kcfg
[!i386] usr/share/config.kcfg/pdfsettings.kcfg
usr/share/icons/hicolor/*/apps/okular.png
-usr/share/kconf_update/okular.upd
usr/share/man/*/man1/okular.1
usr/share/man/man1/okular.1
usr/share/metainfo/org.kde.okular-comicbook.metainfo.xml
diff -ur '--exclude=po' okular-25.04.0/generators/comicbook/org.kde.okular-comicbook.metainfo.xml okular-25.04.2/generators/comicbook/org.kde.okular-comicbook.metainfo.xml
--- okular-25.04.0/generators/comicbook/org.kde.okular-comicbook.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/comicbook/org.kde.okular-comicbook.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -114,6 +114,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/djvu/org.kde.okular-djvu.metainfo.xml okular-25.04.2/generators/djvu/org.kde.okular-djvu.metainfo.xml
--- okular-25.04.0/generators/djvu/org.kde.okular-djvu.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/djvu/org.kde.okular-djvu.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -111,6 +111,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/dvi/org.kde.okular-dvi.metainfo.xml okular-25.04.2/generators/dvi/org.kde.okular-dvi.metainfo.xml
--- okular-25.04.0/generators/dvi/org.kde.okular-dvi.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/dvi/org.kde.okular-dvi.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -115,6 +115,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/epub/org.kde.okular-epub.metainfo.xml okular-25.04.2/generators/epub/org.kde.okular-epub.metainfo.xml
--- okular-25.04.0/generators/epub/org.kde.okular-epub.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/epub/org.kde.okular-epub.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -114,6 +114,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/fax/faxdocument.cpp okular-25.04.2/generators/fax/faxdocument.cpp
--- okular-25.04.0/generators/fax/faxdocument.cpp 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/fax/faxdocument.cpp 2025-06-02 22:57:49.000000000 +0200
@@ -149,7 +149,7 @@
}
p = reinterpret_cast<t32bits *>(pn->imageData + lineNum * (2 - pn->vres) * pn->bytes_per_line);
- p1 = reinterpret_cast<t32bits *>(pn->vres ? nullptr : p + pn->bytes_per_line / sizeof(*p));
+ p1 = reinterpret_cast<t32bits *>(pn->vres ? nullptr : p + pn->bytes_per_line / sizeof(*p)); // NOLINT(bugprone-sizeof-expression)
r = run;
acc = 0;
diff -ur '--exclude=po' okular-25.04.0/generators/fax/faxexpand.cpp okular-25.04.2/generators/fax/faxexpand.cpp
--- okular-25.04.0/generators/fax/faxexpand.cpp 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/fax/faxexpand.cpp 2025-06-02 22:57:49.000000000 +0200
@@ -98,7 +98,7 @@
printf("%4d %d\n", a0, *pa); \
} while (0)
-#define EndOfData(pn) (sp >= pn->data + pn->length / sizeof(*pn->data))
+#define EndOfData(pn) (sp >= pn->data + pn->length / sizeof(*pn->data)) // NOLINT(bugprone-sizeof-expression)
/* This macro handles coding errors in G3 data.
We redefine it below for the G4 case */
@@ -712,11 +712,11 @@
int G3count(pagenode *pn, int twoD)
{
t16bits *p = pn->data;
- t16bits *end = p + pn->length / sizeof(*p);
- int lines = 0; /* lines seen so far */
- int zeros = 0; /* number of consecutive zero bits seen */
- int EOLcnt = 0; /* number of consecutive EOLs seen */
- int empty = 1; /* empty line */
+ t16bits *end = p + pn->length / sizeof(*p); // NOLINT(bugprone-sizeof-expression)
+ int lines = 0; /* lines seen so far */
+ int zeros = 0; /* number of consecutive zero bits seen */
+ int EOLcnt = 0; /* number of consecutive EOLs seen */
+ int empty = 1; /* empty line */
int prezeros, postzeros;
while (p < end && EOLcnt < 6) {
diff -ur '--exclude=po' okular-25.04.0/generators/fax/org.kde.okular-fax.metainfo.xml okular-25.04.2/generators/fax/org.kde.okular-fax.metainfo.xml
--- okular-25.04.0/generators/fax/org.kde.okular-fax.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/fax/org.kde.okular-fax.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -115,6 +115,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/fictionbook/org.kde.okular-fb.metainfo.xml okular-25.04.2/generators/fictionbook/org.kde.okular-fb.metainfo.xml
--- okular-25.04.0/generators/fictionbook/org.kde.okular-fb.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/fictionbook/org.kde.okular-fb.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -114,6 +114,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/kimgio/org.kde.okular-kimgio.metainfo.xml okular-25.04.2/generators/kimgio/org.kde.okular-kimgio.metainfo.xml
--- okular-25.04.0/generators/kimgio/org.kde.okular-kimgio.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/kimgio/org.kde.okular-kimgio.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -137,6 +137,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/markdown/org.kde.okular-md.metainfo.xml okular-25.04.2/generators/markdown/org.kde.okular-md.metainfo.xml
--- okular-25.04.0/generators/markdown/org.kde.okular-md.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/markdown/org.kde.okular-md.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -114,6 +114,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/mobipocket/mobidocument.cpp okular-25.04.2/generators/mobipocket/mobidocument.cpp
--- okular-25.04.0/generators/mobipocket/mobidocument.cpp 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/mobipocket/mobidocument.cpp 2025-06-02 22:57:49.000000000 +0200
@@ -20,7 +20,7 @@
if (doc->isValid()) {
QString text = doc->text();
QString header = text.left(1024);
- if (header.contains(QStringLiteral("<html>")) || header.contains(QStringLiteral("<HTML>"))) {
+ if (header.contains(QStringLiteral("<html")) || header.contains(QStringLiteral("<HTML"))) {
setDefaultStyleSheet(QStringLiteral("a { color: %1 }").arg(QColor(Qt::blue).name()));
setHtml(fixMobiMarkup(text));
} else {
diff -ur '--exclude=po' okular-25.04.0/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml okular-25.04.2/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml
--- okular-25.04.0/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/mobipocket/org.kde.okular-mobipocket.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -135,6 +135,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/poppler/org.kde.okular-poppler.metainfo.xml okular-25.04.2/generators/poppler/org.kde.okular-poppler.metainfo.xml
--- okular-25.04.0/generators/poppler/org.kde.okular-poppler.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/poppler/org.kde.okular-poppler.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -115,6 +115,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/spectre/org.kde.okular-spectre.metainfo.xml okular-25.04.2/generators/spectre/org.kde.okular-spectre.metainfo.xml
--- okular-25.04.0/generators/spectre/org.kde.okular-spectre.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/spectre/org.kde.okular-spectre.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -119,6 +119,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/tiff/org.kde.okular-tiff.metainfo.xml okular-25.04.2/generators/tiff/org.kde.okular-tiff.metainfo.xml
--- okular-25.04.0/generators/tiff/org.kde.okular-tiff.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/tiff/org.kde.okular-tiff.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -114,6 +114,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/txt/org.kde.okular-txt.metainfo.xml okular-25.04.2/generators/txt/org.kde.okular-txt.metainfo.xml
--- okular-25.04.0/generators/txt/org.kde.okular-txt.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/txt/org.kde.okular-txt.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -111,6 +111,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/generators/xps/org.kde.okular-xps.metainfo.xml okular-25.04.2/generators/xps/org.kde.okular-xps.metainfo.xml
--- okular-25.04.0/generators/xps/org.kde.okular-xps.metainfo.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/generators/xps/org.kde.okular-xps.metainfo.xml 2025-06-02 22:57:49.000000000 +0200
@@ -112,6 +112,8 @@
</provides>
<url type="homepage">https://okular.kde.org</url>
<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' okular-25.04.0/.gitlab-ci.yml okular-25.04.2/.gitlab-ci.yml
--- okular-25.04.0/.gitlab-ci.yml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/.gitlab-ci.yml 2025-06-02 22:57:49.000000000 +0200
@@ -37,7 +37,7 @@
build_clazy_clang_tidy:
stage: build
- image: invent-registry.kde.org/sysadmin/ci-images/suse-qt68:latest
+ image: invent-registry.kde.org/sysadmin/ci-images/suse-qt69:latest
tags:
- Linux
interruptible: true
@@ -47,10 +47,10 @@
only:
- merge_requests
variables:
- KDECI_CC_CACHE: /mnt/caches/suse-qt6.8/
- KDECI_CACHE_PATH: /mnt/artifacts/suse-qt6.8/
+ KDECI_CC_CACHE: /mnt/caches/suse-qt6.9/
+ KDECI_CACHE_PATH: /mnt/artifacts/suse-qt6.9/
KDECI_GITLAB_SERVER: https://invent.kde.org/
- KDECI_PACKAGE_PROJECT: teams/ci-artifacts/suse-qt6.8
+ KDECI_PACKAGE_PROJECT: teams/ci-artifacts/suse-qt6.9
CLAZY_CHECKS: level0,level1,level2,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch
CXXFLAGS: -Werror -Wno-deprecated-declarations
CC: clang
diff -ur '--exclude=po' okular-25.04.0/.kde-ci.yml okular-25.04.2/.kde-ci.yml
--- okular-25.04.0/.kde-ci.yml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/.kde-ci.yml 2025-06-02 22:57:49.000000000 +0200
@@ -34,7 +34,7 @@
'frameworks/kirigami': '@latest-kf6'
Options:
- require-passing-tests-on: [ 'Linux', 'FreeBSD' ]
+ require-passing-tests-on: [ 'Linux/Qt6', 'FreeBSD' ]
per-test-timeout: 300
cppcheck-arguments: '--enable=warning,style,performance -DOKULAR_EXPORT_PLUGIN --suppress-xml=cppcheck-suppressions.xml'
cppcheck-ignore-files:
diff -ur '--exclude=po' okular-25.04.0/mobile/app/org.kde.okular.kirigami.appdata.xml okular-25.04.2/mobile/app/org.kde.okular.kirigami.appdata.xml
--- okular-25.04.0/mobile/app/org.kde.okular.kirigami.appdata.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/mobile/app/org.kde.okular.kirigami.appdata.xml 2025-06-02 22:57:49.000000000 +0200
@@ -406,6 +406,8 @@
<content_rating type="oars-1.1"/>
<launchable type="desktop-id">org.kde.okular.kirigami.desktop</launchable>
<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"/>
Seulement dans okular-25.04.0: okular.upd
diff -ur '--exclude=po' okular-25.04.0/part/part.cpp okular-25.04.2/part/part.cpp
--- okular-25.04.0/part/part.cpp 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/part/part.cpp 2025-06-02 22:57:49.000000000 +0200
@@ -1449,17 +1449,19 @@
}
m_documentOpenWithPassword = false;
-#if HAVE_KWALLET
// if the file didn't open correctly it might be encrypted, so ask for a pass
+#if HAVE_KWALLET
QString walletName, walletFolder, walletKey;
m_document->walletDataForFile(fileNameToOpen, &walletName, &walletFolder, &walletKey);
- bool firstInput = true;
bool triedWallet = false;
KWallet::Wallet *wallet = nullptr;
bool keep = true;
+#endif
+ bool firstInput = true;
while (openResult == Document::OpenNeedsPassword) {
QString password;
+#if HAVE_KWALLET
// 1.A. try to retrieve the first password from the kde wallet system
if (!triedWallet && !walletKey.isNull()) {
const WId parentwid = widget()->effectiveWinId();
@@ -1479,6 +1481,7 @@
}
triedWallet = true;
}
+#endif
// 1.B. if not retrieved, ask the password using the kde password dialog
if (password.isNull()) {
@@ -1491,16 +1494,23 @@
firstInput = false;
// if the user presses cancel, abort opening
- KPasswordDialog dlg(widget(), wallet ? KPasswordDialog::ShowKeepPassword : KPasswordDialog::KPasswordDialogFlags());
+#if HAVE_KWALLET
+ const KPasswordDialog::KPasswordDialogFlags dlgFlags = wallet ? KPasswordDialog::ShowKeepPassword : KPasswordDialog::KPasswordDialogFlags();
+#else
+ const KPasswordDialog::KPasswordDialogFlags dlgFlags;
+#endif
+ KPasswordDialog dlg(widget(), dlgFlags);
dlg.setWindowTitle(i18n("Document Password"));
dlg.setPrompt(prompt);
if (!dlg.exec()) {
break;
}
password = dlg.password();
+#if HAVE_KWALLET
if (wallet) {
keep = dlg.keepPassword();
}
+#endif
}
// 2. reopen the document using the password
@@ -1514,13 +1524,14 @@
if (openResult == Document::OpenSuccess) {
m_documentOpenWithPassword = true;
+#if HAVE_KWALLET
// 3. if the password is correct and the user chose to remember it, store it to the wallet
if (wallet && /*safety check*/ wallet->isOpen() && keep) {
wallet->writePassword(walletKey, password);
}
+#endif
}
}
-#endif
}
if (openResult == Document::OpenSuccess) {
diff -ur '--exclude=po' okular-25.04.0/shell/org.kde.okular.appdata.xml okular-25.04.2/shell/org.kde.okular.appdata.xml
--- okular-25.04.0/shell/org.kde.okular.appdata.xml 2025-04-09 05:10:45.000000000 +0200
+++ okular-25.04.2/shell/org.kde.okular.appdata.xml 2025-06-02 22:57:49.000000000 +0200
@@ -218,7 +218,7 @@
<li xml:lang="es">Formatos permitidos: PDF, PS, Tiff, DjVu, imágenes, DVI, XPS, Fiction Book, libros de cómics, Plucker, EPub, Fax</li>
<li xml:lang="eu">Onartutako formatuak: PDF, PS, Tiff, DjVu, irudiak, DVI, XPS, FictionBook, Comic Book, Plucker, EPub, Fax</li>
<li xml:lang="fi">Tuetut tiedostomuodot: PDF, PS, TIFF, DjVu, kuvatiedostot, DVI, XPS, FictionBook, sarjakuvakirjat, Plucker, EPub, faksit</li>
- <li xml:lang="fr">Formats de fichiers pris en charge : pdf, ps, Tiff, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax</li>
+ <li xml:lang="fr">Formats de fichiers pris en charge : pdf, ps, Tiff, DjVU, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, ePub, Fax</li>
<li xml:lang="gl">Formatos compatíbeis: PDF, PS, Tiff, DjVu, imaxes, DVI, XPS, Fiction Book, banda deseñada, Plucker, EPub e fax.</li>
<li xml:lang="he">תסדירים נתמכים: PDF, PS, Tiff, DjVu, תמונות, DVI, XPS, Fiction Book, Comic Book, Plucker, ספר אלקטרוני/EPub, פקס</li>
<li xml:lang="hu">Támogatott formátumok: PDF, PS, Tiff, DjVu, képek, DVI, XPS, illusztrált könyvek, képregények, Plucker, EPub, Fax</li>
@@ -424,6 +424,8 @@
</custom>
<launchable type="desktop-id">org.kde.okular.desktop</launchable>
<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"/>