From 9e7fec8aa012b6e8a2a723ceded2099af49fd9fd Mon Sep 17 00:00:00 2001
From: Weng Xuetian <wengxt@gmail.com>
Date: Sun, 17 Nov 2024 19:32:07 -0800
Subject: [PATCH] Apply upstream fix to libskk

---
 0001-Fix-invalid-escape-on-json-file.patch | 35 ++++++++++++++++++++++
 org.fcitx.Fcitx5.Addon.Skk.yaml            |  3 ++
 2 files changed, 38 insertions(+)
 create mode 100644 0001-Fix-invalid-escape-on-json-file.patch

diff --git a/0001-Fix-invalid-escape-on-json-file.patch b/0001-Fix-invalid-escape-on-json-file.patch
new file mode 100644
index 0000000..92ca461
--- /dev/null
+++ b/0001-Fix-invalid-escape-on-json-file.patch
@@ -0,0 +1,35 @@
+From a2936e865fcc00e6e0c0bfc6c1d62db19e49fe74 Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Thu, 22 Aug 2024 00:53:12 +0900
+Subject: [PATCH] Fix invalid escape on json file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fix the following invalid escape on
+rules/default/rom-kana/default.json:
+
+/usr/share/libskk/rules/default/rom-kana/default.json:121:47: 解析エラー: unexpected
+character `,', expected string constant
+
+Fixes: #89
+---
+ rules/default/rom-kana/default.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rules/default/rom-kana/default.json b/rules/default/rom-kana/default.json
+index 6ddfce6..68dcff9 100644
+--- a/rules/default/rom-kana/default.json
++++ b/rules/default/rom-kana/default.json
+@@ -108,7 +108,7 @@
+             "myi": ["", "みぃ" ],
+             "myo": ["", "みょ" ],
+             "myu": ["", "みゅ" ],
+-            "n\'": ["", "ん" ],
++            "n'": ["", "ん" ],
+             "na": ["", "な" ],
+             "ne": ["", "ね" ],
+             "ni": ["", "に" ],
+-- 
+2.47.0
+
diff --git a/org.fcitx.Fcitx5.Addon.Skk.yaml b/org.fcitx.Fcitx5.Addon.Skk.yaml
index b85a112..d3e4b54 100644
--- a/org.fcitx.Fcitx5.Addon.Skk.yaml
+++ b/org.fcitx.Fcitx5.Addon.Skk.yaml
@@ -41,6 +41,9 @@ modules:
           project-id: 228903
           stable-only: true
           url-template: https://github.com/ueno/libskk/archive/${version}.tar.gz
+      - type: patch
+        path: 0001-Fix-invalid-escape-on-json-file.patch
+        use-git: true
     build-options:
       cflags: -Wno-int-conversion
       env: