Hello community,
here is the log from the commit of package gnome-initial-setup for
openSUSE:Leap:15.2 checked in at 2020-02-01 06:10:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/gnome-initial-setup (Old)
and /work/SRC/openSUSE:Leap:15.2/.gnome-initial-setup.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-initial-setup"
Sat Feb 1 06:10:07 2020 rev:29 rq:751809 version:3.34.1
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/gnome-initial-setup/gnome-initial-setup.changes
2020-01-15 15:04:43.317881990 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.gnome-initial-setup.new.26092/gnome-initial-setup.changes
2020-02-01 06:10:09.570777532 +0100
@@ -1,0 +2,97 @@
+Tue Nov 26 06:55:54 UTC 2019 - Cliff Zhao <qz...@suse.com>
+
+- Update gnome-initial-setup-smarter.patch: Rebase to
+ gnome-initial-setup-3.34.1 for SLE-15-SP2 build(bnc#1156952).
+
+-------------------------------------------------------------------
+Thu Oct 24 09:47:45 UTC 2019 - Cliff Zhao <qz...@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....@gmail.com>
+
+- Update to version 3.34.1:
+ + Bugs fixed:
+ - Mark “Accept” button as suggested action
+ - Disable g-i-s in GDM.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue Sep 24 14:32:46 UTC 2019 - Felix Zhang <fezh...@suse.com>
+
+- Fix unpackaged files in specfile.
+
+-------------------------------------------------------------------
+Wed Sep 18 06:47:05 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 3.34.0:
+ + Bugs fixed: Fixes for systemd user instance support.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Sat Aug 31 16:13:35 CDT 2019 - mgo...@suse.com
+
+- Update to version 3.33.92:
+ + Translation updates.
+ + Changes in version 3.33.91:
+ + build: Add a log domain.
+ + Translation updates.
+ + Changes in version 3.33.90:
+ + systemd user instance support. This is inert without
+ corresponding changes in other GNOME modules, and can be
+ disabled entirely with `-Dsystemd=false` at build time.
+ + Other improvements and bug fixes:
+ - summary: don't free borrowed password string.
+ - data: use a11y menu in initial-setup session.
+ - driver: Account for multi monitor when checking for small screen.
+ - language: Refactor the logo selection.
+ - language: Fix the visibility of the placeholder.
+ - summary: Make the page fit narrow screens.
+ - Drop the headers for the first rows.
+ - account: Drop the avatar button padding.
+ - Refactor page headers.
+ - data: Update required gnome-settings-daemon plugins.
+ + Translation updates.
+ + Changes in version 3.33.4:
+ + Bugs fixed:
+ - Check for errors from newlocale().
+ + Translation updates.
+ + Changes in version 3.33.2:
+ + Bugs fixed:
+ - setlocale() usage is not threadsafe.
+ - Include bug report URL in .pot file
+ + Translation updates.
+- Rebase gnome-initial-setup-only-setup-keyboard.patch.
+- Depend on systemd.
+- Remove setup-shell.desktop from files.
+- Add user systemd targets to files.
+
+-------------------------------------------------------------------
+Fri Apr 5 11:54:14 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 3.32.1:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Mon Mar 11 13:19:04 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 3.32.0:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Tue Mar 5 06:03:49 UTC 2019 - Bjørn Lie <bjorn....@gmail.com>
+
+- Update to version 3.31.92:
+ + Connect to GDM as soon as gnome-initial-setup starts and fix
+ memory leaks.
+ + Improve account page behaviour when offline.
+ + Updated translations.
+
+-------------------------------------------------------------------
@@ -7,0 +105,15 @@
+Wed Feb 20 12:12:27 UTC 2019 - bjorn....@gmail.com
+
+- Update to version 3.31.90:
+ + Generate default user account pictures.
+ + Fix Meson build with (buggy) Meson 0.48.0 and 0.48.1.
+ + Remove Autotools build.
+ + Fix various compiler warnings.
+ + Add welcome distro logo for openSUSE.
+ + Updated translations.
+- Switch to meson build system, add meson BuildRequires and macros.
+- Drop obsolete intltool BuildRequires: No longer needed.
+- Add pkgconfig(packagekit-glib2) BuildRequires: New dependency.
+- Refresh patch with refresh_patches service.
+
+-------------------------------------------------------------------
@@ -18,0 +131,30 @@
+Wed Sep 26 16:14:52 UTC 2018 - bjorn....@gmail.com
+
+- Update to version 3.30.0:
+ + Updated translations.
+
+-------------------------------------------------------------------
+Sun Sep 2 18:47:30 UTC 2018 - luc1...@linuxmail.org
+
+- Update to version 3.29.92:
+ + Improved network page.
+ + Fix timezone selection in new-user mode.
+ + Properly use libsecret unstable api.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Fri Aug 3 19:48:49 UTC 2018 - bjorn....@gmail.com
+
+- Update to version 3.29.1:
+ + Support more general page skipping.
+ + Show the welcome page if the language page is skipped.
+ + Look for vendor.conf in /usr/share instead of /var.
+ + Go back to allowing weak passwords.
+ + Set keyring password for enterprise accounts.
+ + Use Debian, Ubuntu logos when appropriate.
+ + Fix a crash.
+ + Add meson support.
+ + Use a new avatar chooser.
+ + Updated translations.
+
+-------------------------------------------------------------------
@@ -33,0 +176,12 @@
+Tue Mar 13 12:05:53 UTC 2018 - dims...@opensuse.org
+
+- Update to version 3.28.0:
+ + Sync string changes with gnome-software.
+ + Updated translations.
+
+-------------------------------------------------------------------
+Wed Feb 28 16:28:24 UTC 2018 - dims...@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------
@@ -36,0 +191,10 @@
+
+-------------------------------------------------------------------
+Sat Feb 10 22:30:46 UTC 2018 - bjorn....@gmail.com
+
+- Update to version 3.27.90:
+ + Adjust session components to recent changes.
+ + Improve sorting in the language list.
+ + Memory leak fixes.
+ + Update titlebar when title changes.
+ + Updated translations.
Old:
----
gnome-initial-setup-3.26.0.tar.xz
gnome-initial-setup-disable-dep-on-started-docs.patch
gnome-initial-setup-mozc-engine-prioritized.patch
gnome-initial-setup-only-launch-CJK.patch
gnome-initial-setup-only-setup-keyboard.patch
New:
----
gnome-initial-setup-3.34.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-initial-setup.spec ++++++
--- /var/tmp/diff_new_pack.N2fGno/_old 2020-02-01 06:10:11.118778303 +0100
+++ /var/tmp/diff_new_pack.N2fGno/_new 2020-02-01 06:10:11.162778325 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gnome-initial-setup
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,30 +12,23 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: gnome-initial-setup
-Version: 3.26.0
+Version: 3.34.1
Release: 0
Summary: GNOME Initial Setup Assistant
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: System/GUI/GNOME
Url: https://wiki.gnome.org/Design/OS/InitialSetup
-Source:
http://download.gnome.org/sources/gnome-initial-setup/3.26/%{name}-%{version}.tar.xz
-# PATCH-FEATURE-SLE gnome-initial-setup-only-launch-CJK.patch FATE#321126
qz...@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
yfji...@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 yfji...@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 qz...@suse.com -- Make the Mozc input engine as the 1st
choice for Japanese environment.
-Patch3: gnome-initial-setup-mozc-engine-prioritized.patch
+Source0:
https://download.gnome.org/sources/gnome-initial-setup/3.34/%{name}-%{version}.tar.xz
# PATCH-FEATURE-SLE gnome-initial-setup-smarter.patch FATE#325763 FATE#321126
boo#1067288 bnc#1029083 qz...@suse.com -- Investigate gnome-initial-setup, and
make a Smarter gnome initial configuration.
-Patch4: gnome-initial-setup-smarter.patch
-BuildRequires: intltool >= 0.40
+Patch0: gnome-initial-setup-smarter.patch
BuildRequires: krb5-devel
+BuildRequires: meson
+BuildRequires: pkgconfig
BuildRequires: vala
BuildRequires: pkgconfig(accountsservice)
BuildRequires: pkgconfig(cheese)
@@ -58,49 +51,41 @@
BuildRequires: pkgconfig(libnm) >= 1.2
BuildRequires: pkgconfig(libnma) >= 1.0
BuildRequires: pkgconfig(libsecret-1)
+BuildRequires: pkgconfig(packagekit-glib2)
BuildRequires: pkgconfig(pango) >= 1.32.5
BuildRequires: pkgconfig(polkit-gobject-1) >= 0.103
BuildRequires: pkgconfig(pwquality)
BuildRequires: pkgconfig(rest-0.7)
+BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(webkit2gtk-4.0)
+Recommends: %{name}-lang
# Remove the yelp document dependency on both sle and leap, keeping tw
consistent with upstream
%if !0%{?sle_version}
Requires: gnome-getting-started-docs
%endif
-Recommends: %{name}-lang
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Initial assistant, helping you to get the system up and running.
%lang_package
+
%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 && 0%{?sle_version} < 150100
+%if !0%{?is_opensuse}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%endif
-%if 0%{?sle_version} < 150100
-%patch3 -p1
-%endif
-
-%if 0%{?sle_version} >= 150100
-%patch4 -p1
-%endif
%build
-%configure
-make %{?_smp_mflags}
+%meson \
+ %{nil}
+%meson_build
%install
-%make_install
-%if 0%{?sle_version} >= 150100
+%meson_install
+%if !0%{?is_opensuse}
rm -rf %{buildroot}%{_libexecdir}/gnome-welcome-tour
rm -rf %{buildroot}%{_sysconfdir}/xdg/autostart/gnome-welcome-tour.desktop
-rm -rf %{buildroot}%{_datadir}/gdm/greeter/applications/setup-shell.desktop
%endif
%find_lang %{name} %{?no_lang_C}
@@ -108,8 +93,8 @@
useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} || :
%files
-%defattr(-,root,root)
-%doc README COPYING
+%license COPYING
+%doc README
%dir %{_datadir}/gdm
%dir %{_datadir}/gdm/greeter
%dir %{_datadir}/gdm/greeter/applications
@@ -125,10 +110,19 @@
%{_libexecdir}/gnome-initial-setup-copy-worker
%{_sysconfdir}/xdg/autostart/gnome-initial-setup-copy-worker.desktop
%{_sysconfdir}/xdg/autostart/gnome-initial-setup-first-login.desktop
-%if 0%{?sle_version} < 150100
+%{_userunitdir}/gnome-initial-setup-copy-worker.service
+%{_userunitdir}/gnome-initial-setup-first-login.service
+%{_userunitdir}/gnome-initial-setup.service
+%{_userunitdir}/gnome-welcome-tour.service
+%dir %{_userunitdir}/gnome-session.target.wants
+%{_userunitdir}/gnome-session.target.wants/gnome-initial-setup-copy-worker.service
+%{_userunitdir}/gnome-session.target.wants/gnome-initial-setup-first-login.service
+%{_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
-%{_datadir}/gdm/greeter/applications/setup-shell.desktop
%endif
%files lang -f %{name}.lang
++++++ gnome-initial-setup-3.26.0.tar.xz -> gnome-initial-setup-3.34.1.tar.xz
++++++
++++ 285696 lines of diff (skipped)
++++++ gnome-initial-setup-smarter.patch ++++++
--- /var/tmp/diff_new_pack.N2fGno/_old 2020-02-01 06:10:13.006779245 +0100
+++ /var/tmp/diff_new_pack.N2fGno/_new 2020-02-01 06:10:13.006779245 +0100
@@ -1,15 +1,15 @@
-diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/gis-driver.c
gnome-initial-setup-3.26.0_new/gnome-initial-setup/gis-driver.c
---- gnome-initial-setup-3.26.0/gnome-initial-setup/gis-driver.c
2017-06-14 21:39:03.000000000 +0800
-+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/gis-driver.c
2019-02-27 18:51:00.329103410 +0800
-@@ -27,6 +27,7 @@
- #include <locale.h>
+diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/gis-driver.c
gnome-initial-setup-3.34.1_new/gnome-initial-setup/gis-driver.c
+--- gnome-initial-setup-3.34.1/gnome-initial-setup/gis-driver.c
2019-10-06 05:03:38.000000000 +0800
++++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/gis-driver.c
2019-11-26 16:05:58.390308663 +0800
+@@ -30,6 +30,7 @@
+ #include "cc-common-language.h"
#include "gis-assistant.h"
+#include "language-setting.h"
#define GIS_TYPE_DRIVER_MODE (gis_driver_mode_get_type ())
-@@ -83,6 +84,32 @@
+@@ -92,6 +93,32 @@
G_DEFINE_TYPE_WITH_PRIVATE(GisDriver, gis_driver, GTK_TYPE_APPLICATION)
@@ -40,9 +40,9 @@
+}
+
static void
- gis_driver_finalize (GObject *object)
+ gis_driver_dispose (GObject *object)
{
-@@ -319,7 +346,16 @@
+@@ -387,7 +414,16 @@
G_APPLICATION_CLASS (gis_driver_parent_class)->activate (app);
@@ -60,7 +60,7 @@
}
static gboolean
-@@ -436,6 +472,7 @@
+@@ -555,6 +591,7 @@
"icon-name", "preferences-system",
"deletable", FALSE,
NULL);
@@ -68,18 +68,18 @@
g_signal_connect (priv->main_window,
"realize",
-diff -Nura
gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c
gnome-initial-setup-3.26.0_new/gnome-initial-setup/gnome-initial-setup.c
---- gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.c
2017-09-05 00:35:30.000000000 +0800
-+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/gnome-initial-setup.c
2019-02-27 16:05:26.596328724 +0800
-@@ -48,6 +48,7 @@
+diff -Nura
gnome-initial-setup-3.34.1/gnome-initial-setup/gnome-initial-setup.c
gnome-initial-setup-3.34.1_new/gnome-initial-setup/gnome-initial-setup.c
+--- gnome-initial-setup-3.34.1/gnome-initial-setup/gnome-initial-setup.c
2019-10-06 05:03:38.000000000 +0800
++++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/gnome-initial-setup.c
2019-11-26 19:19:43.238641813 +0800
+@@ -44,6 +44,7 @@
#include "pages/account/gis-account-pages.h"
#include "pages/password/gis-password-page.h"
#include "pages/summary/gis-summary-page.h"
+#include "language-setting.h"
#define VENDOR_PAGES_GROUP "pages"
- #define VENDOR_PAGES_SKIP_KEY "skip"
-@@ -82,6 +83,16 @@
+ #define VENDOR_SKIP_KEY "skip"
+@@ -84,6 +85,16 @@
#undef PAGE
@@ -94,28 +94,47 @@
+ };
+
static gboolean
- should_skip_page (GisDriver *driver,
- const gchar *page_id,
-@@ -100,42 +111,6 @@
+ should_skip_page (const gchar *page_id,
+ gchar **skip_pages)
+@@ -101,73 +112,6 @@
return FALSE;
}
-static gchar **
--pages_to_skip_from_file (void)
+-strv_append (gchar **a,
+- gchar **b)
+-{
+- guint n = g_strv_length (a);
+- guint m = g_strv_length (b);
+-
+- a = g_renew (gchar *, a, n + m + 1);
+- for (guint i = 0; i < m; i++)
+- a[n + i] = g_strdup (b[i]);
+- a[n + m] = NULL;
+-
+- return a;
+-}
+-
+-static gchar **
+-pages_to_skip_from_file (gboolean is_new_user)
-{
- GKeyFile *skip_pages_file;
- gchar **skip_pages = NULL;
+- gchar **additional_skip_pages = NULL;
- GError *error = NULL;
-
- /* VENDOR_CONF_FILE points to a keyfile containing vendor customization
- * options. This code will look for options under the "pages" group, and
- * supports the following keys:
-- * - skip (optional): list of pages to be skipped.
+- * - skip (optional): list of pages to be skipped always
+- * - new_user_only (optional): list of pages to be skipped in existing
user mode
+- * - existing_user_only (optional): list of pages to be skipped in new
user mode
- *
-- * This is how this file would look on a vendor image:
+- * This is how this file might look on a vendor image:
- *
- * [pages]
-- * skip=language
+- * skip=timezone
+- * existing_user_only=language;keyboard
- */
- skip_pages_file = g_key_file_new ();
- if (!g_key_file_load_from_file (skip_pages_file, VENDOR_CONF_FILE,
@@ -127,8 +146,20 @@
- goto out;
- }
-
-- skip_pages = g_key_file_get_string_list (skip_pages_file,
VENDOR_PAGES_GROUP,
-- VENDOR_PAGES_SKIP_KEY, NULL, NULL);
+- skip_pages = g_key_file_get_string_list (skip_pages_file,
+- VENDOR_PAGES_GROUP,
+- VENDOR_SKIP_KEY, NULL, NULL);
+- additional_skip_pages = g_key_file_get_string_list (skip_pages_file,
+- VENDOR_PAGES_GROUP,
+- is_new_user ?
VENDOR_EXISTING_USER_ONLY_KEY : VENDOR_NEW_USER_ONLY_KEY,
+- NULL, NULL);
+-
+- if (!skip_pages && additional_skip_pages) {
+- skip_pages = additional_skip_pages;
+- } else if (skip_pages && additional_skip_pages) {
+- skip_pages = strv_append (skip_pages, additional_skip_pages);
+- g_strfreev (additional_skip_pages);
+- }
-
- out:
- g_key_file_free (skip_pages_file);
@@ -139,56 +170,41 @@
static void
destroy_pages_after (GisAssistant *assistant,
GisPage *page)
-@@ -161,14 +136,11 @@
- PageData *page_data;
+@@ -194,7 +138,6 @@
+ GisPage *page;
GisAssistant *assistant;
GisPage *current_page;
- gchar **skip_pages;
- gboolean is_new_user;
+ gboolean is_new_user, skipped;
assistant = gis_driver_get_assistant (driver);
- current_page = gis_assistant_get_current_page (assistant);
-
-- skip_pages = pages_to_skip_from_file ();
--
- page_data = page_table;
+@@ -215,13 +158,12 @@
+ }
- if (current_page != NULL) {
-@@ -186,13 +158,11 @@
- if (page_data->new_user_only && !is_new_user)
- continue;
+ is_new_user = (gis_driver_get_mode (driver) == GIS_DRIVER_MODE_NEW_USER);
+- skip_pages = pages_to_skip_from_file (is_new_user);
-- if (should_skip_page (driver, page_data->page_id, skip_pages))
-+ if (should_skip_page (driver, page_data->page_id, SUSE_skip_pages))
- continue;
+ for (; page_data->page_id != NULL; ++page_data) {
+ skipped = FALSE;
- page_data->prepare_page_func (driver);
+ if ((page_data->new_user_only && !is_new_user) ||
+- (should_skip_page (page_data->page_id, skip_pages)))
++ (should_skip_page (page_data->page_id, SUSE_skip_pages)))
+ skipped = TRUE;
+
+ page = page_data->prepare_page_func (driver);
+@@ -233,8 +175,6 @@
+ else
+ gis_driver_add_page (driver, page);
}
-
- g_strfreev (skip_pages);
}
static GisDriverMode
-@@ -208,7 +178,7 @@
- main (int argc, char *argv[])
- {
- GisDriver *driver;
-- int status;
-+ int status = 0;
- GOptionContext *context;
- GisDriverMode mode;
-
-@@ -254,6 +224,7 @@
-
- driver = gis_driver_new (mode);
- g_signal_connect (driver, "rebuild-pages", G_CALLBACK (rebuild_pages_cb),
NULL);
-+
- status = g_application_run (G_APPLICATION (driver), argc, argv);
-
- g_object_unref (driver);
-diff -Nura
gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.h
gnome-initial-setup-3.26.0_new/gnome-initial-setup/gnome-initial-setup.h
---- gnome-initial-setup-3.26.0/gnome-initial-setup/gnome-initial-setup.h
2017-06-14 21:39:03.000000000 +0800
-+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/gnome-initial-setup.h
2019-02-27 18:35:26.507047546 +0800
+diff -Nura
gnome-initial-setup-3.34.1/gnome-initial-setup/gnome-initial-setup.h
gnome-initial-setup-3.34.1_new/gnome-initial-setup/gnome-initial-setup.h
+--- gnome-initial-setup-3.34.1/gnome-initial-setup/gnome-initial-setup.h
2019-10-06 05:03:38.000000000 +0800
++++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/gnome-initial-setup.h
2019-11-25 19:53:10.482353002 +0800
@@ -36,6 +36,7 @@
#include "gis-keyring.h"
@@ -197,9 +213,9 @@
#endif /* __GNOME_INITIAL_SETUP_H__ */
-diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/language-setting.c
gnome-initial-setup-3.26.0_new/gnome-initial-setup/language-setting.c
---- gnome-initial-setup-3.26.0/gnome-initial-setup/language-setting.c
1970-01-01 08:00:00.000000000 +0800
-+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/language-setting.c
2019-02-27 16:05:26.596328724 +0800
+diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/language-setting.c
gnome-initial-setup-3.34.1_new/gnome-initial-setup/language-setting.c
+--- gnome-initial-setup-3.34.1/gnome-initial-setup/language-setting.c
1970-01-01 08:00:00.000000000 +0800
++++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/language-setting.c
2019-11-25 19:53:10.482353002 +0800
@@ -0,0 +1,289 @@
+#include "config.h"
+
@@ -490,9 +506,9 @@
+
+ return ht;
+}
-diff -Nura gnome-initial-setup-3.26.0/gnome-initial-setup/language-setting.h
gnome-initial-setup-3.26.0_new/gnome-initial-setup/language-setting.h
---- gnome-initial-setup-3.26.0/gnome-initial-setup/language-setting.h
1970-01-01 08:00:00.000000000 +0800
-+++ gnome-initial-setup-3.26.0_new/gnome-initial-setup/language-setting.h
2019-02-27 16:05:26.596328724 +0800
+diff -Nura gnome-initial-setup-3.34.1/gnome-initial-setup/language-setting.h
gnome-initial-setup-3.34.1_new/gnome-initial-setup/language-setting.h
+--- gnome-initial-setup-3.34.1/gnome-initial-setup/language-setting.h
1970-01-01 08:00:00.000000000 +0800
++++ gnome-initial-setup-3.34.1_new/gnome-initial-setup/language-setting.h
2019-11-25 19:53:10.482353002 +0800
@@ -0,0 +1,13 @@
+#ifndef __CC_COMMON_LANGUAGE_H__
+#define __CC_COMMON_LANGUAGE_H__
@@ -507,10 +523,10 @@
+G_END_DECLS
+
+#endif
-diff -Nura
gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
----
gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
2016-10-22 15:09:29.000000000 +0800
-+++
gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
2019-02-27 16:05:26.596328724 +0800
-@@ -59,6 +59,7 @@
+diff -Nura
gnome-initial-setup-3.34.1/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
+---
gnome-initial-setup-3.34.1/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
2019-10-06 05:03:38.000000000 +0800
++++
gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
2019-11-25 19:53:10.483353011 +0800
+@@ -58,6 +58,7 @@
gboolean showing_extra;
gchar *locale;
@@ -518,7 +534,7 @@
gchar *id;
gchar *type;
GnomeXkbInfo *xkb_info;
-@@ -272,8 +273,14 @@
+@@ -271,8 +272,14 @@
if (priv->id == NULL || priv->type == NULL)
should_be_visible = FALSE;
@@ -533,7 +549,7 @@
gtk_widget_set_opacity (widget->checkmark, should_be_visible ? 1.0 :
0.0);
if (widget->is_extra && should_be_visible)
-@@ -452,6 +459,14 @@
+@@ -451,6 +458,14 @@
widget = get_input_widget (child);
@@ -548,7 +564,7 @@
if (!priv->showing_extra && widget->is_extra)
return FALSE;
-@@ -468,6 +483,9 @@
+@@ -467,6 +482,9 @@
GtkListBoxRow *b,
gpointer data)
{
@@ -558,7 +574,7 @@
InputWidget *la, *lb;
la = get_input_widget (gtk_bin_get_child (GTK_BIN (a)));
-@@ -479,6 +497,18 @@
+@@ -478,6 +496,18 @@
if (lb == NULL)
return -1;
@@ -577,7 +593,7 @@
if (la->is_extra && !lb->is_extra)
return 1;
-@@ -751,9 +781,13 @@
+@@ -752,9 +782,13 @@
gtk_list_box_set_selection_mode (GTK_LIST_BOX (priv->input_list),
GTK_SELECTION_NONE);
@@ -593,18 +609,18 @@
get_locale_infos (chooser);
#ifdef HAVE_IBUS
-diff -Nura
gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
----
gnome-initial-setup-3.26.0/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
2017-06-14 21:39:03.000000000 +0800
-+++
gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
2019-02-27 16:05:26.596328724 +0800
-@@ -33,6 +33,7 @@
+diff -Nura
gnome-initial-setup-3.34.1/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
+---
gnome-initial-setup-3.34.1/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
2019-10-06 05:03:38.000000000 +0800
++++
gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/keyboard/gis-keyboard-page.c
2019-11-25 19:53:10.483353011 +0800
+@@ -36,6 +36,7 @@
#include "gis-keyboard-page.h"
#include "keyboard-resources.h"
#include "cc-input-chooser.h"
+#include "cc-common-language.h"
- #define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources"
- #define KEY_CURRENT_INPUT_SOURCE "current"
-@@ -45,6 +46,7 @@
+ #include "cc-common-language.h"
+
+@@ -52,6 +53,7 @@
GCancellable *cancellable;
GPermission *permission;
GSettings *input_settings;
@@ -612,7 +628,7 @@
GSList *system_sources;
};
-@@ -318,6 +320,29 @@
+@@ -437,6 +439,29 @@
update_page_complete (self);
}
@@ -642,7 +658,7 @@
static void
gis_keyboard_page_constructed (GObject *object)
{
-@@ -337,6 +362,7 @@
+@@ -456,6 +481,7 @@
g_settings_delay (priv->input_settings);
priv->cancellable = g_cancellable_new ();
@@ -650,7 +666,7 @@
g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_GET_INVALIDATED_PROPERTIES,
-@@ -354,7 +380,10 @@
+@@ -473,7 +499,10 @@
update_page_complete (self);
@@ -662,9 +678,9 @@
}
static void
-diff -Nura
gnome-initial-setup-3.26.0/gnome-initial-setup/pages/language/gis-language-page.c
gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/language/gis-language-page.c
----
gnome-initial-setup-3.26.0/gnome-initial-setup/pages/language/gis-language-page.c
2017-06-14 21:39:03.000000000 +0800
-+++
gnome-initial-setup-3.26.0_new/gnome-initial-setup/pages/language/gis-language-page.c
2019-02-27 18:41:40.070361981 +0800
+diff -Nura
gnome-initial-setup-3.34.1/gnome-initial-setup/pages/language/gis-language-page.c
gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/language/gis-language-page.c
+---
gnome-initial-setup-3.34.1/gnome-initial-setup/pages/language/gis-language-page.c
2019-10-06 05:03:38.000000000 +0800
++++
gnome-initial-setup-3.34.1_new/gnome-initial-setup/pages/language/gis-language-page.c
2019-11-27 11:11:18.491358283 +0800
@@ -28,17 +28,33 @@
#define GNOME_SYSTEM_LOCALE_DIR "org.gnome.system.locale"
@@ -707,7 +723,7 @@
GCancellable *cancellable;
};
-@@ -103,62 +120,16 @@
+@@ -103,11 +120,17 @@
GParamSpec *pspec,
gpointer user_data)
{
@@ -718,64 +734,16 @@
act_user_set_language (ACT_USER (object), new_locale_id);
-
g_free (new_locale_id);
--}
-
--static void
--language_changed (CcLanguageChooser *chooser,
-- GParamSpec *pspec,
-- GisLanguagePage *page)
--{
-- GisLanguagePagePrivate *priv = gis_language_page_get_instance_private
(page);
-- GisDriver *driver;
-- GSettings *region_settings;
-- ActUser *user;
--
-- priv->new_locale_id = cc_language_chooser_get_language (chooser);
-- driver = GIS_PAGE (page)->driver;
--
-- setlocale (LC_MESSAGES, priv->new_locale_id);
-- gtk_widget_set_default_direction (gtk_get_locale_direction ());
--
-- if (gis_driver_get_mode (driver) == GIS_DRIVER_MODE_NEW_USER) {
-- if (g_permission_get_allowed (priv->permission)) {
-- set_localed_locale (page);
-- }
-- else if (g_permission_get_can_acquire (priv->permission)) {
-- g_permission_acquire_async (priv->permission,
-- NULL,
-- change_locale_permission_acquired,
-- page);
-- }
-+ if (!gis_cjk_region) {
++
++ if (!gis_cjk_region)
++ {
+ gis_ensure_stamp_files ();
+ g_application_quit (G_APPLICATION (GIS_PAGE (user_data)->driver));
- }
--
-- /* Ensure we won't override the selected language for format strings */
-- region_settings = g_settings_new (GNOME_SYSTEM_LOCALE_DIR);
-- g_settings_reset (region_settings, REGION_KEY);
-- g_object_unref (region_settings);
--
-- user = act_user_manager_get_user (act_user_manager_get_default (),
-- g_get_user_name ());
-- if (act_user_is_loaded (user))
-- act_user_set_language (user, priv->new_locale_id);
-- else
-- g_signal_connect (user,
-- "notify::is-loaded",
-- G_CALLBACK (user_loaded),
-- g_strdup (priv->new_locale_id));
--
-- gis_driver_set_user_language (driver, priv->new_locale_id);
--
-- gis_welcome_widget_show_locale (GIS_WELCOME_WIDGET (priv->welcome_widget),
-- priv->new_locale_id);
--
-- gis_driver_locale_changed (driver);
++ }
}
static void
-@@ -183,67 +154,162 @@
+@@ -179,85 +202,161 @@
priv->localed = proxy;
}
@@ -862,6 +830,20 @@
- GisLanguagePagePrivate *priv = gis_language_page_get_instance_private
(page);
- char *buffer;
- char *id;
+- gsize i;
+-
+- static const struct {
+- const char *id;
+- const char *logo;
+- } id_to_logo[] = {
+- { "debian", "emblem-debian" },
+- { "fedora", "fedora-logo-icon" },
+- { "ubuntu", "ubuntu-logo-icon" },
+- { "openSUSE Tumbleweed", "opensuse-logo-icon" },
+- { "openSUSE Leap", "opensuse-logo-icon" },
+- { "SLED", "suse-logo-icon" },
+- { "SLES", "suse-logo-icon" },
+- };
+ g_autoptr (GDBusConnection) bus = NULL;
+ g_autoptr (GError) error = NULL;
+ GDBusProxy *proxy;
@@ -902,7 +884,7 @@
}
+}
-- if (g_strcmp0 (id, "fedora") == 0)
+- for (i = 0; i < G_N_ELEMENTS (id_to_logo); i++)
+static gboolean
+get_system_language (GisPage *page)
+{
@@ -926,7 +908,11 @@
+ get_language_from_config_file (self);
+ if (self->language != NULL)
{
-- g_object_set (priv->logo, "icon-name", "fedora-logo-icon", NULL);
+- if (g_strcmp0 (id, id_to_logo[i].id) == 0)
+- {
+- g_object_set (priv->logo, "icon-name", id_to_logo[i].logo, NULL);
+- break;
+- }
+ language_acquire = TRUE;
+ priv-> system_language = g_strdup(self->language);
+ priv->new_locale_id = g_strdup(self->language);
@@ -972,24 +958,21 @@
+ "notify::is-loaded",
+ G_CALLBACK (user_loaded),
+ page);
-+
-+ gis_driver_set_user_language (driver, priv->new_locale_id);
++ gis_driver_set_user_language (driver, priv->new_locale_id, FALSE);
}
static void
-@@ -257,10 +323,6 @@
+@@ -271,8 +370,6 @@
G_OBJECT_CLASS (gis_language_page_parent_class)->constructed (object);
- update_distro_logo (page);
-
-- g_signal_connect (priv->language_chooser, "notify::language",
-- G_CALLBACK (language_changed), page);
+ g_signal_connect (priv->language_chooser, "notify::language",
+ G_CALLBACK (language_changed), page);
g_signal_connect (priv->language_chooser, "confirm",
- G_CALLBACK (language_confirmed), page);
-
-@@ -283,6 +345,12 @@
- }
+@@ -297,6 +394,12 @@
+ }
gis_page_set_complete (GIS_PAGE (page), TRUE);
+
