GNOME.org
 

ooo-build r14342 - in branches/debian-2-4-1: . patches/src680

Author: rengelhard
Date: Sun Oct 19 19:34:12 2008
New Revision: 14342
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14342&view=rev

Log:
2008-10-19  Rene Engelhard  <rene debian org>

        * patches/src680/apply,
          patches/src680/no-latex-filter-without-writer2latex.diff: fix i93520


Added:
   branches/debian-2-4-1/patches/src680/no-latex-filter-without-writer2latex.diff
Modified:
   branches/debian-2-4-1/ChangeLog
   branches/debian-2-4-1/patches/src680/apply

Modified: branches/debian-2-4-1/patches/src680/apply
==============================================================================
--- branches/debian-2-4-1/patches/src680/apply	(original)
+++ branches/debian-2-4-1/patches/src680/apply	Sun Oct 19 19:34:12 2008
@@ -325,7 +325,7 @@
 
 cws-cmcfixes47-sw.diff, i#90306
 
-[ CWSBackports < ooh680-m18 ]
+[ CWSBackports < ooo300-m18 ]
 cws-chart28.diff, i#90071
 i89812.diff
 
@@ -2483,3 +2483,7 @@
 [ Fixes ]
 cppcanvas-fix-roundcorners.diff, i#361534, rodo
 vcl-fix-randr-heapcorruption.diff, i#89718, n#398244, thorsten
+
+[ SystemBuildBits ]
+no-latex-filter-without-writer2latex.diff, i#93520
+

Added: branches/debian-2-4-1/patches/src680/no-latex-filter-without-writer2latex.diff
==============================================================================
--- (empty file)
+++ branches/debian-2-4-1/patches/src680/no-latex-filter-without-writer2latex.diff	Sun Oct 19 19:34:12 2008
@@ -0,0 +1,37 @@
+Index: source/config/fragments/fcfg_writer.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/fcfg_writer.mk,v
+retrieving revision 1.14.20.1
+diff -u -r1.14.20.1 fcfg_writer.mk
+--- filter/source/config/fragments/fcfg_writer.mk	15 Aug 2008 10:33:45 -0000	1.14.20.1
++++ filter/source/config/fragments/fcfg_writer.mk	3 Sep 2008 14:16:49 -0000
+@@ -33,9 +33,13 @@
+     writer8 \
+     writer_MS_Word_2003_XML \
+     writer_MS_Word_2007_XML \
+-    MediaWiki_File \
++    MediaWiki_File
++
++.IF "$(WITH_WRITER2LATEX)" != "NO"
++T4_WRITER += \
+ 	LaTeX \
+ 	BibTeX
++.ENDIF
+ 
+ # -----------------------------------------------
+ # count = 39
+@@ -71,9 +75,13 @@
+     writer_MediaWiki_File \
+     writer_web_MediaWiki_File \
+     MS_Word_2003_XML \
+-    MS_Word_2007_XML \
++    MS_Word_2007_XML
++
++.IF "$(WITH_WRITER2LATEX)" != "NO"
++F4_WRITER += \
+ 	LaTeX_Writer \
+ 	BibTeX_Writer
++.ENDIF
+ 
+ # -----------------------------------------------
+ # count = 14
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]