[tilda/f17] added a patch to fix #644267, startup works now

hannes hannes at fedoraproject.org
Sun Jun 24 16:10:55 UTC 2012


commit f719633fd7c9683004c9d2f82203c376c8e546fc
Author: hannes <hannes at fedoraproject.org>
Date:   Sun Jun 24 17:10:11 2012 +0200

    added a patch to fix #644267, startup works now

 tilda-0.9.6-startup-segfault.patch |   14 ++++++++++++++
 tilda.spec                         |    7 ++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/tilda-0.9.6-startup-segfault.patch b/tilda-0.9.6-startup-segfault.patch
new file mode 100644
index 0000000..6c1545f
--- /dev/null
+++ b/tilda-0.9.6-startup-segfault.patch
@@ -0,0 +1,14 @@
+diff --git a/src/tilda_window.c b/src/tilda_window.c
+index 9a08f59..107b8da 100644
+--- a/src/tilda_window.c
++++ b/src/tilda_window.c
+@@ -427,6 +427,9 @@ tilda_window *tilda_window_init (const gchar *config_file, const gint instance)
+     gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos"));
+     gtk_window_set_default_size (GTK_WINDOW(tw->window), config_getint ("max_width"), config_getint ("max_height"));
+     gtk_window_resize (GTK_WINDOW(tw->window), config_getint ("max_width"), config_getint ("max_height"));
++    
++    /* Create GDK resources now, to prevent crashes later on */
++    gtk_widget_realize (tw->window);
+     generate_animation_positions (tw);
+ 
+     return tw;
diff --git a/tilda.spec b/tilda.spec
index abb7499..2e5e3f3 100644
--- a/tilda.spec
+++ b/tilda.spec
@@ -1,6 +1,6 @@
 Name:           tilda
 Version:        0.9.6
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A quake like terminal for GNOME
 
 Group:          Applications/System
@@ -11,6 +11,7 @@ Source0:        http://downloads.sourceforge.net/tilda/%{name}-%{version}.tar.gz
 Patch1:         tilda-0.9.6-fix-glib-include.patch
 Patch2:         tilda-0.9.6-fix-pointers.patch
 Patch3:         tilda-0.9.6-add-xrandr.patch
+Patch4:		tilda-0.9.6-startup-segfault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, pango-devel, vte-devel, flex-static
@@ -28,6 +29,7 @@ pressed.
 %patch1 -p1 -b .glib
 %patch2 -p1 -b .pointers
 %patch3 -p1 -b .xrandr
+%patch4 -p1 -b .startsegfix
 
 # Fix default installed dir
 sed -i 's|%{prefix}/share|%{_datadir}/%{name}|g' src/Makefile.in
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sun Jun 24 2012 Johannes Lips <hannes at fedoraproject.org> - 0.9.6-10
+- Add patch to fix the segfault during startup 
+
 * Fri May 04 2012 Jon Ciesla <limburgher at gmail.com> - 0.9.6-9
 - Add xrandr, glib and point patchs, BZ 781875.
 


More information about the scm-commits mailing list