Fix FTBFS with Qt 6.9

debian/changelog

@@ -1,41 +1,3 @@
-libqtxdg (4.2.0-0ubuntu1) questing; urgency=medium
-
-  * New upstream release.
-    - Update build dependencies.
-  * Update Standards-Version to 4.7.2, no changes needed.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sat, 07 Jun 2025 23:44:05 -0500
-
-libqtxdg (4.1.0-0ubuntu6) plucky; urgency=medium
-
-  * Update Standards-Version to 4.7.1, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:01:56 -0600
-
-libqtxdg (4.1.0-0ubuntu5) plucky; urgency=medium
-
-  * No-change rebuild for Qt 6.8.2.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 04 Feb 2025 11:05:34 -0600
-
-libqtxdg (4.1.0-0ubuntu4) plucky; urgency=medium
-
-  * No-change rebuild for lxqt-build-tools C++17 -> C++20.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 03:53:46 -0600
-
-libqtxdg (4.1.0-0ubuntu3) plucky; urgency=medium
-
-  * No-change rebuild for Qt 6.8.1.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 04 Dec 2024 14:32:44 -0600
-
-libqtxdg (4.1.0-0ubuntu2) plucky; urgency=medium
-
-  * No-change rebuild for Qt 6.8.0.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 04 Dec 2024 14:32:44 -0600
-
 libqtxdg (4.1.0-0ubuntu1) plucky; urgency=medium
 
   * New upstream release.

debian/control

@@ -10,13 +10,13 @@ Priority: optional
 Build-Depends: cmake,
                debhelper-compat (= 13),
                libmagic-dev,
-               lxqt-build-tools (>= 2.2.0),
+               lxqt-build-tools (>= 2.1.0),
                pkgconf,
                qt6-base-private-dev,
                qt6-svg-dev,
                qt6-tools-dev,
                qt6-tools-dev-tools
-Standards-Version: 4.7.2
+Standards-Version: 4.7.0
 Rules-Requires-Root: no
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/libqtxdg-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/libqtxdg-packaging.git

debian/copyright

@@ -4,7 +4,7 @@ Source: https://github.com/lxqt/libqtxdg
 
 Files: *
 Copyright: 2010-2012 Razor team
-           2012-2025 LXQt team
+           2012-2023 LXQt team
 License: LGPL-2.1+
 
 Copyright: 2013 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
@@ -43,8 +43,8 @@ Copyright: 2013-2019 Alf Gaida <agaida@siduction.org>
            2015-2022 Andrew Lee (李健秋) <ajqlee@debian.org>
            2014-2016 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
            2022      S. 7 <severusseptimius7@gmail.com>
-           2022-2025 Simon Quigley <tsimonq2@debian.org>
-           2023-2025 Aaron Rainbolt <arraybolt3@ubuntu.com>
+           2022-2024 Simon Quigley <tsimonq2@debian.org>
+           2023-2024 Aaron Rainbolt <arraybolt3@ubuntu.com>
 License: LGPL-2.1+
 
 License: BSD-3-clause

debian/patches/series

@@ -1 +1,2 @@
 ubuntu-gettext-translations.patch
+test-qt69-build.patch

debian/patches/test-qt69-build.patch

@@ -0,0 +1,39 @@
+Description: https://github.com/lxqt/libqtxdg/issues/310
+
+diff --git a/src/xdgiconloader/xdgiconloader.cpp b/src/xdgiconloader/xdgiconloader.cpp
+index c299cca..2353ba4 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 = std::make_unique<ScalableFollowsColorEntry>();
++                        else
++                            iconEntry = std::make_unique<ScalableEntry>();
+                         iconEntry->dir = dirInfo;
+                         iconEntry->filename = svgPath;
+                         info.entries.push_back(std::move(iconEntry));
+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