Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libqt6xdg for openSUSE:Factory checked in at 2026-11-20 14:44:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt6xdg (Old) and /work/SRC/openSUSE:Factory/.libqt6xdg.new.1251 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt6xdg" Fri Nov 20 14:44:32 2026 rev:9 rq:1398745 version:4.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt6xdg/libqt6xdg.changes 2026-04-22 16:57:14.278144773 +0200 +++ /work/SRC/openSUSE:Factory/.libqt6xdg.new.1251/libqt6xdg.changes 2026-11-20 14:46:23.948559301 +0100 @@ -1,0 +2,7 @@ +Fri Nov 6 08:44:01 UTC 2026 - Андрей Алыпов <[email protected]> + +- Update to 4.5.0: + * Files are opened in the URI format with DBus activated apps. + * Also, the code is cleaned up in various ways. + +------------------------------------------------------------------- Old: ---- libqtxdg-4.4.0.tar.xz libqtxdg-4.4.0.tar.xz.asc New: ---- libqtxdg-4.5.0.tar.xz libqtxdg-4.5.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt6xdg.spec ++++++ --- /var/tmp/diff_new_pack.hto0Go/_old 2026-11-20 14:46:26.245656601 +0100 +++ /var/tmp/diff_new_pack.hto0Go/_new 2026-11-20 14:46:26.252656897 +0100 @@ -1,6 +1,7 @@ # # spec file for package libqt6xdg # +# Copyright (c) 2026 SUSE LLC # Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties @@ -17,10 +18,10 @@ %define _name libqtxdg -%define _sover 4.4.0 +%define _sover 4.5.0 %define sover 4 Name: libqt6xdg -Version: 4.4.0 +Version: 4.5.0 Release: 0 Summary: Qt implementation of freedesktop.org xdg specs License: LGPL-2.1-only AND SUSE-LGPL-2.1-with-digia-exception-1.1 @@ -29,14 +30,14 @@ Source1: %{url}/releases/download/%{version}/%{_name}-%{version}.tar.xz.asc Source2: %{name}.keyring -BuildRequires: cmake >= 3.5.0 +BuildRequires: cmake >= 3.18.0 BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: qt6-gui-private-devel -BuildRequires: cmake(Qt6Core) >= 6.6.0 +BuildRequires: cmake(Qt6Core) >= 6.10.0 BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6GuiPrivate) BuildRequires: cmake(Qt6Svg) BuildRequires: cmake(Qt6Test) BuildRequires: cmake(Qt6Widgets) ++++++ libqtxdg-4.4.0.tar.xz -> libqtxdg-4.5.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/.gitattributes new/libqtxdg-4.5.0/.gitattributes --- old/libqtxdg-4.4.0/.gitattributes 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/.gitattributes 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -# remove files from deployment using `git archive` - -# git* files -.gitattributes export-ignore -.github export-ignore -.gitignore export-ignore -.mailmap export-ignore - - -# several files and directories we never want to export -# a little bit belt and braces as the most of these files -# should never ever be in the repository - -.*~ export-ignore -.kdev4 export-ignore -release.sh export-ignore - -/build export-ignore -/temp export-ignore -/tmp export-ignore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/.github/ISSUE_TEMPLATE.md new/libqtxdg-4.5.0/.github/ISSUE_TEMPLATE.md --- old/libqtxdg-4.4.0/.github/ISSUE_TEMPLATE.md 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/.github/ISSUE_TEMPLATE.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,43 +0,0 @@ -<!--- Provide a general summary of the issue in the title above. You ---> -<!--- should not delete relevant sections and/or questions in your report ---> - -<!--- BEFORE FILLING OUT THIS REPORT FORM: ---> -<!--- Dear users of stable and LTS (long term service) distributions: ---> -<!--- Please do NOT file bugs against old (dead) versions but use your ---> -<!--- distribution bugtracker instead. This is esp. true for Ubuntu LTS. ---> - -##### Expected Behavior -<!--- If you're describing a bug, tell us what should happen --> -<!--- If you're suggesting a change/improvement, tell us how it should work --> - -##### Current Behavior -<!--- If describing a bug, tell us what happens instead of the expected ---> -<!--- behaviour. If suggesting a change/improvement, explain the difference --> -<!--- from current behavior (a screenshot might help) ---> - -##### Possible Solution -<!--- Not obligatory, but suggest a fix/reason for the bug, ---> -<!--- or ideas how to implement the addition or change ---> - -##### Steps to Reproduce (for bugs) -<!--- Provide a link to a live example, or an unambiguous set of steps to ---> -<!--- reproduce this bug. Include code to reproduce, if relevant ---> -1. -2. -3. -4. - -##### Context -<!--- How has this issue affected you? What are you trying to accomplish? ---> -<!--- Providing context helps us come up with a solution that is most ---> -<!--- useful in the real world ---> - -##### System Information -<!--- Include as many relevant details about the system you experienced ---> -<!--- the bug in ---> -* Distribution & Version: -* Kernel: -* Qt Version: -* cmake Version: -* lxqt-build-tools Version: -* Package version: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/.gitignore new/libqtxdg-4.5.0/.gitignore --- old/libqtxdg-4.4.0/.gitignore 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -build* -*.qm -*~ -*.autosave -*-swp -*.swp -CMakeLists.txt.user* -nbproject/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/.mailmap new/libqtxdg-4.5.0/.mailmap --- old/libqtxdg-4.4.0/.mailmap 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/.mailmap 1970-01-01 01:00:00.000000000 +0100 @@ -1,79 +0,0 @@ -# Proper Name <[email protected]> Commit Name <[email protected]> - - -Alexander Golubev <[email protected]> Golubev Alexander <[email protected]> - -Alf Gaida <[email protected]> Alf <[email protected]> -Alf Gaida <[email protected]> LX* Machine account <[email protected]> - -attus <[email protected]> attuska <[email protected]> -attus <[email protected]> attuska <[email protected]> - -Ayhan Yalçınsoy <[email protected]> Ayhan YALÇINSOY PhD. (Dr.) <[email protected]> -Ayhan Yalçınsoy <[email protected]> ayhanyalcinsoy <[email protected]> - -Bartosz Taczala <[email protected]> Bartek Taczala <[email protected]> - -Georges Eckenschwiller <[email protected]> paiiou <[email protected]> - -Hong Jen Yee (PCMan) <[email protected]> Hone Jen Yee (PCMan) <[email protected]> -Hong Jen Yee (PCMan) <[email protected]> PCMan <[email protected]> - -Jerome Leclanche <[email protected]> Jerome Leclanche <[email protected]> - -Julien Lavergne <[email protected]> Julien Lavergne <[email protected]> - -Marcin Mikołajczak <[email protected]> Marcin Mikołajczak <[email protected]> -Marcin Mikołajczak <[email protected]> m4sk1n <[email protected]> - -Masamichi Ito <[email protected]> Ma. Ito <[email protected]> -Masamichi Ito <[email protected]> Masamichi Ito <[email protected]> -Masamichi Ito <[email protected]> Masamichi Ito <[email protected]> -Masamichi Ito <[email protected]> Masamichi Ito <[email protected]> -Masamichi Ito <[email protected]> Masamichi Ito <[email protected]> - -Michael Vetter <[email protected]> Michael Vetter <[email protected]> -Michael Vetter <[email protected]> Michael Vetter <[email protected]> - -micrococo <[email protected]> micrococo <[email protected]> - -notname000 <[email protected]> notname000 <[email protected]> - -Pavel Fric <[email protected]> PavelFric <[email protected]> - -Palo Kisa <[email protected]> palinek <[email protected]> - -Peter Mattern <[email protected]> Peter Mattern <[email protected]> -Peter Mattern <[email protected]> Peter Mattern <[email protected]> - -Petr Vanek <[email protected]> Petr Vanek <[email protected]> -Petr Vanek <[email protected]> pvanek <[email protected]> - -Philipp Wiesemann <[email protected]> Philipp Wiesemann <[email protected]> - -Robert Antoni Buj Gelonch <[email protected]> Robert Antoni Buj Gelonch <[email protected]> -Robert Antoni Buj Gelonch <[email protected]> rbuj <[email protected]> -Robert Antoni Buj Gelonch <[email protected]> Robert Antoni Buj Gelonch <[email protected]> -Robert Antoni Buj Gelonch <[email protected]> Robert Antoni Buj Gelonch <[email protected]> - -Safa Alfulaij <[email protected]> safaalfulaij <[email protected]> - -Stefano Binde <[email protected]> stefonarch <[email protected]> - -Takefumi Nagata <[email protected]> Takefumi Nagata <[email protected]> - -Tsu Jan <[email protected]> tsujan <[email protected]> - - -Urs Fleisch <[email protected]> Urs Fleisch <[email protected]> - - -Vladimir Chren <[email protected]> vc-01 <[email protected]> -Vladimir Chren <[email protected]> vc-01 <[email protected]> - - -welaq <[email protected]> welaq <[email protected]> - -Yaşar Çiv <[email protected]> Yaşar <[email protected]> - -Zac Anger <[email protected]> zacanger <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/CHANGELOG new/libqtxdg-4.5.0/CHANGELOG --- old/libqtxdg-4.4.0/CHANGELOG 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/CHANGELOG 2026-11-03 11:35:54.000000000 +0100 @@ -1,3 +1,13 @@ +libqtxdg-4.5.0 / 2026-11-05 +============================ + * Don't show C2Y extensions warnings. + * Updated the address of Free Software Foundation. + * Dropped string macros. + * Open files in URI format with DBus activated apps. + * Removed old codes belonging to Qt < 6.8 after bumping the minimum Qt version to 6.10. + * Dropped QVector. + * Removed unneeded headers. + libqtxdg-4.4.0 / 2026-04-20 ============================ * Modernized string nomenclature and classes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/CMakeLists.txt new/libqtxdg-4.5.0/CMakeLists.txt --- old/libqtxdg-4.4.0/CMakeLists.txt 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/CMakeLists.txt 2026-11-03 11:35:54.000000000 +0100 @@ -14,22 +14,19 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(QTXDG_MAJOR_VERSION 4) -set(QTXDG_MINOR_VERSION 4) +set(QTXDG_MINOR_VERSION 5) set(QTXDG_PATCH_VERSION 0) set(QTXDG_VERSION_STRING ${QTXDG_MAJOR_VERSION}.${QTXDG_MINOR_VERSION}.${QTXDG_PATCH_VERSION}) -set(LXQTBT_MINIMUM_VERSION "2.4.0") -set(QT_MINIMUM_VERSION "6.6.0") +set(LXQTBT_MINIMUM_VERSION "2.5.0") +set(QT_MINIMUM_VERSION "6.10.0") set(GLIB_MINIMUM_VERSION "2.41.0") # Mime Apps new implementation find_package(lxqt2-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) find_package(Qt6 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Widgets Svg Xml DBus) find_package(GLIB ${GLIB_MINIMUM_VERSION} REQUIRED COMPONENTS gobject gio gio-unix) find_package(XTerm) - -if (Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10.0") - find_package(Qt6GuiPrivate ${QT_MINIMUM_VERSION} REQUIRED) -endif() +find_package(Qt6GuiPrivate ${QT_MINIMUM_VERSION} REQUIRED) include(GNUInstallDirs) # Standard directories for installation include(CMakePackageConfigHelpers) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/COPYING new/libqtxdg-4.5.0/COPYING --- old/libqtxdg-4.4.0/COPYING 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/COPYING 2026-11-03 11:35:54.000000000 +0100 @@ -3,7 +3,7 @@ Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + <https://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/CMakeLists.txt new/libqtxdg-4.5.0/src/qtxdg/CMakeLists.txt --- old/libqtxdg-4.4.0/src/qtxdg/CMakeLists.txt 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/CMakeLists.txt 2026-11-03 11:35:54.000000000 +0100 @@ -93,6 +93,11 @@ SOVERSION ${QTXDG_MAJOR_VERSION} ) +target_compile_options(${QTXDGX_LIBRARY_NAME} + PRIVATE + "$<$<CXX_COMPILER_ID:Clang>:-Wno-c2y-extensions>" +) + target_compile_definitions(${QTXDGX_LIBRARY_NAME} PRIVATE "QTXDG_COMPILATION=\"1\"" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgaction.h new/libqtxdg-4.5.0/src/qtxdg/xdgaction.h --- old/libqtxdg-4.4.0/src/qtxdg/xdgaction.h 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgaction.h 2026-11-03 11:35:54.000000000 +0100 @@ -19,9 +19,8 @@ * Lesser General Public License for more details. * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA + * Public License along with this library; if not, see + * <https://www.gnu.org/licenses/>. * * END_COMMON_COPYRIGHT_HEADER */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgautostart.h new/libqtxdg-4.5.0/src/qtxdg/xdgautostart.h --- old/libqtxdg-4.4.0/src/qtxdg/xdgautostart.h 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgautostart.h 2026-11-03 11:35:54.000000000 +0100 @@ -19,9 +19,8 @@ * Lesser General Public License for more details. * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA + * Public License along with this library; if not, see + * <https://www.gnu.org/licenses>. * * END_COMMON_COPYRIGHT_HEADER */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgdesktopfile.cpp new/libqtxdg-4.5.0/src/qtxdg/xdgdesktopfile.cpp --- old/libqtxdg-4.4.0/src/qtxdg/xdgdesktopfile.cpp 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgdesktopfile.cpp 2026-11-03 11:35:54.000000000 +0100 @@ -35,9 +35,6 @@ #include "xdgmimeapps.h" #include "xdgdefaultapps.h" -#include <cstdlib> -#include <unistd.h> - #include <QDebug> #include <QDBusInterface> #include <QDBusObjectPath> @@ -493,6 +490,7 @@ bool XdgDesktopFileData::startApplicationDetached(const XdgDesktopFile *q, const QString & action, const QStringList& urls) const { + QStringList formattedUrls(urls.size()); //DBusActivatable handling if (q->value("DBusActivatable"_L1, false).toBool()) { /* WARNING: We fallback to use Exec when the DBusActivatable fails. @@ -516,13 +514,37 @@ * We consider that this violation is more acceptable than an failure * in launching an application. */ - if (startByDBus(action, urls)) + + // Convert all local filesystem paths to URL format + // The spec states that filenames are an array of URIs, in UTF-8. + // Ref: https://specifications.freedesktop.org/desktop-entry/latest/dbus.html + for (qsizetype i = 0; i < urls.size(); ++i) { + const QUrl url(urls.at(i)); + if (url.scheme().isEmpty()) { + // No scheme present: treat as a direct filesystem path + formattedUrls[i] = QUrl::fromLocalFile(urls.at(i)).toString(); + } else { + formattedUrls[i] = urls.at(i); + } + } + if (startByDBus(action, formattedUrls)) return true; } + + // Convert all to local filesystem paths. + // Some apps can't take an local fil in URL format + for (qsizetype i = 0; i < urls.size(); ++i) { + const QUrl url(urls.at(i)); + if (url.scheme() == "file"_L1) { + formattedUrls[i] = url.toLocalFile(); + } else { + formattedUrls[i] = urls.at(i); + } + } QStringList args; QStringList appArgs = action.isEmpty() - ? q->expandExecString(urls) - : XdgDesktopAction{*q, action}.expandExecString(urls); + ? q->expandExecString(formattedUrls) + : XdgDesktopAction{*q, action}.expandExecString(formattedUrls); if (appArgs.isEmpty()) return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgdesktopfile.h new/libqtxdg-4.5.0/src/qtxdg/xdgdesktopfile.h --- old/libqtxdg-4.4.0/src/qtxdg/xdgdesktopfile.h 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgdesktopfile.h 2026-11-03 11:35:54.000000000 +0100 @@ -19,9 +19,8 @@ * Lesser General Public License for more details. * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA + * Public License along with this library; if not, see + * <https://www.gnu.org/licenses>. * * END_COMMON_COPYRIGHT_HEADER */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgdirs.cpp new/libqtxdg-4.5.0/src/qtxdg/xdgdirs.cpp --- old/libqtxdg-4.4.0/src/qtxdg/xdgdirs.cpp 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgdirs.cpp 2026-11-03 11:35:54.000000000 +0100 @@ -28,10 +28,11 @@ // clazy:excludeall=non-pod-global-static #include "xdgdirs.h" -#include <cstdlib> + #include <QDir> #include <QDebug> #include <QLatin1StringView> +#include <QList> #include <QStandardPaths> @@ -214,7 +215,7 @@ return false; QTextStream stream(&configFile); - QVector<QString> lines; + QList<QString> lines; QString line; bool foundVar = false; while (!stream.atEnd()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgdirs.h new/libqtxdg-4.5.0/src/qtxdg/xdgdirs.h --- old/libqtxdg-4.4.0/src/qtxdg/xdgdirs.h 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgdirs.h 2026-11-03 11:35:54.000000000 +0100 @@ -19,9 +19,8 @@ * Lesser General Public License for more details. * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA + * Public License along with this library; if not, see + * <https://www.gnu.org/licenses>. * * END_COMMON_COPYRIGHT_HEADER */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgicon.h new/libqtxdg-4.5.0/src/qtxdg/xdgicon.h --- old/libqtxdg-4.4.0/src/qtxdg/xdgicon.h 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgicon.h 2026-11-03 11:35:54.000000000 +0100 @@ -19,9 +19,8 @@ * Lesser General Public License for more details. * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA + * Public License along with this library; if not, see + * <https://www.gnu.org/licenses>. * * END_COMMON_COPYRIGHT_HEADER */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgmacros.h new/libqtxdg-4.5.0/src/qtxdg/xdgmacros.h --- old/libqtxdg-4.4.0/src/qtxdg/xdgmacros.h 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgmacros.h 2026-11-03 11:35:54.000000000 +0100 @@ -42,20 +42,4 @@ # define QTXDG_AUTOTEST /* Building library, tests disabled */ #endif -#ifndef QL1S -#define QL1S(x) QLatin1String(x) -#endif - -#ifndef QL1C -#define QL1C(x) QLatin1Char(x) -#endif - -#ifndef QSL -#define QSL(x) QStringLiteral(x) -#endif - -#ifndef QBAL -#define QBAL(x) QByteArrayLiteral(x) -#endif - #endif // QTXDG_MACROS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgmenu.h new/libqtxdg-4.5.0/src/qtxdg/xdgmenu.h --- old/libqtxdg-4.4.0/src/qtxdg/xdgmenu.h 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgmenu.h 2026-11-03 11:35:54.000000000 +0100 @@ -19,9 +19,8 @@ * Lesser General Public License for more details. * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA + * Public License along with this library; if not, see + * <https://www.gnu.org/licenses>. * * END_COMMON_COPYRIGHT_HEADER */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgmenuwidget.h new/libqtxdg-4.5.0/src/qtxdg/xdgmenuwidget.h --- old/libqtxdg-4.4.0/src/qtxdg/xdgmenuwidget.h 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgmenuwidget.h 2026-11-03 11:35:54.000000000 +0100 @@ -19,9 +19,8 @@ * Lesser General Public License for more details. * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA + * Public License along with this library; if not, see + * <https://www.gnu.org/licenses>. * * END_COMMON_COPYRIGHT_HEADER */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xdgmimeapps.cpp new/libqtxdg-4.5.0/src/qtxdg/xdgmimeapps.cpp --- old/libqtxdg-4.4.0/src/qtxdg/xdgmimeapps.cpp 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xdgmimeapps.cpp 2026-11-03 11:35:54.000000000 +0100 @@ -22,7 +22,6 @@ #include "xdgmimeapps_p.h" #include "xdgdesktopfile.h" -#include "xdgmacros.h" #include "xdgmimeappsglibbackend.h" #include <QMutexLocker> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/qtxdg/xmlhelper.h new/libqtxdg-4.5.0/src/qtxdg/xmlhelper.h --- old/libqtxdg-4.4.0/src/qtxdg/xmlhelper.h 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/qtxdg/xmlhelper.h 2026-11-03 11:35:54.000000000 +0100 @@ -19,9 +19,8 @@ * Lesser General Public License for more details. * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA + * Public License along with this library; if not, see + * <https://www.gnu.org/licenses>. * * END_COMMON_COPYRIGHT_HEADER */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/xdgiconloader/xdgiconloader.cpp new/libqtxdg-4.5.0/src/xdgiconloader/xdgiconloader.cpp --- old/libqtxdg-4.4.0/src/xdgiconloader/xdgiconloader.cpp 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/xdgiconloader/xdgiconloader.cpp 2026-11-03 11:35:54.000000000 +0100 @@ -768,11 +768,7 @@ } // XXX: duplicated from qiconloader.cpp, because this symbol isn't exported :( -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale) -#else -QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) -#endif { Q_UNUSED(state); @@ -788,7 +784,6 @@ if (!actualSize.isNull() && (actualSize.width() > size.width() || actualSize.height() > size.height())) actualSize.scale(size, Qt::KeepAspectRatio); -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) // see QIconPrivate::pixmapDevicePixelRatio qreal calculatedDpr; QSize targetSize = size * scale; @@ -812,14 +807,6 @@ % HexString<uint>(actualSize.width()) % HexString<uint>(actualSize.height()) % HexString<quint16>(qRound(calculatedDpr * 1000)); -#else - QString key = "$qt_theme_"_L1 - % HexString<qint64>(basePixmap.cacheKey()) - % HexString<int>(mode) - % HexString<qint64>(QGuiApplication::palette().cacheKey()) - % HexString<int>(actualSize.width()) - % HexString<int>(actualSize.height()); -#endif QPixmap cachedPixmap; if (QPixmapCache::find(key, &cachedPixmap)) { @@ -831,9 +818,7 @@ cachedPixmap = basePixmap; if (QGuiApplication *guiApp = qobject_cast<QGuiApplication *>(qApp)) cachedPixmap = static_cast<QGuiApplicationPrivate*>(QObjectPrivate::get(guiApp))->applyQIconStyleHelper(mode, cachedPixmap); -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) cachedPixmap.setDevicePixelRatio(calculatedDpr); -#endif QPixmapCache::insert(key, cachedPixmap); } return cachedPixmap; @@ -841,17 +826,12 @@ // NOTE: For SVG, QSvgRenderer is used to prevent our icon handling from // being broken by icon engines that register themselves for SVG. -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) QPixmap ScalableEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale) -#else -QPixmap ScalableEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) -#endif { QPixmap pm; if (size.isEmpty()) return pm; -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) QString key = "lxqt_"_L1 % filename % HexString<quint8>(mode) @@ -859,21 +839,10 @@ % HexString<uint>(size.width()) % HexString<uint>(size.height()) % HexString<quint16>(qRound(scale * 1000)); -#else - QString key = "lxqt_"_L1 - % filename - % HexString<int>(mode) - % HexString<int>(state) - % HexString<int>(size.width()) - % HexString<int>(size.height()); -#endif + if (!QPixmapCache::find(key, &pm)) { -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) int icnSize = std::min(size.width(), size.height()) * scale; -#else - int icnSize = std::min(size.width(), size.height()); -#endif pm = QPixmap(icnSize, icnSize); pm.fill(Qt::transparent); @@ -887,12 +856,7 @@ } svgIcon = QIcon(pm); -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) pm = svgIcon.pixmap(size, scale, mode, state); -#else - if (QIconEngine *engine = svgIcon.data_ptr() ? svgIcon.data_ptr()->engine : nullptr) - pm = engine->pixmap(size, mode, state); -#endif QPixmapCache::insert(key, pm); } @@ -905,11 +869,7 @@ // NOTE: Qt palette does not have any colors for positive/negative text // .ColorScheme-PositiveText,ColorScheme-NegativeText {color:%4;} -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) QPixmap ScalableFollowsColorEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale) -#else -QPixmap ScalableFollowsColorEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) -#endif { QPixmap pm; if (size.isEmpty()) @@ -937,7 +897,6 @@ } hCol = pal.highlight().color().name(); } -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) QString key = "lxqt_"_L1 % filename % HexString<quint8>(mode) @@ -946,22 +905,10 @@ % HexString<uint>(size.height()) % HexString<quint16>(qRound(scale * 1000)) % txtCol % bgCol % hCol; -#else - QString key = "lxqt_"_L1 - % filename - % HexString<int>(mode) - % HexString<int>(state) - % HexString<int>(size.width()) - % HexString<int>(size.height()) - % txtCol % bgCol % hCol; -#endif + if (!QPixmapCache::find(key, &pm)) { -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) int icnSize = std::min(size.width(), size.height()) * scale; -#else - int icnSize = std::min(size.width(), size.height()); -#endif pm = QPixmap(icnSize, icnSize); pm.fill(Qt::transparent); @@ -1012,12 +959,7 @@ // for QIcon::pixmap() to handle states and modes, // especially the disabled mode. svgIcon = QIcon(pm); -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) pm = svgIcon.pixmap(size, scale, mode, state); -#else - if (QIconEngine *engine = svgIcon.data_ptr() ? svgIcon.data_ptr()->engine : nullptr) - pm = engine->pixmap(size, mode, state); -#endif QPixmapCache::insert(key, pm); } @@ -1051,13 +993,8 @@ { ensureLoaded(); const int integerScale = std::ceil(scale); -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) QIconLoaderEngineEntry *entry = entryForSize(m_info, size, integerScale); return entry ? entry->pixmap(size, mode, state, scale) : QPixmap(); -#else - QIconLoaderEngineEntry *entry = entryForSize(m_info, size / integerScale, integerScale); - return entry ? entry->pixmap(size, mode, state) : QPixmap(); -#endif } QList<QSize> XdgIconLoaderEngine::availableSizes(QIcon::Mode mode, QIcon::State state) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libqtxdg-4.4.0/src/xdgiconloader/xdgiconloader_p.h new/libqtxdg-4.5.0/src/xdgiconloader/xdgiconloader_p.h --- old/libqtxdg-4.4.0/src/xdgiconloader/xdgiconloader_p.h 2026-04-20 09:07:00.000000000 +0200 +++ new/libqtxdg-4.5.0/src/xdgiconloader/xdgiconloader_p.h 2026-11-03 11:35:54.000000000 +0100 @@ -63,11 +63,7 @@ struct ScalableFollowsColorEntry : public QIconLoaderEngineEntry { -#if (QT_VERSION >= QT_VERSION_CHECK(6,8,0)) QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale) override; -#else - QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override; -#endif QIcon svgIcon; };
