rtcm pushed to control-center (f21). "Add upstream patch to fix a crash"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri Mar 27 14:11:59 UTC 2015


>From c8e17f8c83364d5c42614d219125d0c2f1e97b1a Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos at gmail.com>
Date: Fri, 27 Mar 2015 15:11:31 +0100
Subject: Add upstream patch to fix a crash


diff --git a/0001-network-Fix-a-crash-on-IPv6-settings-dialog.patch b/0001-network-Fix-a-crash-on-IPv6-settings-dialog.patch
new file mode 100644
index 0000000..44cda69
--- /dev/null
+++ b/0001-network-Fix-a-crash-on-IPv6-settings-dialog.patch
@@ -0,0 +1,29 @@
+From 1faa4acd9e9d51987b19ddf9377a87a9420d0321 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos at gmail.com>
+Date: Fri, 27 Mar 2015 14:37:51 +0100
+Subject: [PATCH] network: Fix a crash on IPv6 settings dialog
+
+Commit 219a94ed1ec3404c1893446e0590dc079e988921 added a
+g_object_unref() on the wrong line.
+---
+ panels/network/connection-editor/ce-page-ip6.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/network/connection-editor/ce-page-ip6.c b/panels/network/connection-editor/ce-page-ip6.c
+index 9f6c720..d4c477e 100644
+--- a/panels/network/connection-editor/ce-page-ip6.c
++++ b/panels/network/connection-editor/ce-page-ip6.c
+@@ -625,9 +625,9 @@ connect_ip6_page (CEPageIP6 *page)
+                                            METHOD_COL_NAME, _("Link-Local Only"),
+                                            METHOD_COL_METHOD, IP6_METHOD_LINK_LOCAL,
+                                            -1);
+-        g_object_unref (G_OBJECT (store));
+ 
+         gtk_combo_box_set_model (page->method, GTK_TREE_MODEL (store));
++        g_object_unref (G_OBJECT (store));
+ 
+         method = IP6_METHOD_AUTO;
+         if (g_strcmp0 (str_method, NM_SETTING_IP6_CONFIG_METHOD_DHCP) == 0) {
+-- 
+2.1.0
+
diff --git a/control-center.spec b/control-center.spec
index 95814b6..5006369 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -10,7 +10,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 3.14.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 #VCS: git:git://git.gnome.org/gnome-control-center
@@ -20,6 +20,8 @@ URL: http://www.gnome.org
 # https://bugzilla.gnome.org/show_bug.cgi?id=695691
 Patch0: distro-logo.patch
 
+Patch1: 0001-network-Fix-a-crash-on-IPv6-settings-dialog.patch
+
 Requires: gnome-settings-daemon >= %{gsd_version}
 Requires: alsa-lib
 Requires: gnome-desktop3 >= %{gnome_desktop_version}
@@ -124,6 +126,7 @@ utilities.
 %prep
 %setup -q -n gnome-control-center-%{version}
 %patch0 -p1 -b .distro-logo
+%patch1 -p1 -b .ipv6-settings-crash
 
 %build
 %configure \
@@ -207,6 +210,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Mar 27 2015 Rui Matos <rmatos at redhat.com> - 1:3.14.4-2
+- Add upstream patch to fix a crash
+
 * Thu Mar 19 2015 Rui Matos <rmatos at redhat.com> - 1:3.14.4-1
 - Update to 3.14.4
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/control-center.git/commit/?h=f21&id=c8e17f8c83364d5c42614d219125d0c2f1e97b1a


More information about the scm-commits mailing list