data: Enable to configure kasumi-unicode in gschema

fujiwarat · fujiwarat · commit 00bab0ac26df · 2021-02-10T20:52:30.000+09:00
kasumi-unicode can be generated from kasumi source codes
with anthy-unicode but not anthy.
kasumi-unicode can save the dicts in XDG config dir but not
$HOME/.anthy

% ./configure --with-kasumi-exec=/usr/bin/kasumi-unicode
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -2,7 +2,7 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2010-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>
+# Copyright (c) 2010-2021 Takao Fujiwara <takao.fujiwara1@gmail.com>
 # Copyright (c) 2010-2018 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -49,8 +49,10 @@ $(metainfo_DATA): $(metainfo_in_files) Makefile
 	$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 $(schemas_DATA): $(schemas_in_files)
+	KASUMI_EXEC_BASENAME=`basename $(KASUMI_EXEC_FILE)`; \
 	$(SED) -e "s|\@ANTHY_ZIPCODE_FILE\@|$(ANTHY_ZIPCODE_FILE)|g" \
 	       -e "s|\@KASUMI_EXEC_FILE\@|$(KASUMI_EXEC_FILE)|g" \
+	       -e "s|\@KASUMI_EXEC_BASENAME\@|$$KASUMI_EXEC_BASENAME|g" \
 	       -e "s|\@KASUMI_ICON_FILE\@|$(KASUMI_ICON_FILE)|g" \
 	       -e "s|\@ON_OFF_KEYS\@|$(ON_OFF_KEYS)|g" \
 	       -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" \
diff --git a/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in b/data/org.freedesktop.ibus.engine.anthy.gschema.xml.in
@@ -108,12 +108,12 @@
       <description></description>
     </key>
     <key name="dict-admin-command" type="as">
-      <default>['@KASUMI_EXEC_FILE@', 'kasumi']</default>
+      <default>['@KASUMI_EXEC_FILE@', '@KASUMI_EXEC_BASENAME@']</default>
       <summary>Dictionary Administration Command</summary>
       <description></description>
     </key>
     <key name="add-word-command" type="as">
-      <default>['@KASUMI_EXEC_FILE@', 'kasumi', '-a']</default>
+      <default>['@KASUMI_EXEC_FILE@', '@KASUMI_EXEC_BASENAME@', '-a']</default>
       <summary>Add Word Command</summary>
       <description></description>
     </key>

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# ibus-anthy - The Anthy engine for IBus`
`4`	`4`	`#`
`5`		`-# Copyright (c) 2010-2018 Takao Fujiwara <[email protected]>`
	`5`	`+# Copyright (c) 2010-2021 Takao Fujiwara <[email protected]>`
`6`	`6`	`# Copyright (c) 2010-2018 Red Hat, Inc.`
`7`	`7`	`#`
`8`	`8`	`# This program is free software; you can redistribute it and/or modify`
`@@ -49,8 +49,10 @@ $(metainfo_DATA): $(metainfo_in_files) Makefile`
`49`	`49`	`$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@`
`50`	`50`
`51`	`51`	`$(schemas_DATA): $(schemas_in_files)`
	`52`	+ KASUMI_EXEC_BASENAME=`basename $(KASUMI_EXEC_FILE)`; \
`52`	`53`	`$(SED) -e "s\|\@ANTHY_ZIPCODE_FILE\@\|$(ANTHY_ZIPCODE_FILE)\|g" \`
`53`	`54`	`-e "s\|\@KASUMI_EXEC_FILE\@\|$(KASUMI_EXEC_FILE)\|g" \`
	`55`	`+ -e "s\|\@KASUMI_EXEC_BASENAME\@\|$$KASUMI_EXEC_BASENAME\|g" \`
`54`	`56`	`-e "s\|\@KASUMI_ICON_FILE\@\|$(KASUMI_ICON_FILE)\|g" \`
`55`	`57`	`-e "s\|\@ON_OFF_KEYS\@\|$(ON_OFF_KEYS)\|g" \`
`56`	`58`	`-e "s\|\@pkgdatadir\@\|$(pkgdatadir)\|g" \`