Accepting request 261785 from GNOME:Factory
Push GNOME 3.14.2 OBS-URL: https://build.opensuse.org/request/show/261785 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-control-center?expand=0&rev=125
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
0d95cf198b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:be1fa93e5a06d776d3dc6099aab7e4e301603cae3f56c00c09d10d3ebeed8249
|
||||
size 6930424
|
||||
3
gnome-control-center-3.14.2.tar.xz
Normal file
3
gnome-control-center-3.14.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b15e188b3d45c86d71f4d8cb297829cf190be81f22ce76dc74c7b4232bd0652a
|
||||
size 6938572
|
||||
@ -1,29 +0,0 @@
|
||||
From 57aab756e9d67d6420bcb651537e45930a257aa2 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Mon, 20 Oct 2014 13:41:21 +0200
|
||||
Subject: background: Fix possible crash when date isn't available
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=736475
|
||||
|
||||
diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
|
||||
index c165fa3..1dcce19 100644
|
||||
--- a/panels/background/bg-pictures-source.c
|
||||
+++ b/panels/background/bg-pictures-source.c
|
||||
@@ -571,7 +571,12 @@ add_single_file_from_media (BgPicturesSource *bg_source,
|
||||
* plugin, GRL_METADATA_KEY_MODIFICATION_DATE is not
|
||||
*/
|
||||
mtime = grl_media_get_creation_date (media);
|
||||
- mtime_unix = g_date_time_to_unix (mtime);
|
||||
+ if (!mtime)
|
||||
+ mtime = grl_media_get_modification_date (media);
|
||||
+ if (mtime)
|
||||
+ mtime_unix = g_date_time_to_unix (mtime);
|
||||
+ else
|
||||
+ mtime_unix = g_get_real_time () / G_USEC_PER_SEC;
|
||||
|
||||
return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
|
||||
}
|
||||
--
|
||||
cgit v0.10.1
|
||||
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From 422166f3206740b98304528fb0974419ac0aeadb Mon Sep 17 00:00:00 2001
|
||||
From: Cosimo Cecchi <cosimo@endlessm.com>
|
||||
Date: Mon, 20 Oct 2014 14:52:47 -0700
|
||||
Subject: region: don't crash for locales with no country_code
|
||||
|
||||
gnome_parse_locale() can return an empty country_code for some locales,
|
||||
which we are not taking into account when building the simple_locale
|
||||
string.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=738963
|
||||
|
||||
diff --git a/panels/region/cc-input-chooser.c b/panels/region/cc-input-chooser.c
|
||||
index bb620f8..26a30a2 100644
|
||||
--- a/panels/region/cc-input-chooser.c
|
||||
+++ b/panels/region/cc-input-chooser.c
|
||||
@@ -1022,7 +1022,11 @@ get_locale_infos (GtkWidget *chooser)
|
||||
if (!gnome_parse_locale (*locale, &lang_code, &country_code, NULL, NULL))
|
||||
continue;
|
||||
|
||||
- simple_locale = g_strdup_printf ("%s_%s.utf8", lang_code, country_code);
|
||||
+ if (country_code != NULL)
|
||||
+ simple_locale = g_strdup_printf ("%s_%s.utf8", lang_code, country_code);
|
||||
+ else
|
||||
+ simple_locale = g_strdup_printf ("%s.utf8", lang_code);
|
||||
+
|
||||
if (g_hash_table_contains (priv->locales, simple_locale))
|
||||
{
|
||||
g_free (simple_locale);
|
||||
@@ -1060,10 +1064,13 @@ get_locale_infos (GtkWidget *chooser)
|
||||
add_ids_to_set (layouts_with_locale, list);
|
||||
g_list_free (list);
|
||||
|
||||
- list = gnome_xkb_info_get_layouts_for_country (priv->xkb_info, country_code);
|
||||
- add_rows_to_table (chooser, info, list, INPUT_SOURCE_TYPE_XKB, id);
|
||||
- add_ids_to_set (layouts_with_locale, list);
|
||||
- g_list_free (list);
|
||||
+ if (country_code != NULL)
|
||||
+ {
|
||||
+ list = gnome_xkb_info_get_layouts_for_country (priv->xkb_info, country_code);
|
||||
+ add_rows_to_table (chooser, info, list, INPUT_SOURCE_TYPE_XKB, id);
|
||||
+ add_ids_to_set (layouts_with_locale, list);
|
||||
+ g_list_free (list);
|
||||
+ }
|
||||
|
||||
g_free (lang_code);
|
||||
g_free (country_code);
|
||||
--
|
||||
cgit v0.10.1
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,30 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 13 18:09:08 UTC 2014 - zaitor@opensuse.org
|
||||
|
||||
- Update to version 3.14.2:
|
||||
+ Disable SSLv3 because of POODLE.
|
||||
+ Background:
|
||||
- Fix possible crash when date isn't available.
|
||||
- Fix crash when adding the second color.
|
||||
+ Power: Disable hover on non-clickable rows.
|
||||
+ Printers: Automatically keep the selected row scrolled in view.
|
||||
+ Region:
|
||||
- Make Add/Done buttons blue as intended.
|
||||
- Don't crash for locales with no country code.
|
||||
+ Search: Use g_get_system_data_dirs() to discover providers.
|
||||
+ Sound: Fix the main volume bars to correctly display changes in
|
||||
volume.
|
||||
+ Universal Access: Make Add/Done buttons blue as intended.
|
||||
+ User Accounts:
|
||||
- Fix a crash when taking a photo in the avatar chooser.
|
||||
- Reset language dialog to original state when used the 2nd
|
||||
time.
|
||||
+ Updated translations.
|
||||
- Drop gnome-control-center-no-country-code-crash.patch,
|
||||
gnome-control-center-user-account-cheese-crash.patch, and
|
||||
gnome-control-center-crash-when-date-unavailable.patch: Fixed
|
||||
upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 3 14:55:37 UTC 2014 - badshah400@gmail.com
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
%endif
|
||||
|
||||
Name: gnome-control-center
|
||||
Version: 3.14.1
|
||||
Version: 3.14.2
|
||||
Release: 0
|
||||
# FIXME: in 12.3 and later, check if we still need patch2 (gnome-control-center-hide-region-system-tab.patch) (see bnc#703833)
|
||||
Summary: The GNOME Control Center
|
||||
@ -47,12 +47,6 @@ Patch15: gcc-private-connection.patch
|
||||
Patch16: gnome-control-center-probe-radius-server-cert.patch
|
||||
# PATCH-FEATURE-OPENSUSE gnome-control-center-follow-polkit-permissions-for-tz.patch boo#904058 badshah400@gmail.com -- Follow polkit permissions for allowing/locking timezone setting changes
|
||||
Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-control-center-user-account-cheese-crash.patch boo#904070 bgo#697039 badshah400@gmail.com -- user-account: Do not crash while taking a picture for user avatar using cheese, patch taken from upstream git
|
||||
Patch18: gnome-control-center-user-account-cheese-crash.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-control-center-crash-when-date-unavailable.patch boo#904073 bgo#736475 badshah400@gmail.com -- background: Do not crash when date is unavailable, patch taken from upstream git
|
||||
Patch19: gnome-control-center-crash-when-date-unavailable.patch
|
||||
# PATCH-FIX-UPSTREAM gnome-control-center-no-country-code-crash.patch boo#904071 bgo#738963 badshah400@gmail.com -- region: don't crash for locales with no country_code, patch taken from upstream git
|
||||
Patch20: gnome-control-center-no-country-code-crash.patch
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: fdupes
|
||||
@ -188,9 +182,6 @@ GNOME control center.
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
%patch20 -p1
|
||||
#NEEDS-REBASE
|
||||
#patch14 -p1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user