--- gnome-desktop-43.2/debian/patches/series 2023-02-16 01:15:51.000000000 +0900 +++ gnome-desktop-43.2/debian/patches/series 2023-03-05 20:26:49.000000000 +0900 @@ -1 +1,2 @@ languages-Look-at-LOCPATH-before-compile-time-LIBLOCALEDI.patch +use-mozc-for-Japanese.patch diff -Nru gnome-desktop-43.2/debian/patches/use-mozc-for-Japanese.patch gnome-desktop-43.2/debian/patches/use-mozc-for-Japanese.patch --- gnome-desktop-43.2/debian/patches/use-mozc-for-Japanese.patch 1970-01-01 09:00:00.000000000 +0900 +++ gnome-desktop-43.2/debian/patches/use-mozc-for-Japanese.patch 2023-03-05 20:27:12.000000000 +0900 @@ -0,0 +1,51 @@ +Description: Use mozc as the default input source for Japanese + Upstream prefers ibus-anthy for Japanese input, while Debian uses + ibus-mozc as the default. +Author: YOSHINO Yoshihito +Origin: vendor +Forwarded: not-needed +Last-Update: 2023-03-05 + +Index: gnome-desktop-43.2/libgnome-desktop/default-input-sources.h +=================================================================== +--- gnome-desktop-43.2.orig/libgnome-desktop/default-input-sources.h ++++ gnome-desktop-43.2/libgnome-desktop/default-input-sources.h +@@ -36,7 +36,11 @@ static DefaultInputSource default_input_ + { "hi_IN", "ibus", "m17n:hi:inscript" }, + { "id_ID", "xkb", "us" }, + { "it_IT", "xkb", "it" }, ++#ifdef USE_MOZC_JP ++ { "ja_JP", "ibus", "mozc-jp" }, ++#else + { "ja_JP", "ibus", "anthy" }, ++#endif + { "kn_IN", "ibus", "m17n:kn:kgp" }, + { "ko_KR", "ibus", "hangul" }, + { "mai_IN", "ibus", "m17n:mai:inscript" }, +Index: gnome-desktop-43.2/meson_options.txt +=================================================================== +--- gnome-desktop-43.2.orig/meson_options.txt ++++ gnome-desktop-43.2/meson_options.txt +@@ -34,3 +34,7 @@ option('build_gtk4', + option('legacy_library', + type: 'boolean', value: true, description: 'Build the legacy libgnome-desktop-3.0' + ) ++ ++option('use_mozc_jp', ++ type: 'boolean', value: false, description: 'Use mozc-jp' ++) +Index: gnome-desktop-43.2/libgnome-desktop/meson.build +=================================================================== +--- gnome-desktop-43.2.orig/libgnome-desktop/meson.build ++++ gnome-desktop-43.2/libgnome-desktop/meson.build +@@ -9,6 +9,10 @@ libargs = [ + '-DXKB_BASE="@0@"'.format(xkb_base) + ] + ++if get_option('use_mozc_jp') ++ add_project_arguments('-DUSE_MOZC_JP', language: 'c') ++endif ++ + conf = configuration_data() + + conf.set_quoted('GETTEXT_PACKAGE', '@0@-3.0'.format(meson.project_name())) diff -Nru gnome-desktop-43.2/debian/rules gnome-desktop-43.2/debian/rules --- gnome-desktop-43.2/debian/rules 2023-02-16 01:15:51.000000000 +0900 +++ gnome-desktop-43.2/debian/rules 2023-03-05 20:27:12.000000000 +0900 @@ -11,6 +11,12 @@ export GD_SOVERSION = $(shell echo $(GD_LIBNAME) | rev | cut -f1 -d- | rev) export GD_API_VERSION = $(shell echo $(GD_LIBNAME) | rev | cut -f2 -d- | rev) +ifneq (,$(filter $(DEB_BUILD_ARCH),i386 amd64 armel armhf arm64 riscv64)) +USE_MOZC_JP := -Duse_mozc_jp=true +else +USE_MOZC_JP := -Duse_mozc_jp=false +endif + %: dh $@ @@ -18,7 +24,8 @@ dh_auto_configure -- \ -Dgtk_doc=true \ -Dinstalled_tests=true \ - -Ddesktop_docs=true + -Ddesktop_docs=true \ + $(USE_MOZC_JP) override_dh_auto_test: debian/tests/run-with-locales \