Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libqt6xdg for openSUSE:Factory checked in at 2025-04-08 17:52:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt6xdg (Old) and /work/SRC/openSUSE:Factory/.libqt6xdg.new.1907 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt6xdg" Tue Apr 8 17:52:03 2025 rev:4 rq:1267782 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt6xdg/libqt6xdg.changes 2024-11-11 13:46:40.827217131 +0100 +++ /work/SRC/openSUSE:Factory/.libqt6xdg.new.1907/libqt6xdg.changes 2025-04-08 17:52:48.510463040 +0200 @@ -1,0 +2,9 @@ +Mon Apr 7 17:33:22 UTC 2025 - Shawn Dunn <[email protected]> + +- Add: 35ce74f1510a9f41b2aff82fd1eda63014c3fe2b.patch + (gh#lxqt/libqtxdg#311) + * Adapts to changes in Qt > 6.8 Private Headers +- Remove Group: Declarations, no longer used +- Add %check section + +------------------------------------------------------------------- New: ---- 35ce74f1510a9f41b2aff82fd1eda63014c3fe2b.patch BETA DEBUG BEGIN: New: - Add: 35ce74f1510a9f41b2aff82fd1eda63014c3fe2b.patch (gh#lxqt/libqtxdg#311) BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt6xdg.spec ++++++ --- /var/tmp/diff_new_pack.MuVDUb/_old 2025-04-08 17:52:48.998483512 +0200 +++ /var/tmp/diff_new_pack.MuVDUb/_new 2025-04-08 17:52:48.998483512 +0200 @@ -24,11 +24,14 @@ 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 -Group: Development/Libraries/C and C++ URL: https://github.com/lxqt/libqtxdg Source0: %{url}/releases/download/%{version}/%{_name}-%{version}.tar.xz Source1: %{url}/releases/download/%{version}/%{_name}-%{version}.tar.xz.asc Source2: %{name}.keyring + +# PATCH-FIX-UPSTREAM <[email protected]> (gh#lxqt/libqtxdg#311) +Patch0: %{url}/commit/35ce74f1510a9f41b2aff82fd1eda63014c3fe2b.patch + BuildRequires: cmake >= 3.18.0 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -52,7 +55,6 @@ %package -n libQt6Xdg%{sover} Summary: Libraries for qtxdg -Group: System/Libraries Provides: libqtxdg %description -n libQt6Xdg%{sover} @@ -60,7 +62,6 @@ %package devel Summary: Devel files for libqtxdg -Group: Development/Libraries/C and C++ Requires: libQt6Xdg%{sover} = %{version} %description devel @@ -68,7 +69,6 @@ %package -n libQt6XdgIconLoader%{sover} Summary: IconLoader library for QtXDG -Group: System/Libraries Provides: libqtxdgiconloader %description -n libQt6XdgIconLoader%{sover} @@ -76,14 +76,13 @@ %package -n libQt6XdgIconLoader-devel Summary: Devel files for libQt6XdgIconLoader -Group: Development/Libraries/C and C++ Requires: libQt6XdgIconLoader%{sover} = %{version} %description -n libQt6XdgIconLoader-devel Development files for QtXDG icon loader libraries used in LXQt %prep -%autosetup -n %{_name}-%{version} +%autosetup -p1 -n %{_name}-%{version} %build %cmake_qt6 @@ -96,6 +95,9 @@ %ldconfig_scriptlets -n libQt6Xdg%{sover} %ldconfig_scriptlets -n libQt6XdgIconLoader%{sover} +%check +%ctest + %files -n libQt6Xdg%{sover} %doc AUTHORS CHANGELOG README.md %config %{_sysconfdir}/xdg/*qtxdg.conf ++++++ 35ce74f1510a9f41b2aff82fd1eda63014c3fe2b.patch ++++++ >From 35ce74f1510a9f41b2aff82fd1eda63014c3fe2b Mon Sep 17 00:00:00 2001 From: Palo Kisa <[email protected]> Date: Sat, 22 Feb 2025 09:42:18 +0100 Subject: [PATCH] Adapt to changes in private headers Qt v6.9 (#311) * Adapt to changes in private headers Qt v6.9 * Added a missing condition --------- Co-authored-by: Tsu Jan <[email protected]> --- src/xdgiconloader/xdgiconloader.cpp | 11 +++++++++-- src/xdgiconloader/xdgiconloader_p.h | 3 ++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/xdgiconloader/xdgiconloader.cpp b/src/xdgiconloader/xdgiconloader.cpp index c299cca..7595069 100644 --- a/src/xdgiconloader/xdgiconloader.cpp +++ b/src/xdgiconloader/xdgiconloader.cpp @@ -439,7 +439,11 @@ QThemeIconInfo XdgIconLoader::findIconHelper(const QString &themeName, } else if (gSupportsSvg) { const QString svgPath = subDir + svgIconName; if (QFile::exists(svgPath)) { - std::unique_ptr<ScalableEntry> iconEntry = (followColorScheme() && theme.followsColorScheme()) ? std::make_unique<ScalableFollowsColorEntry>() : std::make_unique<ScalableEntry>(); + std::unique_ptr<QIconLoaderEngineEntry> iconEntry; + if (followColorScheme() && theme.followsColorScheme()) + iconEntry.reset(new ScalableFollowsColorEntry); + else + iconEntry.reset(new ScalableEntry); iconEntry->dir = dirInfo; iconEntry->filename = svgPath; info.entries.push_back(std::move(iconEntry)); @@ -737,8 +741,11 @@ QSize XdgIconLoaderEngine::actualSize(const QSize &size, QIcon::Mode mode, QIconLoaderEngineEntry *entry = entryForSize(m_info, size); if (entry) { const QIconDirInfo &dir = entry->dir; - if (dir.type == QIconDirInfo::Scalable || dynamic_cast<ScalableEntry *>(entry)) + if (dir.type == QIconDirInfo::Scalable + || dynamic_cast<ScalableEntry *>(entry) + || dynamic_cast<ScalableFollowsColorEntry *>(entry)) { return size; + } else { int dir_size = dir.size; //Note: fallback for directories that don't have its content size defined diff --git a/src/xdgiconloader/xdgiconloader_p.h b/src/xdgiconloader/xdgiconloader_p.h index 6c5f17f..cb990a9 100644 --- a/src/xdgiconloader/xdgiconloader_p.h +++ b/src/xdgiconloader/xdgiconloader_p.h @@ -61,13 +61,14 @@ class XdgIconLoader; -struct ScalableFollowsColorEntry : public ScalableEntry +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; }; //class QIconLoaderEngine : public QIconEngine
