- From 026b19ef169dd9612d8a4a1ee34f7c42e7215c9a Mon Sep 17 00:00:00 2001

- From: fujiwarat <takao.fujiwara1@gmail.com>

- Date: Wed, 13 Mar 2019 19:16:17 +0900

- Subject: [PATCH 01/27] setup: Enable to run ibus-setup with a different python

- 

- BUG=https://github.com/ibus/ibus/issues/2086

- ---

-  setup/ibus-setup.in | 4 ++--

-  1 file changed, 2 insertions(+), 2 deletions(-)

- 

- diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in

- index bb5c85cf..4a6830af 100644

- --- a/setup/ibus-setup.in

- +++ b/setup/ibus-setup.in

- @@ -3,7 +3,7 @@

-  # ibus - The Input Bus

-  #

-  # Copyright (c) 2007-2010 Peng Huang <shawn.p.huang@gmail.com>

- -# Copyright (c) 2018 Takao Fujiwara <takao.fujiwara1@gmail.com>

- +# Copyright (c) 2018-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>

-  # Copyright (c) 2007-2018 Red Hat, Inc.

-  #

-  # This library is free software; you can redistribute it and/or

- @@ -27,5 +27,5 @@ export IBUS_PREFIX=@prefix@

-  export IBUS_DATAROOTDIR=@datarootdir@

-  export IBUS_LOCALEDIR=@localedir@

-  export IBUS_LIBEXECDIR=${libexecdir}

- -exec @PYTHON@ @prefix@/share/ibus/setup/main.py $@

- +exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py $@

-  

- -- 

- 2.21.0

- 

- From 2825bfc13618d382444aa1f87be22cd86e9bba29 Mon Sep 17 00:00:00 2001

- From: fujiwarat <takao.fujiwara1@gmail.com>

- Date: Wed, 13 Mar 2019 19:35:19 +0900

- Subject: [PATCH 02/27] src: Update ibusunicodegen.h for Unicode UCD 12.0

- 

- ---

-  src/ibusunicodegen.h | 36 ++++++++++++++++++++++++++++++++++++

-  1 file changed, 36 insertions(+)

- 

- diff --git a/src/ibusunicodegen.h b/src/ibusunicodegen.h

- index 9952fe0a..6a60a5a9 100644

- --- a/src/ibusunicodegen.h

- +++ b/src/ibusunicodegen.h

- @@ -855,6 +855,10 @@ const static char *unicode_blocks[] = {

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

-      N_("Sogdian"),

- +    /* TRANSLATORS: You might refer the translations from gucharmap with

- +                    the following command:

- +       msgmerge -C gucharmap.po ibus.po ibus.pot */

- +    N_("Elymaic"),

-      /* TRANSLATORS: You might refer the translations from gucharmap with

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

- @@ -935,6 +939,10 @@ const static char *unicode_blocks[] = {

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

-      N_("Warang Citi"),

- +    /* TRANSLATORS: You might refer the translations from gucharmap with

- +                    the following command:

- +       msgmerge -C gucharmap.po ibus.po ibus.pot */

- +    N_("Nandinagari"),

-      /* TRANSLATORS: You might refer the translations from gucharmap with

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

- @@ -967,6 +975,10 @@ const static char *unicode_blocks[] = {

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

-      N_("Makasar"),

- +    /* TRANSLATORS: You might refer the translations from gucharmap with

- +                    the following command:

- +       msgmerge -C gucharmap.po ibus.po ibus.pot */

- +    N_("Tamil Supplement"),

-      /* TRANSLATORS: You might refer the translations from gucharmap with

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

- @@ -983,6 +995,10 @@ const static char *unicode_blocks[] = {

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

-      N_("Egyptian Hieroglyphs"),

- +    /* TRANSLATORS: You might refer the translations from gucharmap with

- +                    the following command:

- +       msgmerge -C gucharmap.po ibus.po ibus.pot */

- +    N_("Egyptian Hieroglyph Format Controls"),

-      /* TRANSLATORS: You might refer the translations from gucharmap with

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

- @@ -1031,6 +1047,10 @@ const static char *unicode_blocks[] = {

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

-      N_("Kana Extended-A"),

- +    /* TRANSLATORS: You might refer the translations from gucharmap with

- +                    the following command:

- +       msgmerge -C gucharmap.po ibus.po ibus.pot */

- +    N_("Small Kana Extension"),

-      /* TRANSLATORS: You might refer the translations from gucharmap with

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

- @@ -1079,6 +1099,14 @@ const static char *unicode_blocks[] = {

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

-      N_("Glagolitic Supplement"),

- +    /* TRANSLATORS: You might refer the translations from gucharmap with

- +                    the following command:

- +       msgmerge -C gucharmap.po ibus.po ibus.pot */

- +    N_("Nyiakeng Puachue Hmong"),

- +    /* TRANSLATORS: You might refer the translations from gucharmap with

- +                    the following command:

- +       msgmerge -C gucharmap.po ibus.po ibus.pot */

- +    N_("Wancho"),

-      /* TRANSLATORS: You might refer the translations from gucharmap with

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

- @@ -1091,6 +1119,10 @@ const static char *unicode_blocks[] = {

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

-      N_("Indic Siyaq Numbers"),

- +    /* TRANSLATORS: You might refer the translations from gucharmap with

- +                    the following command:

- +       msgmerge -C gucharmap.po ibus.po ibus.pot */

- +    N_("Ottoman Siyaq Numbers"),

-      /* TRANSLATORS: You might refer the translations from gucharmap with

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

- @@ -1151,6 +1183,10 @@ const static char *unicode_blocks[] = {

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

-      N_("Chess Symbols"),

- +    /* TRANSLATORS: You might refer the translations from gucharmap with

- +                    the following command:

- +       msgmerge -C gucharmap.po ibus.po ibus.pot */

- +    N_("Symbols and Pictographs Extended-A"),

-      /* TRANSLATORS: You might refer the translations from gucharmap with

-                      the following command:

-         msgmerge -C gucharmap.po ibus.po ibus.pot */

- -- 

- 2.21.0

- 

- From 6099a45f2e734458202383fdf157aea95b1f35a5 Mon Sep 17 00:00:00 2001

- From: fujiwarat <takao.fujiwara1@gmail.com>

- Date: Wed, 13 Mar 2019 19:36:05 +0900

- Subject: [PATCH 03/27] build: Delete built sources with MAINTAINERCLEANFILES

- 

- BUG=https://github.com/ibus/ibus/issues/2082

- ---

-  src/Makefile.am     | 9 ++++++++-

-  ui/gtk3/Makefile.am | 6 ++++++

-  2 files changed, 14 insertions(+), 1 deletion(-)

- 

- diff --git a/src/Makefile.am b/src/Makefile.am

- index 6a62e0f0..a8e3d07d 100644

- --- a/src/Makefile.am

- +++ b/src/Makefile.am

- @@ -3,7 +3,7 @@

-  # ibus - The Input Bus

-  #

-  # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>

- -# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>

- +# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>

-  # Copyright (c) 2007-2017 Red Hat, Inc.

-  #

-  # This library is free software; you can redistribute it and/or

- @@ -256,6 +256,10 @@ dicts/emoji-en.dict: emoji-parser

-  	    echo "WARNING: Not found $(EMOJI_ANNOTATION_DIR)/en.xml" 1>&2; \

-  	fi; \

-  	for f in $(LANG_FILES) ; do \

- +	    if test -f dicts/emoji-$$f.dict; then \

- +	        echo "Already exists dicts/emoji-$$f.dict"; \

- +	        continue; \

- +	    fi; \

-  	    if test -f \

-  	    "$(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$$f.xml" ; then \

-  	        xml_derived_option="--xml-derived $(EMOJI_ANNOTATION_DIR)/../annotationsDerived/$$f.xml"; \

- @@ -279,6 +283,9 @@ dicts/emoji-en.dict: emoji-parser

-  	    echo "Generated $$plus_comment dicts/emoji-$$f.dict"; \

-  	done

-  

- +ibusemojigen.h: dicts/emoji-en.dict

- +	$(NULL)

- +

-  install-data-hook: $(dict_DATA)

-  	@$(NORMAL_INSTALL)

-  	$(AM_V_at)list='$(wildcard dicts/*.dict)'; \

- diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am

- index 60205aa5..667d51c6 100644

- --- a/ui/gtk3/Makefile.am

- +++ b/ui/gtk3/Makefile.am

- @@ -130,6 +130,8 @@ CLEANFILES =            \

-      gtkpanel.xml        \

-      $(NULL)

-  

- +MAINTAINERCLEANFILES =

- +

-  emoji_headers =         \

-      ibusemojidialog.h   \

-      $(NULL)

- @@ -192,6 +194,8 @@ emojierapp.o: $(srcdir)/emojierapp.c

-  	$(AM_V_CC_no)$(COMPILE) -c -o $@ $<

-  	$(NULL)

-  

- +MAINTAINERCLEANFILES += emojierapp.c

- +

-  component_DATA += gtkextension.xml

-  CLEANFILES += gtkextension.xml

-  libexec_PROGRAMS += ibus-extension-gtk3

- @@ -240,6 +244,8 @@ panelbinding.o: $(srcdir)/panelbinding.c

-  	$(AM_V_CC_no)$(COMPILE) -c -o $@ $<

-  	$(NULL)

-  

- +MAINTAINERCLEANFILES += extension.c panelbinding.c

- +

-  man_seven_files = $(man_seven_in_files:.7.in=.7)

-  man_seven_DATA =$(man_seven_files:.7=.7.gz)

-  man_sevendir = $(mandir)/man7

- -- 

- 2.21.0

- 

- From b497de5bc6525769e03b65c73fc991d4aa006223 Mon Sep 17 00:00:00 2001

- From: fujiwarat <takao.fujiwara1@gmail.com>

- Date: Wed, 20 Mar 2019 17:44:26 +0900

- Subject: [PATCH 04/27] test: Set GTK_IM_MODULE in test-console.sh

- 

- ---

-  src/tests/Makefile.am |  4 ++--

-  1 files changed, 14 insertions(+), 2 deletions(-)

- 

- diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am

- index e337a59b..e2ff5ea7 100644

- --- a/src/tests/Makefile.am

- +++ b/src/tests/Makefile.am

- @@ -3,7 +3,7 @@

-  # ibus - The Input Bus

-  #

-  # Copyright (c) 2007-2015 Peng Huang <shawn.p.huang@gmail.com>

- -# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>

- +# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>

-  # Copyright (c) 2007-2018 Red Hat, Inc.

-  #

-  # This library is free software; you can redistribute it and/or

- @@ -78,7 +78,7 @@ TESTS_ENVIRONMENT = \

-  

-  LOG_COMPILER = $(srcdir)/runtest

-  

- -EXTRA_DIST = runtest

- +EXTRA_DIST = runtest ibus-compose.env

-  

-  ibus_bus_SOURCES = ibus-bus.c

-  ibus_bus_LDADD = $(prog_ldadd)

- -- 

- 2.21.0

- 

- From 1cb5032e85d85f496e349236d1b74f17fb8db966 Mon Sep 17 00:00:00 2001

- From: fujiwarat <takao.fujiwara1@gmail.com>

- Date: Tue, 23 Apr 2019 15:40:45 +0900

- Subject: [PATCH 05/27] configure: Move ibus-setup from configure.ac to

-  Makefile.am

- 

- @localedir@ can be extracted to ${datarootdir}/locale and

- it needs datarootdir=/usr/share in case configure.ac is used

- and deleting the datarootdir line caused a regression.

- All variables can be extracted in Makefile.am with sed.

- ---

-  configure.ac      |  1 -

-  setup/Makefile.am | 13 +++++++++++--

-  2 files changed, 11 insertions(+), 3 deletions(-)

- 

- diff --git a/configure.ac b/configure.ac

- index 9518e808..7503f3e8 100644

- --- a/configure.ac

- +++ b/configure.ac

- @@ -724,7 +724,6 @@ ibus/interface/Makefile

-  ui/Makefile

-  ui/gtk3/Makefile

-  setup/Makefile

- -setup/ibus-setup

-  bindings/Makefile

-  bindings/pygobject/Makefile

-  bindings/vala/Makefile

- diff --git a/setup/Makefile.am b/setup/Makefile.am

- index cb4dd8d1..34c8f136 100644

- --- a/setup/Makefile.am

- +++ b/setup/Makefile.am

- @@ -3,8 +3,8 @@

-  # ibus - The Input Bus

-  #

-  # Copyright (c) 2007-2014 Peng Huang <shawn.p.huang@gmail.com>

- -# Copyright (c) 2015-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>

- -# Copyright (c) 2007-2018 Red Hat, Inc.

- +# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>

- +# Copyright (c) 2007-2019 Red Hat, Inc.

-  #

-  # This library is free software; you can redistribute it and/or

-  # modify it under the terms of the GNU Lesser General Public

- @@ -40,6 +40,15 @@ ibussetup_DATA = \

-  bin_SCRIPTS = ibus-setup

-  ibussetupdir = $(pkgdatadir)/setup

-  

- +ibus-setup: ibus-setup.in

- +	$(AM_V_GEN) sed -e "s|\@datarootdir\@|$(datarootdir)|g" \

- +	                -e "s|\@localedir\@|$(localedir)|g" \

- +	                -e "s|\@libexecdir\@|$(libexecdir)|g" \

- +	                -e "s|\@prefix\@|$(prefix)|g" \

- +	                -e "s|\@PYTHON\@|$(PYTHON)|g" \

- +	$< > $@.tmp && \

- +	mv $@.tmp $@

- +

-  desktop_notrans_files = ibus-setup.desktop

-  desktop_DATA = org.freedesktop.IBus.Setup.desktop

-  desktopdir = $(datadir)/applications

- -- 

- 2.21.0

- 

- From cc849c20d4dff31f6f88f93789790759bf087b77 Mon Sep 17 00:00:00 2001

- From: fujiwarat <takao.fujiwara1@gmail.com>

- Date: Tue, 23 Apr 2019 17:56:20 +0900

- Subject: [PATCH 06/27] NEWS: Add shortlog

- 

- Update Makefile.am to insert shortlog in NEWS

- Update po/Makevars to add multiple COPYRIGHT_HOLDER

- ---

-  Makefile.am | 7 +++++--

-  po/Makevars | 3 ++-

-  2 files changed, 7 insertions(+), 3 deletions(-)

- 

- diff --git a/Makefile.am b/Makefile.am

- index cf7460d6..9ff786dc 100644

- --- a/Makefile.am

- +++ b/Makefile.am

- @@ -3,8 +3,8 @@

-  # ibus - The Input Bus

-  #

-  # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>

- -# Copyright (c) 2015-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>

- -# Copyright (c) 2007-2017 Red Hat, Inc.

- +# Copyright (c) 2015-2019 Takao Fujiwara <takao.fujiwara1@gmail.com>

- +# Copyright (c) 2007-2019 Red Hat, Inc.

-  #

-  # This library is free software; you can redistribute it and/or

-  # modify it under the terms of the GNU Lesser General Public

- @@ -103,6 +103,9 @@ dist-hook:

-  "$(IBUS_MAJOR_VERSION).$(IBUS_MINOR_VERSION).$$IBUS_PREV_MICRO_VERSION"; \

-  		echo "Changes in IBus $(IBUS_VERSION)" > $(distdir)/NEWS; \

-  		echo "" >> $(distdir)/NEWS; \

- +		git shortlog $$IBUS_PREV_VERSION...$(IBUS_VERSION) \

- +		        >> $(distdir)/NEWS; \

- +		echo "" >> $(distdir)/NEWS; \

-  		git log $$IBUS_PREV_VERSION...$(IBUS_VERSION) --reverse \

-  		        --pretty=format:'%s (%an) %h' >> $(distdir)/NEWS; \

-  	fi

- diff --git a/po/Makevars b/po/Makevars

- index d3fbeab2..1d16cc98 100644

- --- a/po/Makevars

- +++ b/po/Makevars

- @@ -20,7 +20,8 @@ XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2

-  # or entity, or to disclaim their copyright.  The empty string stands for

-  # the public domain; in this case the translators are expected to disclaim

-  # their copyright.

- -COPYRIGHT_HOLDER = Peng Huang <shawn.p.huang@gmail.com>

- +COPYRIGHT_HOLDER = Peng Huang <shawn.p.huang@gmail.com> \

- +Takao Fujiwara <takao.fujiwara1@gmail.com>

-  

-  # This is the email address or URL to which the translators shall report

-  # bugs in the untranslated strings:

- -- 

- 2.21.0

- 

- From 1c54fea645b2ec3a385d492e4ca30a70dbb87c3a Mon Sep 17 00:00:00 2001

- From: fujiwarat <takao.fujiwara1@gmail.com>

- Date: Tue, 23 Apr 2019 18:44:45 +0900

- Subject: [PATCH 07/27] data/its: Add ibus.its for IME's component files

- 

- IBusEngineDesc has translatable strings in longname and

- description tags and they needs to be extracted by xgettext.

- 

- After you install the ibus.[its|loc] to /usr/share/gettext/its,

- each engine's component file needs to renamed with

- '.inputMethod.xml' in the source directory suffix. E.g.

- Rename 'anthy.xml' to 'anthy.inputMethod.xml' and write the file

- path to the engine's POTFILES.in

- ---

-  configure.ac         |  1 +

-  data/Makefile.am     |  3 ++-

-  data/its/Makefile.am | 29 +++++++++++++++++++++++++++++

-  data/its/ibus.its    | 14 ++++++++++++++

-  data/its/ibus.loc    |  7 +++++++

-  5 files changed, 53 insertions(+), 1 deletion(-)

-  create mode 100644 data/its/Makefile.am

-  create mode 100644 data/its/ibus.its

-  create mode 100644 data/its/ibus.loc

- 

- diff --git a/configure.ac b/configure.ac

- index 7503f3e8..b5a87b56 100644

- --- a/configure.ac

- +++ b/configure.ac

- @@ -711,6 +711,7 @@ util/IMdkit/Makefile

-  data/Makefile

-  data/annotations/Makefile

-  data/icons/Makefile

- +data/its/Makefile

-  data/keymaps/Makefile

-  data/dconf/Makefile

-  docs/Makefile

- diff --git a/data/Makefile.am b/data/Makefile.am

- index 2533f444..aa3ee466 100644

- --- a/data/Makefile.am

- +++ b/data/Makefile.am

- @@ -3,7 +3,7 @@

-  # ibus - The Input Bus

-  #

-  # Copyright (c) 2007-2016 Peng Huang <shawn.p.huang@gmail.com>

- -# Copyright (c) 2007-2018 Red Hat, Inc.

- +# Copyright (c) 2007-2019 Red Hat, Inc.

-  #

-  # This library is free software; you can redistribute it and/or

-  # modify it under the terms of the GNU Lesser General Public

- @@ -23,6 +23,7 @@

-  SUBDIRS = \

-  	annotations \

-  	icons \

- +	its \

-  	keymaps \

-  	$(NULL)

-  

- diff --git a/data/its/Makefile.am b/data/its/Makefile.am

- new file mode 100644

- index 00000000..07c8a96d

- --- /dev/null

- +++ b/data/its/Makefile.am

- @@ -0,0 +1,29 @@

- +# vim:set noet ts=4:

- +#

- +# ibus - The Input Bus

- +#

- +# Copyright (c) 2019 Takao Fujiwara <takao.fujiwara1@gmail.com>

- +# Copyright (c) 2019 Red Hat, Inc.

- +#

- +# This library is free software; you can redistribute it and/or

- +# modify it under the terms of the GNU Lesser General Public

- +# License as published by the Free Software Foundation; either

- +# version 2.1 of the License, or (at your option) any later version.

- +#

- +# This library is distributed in the hope that it will be useful,

- +# but WITHOUT ANY WARRANTY; without even the implied warranty of

- +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- +# Lesser General Public License for more details.

- +#

- +# You should have received a copy of the GNU Lesser General Public

- +# License along with this library; if not, write to the Free Software

- +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301

- +# USA

- +

- +itsdir = $(datadir)/gettext/its

- +its_DATA = \

- +    ibus.its \

- +    ibus.loc \

- +    $(NULL)

- +

- +-include $(top_srcdir)/git.mk

- diff --git a/data/its/ibus.its b/data/its/ibus.its

- new file mode 100644

- index 00000000..30d8d4e2

- --- /dev/null

- +++ b/data/its/ibus.its

- @@ -0,0 +1,14 @@

- +<?xml version="1.0"?>

- +<its:rules xmlns:its="http://www.w3.org/2005/11/its"

- +           version="2.0">

- +  <its:translateRule selector="/component" translate="no"/>

- +  <its:translateRule selector="/engines" translate="no"/>

- +  <its:translateRule selector="//engine" translate="no"/>

- +  <its:translateRule selector="//longname |

- +                               //description"

- +                     translate="yes"/>

- +  <its:translateRule selector="//longname[@translatable = 'no']"

- +                     translate="no"/>

- +  <its:translateRule selector="//description[@translatable = 'no']"

- +                     translate="no"/>

- +</its:rules>

- diff --git a/data/its/ibus.loc b/data/its/ibus.loc

- new file mode 100644

- index 00000000..5a73798b

- --- /dev/null

- +++ b/data/its/ibus.loc

- @@ -0,0 +1,7 @@

- +<?xml version="1.0"?>

- +<locatingRules>

- +  <locatingRule name="IBusEngineDesc" pattern="*.inputMethod.xml">

- +    <documentRule localName="engines" target="ibus.its"/>

- +    <documentRule localName="component" target="ibus.its"/>

- +  </locatingRule>

- +</locatingRules>

- -- 

- 2.21.0

- 

- From 91a256163427f04eb7763196b4ffe553911d2e01 Mon Sep 17 00:00:00 2001

- From: Gunnar Hjalmarsson <gunnarhj@users.noreply.github.com>

- Date: Tue, 7 May 2019 19:42:28 +0900

- Subject: [PATCH 08/27] bus: Indistinguishable address of ibus-daemon

- 

- BUG=https://github.com/ibus/ibus/issues/2095

- ---

-  bus/global.c | 2 +-

-  1 file changed, 1 insertion(+), 1 deletion(-)

- 

- diff --git a/bus/global.c b/bus/global.c

- index f147cd6f..2ba8b2a7 100644

- --- a/bus/global.c

- +++ b/bus/global.c

- @@ -24,7 +24,7 @@

-  #include "global.h"

-  

-  gchar **g_argv = NULL;

- -gchar *g_address = "unix:tmpdir=/tmp";

- +gchar *g_address = "unix:tmpdir=/tmp/ibus";

-  gchar *g_cache = "auto";

-  gboolean g_mempro = FALSE;

-  gboolean g_verbose = FALSE;

- -- 

- 2.21.0

- 

- From 05a10950d635602fb3fcf4ed0021aa0b15dbd698 Mon Sep 17 00:00:00 2001

- From: fujiwarat <takao.fujiwara1@gmail.com>

- Date: Thu, 9 May 2019 15:49:09 +0900

- Subject: [PATCH 09/27] src: Make ISO 639 language names with title

- 

- Danish translations are small in iso-codes-iso-639-2-da.po for the

- genral usage but the users ask the title format on UI.

- Now ibus_get_language_name() and ibus_get_untranslated_language_name()

- return the dynamic allocation instead of the static characters

- to make the capital character.

- 

- BUG=https://github.com/ibus/ibus/issues/2079

- ---

-  src/ibusutil.c | 63 ++++++++++++++++++++++++++++++++++++++++++--------

-  src/ibusutil.h |  8 +++----

-  2 files changed, 58 insertions(+), 13 deletions(-)

- 

- diff --git a/src/ibusutil.c b/src/ibusutil.c

- index fd1da006..9d003e2e 100644

- --- a/src/ibusutil.c

- +++ b/src/ibusutil.c

- @@ -2,7 +2,7 @@

-  /* vim:set et sts=4: */

-  /* bus - The Input Bus

-   * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>

- - * Copyright (C) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>

- + * Copyright (C) 2010-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>

-   * Copyright (C) 2008-2016 Red Hat, Inc.

-   *

-   * This library is free software; you can redistribute it and/or

- @@ -125,8 +125,8 @@ _load_lang()

-      ibus_xml_free (node);

-  }

-  

- -const gchar *

- -ibus_get_untranslated_language_name (const gchar *_locale)

- +const static gchar *

- +ibus_get_untranslated_raw_language_name (const gchar *_locale)

-  {

-      const gchar *retval;

-      gchar *p = NULL;

- @@ -148,19 +148,64 @@ ibus_get_untranslated_language_name (const gchar *_locale)

-          return "Other";

-  }

-  

- -const gchar *

- +static char *

- +get_first_item_in_semicolon_list (const char *list)

- +{

- +        char **items;

- +        char  *item;

- +

- +        items = g_strsplit (list, "; ", 2);

- +

- +        item = g_strdup (items[0]);

- +        g_strfreev (items);

- +

- +        return item;

- +}

- +

- +static char *

- +capitalize_utf8_string (const char *str)

- +{

- +    char first[8] = { 0 };

- +

- +    if (!str)

- +        return NULL;

- +

- +    g_unichar_to_utf8 (g_unichar_totitle (g_utf8_get_char (str)), first);

- +

- +    return g_strconcat (first, g_utf8_offset_to_pointer (str, 1), NULL);

- +}

- +

- +gchar *

- +ibus_get_untranslated_language_name (const gchar *_locale)

- +{

- +    const gchar *raw = ibus_get_untranslated_raw_language_name (_locale);

- +    gchar *tmp = get_first_item_in_semicolon_list (raw);

- +    gchar *retval = capitalize_utf8_string (tmp);

- +    g_free (tmp);

- +    return retval;

- +}

- +

- +gchar *

-  ibus_get_language_name (const gchar *_locale)

-  {

- -    const gchar *retval = ibus_get_untranslated_language_name (_locale);

- +    const gchar *raw = ibus_get_untranslated_raw_language_name (_locale);

- +    const gchar *translation = NULL;

- +    gchar *tmp;

- +    gchar *retval;

-  

-  #ifdef ENABLE_NLS

- -    if (g_strcmp0 (retval, "Other") == 0)

- -        return dgettext (GETTEXT_PACKAGE, N_("Other"));

- +    if (g_strcmp0 (raw, "Other") == 0)

- +        return g_strdup (dgettext (GETTEXT_PACKAGE, N_("Other")));

-      else

- -        return dgettext ("iso_639-3", retval);

- +        translation = dgettext ("iso_639-3", raw);

-  #else

- -    return retval;

- +    translation = raw;

-  #endif

- +

- +    tmp = get_first_item_in_semicolon_list (translation);

- +    retval = capitalize_utf8_string (tmp);

- +    g_free (tmp);

- +    return retval;

-  }

-  

-  void

- diff --git a/src/ibusutil.h b/src/ibusutil.h

- index 226dd7a8..795365f6 100644

- --- a/src/ibusutil.h

- +++ b/src/ibusutil.h

- @@ -2,8 +2,8 @@

-  /* vim:set et sts=4: */

-  /* bus - The Input Bus

-   * Copyright (C) 2008-2015 Peng Huang <shawn.p.huang@gmail.com>

- - * Copyright (C) 2010-2017 Takao Fujiwara <takao.fujiwara1@gmail.com>

- - * Copyright (C) 2008-2016 Red Hat, Inc.

- + * Copyright (C) 2010-2018 Takao Fujiwara <takao.fujiwara1@gmail.com>

- + * Copyright (C) 2008-2018 Red Hat, Inc.

-   *

-   * This library is free software; you can redistribute it and/or

-   * modify it under the terms of the GNU Lesser General Public

- @@ -42,7 +42,7 @@

-   *

-   * Returns: untranslated language name

-   */

- -const gchar *    ibus_get_untranslated_language_name

- +gchar *          ibus_get_untranslated_language_name

-                                                  (const gchar    *_locale);

-  

-  /**

- @@ -51,6 +51,6 @@ const gchar *    ibus_get_untranslated_language_name

-   *

-   * Returns: translated language name

-   */

- -const gchar *    ibus_get_language_name         (const gchar    *_locale);

- +gchar *          ibus_get_language_name         (const gchar    *_locale);

-  

-  #endif

- -- 

- 2.21.0

- 

- From cebe7a9553de69943b955ec99285f74961c9ee4e Mon Sep 17 00:00:00 2001

- From: fujiwarat <takao.fujiwara1@gmail.com>

- Date: Thu, 9 May 2019 15:49:21 +0900

- Subject: [PATCH 10/27] client/gtk2: Keep preedit cursor_pos and visible in

-  clearing preedit text

- 

- Clear the preedit_string but keep the preedit_cursor_pos and

- preedit_visible because a time lag could happen, firefox commit

- the preedit text before the preedit text is cleared and it cause

- a double commits of the Hangul preedit in firefox if the preedit

- would be located on the URL bar and click on anywhere of firefox

- out of the URL bar.

- ---

-  client/gtk2/ibusimcontext.c | 12 ++++++++++--

-  1 file changed, 10 insertions(+), 2 deletions(-)

- 

- diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c

- index 264a747a..5e3457ba 100644

- --- a/client/gtk2/ibusimcontext.c

- +++ b/client/gtk2/ibusimcontext.c

- @@ -881,10 +881,18 @@ ibus_im_context_clear_preedit_text (IBusIMContext *ibusimcontext)

-          ibusimcontext->preedit_mode == IBUS_ENGINE_PREEDIT_COMMIT) {

-          preedit_string = g_strdup (ibusimcontext->preedit_string);

-      }

- +

- +    /* Clear the preedit_string but keep the preedit_cursor_pos and

- +     * preedit_visible because a time lag could happen, firefox commit

- +     * the preedit text before the preedit text is cleared and it cause

- +     * a double commits of the Hangul preedit in firefox if the preedit

- +     * would be located on the URL bar and click on anywhere of firefox

- +     * out of the URL bar.

- +     */

-      _ibus_context_update_preedit_text_cb (ibusimcontext->ibuscontext,

-                                            ibus_text_new_from_string (""),

- -                                          0,

- -                                          FALSE,

- +                                          ibusimcontext->preedit_cursor_pos,

- +                                          ibusimcontext->preedit_visible,

-                                            IBUS_ENGINE_PREEDIT_CLEAR,

-                                            ibusimcontext);

-      if (preedit_string) {

- -- 

- 2.21.0

- 

- From b59f7f823b7b2051e4ca31834f9299a72f01b339 Mon Sep 17 00:00:00 2001

- From: fujiwarat <takao.fujiwara1@gmail.com>

- Date: Thu, 9 May 2019 17:02:21 +0900

- Subject: [PATCH 14/27] src: Support 32bit and multiple compose outputs

- MIME-Version: 1.0

- Content-Type: text/plain; charset=UTF-8

- Content-Transfer-Encoding: 8bit

- 

- Compose file in en_US.UTF-8 now includes wide codepoints more than

- U+FFFF likes '<Multi_key> <F> <U> : "🖕"  U1F595' but the current

- gtk_compose_seqs_compact[] is a guint16 array.

- To support 32bit and multiple compose outputs, the array is now

- separated to 16bit and 32bit arrays and 32bit array is also

- separated to gtk_compose_seqs_compact_32bit_first[] for 16bit

- key sequences and gtk_compose_seqs_compact_32bit_second[] for

- 32bit output values.

- 

- BUG=https://github.com/ibus/ibus/issues/2074

- ---

-  src/gtkimcontextsimpleseqs.h  | 9912 +++++++++++++++++----------------

-  src/ibuscomposetable.h        |   13 +-

-  src/ibusenginesimple.c        |  166 +-

-  src/ibusenginesimpleprivate.h |    8 +-

-  4 files changed, 5380 insertions(+), 4719 deletions(-)

- 

- diff --git a/src/gtkimcontextsimpleseqs.h b/src/gtkimcontextsimpleseqs.h

- index 632391a1..ffa5f125 100644

- --- a/src/gtkimcontextsimpleseqs.h

- +++ b/src/gtkimcontextsimpleseqs.h

- @@ -94,4680 +94,5244 @@ IBUS_KEY_dead_belowdiaeresis, 3705, 3705, 3708, 3708, 3708,

-  IBUS_KEY_dead_belowcomma, 3708, 3722, 3722, 3722, 3722, 

-  IBUS_KEY_dead_currency, 3722, 3820, 3826, 3826, 3826, 

-  IBUS_KEY_dead_greek, 3826, 3928, 3952, 3952, 3952, 

- -IBUS_KEY_Multi_key, 3952, 3952, 10348, 14044, 15919, 

- -IBUS_KEY_Greek_iota, 0x0390, 

- -IBUS_KEY_Greek_upsilon, 0x03B0, 

- -IBUS_KEY_space, 0x0060, 

- -IBUS_KEY_V, 0x01DB, 

- -IBUS_KEY_v, 0x01DC, 

- -IBUS_KEY_nobreakspace, 0x0300, 

- -IBUS_KEY_Abreve, 0x1EB0, 

- -IBUS_KEY_abreve, 0x1EB1, 

- -IBUS_KEY_Emacron, 0x1E14, 

- -IBUS_KEY_emacron, 0x1E15, 

- -IBUS_KEY_Omacron, 0x1E50, 

- -IBUS_KEY_omacron, 0x1E51, 

- -IBUS_KEY_Cyrillic_ie, 0x0450, 

- -IBUS_KEY_Cyrillic_i, 0x045D, 

- -IBUS_KEY_Cyrillic_IE, 0x0400, 

- -IBUS_KEY_Cyrillic_I, 0x040D, 

- -IBUS_KEY_Greek_iotadieresis, 0x1FD2, 

- -IBUS_KEY_Greek_upsilondieresis, 0x1FE2, 

- -IBUS_KEY_Greek_ALPHA, 0x1FBA, 

- -IBUS_KEY_Greek_EPSILON, 0x1FC8, 

- -IBUS_KEY_Greek_ETA, 0x1FCA, 

- -IBUS_KEY_Greek_IOTA, 0x1FDA, 

- -IBUS_KEY_Greek_OMICRON, 0x1FF8, 

- -IBUS_KEY_Greek_UPSILON, 0x1FEA, 

- -IBUS_KEY_Greek_OMEGA, 0x1FFA, 

- -IBUS_KEY_Greek_alpha, 0x1F70, 

- -IBUS_KEY_Greek_epsilon, 0x1F72, 

- -IBUS_KEY_Greek_eta, 0x1F74, 

- -IBUS_KEY_Greek_iota, 0x1F76, 

- -IBUS_KEY_Greek_omicron, 0x1F78, 

- -IBUS_KEY_Greek_upsilon, 0x1F7A, 

- -IBUS_KEY_Greek_omega, 0x1F7C, 

- -IBUS_KEY_dead_grave, 0x0060, 

- -IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_iota, 0x1FD2, 

- -IBUS_KEY_dead_diaeresis, IBUS_KEY_Greek_upsilon, 0x1FE2, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_ALPHA, 0x1F0A, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_EPSILON, 0x1F1A, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_ETA, 0x1F2A, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_IOTA, 0x1F3A, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMICRON, 0x1F4A, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_OMEGA, 0x1F6A, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_alpha, 0x1F02, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_epsilon, 0x1F12, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_eta, 0x1F22, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_iota, 0x1F32, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_omicron, 0x1F42, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_upsilon, 0x1F52, 

- -IBUS_KEY_dead_psili, IBUS_KEY_Greek_omega, 0x1F62, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ALPHA, 0x1F0B, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_EPSILON, 0x1F1B, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_ETA, 0x1F2B, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_IOTA, 0x1F3B, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMICRON, 0x1F4B, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_UPSILON, 0x1F5B, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_OMEGA, 0x1F6B, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_alpha, 0x1F03, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_epsilon, 0x1F13, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_eta, 0x1F23, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_iota, 0x1F33, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omicron, 0x1F43, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_upsilon, 0x1F53, 

- -IBUS_KEY_dead_dasia, IBUS_KEY_Greek_omega, 0x1F63, 

- -IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_U, 0x01DB, 

- -IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_u, 0x01DC, 

- -IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_iota, 0x1FD2, 

- -IBUS_KEY_Multi_key, IBUS_KEY_quotedbl, IBUS_KEY_Greek_upsilon, 0x1FE2, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ALPHA, 0x1F0B, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_EPSILON, 0x1F1B, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_ETA, 0x1F2B, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_IOTA, 0x1F3B, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMICRON, 0x1F4B, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_UPSILON, 0x1F5B, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_OMEGA, 0x1F6B, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_alpha, 0x1F03, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_epsilon, 0x1F13, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_eta, 0x1F23, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_iota, 0x1F33, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omicron, 0x1F43, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_upsilon, 0x1F53, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenleft, IBUS_KEY_Greek_omega, 0x1F63, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ALPHA, 0x1F0A, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_EPSILON, 0x1F1A, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_ETA, 0x1F2A, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_IOTA, 0x1F3A, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMICRON, 0x1F4A, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_OMEGA, 0x1F6A, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_alpha, 0x1F02, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_epsilon, 0x1F12, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_eta, 0x1F22, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_iota, 0x1F32, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omicron, 0x1F42, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_upsilon, 0x1F52, 

- -IBUS_KEY_Multi_key, IBUS_KEY_parenright, IBUS_KEY_Greek_omega, 0x1F62, 

- -IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_O, 0x1EDC, 

- -IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_U, 0x1EEA, 

- -IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_o, 0x1EDD, 

- -IBUS_KEY_Multi_key, IBUS_KEY_plus, IBUS_KEY_u, 0x1EEB, 

- -IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_A, 0x1EB0, 

- -IBUS_KEY_Multi_key, IBUS_KEY_U, IBUS_KEY_a, 0x1EB1, 

- -IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_A, 0x1EA6, 

- -IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_E, 0x1EC0, 

- -IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_O, 0x1ED2, 

- -IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_a, 0x1EA7, 

- -IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_e, 0x1EC1, 

- -IBUS_KEY_Multi_key, IBUS_KEY_asciicircum, IBUS_KEY_o, 0x1ED3, 

- -IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_E, 0x1E14, 

- -IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_O, 0x1E50, 

- -IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_e, 0x1E15, 

- -IBUS_KEY_Multi_key, IBUS_KEY_underscore, IBUS_KEY_o, 0x1E51, 

- -IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_A, 0x1EB0, 

- -IBUS_KEY_Multi_key, IBUS_KEY_b, IBUS_KEY_a, 0x1EB1, 

- -IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_E, 0x1E14, 

- -IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_O, 0x1E50, 

- -IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_e, 0x1E15, 

- -IBUS_KEY_Multi_key, IBUS_KEY_macron, IBUS_KEY_o, 0x1E51, 

- -IBUS_KEY_space, 0x0027, 

- -IBUS_KEY_V, 0x01D7, 

- -IBUS_KEY_v, 0x01D8, 

- -IBUS_KEY_nobreakspace, 0x0301, 

- -IBUS_KEY_Abreve, 0x1EAE, 

- -IBUS_KEY_abreve, 0x1EAF, 

- -IBUS_KEY_Emacron, 0x1E16, 

- -IBUS_KEY_emacron, 0x1E17,