Dominique Leuenberger 2018-10-17 06:13:43 +00:00 committed by Git OBS Bridge
commit e430d77bfc
9 changed files with 176 additions and 160 deletions

View File

@ -1,27 +0,0 @@
From cb760e77af0b566f6fcc96fe162a875403665877 Mon Sep 17 00:00:00 2001
From: Jonathan Kang <jonathan121537@gmail.com>
Date: Mon, 21 May 2018 15:23:04 +0800
Subject: [PATCH] wifi: only manage Wi-Fi devices managed by NM
If a Wi-Fi device is unmanaged by NetworkManager, ignore it.
---
panels/network/cc-wifi-panel.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/panels/network/cc-wifi-panel.c b/panels/network/cc-wifi-panel.c
index d785bad0d..8db43c349 100644
--- a/panels/network/cc-wifi-panel.c
+++ b/panels/network/cc-wifi-panel.c
@@ -91,7 +91,8 @@ add_wifi_device (CcWifiPanel *self,
NetObject *net_device;
/* Only manage Wi-Fi devices */
- if (!NM_IS_DEVICE_WIFI (device))
+ if (!NM_IS_DEVICE_WIFI (device) ||
+ !nm_device_get_managed (device))
return;
/* Create the NetDevice */
--
2.17.0

View File

@ -20,11 +20,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=787882
.../network/wireless-security/eap-method-ttls.ui | 39 +++++++++++++++---
6 files changed, 175 insertions(+), 25 deletions(-)
diff --git a/panels/network/wireless-security/eap-method-peap.c b/panels/network/wireless-security/eap-method-peap.c
index 402887c87..e94c0ef4f 100644
--- a/panels/network/wireless-security/eap-method-peap.c
+++ b/panels/network/wireless-security/eap-method-peap.c
@@ -114,6 +114,10 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-peap.c
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-peap.c 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-peap.c 2018-07-24 12:14:46.053325821 +0200
@@ -114,6 +114,10 @@ add_to_size_group (EAPMethod *parent, Gt
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@ -35,7 +35,7 @@ index 402887c87..e94c0ef4f 100644
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_version_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@@ -159,6 +163,12 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
@@ -159,6 +163,12 @@ fill_connection (EAPMethod *parent, NMCo
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, text, NULL);
@ -48,7 +48,7 @@ index 402887c87..e94c0ef4f 100644
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_button"));
g_assert (widget);
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
@@ -424,11 +434,22 @@ eap_method_peap_new (WirelessSecurity *ws_parent,
@@ -424,11 +434,22 @@ eap_method_peap_new (WirelessSecurity *w
(GCallback) wireless_security_changed_cb,
ws_parent);
@ -71,10 +71,10 @@ index 402887c87..e94c0ef4f 100644
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_label"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_ca_cert_button"));
diff --git a/panels/network/wireless-security/eap-method-peap.ui b/panels/network/wireless-security/eap-method-peap.ui
index 37dddd643..1f5e7e599 100644
--- a/panels/network/wireless-security/eap-method-peap.ui
+++ b/panels/network/wireless-security/eap-method-peap.ui
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-peap.ui
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-peap.ui 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-peap.ui 2018-07-24 12:14:46.053325821 +0200
@@ -67,6 +67,33 @@
</packing>
</child>
@ -172,7 +172,7 @@ index 37dddd643..1f5e7e599 100644
</packing>
</child>
<child>
@@ -180,7 +207,7 @@
@@ -181,7 +208,7 @@
</object>
<packing>
<property name="left_attach">0</property>
@ -181,11 +181,11 @@ index 37dddd643..1f5e7e599 100644
<property name="width">2</property>
</packing>
</child>
diff --git a/panels/network/wireless-security/eap-method-tls.c b/panels/network/wireless-security/eap-method-tls.c
index 8d17fa459..278e98364 100644
--- a/panels/network/wireless-security/eap-method-tls.c
+++ b/panels/network/wireless-security/eap-method-tls.c
@@ -148,6 +148,10 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-tls.c
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-tls.c 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-tls.c 2018-07-24 12:14:46.053325821 +0200
@@ -139,6 +139,10 @@ add_to_size_group (EAPMethod *parent, Gt
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@ -196,7 +196,7 @@ index 8d17fa459..278e98364 100644
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@@ -190,6 +194,12 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
@@ -181,6 +185,12 @@ fill_connection (EAPMethod *parent, NMCo
g_assert (widget);
g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text (GTK_ENTRY (widget)), NULL);
@ -209,7 +209,7 @@ index 8d17fa459..278e98364 100644
/* TLS private key */
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_private_key_password_entry"));
g_assert (widget);
@@ -393,7 +403,7 @@ setup_filepicker (GtkBuilder *builder,
@@ -384,7 +394,7 @@ setup_filepicker (GtkBuilder *builder,
filter = eap_method_default_file_chooser_filter_new (privkey);
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (widget), filter);
@ -218,7 +218,7 @@ index 8d17fa459..278e98364 100644
* gtkfilechooserdefault.c::show_and_select_files_finished_loading() on our
* dialog; so force-reset the filter to what we want it to be whenever
* it gets cleared.
@@ -491,6 +501,19 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
@@ -482,6 +492,19 @@ eap_method_tls_new (WirelessSecurity *ws
if (s_8021x && nm_setting_802_1x_get_identity (s_8021x))
gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_identity (s_8021x));
@ -238,7 +238,7 @@ index 8d17fa459..278e98364 100644
setup_filepicker (parent->builder, "eap_tls_user_cert_button",
_("Choose your personal certificate"),
ws_parent, parent, s_8021x,
@@ -540,6 +563,10 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
@@ -531,6 +554,10 @@ eap_method_tls_new (WirelessSecurity *ws
if (secrets_only) {
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry"));
gtk_widget_set_sensitive (widget, FALSE);
@ -249,10 +249,10 @@ index 8d17fa459..278e98364 100644
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_label"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_user_cert_button"));
diff --git a/panels/network/wireless-security/eap-method-tls.ui b/panels/network/wireless-security/eap-method-tls.ui
index a399460fa..60fe59f06 100644
--- a/panels/network/wireless-security/eap-method-tls.ui
+++ b/panels/network/wireless-security/eap-method-tls.ui
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-tls.ui
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-tls.ui 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-tls.ui 2018-07-24 12:14:46.053325821 +0200
@@ -43,6 +43,33 @@
</packing>
</child>
@ -377,11 +377,11 @@ index a399460fa..60fe59f06 100644
</packing>
</child>
</object>
diff --git a/panels/network/wireless-security/eap-method-ttls.c b/panels/network/wireless-security/eap-method-ttls.c
index 2d9de48d6..9cd2c205f 100644
--- a/panels/network/wireless-security/eap-method-ttls.c
+++ b/panels/network/wireless-security/eap-method-ttls.c
@@ -114,6 +114,10 @@ add_to_size_group (EAPMethod *parent, GtkSizeGroup *group)
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-ttls.c
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-ttls.c 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-ttls.c 2018-07-24 12:14:46.057325870 +0200
@@ -114,6 +114,10 @@ add_to_size_group (EAPMethod *parent, Gt
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@ -392,7 +392,7 @@ index 2d9de48d6..9cd2c205f 100644
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_inner_auth_label"));
g_assert (widget);
gtk_size_group_add_widget (group, widget);
@@ -154,6 +158,12 @@ fill_connection (EAPMethod *parent, NMConnection *connection, NMSettingSecretFla
@@ -154,6 +158,12 @@ fill_connection (EAPMethod *parent, NMCo
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, text, NULL);
@ -405,7 +405,7 @@ index 2d9de48d6..9cd2c205f 100644
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_button"));
g_assert (widget);
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
@@ -451,6 +461,13 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
@@ -451,6 +461,13 @@ eap_method_ttls_new (WirelessSecurity *w
(GCallback) wireless_security_changed_cb,
ws_parent);
@ -419,7 +419,7 @@ index 2d9de48d6..9cd2c205f 100644
widget = inner_auth_combo_init (method, connection, s_8021x, secrets_only);
inner_auth_combo_changed_cb (widget, (gpointer) method);
@@ -459,6 +476,10 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
@@ -459,6 +476,10 @@ eap_method_ttls_new (WirelessSecurity *w
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_anon_identity_entry"));
gtk_widget_hide (widget);
@ -430,10 +430,10 @@ index 2d9de48d6..9cd2c205f 100644
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_label"));
gtk_widget_hide (widget);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_ca_cert_button"));
diff --git a/panels/network/wireless-security/eap-method-ttls.ui b/panels/network/wireless-security/eap-method-ttls.ui
index 0b23c54ba..c679cdf0b 100644
--- a/panels/network/wireless-security/eap-method-ttls.ui
+++ b/panels/network/wireless-security/eap-method-ttls.ui
Index: gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-ttls.ui
===================================================================
--- gnome-control-center-3.29.4.orig/panels/network/wireless-security/eap-method-ttls.ui 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wireless-security/eap-method-ttls.ui 2018-07-24 12:14:46.057325870 +0200
@@ -50,6 +50,33 @@
</packing>
</child>
@ -513,7 +513,7 @@ index 0b23c54ba..c679cdf0b 100644
</packing>
</child>
<child>
@@ -133,7 +160,7 @@
@@ -134,7 +161,7 @@
</object>
<packing>
<property name="left_attach">0</property>
@ -522,6 +522,3 @@ index 0b23c54ba..c679cdf0b 100644
<property name="width">2</property>
</packing>
</child>
--
2.13.5

View File

@ -1,34 +0,0 @@
From 4f3035effef08e72cffea75ec8b3dd5b8051d0c7 Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Tue, 6 Mar 2018 22:02:58 -0300
Subject: [PATCH] user-accounts: Force symlink creation
So that we can run Settings more than once in GNOME Builder.
Without the -f flag, ln errs out after these symlinks are
created, and Builder refuses to run after that.
Closes: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/107
---
panels/user-accounts/meson.build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/panels/user-accounts/meson.build b/panels/user-accounts/meson.build
index 65341410d..0b0a4fecf 100644
--- a/panels/user-accounts/meson.build
+++ b/panels/user-accounts/meson.build
@@ -78,9 +78,9 @@ install_data(
# create symlinks for legacy images to not break current images for people
meson.add_install_script('sh', '-c',
- 'for f in $DESTDIR@0@/*; do
- ln -s legacy/$(basename $f) $DESTDIR@1@/$(basename $f);
- done'.format(legacy_image_dir, image_dir))
+ '''for f in $DESTDIR@0@/*; do
+ ln -sf legacy/$(basename $f) $DESTDIR@1@/$(basename $f);
+ done'''.format(legacy_image_dir, image_dir))
polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname)
--
2.17.1

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ff9e3d7c1693c6004c8a337eb84452d517259b52330081b6b226a8ac5793d734
size 5857128

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2b1f9bb794cf57838f8340ac8b0e30e6a924c6a3de50c8f2af5f64d6609569bb
size 5887776

View File

@ -1,8 +1,8 @@
Index: gnome-control-center-3.27.92/panels/network/cc-network-panel.c
Index: gnome-control-center-3.29.4/panels/network/cc-network-panel.c
===================================================================
--- gnome-control-center-3.27.92.orig/panels/network/cc-network-panel.c
+++ gnome-control-center-3.27.92/panels/network/cc-network-panel.c
@@ -765,10 +765,24 @@ panel_check_network_manager_version (CcN
--- gnome-control-center-3.29.4.orig/panels/network/cc-network-panel.c 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/cc-network-panel.c 2018-07-24 12:14:46.041325672 +0200
@@ -769,10 +769,24 @@ panel_check_network_manager_version (CcN
GtkWidget *label;
gchar *markup;
const gchar *version;
@ -28,7 +28,7 @@ Index: gnome-control-center-3.27.92/panels/network/cc-network-panel.c
gtk_container_remove (GTK_CONTAINER (panel), gtk_bin_get_child (GTK_BIN (panel)));
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 20);
@@ -791,9 +805,27 @@ panel_check_network_manager_version (CcN
@@ -795,9 +809,27 @@ panel_check_network_manager_version (CcN
gtk_widget_show_all (box);
g_free (markup);
@ -56,11 +56,11 @@ Index: gnome-control-center-3.27.92/panels/network/cc-network-panel.c
}
static void
Index: gnome-control-center-3.27.92/panels/network/cc-wifi-panel.c
Index: gnome-control-center-3.29.4/panels/network/cc-wifi-panel.c
===================================================================
--- gnome-control-center-3.27.92.orig/panels/network/cc-wifi-panel.c
+++ gnome-control-center-3.27.92/panels/network/cc-wifi-panel.c
@@ -120,17 +120,36 @@ static void
--- gnome-control-center-3.29.4.orig/panels/network/cc-wifi-panel.c 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/cc-wifi-panel.c 2018-07-24 12:14:46.101326416 +0200
@@ -183,17 +183,36 @@ static void
check_main_stack_page (CcWifiPanel *self)
{
const gchar *nm_version;
@ -98,10 +98,10 @@ Index: gnome-control-center-3.27.92/panels/network/cc-wifi-panel.c
}
static void
Index: gnome-control-center-3.27.92/panels/network/wifi.ui
Index: gnome-control-center-3.29.4/panels/network/wifi.ui
===================================================================
--- gnome-control-center-3.27.92.orig/panels/network/wifi.ui
+++ gnome-control-center-3.27.92/panels/network/wifi.ui
--- gnome-control-center-3.29.4.orig/panels/network/wifi.ui 2018-07-17 02:32:35.000000000 +0200
+++ gnome-control-center-3.29.4/panels/network/wifi.ui 2018-07-24 12:14:46.041325672 +0200
@@ -293,6 +293,48 @@
<property name="name">nm-not-running</property>
</packing>

View File

@ -1,15 +0,0 @@
Index: gnome-control-center-3.28.2/panels/user-accounts/um-user-panel.c
===================================================================
--- gnome-control-center-3.28.2.orig/panels/user-accounts/um-user-panel.c
+++ gnome-control-center-3.28.2/panels/user-accounts/um-user-panel.c
@@ -840,10 +840,6 @@ show_user (ActUser *user, CcUserPanelPri
name = NULL;
lang = g_strdup (act_user_get_language (user));
- if ((!lang || *lang == '\0') && act_user_get_uid (user) == getuid ()) {
- lang = cc_common_language_get_current_language ();
- act_user_set_language (user, lang);
- }
if (lang && *lang != '\0') {
name = gnome_get_language_from_locale (lang, NULL);

View File

@ -1,3 +1,45 @@
-------------------------------------------------------------------
Wed Sep 26 11:12:34 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.30.1:
+ Fix crash in the object cache system.
+ Color: Fix fallout from GtkTemplate port.
+ Power: Do not crash when canceling KDB brightness proxy
creation.
+ Region:
- Do not release locale keys in IM hash table.
- Plug leaking GFile objects.
- Replace tab characters by whitespaces.
- Fix language section not marked as insensitive.
- Cancel async permission when panel is closed.
+ Sharing: Bind hostname entry from UI.
+ Updated translations.
-------------------------------------------------------------------
Fri Sep 7 00:49:59 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.30.0:
+ Updated translations.
- Enable tests run to increase QA of package.
-------------------------------------------------------------------
Tue Aug 28 20:16:47 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.29.92:
+ Fix a couple of memory leaks in the tests.
+ Don't hardcode Python path in tests.
+ Stop aggressively caching D-Bus objects not related to
hardware.
+ CI: Improve Flatpak job.
+ User Accounts:
- Silence some compiler warnings.
- Remove stub string from translation.
+ Wacom: Remove unused widgets from the .ui file.
+ Wi-Fi: Fix a potential crash.
+ Updated translations.
- Drop gnome-control-center-remove-implicit-language-setting.patch:
Fixed upstream.
-------------------------------------------------------------------
Fri Aug 17 01:08:50 UTC 2018 - yfjiang@suse.com
@ -6,6 +48,46 @@ Fri Aug 17 01:08:50 UTC 2018 - yfjiang@suse.com
navigating the user panel at the first time (bsc#1078968, commit
a1066a2).
-------------------------------------------------------------------
Fri Aug 3 19:01:16 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.29.90:
+ Use symbolic icons in Shell search.
+ Network: Better device names.
+ Power: Improve wording of some strings.
+ Region & Language: Make Language Chooser dialog implement
mockups.
+ Wi-Fi: Improve Airplane Mode.
- No longer export ACLOCAL_FLAGS="-I libgd" to buildroot, no longer
needed.
- Drop removal of .la files, we are using meson buildsystem now, so
no longer needed.
- Disable gnome-control-center-disable-error-message-for-NM.patch:
This downstream patch needs rebase.
-------------------------------------------------------------------
Tue Jul 24 10:08:07 UTC 2018 - bjorn.lie@gmail.com
- Update to version 3.29.4:
+ Introduce Dynamic Panel.
+ Many code cleanups and modernizations.
+ CI:
- Support for multiarch builds (ARMv8 and PPC64).
- Support generating Flatpaks on demand.
+ Display: Improve display arrangement widget.
+ Network: Add a testsuite.
+ Sharing: Expose Remote Desktop work on Wayland.
+ User Accounts:
- Use term "Confirm" instead of "Verify".
- Use the same phrase when passwords do not match.
+ Wacom:
- Hide when no Wacom devices are connected.
- Remove deprecated APIs.
+ Wi-Fi: Hide when no Wi-Fi adapters are available.
- Add pkgconfig(libsecret-1) BuildRequires: New dependency.
- Drop control-center-ignore-unmanaged-wifi-devices.patch and
gcc-user-accounts-Force-symlink-creation.patch: Fixed upstream.
-------------------------------------------------------------------
Mon Jul 23 10:31:30 UTC 2018 - dimstar@opensuse.org
@ -21,6 +103,17 @@ Wed Jul 11 23:12:34 UTC 2018 - bjorn.lie@gmail.com
errs out after these symlinks are created, and Builder refuses to
run after that (glgo#GNOME/gnome-control-center#107).
-------------------------------------------------------------------
Fri Jun 22 03:19:46 UTC 2018 - luc14n0@linuxmail.org
- Update to version 3.29.2:
+ Improve logging engine.
+ Add an object caching mechanism.
+ Display: Fix a few crashers.
+ Power: Fix showing approximate percentages.
+ Thunderbolt: Introduce new Thunderbolt panel.
+ User Accounts: Fix hint for wrong enterprise user/password.
-------------------------------------------------------------------
Sat Jun 2 21:22:15 UTC 2018 - bjorn.lie@gmail.com

View File

@ -12,38 +12,33 @@
# 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/
#
# Allow to enable/disable ibus, as GNOME is rather strict on new versions.
%define with_ibus 1
%bcond_without ibus
# Wacom input support
%ifarch s390 s390x
%define with_wacom 0
%bcond_with wacom
%else
%define with_wacom 1
%bcond_without wacom
%endif
%{?with_ibus:BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2}
%{?with_wacom:BuildRequires: pkgconfig(clutter-1.0) >= 1.11.3 pkgconfig(libwacom) >= 0.7}
Name: gnome-control-center
Version: 3.28.2
Version: 3.30.1
Release: 0
Summary: The GNOME Control Center
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: https://www.gnome.org
Source: http://download.gnome.org/sources/gnome-control-center/3.28/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running was:PATCH-FIX-OPENSUSE
Source: http://download.gnome.org/sources/gnome-control-center/3.30/%{name}-%{version}.tar.xz
# PATCH-NEEDS-REBASE gnome-control-center-disable-error-message-for-NM.patch bsc#989801 sckang@suse.com -- network: Improve the check for whether NM or wicked is running WAS: PATCH-FIX-OPENSUSE
Patch0: gnome-control-center-disable-error-message-for-NM.patch
# PATCH-FIX-UPSTREAM control-center-network-add-domain-suffix-match.patch bgo#787882 bsc#1047509 sckang@suse.com -- wifi: Add domain-suffix-match entry
Patch1: control-center-network-add-domain-suffix-match.patch
# PATCH-FIX-UPSTREAM control-center-ignore-unmanaged-wifi-devices.patch bsc#1079320 glgo#GNOME/gnome-control-center#54 sckang@suse.com -- wifi: only manage Wi-Fi devices managed by NM
Patch2: control-center-ignore-unmanaged-wifi-devices.patch
# PATCH-FIX-UPSTREAM gcc-user-accounts-Force-symlink-creation.patch -- user-accounts: Force symlink creation
Patch3: gcc-user-accounts-Force-symlink-creation.patch
# PATCH-FIX-UPSTREAM gnome-control-center-remove-implicit-language-setting.patch bsc#1078968 yfjiang@suse.com -- user-accounts: remove implicit language setting when a new user navigating the user panel at the first time (commit a1066a2)
Patch4: gnome-control-center-remove-implicit-language-setting.patch
### patches for Leap >= 15 plus SLE >= 15, but not TW
# PATCH-FEATURE-SLE gnome-control-center-info-never-use-gnome-software.patch bsc#999336 fezhang@suse.com -- info: Never search for gnome-software as an option when checking for updates on SLE and Leap 42.2, because we use gpk-update-viewer.
Patch1001: gnome-control-center-info-never-use-gnome-software.patch
@ -51,6 +46,7 @@ Patch1001: gnome-control-center-info-never-use-gnome-software.patch
Patch1002: gnome-control-center-more-power-button-actions.patch
# PATCH-FEATURE-SLE gnome-control-center-bring-back-firewall-zone.patch fate#316719 sckang@suse.com -- network: Bring back the firewall zone combo box to select proper firewall zone for each connection.
Patch1003: gnome-control-center-bring-back-firewall-zone.patch
BuildRequires: cups-devel >= 1.4
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@ -88,10 +84,11 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.20
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(libcanberra-gtk3)
BuildRequires: pkgconfig(libgtop-2.0)
BuildRequires: pkgconfig(libnm) >= 1.2.0
BuildRequires: pkgconfig(libnma) >= 1.2.0
BuildRequires: pkgconfig(libnm) >= 1.10.0
BuildRequires: pkgconfig(libnma) >= 1.8.0
BuildRequires: pkgconfig(libpulse) >= 2.0
BuildRequires: pkgconfig(libpulse-mainloop-glib)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(mm-glib) >= 0.7
@ -129,6 +126,13 @@ Obsoletes: control-center2 < 2.22.1
Obsoletes: gnome-control-center-branding <= 12.3
Obsoletes: gnome-control-center-branding-openSUSE <= 12.3
Obsoletes: gnome-control-center-branding-upstream <= 12.3
%if %{with wacom}
BuildRequires: pkgconfig(clutter-1.0) >= 1.11.3
BuildRequires: pkgconfig(libwacom) >= 0.7
%endif
%if %{with ibus}
BuildRequires: pkgconfig(ibus-1.0) >= 1.5.2
%endif
%description
The control center is GNOME's main interface for configuration of
@ -182,11 +186,8 @@ GNOME control center.
%prep
%setup -q
%patch0 -p1
#patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
translation-update-upstream po gnome-control-center-2.0
# patches for Leap >= 15 plus SLE >= 15, but not TW
@ -197,17 +198,18 @@ translation-update-upstream po gnome-control-center-2.0
%endif
%build
export ACLOCAL_FLAGS="-I libgd"
%meson \
-Dcheese=true \
-Ddocumentation=true \
%{!?with_ibus: -Dibus=false} \
-Dcheese=true \
-Ddocumentation=true \
%{!?with_ibus: -Dibus=false} \
%{nil}
%meson_build
%check
%meson_test
%install
%meson_install
find %{buildroot} -type f -name "*.la" -delete -print
%find_lang %{name}-2.0 %{?no_lang_C}
%find_lang %{name}-2.0-timezones %{name}-2.0.lang
%fdupes %{buildroot}/%{_prefix}
@ -217,7 +219,7 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
%files
%license COPYING
%doc NEWS README
%doc NEWS README.md
%{_bindir}/*
%{_datadir}/metainfo/gnome-control-center.appdata.xml
%exclude %{_datadir}/applications/gnome-color-panel.desktop
@ -256,7 +258,7 @@ rm %{buildroot}%{_datadir}/polkit-1/rules.d/gnome-control-center.rules
%{_datadir}/applications/gnome-online-accounts-panel.desktop
%files devel
%doc AUTHORS ChangeLog MAINTAINERS gnome-control-center.doap
%doc gnome-control-center.doap
%{_datadir}/pkgconfig/gnome-keybindings.pc
%{_datadir}/gettext/its/gnome-keybindings.its
%{_datadir}/gettext/its/gnome-keybindings.loc