From 1110b93fa59db46808c76a618f559ba061565872 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Fri, 22 Jan 2016 05:44:13 +0100 Subject: [PATCH] fix crash with gwd using close button, rhbz (#1300162, #1298016) --- compiz.spec | 9 ++++++- ...do-not-free-what-should-not-be-freed.patch | 27 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 compiz_gtk-window-decorator-do-not-free-what-should-not-be-freed.patch diff --git a/compiz.spec b/compiz.spec index 7efeb6b..c012076 100644 --- a/compiz.spec +++ b/compiz.spec @@ -10,7 +10,7 @@ URL: https://github.com/raveit65/compiz License: GPLv2+ and LGPLv2+ and MIT Group: User Interface/Desktops Version: 0.8.10 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: OpenGL window and compositing manager @@ -21,6 +21,9 @@ Source0: https://github.com/raveit65/%{name}/releases/download/v%{version} # fedora specific Patch0: compiz_fedora-logo.patch +# rhbz (#1300162, #1298016) +# https://github.com/raveit65/compiz/commit/b76e810 +Patch1: compiz_gtk-window-decorator-do-not-free-what-should-not-be-freed.patch BuildRequires: libX11-devel BuildRequires: libdrm-devel @@ -92,6 +95,7 @@ windows and compositing manager. %setup -q %patch0 -p1 -b .fedora-logo +%patch1 -p1 -b .gtk-window-decorator %build %configure \ @@ -172,6 +176,9 @@ fi %changelog +* Fri Jan 22 2016 Wolfgang Ulbrich - 1:0.8.10-3 +- fix crash with gwd using close button, rhbz (#1300162, #1298016) + * Sun Dec 20 2015 Wolfgang Ulbrich - 1:0.8.10-2 - fix runtime requires diff --git a/compiz_gtk-window-decorator-do-not-free-what-should-not-be-freed.patch b/compiz_gtk-window-decorator-do-not-free-what-should-not-be-freed.patch new file mode 100644 index 0000000..ca35be6 --- /dev/null +++ b/compiz_gtk-window-decorator-do-not-free-what-should-not-be-freed.patch @@ -0,0 +1,27 @@ +diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c +index 97b32b2..59ae4fe 100644 +--- a/gtk/window-decorator/gtk-window-decorator.c ++++ b/gtk/window-decorator/gtk-window-decorator.c +@@ -5146,9 +5146,10 @@ static void + show_force_quit_dialog (WnckWindow *win, + Time timestamp) + { +- decor_t *d = g_object_get_data (G_OBJECT (win), "decor"); +- GtkWidget *dialog; +- gchar *str, *tmp, *message; ++ decor_t *d = g_object_get_data (G_OBJECT (win), "decor"); ++ GtkWidget *dialog; ++ gchar *str, *tmp; ++ const gchar *message; + + if (d->force_quit_dialog) + return; +@@ -5166,7 +5167,6 @@ show_force_quit_dialog (WnckWindow *win, + str, + message); + g_free (str); +- g_free (message); + + gtk_window_set_icon_name (GTK_WINDOW (dialog), "force-quit"); + +