[mate-panel/epel7] update marco wm name, fix rhbz (#1007219), rhbz (#1023604), timezone fix
Wolfgang Ulbrich
raveit65 at fedoraproject.org
Mon Dec 1 15:08:10 UTC 2014
commit c268012609836b1479ab100b372f0b902a356fe3
Author: raveit65 <chat-to-me at raveit.de>
Date: Mon Dec 1 16:08:03 2014 +0100
update marco wm name, fix rhbz (#1007219), rhbz (#1023604), timezone fix
mate-panel.spec | 21 ++++++++++++++-
mate-panel_container-child-background.patch | 16 +++++++++++
...-panel_fix-container_child_background_set.patch | 13 +++++++++
mate-panel_timezone.patch | 28 ++++++++++++++++++++
mate-panel_update-marco-wm-name.patch | 24 +++++++++++++++++
5 files changed, 101 insertions(+), 1 deletions(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index 2c98bb3..123a598 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+
@@ -29,6 +29,15 @@ URL: http://mate-desktop.org
Source1: mate-panel_rhel.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
+# rhbz (#1169330)
+# http://git.mate-desktop.org/mate-panel/commit/?h=1.8&id=45f9dd1
+Patch3: mate-panel_update-marco-wm-name.patch
+
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# needed as nothing else requires it
Requires: mate-session-manager
@@ -74,6 +83,10 @@ 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
+%patch3 -p1 -b .marco-wm-name
# To work around rpath
#autoreconf -fi
@@ -166,6 +179,12 @@ fi
%changelog
+* Mon Dec 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-2
+- fix rhbz (#1007219)
+- update marco wm name
+- 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_container-child-background.patch b/mate-panel_container-child-background.patch
new file mode 100644
index 0000000..6e0ee76
--- /dev/null
+++ b/mate-panel_container-child-background.patch
@@ -0,0 +1,16 @@
+diff -upr mate-panel-1.6.2-orig/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c mate-panel-1.6.2/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c
+--- mate-panel-1.6.2-orig/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c 2013-11-15 15:25:42.000000000 +0100
++++ mate-panel-1.6.2/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c 2014-06-25 17:50:25.098194232 +0200
+@@ -237,7 +237,11 @@ container_child_background_set (GObject
+ mate_panel_applet_container_child_set_finish (container, res, NULL);
+
+ if (frame->priv->bg_cancellable)
+- g_object_unref (frame->priv->bg_cancellable);
++#if GLIB_CHECK_VERSION(2, 28, 0)
++ g_clear_object (&frame->priv->bg_cancellable);
++#else
++ g_object_unref (frame->priv->bg_cancellable);
++#endif
+ frame->priv->bg_cancellable = NULL;
+ }
+
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);
+
+
diff --git a/mate-panel_update-marco-wm-name.patch b/mate-panel_update-marco-wm-name.patch
new file mode 100644
index 0000000..784f6de
--- /dev/null
+++ b/mate-panel_update-marco-wm-name.patch
@@ -0,0 +1,24 @@
+From 45f9dd1209ea5715b02d5d1a5e9e2dd51220da1e Mon Sep 17 00:00:00 2001
+From: Nathan Torchia <nemasu at gmail.com>
+Date: Fri, 03 Oct 2014 01:24:21 +0000
+Subject: Update Marco WM name as per Marco commit
+
+Closes https://github.com/mate-desktop/mate-panel/pull/240
+
+ cbf24f5d78719b930fc0cd6c0c80e00e9d62c95a
+---
+diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
+index d35155a..6de086b 100644
+--- a/applets/wncklet/workspace-switcher.c
++++ b/applets/wncklet/workspace-switcher.c
+@@ -143,7 +143,7 @@ static void window_manager_changed(WnckScreen* screen, PagerData* pager)
+
+ if (!wm_name)
+ pager->wm = PAGER_WM_UNKNOWN;
+- else if (strcmp(wm_name, "Marco") == 0)
++ else if (strcmp(wm_name, "Metacity (Marco)") == 0)
+ pager->wm = PAGER_WM_MARCO;
+ else if (strcmp(wm_name, "Compiz") == 0)
+ pager->wm = PAGER_WM_COMPIZ;
+--
+cgit
More information about the scm-commits
mailing list