Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
fcitx5-qt
Commits:
c60adb6d by Antonio Rojas at 2025-10-05T10:15:36+02:00
Fix build with Qt 6.10
- - - - -
2 changed files:
- PKGBUILD
- + qt-6.10.patch
Changes:
=====================================
PKGBUILD
=====================================
@@ -11,10 +11,17 @@ license=('GPL')
groups=('fcitx5-im')
depends=('glibc' 'gcc-libs' 'libxcb' 'libxkbcommon' 'fcitx5' 'qt6-base'
'qt6-wayland' 'wayland')
makedepends=('git' 'extra-cmake-modules' 'qt5-base' 'ninja')
-source=("git+https://github.com/fcitx/fcitx5-qt.git#tag=$pkgver?signed";)
-sha512sums=('2e4e50f4820e33d2c9849b498991ec492cb571a673a1c276634d86b9145ee0e3058c5d2849615c6ace0a0b68fc25c242eed7e57a27a9d36b1ee0f83263c04bf3')
+source=("git+https://github.com/fcitx/fcitx5-qt.git#tag=$pkgver?signed";
+ qt-6.10.patch)
+sha512sums=('2e4e50f4820e33d2c9849b498991ec492cb571a673a1c276634d86b9145ee0e3058c5d2849615c6ace0a0b68fc25c242eed7e57a27a9d36b1ee0f83263c04bf3'
+
'4793626852e53c599eab694f7e859b54eb7804f2f8515505b5ef7c543510eeb80f14baf256ef66a27898568303218503de583f734d9a8408d67df3d7235e6999')
validpgpkeys=('2CC8A0609AD2A479C65B6D5C8E8B898CBF2412F9') # Weng Xuetian
<[email protected]>
+prepare() {
+ cd $pkgname
+ patch -p1 -i ../qt-6.10.patch
+}
+
build() {
cd $pkgname
cmake . -GNinja \
=====================================
qt-6.10.patch
=====================================
@@ -0,0 +1,36 @@
+diff --git a/qt6/CMakeLists.txt b/qt6/CMakeLists.txt
+index bff3a03..28ee62e 100644
+--- a/qt6/CMakeLists.txt
++++ b/qt6/CMakeLists.txt
+@@ -2,9 +2,18 @@
+ find_package(Qt6 ${REQUIRED_QT6_VERSION} CONFIG REQUIRED Core DBus Widgets)
+ find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private)
+ if (ENABLE_QT6_WAYLAND_WORKAROUND)
++if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
++ find_package(Qt6 COMPONENTS WaylandClientPrivate REQUIRED)
++else()
+ find_package(Qt6WaylandClient ${REQUIRED_QT6_VERSION} REQUIRED Private)
+ find_package(Qt6WaylandGlobalPrivate ${REQUIRED_QT6_VERSION} REQUIRED)
+ endif()
++endif()
++if(Qt6_VERSION VERSION_GREATER_EQUAL 6.10)
++ find_package(Qt6 COMPONENTS GuiPrivate REQUIRED)
++else()
++ find_package(Qt6Gui ${REQUIRED_QT6_VERSION} REQUIRED Private)
++endif()
+
+ add_subdirectory(dbusaddons)
+ add_subdirectory(platforminputcontext)
+diff --git a/qt6/immodule-probing/CMakeLists.txt
b/qt6/immodule-probing/CMakeLists.txt
+index efa5e4b..a1bfce4 100644
+--- a/qt6/immodule-probing/CMakeLists.txt
++++ b/qt6/immodule-probing/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ 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}")
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/fcitx5-qt/-/commit/c60adb6d8e71d6aeb6e1bee3cfa8398cfe482946
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/fcitx5-qt/-/commit/c60adb6d8e71d6aeb6e1bee3cfa8398cfe482946
You're receiving this email because of your account on gitlab.archlinux.org.
