!15 Upgrade to 3.38.6

From: @weijin-deng
Reviewed-by: @dwl301
Signed-off-by: @dwl301

0001-online-accounts-Track-the-lifecycle-of-CcGoaPanel-ac.patch

@@ -37,51 +37,40 @@ This second part is a small improvement over the earlier hack.
 
 https://gitlab.gnome.org/GNOME/gnome-control-center/issues/208
 ---
- panels/online-accounts/cc-online-accounts-panel.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c
-index a89d249c0..747381bef 100644
+index e6d6a3d..2afddeb 100644
 --- a/panels/online-accounts/cc-online-accounts-panel.c
 +++ b/panels/online-accounts/cc-online-accounts-panel.c
-@@ -56,6 +56,7 @@ struct _CcGoaPanel
+@@ -57,6 +57,7 @@ struct _CcGoaPanel
-   GtkWidget *stack;
+   GoaObject *active_object;
-   GtkWidget *accounts_vbox;
+   GoaObject *removed_object;
  
 +  gboolean   destroyed;
    guint      remove_account_timeout_id;
  };
  
-@@ -394,6 +395,8 @@ cc_goa_panel_dispose (GObject *object)
+@@ -399,6 +400,8 @@ cc_goa_panel_dispose (GObject *object)
    /* Must be destroyed in dispose, not finalize. */
-   g_clear_pointer (&panel->edit_account_dialog, gtk_widget_destroy);
+   g_clear_pointer ((GtkWidget **) &panel->edit_account_dialog, gtk_widget_destroy);
  
 +  panel->destroyed = TRUE;
 +
    G_OBJECT_CLASS (cc_goa_panel_parent_class)->dispose (object);
  }
  
-@@ -489,7 +492,7 @@ cc_goa_panel_init (CcGoaPanel *panel)
+@@ -493,6 +496,8 @@ cc_goa_panel_init (CcGoaPanel *panel)
-                     panel);
  
    fill_accounts_listbox (panel);
--  goa_provider_get_all (get_all_providers_cb, panel);
-+  goa_provider_get_all (get_all_providers_cb, g_object_ref_sink (panel));
  
++  goa_provider_get_all (get_all_providers_cb, g_object_ref_sink (panel));
++
    gtk_widget_show (GTK_WIDGET (panel));
  }
-@@ -852,7 +855,7 @@ get_all_providers_cb (GObject      *source,
-                       GAsyncResult *res,
-                       gpointer      user_data)
- {
--  CcGoaPanel *self = user_data;
-+  g_autoptr (CcGoaPanel) self = user_data;
-   GList *providers;
-   GList *l;
  
-@@ -860,6 +863,9 @@ get_all_providers_cb (GObject      *source,
+@@ -875,6 +880,9 @@ get_all_providers_cb (GObject      *source,
-   if (!goa_provider_get_all_finish (&providers, res, NULL))
+       return;
-     return;
+     }
  
 +  if (self->destroyed)
 +    return;
@@ -89,6 +78,3 @@ index a89d249c0..747381bef 100644
    for (l = providers; l != NULL; l = l->next)
      {
        GoaProvider *provider;
--- 
-2.19.0
-

0002-background-Add-queue-to-load-4-pictures-at-a-time.patch

@@ -9,16 +9,13 @@ from which 4 tasks at will be processed at the same time.
 
 Fixes #191
 ---
- panels/background/bg-pictures-source.c | 128 ++++++++++++++++++++++++-
- 1 file changed, 123 insertions(+), 5 deletions(-)
-
 diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
-index a37682d63..2e43ae84a 100644
+index 3a3027b..3b955bb 100644
 --- a/panels/background/bg-pictures-source.c
 +++ b/panels/background/bg-pictures-source.c
-@@ -47,12 +47,26 @@ struct _BgPicturesSource
+@@ -45,12 +45,26 @@ struct _BgPicturesSource
  
-   GnomeDesktopThumbnailFactory *thumb_factory;
+   CcBackgroundGriloMiner *grl_miner;
  
 +  GQueue add_queue;
 +  gint adds_running;
@@ -43,7 +40,7 @@ index a37682d63..2e43ae84a 100644
  G_DEFINE_TYPE (BgPicturesSource, bg_pictures_source, BG_TYPE_SOURCE)
  
  const char * const content_types[] = {
-@@ -74,6 +88,86 @@ static char *bg_pictures_source_get_unique_filename (const char *uri);
+@@ -72,6 +86,86 @@ static char *bg_pictures_source_get_unique_filename (const char *uri);
  
  static void picture_opened_for_read (GObject *source_object, GAsyncResult *res, gpointer user_data);
  
@@ -130,7 +127,7 @@ index a37682d63..2e43ae84a 100644
  static void
  bg_pictures_source_dispose (GObject *object)
  {
-@@ -85,6 +179,9 @@ bg_pictures_source_dispose (GObject *object)
+@@ -83,6 +177,9 @@ bg_pictures_source_dispose (GObject *object)
        g_clear_object (&source->cancellable);
      }
  
@@ -138,37 +135,40 @@ index a37682d63..2e43ae84a 100644
 +  g_queue_clear (&source->add_queue);
 +
    g_clear_object (&source->grl_miner);
-   g_clear_object (&source->thumb_factory);
  
-@@ -190,6 +287,9 @@ picture_scaled (GObject *source_object,
+   G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
+@@ -206,6 +303,10 @@ picture_scaled (GObject *source_object,
          {
            g_warning ("Failed to load image: %s", error->message);
            remove_placeholder (BG_PICTURES_SOURCE (user_data), item);
 +
 +          bg_source = BG_PICTURES_SOURCE (user_data);
 +          add_processing_finished (bg_source);
++
          }
  
        return;
-@@ -211,6 +311,8 @@ picture_scaled (GObject *source_object,
+@@ -227,7 +328,9 @@ picture_scaled (GObject *source_object,
      {
        g_debug ("Ignored URL '%s' as it's a screenshot from gnome-screenshot", uri);
        remove_placeholder (BG_PICTURES_SOURCE (user_data), item);
+-      return;
 +
-+      add_processing_finished (bg_source);
++     add_processing_finished (bg_source);
-       return;
++     return;
      }
  
-@@ -264,6 +366,8 @@ picture_scaled (GObject *source_object,
+   /* Process embedded orientation */
+@@ -262,6 +365,8 @@ picture_scaled (GObject *source_object,
                         GINT_TO_POINTER (TRUE));
  
-   g_clear_pointer (&surface, (GDestroyNotify) cairo_surface_destroy);
+   g_clear_pointer (&surface, cairo_surface_destroy);
 +
 +  add_processing_finished (bg_source);
  }
  
  static void
-@@ -288,6 +392,9 @@ picture_opened_for_read (GObject *source_object,
+@@ -286,6 +391,9 @@ picture_opened_for_read (GObject *source_object,
            g_autofree gchar *filename = g_file_get_path (G_FILE (source_object));
            g_warning ("Failed to load picture '%s': %s", filename, error->message);
            remove_placeholder (BG_PICTURES_SOURCE (user_data), item);
@@ -178,7 +178,7 @@ index a37682d63..2e43ae84a 100644
          }
  
        return;
-@@ -341,6 +448,10 @@ picture_copied_for_read (GObject *source_object,
+@@ -339,6 +447,10 @@ picture_copied_for_read (GObject *source_object,
  
            uri = g_file_get_uri (thumbnail_file);
            g_warning ("Failed to download '%s': %s", uri, error->message);
@@ -189,15 +189,14 @@ index a37682d63..2e43ae84a 100644
            return;
          }
      }
-@@ -441,11 +552,11 @@ bg_pictures_source_get_cache_file (void)
+@@ -378,10 +490,11 @@ bg_pictures_source_get_cache_file (void)
  }
  
  static gboolean
 -add_single_file (BgPicturesSource     *bg_source,
 -                 GFile                *file,
 -                 const gchar          *content_type,
--                 guint64               mtime,
+-                 guint64               mtime)
--                 GtkTreeRowReference **ret_row_ref)
 +add_single_file_real (BgPicturesSource     *bg_source,
 +                      GFile                *file,
 +                      const gchar          *content_type,
@@ -206,10 +205,10 @@ index a37682d63..2e43ae84a 100644
  {
    g_autoptr(CcBackgroundItem) item = NULL;
    CcBackgroundItemFlags flags = 0;
-@@ -573,6 +684,11 @@ add_single_file (BgPicturesSource     *bg_source,
+@@ -480,6 +593,11 @@ add_single_file (BgPicturesSource     *bg_source,
-     }
+   retval = TRUE;
-   gtk_tree_path_free (path);
+ 
-   g_clear_pointer (&surface, (GDestroyNotify) cairo_surface_destroy);
+  out:
 +
 +  /* Async processing is happening. */
 +  if (!retval)
@@ -218,7 +217,25 @@ index a37682d63..2e43ae84a 100644
    return retval;
  }
  
-@@ -955,6 +1071,8 @@ bg_pictures_source_init (BgPicturesSource *self)
+@@ -493,7 +611,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
+ 
+   content_type = g_file_info_get_content_type (info);
+   mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+-  return add_single_file (bg_source, file, content_type, mtime);
++  return add_single_file (bg_source, file, content_type, mtime, NULL);
+ }
+ 
+ static gboolean
+@@ -518,7 +636,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
+   else
+     mtime_unix = g_get_real_time () / G_USEC_PER_SEC;
+ 
+-  return add_single_file (bg_source, file, content_type, (guint64) mtime_unix);
++  return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
+ }
+ 
+ gboolean
+@@ -828,6 +946,8 @@ bg_pictures_source_init (BgPicturesSource *self)
  					     (GDestroyNotify) g_free,
  					     NULL);
  
@@ -227,6 +244,3 @@ index a37682d63..2e43ae84a 100644
    pictures_path = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
    if (pictures_path == NULL)
      pictures_path = g_get_home_dir ();
--- 
-2.19.0
-

Adapt-to-new-gnome-desktop-API-changes.patch

@@ -1,24 +0,0 @@
-From 9dcb5cde73917832fa11cab69e7b51b092f281f2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
-Date: Wed, 15 Jan 2020 20:25:56 +0900
-Subject: [PATCH] Adapt to new gnome-desktop API changes
- 
----
- panels/background/cc-background-item.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
- 
-diff --git a/panels/background/cc-background-item.c b/panels/background/cc-background-item.c
-index dc8850b66..50851e17d 100644
---- a/panels/background/cc-background-item.c
-+++ b/panels/background/cc-background-item.c
-@@ -156,7 +156,7 @@ render_at_size (GnomeBG *bg,
-         GdkPixbuf *pixbuf;
- 
-         pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
--        gnome_bg_draw (bg, pixbuf, gdk_screen_get_default (), FALSE);
-+        gnome_bg_draw (bg, pixbuf);
- 
-         return pixbuf;
- }
--- 
-2.24.1

Fix-crashes-when-retrieving-disk-size.patch

@@ -1,69 +0,0 @@
----
- panels/info/cc-info-overview-panel.c | 33 +++++++++++++++++++++++-----
- 1 file changed, 28 insertions(+), 5 deletions(-)
-
-diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c
-index 7758271b1..fa9510b06 100644
---- a/panels/info/cc-info-overview-panel.c
-+++ b/panels/info/cc-info-overview-panel.c
-@@ -546,10 +546,30 @@ get_primary_disc_info_start (CcInfoOverviewPanel *self)
-                                       self);
- }
- 
-+static GList *
-+convert_points_to_entries (GList *points)
-+{
-+  GList *entries = NULL;
-+  GList *p;
-+
-+  for (p = points; p != NULL; p = p->next)
-+    {
-+      GUnixMountPoint *point = p->data;
-+      GUnixMountEntry *mount;
-+      const gchar *mount_path = g_unix_mount_point_get_mount_path (point);
-+
-+      mount = g_unix_mount_at (mount_path, NULL);
-+      if (mount)
-+        entries = g_list_append (entries, mount);
-+    }
-+
-+  return entries;
-+}
-+
- static void
- get_primary_disc_info (CcInfoOverviewPanel *self)
- {
--  GList *points;
-+  GList *points, *entries = NULL;
-   GList *p;
-   GHashTable *hash;
-   CcInfoOverviewPanelPrivate *priv = cc_info_overview_panel_get_instance_private (self);
-@@ -557,11 +577,14 @@ get_primary_disc_info (CcInfoOverviewPanel *self)
-   hash = g_hash_table_new (g_str_hash, g_str_equal);
-   points = g_unix_mount_points_get (NULL);
- 
-+  entries = convert_points_to_entries (points);
-+  g_list_free_full (points, (GDestroyNotify) g_unix_mount_point_free);
-+
-   /* If we do not have /etc/fstab around, try /etc/mtab */
--  if (points == NULL)
--    points = g_unix_mounts_get (NULL);
-+  if (entries == NULL)
-+    entries = g_unix_mounts_get (NULL);
- 
--  for (p = points; p != NULL; p = p->next)
-+  for (p = entries; p != NULL; p = p->next)
-     {
-       GUnixMountEntry *mount = p->data;
-       const char *mount_path;
-@@ -586,7 +609,7 @@ get_primary_disc_info (CcInfoOverviewPanel *self)
-       priv->primary_mounts = g_list_prepend (priv->primary_mounts, mount);
-       g_hash_table_insert (hash, (gpointer) device_path, (gpointer) device_path);
-     }
--  g_list_free (points);
-+  g_list_free (entries);
-   g_hash_table_destroy (hash);
- 
-   priv->cancellable = g_cancellable_new ();
--- 
-2.24.1

bugfix-duplicate-Current-passwd.patch

@@ -1,12 +0,0 @@
-diff -urpN gnome-control-center-3.30.1.orig/panels/user-accounts/run-passwd.c gnome-control-center-3.30.1/panels/user-accounts/run-passwd.c
---- gnome-control-center-3.30.1.orig/panels/user-accounts/run-passwd.c	2019-12-28 23:02:47.839960163 +0800
-+++ gnome-control-center-3.30.1/panels/user-accounts/run-passwd.c	2019-12-28 23:03:41.180636928 +0800
-@@ -404,7 +404,7 @@ io_watch_stdout (GIOChannel *source, GIO
- 
-                         if (is_string_complete (str->str, "assword: ", "failure", "wrong", "error", NULL)) {
- 
--                                if (strstr (str->str, "assword: ") != NULL) {
-+                                if (strstr (str->str, "assword: ") != NULL && strstr (str->str, "Current") == NULL) {
-                                         /* Authentication successful */
- 
-                                         passwd_handler->backend_state = PASSWD_STATE_NEW;

bugfix-fix_used_passwd_error_capture.patch

@@ -1,16 +1,17 @@
-diff -Nur gnome-control-center-3.26.2.old/panels/user-accounts/run-passwd.c gnome-control-center-3.26.2/panels/user-accounts/run-passwd.c
+diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
---- gnome-control-center-3.26.2.old/panels/user-accounts/run-passwd.c	2018-10-27 19:31:31.154224814 +0000
+index 56eea9f..1abefcd 100644
-+++ gnome-control-center-3.26.2/panels/user-accounts/run-passwd.c	2018-10-27 19:34:58.394200706 +0000
+--- a/panels/user-accounts/run-passwd.c
-@@ -469,7 +469,7 @@
++++ b/panels/user-accounts/run-passwd.c
+@@ -471,7 +471,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
                                                  "different",
                                                  "wrapped",
                                                  "recovered",
 -                                                "recent",
-+                                                "already used",
++						"already used",
                                                  "unchanged",
                                                  "match",
                                                  "1 numeric or special",
-@@ -512,9 +512,9 @@
+@@ -514,9 +514,9 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswdHandler *pass
                                                     strstr (str->str, "wrapped") != NULL) {
                                                  error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
                                                                       _("The old and new passwords are too similar"));
@@ -22,31 +23,18 @@ diff -Nur gnome-control-center-3.26.2.old/panels/user-accounts/run-passwd.c gnom
                                          } else if (strstr (str->str, "1 numeric or special") != NULL) {
                                                  error = g_error_new (PASSWD_ERROR, PASSWD_ERROR_REJECTED,
                                                                       _("The new password must contain numeric or special characters"));
-diff -Nur gnome-control-center-3.26.2.old/panels/user-accounts/um-password-dialog.c gnome-control-center-3.26.2/panels/user-accounts/um-password-dialog.c
+diff --git a/po/zh_CN.po b/po/zh_CN.po
---- gnome-control-center-3.26.2.old/panels/user-accounts/um-password-dialog.c	2018-10-27 19:31:31.154224814 +0000
+index ba8a7a8..03540dd 100644
-+++ gnome-control-center-3.26.2/panels/user-accounts/um-password-dialog.c	2018-10-27 19:36:35.291189435 +0000
+--- a/po/zh_CN.po
-@@ -143,8 +143,9 @@
++++ b/po/zh_CN.po
-                 primary_text = error->message;
+@@ -7642,8 +7642,8 @@ msgstr "新密码和旧密码太相似"
-                 secondary_text = _("Please choose another password.");
  
-+                gtk_entry_set_text (GTK_ENTRY (um->old_password_entry), "");
+ #: panels/user-accounts/run-passwd.c:519
-+                gtk_widget_grab_focus (um->old_password_entry);
-                 gtk_entry_set_text (GTK_ENTRY (um->password_entry), "");
--                gtk_widget_grab_focus (um->password_entry);
- 
-                 gtk_entry_set_text (GTK_ENTRY (um->verify_entry), "");
-         }
-diff -Nur gnome-control-center-3.26.2.old/po/zh_CN.po gnome-control-center-3.26.2/po/zh_CN.po
---- gnome-control-center-3.26.2.old/po/zh_CN.po	2018-10-27 19:31:31.070224824 +0000
-+++ gnome-control-center-3.26.2/po/zh_CN.po	2018-10-27 19:38:13.743177982 +0000
-@@ -6401,8 +6401,8 @@
- 
- #: ../panels/user-accounts/run-passwd.c:517
  #, c-format
 -msgid "The new password has already been used recently."
 -msgstr "新的密码最近已使用过。"
 +msgid "Password has been already used. Choose another."
 +msgstr "新密码在最近已经使用过。请选用其他密码"
  
- #: ../panels/user-accounts/run-passwd.c:520
+ #: panels/user-accounts/run-passwd.c:522
  #, c-format

bugfix-gnome-control-center-clickassist-fix.patch

@@ -1,28 +0,0 @@
-diff -Nur gnome-control-center-3.14.5_orig/panels/universal-access/uap.ui gnome-control-center-3.14.5/panels/universal-access/uap.ui
---- gnome-control-center-3.14.5_orig/panels/universal-access/uap.ui	2017-05-23 21:59:10.676257462 +0800
-+++ gnome-control-center-3.14.5/panels/universal-access/uap.ui	2017-05-23 22:31:42.502077833 +0800
-@@ -1868,6 +1868,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="adjustment">click_delay_adjustment</property>
-+                                <property name="width_request">200</property>
-                                 <property name="draw_value">False</property>
-                                 <child internal-child="accessible">
-                                   <object class="AtkObject" id="pointing_secondary_click_delay_scale-atkobject">
-@@ -2033,6 +2034,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="adjustment">dwell_time_adjustment</property>
-+                                <property name="width_request">200</property>
-                                 <property name="draw_value">False</property>
-                                 <property name="value_pos">right</property>
-                               </object>
-@@ -2122,6 +2124,7 @@
-                                 <property name="visible">True</property>
-                                 <property name="can_focus">True</property>
-                                 <property name="adjustment">dwell_threshold_adjustment</property>
-+                                <property name="width_request">200</property>
-                                 <property name="digits">0</property>
-                                 <property name="draw_value">False</property>
-                               </object>
-

bugfix-gnome-control-center-fix-repetitivewallpapers.patch

@@ -1,8 +1,9 @@
-diff -Nur gnome-control-center-3.30.1.bak/panels/background/bg-wallpapers-source.c gnome-control-center-3.30.1/panels/background/bg-wallpapers-source.c
+diff --git a/panels/background/bg-wallpapers-source.c b/panels/background/bg-wallpapers-source.c
---- gnome-control-center-3.30.1.bak/panels/background/bg-wallpapers-source.c	2019-01-23 07:15:34.793000000 -0500
+index 7d3b644..c79fd97 100644
-+++ gnome-control-center-3.30.1/panels/background/bg-wallpapers-source.c	2019-01-23 07:16:16.286000000 -0500
+--- a/panels/background/bg-wallpapers-source.c
-@@ -126,7 +126,7 @@
++++ b/panels/background/bg-wallpapers-source.c
- 		    G_CALLBACK (item_added), self);
+@@ -100,7 +100,7 @@ bg_wallpapers_source_constructed (GObject *object)
+                            G_CALLBACK (item_added), self, G_CONNECT_SWAPPED);
  
    /* Try adding the default background first */
 -  load_default_bg (self);

gnome-control-center-change-translation-when-changing-password.patch

@@ -1,25 +1,28 @@
---- a/panels/user-accounts/pw-utils.c	2015-03-17 07:25:21.000000000 -0400
+diff --git a/panels/user-accounts/pw-utils.c b/panels/user-accounts/pw-utils.c
-+++ b/panels/user-accounts/pw-utils.c	2018-03-15 06:09:58.370000000 -0400
+index 0f4dfd8..617e0d7 100644
-@@ -114,7 +114,7 @@
+--- a/panels/user-accounts/pw-utils.c
++++ b/panels/user-accounts/pw-utils.c
+@@ -127,7 +127,7 @@ pw_error_hint (gint error)
          case PWQ_ERROR_MIN_LENGTH:
                  return C_("Password hint", "Password needs to be longer. Try to add more letters, numbers and punctuation.");
          case PWQ_ERROR_EMPTY_PASSWORD:
 -                return C_("Password hint", "Mix uppercase and lowercase and try to use a number or two.");
-+                return C_("Password hint", "Mix at least three types of these: lower and upper case letters, digits and any of characters.");
++		return C_("Password hint", "Mix at least three types of these: lower and upper case letters, digits and any of characters.");
          default:
                  return C_("Password hint", "Adding more letters, numbers and punctuation will make the password stronger.");
          }
---- a/po/zh_CN.po	2018-03-15 06:03:27.989000000 -0400
+diff --git a/po/zh_CN.po b/po/zh_CN.po
-+++ a/po/zh_CN.po	2018-03-15 06:17:13.478000000 -0400
+index 03540dd..34e1624 100644
-@@ -6200,8 +6200,8 @@
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -7612,8 +7612,8 @@ msgstr "需要更长的密码。请试着加入更多的字母、数字和标点
  
- #: ../panels/user-accounts/pw-utils.c:117
+ #: panels/user-accounts/pw-utils.c:130
  msgctxt "Password hint"
 -msgid "Mix uppercase and lowercase and try to use a number or two."
 -msgstr "密码需要大小写字母混用并试着使用一到两个数字。"
 +msgid "Mix at least three types of these: lower and upper case letters, digits and any of characters."
 +msgstr "混合至少三种类型：大写字母，小写字母，数字和特殊字符。"
  
- #: ../panels/user-accounts/pw-utils.c:119
+ #: panels/user-accounts/pw-utils.c:132
  msgctxt "Password hint"
-

gnome-control-center-remove-country-in-the-name-of-timezone.patch

@@ -4,10 +4,6 @@ Subject: [PATCH] control-center: remove country in the name of timezone
 
 Change-Id: I794c649d35e498bdd4273062b982c04ebe953e6c
 ---
- gnome-control-center-3.30.1/panels/datetime/backward |  3 +--
- .../panels/datetime/cc-datetime-panel.c              | 12 ++++--------
- .../panels/datetime/po-timezones/zh_CN.po            |  4 ----
- 3 files changed, 5 insertions(+), 14 deletions(-)
 
 diff --git a/panels/datetime/backward b/panels/datetime/backward
 index 8594be6..3fe71fc 100644
@@ -29,10 +25,10 @@ index 8594be6..3fe71fc 100644
 \ No newline at end of file
 +Link	Etc/UTC			Zulu
 diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
-index 880490a..23bb7d1 100644
+index eb7e78b..3a58d93 100644
 --- a/panels/datetime/cc-datetime-panel.c
 +++ b/panels/datetime/cc-datetime-panel.c
-@@ -478,7 +478,6 @@ translated_city_name (TzLocation *loc)
+@@ -414,7 +414,6 @@ translated_city_name (TzLocation *loc)
  {
    g_autofree gchar *zone_translated = NULL;
    g_auto(GStrv) split_translated = NULL;
@@ -40,24 +36,22 @@ index 880490a..23bb7d1 100644
    gchar *name;
    gint length;
  
-@@ -490,13 +489,10 @@ translated_city_name (TzLocation *loc)
+@@ -427,11 +426,10 @@ translated_city_name (TzLocation *loc)
-                                            0, 0);
  
    length = g_strv_length (split_translated);
--
+ 
 -  country = gnome_get_country_from_code (loc->country, NULL);
 -  /* Translators: "city, country" */
 -  name = g_strdup_printf (C_("timezone loc", "%s, %s"),
 -                          split_translated[length-1],
 -                          country);
--
 +  /* Translators: "city" */
 +  name = g_strdup_printf (C_("timezone loc", "%s"),
 +                          split_translated[length-1]);
-+  
++
+ 
    return name;
  }
- 
 diff --git a/panels/datetime/po-timezones/zh_CN.po b/panels/datetime/po-timezones/zh_CN.po
 index 38b053f..6bd84e9 100644
 --- a/panels/datetime/po-timezones/zh_CN.po
@@ -73,5 +67,3 @@ index 38b053f..6bd84e9 100644
  #: timezones.h:531
  msgid "Asia/Magadan"
  msgstr "亚洲/马加丹"
--- 
-2.19.1

gnome-control-center.spec

@@ -1,12 +1,12 @@
 Name:           gnome-control-center
-Version:        3.30.1
+Version:        3.38.6
-Release:        13
+Release:        1
 Summary:        GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop.
 License:        GPLv2+ and CC-BY-SA
 URL:            http://www.gnome.org
-Source0:        https://download.gnome.org/sources/gnome-control-center/3.30/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gnome-control-center/3.38/%{name}-%{version}.tar.xz
 
-BuildRequires:  chrpath cups-devel desktop-file-utils docbook-style-xsl gettext
+BuildRequires:  chrpath cups-devel desktop-file-utils docbook-style-xsl gettext gcc git libudisks2-devel
 BuildRequires:  libxslt meson accountsservice-devel cheese-libs-devel clutter-gtk-devel colord-devel
 BuildRequires:  colord-gtk-devel gdk-pixbuf2-devel gtk3-devel glib2-devel pulseaudio-libs-devel
 BuildRequires:  gnome-desktop3-devel gnome-settings-daemon-devel gnome-online-accounts-devel
@@ -14,7 +14,8 @@ BuildRequires:  grilo-devel gsettings-desktop-schemas-devel gtk3-devel libgudev-
 BuildRequires:  libcanberra-devel libgtop2-devel NetworkManager-libnm-devel libnma-devel
 BuildRequires:  libsecret-devel libsoup-devel libxml2-devel ModemManager-glib-devel polkit-devel
 BuildRequires:  libpwquality-devel libsmbclient-devel upower-devel libX11-devel libXi-devel
-BuildRequires:  gnome-bluetooth-libs-devel libwacom-devel gdb
+BuildRequires:  gnome-bluetooth-libs-devel libwacom-devel gdb gsound-devel
+BuildRequires:  pkgconfig(libhandy-1)
 
 Requires:       accountsservice alsa-lib bolt colord cups-pk-helper dbus-x11 glx-utils iso-codes
 Requires:       nm-connection-editor switcheroo-control /usr/bin/gkbd-keyboard-display
@@ -28,18 +29,13 @@ Provides:       control-center = 1:%{version}-%{release}
 Provides:       control-center%{?_isa} = 1:%{version}-%{release}
 Obsoletes:      control-center < 1:%{version}-%{release}
 
-# Patch0 and Patch2 is from fedora 29
 Patch1:         0001-online-accounts-Track-the-lifecycle-of-CcGoaPanel-ac.patch
 Patch2:         0002-background-Add-queue-to-load-4-pictures-at-a-time.patch
-Patch3:         Adapt-to-new-gnome-desktop-API-changes.patch
 
-Patch9000:      bugfix-gnome-control-center-clickassist-fix.patch
+Patch9001:      bugfix-fix_used_passwd_error_capture.patch
-Patch9001:      bugfix-gnome-control-center-fix-repetitivewallpapers.patch
+Patch9002:      bugfix-gnome-control-center-fix-repetitivewallpapers.patch
-Patch9002:      bugfix-fix_used_passwd_error_capture.patch
 Patch9003:      gnome-control-center-change-translation-when-changing-password.patch
-Patch9004:      bugfix-duplicate-Current-passwd.patch
+Patch9004:      gnome-control-center-remove-country-in-the-name-of-timezone.patch
-Patch9005:      gnome-control-center-remove-country-in-the-name-of-timezone.patch
-Patch9006:      Fix-crashes-when-retrieving-disk-size.patch 
 
 %description
 Gnome-control-center is a graphical user interface to configure
@@ -79,6 +75,7 @@ chrpath --delete %{buildroot}%{_bindir}/gnome-control-center
 %{_bindir}/gnome-control-center
 %{_libexecdir}/gnome-control-center-search-provider
 %{_libexecdir}/cc-remote-login-helper
+%{_libexecdir}/gnome-control-center-print-renderer
 %{_datadir}/sounds/gnome/default/alerts/*.ogg
 %{_datadir}/polkit-1/actions/*.policy
 %{_datadir}/polkit-1/rules.d/gnome-control-center.rules
@@ -96,7 +93,7 @@ chrpath --delete %{buildroot}%{_bindir}/gnome-control-center
 
 %files filesystem
 %dir %{_datadir}/gnome/wm-properties
-%dir %{_datadir}/gnome-control-center/sounds
+%dir %{_datadir}/gnome-control-center/
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %files help
@@ -104,6 +101,11 @@ chrpath --delete %{buildroot}%{_bindir}/gnome-control-center
 %{_mandir}/man1/*.gz
 
 %changelog
+* Mon May 31 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.6-1
+- Upgrade to 3.38.6
+- Update Version, Release, BuildRequires, stage 'files'
+- Delete 4 patches, modify the left 6 patches
+
 * Wed Feb 3 2021 yanglu<yanglu60@huawei.com> - 3.30.1-13
 - Type:bugfix
 - ID:NA