From 743cfe11d7d28f5f015ca8d5c882490c0db408cd Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Thu, 19 Feb 2026 13:54:35 -0500 Subject: [PATCH] Upload to archive, fixup patches --- debian/changelog | 5 +++- debian/patches/qt-6.10-compat.patch | 30 +++++++++++++++++++ debian/patches/series | 1 + .../patches/ubuntu-gettext-translations.patch | 4 +-- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 debian/patches/qt-6.10-compat.patch diff --git a/debian/changelog b/debian/changelog index 020cbed..e226e4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,11 +3,14 @@ libqtxdg (4.3.0-0ubuntu1) resolute; urgency=medium * New upstream release. - Update build dependencies. - Update symbols file. + - Refresh ubuntu-gettext-translations.patch. + - Backport Qt 6.10 compatibility fix from upstream as + qt-6.10-compat.patch. * Update copyright file. * Update Standards-Version to 4.7.3, no changes needed. * Remove redundant 'Rules-Requires-Root: no' control line. - -- Aaron Rainbolt Wed, 14 Jan 2026 12:14:26 -0600 + -- Aaron Rainbolt Thu, 19 Feb 2026 13:19:33 -0500 libqtxdg (4.2.0-0ubuntu1) questing; urgency=medium diff --git a/debian/patches/qt-6.10-compat.patch b/debian/patches/qt-6.10-compat.patch new file mode 100644 index 0000000..cc8b412 --- /dev/null +++ b/debian/patches/qt-6.10-compat.patch @@ -0,0 +1,30 @@ +Description: Fix Qt 6.10 compatibility +Origin: https://github.com/lxqt/libqtxdg/commit/49e563dff04d1cb55124e566ebeeb8bb121ad15a +Last-Update: 2026-02-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/util/CMakeLists.txt ++++ b/util/CMakeLists.txt +@@ -20,10 +20,6 @@ target_include_directories(qtxdg-desktop + PRIVATE "${PROJECT_SOURCE_DIR}/qtxdg" + ) + +-target_include_directories(qtxdg-iconfinder +- PRIVATE "${Qt6Gui_PRIVATE_INCLUDE_DIRS}" +-) +- + target_compile_definitions(qtxdg-desktop-file-start + PRIVATE + "-DQTXDG_VERSION=\"${QTXDG_VERSION_STRING}\"" +@@ -41,7 +37,10 @@ target_link_libraries(qtxdg-desktop-file + ) + + target_link_libraries(qtxdg-iconfinder +- ${QTXDGX_ICONLOADER_LIBRARY_NAME} ++ PRIVATE ++ Qt6::GuiPrivate ++ PUBLIC ++ ${QTXDGX_ICONLOADER_LIBRARY_NAME} + ) + + install(TARGETS diff --git a/debian/patches/series b/debian/patches/series index bfdb363..1d130d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ ubuntu-gettext-translations.patch +qt-6.10-compat.patch diff --git a/debian/patches/ubuntu-gettext-translations.patch b/debian/patches/ubuntu-gettext-translations.patch index 3ab6f78..f1966d0 100644 --- a/debian/patches/ubuntu-gettext-translations.patch +++ b/debian/patches/ubuntu-gettext-translations.patch @@ -7,7 +7,7 @@ Last-Update: 2023-03-06 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/src/qtxdg/xdgdesktopfile.cpp +++ b/src/qtxdg/xdgdesktopfile.cpp -@@ -38,6 +38,7 @@ +@@ -37,6 +37,7 @@ #include #include @@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #include #include -@@ -920,7 +921,22 @@ QString XdgDesktopFile::localizedKey(con +@@ -919,7 +920,22 @@ QString XdgDesktopFile::localizedKey(con QVariant XdgDesktopFile::localizedValue(const QString& key, const QVariant& defaultValue) const {