rpms/evolution-data-server/FC-4 evolution-data-server-1.2.3-fix-implicit-function-declarations.patch, NONE, 1.1 evolution-data-server.spec, 1.50, 1.51

[fedora-cvs-commits redhat com]

Author: dmalcolm

Update of /cvs/dist/rpms/evolution-data-server/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv29685

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.2.3-fix-implicit-function-declarations.patch 
Log Message:
* Tue Aug 30 2005 David Malcolm <dmalcolm redhat com> - 1.2.3-3.fc4
- Add -Werror-implicit-function-declaration to CFLAGS during make (but not 
  during configure), to avoid 64-bit issues and add patch to fix these where 
  they occur, also patching libdb Makefile.in to avoid this breaking the build
  (all of this is patch 103)



evolution-data-server-1.2.3-fix-implicit-function-declarations.patch:
 calendar/backends/weather/e-weather-source.c       |    1 +
 calendar/libical/src/libicalss/icalssyacc.y        |    1 +
 calendar/libical/src/libicalvcal/vcc.y             |    3 ++-
 docs/reference/addressbook/libebook/libebook.types |    6 ++++++
 docs/reference/calendar/libecal/libecal.types      |    7 ++++++-
 docs/reference/libedataserver/libedataserver.types |   11 ++++++++++-
 iconv-detect.c                                     |    1 +
 libdb/dist/Makefile.in                             |    2 +-
 libedataserver/e-categories.c                      |    1 +
 libedataserverui/e-name-selector-dialog.c          |    4 ++++
 libedataserverui/e-name-selector-entry.c           |    1 +
 libedataserverui/test-contact-store.c              |    1 +
 12 files changed, 35 insertions(+), 4 deletions(-)

--- NEW FILE evolution-data-server-1.2.3-fix-implicit-function-declarations.patch ---
--- evolution-data-server-1.2.3/libdb/dist/Makefile.in.fix-implicit-function-declarations	2004-02-24 16:05:39.000000000 -0500
+++ evolution-data-server-1.2.3/libdb/dist/Makefile.in	2005-08-30 22:29:39.000000000 -0400
@@ -51,7 +51,7 @@
 # C API.
 ##################################################
 CPPFLAGS=	-I$(builddir) -I$(srcdir) -I$(srcdir)/dbinc @CPPFLAGS@
-CFLAGS=	 	-c $(CPPFLAGS) @CFLAGS@
+override CFLAGS+= -c $(CPPFLAGS) @CFLAGS@
 CC=		@MAKEFILE_CC@
 CCLINK=		@MAKEFILE_CCLINK@
 
--- evolution-data-server-1.2.3/iconv-detect.c.fix-implicit-function-declarations	2004-12-02 22:34:16.000000000 -0500
+++ evolution-data-server-1.2.3/iconv-detect.c	2005-08-30 22:29:39.000000000 -0400
@@ -21,6 +21,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <iconv.h>
 
 enum {
--- evolution-data-server-1.2.3/calendar/libical/src/libicalss/icalssyacc.y.fix-implicit-function-declarations	2005-08-30 23:25:05.000000000 -0400
+++ evolution-data-server-1.2.3/calendar/libical/src/libicalss/icalssyacc.y	2005-08-30 23:25:34.000000000 -0400
@@ -47,6 +47,7 @@
 static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1);
 static void set_logic(struct icalgauge_impl* impl,icalgaugelogic l);
 void sserror(char *s); /* Don't know why I need this.... */
+int sslex(void *YYPARSE_PARAM);
 
 %}
 
--- evolution-data-server-1.2.3/calendar/libical/src/libicalvcal/vcc.y.fix-implicit-function-declarations	2005-08-30 23:26:39.000000000 -0400
+++ evolution-data-server-1.2.3/calendar/libical/src/libicalvcal/vcc.y	2005-08-30 23:27:38.000000000 -0400
@@ -170,6 +170,7 @@
 static void enterAttr(const char *s1, const char *s2);
 static void enterValues(const char *value);
 static void mime_error_(char *s);
+static int mime_lex(void);
 
 %}
 
@@ -987,7 +988,7 @@
     return lexStr();
     } /* LexQuotedPrintable */
 
-int yylex() {
+int yylex(void) {
 
     int lexmode = LEXMODE();
     if (lexmode == L_VALUES) {
--- evolution-data-server-1.2.3/calendar/backends/weather/e-weather-source.c.fix-implicit-function-declarations	2005-08-30 23:46:36.000000000 -0400
+++ evolution-data-server-1.2.3/calendar/backends/weather/e-weather-source.c	2005-08-30 23:47:07.000000000 -0400
@@ -18,6 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <string.h>
 #include "e-weather-source.h"
 #include "e-weather-source-ccf.h"
 
--- evolution-data-server-1.2.3/libedataserver/e-categories.c.fix-implicit-function-declarations	2005-08-30 22:57:16.000000000 -0400
+++ evolution-data-server-1.2.3/libedataserver/e-categories.c	2005-08-30 22:57:48.000000000 -0400
@@ -22,6 +22,7 @@
 #endif
 
 #include <libxml/parser.h>
+#include <string.h>
 #include <glib/ghash.h>
 #include <glib/gi18n-lib.h>
 #include <gconf/gconf-client.h>
--- evolution-data-server-1.2.3/libedataserverui/test-contact-store.c.fix-implicit-function-declarations	2005-08-31 00:00:27.000000000 -0400
+++ evolution-data-server-1.2.3/libedataserverui/test-contact-store.c	2005-08-31 00:01:05.000000000 -0400
@@ -28,6 +28,7 @@
 #include "e-contact-store.h"
 #include <gtk/gtk.h>
 #include <libgnomeui/gnome-ui-init.h>
+#include <bonobo/bonobo-main.h>
 
 static void
 entry_changed (GtkWidget *entry, EContactStore *contact_store)
--- evolution-data-server-1.2.3/libedataserverui/e-name-selector-dialog.c.fix-implicit-function-declarations	2005-08-30 23:50:49.000000000 -0400
+++ evolution-data-server-1.2.3/libedataserverui/e-name-selector-dialog.c	2005-08-30 23:56:10.000000000 -0400
@@ -26,11 +26,15 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkalignment.h>
 #include <gtk/gtkbutton.h>
+#include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkentry.h>
+#include <gtk/gtkhbox.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkstock.h>
+#include <gtk/gtktreeselection.h>
 #include <glib/gi18n-lib.h>
+#include <libedataserver/e-sexp.h>
 #include <libedataserverui/e-source-option-menu.h>
 #include <libedataserverui/e-destination-store.h>
 #include <libedataserverui/e-contact-store.h>
--- evolution-data-server-1.2.3/libedataserverui/e-name-selector-entry.c.fix-implicit-function-declarations	2005-08-30 23:56:47.000000000 -0400
+++ evolution-data-server-1.2.3/libedataserverui/e-name-selector-entry.c	2005-08-30 23:57:07.000000000 -0400
@@ -34,6 +34,7 @@
 #include <libebook/e-book.h>
 #include <libebook/e-contact.h>
 #include <libebook/e-destination.h>
+#include <libedataserver/e-sexp.h>
 #include <libedataserverui/e-book-auth-util.h>
 
 #include "e-name-selector-entry.h"
--- evolution-data-server-1.2.3/docs/reference/addressbook/libebook/libebook.types.fix-implicit-function-declarations	2005-08-31 00:04:58.000000000 -0400
+++ evolution-data-server-1.2.3/docs/reference/addressbook/libebook/libebook.types	2005-08-31 00:05:40.000000000 -0400
@@ -1,4 +1,10 @@
 #include <glib-object.h>
+#include <libebook/e-book-listener.h>
+#include <libebook/e-book-view-listener.h>
+#include <libebook/e-book-view.h>
+#include <libebook/e-book.h>
+#include <libebook/e-contact.h>
+#include <libebook/e-vcard.h>
 e_book_listener_get_type
 e_book_view_listener_get_type
 e_book_view_get_type
--- evolution-data-server-1.2.3/docs/reference/calendar/libecal/libecal.types.fix-implicit-function-declarations	2005-08-31 00:07:40.000000000 -0400
+++ evolution-data-server-1.2.3/docs/reference/calendar/libecal/libecal.types	2005-08-31 00:08:37.000000000 -0400
@@ -1,6 +1,11 @@
 #include <glib-object.h>
+#include <libecal/e-cal.h>
+#include <libecal/e-cal-view.h>
+#include <libecal/e-cal-listener.h>
+#include <libecal/e-cal-view-listener.h>
+#include <libecal/e-cal-component.h>
 e_cal_get_type
 e_cal_view_get_type
 e_cal_listener_get_type
 e_cal_view_listener_get_type
-e_cal_component_get_type
\ No newline at end of file
+e_cal_component_get_type
--- evolution-data-server-1.2.3/docs/reference/libedataserver/libedataserver.types.fix-implicit-function-declarations	2005-08-31 00:10:36.000000000 -0400
+++ evolution-data-server-1.2.3/docs/reference/libedataserver/libedataserver.types	2005-08-31 00:11:18.000000000 -0400
@@ -1,4 +1,13 @@
 #include <glib-object.h>
+#include <libedataserver/e-account.h>
+#include <libedataserver/e-component-listener.h>
+#include <libedataserver/e-file-cache.h>
+#include <libedataserver/e-iterator.h>
+#include <libedataserver/e-list-iterator.h>
+#include <libedataserver/e-list.h>
+#include <libedataserver/e-source-group.h>
+#include <libedataserver/e-source-list.h>
+#include <libedataserver/e-source.h>
 e_account_get_type
 e_component_listener_get_type
 e_file_cache_get_type
@@ -7,4 +16,4 @@
 e_list_get_type
 e_source_group_get_type
 e_source_list_get_type
-e_source_get_type
\ No newline at end of file
+e_source_get_type


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/FC-4/evolution-data-server.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- evolution-data-server.spec	8 Aug 2005 17:23:25 -0000	1.50
+++ evolution-data-server.spec	31 Aug 2005 00:34:20 -0000	1.51
@@ -23,7 +23,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.2.3
-Release: 2.fc4
+Release: 3.fc4
 License: GPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -39,6 +39,7 @@
 Patch100: evolution-data-server-1.2.0-cope-with-a-macro-called-read.patch
 Patch101: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch
 Patch102: evolution-data-server-1.2.3-fix-ldap-backend.patch
+Patch103: evolution-data-server-1.2.3-fix-implicit-function-declarations.patch
 
 # Leak fixes by Mark G. Adams
 Patch200: gb-309079-attach-48376.patch
@@ -111,6 +112,7 @@
 %patch100 -p1 -b .cope-with-a-macro-called-read
 %patch101 -p1 -b .fix_open_calendar_declaration
 %patch102 -p1 -b .fix-ldap-backend
+%patch103 -p1 -b .fix-implicit-function-declarations
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
 
@@ -170,7 +172,7 @@
   --enable-file-locking=fcntl --enable-dot-locking=no \
   %ldap_flags %krb5_flags %nntp_flags %ssl_flags
 export tagname=CC
-make LIBTOOL=/usr/bin/libtool
+make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -212,6 +214,12 @@
 
 
 %changelog
+* Tue Aug 30 2005 David Malcolm <dmalcolm redhat com> - 1.2.3-3.fc4
+- Add -Werror-implicit-function-declaration to CFLAGS during make (but not 
+  during configure), to avoid 64-bit issues and add patch to fix these where 
+  they occur, also patching libdb Makefile.in to avoid this breaking the build
+  (all of this is patch 103)
+
 * Mon Aug  8 2005 David Malcolm <dmalcolm redhat com> - 1.2.3-2.fc4
 - Fix crash in the LDAP backend (#165269, upstream bug 311684, patch 102)