SOURCES: openoffice.org-filter.patch - patch from IZ: http://www.o...

[arekm]

Author: arekm                        Date: Tue Oct 25 20:25:55 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- patch from IZ: http://www.openoffice.org/issues/show_bug.cgi?id=56619

---- Files affected:
SOURCES:
   openoffice.org-filter.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/openoffice.org-filter.patch
diff -u SOURCES/openoffice.org-filter.patch:1.1 SOURCES/openoffice.org-filter.patch:1.2
--- SOURCES/openoffice.org-filter.patch:1.1	Tue Oct 25 21:13:58 2005
+++ SOURCES/openoffice.org-filter.patch	Tue Oct 25 22:25:50 2005
@@ -1,6 +1,6 @@
 diff -urbBN ooo-build-2.0.0.org/patches/OOO_2_0/apply ooo-build-2.0.0/patches/OOO_2_0/apply
 --- ooo-build-2.0.0.org/patches/OOO_2_0/apply	2005-10-24 21:12:15.000000000 +0000
-+++ ooo-build-2.0.0/patches/OOO_2_0/apply	2005-10-25 19:13:09.430758688 +0000
++++ ooo-build-2.0.0/patches/OOO_2_0/apply	2005-10-25 19:13:09.000000000 +0000
 @@ -254,6 +254,9 @@
  # Fix for novell-i#113235
  wizards-source-importwizard-filesmodul-xba.diff
@@ -13,20 +13,46 @@
  leak-sal-file.diff
 diff -urbBN ooo-build-2.0.0.org/patches/src680/buildfix-filter.diff ooo-build-2.0.0/patches/src680/buildfix-filter.diff
 --- ooo-build-2.0.0.org/patches/src680/buildfix-filter.diff	1970-01-01 00:00:00.000000000 +0000
-+++ ooo-build-2.0.0/patches/src680/buildfix-filter.diff	2005-10-25 19:09:16.000000000 +0000
-@@ -0,0 +1,15 @@
-+diff -urbB filter.org/source/config/fragments/makefile.mk filter/source/config/fragments/makefile.mk
-+--- filter.org/source/config/fragments/makefile.mk	2005-10-25 19:00:56.754142000 +0000
-++++ filter/source/config/fragments/makefile.mk	2005-10-25 19:06:43.637408192 +0000
-+@@ -182,7 +182,11 @@
++++ ooo-build-2.0.0/patches/src680/buildfix-filter.diff	2005-10-25 20:24:41.017338360 +0000
+@@ -0,0 +1,41 @@
++Index: source/config/fragments/makefile.mk
++===================================================================
++RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
++retrieving revision 1.12
++diff -u -u -r1.12 makefile.mk
++--- source/config/fragments/makefile.mk	8 Sep 2005 21:33:23 -0000	1.12
+++++ source/config/fragments/makefile.mk	25 Oct 2005 18:24:46 -0000
++@@ -147,13 +147,22 @@
++ .IF "$(SOLAR_JAVA)"==""
++ #cmc, hack to workaround the java build requirement
++ MERGE:=python ../tools/merge/pyAltFCFGMerge
+++PACKLANG := $(XSLTPROC)
+++PACKLANG_IN :=
+++PACKLANG_PARAM := --param
+++PACKLANG_PARAM_QUOTE :=\"
+++PACKLANG_XSL :=
++ .ELSE
++ MERGE    := $(JAVA) -jar $(CLASSDIR)$/FCFGMerge.jar
++ .IF "$(JDK)" == "gcj"
++-PACKLANG := $(JAVA) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
+++PACKLANG := $(JAVA) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process
++ .ELSE
++-PACKLANG := $(JAVA) org.apache.xalan.xslt.Process -XSL langfilter.xsl
+++PACKLANG := $(JAVA) org.apache.xalan.xslt.Process
++ .ENDIF
+++PACKLANG_IN := -IN
+++PACKLANG_PARAM := -PARAM
+++PACKLANG_PARAM_QUOTE :=
+++PACKLANG_XSL := -XSL
++ .ENDIF
++ 
++ # -----------------------------------------------------------------------------
++@@ -182,7 +191,7 @@
 +      + at echo Building language packages $(@:b:s/Filter_//) for filters
 +      + at echo ===================================================================
 +      +-$(MKDIRHIER) $(@:d)
-++.IF "$(XSLTPROC)"=="NO_XSLTPROC"
-+      +$(PACKLANG) -IN $< -PARAM lang $(@:d:d:d:d:d:d:d:d:b) > $@
-++.ELSE
-++     +$(XSLTPROC) -o $@ -param lang $(@:d:d:d:d:d:d:d:d:b) langfilter.xsl $<
-++.ENDIF
++-     +$(PACKLANG) -IN $< -PARAM lang $(@:d:d:d:d:d:d:d:d:b) > $@
+++     +$(PACKLANG) $(PACKLANG_PARAM) lang $(PACKLANG_PARAM_QUOTE)$(@:d:d:d:d:d:d:d:d:b)$(PACKLANG_PARAM_QUOTE) $(PACKLANG_XSL) langfilter.xsl $(PACKLANG_IN) $< > $@
 + 
 + $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS_PACKED) : $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS)
 + 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/openoffice.org-filter.patch?r1=1.1&r2=1.2&f=u