ooo-build r11480 - in trunk: . patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Thu Jan 31 14:33:10 2008
New Revision: 11480
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11480&view=rev

Log:
2008-01-31  Petr Mladek  <pmladek suse cz>

	* patches/src680/gcc-4.3-icc.diff, patches/src680/apply: fixes build
	  with gcc-4.3 on x86_64, i#85771



Added:
   trunk/patches/src680/gcc-4.3-icc.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Jan 31 14:33:10 2008
@@ -1094,6 +1094,11 @@
 
 [ BuildBits >= ooh680-m5 ]
 
+# fix build with gcc-4.3 on x86_64
+gcc-4.3-icc.diff, i#85771, pmladek
+
+[ BuildBits >= ooh680-m5 < ooh680-m6  ]
+
 # fixes missing sprintf argument
 warning-too-few-arguments-icc.diff. i#85736, pmladek
 

Added: trunk/patches/src680/gcc-4.3-icc.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/gcc-4.3-icc.diff	Thu Jan 31 14:33:10 2008
@@ -0,0 +1,112 @@
+--- icc/SampleICC-1.3.2-bendian.patch.old	2008-01-30 20:31:42.000000000 +0100
++++ icc/SampleICC-1.3.2-bendian.patch	2008-01-31 14:12:40.000000000 +0100
+@@ -5081,3 +5081,53 @@
+   	IccProfLibTest \
+   	IccStripUnknownTags \
+   	IccV4ToMPE
++*** misc/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp	2007-08-20 22:04:53.000000000 +0200
++--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp	2008-01-31 13:53:16.000000000 +0100
++***************
++*** 77,82 ****
++--- 77,84 ----
++  //
++  //////////////////////////////////////////////////////////////////////
++  
+++ #include <stdlib.h>
+++ #include <string.h>
++  #include <iostream>
++  #include <fstream>
++  #include <sstream>
++*** misc/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h	2007-08-20 22:04:54.000000000 +0200
++--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h	2008-01-31 13:54:51.000000000 +0100
++***************
++*** 83,88 ****
++--- 83,89 ----
++  #ifndef __DEFINED_ICC_TOOL_EXCEPTION_H__
++  #define __DEFINED_ICC_TOOL_EXCEPTION_H__
++  
+++ #include <string.h>
++  #include <exception>
++  #include <string>
++  
++*** misc/SampleICC-1.3.2/IccProfLib/IccCmm.cpp	2007-08-20 22:05:00.000000000 +0200
++--- misc/build/SampleICC-1.3.2/IccProfLib/IccCmm.cpp	2008-01-31 13:49:54.000000000 +0100
++***************
++*** 79,84 ****
++--- 79,86 ----
++  #pragma warning( disable: 4786) //disable warning in <list.h>
++  #endif
++  
+++ #include <stdlib.h>
+++ #include <string.h>
++  #include "IccCmm.h"
++  #include "IccTag.h"
++  #include "IccIO.h"
++*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h	2007-08-20 22:04:53.000000000 +0200
++--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h	2008-01-31 14:05:58.000000000 +0100
++***************
++*** 83,88 ****
++--- 83,89 ----
++  #include <string>
++  #include <sys/types.h>
++  #include <sys/stat.h>
+++ #include <stdlib.h>
++  
++  #ifdef WIN32
++  typedef unsigned short mode_t;
+--- icc/SampleICC-1.3.2.patch.old	2008-01-30 20:31:42.000000000 +0100
++++ icc/SampleICC-1.3.2.patch	2008-01-31 14:12:48.000000000 +0100
+@@ -5034,3 +5034,53 @@
+   	IccProfLibTest \
+   	IccStripUnknownTags \
+   	IccV4ToMPE
++*** misc/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp	2007-08-20 22:04:53.000000000 +0200
++--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/CLUT.cpp	2008-01-31 13:53:16.000000000 +0100
++***************
++*** 77,82 ****
++--- 77,84 ----
++  //
++  //////////////////////////////////////////////////////////////////////
++  
+++ #include <stdlib.h>
+++ #include <string.h>
++  #include <iostream>
++  #include <fstream>
++  #include <sstream>
++*** misc/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h	2007-08-20 22:04:54.000000000 +0200
++--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/ICC_tool_exception.h	2008-01-31 13:54:51.000000000 +0100
++***************
++*** 83,88 ****
++--- 83,89 ----
++  #ifndef __DEFINED_ICC_TOOL_EXCEPTION_H__
++  #define __DEFINED_ICC_TOOL_EXCEPTION_H__
++  
+++ #include <string.h>
++  #include <exception>
++  #include <string>
++  
++*** misc/SampleICC-1.3.2/IccProfLib/IccCmm.cpp	2007-08-20 22:05:00.000000000 +0200
++--- misc/build/SampleICC-1.3.2/IccProfLib/IccCmm.cpp	2008-01-31 13:49:54.000000000 +0100
++***************
++*** 79,84 ****
++--- 79,86 ----
++  #pragma warning( disable: 4786) //disable warning in <list.h>
++  #endif
++  
+++ #include <stdlib.h>
+++ #include <string.h>
++  #include "IccCmm.h"
++  #include "IccTag.h"
++  #include "IccIO.h"
++*** misc/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h	2007-08-20 22:04:53.000000000 +0200
++--- misc/build/SampleICC-1.3.2/Contrib/ICC_utils/Vetters.h	2008-01-31 14:05:58.000000000 +0100
++***************
++*** 83,88 ****
++--- 83,89 ----
++  #include <string>
++  #include <sys/types.h>
++  #include <sys/stat.h>
+++ #include <stdlib.h>
++  
++  #ifdef WIN32
++  typedef unsigned short mode_t;