[neon/backports-noble/fcitx5-qt-noble/Neon/release] debian/patches: patch in qt6.10 support - stolen from NixOS

[Carlos De Maine]

Git commit adb1479da4499b8372f07123487a3d17f63b23a9 by Carlos De Maine.
Committed on 03/12/2025 at 01:47.
Pushed by carlosdem into branch 'Neon/release'.

patch in qt6.10 support - stolen from NixOS

A  +22   -0    debian/patches/1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4.patch
A  +28   -0    debian/patches/46a07a85d191fd77a1efc39c8ed43d0cd87788d2.patch
A  +38   -0    debian/patches/6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71.patch
A  +3    -0    debian/patches/series

https://invent.kde.org/neon/backports-noble/fcitx5-qt-noble/-/commit/adb1479da4499b8372f07123487a3d17f63b23a9

diff --git a/debian/patches/1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4.patch b/debian/patches/1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4.patch
new file mode 100644
index 0000000..888f8c2
--- /dev/null
+++ b/debian/patches/1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4.patch
@@ -0,0 +1,22 @@
+From 1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4 Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt at gmail.com>
+Date: Wed, 1 Oct 2025 23:37:51 -0700
+Subject: [PATCH] Migrate immodule probing also to GuiPrivate target
+
+---
+ qt6/immodule-probing/CMakeLists.txt | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/qt6/immodule-probing/CMakeLists.txt b/qt6/immodule-probing/CMakeLists.txt
+index efa5e4bcb243b502ee11af0a133ecc9f9fa2dd99..a586140e50dbd1301f8758e737d56aa0fd1e701a 100644
+--- a/qt6/immodule-probing/CMakeLists.txt
++++ b/qt6/immodule-probing/CMakeLists.txt
+@@ -1,5 +1,4 @@
+ add_executable(fcitx5-qt6-immodule-probing main.cpp)
+-target_include_directories(fcitx5-qt6-immodule-probing PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
+-target_link_libraries(fcitx5-qt6-immodule-probing Qt6::Gui)
++target_link_libraries(fcitx5-qt6-immodule-probing Qt6::Gui Qt6::GuiPrivate)
+ 
+-install(TARGETS fcitx5-qt6-immodule-probing DESTINATION "${CMAKE_INSTALL_BINDIR}")
+\ No newline at end of file
++install(TARGETS fcitx5-qt6-immodule-probing DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/debian/patches/46a07a85d191fd77a1efc39c8ed43d0cd87788d2.patch b/debian/patches/46a07a85d191fd77a1efc39c8ed43d0cd87788d2.patch
new file mode 100644
index 0000000..ee08836
--- /dev/null
+++ b/debian/patches/46a07a85d191fd77a1efc39c8ed43d0cd87788d2.patch
@@ -0,0 +1,28 @@
+From 46a07a85d191fd77a1efc39c8ed43d0cd87788d2 Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt at gmail.com>
+Date: Wed, 1 Oct 2025 18:53:23 -0700
+Subject: [PATCH] Try new cmake style for Qt6 (#76)
+
+---
+ qt6/CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/qt6/CMakeLists.txt b/qt6/CMakeLists.txt
+index bff3a03ed3caebdff2a0fdd5cbaf06eb6bce737f..c24f3d7f5521fba6333f9cf093077d58a6ef12d9 100644
+--- a/qt6/CMakeLists.txt
++++ b/qt6/CMakeLists.txt
+@@ -1,10 +1,10 @@
+ 
+-find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core DBus Widgets)
+-find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private)
++set(QT6_REQUIRED_COMPONENTS Core Gui GuiPrivate DBus Widgets)
++
+ if (ENABLE_QT6_WAYLAND_WORKAROUND)
+-  find_package(Qt6WaylandClient ${REQUIRED_QT6_VERSION} REQUIRED Private)
+-  find_package(Qt6WaylandGlobalPrivate ${REQUIRED_QT6_VERSION} REQUIRED)
++  list(APPEND QT6_REQUIRED_COMPONENTS WaylandClient WaylandClientPrivate WaylandGlobalPrivate)
+ endif()
++find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED COMPONENTS ${QT6_REQUIRED_COMPONENTS})
+ 
+ add_subdirectory(dbusaddons)
+ add_subdirectory(platforminputcontext)
diff --git a/debian/patches/6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71.patch b/debian/patches/6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71.patch
new file mode 100644
index 0000000..d27796d
--- /dev/null
+++ b/debian/patches/6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71.patch
@@ -0,0 +1,38 @@
+From 6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71 Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt at gmail.com>
+Date: Wed, 1 Oct 2025 21:05:48 -0700
+Subject: [PATCH] Fix cmake for qt6
+
+For Qt6, prior Qt 6.10 the private is implicity, 6.10 seems to be
+explicit and has split cmake target.
+---
+ qt6/CMakeLists.txt | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/qt6/CMakeLists.txt b/qt6/CMakeLists.txt
+index c24f3d7f5521fba6333f9cf093077d58a6ef12d9..79e68ad95650ce8df235f134c1f9eb6767bf2410 100644
+--- a/qt6/CMakeLists.txt
++++ b/qt6/CMakeLists.txt
+@@ -1,11 +1,20 @@
+ 
+-set(QT6_REQUIRED_COMPONENTS Core Gui GuiPrivate DBus Widgets)
++set(QT6_REQUIRED_COMPONENTS Core Gui DBus Widgets)
+ 
+ if (ENABLE_QT6_WAYLAND_WORKAROUND)
+-  list(APPEND QT6_REQUIRED_COMPONENTS WaylandClient WaylandClientPrivate WaylandGlobalPrivate)
++  list(APPEND QT6_REQUIRED_COMPONENTS WaylandClient WaylandGlobalPrivate)
+ endif()
+ find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED COMPONENTS ${QT6_REQUIRED_COMPONENTS})
+ 
++if (NOT TARGET Qt6::GuiPrivate)
++    find_package(Qt6GuiPrivate CONFIG REQUIRED)
++endif()
++
++if (ENABLE_QT6_WAYLAND_WORKAROUND AND NOT TARGET Qt6::WaylandClientPrivate)
++    find_package(Qt6WaylandClientPrivate CONFIG REQUIRED)
++endif()
++
++
+ add_subdirectory(dbusaddons)
+ add_subdirectory(platforminputcontext)
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..64d554c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+46a07a85d191fd77a1efc39c8ed43d0cd87788d2.patch
+6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71.patch
+1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4.patch