diff options
author | nobody <nobody@gnome.org> | 2004-11-21 14:15:45 +0000 |
---|---|---|
committer | nobody <nobody@gnome.org> | 2004-11-21 14:15:45 +0000 |
commit | fe0ae76d5a0087e0b621d29c5546dc478d493a51 (patch) | |
tree | b928ad6a1286c7fb1701157f5859c358015b7027 | |
parent | ad807db2e50f1e205d3ee2c26e9324080bcb116a (diff) |
This commit was manufactured by cvs2svn to create tagDEBIAN-1_1_2DFSG1-3
'DEBIAN-1_1_2DFSG1-3'.
-rwxr-xr-x | bin/openoffice-xlate-lang | 3 | ||||
-rw-r--r-- | patches/OOO_1_1/allow-free-jars.diff | 116 | ||||
-rw-r--r-- | patches/OOO_1_1/desktop-debug-fix.diff | 65 | ||||
-rw-r--r-- | patches/OOO_1_1/hebrew-culmus.diff | 16 | ||||
-rw-r--r-- | patches/OOO_1_1/l10n-YTL.diff | 26 | ||||
-rw-r--r-- | patches/OOO_1_1/sparc-v8-fixes.diff | 98 | ||||
-rw-r--r-- | patches/OOO_1_1/system-curl.diff | 35 | ||||
-rw-r--r-- | patches/OOO_1_1/sysui-impress-comment.diff | 13 | ||||
-rw-r--r-- | patches/OOO_1_1/sysui-mimetypes.diff | 50 | ||||
-rw-r--r-- | patches/OOO_1_1/sysui-translations.diff | 6 | ||||
-rw-r--r-- | patches/OOO_1_1/tmpfile-fix.diff | 64 | ||||
-rw-r--r-- | patches/OOO_1_1_1/apply | 3 | ||||
-rw-r--r-- | patches/OOO_1_1_2/apply | 21 |
13 files changed, 513 insertions, 3 deletions
diff --git a/bin/openoffice-xlate-lang b/bin/openoffice-xlate-lang index f8a3653f0..2fb04064d 100755 --- a/bin/openoffice-xlate-lang +++ b/bin/openoffice-xlate-lang @@ -132,6 +132,8 @@ __DATA__ 49:de:german 50:sl:slovenian 53:cy:welsh +55:pt-BR:portuguese_brazilian +66:th:thai 77:et:estonian 79:nn:nowegian_nynorsk 81:ja:japanese @@ -139,5 +141,6 @@ __DATA__ 86:zh-CN:chinese_simplified 88:zh-TW:chinese_traditional 90:tr:turkish +91:hi:hindi 96:ar:arabic 97:he:hebrew diff --git a/patches/OOO_1_1/allow-free-jars.diff b/patches/OOO_1_1/allow-free-jars.diff new file mode 100644 index 000000000..d24c83b2d --- /dev/null +++ b/patches/OOO_1_1/allow-free-jars.diff @@ -0,0 +1,116 @@ +--- officecfg/org/openoffice/configuration/XMLDefaultGenerator.java.orig Mon Oct 20 09:53:18 2003 ++++ officecfg/org/openoffice/configuration/XMLDefaultGenerator.java Mon Oct 20 15:05:46 2003 +@@ -62,12 +62,12 @@ + + import org.xml.sax.*; + import org.w3c.dom.*; +-import com.sun.xml.tree.XmlDocument; ++//import com.sun.xml.tree.XmlDocument; + import org.xml.sax.SAXException; + import org.xml.sax.SAXParseException; + import javax.xml.parsers.SAXParserFactory; + import javax.xml.parsers.SAXParser; +-import com.sun.xml.tree.*; ++//import com.sun.xml.tree.*; + import java.util.*; + import java.io.*; + import com.jclark.xsl.sax.Driver; +--- XmlSearch/prj/build.lst.orig Mon Oct 20 13:58:06 2003 ++++ XmlSearch/prj/build.lst Mon Oct 20 13:58:11 2003 +@@ -1,2 +1 @@ + xh XmlSearch : external codemaker NULL +-xh XmlSearch\src\com\sun\xmlsearch nmake - all xs NULL +--- xmlhelp/prj/build.lst.orig Mon Oct 20 13:53:25 2003 ++++ xmlhelp/prj/build.lst Mon Oct 20 13:53:33 2003 +@@ -2,7 +2,6 @@ + xh xmlhelp usr1 - all xh_mkout NULL + xh xmlhelp\source\helpprovider nmake - all xh_helpprovider NULL + xh xmlhelp\source\treeview nmake - all xh_treeview NULL +-xh xmlhelp\source\com\sun\star\help nmake - all xh_help NULL + xh xmlhelp\source\cxxhelp\util nmake - all xh_cutil NULL + xh xmlhelp\source\cxxhelp\qe nmake - all xh_qe NULL + xh xmlhelp\source\cxxhelp\db nmake - all xh_db NULL +Index: util/makefile.pmk +=================================================================== +RCS file: /cvs/installation/readlicense/util/makefile.pmk,v +retrieving revision 1.2.30.1 +diff -u -u -r1.2.30.1 makefile.pmk +--- readlicense_oo/util/makefile.pmk 9 Jan 2004 18:10:12 -0000 1.2.30.1 ++++ readlicense_oo/util/makefile.pmk 17 Oct 2004 22:32:06 -0000 +@@ -79,7 +79,7 @@ + $(MISC)$/%.html : + @+-$(MKDIR) $(@:d) + .IF "$(SOLAR_JAVA)"!="" +- $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=html file=$@ ++ $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=html file=$@ + .ELSE + sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl > ..$/readme2.xsl + xsltproc -o $@ \ +@@ -97,7 +97,7 @@ + $(MISC)$/%.txt : + @+-$(MKDIR) $(@:d) + .IF "$(SOLAR_JAVA)"!="" +- $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=text file=$@ ++ $(JAVA) -classpath $(COMMON_BUILD_TOOLS)$/xt.jar$(PATH_SEPERATOR)$(COMMON_BUILD_TOOLS)$/parser.jar com.jclark.xsl.sax.Driver $(subst,$(@::d:d:b), $(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(iso_$(@:d:d:b)) type=text file=$@ + .ELSE + sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl > ..$/readme2.xsl + xsltproc -o $@ \ +Index: makefile.pmk +=================================================================== +RCS file: /cvs/util/officecfg/util/makefile.pmk,v +retrieving revision 1.23.94.1 +diff -u -u -r1.23.94.1 makefile.pmk +--- officecfg/util/makefile.pmk 9 Jan 2004 18:06:41 -0000 1.23.94.1 ++++ officecfg/util/makefile.pmk 17 Oct 2004 22:35:53 -0000 +@@ -68,11 +68,11 @@ + @+echo -------------+ validating and stripping schema files + -$(MKDIR) -p $(@:d) + .IF "$(SOLAR_JAVA)"!="" +- $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $< +- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_val.xsl $(@:d)$(<:b).val file=$(<:d)$(<:b) pathSeparator=$/ +- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/sanity.xsl $(@:d)$(<:b).san file=$(<:d)$(<:b) pathSeparator=$/ +- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_trim.xsl $(@:d)$(<:b).tmp +- $(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).xcs ++ $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar org.openoffice.configuration.Inspector $< ++ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_val.xsl $(@:d)$(<:b).val file=$(<:d)$(<:b) pathSeparator=$/ ++ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/sanity.xsl $(@:d)$(<:b).san file=$(<:d)$(<:b) pathSeparator=$/ ++ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/schema_trim.xsl $(@:d)$(<:b).tmp ++ $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcs + .ELSE + # xsltproc already validates against the dtd. For additional validation, + # org.openoffice.configuration.Inspector should be replaced and the +@@ -98,7 +98,7 @@ + @+echo -------------+ creating locale dependent resource bundles + -$(MKDIR) -p $(@:d) + .IF "$(SOLAR_JAVA)"!="" +- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/resource.xsl $(@:d)$(<:b).properties locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))} ++ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/resource.xsl $(@:d)$(<:b).properties locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))} + .ELSE + $(XSLTPROC) -o $(@:d)$(<:b).properties \ + --stringparam locale {$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $(subst,.properties,.xcs $@)))} \ +@@ -111,10 +111,10 @@ + @+echo -------------+ validating and creating a locale independent file + -$(MKDIR) -p $(@:d) + .IF "$(SOLAR_JAVA)"!="" +- $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $< +- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/data_val.xsl $(@:d)$(<:b).val xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema +- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema +- $(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 ++ $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar org.openoffice.configuration.Inspector $< ++ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/data_val.xsl $(@:d)$(<:b).val xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema ++ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema ++ $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar org.openoffice.helper.PrettyPrinter $(@:d)$(<:b).tmp $(@:d)$(<:b).xcu + .ELSE + # xsltproc already validates against the dtd. For additional validation, + # org.openoffice.configuration.Inspector should be replaced and the +@@ -142,8 +142,8 @@ + @+echo -------------+ creating locale dependent entries + -$(MKDIR) -p $(@:d) + .IF "$(SOLAR_JAVA)"!="" +- $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))} +- $(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 ++ $(JAVA) -classpath $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/cfgimport.jar com.jclark.xsl.sax.Driver $< $(PRJ)$/util$/alllang.xsl $(@:d)$(<:b).tmp xcs=$(PRJ)$/registry$/schema$/$(<:d)$(<:b).xcs schemaRoot=$(PRJ)$/registry$/schema locale={$(subst,$/$<, $(subst,$(MISC)$/registry$/res$/, $@))} ++ $(JAVA) -classpath $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(CLASSDIR)$/schema.jar 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 + $(XSLTPROC) -o $(@:d)$(<:b).tmp \ diff --git a/patches/OOO_1_1/desktop-debug-fix.diff b/patches/OOO_1_1/desktop-debug-fix.diff new file mode 100644 index 000000000..01a9c8f95 --- /dev/null +++ b/patches/OOO_1_1/desktop-debug-fix.diff @@ -0,0 +1,65 @@ +Index: desktop/source/app/app.cxx +=================================================================== +RCS file: /cvs/framework/desktop/source/app/app.cxx,v +retrieving revision 1.121.10.8 +diff -u -r1.121.10.8 app.cxx +--- desktop/source/app/app.cxx 2 Mar 2004 10:06:34 -0000 1.121.10.8 ++++ desktop/source/app/app.cxx 2 Oct 2004 16:36:23 -0000 +@@ -2128,14 +2128,14 @@ + OUString aMsg = OUString::createFromAscii( + "Desktop::OpenDefault() IllegalArgumentException while calling loadComponentFromURL: ") + + iae.Message; +- OSL_ENSURE( sal_False, aMsg); ++ OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); + } + catch (com::sun::star::io::IOException& ioe) + { + OUString aMsg = OUString::createFromAscii( + "Desktop::OpenDefault() IOException while calling loadComponentFromURL: ") + + ioe.Message; +- OSL_ENSURE( sal_False, aMsg); ++ OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); + } + + // shut down again if no component could be loaded +@@ -2286,14 +2286,14 @@ + OUString aMsg = OUString::createFromAscii( + "handle app event IllegalArgumentException while calling loadComponentFromURL: ") + + iae.Message; +- OSL_ENSURE( sal_False, aMsg); ++ OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); + } + catch (com::sun::star::io::IOException& ioe) + { + OUString aMsg = OUString::createFromAscii( + "handle app event IOException while calling loadComponentFromURL: ") + + ioe.Message; +- OSL_ENSURE( sal_False, aMsg); ++ OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); + } + + if ( !xDoc.is() ) +Index: desktop/source/app/dispatchwatcher.cxx +=================================================================== +RCS file: /cvs/framework/desktop/source/app/dispatchwatcher.cxx,v +retrieving revision 1.15.82.1 +diff -u -r1.15.82.1 dispatchwatcher.cxx +--- desktop/source/app/dispatchwatcher.cxx 9 Jan 2004 16:43:26 -0000 1.15.82.1 ++++ desktop/source/app/dispatchwatcher.cxx 2 Oct 2004 16:36:24 -0000 +@@ -353,14 +353,14 @@ + OUString aMsg = OUString::createFromAscii( + "Dispatchwatcher IllegalArgumentException while calling loadComponentFromURL: ") + + iae.Message; +- OSL_ENSURE( sal_False, aMsg); ++ OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); + } + catch (com::sun::star::io::IOException& ioe) + { + OUString aMsg = OUString::createFromAscii( + "Dispatchwatcher IOException while calling loadComponentFromURL: ") + + ioe.Message; +- OSL_ENSURE( sal_False, aMsg); ++ OSL_ENSURE( sal_False, OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr()); + } + if ( aDispatchRequest.aRequestType == REQUEST_OPEN || + aDispatchRequest.aRequestType == REQUEST_VIEW || diff --git a/patches/OOO_1_1/hebrew-culmus.diff b/patches/OOO_1_1/hebrew-culmus.diff new file mode 100644 index 000000000..fdb44e670 --- /dev/null +++ b/patches/OOO_1_1/hebrew-culmus.diff @@ -0,0 +1,16 @@ +Index: registry/data/org/openoffice/VCL.xcu +=================================================================== +RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v +retrieving revision 1.20.14.7 +diff -u -u -r1.20.14.7 VCL.xcu +--- officecfg/registry/data/org/openoffice/VCL.xcu 27 May 2004 13:21:14 -0000 1.20.14.7 ++++ officecfg/registry/data/org/openoffice/VCL.xcu 7 Nov 2004 14:21:56 -0000 +@@ -409,7 +409,7 @@ + </node> + <node oor:name="he" oor:op="replace"> + <prop oor:name="UI_SANS" oor:op="replace" oor:type="xs:string"> +- <value>Tahoma;Raanana;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value> ++ <value>Ellinia CLM;Tahoma;Raanana;Lucidasans;Lucida Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Interface User;WarpSans;Geneva;MS Sans Serif;Helv;Dialog;Albany;Lucida;Helvetica;Charcoal;Chicago;Arial;Helmet;Interface System;Sans Serif</value> + </prop> + <prop oor:name="SANS_UNICODE" oor:type="xs:string" oor:op="replace"> + <value>Tahoma;Raanana;Lucidasans;Lucida Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Albany;Arial;Helvetica;Lucida;Geneva;Helmet;SansSerif</value> diff --git a/patches/OOO_1_1/l10n-YTL.diff b/patches/OOO_1_1/l10n-YTL.diff new file mode 100644 index 000000000..dbc646a89 --- /dev/null +++ b/patches/OOO_1_1/l10n-YTL.diff @@ -0,0 +1,26 @@ +=================================================================== +RCS file: /opt/sourcecast/data/ccvs/repository/l10n/i18npool/source/localedata/data/tr_TR.xml,v +retrieving revision 1.7 +retrieving revision 1.7.130.1 +diff -u -r1.7 -r1.7.130.1 +--- i18npool/source/localedata/data/tr_TR.xml 2003/04/08 15:58:56 1.7 ++++ i18npool/source/localedata/data/tr_TR.xml 2004/10/13 15:38:38 1.7.130.1 +@@ -342,10 +342,17 @@ + </Calendar> + </LC_CALENDAR> + <LC_CURRENCY> +-<Currency default="true" usedInCompatibleFormatCodes="true"> ++<Currency default="false" usedInCompatibleFormatCodes="true"> + <CurrencyID>TL</CurrencyID> + <CurrencySymbol>TL</CurrencySymbol> + <BankSymbol>TRL</BankSymbol> ++<CurrencyName>Lira</CurrencyName> ++<DecimalPlaces>2</DecimalPlaces> ++</Currency> ++<Currency default="true" usedInCompatibleFormatCodes="false"> ++<CurrencyID>TRY</CurrencyID> ++<CurrencySymbol>YTL</CurrencySymbol> ++<BankSymbol>TRY</BankSymbol> + <CurrencyName>Lira</CurrencyName> + <DecimalPlaces>2</DecimalPlaces> + </Currency> diff --git a/patches/OOO_1_1/sparc-v8-fixes.diff b/patches/OOO_1_1/sparc-v8-fixes.diff new file mode 100644 index 000000000..6a3e7d095 --- /dev/null +++ b/patches/OOO_1_1/sparc-v8-fixes.diff @@ -0,0 +1,98 @@ +Index: sal/osl/unx/util.c +=================================================================== +RCS file: /cvs/porting/sal/osl/unx/util.c,v +retrieving revision 1.5 +diff -u -u -r1.5 util.c +--- sal/osl/unx/util.c 2 Jul 2003 13:35:19 -0000 1.5 ++++ sal/osl/unx/util.c 12 Jul 2004 08:02:39 -0000 +@@ -398,3 +398,23 @@ + + #endif + ++#if defined ( LINUX ) && defined ( SPARC ) ++#include <sys/utsname.h> ++void osl_InitSparcV9(void) __attribute__((constructor)); ++void osl_InterlockedCountSetV9(sal_Bool bV9); ++/* Determine which machine we are running on (sparc or sparc64) ++ * The approach is very similar to Solaris. ++ */ ++void osl_InitSparcV9(void) ++{ ++ struct utsname name; ++ int rc; ++ rc = uname(&name); ++ if ( rc != -1 ) { ++ if ( !strcmp( "sparc", name.machine )) ++ return; ++ osl_InterlockedCountSetV9(sal_True); ++ } ++} ++ ++#endif +Index: sal/osl/unx/asm/interlck_sparc.s +=================================================================== +RCS file: /cvs/porting/sal/osl/unx/asm/interlck_sparc.s,v +retrieving revision 1.3 +diff -u -u -r1.3 interlck_sparc.s +--- sal/osl/unx/asm/interlck_sparc.s 28 Apr 2003 17:13:44 -0000 1.3 ++++ sal/osl/unx/asm/interlck_sparc.s 12 Jul 2004 08:02:39 -0000 +@@ -248,7 +248,9 @@ + + 1: ld [%o0], %o1 + add %o1, 1, %o2 +- cas [%o0], %o1, %o2 ++! allow linux to build for v8 ++ .word 0xD5E21009 ++! cas [%o0], %o1, %o2 + cmp %o1, %o2 + bne 1b + nop ! delay slot +@@ -267,7 +269,9 @@ + + 1: ld [%o0], %o1 + sub %o1, 1, %o2 +- cas [%o0], %o1, %o2 ++! allow linux to build for v8 ++ .word 0xD5E21009 ++! cas [%o0], %o1, %o2 + cmp %o1, %o2 + bne 1b + nop ! delay slot +@@ -276,4 +280,3 @@ + + .type osl_decrementInterlockedCountV9,#function + .size osl_decrementInterlockedCountV9,.-osl_decrementInterlockedCountV9 +- +Index: sc/source/core/data/makefile.mk +=================================================================== +RCS file: /cvs/sc/sc/source/core/data/makefile.mk,v +retrieving revision 1.6.260.3 +diff -u -u -r1.6.260.3 makefile.mk +--- sc/source/core/data/makefile.mk 28 Jan 2004 10:02:07 -0000 1.6.260.3 ++++ sc/source/core/data/makefile.mk 12 Jul 2004 08:02:42 -0000 +@@ -205,7 +205,8 @@ + $(SLO)$/table3.obj \ + $(SLO)$/table4.obj \ + $(SLO)$/documen4.obj \ +- $(SLO)$/conditio.obj ++ $(SLO)$/conditio.obj \ ++ $(SLO)$/validat.obj + .ENDIF + + EXCEPTIONSFILES= \ +Index: solenv/inc/unxlngs.mk +=================================================================== +RCS file: /cvs/tools/solenv/inc/unxlngs.mk,v +retrieving revision 1.2.50.2 +diff -u -u -r1.2.50.2 unxlngs.mk +--- solenv/inc/unxlngs.mk 30 Mar 2004 13:17:38 -0000 1.2.50.2 ++++ solenv/inc/unxlngs.mk 12 Jul 2004 08:02:55 -0000 +@@ -62,7 +62,7 @@ + + # mk file for unxlngs + ASM=$(CC) +-AFLAGS=-Wa,-Av8plus,-K,PIC -c $(CDEFS) ++AFLAGS=-Wa,-K,PIC -c $(CDEFS) + + SOLAR_JAVA*=TRUE + JAVAFLAGSDEBUG=-g diff --git a/patches/OOO_1_1/system-curl.diff b/patches/OOO_1_1/system-curl.diff index feccd995d..64b97027b 100644 --- a/patches/OOO_1_1/system-curl.diff +++ b/patches/OOO_1_1/system-curl.diff @@ -67,3 +67,38 @@ diff -u -r1.11 ftpurl.hxx SHL1DEF=$(MISC)$/$(SHL1TARGET).def SHL1LIBS= \ $(LIB1TARGET) +Index: ftphandleprovider.hxx +=================================================================== +RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftphandleprovider.hxx,v +retrieving revision 1.2 +diff -u -r1.2 ftphandleprovider.hxx +--- ucb/source/ucp/ftp/ftphandleprovider.hxx 15 Oct 2002 09:21:17 -0000 1.2 ++++ ucb/source/ucp/ftp/ftphandleprovider.hxx 20 Jul 2004 22:02:48 -0000 +@@ -1,5 +1,5 @@ + #include <rtl/ustring.hxx> +-#include <curl/types.h> ++#include <curl/curl.h> + + namespace ftp { + +Index: ftploaderthread.hxx +=================================================================== +RCS file: /cvs/ucb/ucb/source/ucp/ftp/ftploaderthread.hxx,v +retrieving revision 1.5 +diff -u -r1.5 ftploaderthread.hxx +--- ucb/source/ucp/ftp/ftploaderthread.hxx 28 Aug 2002 07:23:14 -0000 1.5 ++++ ucb/source/ucp/ftp/ftploaderthread.hxx 20 Jul 2004 22:02:48 -0000 +@@ -71,11 +71,10 @@ + #ifndef _OSL_THREAD_H_ + #include <osl/thread.h> + #endif +-#ifndef __CURL_TYPES_H +-#include <curl/types.h> ++#ifndef __CURL_CURL_H ++#include <curl/curl.h> + #endif + +- + namespace ftp { + + /** A loaderthread acts as factory for CURL-handles, diff --git a/patches/OOO_1_1/sysui-impress-comment.diff b/patches/OOO_1_1/sysui-impress-comment.diff new file mode 100644 index 000000000..65306525e --- /dev/null +++ b/patches/OOO_1_1/sysui-impress-comment.diff @@ -0,0 +1,13 @@ +Index: impress.desktop +=================================================================== +RCS file: /cvs/gsl/sysui/desktop/gnome/impress.desktop,v +retrieving revision 1.2.30.2 +diff -u -u -r1.2.30.2 impress.desktop +--- sysui/desktop/gnome/impress.desktop 9 Jan 2004 19:02:27 -0000 1.2.30.2 ++++ sysui/desktop/gnome/impress.desktop 8 Nov 2004 13:27:53 -0000 +@@ -7,4 +7,4 @@ + Type=Application + Exec=<progpath_utf8>/program/simpress %U + Name=<productname> Impress +-Commment=<productname> Presentation ++Comment=<productname> Presentation diff --git a/patches/OOO_1_1/sysui-mimetypes.diff b/patches/OOO_1_1/sysui-mimetypes.diff new file mode 100644 index 000000000..1d158a2d1 --- /dev/null +++ b/patches/OOO_1_1/sysui-mimetypes.diff @@ -0,0 +1,50 @@ +? delzip +? legacy/delzip +Index: calc.desktop +=================================================================== +RCS file: /cvs/gsl/sysui/desktop/gnome/calc.desktop,v +retrieving revision 1.2.30.2 +diff -u -u -r1.2.30.2 calc.desktop +--- sysui/desktop/gnome/calc.desktop 9 Jan 2004 19:02:26 -0000 1.2.30.2 ++++ sysui/desktop/gnome/calc.desktop 14 Oct 2004 07:22:58 -0000 +@@ -8,3 +8,4 @@ + Type=Application + Name=<productname> Calc + Comment=<productname> Spreadsheet ++MimeType=application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.sun.xml.math;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.stardivision.math;text/x-comma-separated-values +Index: draw.desktop +=================================================================== +RCS file: /cvs/gsl/sysui/desktop/gnome/draw.desktop,v +retrieving revision 1.2.30.2 +diff -u -u -r1.2.30.2 draw.desktop +--- sysui/desktop/gnome/draw.desktop 9 Jan 2004 19:02:27 -0000 1.2.30.2 ++++ sysui/desktop/gnome/draw.desktop 14 Oct 2004 07:22:58 -0000 +@@ -8,3 +8,4 @@ + Type=Application + Name=<productname> Draw + Comment=<productname> Drawing ++MimeType=application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw +Index: impress.desktop +=================================================================== +RCS file: /cvs/gsl/sysui/desktop/gnome/impress.desktop,v +retrieving revision 1.2.30.3 +diff -u -u -r1.2.30.3 impress.desktop +--- sysui/desktop/gnome/impress.desktop 27 Aug 2004 10:27:44 -0000 1.2.30.3 ++++ sysui/desktop/gnome/impress.desktop 14 Oct 2004 07:22:58 -0000 +@@ -8,3 +8,4 @@ + Exec=<progpath_utf8>/program/simpress %U + Name=<productname> Impress + Comment=<productname> Presentation ++MimeType=application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.ms-powerpoint;application/vnd.stardivision.impress +Index: writer.desktop +=================================================================== +RCS file: /cvs/gsl/sysui/desktop/gnome/writer.desktop,v +retrieving revision 1.2.30.2 +diff -u -u -r1.2.30.2 writer.desktop +--- sysui/desktop/gnome/writer.desktop 9 Jan 2004 19:02:29 -0000 1.2.30.2 ++++ sysui/desktop/gnome/writer.desktop 14 Oct 2004 07:22:58 -0000 +@@ -8,3 +8,4 @@ + Type=Application + Name=<productname> Writer + Comment=<productname> Text Document ++MimeType=application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.global;application/vnd.sun.xml.writer.template;application/vnd.ms-word;application/x-mswrite;application/vnd.stardivision.writer;application/rtf;text/plain diff --git a/patches/OOO_1_1/sysui-translations.diff b/patches/OOO_1_1/sysui-translations.diff index 126a704fd..14b000165 100644 --- a/patches/OOO_1_1/sysui-translations.diff +++ b/patches/OOO_1_1/sysui-translations.diff @@ -264,7 +264,7 @@ diff -u -r1.7.8.5 documents.ulf -ca = "%PRODUCTNAME Tabelle" -th = "%PRODUCTNAME Tabelle" -hi-IN = "%PRODUCTNAME Tabelle" -+ca = "Fulla de cĂ| lcul d'%PRODUCTNAME" ++ca = "Fulla de cĂ lcul d'%PRODUCTNAME" et = "%PRODUCTNAME-i arvutustabel" sl = "Preglednica programa %PRODUCTNAME" ns = "Pampiri ya go anega ya %PRODUCTNAME" @@ -298,7 +298,7 @@ diff -u -r1.7.8.5 documents.ulf -ca = "%PRODUCTNAME Tabellenvorlage" -th = "%PRODUCTNAME Tabellenvorlage" -hi-IN = "%PRODUCTNAME Tabellenvorlage" -+ca = "Plantilla de fulla de cĂ| lcul d'%PRODUCTNAME" ++ca = "Plantilla de fulla de cĂ lcul d'%PRODUCTNAME" et = "%PRODUCTNAME-i arvutustabeli mall" sl = "Predloga preglednice programa %PRODUCTNAME" ns = "%PRODUCTNAME Template ya Pampiri ya go Anega" @@ -439,7 +439,7 @@ diff -u -r1.8.8.6 launcher_comment.ulf -ca = "%PRODUCTNAME Tabelle" -th = "%PRODUCTNAME Tabelle" -hi-IN = "%PRODUCTNAME Tabelle" -+ca = "Fulla de cĂ| lcul d'%PRODUCTNAME" ++ca = "Fulla de cĂ lcul d'%PRODUCTNAME" et = "%PRODUCTNAME-i arvutustabel" sl = "Preglednica programa %PRODUCTNAME" ns = "Pampiri ya go anega ya %PRODUCTNAME" diff --git a/patches/OOO_1_1/tmpfile-fix.diff b/patches/OOO_1_1/tmpfile-fix.diff new file mode 100644 index 000000000..73093df8d --- /dev/null +++ b/patches/OOO_1_1/tmpfile-fix.diff @@ -0,0 +1,64 @@ +Index: tempfile.cxx +=================================================================== +RCS file: /cvs/util/unotools/source/ucbhelper/tempfile.cxx,v +retrieving revision 1.14 +retrieving revision 1.14.72.1 +diff -u -r1.14 -r1.14.72.1 +--- unotools/source/ucbhelper/tempfile.cxx 9 Sep 2002 10:25:47 -0000 1.14 ++++ unotolls/source/ucbhelper/tempfile.cxx 1 Sep 2004 09:28:55 -0000 1.14.72.1 +@@ -70,6 +70,7 @@ + #include <tools/time.hxx> + #include <tools/debug.hxx> + #include <stdio.h> ++#include <sys/stat.h> + + using namespace osl; + +@@ -119,7 +120,15 @@ + // HACK: create directory on a mount point with nobrowse option + // returns ENOSYS in any case !! + osl::Directory aDirectory( aPath ); ++#ifdef UNX ++#include <sys/stat.h> ++/* RW permission for the user only! */ ++ mode_t old_mode = umask(077); ++#endif + osl::FileBase::RC nError = aDirectory.open(); ++#ifdef UNX ++umask(old_mode); ++#endif + aDirectory.close(); + if( nError == osl::File::E_None ) + return sal_True; +@@ -240,7 +249,15 @@ + { + DBG_ASSERT( bKeep, "Too expensive, use directory for creating name!" ); + File aFile( aTmp ); ++#ifdef UNX ++#include <sys/stat.h> ++/* RW permission for the user only! */ ++ mode_t old_mode = umask(077); ++#endif + FileBase::RC err = aFile.open(osl_File_OpenFlag_Create); ++#ifdef UNX ++umask(old_mode); ++#endif + if ( err == FileBase::E_None ) + { + rName = aTmp; +@@ -318,7 +335,15 @@ + else + { + File aFile( aTmp ); ++#ifdef UNX ++#include <sys/stat.h> ++/* RW permission for the user only! */ ++ mode_t old_mode = umask(077); ++#endif + FileBase::RC err = aFile.open(osl_File_OpenFlag_Create); ++#ifdef UNX ++umask(old_mode); ++#endif + if ( err == FileBase::E_None ) + { + pImp->aName = aTmp; diff --git a/patches/OOO_1_1_1/apply b/patches/OOO_1_1_1/apply index b0095d698..596e0ac5a 100644 --- a/patches/OOO_1_1_1/apply +++ b/patches/OOO_1_1_1/apply @@ -68,6 +68,9 @@ build-sparc-assembler.diff # Fix alignment of long/doubles on Sparc #24059 bridges-sparc-alignment.diff +# make libsal v8 on sparc, #30774 +sparc-v8-fixes.diff + # Don't -DBUILD, -DBUILD_ID for our build system #12782: rc3 stlport-defeat-include.diff diff --git a/patches/OOO_1_1_2/apply b/patches/OOO_1_1_2/apply index 6528cb9c0..d68412af7 100644 --- a/patches/OOO_1_1_2/apply +++ b/patches/OOO_1_1_2/apply @@ -44,6 +44,9 @@ flash-compile-fix.diff # help people get debugging debug-helper.diff +# fix debug build in desktop/, #28330 +desktop-debug-fix.diff + # do not build extras for icu, workaround for http://bugs.debian.org/210608 icu-build-no-extras.diff @@ -132,6 +135,18 @@ security-sonames.diff # do not pack any potential .orig files with ppds psprint_config-no-orig.diff +# make libsal v8 on sparc, #30774 +sparc-v8-fixes.diff + +# fix tmpfile permissions, #33357 +tmpfile-fix.diff + +# s/Commment/Comment/ +sysui-impress-comment.diff + +# add mimetype entries to the .desktop files +sysui-mimetypes.diff + [ ODKFixes ] # Fix ODK Java bits @@ -364,6 +379,9 @@ build-instsetoo-lang.diff # Temporary until above patch adapted for DebianOnly's needs build-instsetoo-langext.diff +# allow build with free jars, #21678 +allow-free-jars.diff + [ i18n ] # Use the environment to determine locale #21191 @@ -392,6 +410,9 @@ i18n-calc-encoding.diff # Fix silly brokenness in langtab lists - #18826 translation-shift.diff +# prioritize hebrew culmus fonts +hebrew-culmus.diff + [ NotVCLPlug ] # SystemBits # use system freetype, 23779, 29765 system-freetype.diff |