From 1b181cf557a35c72e8da142fdbeeebed08c54aa67bbd06218580e3fabda1eb30 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 18 Mar 2021 18:31:50 +0000 Subject: [PATCH 1/2] Accepting request 879701 from home:qzhao:branches:GNOME:Factory Update gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch: Modify the Japanese input engine load order which will more fit for our community (bnc#1183475); OBS-URL: https://build.opensuse.org/request/show/879701 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=467 --- ...ll-jsc#SLE-16051-Input-method-recommendation.patch | 11 +++++------ gnome-shell.changes | 7 +++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch b/gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch index 9067700..99ec454 100644 --- a/gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch +++ b/gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch @@ -1,7 +1,7 @@ -diff -Nura gnome-shell-3.38.2/js/ui/status/keyboard.js gnome-shell-3.38.2_new/js/ui/status/keyboard.js ---- gnome-shell-3.38.2/js/ui/status/keyboard.js 2020-12-03 07:00:04.412861000 +0800 -+++ gnome-shell-3.38.2_new/js/ui/status/keyboard.js 2021-01-12 11:46:45.501634675 +0800 -@@ -264,6 +264,34 @@ +diff -Nura gnome-shell-3.38.3/js/ui/status/keyboard.js gnome-shell-3.38.3_new/js/ui/status/keyboard.js +--- gnome-shell-3.38.3/js/ui/status/keyboard.js 2021-01-15 01:51:55.673968800 +0800 ++++ gnome-shell-3.38.3_new/js/ui/status/keyboard.js 2021-03-17 19:01:52.594128367 +0800 +@@ -264,6 +264,33 @@ this._settings.connect('changed::%s'.format(this._KEY_INPUT_SOURCES), this._emitInputSourcesChanged.bind(this)); this._settings.connect('changed::%s'.format(this._KEY_KEYBOARD_OPTIONS), this._emitKeyboardOptionsChanged.bind(this)); this._settings.connect('changed::%s'.format(this._KEY_PER_WINDOW), this._emitPerWindowChanged.bind(this)); @@ -19,9 +19,8 @@ diff -Nura gnome-shell-3.38.2/js/ui/status/keyboard.js gnome-shell-3.38.2_new/js + + else if (GLib.getenv('LANG') == 'ja_JP.UTF-8') { + log('Set default input method in Japanese language env.'); -+ sourcesList.push(['xkb', 'jp']); + sourcesList.push([ "ibus", "mozc-jp" ]); -+ sourcesList.push([ "ibus", "kkc" ]); ++ sourcesList.push(['xkb', 'jp']); + } + + else if (GLib.getenv('LANG') == 'ko_KR.UTF-8') { diff --git a/gnome-shell.changes b/gnome-shell.changes index 3737999..b72b961 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 17 11:16:17 UTC 2021 - Cliff Zhao + +- Update gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch: + Modify the Japanese input engine load order which will more fit + for our community(bnc#1183475); + ------------------------------------------------------------------- Thu Jan 14 18:22:08 UTC 2021 - Dominique Leuenberger From 2c5fd6a5f98564f448bec13f14f19891e1b5965f17712fba70b73e8ceb8fbbba Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 19 Mar 2021 21:28:00 +0000 Subject: [PATCH 2/2] - Disable gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch: Clears existing keyboard on gnome-shell restart (boo#1183823). for our community(bnc#1183475); OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-shell?expand=0&rev=468 --- gnome-shell.changes | 11 +++++++++-- gnome-shell.spec | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gnome-shell.changes b/gnome-shell.changes index b72b961..a13adc9 100644 --- a/gnome-shell.changes +++ b/gnome-shell.changes @@ -1,9 +1,16 @@ +------------------------------------------------------------------- +Fri Mar 19 21:27:12 UTC 2021 - Dominique Leuenberger + +- Disable + gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch: + Clears existing keyboard on gnome-shell restart (boo#1183823). + ------------------------------------------------------------------- Wed Mar 17 11:16:17 UTC 2021 - Cliff Zhao - Update gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch: Modify the Japanese input engine load order which will more fit - for our community(bnc#1183475); + for our community(bnc#1183475); ------------------------------------------------------------------- Thu Jan 14 18:22:08 UTC 2021 - Dominique Leuenberger @@ -20,7 +27,7 @@ Thu Jan 14 18:22:08 UTC 2021 - Dominique Leuenberger ------------------------------------------------------------------- Mon Jan 11 03:23:44 UTC 2021 - Cliff Zhao - + - Add gnome-shell-jsc#SLE-16051-Input-method-recommendation.patch: launch recommended input engines when Gnome-shell init in CJK regions (jsc#SLE-16051, glgo#GNOME/gnome-shell!1563). diff --git a/gnome-shell.spec b/gnome-shell.spec index ff3348b..52663cd 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -183,7 +183,7 @@ This package contains an optional extensions app for managing GNOME Shell extens %patch4 -p1 #patch5 -p1 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150300 -%patch6 -p1 +#patch6 -p1 %endif translation-update-upstream