rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add patch for GNOME bug #499920 (invalid #include).

Browse Source
This commit is contained in:
Matthew Barnes 2007-11-29 20:43:29 +00:00
parent 414fc02831
commit ba8861e012
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
evolution-2.21.2-invalid-include.patch Normal file
View File

@ -0,0 +1,48 @@
diff -up evolution-2.21.2/shell/es-event.c.invalid-include evolution-2.21.2/shell/es-event.c
--- evolution-2.21.2/shell/es-event.c.invalid-include 2007-10-28 22:02:14.000000000 -0400
+++ evolution-2.21.2/shell/es-event.c 2007-11-29 15:01:31.000000000 -0500
@@ -30,6 +30,7 @@
#include <glib.h>
#include "es-event.h"
+#include "e-shell.h"
static GObjectClass *eme_parent;
static ESEvent *es_event;
diff -up evolution-2.21.2/shell/es-event.h.invalid-include evolution-2.21.2/shell/es-event.h
--- evolution-2.21.2/shell/es-event.h.invalid-include 2007-10-23 06:03:16.000000000 -0400
+++ evolution-2.21.2/shell/es-event.h 2007-11-29 15:01:31.000000000 -0500
@@ -26,13 +26,14 @@
#include <glib-object.h>
#include "e-util/e-event.h"
-#include "e-shell.h"
#ifdef __cplusplus
extern "C" {
#pragma }
#endif /* __cplusplus */
+struct _EShell; /* Avoid including "e-shell.h" */
+
typedef struct _ESEvent ESEvent;
typedef struct _ESEventClass ESEventClass;
@@ -56,7 +57,7 @@ typedef struct _ESEventTargetShell ESEve
struct _ESEventTargetShell {
EEventTarget target;
- EShell *shell;
+ struct _EShell *shell;
};
struct _ESEventTargetState {
@@ -91,7 +92,7 @@ GType es_event_get_type(void);
ESEvent *es_event_peek(void);
ESEventTargetState *es_event_target_new_state(ESEvent *emp, int state);
-ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, EShell *shell);
+ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, struct _EShell *shell);
ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision);
/* ********************************************************************** */

9
evolution.spec
View File

@ -45,7 +45,7 @@
Name: evolution Name: evolution
Version: 2.21.2 Version: 2.21.2
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2 and GFDL+ License: GPLv2 and GFDL+
Group: Applications/Productivity Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite Summary: GNOME's next-generation groupware suite
@ -117,6 +117,9 @@ Patch31: evolution-2.9.3-meeting-list-view.patch
# XXX Disabled due to outstanding issues. # XXX Disabled due to outstanding issues.
#Patch33: evolution-2.10.0-e-passwords.patch #Patch33: evolution-2.10.0-e-passwords.patch
# GNOME bug #499920
Patch34: evolution-2.21.2-invalid-include.patch
## Dependencies ### ## Dependencies ###
Requires(post): GConf2 Requires(post): GConf2
@ -251,6 +254,7 @@ PalmOS<tm> devices with %{name}.
%patch30 -p1 -b .source-path-entry %patch30 -p1 -b .source-path-entry
%patch31 -p1 -b .meeting-list-view %patch31 -p1 -b .meeting-list-view
#%patch33 -p1 -b .e-passwords #%patch33 -p1 -b .e-passwords
%patch34 -p1 -b .invalid-include
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -676,6 +680,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Thu Nov 29 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.2-3.fc9
- Add patch for GNOME bug #499920 (invalid #include).
* Fri Nov 23 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.2-2.fc9 * Fri Nov 23 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.2-2.fc9
- Rebuild against newer libpisync.so. - Rebuild against newer libpisync.so.