rpms/gnome-control-center
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources

Browse Source 
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#78830937b8b0f6b5a6784c3a1ed8b09af8c4d2fc
This commit is contained in:
DistroBaker 2021-03-29 18:17:30 +00:00
parent 2f3251fe12
commit 45c93a1430
6 changed files with 19 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -34,3 +34,5 @@
/gnome-control-center-3.38.3.tar.xz
/gnome-control-center-3.38.4.tar.xz
/gnome-control-center-40.beta.tar.xz
/gnome-control-center-40.rc.tar.xz
/gnome-control-center-40.0.tar.xz

115
0001-network-Make-IPv4-v6-scroll-when-the-focus-moves-dow.patch
View File

@ -1,115 +0,0 @@
From 145ac84f3b1a9d98e80a4304dd9dce5d7261b232 Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Fri, 12 Mar 2021 10:50:44 +0100
Subject: [PATCH] network: Make IPv4/v6 scroll when the focus moves down the
tab
---
panels/network/connection-editor/ce-page-ip4.c | 5 +++++
panels/network/connection-editor/ce-page-ip6.c | 5 +++++
panels/network/connection-editor/connection-editor.ui | 1 -
panels/network/connection-editor/ip4-page.ui | 2 +-
panels/network/connection-editor/ip6-page.ui | 2 +-
5 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c
index 6de6ce607..140dedd75 100644
--- a/panels/network/connection-editor/ce-page-ip4.c
+++ b/panels/network/connection-editor/ce-page-ip4.c
@@ -50,6 +50,7 @@ struct _CEPageIP4
GtkRadioButton *disabled_radio;
GtkEntry *dns_entry;
GtkRadioButton *local_radio;
+ GtkGrid *main_box;
GtkRadioButton *manual_radio;
GtkCheckButton *never_default_check;
GtkBox *routes_box;
@@ -469,6 +470,9 @@ connect_ip4_page (CEPageIP4 *self)
const gchar *str_method;
guint method;
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (self->main_box),
+ gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (self)));
+
add_address_box (self);
add_dns_section (self);
add_routes_box (self);
@@ -783,6 +787,7 @@ ce_page_ip4_class_init (CEPageIP4Class *klass)
gtk_widget_class_bind_template_child (widget_class, CEPageIP4, disabled_radio);
gtk_widget_class_bind_template_child (widget_class, CEPageIP4, dns_entry);
gtk_widget_class_bind_template_child (widget_class, CEPageIP4, local_radio);
+ gtk_widget_class_bind_template_child (widget_class, CEPageIP4, main_box);
gtk_widget_class_bind_template_child (widget_class, CEPageIP4, manual_radio);
gtk_widget_class_bind_template_child (widget_class, CEPageIP4, never_default_check);
gtk_widget_class_bind_template_child (widget_class, CEPageIP4, routes_box);
diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c
index 2fb61394c..06e1842b5 100644
--- a/panels/network/connection-editor/ce-page-ip6.c
+++ b/panels/network/connection-editor/ce-page-ip6.c
@@ -51,6 +51,7 @@ struct _CEPageIP6
GtkRadioButton *disabled_radio;
GtkEntry *dns_entry;
GtkRadioButton *local_radio;
+ GtkGrid *main_box;
GtkRadioButton *manual_radio;
GtkCheckButton *never_default_check;
GtkBox *routes_box;
@@ -443,6 +444,9 @@ connect_ip6_page (CEPageIP6 *self)
const gchar *str_method;
guint method;
+ gtk_container_set_focus_vadjustment (GTK_CONTAINER (self->main_box),
+ gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (self)));
+
add_address_box (self);
add_dns_section (self);
add_routes_box (self);
@@ -756,6 +760,7 @@ ce_page_ip6_class_init (CEPageIP6Class *klass)
gtk_widget_class_bind_template_child (widget_class, CEPageIP6, disabled_radio);
gtk_widget_class_bind_template_child (widget_class, CEPageIP6, dns_entry);
gtk_widget_class_bind_template_child (widget_class, CEPageIP6, local_radio);
+ gtk_widget_class_bind_template_child (widget_class, CEPageIP6, main_box);
gtk_widget_class_bind_template_child (widget_class, CEPageIP6, manual_radio);
gtk_widget_class_bind_template_child (widget_class, CEPageIP6, never_default_check);
gtk_widget_class_bind_template_child (widget_class, CEPageIP6, routes_box);
diff --git a/panels/network/connection-editor/connection-editor.ui b/panels/network/connection-editor/connection-editor.ui
index 746e86b1c..6a83f134e 100644
--- a/panels/network/connection-editor/connection-editor.ui
+++ b/panels/network/connection-editor/connection-editor.ui
@@ -42,7 +42,6 @@
<child>
<object class="GtkStack" id="toplevel_stack">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<child>
<object class="GtkSpinner" id="spinner">
<property name="visible">True</property>
diff --git a/panels/network/connection-editor/ip4-page.ui b/panels/network/connection-editor/ip4-page.ui
index c390eb8dc..714036b55 100644
--- a/panels/network/connection-editor/ip4-page.ui
+++ b/panels/network/connection-editor/ip4-page.ui
@@ -10,7 +10,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="main_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">24</property>
diff --git a/panels/network/connection-editor/ip6-page.ui b/panels/network/connection-editor/ip6-page.ui
index 2234cd1f4..06044c468 100644
--- a/panels/network/connection-editor/ip6-page.ui
+++ b/panels/network/connection-editor/ip6-page.ui
@@ -10,7 +10,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="main_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">24</property>
--
2.28.0

28
0001-network-connection-editor-Fixup-creation-of-the-netm.patch
View File

@ -1,28 +0,0 @@
From 5902d04ac2f2bfec361ed8d0feb053f96734a076 Mon Sep 17 00:00:00 2001
From: Igor Raits <igor.raits@gmail.com>
Date: Sat, 6 Mar 2021 22:07:29 +0100
Subject: [PATCH] network/connection-editor: Fixup creation of the netmask
widget
Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1274
Signed-off-by: Igor Raits <igor.raits@gmail.com>
---
panels/network/connection-editor/ce-page-ip4.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/panels/network/connection-editor/ce-page-ip4.c b/panels/network/connection-editor/ce-page-ip4.c
index c1500f99f..6de6ce607 100644
--- a/panels/network/connection-editor/ce-page-ip4.c
+++ b/panels/network/connection-editor/ce-page-ip4.c
@@ -360,7 +360,7 @@ add_route_row (CEPageIP4 *self,
gtk_widget_set_hexpand (widget, TRUE);
gtk_container_add (GTK_CONTAINER (row_box), widget);
- widget = gtk_entry_new ();
+ widget = GTK_WIDGET (ce_netmask_entry_new ());
g_signal_connect_object (widget, "changed", G_CALLBACK (ce_page_changed), self, G_CONNECT_SWAPPED);
g_signal_connect_object (widget, "activate", G_CALLBACK (ensure_empty_routes_row), self, G_CONNECT_SWAPPED);
g_object_set_data (G_OBJECT (row), "netmask", widget);
--
2.30.1

96
fix-language-chooser.patch
View File

@ -1,96 +0,0 @@
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

32
gnome-control-center.spec
View File

@ -12,8 +12,8 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: gnome-control-center
Version: 40~beta
Release: 6%{?dist}
Version: 40.0
Release: 3%{?dist}
Summary: Utilities to configure the GNOME desktop
License: GPLv2+ and CC-BY-SA
@ -23,14 +23,6 @@ Source0: https://download.gnome.org/sources/gnome-control-center/40/gnome
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/965
Patch0: distro-logo.patch
Patch1: fix-language-chooser.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1932674
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/963
Patch2: 0001-network-connection-editor-Fixup-creation-of-the-netm.patch
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/966
Patch3: 0001-network-Make-IPv4-v6-scroll-when-the-focus-moves-dow.patch
BuildRequires: chrpath
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
@ -38,7 +30,6 @@ BuildRequires: docbook-style-xsl libxslt
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: meson
BuildRequires: git
BuildRequires: pkgconfig(accountsservice)
BuildRequires: pkgconfig(cheese) >= %{cheese_version}
BuildRequires: pkgconfig(cheese-gtk)
@ -151,14 +142,14 @@ can install configuration files that are picked up by the control-center
utilities.
%prep
%autosetup -p1 -S git -n gnome-control-center-%{tarball_version}
%autosetup -p1 -n gnome-control-center-%{tarball_version}
%build
%meson \
-Ddocumentation=true \
%if 0%{?fedora}
-Ddistributor_logo=%{_datadir}/pixmaps/fedora-logo-small.png \
-Ddark_mode_distributor_logo=%{_datadir}/pixmaps/system-logo-white.png \
-Ddistributor_logo=%{_datadir}/pixmaps/fedora_logo_med.png \
-Ddark_mode_distributor_logo=%{_datadir}/pixmaps/fedora_whitelogo_med.png \
%endif
%if 0%{?rhel}
-Ddistributor_logo=%{_datadir}/pixmaps/fedora-logo.png \
@ -213,8 +204,17 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gnome-control-center
%dir %{_datadir}/gnome/wm-properties
%changelog
* Fri Mar 19 2021 Felipe Borges <feborges@redhat.com> - 40~beta-6
- Make IPv4/v6 pages drive the scrolledwindow (rhbz#1671709)
* Mon Mar 29 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 40.0-3
- Update Fedora logos to larger versions
* Wed Mar 24 2021 Kalev Lember <klember@redhat.com> - 40.0-2
- Rebuilt
* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
- Update to 40.0
* Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
- Update to 40.rc
* Wed Mar 10 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 40~beta-5
- Refresh distro logo patch

2
sources
View File

@ -1 +1 @@
SHA512 (gnome-control-center-40.beta.tar.xz) = d09239c21d5129b32297671c7636d0f82663bbf72395f827d13470108c66dd004527e25b788850714ce4f7a513cbe0032d10e06e36b8f16ba129bc4bbca0238b
SHA512 (gnome-control-center-40.0.tar.xz) = 26980cd18c414b12d2bf7e61be200e02302e170d53aba4f064154eda4c006648160919b6d4c9d168d8c5a461c05dc6593a52066b144af577c6aac420b9723cb9