Upload to archive, fixup patches
This commit is contained in:
parent
1f11eaeddc
commit
743cfe11d7
5
debian/changelog
vendored
5
debian/changelog
vendored
@ -3,11 +3,14 @@ libqtxdg (4.3.0-0ubuntu1) resolute; urgency=medium
|
|||||||
* New upstream release.
|
* New upstream release.
|
||||||
- Update build dependencies.
|
- Update build dependencies.
|
||||||
- Update symbols file.
|
- 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 copyright file.
|
||||||
* Update Standards-Version to 4.7.3, no changes needed.
|
* Update Standards-Version to 4.7.3, no changes needed.
|
||||||
* Remove redundant 'Rules-Requires-Root: no' control line.
|
* Remove redundant 'Rules-Requires-Root: no' control line.
|
||||||
|
|
||||||
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Wed, 14 Jan 2026 12:14:26 -0600
|
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 19 Feb 2026 13:19:33 -0500
|
||||||
|
|
||||||
libqtxdg (4.2.0-0ubuntu1) questing; urgency=medium
|
libqtxdg (4.2.0-0ubuntu1) questing; urgency=medium
|
||||||
|
|
||||||
|
|||||||
30
debian/patches/qt-6.10-compat.patch
vendored
Normal file
30
debian/patches/qt-6.10-compat.patch
vendored
Normal file
@ -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
|
||||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1 +1,2 @@
|
|||||||
ubuntu-gettext-translations.patch
|
ubuntu-gettext-translations.patch
|
||||||
|
qt-6.10-compat.patch
|
||||||
|
|||||||
@ -7,7 +7,7 @@ Last-Update: 2023-03-06
|
|||||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||||
--- a/src/qtxdg/xdgdesktopfile.cpp
|
--- a/src/qtxdg/xdgdesktopfile.cpp
|
||||||
+++ b/src/qtxdg/xdgdesktopfile.cpp
|
+++ b/src/qtxdg/xdgdesktopfile.cpp
|
||||||
@@ -38,6 +38,7 @@
|
@@ -37,6 +37,7 @@
|
||||||
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
|||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QDBusInterface>
|
#include <QDBusInterface>
|
||||||
@@ -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
|
QVariant XdgDesktopFile::localizedValue(const QString& key, const QVariant& defaultValue) const
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user