rpms/gcalctool/devel gcalctool-init.patch, NONE, 1.1 gcalctool.spec, 1.82, 1.83

Matthias Clasen mclasen at fedoraproject.org
Fri Feb 13 04:07:31 UTC 2009


Author: mclasen

Update of /cvs/pkgs/rpms/gcalctool/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24137

Modified Files:
	gcalctool.spec 
Added Files:
	gcalctool-init.patch 
Log Message:
fix a segfault


gcalctool-init.patch:

--- NEW FILE gcalctool-init.patch ---
diff -up gcalctool-5.25.90/gcalctool/calctool.c.init gcalctool-5.25.90/gcalctool/calctool.c
--- gcalctool-5.25.90/gcalctool/calctool.c.init	2009-02-12 23:02:35.000000000 -0500
+++ gcalctool-5.25.90/gcalctool/calctool.c	2009-02-12 23:02:48.000000000 -0500
@@ -194,6 +194,8 @@ init_state(void)
 int
 main(int argc, char **argv)
 {
+    g_type_init();
+
     memset(&calc_state, 0, sizeof(calc_state));
     v = &calc_state;
 


Index: gcalctool.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcalctool/devel/gcalctool.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- gcalctool.spec	3 Feb 2009 05:50:52 -0000	1.82
+++ gcalctool.spec	13 Feb 2009 04:06:59 -0000	1.83
@@ -9,6 +9,9 @@
 Source0:        http://download.gnome.org/sources/gcalctool/5.25/gcalctool-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=571581
+Patch0:	gcalctool-init.patch
+
 BuildRequires: atk-devel >= 1.5
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel >= 2.6.0
@@ -37,7 +40,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .init
 
 %build
 %configure --disable-scrollkeeper
@@ -99,6 +102,9 @@
 
 
 %changelog
+* Thu Feb 12 2009 Matthias Clasen <mclasen at redhat.com> - 5.25.90-2
+- Properly initialize the type system
+
 * Tue Feb  3 2009 Matthias Clasen <mclasen at redhat.com> - 5.25.90-1
 - Update to 5.25.90
 




More information about the scm-commits mailing list