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

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Jan 27 15:08:32 2009
New Revision: 15166
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15166&view=rev

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

	* patches/dev300/apply: disabled several patches against configure for
	dev300-m40 for now.
	
	* patches/dev300/wps-registry.diff: added scp2 to the paths.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/wps-registry.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jan 27 15:08:32 2009
@@ -179,9 +179,15 @@
 # fix the smoketest
 smoketest-fix.diff, michael, i#84720
 
+[ TemporaryHacks < dev300-m40 ]
 # add idl target to toplevel makefile
 makefile-idl-build.diff, noelpwer
 
+[ TemporaryHacks >= dev300-m40 ]
+# add idl target to toplevel makefile
+#FIXME_m40 makefile-idl-build.diff, noelpwer
+
+[ TemporaryHacks ]
 # Pagein types.rdb / services.rdb & the ui files
 speed-pagein.diff, i#57679, michael
 
@@ -304,7 +310,14 @@
 
 [ WPS ]
 # MS Works import filter (following patches depend on each other) Fridrich
+
+[ WPS < dev300-m40 ]
 wpsimport-config_office.diff
+
+[ WPS >= dev300-m40 ]
+#FIXME_m40 wpsimport-config_office.diff
+
+[ WPS ]
 wpsimport-filter.diff
 wpsimport-scp2.diff
 
@@ -327,11 +340,16 @@
 #api changes
 cws-npower11.diff
 
-[ CWSBackports ]
+[ CWSBackports < dev300-m40 ]
 # not for upstreaming: don't disable the entire visibility, just
 # the -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.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
+
 [ CWSBackports == dev300-m38 ]
 # 'PreferredFilter' filter option should only be used if the filter is an 
 # IMPORT filter.

Modified: trunk/patches/dev300/wps-registry.diff
==============================================================================
--- trunk/patches/dev300/wps-registry.diff	(original)
+++ trunk/patches/dev300/wps-registry.diff	Tue Jan 27 15:08:32 2009
@@ -1,7 +1,7 @@
 Index: source/writer/registryitem_writer.scp
 ===================================================================
---- source/writer/registryitem_writer.scp	(Revision 266578)
-+++ source/writer/registryitem_writer.scp	(Arbeitskopie)
+--- scp2/source/writer/registryitem_writer.scp	(Revision 266578)
++++ scp2/source/writer/registryitem_writer.scp	(Arbeitskopie)
 @@ -1278,6 +1278,15 @@
      Value = " ";
  End