ooo-build r15171 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Jan 27 19:27:23 2009
New Revision: 15171
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15171&view=rev

Log:
2009-01-27  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/buildfix-x86-64-visibility-workaround-m39.diff:
	* patches/dev300/buildfix-x86-64-visibility-workaround.diff:	
	* patches/dev300/makefile-idl-build-m39.diff:
	* patches/dev300/makefile-idl-build.diff:	
	* patches/dev300/wpsimport-config_office-m39.diff:
	* patches/dev300/wpsimport-config_office.diff:	
	* patches/dev300/apply: re-enabled and adjusted these patches for 
	dev300-m40.


Added:
   trunk/patches/dev300/buildfix-x86-64-visibility-workaround-m39.diff
      - copied unchanged from r15169, /trunk/patches/dev300/buildfix-x86-64-visibility-workaround.diff
   trunk/patches/dev300/makefile-idl-build-m39.diff
      - copied unchanged from r15169, /trunk/patches/dev300/makefile-idl-build.diff
   trunk/patches/dev300/wpsimport-config_office-m39.diff
      - copied unchanged from r15169, /trunk/patches/dev300/wpsimport-config_office.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/buildfix-x86-64-visibility-workaround.diff
   trunk/patches/dev300/makefile-idl-build.diff
   trunk/patches/dev300/wpsimport-config_office.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 19:27:23 2009
@@ -181,11 +181,11 @@
 
 [ TemporaryHacks < dev300-m40 ]
 # add idl target to toplevel makefile
-makefile-idl-build.diff, noelpwer
+makefile-idl-build-m39.diff, noelpwer
 
 [ TemporaryHacks >= dev300-m40 ]
 # add idl target to toplevel makefile
-#FIXME_m40 makefile-idl-build.diff, noelpwer
+makefile-idl-build.diff, noelpwer
 
 [ TemporaryHacks ]
 # Pagein types.rdb / services.rdb & the ui files
@@ -315,10 +315,10 @@
 # MS Works import filter (following patches depend on each other) Fridrich
 
 [ WPS < dev300-m40 ]
-wpsimport-config_office.diff
+wpsimport-config_office-m39.diff
 
 [ WPS >= dev300-m40 ]
-#FIXME_m40 wpsimport-config_office.diff
+wpsimport-config_office.diff
 
 [ WPS ]
 wpsimport-filter.diff
@@ -346,12 +346,12 @@
 [ CWSBackports < dev300-m40 ]
 # not for upstreaming: don't disable the entire visibility, just
 # the -fvisibility-inlines-hidden
-buildfix-x86-64-visibility-workaround.diff
+buildfix-x86-64-visibility-workaround-m39.diff
 
 [ CWSBackports >= dev300-m40 ]
 # not for upstreaming: don't disable the entire visibility, just
 # the -fvisibility-inlines-hidden
-#FIXME_m40 buildfix-x86-64-visibility-workaround.diff
+buildfix-x86-64-visibility-workaround.diff
 
 [ CWSBackports == dev300-m38 ]
 # 'PreferredFilter' filter option should only be used if the filter is an 

Modified: trunk/patches/dev300/buildfix-x86-64-visibility-workaround.diff
==============================================================================
--- trunk/patches/dev300/buildfix-x86-64-visibility-workaround.diff	(original)
+++ trunk/patches/dev300/buildfix-x86-64-visibility-workaround.diff	Tue Jan 27 19:27:23 2009
@@ -1,7 +1,7 @@
 diff --git a/config_office/configure.in b/config_office/configure.in
 index b2faf3a..68e4904 100644
---- config_office/configure.in
-+++ config_office/configure.in
+--- configure.in.old
++++ configure.in
 @@ -2369,6 +2369,7 @@ AC_SUBST(USE_SYSTEM_STL)
  dnl ===================================================================
  dnl system stl sanity tests
@@ -33,8 +33,8 @@
  dnl allocator
 diff --git a/config_office/set_soenv.in b/config_office/set_soenv.in
 index f1538b9..488597a 100644
---- config_office/set_soenv.in
-+++ config_office/set_soenv.in
+--- set_soenv.in.old
++++ set_soenv.in
 @@ -1917,6 +1917,8 @@ ToFile( "JAVAHOME",          $JAVAHOME,          "e" );
  ToFile( "CC",                $CC,                "e" );
  ToFile( "HAVE_GCC_VISIBILITY_FEATURE",

Modified: trunk/patches/dev300/makefile-idl-build.diff
==============================================================================
--- trunk/patches/dev300/makefile-idl-build.diff	(original)
+++ trunk/patches/dev300/makefile-idl-build.diff	Tue Jan 27 19:27:23 2009
@@ -1,5 +1,5 @@
---- config_office.bak/makefile.rc	2006-01-06 11:17:31.000000000 +0000
-+++ config_office/makefile.rc	2006-08-08 13:43:04.000000000 +0100
+--- makefile.rc.old	2006-01-06 11:17:31.000000000 +0000
++++ makefile.rc	2006-08-08 13:43:04.000000000 +0100
 @@ -46,6 +46,16 @@ check_modules .PHONY :
  	@+echo Checking module list
  	@+perl $(SOLARENV)$/bin$/build.pl --checkmodules

Modified: trunk/patches/dev300/wpsimport-config_office.diff
==============================================================================
--- trunk/patches/dev300/wpsimport-config_office.diff	(original)
+++ trunk/patches/dev300/wpsimport-config_office.diff	Tue Jan 27 19:27:23 2009
@@ -1,5 +1,5 @@
---- config_office/configure.in	25 Apr 2007 15:53:53 -0000	1.201
-+++ config_office/configure.in	7 May 2007 09:28:02 -0000	1.189.2.5
+--- configure.in.old	25 Apr 2007 15:53:53 -0000	1.201
++++ configure.in	7 May 2007 09:28:02 -0000	1.189.2.5
 @@ -296,6 +296,9 @@ AC_ARG_WITH(system-freetype,
  AC_ARG_WITH(system-libwpd,
  [  --with-system-libwpd    Use libwpd already on system
@@ -35,8 +35,8 @@
  dnl Check whether freetype2 supports emboldening
  dnl ===================================================================
  if test "$SYSTEM_FREETYPE" = "YES" ; then
---- config_office/set_soenv.in	25 Apr 2007 15:54:09 -0000	1.141
-+++ config_office/set_soenv.in	7 May 2007 09:28:12 -0000	1.127.2.5
+--- set_soenv.in.old	25 Apr 2007 15:54:09 -0000	1.141
++++ set_soenv.in	7 May 2007 09:28:12 -0000	1.127.2.5
 @@ -1817,6 +1817,9 @@ ToFile( "CAIRO_LIBS",        "@CAIRO_LIB
  ToFile( "SYSTEM_LIBWPD",     "@SYSTEM_LIBWPD@",    "e" );
  ToFile( "LIBWPD_CFLAGS",     "@LIBWPD_CFLAGS@",    "e" );