pool/gnome-initial-setup
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 744692 from home:qzhao:branches:GNOME:Factory

Browse Source 
- Update gnome-initial-setup.spec
  Drop gnome-initial-setup-disable-dep-on-started-docs.patch
  Drop gnome-initial-setup-mozc-engine-prioritized.patch
  Drop gnome-initial-setup-only-setup-keyboard.patch
  Drop gnome-initial-setup-only-launch-CJK.patch
  to avoid blank docs window appear after gnome-initial-setup 
  finished (bnc#1125694, bnc#1131087).
- Sync SLE's changelog to Factory.

OBS-URL: https://build.opensuse.org/request/show/744692
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-initial-setup?expand=0&rev=72
This commit is contained in:
Dominique Leuenberger 2019-11-07 10:52:27 +00:00 committed by Git OBS Bridge
parent 22baa6a902
commit dc82b8cbd1
7 changed files with 1043 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnome-initial-setup-disable-dep-on-started-docs.patch
View File

@ -1,30 +0,0 @@
Index: gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup-copy-worker.c
===================================================================
--- gnome-initial-setup-3.26.0.orig/gnome-initial-setup/gnome-initial-setup-copy-worker.c
+++ gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup-copy-worker.c
@@ -89,7 +89,6 @@ main (int argc,
move_file_from_homedir (src, dest, path);
FILE (".config/gnome-initial-setup-done");
- FILE (".config/run-welcome-tour");
FILE (".config/dconf/user");
FILE (".config/goa-1.0/accounts.conf");
FILE (".config/monitors.xml");
Index: gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c
===================================================================
--- gnome-initial-setup-3.26.0.orig/gnome-initial-setup/gnome-initial-setup.c
+++ gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c
@@ -285,13 +285,6 @@ gis_ensure_stamp_files (void)
gchar *file;
GError *error = NULL;
- file = g_build_filename (g_get_user_config_dir (), "run-welcome-tour", NULL);
- if (!g_file_set_contents (file, "yes", -1, &error)) {
- g_warning ("Unable to create %s: %s", file, error->message);
- g_clear_error (&error);
- }
- g_free (file);
-
file = g_build_filename (g_get_user_config_dir (), "gnome-initial-setup-done", NULL);
if (!g_file_set_contents (file, "yes", -1, &error)) {
g_warning ("Unable to create %s: %s", file, error->message);

48
gnome-initial-setup-mozc-engine-prioritized.patch
View File

@ -1,48 +0,0 @@
Index: gnome-initial-setup-3.31.90/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
===================================================================
--- gnome-initial-setup-3.31.90.orig/gnome-initial-setup/pages/keyboard/cc-input-chooser.c 2019-02-04 23:16:02.000000000 +0100
+++ gnome-initial-setup-3.31.90/gnome-initial-setup/pages/keyboard/cc-input-chooser.c 2019-02-20 13:26:23.074350247 +0100
@@ -273,6 +273,14 @@ sync_checkmark (GtkWidget *row,
should_be_visible = FALSE;
else
should_be_visible = g_strcmp0 (widget->id, priv->id) == 0 && g_strcmp0 (widget->type, priv->type) == 0;
+
+ if ((g_strcmp0 (widget->id, "jp") == 0) &&
+ (g_strcmp0 (priv->id, "jp") == 0))
+ should_be_visible = FALSE;
+
+ if (g_strcmp0 (widget->id, "mozc-jp") == 0)
+ should_be_visible = TRUE;
+
gtk_widget_set_opacity (widget->checkmark, should_be_visible ? 1.0 : 0.0);
if (widget->is_extra && should_be_visible)
@@ -451,6 +459,13 @@ input_visible (GtkListBoxRow *row,
widget = get_input_widget (child);
+ if((g_strcmp0 (widget->id, "mozc-jp") == 0) ||
+ (g_strcmp0 (widget->id, "anthy") == 0))
+ return TRUE;
+
+ if(g_strcmp0 (widget->id, "Japanese (Mozc)") == 0)
+ return FALSE;
+
if (!priv->showing_extra && widget->is_extra)
return FALSE;
@@ -478,6 +493,14 @@ sort_inputs (GtkListBoxRow *a,
if (lb == NULL)
return -1;
+ if (g_strcmp0 (la->id, "mozc-jp") == 0 ||
+ g_strcmp0 (la->id, "anthy") == 0)
+ return -1;
+
+ if (g_strcmp0 (lb->id, "mozc-jp") == 0 ||
+ g_strcmp0 (lb->id, "anthy") == 0)
+ return 1;
+
if (la->is_extra && !lb->is_extra)
return 1;

45
gnome-initial-setup-only-launch-CJK.patch
View File

@ -1,45 +0,0 @@
Index: gnome-initial-setup-3.20.1/gnome-initial-setup/gnome-initial-setup.c
===================================================================
--- gnome-initial-setup-3.20.1.orig/gnome-initial-setup/gnome-initial-setup.c
+++ gnome-initial-setup-3.20.1/gnome-initial-setup/gnome-initial-setup.c
@@ -184,6 +184,30 @@ get_mode (void)
return GIS_DRIVER_MODE_NEW_USER;
}
+static gboolean
+language_is_CJK()
+{
+ gchar **env = g_get_environ ();
+ const gchar *value = g_environ_getenv (env, "LANG");
+
+ if (g_ascii_strcasecmp(value, "zh_CN.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_HK.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_MO.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_TW.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_SG.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_MO.UTF-8") &&
+ g_ascii_strcasecmp(value, "zh_MO.UTF-8") &&
+ g_ascii_strcasecmp(value, "ja_JP.UTF-8") &&
+ g_ascii_strcasecmp(value, "ko_KR.UTF-8")) {
+ g_strfreev(env);
+ return FALSE;
+ }
+ else {
+ g_strfreev(env);
+ return TRUE;
+ }
+}
+
int
main (int argc, char *argv[])
{
@@ -192,6 +216,9 @@ main (int argc, char *argv[])
GOptionContext *context;
GisDriverMode mode;
+ if (!language_is_CJK())
+ return status;
+
GOptionEntry entries[] = {
{ "existing-user", 0, 0, G_OPTION_ARG_NONE, &force_existing_user_mode,
_("Force existing user mode"), NULL },

23
gnome-initial-setup-only-setup-keyboard.patch
View File

@ -1,23 +0,0 @@
diff -urp gnome-initial-setup-3.33.91.orig/gnome-initial-setup/gnome-initial-setup.c gnome-initial-setup-3.33.91/gnome-initial-setup/gnome-initial-setup.c
--- gnome-initial-setup-3.33.91.orig/gnome-initial-setup/gnome-initial-setup.c 2019-08-31 16:14:45.640964145 -0500
+++ gnome-initial-setup-3.33.91/gnome-initial-setup/gnome-initial-setup.c 2019-08-31 16:21:35.551137124 -0500
@@ -65,19 +65,10 @@ typedef struct {
#define PAGE(name, new_user_only) { #name, gis_prepare_ ## name ## _page, new_user_only }
static PageData page_table[] = {
- PAGE (language, FALSE),
#ifdef ENABLE_REGION_PAGE
PAGE (region, FALSE),
#endif /* ENABLE_REGION_PAGE */
PAGE (keyboard, FALSE),
- PAGE (eula, FALSE),
- PAGE (network, FALSE),
- PAGE (privacy, FALSE),
- PAGE (timezone, TRUE),
- PAGE (software, TRUE),
- PAGE (goa, FALSE),
- PAGE (account, TRUE),
- PAGE (password, TRUE),
PAGE (summary, FALSE),
{ NULL },
};

1003
gnome-initial-setup-smarter.patch Normal file
View File

File diff suppressed because it is too large Load Diff

28
gnome-initial-setup.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Oct 24 09:47:45 UTC 2019 - Cliff Zhao <qzhao@suse.com>
- Update gnome-initial-setup.spec
Drop gnome-initial-setup-disable-dep-on-started-docs.patch
Drop gnome-initial-setup-mozc-engine-prioritized.patch
Drop gnome-initial-setup-only-setup-keyboard.patch
Drop gnome-initial-setup-only-launch-CJK.patch
to avoid blank docs window appear after gnome-initial-setup
finished (bnc#1125694, bnc#1131087).
-------------------------------------------------------------------
Sat Oct 5 21:53:52 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
@ -78,6 +89,12 @@ Tue Mar 5 06:03:49 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+ Improve account page behaviour when offline.
+ Updated translations.
-------------------------------------------------------------------
Wed Feb 27 08:18:15 UTC 2019 - qzhao@suse.com
- Update gnome-initial-setup-smarter.patch:
Avoid duplicate privilege requirement(FATE#321126).
-------------------------------------------------------------------
Wed Feb 20 12:12:27 UTC 2019 - bjorn.lie@gmail.com
@ -93,6 +110,17 @@ Wed Feb 20 12:12:27 UTC 2019 - bjorn.lie@gmail.com
- Add pkgconfig(packagekit-glib2) BuildRequires: New dependency.
- Refresh patch with refresh_patches service.
-------------------------------------------------------------------
Wed Dec 19 08:39:41 UTC 2018 - qzhao@suse.com
- Add gnome-initial-setup-smarter.patch,
Smarter gnome initial configuration: Find a method (better
upstream compatible) to allow gnome-initial-setup decide the
pop-ups smartly based on the system wise setup provided by the
installer(FATE#325763).
Adapt previous solutions to satisfy this feature. (FATE#321126,
boo#1067288, bnc#1029083).
-------------------------------------------------------------------
Wed Sep 26 16:14:52 UTC 2018 - bjorn.lie@gmail.com

29
gnome-initial-setup.spec
View File

@ -24,16 +24,8 @@ License: GPL-2.0-or-later
Group: System/GUI/GNOME
Url: https://wiki.gnome.org/Design/OS/InitialSetup
Source0: https://download.gnome.org/sources/gnome-initial-setup/3.34/%{name}-%{version}.tar.xz
# PATCH-FEATURE-SLE gnome-initial-setup-only-launch-CJK.patch FATE#321126 qzhao@suse.com -- Make gnome-initial-setup only work for CJK
Patch0: gnome-initial-setup-only-launch-CJK.patch
# PATCH-FEATURE-SLE gnome-initial-setup-only-setup-keyboard.patch FATE#321126 yfjiang@suse.com -- Only launch the keyboard and IM setup
Patch1: gnome-initial-setup-only-setup-keyboard.patch
# PATCH-FEATURE-SLE gnome-initial-setup-disable-dep-on-started-docs.patch FATE#321126 yfjiang@suse.com -- Disable help dialog after g-i-s system to remove the dependency of gnome-getting-started-docs
Patch2: gnome-initial-setup-disable-dep-on-started-docs.patch
# PATCH-FIX-OPENSUSE gnome-initial-setup-mozc-engine-prioritized.patch boo#1067288 bnc#1029083 qzhao@suse.com -- Make the Mozc input engine as the 1st choice for Japanese environment.
Patch3: gnome-initial-setup-mozc-engine-prioritized.patch
# PATCH-FEATURE-SLE gnome-initial-setup-smarter.patch FATE#325763 FATE#321126 boo#1067288 bnc#1029083 qzhao@suse.com -- Investigate gnome-initial-setup, and make a Smarter gnome initial configuration.
Patch0: gnome-initial-setup-smarter.patch
BuildRequires: krb5-devel
BuildRequires: meson
BuildRequires: pkgconfig
@ -79,13 +71,10 @@ Initial assistant, helping you to get the system up and running.
%prep
%setup -q
# Only enable keyboard/im setup feature in CJK environment on both sle and leap, keeping tw consistent with upstream
%if 0%{?sle_version} >= 120300
%if !0%{?is_opensuse}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%endif
%patch3 -p1
%build
%meson \
@ -94,6 +83,10 @@ Initial assistant, helping you to get the system up and running.
%install
%meson_install
%if !0%{?is_opensuse}
rm -rf %{buildroot}%{_libexecdir}/gnome-welcome-tour
rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
%endif
%find_lang %{name} %{?no_lang_C}
%pre
@ -115,10 +108,8 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} || :
%{_datadir}/polkit-1/rules.d/20-gnome-initial-setup.rules
%{_libexecdir}/gnome-initial-setup
%{_libexecdir}/gnome-initial-setup-copy-worker
%{_libexecdir}/gnome-welcome-tour
%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
%{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
%{_userunitdir}/gnome-initial-setup-copy-worker.service
%{_userunitdir}/gnome-initial-setup-first-login.service
%{_userunitdir}/gnome-initial-setup.service
@ -129,6 +120,10 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} || :
%{_userunitdir}/gnome-session.target.wants/gnome-welcome-tour.service
%dir %{_userunitdir}/gnome-session@gnome-initial-setup.target.wants
%{_userunitdir}/gnome-session@gnome-initial-setup.target.wants/gnome-initial-setup.service
%if 0%{?is_opensuse}
%{_libexecdir}/gnome-welcome-tour
%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
%endif
%files lang -f %{name}.lang