Compare commits

..

18 Commits

Author SHA1 Message Date
Aaron Rainbolt
1f11eaeddc
Symbols update 2026-01-14 12:25:08 -06:00
Aaron Rainbolt
f915ebc39b
Set distribution codename 2026-01-14 12:14:44 -06:00
Aaron Rainbolt
f2336d9d05
Remove Rules-Requires-Root 2026-01-14 12:14:07 -06:00
Aaron Rainbolt
edafee2911
Build dep update 2026-01-14 12:12:31 -06:00
Aaron Rainbolt
d49ea48050
Bump standards-version 2026-01-14 12:10:48 -06:00
Aaron Rainbolt
cb267c64b6
Update copyright file 2026-01-14 12:09:56 -06:00
Aaron Rainbolt
5efbfcddf8
Bump version for new upstream release 2026-01-14 12:06:31 -06:00
Aaron Rainbolt
d083b7face
Use debian/watch version 5 (taken from Debian's packages) 2025-11-18 13:16:55 -06:00
Aaron Rainbolt
bed7c0f72b
Update copyright file 2025-06-07 23:51:30 -05:00
00e3b1203c Upload to Questing 2025-04-19 17:18:16 -05:00
d1c346c66a Update build dependencies. 2025-04-19 16:38:47 -05:00
cc4e123edd Update Standards-Version to 4.7.2, no changes needed. 2025-04-19 16:37:18 -05:00
175b50eb73 New upstream release. 2025-04-19 16:36:57 -05:00
d9584f14fb Update Standards-Version to 4.7.1, no changes needed. 2025-02-21 16:06:21 -06:00
e0f0975264 No-change rebuild for Qt 6.8.2. 2025-02-21 16:01:48 -06:00
3f77f7857e No-change rebuild for lxqt-build-tools C++17 -> C++20. 2025-02-21 16:01:17 -06:00
8200daf4d1 No-change rebuild for Qt 6.8.1. 2025-02-21 16:00:29 -06:00
8dc65ce4d5 No-change rebuild for Qt 6.8.0. 2025-02-21 15:59:45 -06:00
7 changed files with 61 additions and 53 deletions

49
debian/changelog vendored
View File

@ -1,3 +1,52 @@
libqtxdg (4.3.0-0ubuntu1) resolute; urgency=medium
* New upstream release.
- Update build dependencies.
- Update symbols file.
* Update copyright file.
* Update Standards-Version to 4.7.3, no changes needed.
* Remove redundant 'Rules-Requires-Root: no' control line.
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Wed, 14 Jan 2026 12:14:26 -0600
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 libqtxdg (4.1.0-0ubuntu1) plucky; urgency=medium
* New upstream release. * New upstream release.

5
debian/control vendored
View File

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

8
debian/copyright vendored
View File

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

View File

@ -143,7 +143,6 @@ libQt6Xdg.so.4 libqt6xdg4 #MINVER#
_ZNK14XdgDesktopFile13startDetachedERK5QListI7QStringE@Base 4.0.0 _ZNK14XdgDesktopFile13startDetachedERK5QListI7QStringE@Base 4.0.0
_ZNK14XdgDesktopFile14actionActivateERK7QStringRK5QListIS0_E@Base 4.0.0 _ZNK14XdgDesktopFile14actionActivateERK7QStringRK5QListIS0_E@Base 4.0.0
_ZNK14XdgDesktopFile16expandExecStringERK5QListI7QStringE@Base 4.0.0 _ZNK14XdgDesktopFile16expandExecStringERK5QListI7QStringE@Base 4.0.0
_ZSt19piecewise_construct@Base 4.0.0
(c++)"non-virtual thunk to XdgMenuWidget::~XdgMenuWidget()@Base" 1.0.0 (c++)"non-virtual thunk to XdgMenuWidget::~XdgMenuWidget()@Base" 1.0.0
(c++)"typeinfo for XdgAction@Base" 1.0.0 (c++)"typeinfo for XdgAction@Base" 1.0.0
(c++)"typeinfo for XdgDesktopFile@Base" 1.0.0 (c++)"typeinfo for XdgDesktopFile@Base" 1.0.0

View File

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

View File

@ -1,39 +0,0 @@
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

11
debian/watch vendored
View File

@ -1,5 +1,6 @@
version=4 Version: 5
opts="searchmode=plain, \ Template: GitHub
pgpsigurlmangle=s/$/.asc/, \ Owner: lxqt
uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \ Project: @PACKAGE@
https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz Download-Url-Mangle: s%https://api.github.com/repos/([^/]+)/@PACKAGE@/git/refs/tags/@ANY_VERSION@%https://github.com/$1/@PACKAGE@/releases/download/$2/@PACKAGE@-$2.tar.xz%g
Pgp-Mode: auto