Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kf6-kfilemetadata for
openSUSE:Factory checked in at 2026-02-16 13:01:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-kfilemetadata (Old)
and /work/SRC/openSUSE:Factory/.kf6-kfilemetadata.new.1977 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kfilemetadata"
Mon Feb 16 13:01:57 2026 rev:24 rq:1332927 version:6.23.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kf6-kfilemetadata/kf6-kfilemetadata.changes
2026-01-12 10:15:29.255102613 +0100
+++
/work/SRC/openSUSE:Factory/.kf6-kfilemetadata.new.1977/kf6-kfilemetadata.changes
2026-02-16 13:05:10.283705924 +0100
@@ -1,0 +2,15 @@
+Fri Feb 6 14:25:51 UTC 2026 - Christophe Marin <[email protected]>
+
+- Update to 6.23.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/6/6.23.0
+- Changes since 6.22.0:
+ * Update dependency version to 6.23.0
+ * usermetadata: prevent returning UnknownError when removing a not-present
attribute
+ * [PopplerExtractor] Use ReadingOrder text layout from poppler 26.01
+ * [TaglibExtractorTest] Fix FLAC-in-ogg testfile
+ * Update version to 6.23.0
+ * Fix finding of poppler-version.h (Bad include)
+
+-------------------------------------------------------------------
Old:
----
kfilemetadata-6.22.0.tar.xz
kfilemetadata-6.22.0.tar.xz.sig
New:
----
kfilemetadata-6.23.0.tar.xz
kfilemetadata-6.23.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kf6-kfilemetadata.spec ++++++
--- /var/tmp/diff_new_pack.1APipK/_old 2026-02-16 13:05:11.583759812 +0100
+++ /var/tmp/diff_new_pack.1APipK/_new 2026-02-16 13:05:11.587759978 +0100
@@ -19,12 +19,12 @@
%define qt6_version 6.8.0
%define rname kfilemetadata
-# Full KF6 version (e.g. 6.22.0)
+# Full KF6 version (e.g. 6.23.0)
%{!?_kf6_version: %global _kf6_version %{version}}
%bcond_without ffmpeg
%bcond_without released
Name: kf6-kfilemetadata
-Version: 6.22.0
+Version: 6.23.0
Release: 0
Summary: Library for extracting Metadata
License: GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-3.0-only
++++++ kfilemetadata-6.22.0.tar.xz -> kfilemetadata-6.23.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kfilemetadata-6.22.0/CMakeLists.txt
new/kfilemetadata-6.23.0/CMakeLists.txt
--- old/kfilemetadata-6.22.0/CMakeLists.txt 2026-01-02 18:41:45.000000000
+0100
+++ new/kfilemetadata-6.23.0/CMakeLists.txt 2026-02-12 19:34:03.000000000
+0100
@@ -1,11 +1,11 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.27)
-set(KF_VERSION "6.22.0") # handled by release scripts
-set(KF_DEP_VERSION "6.22.0") # handled by release scripts
+set(KF_VERSION "6.23.0") # handled by release scripts
+set(KF_DEP_VERSION "6.23.0") # handled by release scripts
project(KFileMetaData VERSION ${KF_VERSION})
include(FeatureSummary)
-find_package(ECM 6.22.0 NO_MODULE)
+find_package(ECM 6.23.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL "https://commits.kde.org/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kfilemetadata-6.22.0/autotests/popplerextractortest.cpp
new/kfilemetadata-6.23.0/autotests/popplerextractortest.cpp
--- old/kfilemetadata-6.22.0/autotests/popplerextractortest.cpp 2026-01-02
18:41:45.000000000 +0100
+++ new/kfilemetadata-6.23.0/autotests/popplerextractortest.cpp 2026-02-12
19:34:03.000000000 +0100
@@ -14,6 +14,8 @@
#include <QMimeDatabase>
#include <QTimeZone>
+#include <poppler-version.h>
+
using namespace KFileMetaData;
namespace {
@@ -76,7 +78,9 @@
}
QCOMPARE(result.properties().size(), expectedProperties.size());
+#if POPPLER_VERSION_MAJOR < 26
QEXPECT_FAIL("Multicol - metadata and text", "Content extracted uses
layout", Continue);
+#endif
QCOMPARE(result.text(), content);
}
@@ -97,7 +101,11 @@
{Property::PageCount, 1},
{Property::CreationDate,
QDateTime::fromString(QStringLiteral("2014-07-01T13:38:50+00"), Qt::ISODate)},
};
+#if POPPLER_VERSION_MAJOR >= 26
+ auto simplePdfContent = QStringLiteral("This is a sample PDF file for
KFileMetaData.\n\n ");
+#else
auto simplePdfContent = QStringLiteral("This is a sample PDF file for
KFileMetaData. ");
+#endif
QTest::addRow("No extraction") << QStringLiteral("test.pdf") <<
ER::Flags{ER::ExtractNothing} << QString() <<
KFileMetaData::PropertyMultiMap{};
QTest::addRow("Metadata only") << QStringLiteral("test.pdf") <<
ER::Flags{ER::ExtractMetaData} << QString() << simplePdfProperties;
@@ -111,7 +119,22 @@
{Property::PageCount, 1},
{Property::CreationDate,
QDateTime::fromString(QStringLiteral("2024-03-18T01:37:42+00"), Qt::ISODate)},
};
- auto multicolPdfContent = QStringLiteral("1: First headline for
KfileMetaData\n");
+ auto multicolPdfContent = QStringLiteral( //
+ "1: First headline for KfileMetaData\n"
+ "2: This is the content of the first text\n"
+ "block. It has multiple lines. 2.\n"
+ "3: This is the second paragraph, still\n"
+ "in the first column. 3.\n\n"
+ "4: This is the third paragraph, with\n"
+ "multiple lines. It is in the second column. 4.\n\n"
+ "5: Second headline for KfileMetaData\n"
+ "6: This is the content of the second\n"
+ "text block. It has multiple lines. 6.\n"
+ "7: This is the second paragraph of\n"
+ "the second block. 7.\n\n"
+ "8: This is the third paragraph, with\n"
+ "multiple lines. It is in the second column. 8.\n\n "
+ "");
QTest::addRow("Multicol - no extraction") <<
QStringLiteral("test_multicolumn.pdf") << ER::Flags{ER::ExtractNothing} <<
QString() << KFileMetaData::PropertyMultiMap{};
QTest::addRow("Multicol - metadata only") <<
QStringLiteral("test_multicolumn.pdf") << ER::Flags{ER::ExtractMetaData} <<
QString() << multicolPdfProperties;
Binary files old/kfilemetadata-6.22.0/autotests/samplefiles/test.flac.ogg and
new/kfilemetadata-6.23.0/autotests/samplefiles/test.flac.ogg differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kfilemetadata-6.22.0/autotests/taglibextractortest.cpp
new/kfilemetadata-6.23.0/autotests/taglibextractortest.cpp
--- old/kfilemetadata-6.22.0/autotests/taglibextractortest.cpp 2026-01-02
18:41:45.000000000 +0100
+++ new/kfilemetadata-6.23.0/autotests/taglibextractortest.cpp 2026-02-12
19:34:03.000000000 +0100
@@ -179,56 +179,22 @@
{
QTest::addColumn<QString>("fileType");
- QTest::addRow("aiff")
- << QStringLiteral("aif")
- ;
-
- QTest::addRow("ape")
- << QStringLiteral("ape")
- ;
-
- QTest::addRow("flac")
- << QStringLiteral("flac")
- ;
-
- QTest::addRow("flac+ogg")
- << QStringLiteral("flac.ogg")
- ;
-
- QTest::addRow("m4a")
- << QStringLiteral("m4a")
- ;
-
+ // clang-format: off
+ QTest::addRow("aiff") << QStringLiteral("aif");
+ QTest::addRow("ape") << QStringLiteral("ape");
+ QTest::addRow("flac") << QStringLiteral("flac");
+ QTest::addRow("flac+ogg") << QStringLiteral("flac.ogg");
+ QTest::addRow("m4a") << QStringLiteral("m4a");
QTest::addRow("mp3 id3v2") << QStringLiteral("mp3") ;
QTest::addRow("mp3 id3v1") << QStringLiteral("id3v1.mp3");
-
- QTest::addRow("mpc")
- << QStringLiteral("mpc")
- ;
-
- QTest::addRow("ogg")
- << QStringLiteral("ogg")
- ;
-
- QTest::addRow("opus")
- << QStringLiteral("opus")
- ;
-
- QTest::addRow("speex")
- << QStringLiteral("spx")
- ;
-
- QTest::addRow("wav")
- << QStringLiteral("wav")
- ;
-
- QTest::addRow("wavpack")
- << QStringLiteral("wv")
- ;
-
- QTest::addRow("wma")
- << QStringLiteral("wma")
- ;
+ QTest::addRow("mpc") << QStringLiteral("mpc");
+ QTest::addRow("ogg") << QStringLiteral("ogg");
+ QTest::addRow("opus") << QStringLiteral("opus");
+ QTest::addRow("speex") << QStringLiteral("spx");
+ QTest::addRow("wav") << QStringLiteral("wav");
+ QTest::addRow("wavpack") << QStringLiteral("wv");
+ QTest::addRow("wma") << QStringLiteral("wma");
+ // clang-format: on
}
void TagLibExtractorTest::testVorbisComment()
@@ -272,25 +238,13 @@
{
QTest::addColumn<QString>("fileType");
- QTest::addRow("flac")
- << QStringLiteral("flac")
- ;
-
- QTest::addRow("flac+ogg")
- << QStringLiteral("flac.ogg")
- ;
-
- QTest::addRow("ogg")
- << QStringLiteral("ogg")
- ;
-
- QTest::addRow("opus")
- << QStringLiteral("opus")
- ;
-
- QTest::addRow("speex")
- << QStringLiteral("spx")
- ;
+ // clang-format: off
+ QTest::addRow("flac") << QStringLiteral("flac");
+ QTest::addRow("flac+ogg") << QStringLiteral("flac.ogg");
+ QTest::addRow("ogg") << QStringLiteral("ogg");
+ QTest::addRow("opus") << QStringLiteral("opus");
+ QTest::addRow("speex") << QStringLiteral("spx");
+ // clang-format: on
}
void TagLibExtractorTest::testVorbisCommentMultivalue()
@@ -750,57 +704,21 @@
{
QTest::addColumn<QString>("fileName");
- QTest::addRow("aiff")
- << QStringLiteral("test.aif")
- ;
-
- QTest::addRow("ape")
- << QStringLiteral("test.ape")
- ;
-
- QTest::addRow("opus")
- << QStringLiteral("test.opus")
- ;
-
- QTest::addRow("ogg")
- << QStringLiteral("test.ogg")
- ;
-
- QTest::addRow("flac")
- << QStringLiteral("test.flac")
- ;
-
- QTest::addRow("flac+ogg")
- << QStringLiteral("test.flac.ogg")
- ;
-
- QTest::addRow("mp3")
- << QStringLiteral("test.mp3")
- ;
-
- QTest::addRow("m4a")
- << QStringLiteral("test.m4a")
- ;
-
- QTest::addRow("mpc")
- << QStringLiteral("test.mpc")
- ;
-
- QTest::addRow("speex")
- << QStringLiteral("test.spx")
- ;
-
- QTest::addRow("wav")
- << QStringLiteral("test.wav")
- ;
-
- QTest::addRow("wavpack")
- << QStringLiteral("test.wv")
- ;
-
- QTest::addRow("wma")
- << QStringLiteral("test.wma")
- ;
+ // clang-format: off
+ QTest::addRow("aiff") << QStringLiteral("test.aif");
+ QTest::addRow("ape") << QStringLiteral("test.ape");
+ QTest::addRow("opus") << QStringLiteral("test.opus");
+ QTest::addRow("ogg") << QStringLiteral("test.ogg");
+ QTest::addRow("flac") << QStringLiteral("test.flac");
+ QTest::addRow("flac+ogg") << QStringLiteral("test.flac.ogg");
+ QTest::addRow("mp3") << QStringLiteral("test.mp3");
+ QTest::addRow("m4a") << QStringLiteral("test.m4a");
+ QTest::addRow("mpc") << QStringLiteral("test.mpc");
+ QTest::addRow("speex") << QStringLiteral("test.spx");
+ QTest::addRow("wav") << QStringLiteral("test.wav");
+ QTest::addRow("wavpack") << QStringLiteral("test.wv");
+ QTest::addRow("wma") << QStringLiteral("test.wma");
+ // clang-format: on
}
void TagLibExtractorTest::testModuleTrackerFormats()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kfilemetadata-6.22.0/autotests/usermetadatawritertest.cpp
new/kfilemetadata-6.23.0/autotests/usermetadatawritertest.cpp
--- old/kfilemetadata-6.22.0/autotests/usermetadatawritertest.cpp
2026-01-02 18:41:45.000000000 +0100
+++ new/kfilemetadata-6.23.0/autotests/usermetadatawritertest.cpp
2026-02-12 19:34:03.000000000 +0100
@@ -243,6 +243,10 @@
QCOMPARE(md.setAttribute(QStringLiteral("tag"), QString{}),
KFileMetaData::UserMetaData::NoError);
QVERIFY(!md.hasAttribute(QStringLiteral("tag")));
+ // Removing a non-existing tag is not an error
+ QCOMPARE(md.setAttribute(QStringLiteral("tag"), QString{}),
KFileMetaData::UserMetaData::NoError);
+ QVERIFY(!md.hasAttribute(QStringLiteral("tag")));
+
QVERIFY(QDir().rmdir(dirPath));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kfilemetadata-6.22.0/po/ga/kfilemetadata6.po
new/kfilemetadata-6.23.0/po/ga/kfilemetadata6.po
--- old/kfilemetadata-6.22.0/po/ga/kfilemetadata6.po 2026-01-02
18:41:45.000000000 +0100
+++ new/kfilemetadata-6.23.0/po/ga/kfilemetadata6.po 2026-02-12
19:34:03.000000000 +0100
@@ -3,7 +3,6 @@
# This file is distributed under the same license as the kfilemetadata package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: kfilemetadata\n"
@@ -11,11 +10,13 @@
"POT-Creation-Date: 2025-11-17 11:49+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[email protected]>\n"
-"Language: \n"
+"Language-Team: Irish Gaelic <[email protected]>\n"
+"Language: ga\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? "
+"3 : 4\n"
#: src/formatstrings.cpp:64
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kfilemetadata-6.22.0/po/ia/kfilemetadata6.po
new/kfilemetadata-6.23.0/po/ia/kfilemetadata6.po
--- old/kfilemetadata-6.22.0/po/ia/kfilemetadata6.po 2026-01-02
18:41:45.000000000 +0100
+++ new/kfilemetadata-6.23.0/po/ia/kfilemetadata6.po 2026-02-12
19:34:03.000000000 +0100
@@ -2,13 +2,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Giovanni Sora <[email protected]>, 2014.
-# SPDX-FileCopyrightText: 2014, 2016, 2017, 2019, 2020, 2023, 2024, 2025
G.Sora <[email protected]>
+# SPDX-FileCopyrightText: 2014, 2016, 2017, 2019, 2020, 2023, 2024, 2025, 2026
G.Sora <[email protected]>
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2025-11-17 11:49+0000\n"
-"PO-Revision-Date: 2025-04-02 15:10+0200\n"
+"PO-Revision-Date: 2026-01-09 15:46+0100\n"
"Last-Translator: giovanni <[email protected]>\n"
"Language-Team: Interlingua <[email protected]>\n"
"Language: ia\n"
@@ -308,12 +308,9 @@
msgstr "Vacue"
#: src/propertyinfo.cpp:46
-#, fuzzy
-#| msgctxt "@label"
-#| msgid "Description"
msgctxt "@label accessible alt text"
msgid "Assistive Description"
-msgstr "Description"
+msgstr "Description Assistive"
#: src/propertyinfo.cpp:47
msgctxt "@label music album"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kfilemetadata-6.22.0/po/lt/kfilemetadata6.po
new/kfilemetadata-6.23.0/po/lt/kfilemetadata6.po
--- old/kfilemetadata-6.22.0/po/lt/kfilemetadata6.po 2026-01-02
18:41:45.000000000 +0100
+++ new/kfilemetadata-6.23.0/po/lt/kfilemetadata6.po 2026-02-12
19:34:03.000000000 +0100
@@ -9,7 +9,7 @@
"Project-Id-Version: l 10n\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2025-11-17 11:49+0000\n"
-"PO-Revision-Date: 2024-04-24 01:10+0300\n"
+"PO-Revision-Date: 2026-01-09 23:14+0200\n"
"Last-Translator: Moo\n"
"Language-Team: Lithuanian <[email protected]>\n"
"Language: lt\n"
@@ -18,7 +18,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n"
"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n"
-"X-Generator: Poedit 3.4.2\n"
+"X-Generator: Poedit 3.8\n"
#: src/formatstrings.cpp:64
#, kde-format
@@ -309,12 +309,9 @@
msgstr "Tuščia"
#: src/propertyinfo.cpp:46
-#, fuzzy
-#| msgctxt "@label"
-#| msgid "Description"
msgctxt "@label accessible alt text"
msgid "Assistive Description"
-msgstr "Aprašas"
+msgstr "Pagalbinis aprašas"
#: src/propertyinfo.cpp:47
msgctxt "@label music album"
@@ -539,28 +536,22 @@
#: src/propertyinfo.cpp:91
msgctxt "@label"
msgid "Color Space"
-msgstr ""
+msgstr "Spalvų erdvė"
#: src/propertyinfo.cpp:92
-#, fuzzy
-#| msgctxt "@label"
-#| msgid "Video"
msgctxt "@label"
msgid "Video Codec"
-msgstr "Vaizdo įrašas"
+msgstr "Vaizdo kodekas"
#: src/propertyinfo.cpp:93
-#, fuzzy
-#| msgctxt "@label"
-#| msgid "Audio"
msgctxt "@label"
msgid "Audio Codec"
-msgstr "Garso įrašas"
+msgstr "Garso kodekas"
#: src/propertyinfo.cpp:94
msgctxt "@label"
msgid "Pixel Format"
-msgstr ""
+msgstr "Pikselių formatas"
#: src/propertyinfo.cpp:95
msgctxt "@label"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kfilemetadata-6.22.0/po/nl/kfilemetadata6.po
new/kfilemetadata-6.23.0/po/nl/kfilemetadata6.po
--- old/kfilemetadata-6.22.0/po/nl/kfilemetadata6.po 2026-01-02
18:41:45.000000000 +0100
+++ new/kfilemetadata-6.23.0/po/nl/kfilemetadata6.po 2026-02-12
19:34:03.000000000 +0100
@@ -1,21 +1,21 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# SPDX-FileCopyrightText: 2014, 2015, 2016, 2017, 2018, 2019, 2023, 2024, 2025
Freek de Kruijf <[email protected]>
+# SPDX-FileCopyrightText: 2014, 2015, 2016, 2017, 2018, 2019, 2023, 2024,
2025, 2026 Freek de Kruijf <[email protected]>
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2025-11-17 11:49+0000\n"
-"PO-Revision-Date: 2025-06-27 11:32+0200\n"
-"Last-Translator: Freek de Kruijf <[email protected]>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2026-01-07 11:25+0100\n"
+"Last-Translator: Freek de Kruijf <[email protected]>\n"
+"Language-Team: Dutch <[email protected]>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 25.04.2\n"
+"X-Generator: Lokalize 25.12.0\n"
#: src/formatstrings.cpp:64
#, kde-format
@@ -658,7 +658,7 @@
#: src/propertyinfo.cpp:116
msgctxt "@label ReplayGain is the name of a standard"
msgid "ReplayGain Track Gain"
-msgstr "Afspeelversterking van trackversterking"
+msgstr "Afspeelversterking van geluidssterkte van nummer"
#: src/propertyinfo.cpp:117
msgctxt "@label"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kfilemetadata-6.22.0/src/extractors/popplerextractor.cpp
new/kfilemetadata-6.23.0/src/extractors/popplerextractor.cpp
--- old/kfilemetadata-6.22.0/src/extractors/popplerextractor.cpp
2026-01-02 18:41:45.000000000 +0100
+++ new/kfilemetadata-6.23.0/src/extractors/popplerextractor.cpp
2026-02-12 19:34:03.000000000 +0100
@@ -10,6 +10,7 @@
#include "popplerextractor.h"
#include <poppler-qt6.h>
+#include <poppler-version.h>
#include <QScopedPointer>
#include <QDebug>
@@ -85,7 +86,12 @@
qCWarning(KFILEMETADATA_LOG) << "Could not read page content from"
<< fileUrl;
break;
}
- result->append(page->text(QRectF()));
+#if POPPLER_VERSION_MAJOR >= 26
+ // ReadingOrder is available since 26.01.00
+ result->append(page->text(QRectF(),
Poppler::Page::TextLayout::ReadingOrder));
+#else
+ result->append(page->text(QRectF(),
Poppler::Page::TextLayout::PhysicalLayout));
+#endif
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kfilemetadata-6.22.0/src/xattr_p.h
new/kfilemetadata-6.23.0/src/xattr_p.h
--- old/kfilemetadata-6.22.0/src/xattr_p.h 2026-01-02 18:41:45.000000000
+0100
+++ new/kfilemetadata-6.23.0/src/xattr_p.h 2026-02-12 19:34:03.000000000
+0100
@@ -186,16 +186,16 @@
#endif
const char* attributeName = n.constData();
- #if defined(Q_OS_LINUX) || (defined(__GLIBC__) &&
!defined(__stub_removexattr))
- int result = removexattr(encodedPath, attributeName);
- return result == -1 ? errno : 0;
- #elif defined(Q_OS_MAC)
- int result = removexattr(encodedPath, attributeName, XATTR_NOFOLLOW );
- return result == -1 ? errno : 0;
- #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
- int result = extattr_delete_file (encodedPath, EXTATTR_NAMESPACE_USER,
attributeName);
- return result == -1 ? errno : 0;
- #endif
+#if defined(Q_OS_LINUX) || (defined(__GLIBC__) && !defined(__stub_removexattr))
+ const int result = removexattr(encodedPath, attributeName);
+ return ((result == 0) || (errno == ENODATA)) ? 0 : errno;
+#elif defined(Q_OS_MAC)
+ const int result = removexattr(encodedPath, attributeName, XATTR_NOFOLLOW
);
+ return ((result == 0) || (errno == ENOATTR)) ? 0 : errno;
+#elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+ const int result = extattr_delete_file (encodedPath,
EXTATTR_NAMESPACE_USER, attributeName);
+ return ((result == 0) || (errno == ENOATTR)) ? 0 : errno;
+#endif
}
inline bool k_hasAttribute(const QString& path, const QString& name)
@@ -400,6 +400,11 @@
{
const QString fullADSName = path + QLatin1String(":user.") + name;
int ret = (DeleteFileW(reinterpret_cast<const
WCHAR*>(fullADSName.utf16()))) ? 0 : -1;
+
+ if (ret == -1 && ::GetLastError() == ERROR_FILE_NOT_FOUND) {
+ // ignore error when removing a not present ADS / attribute
+ return 0;
+ }
return ret;
}
