Rename master_dic_file to main_dic_file

anthy-unicode-HEAD.patch

@@ -91,3 +91,57 @@ index 20dde71..d84858c 100644
 -- 
 2.35.1
 
+From 754f1c8b18ce0bf9c5e25541f4f4707d8a982811 Mon Sep 17 00:00:00 2001
+From: Jens Petersen <juhpetersen@gmail.com>
+Date: Thu, 9 Jun 2022 11:47:18 +0800
+Subject: [PATCH] word_dic.c: rename master_dic_file to main_dic_file
+
+---
+ src-worddic/word_dic.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src-worddic/word_dic.c b/src-worddic/word_dic.c
+index cc2cf89..0138d17 100644
+--- a/src-worddic/word_dic.c
++++ b/src-worddic/word_dic.c
+@@ -46,7 +46,7 @@ static int dic_init_count;
+ 
+ /* 辞書 */
+ /* 全personalityで共有されるファイル辞書 */
+-static struct word_dic *master_dic_file;
++static struct word_dic *main_dic_file;
+ 
+ /* 各パーソナリティごとの辞書 */
+ struct mem_dic *anthy_current_personal_dic_cache;/* キャッシュ */
+@@ -89,7 +89,7 @@ anthy_cache_get_seq_ent(xstr *xs, int is_reverse)
+ int
+ anthy_dic_check_word_relation(int from, int to)
+ {
+-  return anthy_word_dic_check_word_relation(master_dic_file, from, to);
++  return anthy_word_dic_check_word_relation(main_dic_file, from, to);
+ }
+ 
+ static seq_ent_t
+@@ -349,7 +349,7 @@ do_gang_load_dic(xstr *sentence, int is_reverse)
+   }
+   qsort(array, nr, sizeof(struct gang_elm *), gang_elm_compare_func);
+   /**/
+-  anthy_gang_fill_seq_ent(master_dic_file, array, nr, is_reverse);
++  anthy_gang_fill_seq_ent(main_dic_file, array, nr, is_reverse);
+   /**/
+   scan_misc_dic(array, nr, is_reverse);
+   /* 個人辞書から読む */
+@@ -769,8 +769,8 @@ anthy_init_dic(void)
+   anthy_init_features();
+ 
+   anthy_init_word_dic();
+-  master_dic_file = anthy_create_word_dic();
+-  if (!master_dic_file) {
++  main_dic_file = anthy_create_word_dic();
++  if (!main_dic_file) {
+     anthy_log(0, "Failed to create file dic.\n");
+     return -1;
+   }
+-- 
+2.35.3
+

anthy-unicode.spec

@@ -10,7 +10,7 @@
 
 Name:  anthy-unicode
 Version: 1.0.0.20211224
-Release: 5%{?dist}
+Release: 6%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  https://github.com/fujiwarat/anthy-unicode/wiki
@@ -168,6 +168,9 @@ cd ..
 
 
 %changelog
+* Tue Jul 19 2022 Takao Fujiwara <fujiwara@redhat.com> 1.0.0.20211224-6
+- Rename master_dic_file to main_dic_file
+
 * Fri May 06 2022 Takao Fujiwara <fujiwara@redhat.com> 1.0.0.20211224-5
 - Fix GCC_ANALYZER_WARNING with -Wanalyzer-null-dereference