From ea669b495d4651830698540c8045610ce543b557 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 1 Mar 2021 10:04:09 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gnome-control-center.git#8cd1e6a05883e07a3d55a88adf1584d91f2cafba
---
 fix-language-chooser.patch | 96 ++++++++++++++++++++++++++++++++++++++
 gnome-control-center.spec  | 10 +++-
 2 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 fix-language-chooser.patch

diff --git a/fix-language-chooser.patch b/fix-language-chooser.patch
new file mode 100644
index 0000000..bfe8634
--- /dev/null
+++ b/fix-language-chooser.patch
@@ -0,0 +1,96 @@
+From 429bbe0564f8c129717635e8979fa6fa761a0f1c Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Tue, 23 Feb 2021 10:24:49 -0300
+Subject: [PATCH] common: Add missing <child> tag to CcLanguageChooser
+
+The UI file is not wrapping the <object> tag with <child>, which
+fails to parse and blanks the dialog.
+
+Add the missing <child>  tag around the "More" row object.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1270
+
+common: Rename 'check' to 'check_image'
+
+The C code tries to fetch and use 'check_image', but the UI definition
+calls it 'check', which throws a few warnings. Renaming it in the UI file
+is easier than in the C file, so I went with the former.
+---
+ panels/common/cc-language-chooser.ui | 47 +++++++++++++++-------------
+ panels/common/cc-language-row.ui     |  2 +-
+ 2 files changed, 27 insertions(+), 22 deletions(-)
+
+diff --git a/panels/common/cc-language-chooser.ui b/panels/common/cc-language-chooser.ui
+index 5449fb3dd..885eb437a 100644
+--- a/panels/common/cc-language-chooser.ui
++++ b/panels/common/cc-language-chooser.ui
+@@ -70,27 +70,32 @@
+                     <property name="sensitive">False</property>
+                   </object>
+                 </child>
+-                <object class="GtkListBoxRow" id="more_row">
+-                  <child>
+-                    <object class="GtkBox">
+-                      <property name="visible">True</property>
+-                      <property name="spacing">10</property>
+-                      <property name="tooltip_markup" translatable="yes">More…</property>
+-                      <child>
+-                        <object class="GtkImage">
+-                          <property name="visible">False</property>
+-                          <property name="icon-name">view-more-symbolic</property>
+-                          <property name="icon-size">1</property>
+-                          <property name="margin-top">10</property>
+-                          <property name="margin-bottom">10</property>
+-                          <style>
+-                            <class name="dim-label"/>
+-                          </style>
+-                        </object>
+-                      </child>
+-                    </object>
+-                  </child>
+-                </object>
++
++                <!-- "More" row -->
++                <child>
++                  <object class="GtkListBoxRow" id="more_row">
++                    <child>
++                      <object class="GtkBox">
++                        <property name="visible">True</property>
++                        <property name="spacing">10</property>
++                        <property name="tooltip_markup" translatable="yes">More…</property>
++                        <child>
++                          <object class="GtkImage">
++                            <property name="visible">False</property>
++                            <property name="icon-name">view-more-symbolic</property>
++                            <property name="icon-size">1</property>
++                            <property name="margin-top">10</property>
++                            <property name="margin-bottom">10</property>
++                            <style>
++                              <class name="dim-label"/>
++                            </style>
++                          </object>
++                        </child>
++                      </object>
++                    </child>
++                  </object>
++                </child>
++
+               </object>
+             </child>
+           </object>
+diff --git a/panels/common/cc-language-row.ui b/panels/common/cc-language-row.ui
+index 3f2d67b68..957df54ab 100644
+--- a/panels/common/cc-language-row.ui
++++ b/panels/common/cc-language-row.ui
+@@ -18,7 +18,7 @@
+           </object>
+         </child>
+         <child>
+-          <object class="GtkImage" id="check">
++          <object class="GtkImage" id="check_image">
+             <property name="visible">False</property>
+             <property name="icon-name">object-select-symbolic</property>
+             <property name="icon-size">1</property>
+-- 
+2.29.2
+
diff --git a/gnome-control-center.spec b/gnome-control-center.spec
index 0c7750b..b8b3cf6 100644
--- a/gnome-control-center.spec
+++ b/gnome-control-center.spec
@@ -13,7 +13,7 @@
 
 Name:           gnome-control-center
 Version:        40~beta
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities to configure the GNOME desktop
 
 License:        GPLv2+ and CC-BY-SA
@@ -23,6 +23,8 @@ Source0:        https://download.gnome.org/sources/gnome-control-center/40/gnome
 # https://bugzilla.gnome.org/show_bug.cgi?id=695691
 Patch0:         distro-logo.patch
 
+Patch1:         fix-language-chooser.patch
+
 BuildRequires:  chrpath
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -196,6 +198,12 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
 %dir %{_datadir}/gnome/wm-properties
 
 %changelog
+* Wed Feb 24 2021 Felipe Borges <feborges@redhat.com> - 40~beta-3
+- Include missing patch from 40~beta-2
+
+* Tue Feb 23 2021 Felipe Borges <feborges@redhat.com> - 40~beta-2
+- Fix error preventing the Region & Language panel from loading
+
 * Sun Feb 21 2021 Kalev Lember <klember@redhat.com> - 40~beta-1
 - Update to 40.beta