[mate-panel/f20] fix rhbz (#1023604)

[Wolfgang Ulbrich]

commit 7beb79312c26c5542e9d631d1f66e7d3530d5dc2
Author: raveit65 <chat-to-me at raveit.de>
Date:   Fri Nov 28 23:53:04 2014 +0100

    fix rhbz (#1023604)

 mate-panel.spec                                    |   11 +++++++-
 ...-panel_fix-container_child_background_set.patch |   13 +++++++++
 mate-panel_timezone.patch                          |   28 ++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletions(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index b29fa68..bedcc7c 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -14,7 +14,7 @@
 
 Name:           mate-panel
 Version:        %{branch}.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 #Release:        0.1%{?git_rel}%{?dist}
 Summary:        MATE Desktop panel and applets
 #libs are LGPLv2+ applications GPLv2+
@@ -31,6 +31,9 @@ Source1:        mate-panel_fedora.layout
 
 # try fix rhbz (#1023604)
 Patch0:         mate-panel_container-child-background.patch
+Patch1:         mate-panel_fix-container_child_background_set.patch
+# https://github.com/mate-desktop/mate-panel/pull/261
+Patch2:         mate-panel_timezone.patch
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 # needed as nothing else requires it
@@ -79,6 +82,8 @@ Development files for mate-panel
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 %patch0 -p1 -b .container
+%patch1 -p1 -b .container2
+%patch2 -p1 -b .timezone
 
 %build
 
@@ -177,6 +182,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Fri Nov 28 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-2
+- fix rhbz (#1023604)
+- timezone fix
+
 * Wed Oct 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-1
 - update to 1.8.1 release
 
diff --git a/mate-panel_fix-container_child_background_set.patch b/mate-panel_fix-container_child_background_set.patch
new file mode 100644
index 0000000..9b1f07b
--- /dev/null
+++ b/mate-panel_fix-container_child_background_set.patch
@@ -0,0 +1,13 @@
+diff -upr mate-panel-1.8.1-orig/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c mate-panel-1.8.1/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
+--- mate-panel-1.8.1-orig/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c	2014-11-25 23:40:54.555704000 +0100
++++ mate-panel-1.8.1/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c	2014-11-25 23:50:09.499401035 +0100
+@@ -333,8 +333,7 @@ mate_panel_applet_frame_dbus_finalize (G
+ 	MatePanelAppletFrameDBus *frame = MATE_PANEL_APPLET_FRAME_DBUS (object);
+ 
+ 	if (frame->priv->bg_cancellable)
+-		g_object_unref (frame->priv->bg_cancellable);
+-	frame->priv->bg_cancellable = NULL;
++        g_cancellable_cancel (frame->priv->bg_cancellable);
+ 
+ 	G_OBJECT_CLASS (mate_panel_applet_frame_dbus_parent_class)->finalize (object);
+ }
diff --git a/mate-panel_timezone.patch b/mate-panel_timezone.patch
new file mode 100644
index 0000000..b89bd69
--- /dev/null
+++ b/mate-panel_timezone.patch
@@ -0,0 +1,28 @@
+diff --git a/applets/clock/system-timezone.c b/applets/clock/system-timezone.c
+index 28b3525..525921c 100644
+--- a/applets/clock/system-timezone.c
++++ b/applets/clock/system-timezone.c
+@@ -634,6 +634,22 @@ system_timezone_read_etc_localtime_softlink (void)
+                 return NULL;
+ 
+         file = g_file_read_link (ETC_LOCALTIME, NULL);
++
++        if (*file != '/') {
++                GFile *gf1;
++                GFile *gf2;
++
++                /* Resolve relative path. */
++                gf1 = g_file_new_for_path (ETC_LOCALTIME);
++                gf2 = g_file_get_parent (gf1);
++                g_object_unref (gf1);
++                gf1 = g_file_resolve_relative_path (gf2, file);
++                g_object_unref (gf2);
++                g_free (file);
++                file = g_file_get_path (gf1);
++                g_object_unref (gf1);
++        }
++
+         tz = system_timezone_strip_path_if_valid (file);
+         g_free (file);
+ 
+