- Add patch to fix startup crash in gtk-compat macros.
This commit is contained in:
parent
feb4cd8ff9
commit
3daaa5209d
24
evolution-2.31.5-gtk-compat-crash.patch
Normal file
24
evolution-2.31.5-gtk-compat-crash.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff -up evolution-2.31.5/e-util/gtk-compat.h.gtk-compat-crash evolution-2.31.5/e-util/gtk-compat.h
|
||||
--- evolution-2.31.5/e-util/gtk-compat.h.gtk-compat-crash 2010-07-11 18:26:08.000000000 -0400
|
||||
+++ evolution-2.31.5/e-util/gtk-compat.h 2010-07-22 11:51:55.076484868 -0400
|
||||
@@ -55,15 +55,15 @@ typedef enum {
|
||||
#define gdk_region_get_rectangles(region, rectangles, n_rectangles) \
|
||||
G_STMT_START { \
|
||||
GdkRectangle *__rects; \
|
||||
- gint __i, __n; \
|
||||
+ gint __i, __nrects; \
|
||||
\
|
||||
- __n = cairo_region_num_rectangles (region); \
|
||||
- __rects = g_new (GdkRectangle, __n); \
|
||||
+ __nrects = cairo_region_num_rectangles (region); \
|
||||
+ __rects = g_new (GdkRectangle, __nrects); \
|
||||
\
|
||||
- for (__i = 0; __i < __n; __i++) \
|
||||
+ for (__i = 0; __i < __nrects; __i++) \
|
||||
cairo_region_get_rectangle ((region), __i, &__rects[__i]); \
|
||||
\
|
||||
- *(n_rectangles) = __n; \
|
||||
+ *(n_rectangles) = __nrects; \
|
||||
*(rectangles) = __rects; \
|
||||
} G_STMT_END
|
||||
|
@ -33,7 +33,7 @@
|
||||
|
||||
Name: evolution
|
||||
Version: 2.31.5
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Group: Applications/Productivity
|
||||
Summary: Mail and calendar client for GNOME
|
||||
License: GPLv2+ and GFDL
|
||||
@ -55,6 +55,9 @@ Patch12: evolution-2.9.1-im-context-reset.patch
|
||||
# RH bug #589555
|
||||
Patch13: evolution-2.30.1-help-contents.patch
|
||||
|
||||
# Fixes a crash in gtk-compat.h macros
|
||||
Patch14: evolution-2.31.5-gtk-compat-crash.patch
|
||||
|
||||
## Dependencies ###
|
||||
|
||||
Requires(pre): GConf2
|
||||
@ -207,6 +210,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
|
||||
%patch10 -p1 -b .ldaphack
|
||||
%patch12 -p1 -b .im-context-reset
|
||||
%patch13 -p1 -b .help-contents
|
||||
%patch14 -p1 -b .gtk-compat-crash
|
||||
|
||||
mkdir -p krb5-fakeprefix/include
|
||||
mkdir -p krb5-fakeprefix/lib
|
||||
@ -614,6 +618,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jul 22 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.5-2.fc14
|
||||
- Add patch to fix startup crash in gtk-compat macros.
|
||||
|
||||
* Tue Jul 13 2010 Milan Crha <mcrha@redhat.com> - 2.31.5-1.fc14
|
||||
- Update to 2.31.5
|
||||
- Remove 'conduit' (removed upstream)
|
||||
|
Loading…
Reference in New Issue
Block a user