[tilda/f16] added the startup segfault patch

hannes hannes at fedoraproject.org
Sun Jun 24 19:54:56 UTC 2012


commit 11db44a76aa7f60c9decdee89bf3c8e89124340d
Author: hannes <hannes at fedoraproject.org>
Date:   Sun Jun 24 20:54:32 2012 +0200

    added the startup segfault patch

 tilda-0.9.6-startup-segfault.patch |   14 ++++++++++++++
 tilda.spec                         |    8 +++++++-
 2 files changed, 21 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 ca0e7ff..4864f60 100644
--- a/tilda.spec
+++ b/tilda.spec
@@ -1,6 +1,6 @@
 Name:           tilda
 Version:        0.9.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A quake like terminal for GNOME
 
 Group:          Applications/System
@@ -8,6 +8,8 @@ License:        GPLv2+
 URL:            http://tilda.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/tilda/%{name}-%{version}.tar.gz
 #Patch0:         tilda-segfault-fix.patch
+%patch1 -p1 -b .startsegfix
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, pango-devel, vte-devel, flex-static
@@ -22,6 +24,7 @@ pressed.
 %prep
 %setup -q
 #%patch0 -p1 -b .segfix
+%patch1 -p1 -b .startsegfix
 
 # Fix default installed dir
 sed -i 's|%{prefix}/share|%{_datadir}/%{name}|g' src/Makefile.in
@@ -68,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Sun Jun 24 2012 Johannes Lips <hannes at fedoraproject.org> - 0.9.6-7
+- Add patch to fix the segfault during startup 
+
 * Mon Jul 25 2011 Pierre-Yves Chibon <pingou at pingoured.fr> - 0.9.6-6
 - Add flex-static as BR
 - Fixes FTBFS


More information about the scm-commits mailing list