File evolution-2.24.3-crosscompile.patch of Package mingw32-evolution

Overview Repositories Revisions Requests Users Attributes Meta

File evolution-2.24.3-crosscompile.patch of Package mingw32-evolution (Revision a4c50f7b9237fbe09a5e44e786b5e9f9)

Currently displaying revision a4c50f7b9237fbe09a5e44e786b5e9f9 , Show latest

--- evolution-2.24.3/configure.in	2009-01-09 08:46:06.000000000 +0100
+++ evolution-2.24.3/configure.in	2009-01-23 09:19:21.000000000 +0100
@@ -100,6 +100,7 @@
 	;;
 esac
 AC_STDC_HEADERS
+AC_HEADER_CHECK(sys/wait.h, AC_DEFINE([HAVE_SYS_WAIT_H], 1, [If we have sys/wait.h header]),)
 AC_ARG_PROGRAM
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -204,45 +205,41 @@
 dnl iconv checking
 dnl ******************************
 have_iconv=no
-AC_ARG_WITH([libiconv],
-	    AC_HELP_STRING([--with-libiconv=PATH],
-			   [Prefix where libiconv is installed]))
-case $withval in
-/*)
-	ICONV_CFLAGS="-I$withval/include"
-	ICONV_LIBS="-L$withval/lib"
-	;;
-esac
+AC_ARG_WITH(libiconv, 
+  AC_HELP_STRING( [--with-libiconv],
+		  [Prefix where libiconv is installed]))
+if test -d $withval; then
+    ICONV_CFLAGS="-I$withval/include"
+    ICONV_LIBS="-L$withval/lib"
+fi
 
 save_CFLAGS="$CFLAGS"
 save_LIBS="$LIBS"
 CFLAGS="$CFLAGS $ICONV_CFLAGS"
 LIBS="$LIBS $ICONV_LIBS -liconv"
-AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv,
-	       AC_TRY_RUN([
+AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([
 #include <iconv.h>
-#include <stdlib.h>
+#include <stdlib.h>],[
 
 int main (int argc, char **argv)
 {
-        iconv_t cd;
-        cd = iconv_open ("UTF-8", "ISO-8859-1");
-        exit (0);
+	iconv_t cd;
+	cd = iconv_open ("UTF-8", "ISO-8859-1");
+	exit (0);
 }
-], [ac_cv_libiconv=yes], [ac_cv_libiconv=no], [ac_cv_libiconv=no]))
-
+], ac_cv_libiconv=yes, ac_cv_libiconv=no))
 if test $ac_cv_libiconv = yes; then
-        ICONV_LIBS="$ICONV_LIBS -liconv"
+	ICONV_LIBS="$ICONV_LIBS -liconv"
 	if test $os_win32 = yes; then
 		# Don't pointlessly auto-export the global symbols
 		# from a potentially static libiconv.a
 		ICONV_LIBS="$ICONV_LIBS -Wl,--exclude-libs=libiconv.a"
 	fi
-        have_iconv=yes
+	have_iconv=yes
 else
-        CFLAGS="$save_CFLAGS"
-        LIBS="$save_LIBS"
-        AC_CHECK_FUNC(iconv, have_iconv=yes, have_iconv=no)
+	CFLAGS="$save_CFLAGS"
+	LIBS="$save_LIBS"
+	AC_CHECK_FUNC(iconv, have_iconv=yes, have_iconv=no)
 fi
 
 if test $have_iconv = yes; then
@@ -282,8 +279,7 @@
                 exit (1);
 
         exit (0);
-}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv
-_libiconv_utf8=no; have_iconv=no]))
+}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], ac_cv_libiconv_utf8=HOPEFULLY))
 fi
 
 if test "$have_iconv" = no; then
@@ -300,16 +296,33 @@
 #define CONFIGURE_IN
 #include "iconv-detect.c"
 ],[
-        AC_MSG_RESULT(found)
+	AC_MSG_RESULT(found)
+],[
+	AC_MSG_RESULT(not found)
+	AC_WARN([
+	*** The iconv-detect program was unable to determine the
+	*** preferred charset formats recognized by your system
+	*** iconv library. It is suggested that you install a
+	*** working iconv library such as the one found at
+	*** ftp://ftp.gnu.org/pub/gnu/libiconv
+])
 ],[
-        AC_MSG_RESULT(not found)
-        AC_WARN([
-        *** The iconv-detect program was unable to determine the
-        *** preferred charset formats recognized by your system
-        *** iconv library. It is suggested that you install a
-        *** working iconv library such as the one found at
-        *** ftp://ftp.gnu.org/pub/gnu/libiconv
-        ])
+  if test x$os_win32 = xyes; then
+    AC_MSG_RESULT(using cached win32 result)
+    echo "/* This is an auto-generated header, DO NOT EDIT! */" > iconv-detect.h
+    echo "" >>iconv-detect.h
+    echo "#define ICONV_ISO_D_FORMAT \"iso-%d-%d\"" >>iconv-detect.h
+    echo "#define ICONV_ISO_S_FORMAT \"iso-%d-%s\"" >>iconv-detect.h
+    echo "#define ICONV_10646 \"UCS-4BE\"" >>iconv-detect.h
+  else
+	AC_MSG_RESULT(unknown)
+	AC_WARN([
+	*** The iconv-detect program was unable to determine the
+	*** preferred charset formats recognized by your system
+	*** iconv library. You are crosscompiling and supposed
+	*** to know what you are doing. (:-)
+    ])
+  fi
 ])
 
 CFLAGS="$save_CFLAGS"
@@ -318,6 +331,8 @@
 dnl alloca()
 AC_CHECK_HEADERS(alloca.h)
 
+if test x$os_win32 != xyes; then
+
 dnl check for socklen_t (in Unix98)
 AC_MSG_CHECKING(for socklen_t)
 AC_TRY_COMPILE([#include <sys/types.h>
@@ -333,6 +348,8 @@
 AC_MSG_RESULT(int)
 AC_DEFINE(socklen_t,int)])])
 
+fi
+
 dnl
 dnl Purify support
 dnl
--- evolution-2.24.3/plugins/backup-restore/backup.c	2008-10-13 10:36:59.000000000 +0200
+++ evolution-2.24.3/plugins/backup-restore/backup.c	2009-01-23 09:26:33.000000000 +0100
@@ -24,9 +24,11 @@
 
 #include <errno.h>
 #include <stdio.h>
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
-#include <sys/wait.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
--- evolution-2.24.3/plugins/backup-restore/backup-restore.c	2008-10-13 10:36:59.000000000 +0200
+++ evolution-2.24.3/plugins/backup-restore/backup-restore.c	2009-01-23 09:25:43.000000000 +0100
@@ -18,9 +18,16 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <sys/types.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
+#include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -71,9 +78,13 @@
 	result = system (command);
 	g_free (command);
 
+#ifdef HAVE_SYS_WAIT_H
 	g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result);
 
-	return WIFEXITED (result) && (WEXITSTATUS (result) == 0);
+	return WIFEXITED (result) && (WEXITSTATUS (result) == 0); */
+#else	
+	return result;
+#endif
 }
 
 static guint32
--- evolution-2.24.3/plugins/backup-restore/Makefile.am	2008-10-13 10:36:59.000000000 +0200
+++ evolution-2.24.3/plugins/backup-restore/Makefile.am	2009-01-22 22:04:47.000000000 +0100
@@ -20,7 +20,8 @@
 liborg_gnome_backup_restore_la_SOURCES = backup-restore.c
 liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 liborg_gnome_backup_restore_la_LIBADD =	\
-	$(EVOLUTION_MAIL_LIBS)
+	$(EVOLUTION_MAIL_LIBS) \
+	$(top_builddir)/e-util/libeutil.la
 
 privlibexec_PROGRAMS = evolution-backup
 evolution_backup_SOURCES = backup.c
--- evolution-2.24.3/plugins/bogo-junk-plugin/bf-junk-filter.c	2008-12-15 07:39:06.000000000 +0100
+++ evolution-2.24.3/plugins/bogo-junk-plugin/bf-junk-filter.c	2009-01-23 09:41:32.000000000 +0100
@@ -25,7 +25,9 @@
 #include "config.h"
 #endif
 
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
 #include <signal.h>
 #include <unistd.h>
 #include <errno.h>
@@ -163,6 +165,7 @@
 	camel_stream_close (stream);
 	camel_object_unref (stream);
 
+#ifdef HAVE_SYS_WAIT_H
 	waitres = waitpid (child_pid, &status, 0);
 	if (waitres < 0 && errno == EINTR) {
 		/* child process is hanging... */
@@ -200,6 +203,9 @@
 		g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to Bogofilter failed, error code: %d."), res);
 	
 	}
+#else
+	res = BOGOFILTER_ERROR;
+#endif
 
 	return res;
 }
--- evolution-2.24.3/plugins/bogo-junk-plugin/Makefile.am	2008-12-15 07:39:06.000000000 +0100
+++ evolution-2.24.3/plugins/bogo-junk-plugin/Makefile.am	2009-01-23 09:43:32.000000000 +0100
@@ -10,6 +10,9 @@
 
 liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c
 liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_bogo_junk_plugin_la_LIBADD =	\
+	$(GNOME_PLATFORM_LIBS) \
+	$(top_builddir)/e-util/libeutil.la
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = bogo-junk-plugin.schemas.in
--- evolution-2.24.3/plugins/external-editor/external-editor.c	2008-10-13 10:36:58.000000000 +0200
+++ evolution-2.24.3/plugins/external-editor/external-editor.c	2009-01-23 09:30:56.000000000 +0100
@@ -38,7 +38,9 @@
 #include <glib/gstdio.h>
 
 #include <sys/stat.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
@@ -151,7 +153,11 @@
 		return ;
 	}
 	
+#ifdef HAVE_SYS_WAIT_H
 	if (WEXITSTATUS (status) != 0) {
+#else
+	if (status) {
+#endif
 		d(printf ("\n\nsome problem here with external editor\n\n"));
 		return ;
 	} else {
--- evolution-2.24.3/plugins/external-editor/Makefile.am	2008-10-13 10:36:58.000000000 +0200
+++ evolution-2.24.3/plugins/external-editor/Makefile.am	2009-01-23 14:24:02.000000000 +0100
@@ -1,3 +1,7 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
+endif
+
 INCLUDES =						\
 	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\
 	-DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\"	\
@@ -25,7 +29,13 @@
 liborg_gnome_external_editor_la_SOURCES = 		\
 	external-editor.c
 
-liborg_gnome_external_editor_la_LDFLAGS = -module -avoid-version
+liborg_gnome_external_editor_la_LDFLAGS = \
+	-module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_external_editor_la_LIBADD = \
+	$(EVOLUTION_MAIL_LIBS) \
+	$(GNOME_PLATFORM_LIBS) \
+	$(top_builddir)/e-util/libeutil.la \
+	$(NO_UNDEFINED_REQUIRED_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
 schema_in_files = apps-evolution-external-editor.schemas.in
--- evolution-2.24.3/plugins/mail-notification/Makefile.am	2008-10-13 10:37:01.000000000 +0200
+++ evolution-2.24.3/plugins/mail-notification/Makefile.am	2009-01-23 13:05:58.000000000 +0100
@@ -16,8 +16,10 @@
 
 liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
 liborg_gnome_mail_notification_la_LDFLAGS = 	\
-	-module -avoid-version			\
-	$(LIBNOTIFY_LIBS)			
+	-module -avoid-version $(NO_UNDEFINED)
+liborg_gnome_mail_notification_la_LIBADD = \
+	$(LIBNOTIFY_LIBS) \		
+	$(GNOME_PLATFORM_LIBS)
 
 if ENABLE_DBUS
 liborg_gnome_mail_notification_la_LDFLAGS += $(NMN_LIBS)
--- evolution-2.24.3/plugins/sa-junk-plugin/em-junk-filter.c	2008-12-22 10:49:57.000000000 +0100
+++ evolution-2.24.3/plugins/sa-junk-plugin/em-junk-filter.c	2009-01-23 09:27:30.000000000 +0100
@@ -26,7 +26,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
+#ifdef HAVE_SYS_WAIT_H
+#  include <sys/wait.h>
+#endif
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
--- evolution-2.24.3/plugins/save-attachments/Makefile.am	2008-10-13 10:37:02.000000000 +0200
+++ evolution-2.24.3/plugins/save-attachments/Makefile.am	2009-01-23 13:15:51.000000000 +0100
@@ -1,3 +1,7 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
+endif
+
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	$(EVOLUTION_MAIL_CFLAGS)
@@ -8,7 +12,15 @@
 plugin_LTLIBRARIES = liborg-gnome-save-attachments.la
 
 liborg_gnome_save_attachments_la_SOURCES = save-attachments.c
-liborg_gnome_save_attachments_la_LDFLAGS = -module -avoid-version
+liborg_gnome_save_attachments_la_LDFLAGS = -module \
+	-avoid-version $(NO_UNDEFINED)
+	
+liborg_gnome_save_attachments_la_LIBADD = \
+	$(EVOLUTION_MAIL_LIBS) \
+	$(GNOME_PLATFORM_LIBS) \
+	$(NO_UNDEFINED_REQUIRED_LIBS)				\
+	$(top_builddir)/e-util/libeutil.la
+
 
 EXTRA_DIST = 					\
 	org-gnome-save-attachments.eplug.xml	\
--- evolution-2.24.3/plugins/tnef-attachments/Makefile.am	2008-10-13 10:37:01.000000000 +0200
+++ evolution-2.24.3/plugins/tnef-attachments/Makefile.am	2009-01-23 12:06:06.000000000 +0100
@@ -1,3 +1,7 @@
+if OS_WIN32
+NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la
+endif
+
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\""	\
@@ -11,7 +15,13 @@
 plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la
 
 liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c
-liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version -lytnef
+liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version  $(NO_UNDEFINED)
+liborg_gnome_tnef_attachments_la_LIBADD = \
+	$(EVOLUTION_MAIL_LIBS) \
+	$(GNOME_PLATFORM_LIBS) \
+	$(top_builddir)/e-util/libeutil.la \
+	$(NO_UNDEFINED_REQUIRED_LIBS)				\
+	-lytnef
 
 EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml
 
--- evolution-2.24.3/plugins/tnef-attachments/tnef-plugin.c	2008-10-13 10:37:01.000000000 +0200
+++ evolution-2.24.3/plugins/tnef-attachments/tnef-plugin.c	2009-01-23 09:48:11.000000000 +0100
@@ -31,7 +31,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <fcntl.h>
 #include <ctype.h>
 #include <stdlib.h>
--- evolution-2.24.3/win32/Makefile.am	2008-10-13 10:43:22.000000000 +0200
+++ evolution-2.24.3/win32/Makefile.am	2009-01-22 13:41:09.000000000 +0100
@@ -29,36 +29,36 @@
 libemiscwidgets.la: dummy.la libemiscwidgets.def
 	sed -e s!%DLL%!libemiscwidgets-0! -e s!%LIB%!libemiscwidgets! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libemiscwidgets.dll.a --dllname=libemiscwidgets-0.dll --input-def=libemiscwidgets.def
+	$(DLLTOOL) --output-lib=.libs/libemiscwidgets.dll.a --dllname=libemiscwidgets-0.dll --input-def=libemiscwidgets.def
 
 libetable.la: dummy.la libetable.def
 	sed -e s!%DLL%!libetable-0! -e s!%LIB%!libetable! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libetable.dll.a --dllname=libetable-0.dll --input-def=libetable.def
+	$(DLLTOOL) --output-lib=.libs/libetable.dll.a --dllname=libetable-0.dll --input-def=libetable.def
 
 libetext.la: dummy.la libetext.def
 	sed -e s!%DLL%!libetext-0! -e s!%LIB%!libetext! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libetext.dll.a --dllname=libetext-0.dll --input-def=libetext.def
+	$(DLLTOOL) --output-lib=.libs/libetext.dll.a --dllname=libetext-0.dll --input-def=libetext.def
 
 libevolution-addressbook.la: dummy.la libevolution-addressbook.def
 	sed -e s!%DLL%!libevolution-addressbook! -e s!%LIB%!libevolution-addressbook! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libevolution-addressbook.dll.a --dllname=libevolution-addressbook.dll --input-def=libevolution-addressbook.def
+	$(DLLTOOL) --output-lib=.libs/libevolution-addressbook.dll.a --dllname=libevolution-addressbook.dll --input-def=libevolution-addressbook.def
 
 libevolution-calendar.la: dummy.la libevolution-calendar.def
 	sed -e s!%DLL%!libevolution-calendar! -e s!%LIB%!libevolution-calendar! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libevolution-calendar.dll.a --dllname=libevolution-calendar.dll --input-def=libevolution-calendar.def
+	$(DLLTOOL) --output-lib=.libs/libevolution-calendar.dll.a --dllname=libevolution-calendar.dll --input-def=libevolution-calendar.def
 
 libevolution-mail.la: dummy.la libevolution-mail.def
 	sed -e s!%DLL%!libevolution-mail! -e s!%LIB%!libevolution-mail! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libevolution-mail.dll.a --dllname=libevolution-mail.dll --input-def=libevolution-mail.def
+	$(DLLTOOL) --output-lib=.libs/libevolution-mail.dll.a --dllname=libevolution-mail.dll --input-def=libevolution-mail.def
 
 libfilter.la: dummy.la libfilter.def
 	sed -e s!%DLL%!libfilter-0! -e s!%LIB%!libfilter! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libfilter.dll.a --dllname=libfilter-0.dll --input-def=libfilter.def
+	$(DLLTOOL) --output-lib=.libs/libfilter.dll.a --dllname=libfilter-0.dll --input-def=libfilter.def
 
 CLEANFILES = $(BOOTSTRAP_LIBS)

Places

File evolution-2.24.3-crosscompile.patch of Package mingw32-evolution (Revision a4c50f7b9237fbe09a5e44e786b5e9f9)

Places