From 3ed058eb055fc6e8942315da993ab7e3e481c897 Mon Sep 17 00:00:00 2001
From: Alex Murray <murray.alex@gmail.com>
Date: Fri, 26 May 2023 14:49:04 +0930
Subject: [PATCH] Setup immodules cache and stage required packages to fix #57

Signed-off-by: Alex Murray <murray.alex@gmail.com>
---
 setup-env      | 9 +++++++++
 snapcraft.yaml | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/setup-env b/setup-env
index ac4e88c..2a519d3 100755
--- a/setup-env
+++ b/setup-env
@@ -39,6 +39,15 @@ cp "$SNAP/etc/fonts/fonts.conf" "$FONTCONFIG_FILE"
 # fontconfig - so replace *all* with ours
 sed -i "s|<cachedir.*/cachedir>|<cachedir>$FONTCONFIG_CACHE_DIR</cachedir>|" "$FONTCONFIG_FILE"
 
+# immodule cache
+GTK_IM_MODULE_DIR="$GDK_CACHE_DIR/immodules"
+[ ! -d "$GTK_IM_MODULE_DIR" ] && mkdir -p "$GTK_IM_MODULE_DIR"
+
+export GTK_IM_MODULE_FILE="$GTK_IM_MODULE_DIR/immodules.cache"
+if [ -f "$SNAP/usr/lib/$ARCH/libgtk-3-0/gtk-query-immodules-3.0" ]; then
+  "$SNAP/usr/lib/$ARCH/libgtk-3-0/gtk-query-immodules-3.0" "$SNAP/usr/lib/$ARCH/gtk-3.0/3.0.0/immodules/"im-*.so > "$GTK_IM_MODULE_FILE"
+fi
+
 # native comp needs to find as etc and this comes from within the snap
 # itself
 export PATH="$PATH:/snap/emacs/current/usr/bin"
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 572fa53..f0b9d9f 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -112,6 +112,7 @@ parts:
       - gcc-10 # for tree-sitter
       - g++-10 # for tree-sitter
       - gvfs
+      - ibus-gtk3
       - libasound2
       - libaspell15
       - libasyncns0
@@ -155,6 +156,7 @@ parts:
       - libharfbuzz-icu0
       - libharfbuzz0b
       - libhyphen0
+      - libibus-1.0-5
       - libice6
       - libicu66
       - libisl22