Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kf6-kcoreaddons for openSUSE:Factory
checked in at 2024-09-15 12:33:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-kcoreaddons (Old)
and /work/SRC/openSUSE:Factory/.kf6-kcoreaddons.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kcoreaddons"
Sun Sep 15 12:33:53 2024 rev:7 rq:1201005 version:6.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kf6-kcoreaddons/kf6-kcoreaddons.changes
2024-08-10 19:10:07.079556525 +0200
+++
/work/SRC/openSUSE:Factory/.kf6-kcoreaddons.new.29891/kf6-kcoreaddons.changes
2024-09-15 12:37:39.839680312 +0200
@@ -1,0 +2,17 @@
+Sat Sep 7 09:03:11 UTC 2024 - Christophe Marin <[email protected]>
+
+- Update to 6.6.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/6/6.6.0
+- Changes since 6.5.0:
+ * Update version to 6.6.0
+ * exportUrlsToPortal: check for dbus error
+ * KDirWatch: don't try inotify again if it has already failed
+ * Relicense some files from lgpl2-only to lgpl2.1-or-later
+ * ci: add Alpine/musl job
+ * KPluginMetaData: Avoid reading metadata from plugin loader twice
+ * kcoreaddons_add_plugin: Fix typo in error message
+ * Fix configuring error when QtQml is not around
+
+-------------------------------------------------------------------
Old:
----
kcoreaddons-6.5.0.tar.xz
kcoreaddons-6.5.0.tar.xz.sig
New:
----
kcoreaddons-6.6.0.tar.xz
kcoreaddons-6.6.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kf6-kcoreaddons.spec ++++++
--- /var/tmp/diff_new_pack.oUksbT/_old 2024-09-15 12:37:40.383703185 +0200
+++ /var/tmp/diff_new_pack.oUksbT/_new 2024-09-15 12:37:40.387703354 +0200
@@ -19,13 +19,13 @@
%define qt6_version 6.6.0
%define rname kcoreaddons
-# Full KF6 version (e.g. 6.5.0)
+# Full KF6 version (e.g. 6.6.0)
%{!?_kf6_version: %global _kf6_version %{version}}
# Last major and minor KF6 version (e.g. 6.0)
%{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} |
awk -F. '{print $1"."$2}')}
%bcond_without released
Name: kf6-kcoreaddons
-Version: 6.5.0
+Version: 6.6.0
Release: 0
Summary: Utilities for core application functionality and accessing the
OS
License: LGPL-2.1-or-later
++++++ kcoreaddons-6.5.0.tar.xz -> kcoreaddons-6.6.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcoreaddons-6.5.0/.gitlab-ci.yml
new/kcoreaddons-6.6.0/.gitlab-ci.yml
--- old/kcoreaddons-6.5.0/.gitlab-ci.yml 2024-08-02 13:12:36.000000000
+0200
+++ new/kcoreaddons-6.6.0/.gitlab-ci.yml 2024-09-06 13:36:48.000000000
+0200
@@ -8,4 +8,5 @@
- /gitlab-templates/android-qt6.yml
- /gitlab-templates/freebsd-qt6.yml
- /gitlab-templates/windows-qt6.yml
+ - /gitlab-templates/alpine-qt6.yml
- /gitlab-templates/cppcheck.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcoreaddons-6.5.0/CMakeLists.txt
new/kcoreaddons-6.6.0/CMakeLists.txt
--- old/kcoreaddons-6.5.0/CMakeLists.txt 2024-08-02 13:12:36.000000000
+0200
+++ new/kcoreaddons-6.6.0/CMakeLists.txt 2024-09-06 13:36:48.000000000
+0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "6.5.0") # handled by release scripts
+set(KF_VERSION "6.6.0") # handled by release scripts
project(KCoreAddons VERSION ${KF_VERSION})
include(FeatureSummary)
-find_package(ECM 6.5.0 NO_MODULE)
+find_package(ECM 6.6.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)
@@ -24,7 +24,6 @@
include(ECMAddQch)
include(ECMSetupQtPluginMacroNames)
include(ECMDeprecationSettings)
-include(ECMQmlModule)
set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of
deprecated API excluded from the build [default=0].")
@@ -38,6 +37,7 @@
find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core)
if (KCOREADDONS_USE_QML)
find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Qml)
+ include(ECMQmlModule)
endif()
ecm_setup_qtplugin_macro_names(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcoreaddons-6.5.0/KF6CoreAddonsMacros.cmake
new/kcoreaddons-6.6.0/KF6CoreAddonsMacros.cmake
--- old/kcoreaddons-6.5.0/KF6CoreAddonsMacros.cmake 2024-08-02
13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/KF6CoreAddonsMacros.cmake 2024-09-06
13:36:48.000000000 +0200
@@ -29,7 +29,7 @@
message(FATAL_ERROR "Must specify INSTALL_NAMESPACE for ${plugin}")
endif()
if (ARGS_UNPARSED_ARGUMENTS)
- message(FATAL_ERROR "kcoreaddons_add_plugin method call recieved
unexpected arguments: ${ARGS_UNPARSED_ARGUMENTS}")
+ message(FATAL_ERROR "kcoreaddons_add_plugin method call received
unexpected arguments: ${ARGS_UNPARSED_ARGUMENTS}")
endif()
if (NOT BUILD_SHARED_LIBS)
set(ARGS_STATIC ON)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kcoreaddons-6.5.0/autotests/klistopenfilesjobtest_unix.cpp
new/kcoreaddons-6.6.0/autotests/klistopenfilesjobtest_unix.cpp
--- old/kcoreaddons-6.5.0/autotests/klistopenfilesjobtest_unix.cpp
2024-08-02 13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/autotests/klistopenfilesjobtest_unix.cpp
2024-09-06 13:36:48.000000000 +0200
@@ -2,7 +2,7 @@
This file is part of the KDE project
SPDX-FileCopyrightText: 2019 David Hallas <[email protected]>
- SPDX-License-Identifier: LGPL-2.0-only
+ SPDX-License-Identifier: LGPL-2.1-or-later
*/
#include "klistopenfilesjobtest_unix.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kcoreaddons-6.5.0/autotests/klistopenfilesjobtest_unix.h
new/kcoreaddons-6.6.0/autotests/klistopenfilesjobtest_unix.h
--- old/kcoreaddons-6.5.0/autotests/klistopenfilesjobtest_unix.h
2024-08-02 13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/autotests/klistopenfilesjobtest_unix.h
2024-09-06 13:36:48.000000000 +0200
@@ -2,7 +2,7 @@
This file is part of the KDE project
SPDX-FileCopyrightText: 2019 David Hallas <[email protected]>
- SPDX-License-Identifier: LGPL-2.0-only
+ SPDX-License-Identifier: LGPL-2.1-or-later
*/
#ifndef KLISTOPENFILESJOBTEST_UNIX_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kcoreaddons-6.5.0/autotests/klistopenfilesjobtest_win.cpp
new/kcoreaddons-6.6.0/autotests/klistopenfilesjobtest_win.cpp
--- old/kcoreaddons-6.5.0/autotests/klistopenfilesjobtest_win.cpp
2024-08-02 13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/autotests/klistopenfilesjobtest_win.cpp
2024-09-06 13:36:48.000000000 +0200
@@ -2,7 +2,7 @@
This file is part of the KDE project
SPDX-FileCopyrightText: 2019 David Hallas <[email protected]>
- SPDX-License-Identifier: LGPL-2.0-only
+ SPDX-License-Identifier: LGPL-2.1-or-later
*/
#include "klistopenfilesjobtest_win.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kcoreaddons-6.5.0/autotests/klistopenfilesjobtest_win.h
new/kcoreaddons-6.6.0/autotests/klistopenfilesjobtest_win.h
--- old/kcoreaddons-6.5.0/autotests/klistopenfilesjobtest_win.h 2024-08-02
13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/autotests/klistopenfilesjobtest_win.h 2024-09-06
13:36:48.000000000 +0200
@@ -2,7 +2,7 @@
This file is part of the KDE project
SPDX-FileCopyrightText: 2019 David Hallas <[email protected]>
- SPDX-License-Identifier: LGPL-2.0-only
+ SPDX-License-Identifier: LGPL-2.1-or-later
*/
#ifndef KLISTOPENFILESJOBTEST_WIN_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcoreaddons-6.5.0/autotests/kprocesslisttest.cpp
new/kcoreaddons-6.6.0/autotests/kprocesslisttest.cpp
--- old/kcoreaddons-6.5.0/autotests/kprocesslisttest.cpp 2024-08-02
13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/autotests/kprocesslisttest.cpp 2024-09-06
13:36:48.000000000 +0200
@@ -2,7 +2,7 @@
This file is part of the KDE project
SPDX-FileCopyrightText: 2019 David Hallas <[email protected]>
- SPDX-License-Identifier: LGPL-2.0-only
+ SPDX-License-Identifier: LGPL-2.1-or-later
*/
#include "kprocesslisttest.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcoreaddons-6.5.0/autotests/kprocesslisttest.h
new/kcoreaddons-6.6.0/autotests/kprocesslisttest.h
--- old/kcoreaddons-6.5.0/autotests/kprocesslisttest.h 2024-08-02
13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/autotests/kprocesslisttest.h 2024-09-06
13:36:48.000000000 +0200
@@ -2,7 +2,7 @@
This file is part of the KDE project
SPDX-FileCopyrightText: 2019 David Hallas <[email protected]>
- SPDX-License-Identifier: LGPL-2.0-only
+ SPDX-License-Identifier: LGPL-2.1-or-later
*/
#ifndef KPROCESSLISTTEST_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcoreaddons-6.5.0/poqm/de/kcoreaddons6_qt.po
new/kcoreaddons-6.6.0/poqm/de/kcoreaddons6_qt.po
--- old/kcoreaddons-6.5.0/poqm/de/kcoreaddons6_qt.po 2024-08-02
13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/poqm/de/kcoreaddons6_qt.po 2024-09-06
13:36:48.000000000 +0200
@@ -12,7 +12,7 @@
# Frank Steinmetzger <[email protected]>, 2022.
msgid ""
msgstr ""
-"Project-Id-Version: kdelibs4\n"
+"Project-Id-Version: kcoreaddons6_qt\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2014-03-23 01:50+0000\n"
"PO-Revision-Date: 2023-12-18 15:22+0100\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcoreaddons-6.5.0/src/lib/io/kdirwatch.cpp
new/kcoreaddons-6.6.0/src/lib/io/kdirwatch.cpp
--- old/kcoreaddons-6.5.0/src/lib/io/kdirwatch.cpp 2024-08-02
13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/src/lib/io/kdirwatch.cpp 2024-09-06
13:36:48.000000000 +0200
@@ -886,11 +886,15 @@
}
// Try the appropriate preferred method from the config first
+ bool inotifyFailed = false;
bool entryAdded = false;
switch (preferredMethod) {
#if HAVE_SYS_INOTIFY_H
case KDirWatch::INotify:
entryAdded = useINotify(e);
+ if (!entryAdded) {
+ inotifyFailed = true;
+ }
break;
#else
case KDirWatch::INotify:
@@ -919,7 +923,9 @@
}
#endif
#if HAVE_QFILESYSTEMWATCHER
- if (preferredMethod != KDirWatch::QFSWatch && useQFSWatch(e)) {
+ // QFileSystemWatcher uses inotify internally if it's supported by the
platform, so
+ // if useInotify() already failed, don't try inotify again through
useQFSWatch().
+ if (preferredMethod != KDirWatch::QFSWatch && !inotifyFailed &&
useQFSWatch(e)) {
return;
}
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcoreaddons-6.5.0/src/lib/io/kurlmimedata.cpp
new/kcoreaddons-6.6.0/src/lib/io/kurlmimedata.cpp
--- old/kcoreaddons-6.5.0/src/lib/io/kurlmimedata.cpp 2024-08-02
13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/src/lib/io/kurlmimedata.cpp 2024-09-06
13:36:48.000000000 +0200
@@ -310,10 +310,6 @@
}
} else {
const QFileInfo info(url.toLocalFile());
- if (info.isDir()) {
- // XDG Document Portal doesn't support directories and
silently drops them.
- return false;
- }
if (info.isSymbolicLink()) {
// XDG Document Portal also doesn't support symlinks since it
doesn't let us open the fd O_NOFOLLOW.
//
https://github.com/flatpak/xdg-desktop-portal/issues/961#issuecomment-1573646299
@@ -329,8 +325,10 @@
// Otherwise not-wellbehaved clients that read the urls multiple times
will trip the automatic-transfer-
// closing-upon-read inside the portal and have any reads, but the first,
not properly resolve anymore.
const QString transferId =
iface->StartTransfer({{QStringLiteral("autostop"),
QVariant::fromValue(false)}});
- mimeData->setData(QStringLiteral("application/vnd.portal.filetransfer"),
QFile::encodeName(transferId));
- setSourceId(mimeData);
+ auto cleanup = qScopeGuard([transferId, iface] {
+ iface->StopTransfer(transferId);
+ iface->deleteLater();
+ });
auto optionalPaths = fuseRedirect(urls, onlyLocalFiles);
if (!optionalPaths.has_value()) {
@@ -351,14 +349,16 @@
const auto addFilesAndClear = [transferId, &iface, &pendingFds]() {
if (pendingFds.isEmpty()) {
- return;
+ return true;
}
auto reply = iface->AddFiles(transferId, pendingFds, {});
reply.waitForFinished();
if (reply.isError()) {
qCWarning(KCOREADDONS_DEBUG) << "Some files could not be exported.
" << reply.error();
+ return false;
}
pendingFds.clear();
+ return true;
};
for (const auto &path : optionalPaths.value()) {
@@ -366,24 +366,29 @@
if (fd == -1) {
const int error = errno;
qCWarning(KCOREADDONS_DEBUG) << "Failed to open" << path <<
strerror(error);
+ return false;
}
pendingFds << QDBusUnixFileDescriptor(fd);
close(fd);
if (pendingFds.size() >= maximumBatchSize) {
- addFilesAndClear();
+ if (!addFilesAndClear()) {
+ return false;
+ }
}
}
- addFilesAndClear();
- QObject::connect(mimeData, &QObject::destroyed, iface, [transferId, iface]
{
- iface->StopTransfer(transferId);
- iface->deleteLater();
- });
+ if (!addFilesAndClear()) {
+ return false;
+ }
+
+ QObject::connect(mimeData, &QObject::destroyed, iface, [cleanup =
std::move(cleanup)] {});
QObject::connect(iface,
&OrgFreedesktopPortalFileTransferInterface::TransferClosed, mimeData, [iface]()
{
iface->deleteLater();
});
+ mimeData->setData(QStringLiteral("application/vnd.portal.filetransfer"),
QFile::encodeName(transferId));
+ setSourceId(mimeData);
return true;
#else
Q_UNUSED(mimeData);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kcoreaddons-6.5.0/src/lib/plugin/kpluginmetadata.cpp
new/kcoreaddons-6.6.0/src/lib/plugin/kpluginmetadata.cpp
--- old/kcoreaddons-6.5.0/src/lib/plugin/kpluginmetadata.cpp 2024-08-02
13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/src/lib/plugin/kpluginmetadata.cpp 2024-09-06
13:36:48.000000000 +0200
@@ -128,10 +128,13 @@
{
QPluginLoader loader;
pluginLoaderForPath(loader, path);
- if (loader.metaData().isEmpty()) {
+
+ const QJsonObject metaData = loader.metaData();
+
+ if (metaData.isEmpty()) {
qCDebug(KCOREADDONS_DEBUG) << "no metadata found in" <<
loader.fileName() << loader.errorString();
}
- auto ret = new
KPluginMetaDataPrivate(loader.metaData().value(QLatin1String("MetaData")).toObject(),
//
+ auto ret = new
KPluginMetaDataPrivate(metaData.value(QLatin1String("MetaData")).toObject(), //
QFileInfo(loader.fileName()).absoluteFilePath(),
options);
ret->m_requestedFileName = path;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kcoreaddons-6.5.0/src/lib/util/klistopenfilesjob_win.cpp
new/kcoreaddons-6.6.0/src/lib/util/klistopenfilesjob_win.cpp
--- old/kcoreaddons-6.5.0/src/lib/util/klistopenfilesjob_win.cpp
2024-08-02 13:12:36.000000000 +0200
+++ new/kcoreaddons-6.6.0/src/lib/util/klistopenfilesjob_win.cpp
2024-09-06 13:36:48.000000000 +0200
@@ -3,7 +3,7 @@
SPDX-FileCopyrightText: 2019 David Hallas <[email protected]>
- SPDX-License-Identifier: LGPL-2.0-only
+ SPDX-License-Identifier: LGPL-2.1-or-later
*/
#include "klistopenfilesjob.h"
