ooo-build r12346 - in trunk: . src

[tml svn gnome org]

Author: tml
Date: Sat Apr 26 04:05:27 2008
New Revision: 12346
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12346&view=rev

Log:
2008-04-26  Tor Lillqvist  <tml novell com>

	* src/libIDL-0.6.8-ooo.patch: Update for MSVS9 which is the
	compiler that should be use now for Win32 builds.

	* src/libIDL-0.6.8-ooo.patch (libIDL-0.6.8/Makefile.msc): Don't
	use options -G5 and -GD which don't exist any more. Use
	-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE to avoid
	silly warnings.

	* src/libIDL-0.6.8-ooo.patch (libIDL-0.6.8/util.h): Don't redefine
	alloca as empty to avoid warnings. The glibconfig.h in glib 1.2.10
	already defines it as _alloca.
	(libIDL-0.6.8/util.c): #define popen and pclose as the
	underscore-prefixed functions.



Modified:
   trunk/ChangeLog
   trunk/src/libIDL-0.6.8-ooo.patch

Modified: trunk/src/libIDL-0.6.8-ooo.patch
==============================================================================
--- trunk/src/libIDL-0.6.8-ooo.patch	(original)
+++ trunk/src/libIDL-0.6.8-ooo.patch	Sat Apr 26 04:05:27 2008
@@ -12,9 +12,35 @@
  GLIB_LIB = glib-1.2.lib
  
  # libIDL dll version
+@@ -23,7 +23,7 @@
+ 
+ 
+ ################################################################
+-CC = cl -G5 -GF $(CCOPT) -W3 -D_DLL -nologo
++CC = cl -GF $(CCOPT) -W3 -D_DLL -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -nologo
+ LDFLAGS = /link /nodefaultlib:libc msvcrt.lib /libpath:$(GLIB_LIBPATH) $(LDOPT)
+ INSTALL = copy
+ TOUCH = copy Makefile.msc+nul
+@@ -45,7 +45,7 @@
+         $(CC) $(CFLAGS) -MD -LD -FelibIDL-$(LIBIDL_LIBVER).dll $(libIDL_OBJECTS) $(GLIB_LIB) user32.lib advapi32.lib $(LDFLAGS) /def:libIDL.def
+ 
+ .c.obj:
+-        $(CC) $(CFLAGS) -GD -c -DPACKAGE=\"libIDL\" -DLIBIDL_LIBRARY_VERSION=\"$(LIBIDL_REALVER)\" -DHAVE_CPP_PIPE_STDIN=1 -DCPP_PROGRAM="\"notsupported\"" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_STDDEF_H=1 -DHAVE_WCHAR_H=1 -DYYDEBUG=1 -DIDL_LIBRARY -DG_LOG_DOMAIN=\"libIDL\" $<
++        $(CC) $(CFLAGS) -c -DPACKAGE=\"libIDL\" -DLIBIDL_LIBRARY_VERSION=\"$(LIBIDL_REALVER)\" -DHAVE_CPP_PIPE_STDIN=1 -DCPP_PROGRAM="\"notsupported\"" -DYYTEXT_POINTER=1 -DSTDC_HEADERS=1 -DHAVE_STDDEF_H=1 -DHAVE_WCHAR_H=1 -DYYDEBUG=1 -DIDL_LIBRARY -DG_LOG_DOMAIN=\"libIDL\" $<
+ 
+ tstidl.exe: libIDL-$(LIBIDL_LIBVER).dll tstidl.obj
+         $(CC) $(CFLAGS) -MD -Fetstidl.exe tstidl.obj libIDL-$(LIBIDL_LIBVER).lib $(GLIB_LIB) $(LDFLAGS) /map
 diff -ur libIDL-0.6.8/util.h libIDL-0.6.8-manual/util.h
 --- libIDL-0.6.8/util.h	1999-06-09 17:33:31.000000000 +0200
 +++ libIDL-0.6.8/util.h	2005-10-14 12:49:00.215250000 +0200
+@@ -36,7 +36,6 @@
+ #include "IDL.h"
+ 
+ #ifdef _WIN32
+-#  define alloca
+ #  define NO_ACCESS
+ #endif
+ 
 @@ -95,6 +95,7 @@
  #ifndef HAVE_CPP_PIPE_STDIN
  extern char *				__IDL_tmp_filename;
@@ -23,3 +49,14 @@
  extern const char *			__IDL_real_filename;
  extern char *				__IDL_cur_filename;
  extern int				__IDL_cur_line;
+--- libIDL-0.6.8/util.c
++++ libIDL-0.6.8/util.c
+@@ -34,6 +34,8 @@
+ #include "rename.h"
+ #include "util.h"
+ 
++#define popen _popen
++#define pclose _pclose
+ IDL_EXPORT const char *IDL_tree_type_names[] = {
+ 	"IDLN_NONE",
+ 	"IDLN_ANY",