[gnome-build-meta/mcatanzaro/fcitx5-gtk: 1/4] Rename fcitx.bst -> fcitx5-gtk and update

[Marge Bot <marge-bot src gnome org>]

commit 85004d31c6aa911da50663ff10c30546fd7da5be
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Fri May 27 09:32:33 2022 -0500

    Rename fcitx.bst -> fcitx5-gtk and update
    
    Fix the name of this module to match the actual upstream project, since
    "fcitx" a is a completely different repo, and this is confusing. Update
    to latest upstream version. Add patch to fix build.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1611>

 elements/sdk-platform.bst                  |  2 +-
 elements/sdk/{fcitx.bst => fcitx5-gtk.bst} |  4 +++-
 files/fcitx5-gtk/gio-unix.patch            | 29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/elements/sdk-platform.bst b/elements/sdk-platform.bst
index 87302793a..c143bfb48 100644
--- a/elements/sdk-platform.bst
+++ b/elements/sdk-platform.bst
@@ -13,7 +13,7 @@ depends:
 - sdk/atk.bst
 - sdk/cantarell-fonts.bst
 - sdk/enchant-2.bst
-- sdk/fcitx.bst
+- sdk/fcitx5-gtk.bst
 - sdk/gcab.bst
 - sdk/gcr.bst
 - sdk/gdk-pixbuf.bst
diff --git a/elements/sdk/fcitx.bst b/elements/sdk/fcitx5-gtk.bst
similarity index 81%
rename from elements/sdk/fcitx.bst
rename to elements/sdk/fcitx5-gtk.bst
index 55c783a7e..4bdb3deb1 100644
--- a/elements/sdk/fcitx.bst
+++ b/elements/sdk/fcitx5-gtk.bst
@@ -2,7 +2,9 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: github_files:fcitx/fcitx5-gtk/archive/5.0.10.tar.gz
+  url: github_files:fcitx/fcitx5-gtk/archive/5.0.14.tar.gz
+- kind: patch
+  path: files/fcitx5-gtk/gio-unix.patch
 
 build-depends:
 - freedesktop-sdk.bst:components/extra-cmake-modules.bst
diff --git a/files/fcitx5-gtk/gio-unix.patch b/files/fcitx5-gtk/gio-unix.patch
new file mode 100644
index 000000000..181ad11df
--- /dev/null
+++ b/files/fcitx5-gtk/gio-unix.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 45a2218..7622fcd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,7 @@ find_package(PkgConfig)
+ find_package(XKBCommon)
+ pkg_check_modules(GLib2 REQUIRED IMPORTED_TARGET "glib-2.0>=2.56")
+ pkg_check_modules(Gio2 REQUIRED IMPORTED_TARGET "gio-2.0")
++pkg_check_modules(GioUnix2 REQUIRED IMPORTED_TARGET "gio-unix-2.0")
+ pkg_check_modules(GObject2 REQUIRED IMPORTED_TARGET "gobject-2.0")
+ add_subdirectory(fcitx-gclient)
+ 
+diff --git a/fcitx-gclient/CMakeLists.txt b/fcitx-gclient/CMakeLists.txt
+index 24085d4..3bad7ed 100644
+--- a/fcitx-gclient/CMakeLists.txt
++++ b/fcitx-gclient/CMakeLists.txt
+@@ -47,9 +47,10 @@ target_include_directories(Fcitx5GClient
+         "$<INSTALL_INTERFACE:${CMAKE_INSTALL_FULL_INCLUDEDIR}>/Fcitx5/GClient"
+     INTERFACE
+         "${Gio2_INCLUDE_DIRS}"
++        "${GioUnix2_INCLUDE_DIRS}"
+         "${GObject2_INCLUDE_DIRS}"
+ )
+-target_link_libraries(Fcitx5GClient LINK_PRIVATE PkgConfig::Gio2 PkgConfig::GLib2 PkgConfig::GObject2)
++target_link_libraries(Fcitx5GClient LINK_PRIVATE PkgConfig::Gio2 PkgConfig::GioUnix2 PkgConfig::GLib2 
PkgConfig::GObject2)
+ 
+ configure_file(Fcitx5GClient.pc.in ${CMAKE_CURRENT_BINARY_DIR}/Fcitx5GClient.pc @ONLY)
+ 
+