- Revise patch for RH bug #238155 (crash on startup).
This commit is contained in:
parent
fdddfb0ad7
commit
d67d2bcbf7
17
evolution-2.10.1-check-uri-before-strcmp.patch
Normal file
17
evolution-2.10.1-check-uri-before-strcmp.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
--- evolution-2.10.1/calendar/gui/calendar-component.c.calendar-component 2007-05-07 14:07:16.000000000 -0400
|
||||||
|
+++ evolution-2.10.1/calendar/gui/calendar-component.c 2007-05-07 14:11:48.000000000 -0400
|
||||||
|
@@ -210,7 +210,13 @@
|
||||||
|
GSList *s;
|
||||||
|
for (s = sources; s; s = s->next) {
|
||||||
|
ESource *source = E_SOURCE (s->data);
|
||||||
|
- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
|
||||||
|
+ const gchar *relative_uri;
|
||||||
|
+
|
||||||
|
+ g_assert (source != NULL);
|
||||||
|
+ relative_uri = e_source_peek_relative_uri (source);
|
||||||
|
+ if (relative_uri == NULL)
|
||||||
|
+ continue;
|
||||||
|
+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
|
||||||
|
personal_source = source;
|
||||||
|
break;
|
||||||
|
}
|
@ -47,7 +47,7 @@
|
|||||||
|
|
||||||
Name: evolution
|
Name: evolution
|
||||||
Version: 2.10.1
|
Version: 2.10.1
|
||||||
Release: 13%{?dist}
|
Release: 14%{?dist}
|
||||||
License: GPL
|
License: GPL
|
||||||
Group: Applications/Productivity
|
Group: Applications/Productivity
|
||||||
Summary: GNOME's next-generation groupware suite
|
Summary: GNOME's next-generation groupware suite
|
||||||
@ -174,7 +174,7 @@ Patch51: evolution-2.10.1-en_CA-attribution-format.patch
|
|||||||
Patch52: evolution-2.10.1-e-attachment-bar.patch
|
Patch52: evolution-2.10.1-e-attachment-bar.patch
|
||||||
|
|
||||||
# RH bug #238155 / GNOME bug #427232
|
# RH bug #238155 / GNOME bug #427232
|
||||||
Patch53: evolution-2.10.1-calendar-component.patch
|
Patch53: evolution-2.10.1-check-uri-before-strcmp.patch
|
||||||
|
|
||||||
## Dependencies ###
|
## Dependencies ###
|
||||||
|
|
||||||
@ -333,7 +333,7 @@ Development files needed for building things which link against evolution.
|
|||||||
%patch50 -p1 -b .fix-uri-handling
|
%patch50 -p1 -b .fix-uri-handling
|
||||||
%patch51 -p1 -b .en_CA-attribution-format
|
%patch51 -p1 -b .en_CA-attribution-format
|
||||||
%patch52 -p1 -b .e-attachment-bar
|
%patch52 -p1 -b .e-attachment-bar
|
||||||
%patch53 -p1 -b .calendar-component
|
%patch53 -p1 -b .check-uri-before-strcmp
|
||||||
|
|
||||||
mkdir -p krb5-fakeprefix/include
|
mkdir -p krb5-fakeprefix/include
|
||||||
mkdir -p krb5-fakeprefix/lib
|
mkdir -p krb5-fakeprefix/lib
|
||||||
@ -755,6 +755,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/evolution/%{evo_major}/libmenus.so
|
%{_libdir}/evolution/%{evo_major}/libmenus.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-14.fc7
|
||||||
|
- Revise patch for RH bug #238155 (crash on startup).
|
||||||
|
|
||||||
* Mon May 07 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-13.fc7
|
* Mon May 07 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-13.fc7
|
||||||
- Add patch for RH bug #238155 (crash on startup).
|
- Add patch for RH bug #238155 (crash on startup).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user