rpms/evolution/devel evolution-2.21.2-invalid-include.patch, NONE, 1.1 evolution.spec, 1.305, 1.306
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Thu Nov 29 20:44:03 UTC 2007
- Previous message: rpms/kernel/devel patch-2.6.24-rc3-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.721, 1.722 kernel.spec, 1.265, 1.266 sources, 1.681, 1.682 upstream, 1.603, 1.604 patch-2.6.24-rc3-git3.bz2.sign, 1.1, NONE
- Next message: rpms/amarok/F-8 amarok-1.4.7-148317.patch, NONE, 1.1 amarok-asf.patch, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14601
Modified Files:
evolution.spec
Added Files:
evolution-2.21.2-invalid-include.patch
Log Message:
* Thu Nov 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.2-3.fc9
- Add patch for GNOME bug #499920 (invalid #include).
evolution-2.21.2-invalid-include.patch:
--- NEW FILE evolution-2.21.2-invalid-include.patch ---
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);
/* ********************************************************************** */
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- evolution.spec 23 Nov 2007 14:37:53 -0000 1.305
+++ evolution.spec 29 Nov 2007 20:43:29 -0000 1.306
@@ -45,7 +45,7 @@
Name: evolution
Version: 2.21.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2 and GFDL+
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -117,6 +117,9 @@
# XXX Disabled due to outstanding issues.
#Patch33: evolution-2.10.0-e-passwords.patch
+# GNOME bug #499920
+Patch34: evolution-2.21.2-invalid-include.patch
+
## Dependencies ###
Requires(post): GConf2
@@ -251,6 +254,7 @@
%patch30 -p1 -b .source-path-entry
%patch31 -p1 -b .meeting-list-view
#%patch33 -p1 -b .e-passwords
+%patch34 -p1 -b .invalid-include
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -676,6 +680,9 @@
%endif
%changelog
+* Thu Nov 29 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.2-3.fc9
+- Add patch for GNOME bug #499920 (invalid #include).
+
* Fri Nov 23 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.2-2.fc9
- Rebuild against newer libpisync.so.
- Previous message: rpms/kernel/devel patch-2.6.24-rc3-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.721, 1.722 kernel.spec, 1.265, 1.266 sources, 1.681, 1.682 upstream, 1.603, 1.604 patch-2.6.24-rc3-git3.bz2.sign, 1.1, NONE
- Next message: rpms/amarok/F-8 amarok-1.4.7-148317.patch, NONE, 1.1 amarok-asf.patch, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list