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

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jan  7 09:58:54 2009
New Revision: 15013
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15013&view=rev

Log:
2009-01-07  Rene Engelhard  <rene debian org>

        * patches/dev300/fixup-r265756.diff,
          patches/dev300/remove-preferred-filter-writer2latex.diff: remove ...
        * patches/dev300/cws-rt36.diff: ... and exchange with this
        * patches/dev300/apply: adapt


Added:
   trunk/patches/dev300/cws-rt36.diff   (contents, props changed)
      - copied, changed from r15005, /trunk/patches/dev300/remove-preferred-filter-writer2latex.diff
Removed:
   trunk/patches/dev300/fixup-r265756.diff
   trunk/patches/dev300/remove-preferred-filter-writer2latex.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jan  7 09:58:54 2009
@@ -313,6 +313,11 @@
 # the -fvisibility-inlines-hidden
 buildfix-x86-64-visibility-workaround.diff
 
+[ CWSBackports == dev300-m38 ]
+# 'PreferredFilter' filter option should only be used if the filter is an 
+# IMPORT filter.
+cws-rt36.diff
+
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
 libwpg.diff
@@ -342,10 +347,6 @@
 # re-direct to plugins via http://extensions.go-oo.org/
 redirect-extensions.diff
 
-[ FixesNotForUpstream >= dev300-m38 ]
-# for masterfix properly. upstream doesn't want it.
-#fixup-r265756.diff
-
 # FIXME: disabled since we need the dep here right now
 # (until the reportbuilderext changed get transferred to DEV300).
 # But then maybe it'll include this fix..
@@ -1211,11 +1212,6 @@
 [ BuildBits < dev300-m39 ]
 fix-mozbootstrap.diff, i#97010, jholesov
 
-[ BuildBits ]
-# 'PreferredFilter' filter option should only be used if the filter is an 
-# IMPORT filter.
-remove-preferred-filter-writer2latex.diff, i#97690, kohei
-
 [ Java14 ]
 
 # enable build with Java 1.4; can't go upstream

Copied: trunk/patches/dev300/cws-rt36.diff (from r15005, /trunk/patches/dev300/remove-preferred-filter-writer2latex.diff)
==============================================================================
--- /trunk/patches/dev300/remove-preferred-filter-writer2latex.diff	(original)
+++ trunk/patches/dev300/cws-rt36.diff	Wed Jan  7 09:58:54 2009
@@ -1,7 +1,7 @@
-diff --git writer2latex/writer2latex05.patch writer2latex/writer2latex05.patch
-index 1492215..9d9da31 100644
---- writer2latex/writer2latex05.patch
-+++ writer2latex/writer2latex05.patch
+Index: writer2latex/writer2latex05.patch
+===================================================================
+--- writer2latex/writer2latex05.patch	(.../tags/DEV300_m38)	(Revision 265952)
++++ writer2latex/writer2latex05.patch	(.../cws/rt36)	(Revision 265952)
 @@ -41,3 +41,51 @@
                       System.err.println("Oops - error converting base64");
                   }
@@ -54,3 +54,60 @@
 + 		<prop oor:name="UIName">
 + 			<value>XHTML 1.1 + MathML 2.0 (xsl)</value>
 + 		</prop>
+Index: scp2/source/writer/file_writer.scp
+===================================================================
+--- scp2/source/writer/file_writer.scp	(.../tags/DEV300_m38)	(Revision 265952)
++++ scp2/source/writer/file_writer.scp	(.../cws/rt36)	(Revision 265952)
+@@ -60,17 +60,16 @@
+ End
+ #endif
+ 
+-# temporarily disable writer2latex filter due to issue i97440 
+-##ifdef SOLAR_JAVA
+-##ifndef WITHOUT_WRITER2LATEX
+-#File gid_File_Oxt_Writer2latex
+-#    TXT_FILE_BODY;
+-#    Name = "writer2latex.oxt";
+-#    Dir = gid_Brand_Dir_Share_Extension_Install;
+-#    Styles = (PACKED);
+-#End
+-##endif
+-##endif
++#ifdef SOLAR_JAVA
++#ifndef WITHOUT_WRITER2LATEX
++File gid_File_Oxt_Writer2latex
++    TXT_FILE_BODY;
++    Name = "writer2latex.oxt";
++    Dir = gid_Brand_Dir_Share_Extension_Install;
++    Styles = (PACKED);
++End
++#endif
++#endif
+ 
+ File gid_File_Registry_Spool_Oo_Office_Embedding_Writer_Xcu
+     TXT_FILE_BODY;
+Index: scp2/source/writer/module_writer.scp
+===================================================================
+--- scp2/source/writer/module_writer.scp	(.../tags/DEV300_m38)	(Revision 265952)
++++ scp2/source/writer/module_writer.scp	(.../cws/rt36)	(Revision 265952)
+@@ -110,13 +110,12 @@
+              gid_File_Res_T602Filter);
+ End
+ 
+-# temporarily disable writer2latex filter due to issue i97440
+-#Module gid_Module_Optional_Writer2latex
+-#    MOD_NAME_DESC(MODULE_PRG_WRT_WRITER2LATEX);
+-#    ParentID = gid_Module_Optional;
+-#    Default = YES;
+-#    PackageInfo = "packinfo_office.txt";
+-#    Files = (gid_File_Oxt_Writer2latex);
+-#End
++Module gid_Module_Optional_Writer2latex
++    MOD_NAME_DESC(MODULE_PRG_WRT_WRITER2LATEX);
++    ParentID = gid_Module_Optional;
++    Default = YES;
++    PackageInfo = "packinfo_office.txt";
++    Files = (gid_File_Oxt_Writer2latex);
++End
+ 
+ #include "alllangmodules_writer.inc"