- update

Changed files:
    openoffice-pld-parallel-build.patch -> 1.5

diff --git a/openoffice-pld-parallel-build.patch b/openoffice-pld-parallel-build.patch
index 05924fc92ceada0ff4fb2a80daea6186b986a5c0..aa411ed2df6f79c76665b63424001b12265bacfd 100644 (file)
--- a/openoffice-pld-parallel-build.patch
+++ b/openoffice-pld-parallel-build.patch
@@ -31,36 +31,36 @@ diff -urN ooo-build-1.1.55.org/bin/build-ooo ooo-build-1.1.55/bin/build-ooo
  
 diff -urN ooo-build-1.1.55.org/patches/OOO_1_1/build-parallel-ooficecfg.patch ooo-build-1.1.55/patches/OOO_1_1/build-parallel-ooficecfg.patch
 --- ooo-build-1.1.55.org/patches/OOO_1_1/build-parallel-ooficecfg.patch        1970-01-01 01:00:00.000000000 +0100
-+++ ooo-build-1.1.55/patches/OOO_1_1/build-parallel-ooficecfg.patch    2004-05-07 02:11:53.649347296 +0200
++++ ooo-build-1.1.55/patches/OOO_1_1/build-parallel-ooficecfg.patch    2004-05-07 03:09:10.000000000 +0200
 @@ -0,0 +1,50 @@
 +diff -urN officecfg.org/util/makefile.pmk officecfg/util/makefile.pmk
 +--- officecfg.org/util/makefile.pmk   2004-05-07 02:09:08.906392032 +0200
-++++ officecfg/util/makefile.pmk       2004-05-07 02:11:32.127619096 +0200
+++++ officecfg/util/makefile.pmk       2004-05-07 03:08:56.461000832 +0200
 +@@ -119,21 +119,21 @@
 + # xsltproc already validates against the dtd.  For additional validation,
 + # org.openoffice.configuration.Inspector should be replaced and the
 + # replacement should be invoked here.
 +-     $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/data_val.xsl > $(PRJ)$/util$/dataval2.xsl
 +-     $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
-++     $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/data_val.xsl > $(PRJ)$/util$/$(<:b)dataval2.xsl
-++     $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/$(<:b)alllang2.xsl
+++     $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/data_val.xsl > $(PRJ)$/util$/$(<:b)-dataval2.xsl
+++     $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/$(<:b)-alllang2.xsl
 +      $(XSLTPROC) -o $(@:d)$(<:b).val \
 +                  --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
 +                  --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
 +-                 $(PRJ)$/util$/dataval2.xsl $<
-++                 $(PRJ)$/util$/$(<:b)dataval2.xsl $<
+++                 $(PRJ)$/util$/$(<:b)-dataval2.xsl $<
 +      $(XSLTPROC) -o $(@:d)$(<:b).tmp \
 +                  --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
 +                  --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
 +-                 $(PRJ)$/util$/alllang2.xsl $<
-++                 $(PRJ)$/util$/$(<:b)alllang2.xsl $<
+++                 $(PRJ)$/util$/$(<:b)-alllang2.xsl $<
 + # xsltproc already seems to pretty-print the xml, so
 + # org.openoffice.helper.PrettyPrinter seems to be unnecessary.
 +      cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
 +-     +$(RM) $(PRJ)$/util$/dataval2.xsl > $(NULLDEV)
 +-     +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
-++     +$(RM) $(PRJ)$/util$/$(<:b)dataval2.xsl > $(NULLDEV)
-++     +$(RM) $(PRJ)$/util$/$(<:b)alllang2.xsl > $(NULLDEV)
+++     +$(RM) $(PRJ)$/util$/$(<:b)-dataval2.xsl > $(NULLDEV)
+++     +$(RM) $(PRJ)$/util$/$(<:b)-alllang2.xsl > $(NULLDEV)
 + .ENDIF
 +      +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
 +      +$(RM) $(@:d)$(<:b).val > $(NULLDEV)
@@ -69,18 +69,18 @@ diff -urN ooo-build-1.1.55.org/patches/OOO_1_1/build-parallel-ooficecfg.patch oo
 +      $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
 + .ELSE
 +-     $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/alllang2.xsl
-++     $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/$(<:b)alllang2.xsl
+++     $(SED) 's|xmlns:filehelper="http://www.jclark.com/xt/java/org.openoffice.configuration.FileHelper"||;s|extension-element-prefixes="filehelper"||;s|filehelper:makeAbs(\(.*\))|\1|' < $(PRJ)$/util$/alllang.xsl > $(PRJ)$/util$/$(<:b)-{$(alliso)}-alllang2.xsl
 +      $(XSLTPROC) -o $(@:d)$(<:b).tmp \
 +                  --stringparam xcs $(PWD)$/$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs \
 +                  --stringparam schemaRoot $(PWD)$/$(PRJ)$/registry$/schema \
 +                  --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))} \
 +-                 $(PRJ)$/util$/alllang2.xsl $<
-++                 $(PRJ)$/util$/$(<:b)alllang2.xsl $<
+++                 $(PRJ)$/util$/$(<:b)-{$(alliso)}-alllang2.xsl $<
 + # xsltproc already seems to pretty-print the xml, so
 + # org.openoffice.helper.PrettyPrinter seems to be unnecessary.
 +      cp $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu
 +-     +$(RM) $(PRJ)$/util$/alllang2.xsl > $(NULLDEV)
-++     +$(RM) $(PRJ)$/util$/$(<:b)alllang2.xsl > $(NULLDEV)
+++     +$(RM) $(PRJ)$/util$/$(<:b)-{$(alliso)}-alllang2.xsl > $(NULLDEV)
 + .ENDIF
 +      +$(RM) $(@:d)$(<:b).tmp > $(NULLDEV)
 diff -urN ooo-build-1.1.55.org/patches/OOO_1_1_1/apply ooo-build-1.1.55/patches/OOO_1_1_1/apply