rpms/openoffice.org/FC-4 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.1, 1.2 openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch, 1.1, 1.2 openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.1, 1.2 openoffice.org-1.9.125.ooo54586.nfslock.sal.patch, 1.1, 1.2 openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch, 1.1, 1.2 openoffice.org-1.9.128.ooo54479.systemicu.patch, 1.1, 1.2 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.1, 1.2 openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch, 1.1, 1.2 openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch, 1.1, 1.2 openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch, 1.3, 1.4 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.2, 1.3 openoffice.org-1.9.89.ooo44027.pthreadchange.patch, 1.1, 1.2 openoffice.org.spec, 1.216, 1.217 sources, 1.81, 1.82 workspace.atkbridge.patch, 1.1, 1.2 openoffice.org-1.9.74.ooo41875.mktemp.patch, 1.1, NONE openoffice.org-1.9.84.ooo44843.sdcasting.patch, 1.3, NONE openo! ffice.org-1.9.84.ooo44846.svxcasting.patch, 1.3, NONE openoffice.org-1.9.84.ooo45162.svxcasting2.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sun Nov 20 14:52:00 UTC 2005
- Previous message (by thread): rpms/kernel/devel patch-2.6.15-rc2.bz2.sign, NONE, 1.1 .cvsignore, 1.279, 1.280 kernel-2.6.spec, 1.1696, 1.1697 linux-2.6-build-userspace-headers-warning.patch, 1.6, 1.7 linux-2.6-execshield.patch, 1.3, 1.4 sources, 1.220, 1.221 upstream, 1.205, 1.206 linux-2.6-ppc64-eeh-panic.patch, 1.4, NONE linux-2.6.15-rc1-ppc64-pci.patch, 1.1, NONE linux-2.6.15-rc1-ppc64-sparsemem.patch, 1.1, NONE patch-2.6.15-rc1.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/openoffice.org/FC-4 openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23066
Modified Files:
openoffice.org-1.9.114.rh161886.rpath.desktop.patch
openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
openoffice.org-1.9.128.ooo54479.systemicu.patch
openoffice.org-1.9.129.ooo54603.fontconfig.patch
openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
openoffice.org-1.9.87.rh151357.setlangtolocale.patch
openoffice.org-1.9.89.ooo44027.pthreadchange.patch
openoffice.org.spec sources workspace.atkbridge.patch
Removed Files:
openoffice.org-1.9.74.ooo41875.mktemp.patch
openoffice.org-1.9.84.ooo44843.sdcasting.patch
openoffice.org-1.9.84.ooo44846.svxcasting.patch
openoffice.org-1.9.84.ooo45162.svxcasting2.patch
Log Message:
start the process off
openoffice.org-1.9.114.rh161886.rpath.desktop.patch:
desktop/scripts/soffice.sh | 98 ++-------------------------------------------
scripts/soffice.sh | 0
2 files changed, 5 insertions(+), 93 deletions(-)
Index: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.114.rh161886.rpath.desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.114.rh161886.rpath.desktop.patch 14 Jul 2005 08:14:14 -0000 1.1
+++ openoffice.org-1.9.114.rh161886.rpath.desktop.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -5,7 +5,7 @@
diff -u -p -r1.17 soffice.sh
--- openoffice.org.orig/desktop/scripts/soffice.sh 15 Jun 2005 08:16:47 -0000 1.17
+++ openoffice.org/desktop/scripts/soffice.sh 5 Jul 2005 07:49:51 -0000
-@@ -92,103 +92,15 @@ sd_inst="`pwd`"
+@@ -73,82 +73,6 @@
# change back directory
cd "$sd_cwd"
@@ -85,9 +85,12 @@
- ;;
-esac
-
- # extend the ld_library_path for java: javaldx checks the sofficerc for us
+ #collect all bootstrap variables specified on the command line
+ #so that they can be passed as arguments to javaldx later on
+ for arg in $@
+@@ -162,23 +86,11 @@
if [ -x "$sd_prog/javaldx" ] ; then
- java_ld_library_path=`"$sd_prog/javaldx"`
+ java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS`
if [ "$java_ld_library_path" != "" ] ; then
- case $sd_platform in
- AIX)
@@ -106,11 +109,11 @@
- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
- ;;
- esac
-+ if [ $LD_LIBRARY_PATH ]; then
-+ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
-+ else
-+ LD_LIBRARY_PATH=${java_ld_library_path}
-+ fi
++ if [ $LD_LIBRARY_PATH ]; then
++ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
++ else
++ LD_LIBRARY_PATH=${java_ld_library_path}
++ fi
fi
fi
openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch:
com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 0
config_office/configure.in | 44 ++++++++++++++++
config_office/set_soenv.in | 4 +
connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 9 ++-
connectivity/prj/build.lst | 2
filter/source/config/fragments/makefile.mk | 4 +
scp2/source/ooo/file_ooo.scp | 6 +-
scp2/source/ooo/makefile.mk | 8 ++
scp2/source/ooo/profileitem_ooo.scp | 4 +
scripting/java/build.xml | 1
scripting/prj/build.lst | 2
source/config/fragments/makefile.mk | 0
source/xmerge/build.xml | 0
xmerge/source/xmerge/build.xml | 5 -
14 files changed, 81 insertions(+), 8 deletions(-)
Index: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 28 Sep 2005 13:24:05 -0000 1.1
+++ openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -99,21 +99,6 @@
SCPDEFS+=\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
-diff -ru scp2.orig/source/ooo/profileitem_ooo.scp scp2/source/ooo/profileitem_ooo.scp
---- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp 2005-08-04 12:56:17.000000000 +0100
-+++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp 2005-08-04 15:55:45.000000000 +0100
-@@ -741,6 +741,10 @@
- Section = "Bootstrap";
- Order = 7;
- Key = "UNO_JAVA_JFW_CLASSPATH_URLS";
-- Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar !
$ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar $ORIGIN/classes/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
-+#ifndef SYSTEM_HSQLDB
-+ Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar !
$ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar $ORIGIN/classes/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
-+#else
-+ Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar !
$ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar file:///usr/share/java/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
-+#endif
- End
-
diff -ru config_office.orig/configure.in config_office/configure.in
--- openoffice.org.orig/config_office/configure.in 2005-08-08 08:34:55.000000000 +0100
+++ openoffice.org/config_office/configure.in 2005-08-08 08:36:50.000000000 +0100
@@ -194,18 +179,6 @@
SCPDEFS+=\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
-diff -ru scp2.orig/source/ooo/profileitem_ooo.scp scp2/source/ooo/profileitem_ooo.scp
---- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp 2005-08-08 08:45:11.000000000 +0100
-+++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp 2005-08-08 08:46:39.000000000 +0100
-@@ -744,7 +744,7 @@
- #ifndef SYSTEM_HSQLDB
- Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar !
$ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar $ORIGIN/classes/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
- #else
-- Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar !
$ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar file:///usr/share/java/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
-+ Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar file:///usr/share/java/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/docbook.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/XFlatXml.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilt!
er.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar file:///usr/share/java/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
- #endif
- End
-
diff -ru scripting.orig/java/build.xml scripting/java/build.xml
--- openoffice.org.orig/scripting/java/build.xml 2005-08-08 08:52:47.000000000 +0100
+++ openoffice.org/scripting/java/build.xml 2005-08-08 08:55:34.000000000 +0100
@@ -234,3 +207,59 @@
cn connectivity usr1 - all cn_mkout NULL
cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb NULL
cn connectivity\source\types nmake - all cn_types NULL
+Index: profileitem_ooo.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ooo/profileitem_ooo.scp,v
+retrieving revision 1.27
+diff -u -p -r1.27 profileitem_ooo.scp
+--- openoffice.org.orig/scp2/source/ooo/profileitem_ooo.scp 24 Oct 2005 18:31:12 -0000 1.27
++++ openoffice.org/scp2/source/ooo/profileitem_ooo.scp 5 Nov 2005 13:25:29 -0000
+@@ -740,6 +740,10 @@ ProfileItem gid_Profileitem_Jvmfwk_Uno_J
+ Section = "Bootstrap";
+ Order = 7;
+ Key = "UNO_JAVA_JFW_CLASSPATH_URLS";
++#ifndef SYSTEM_HSQLDB
+ Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar $ORIGIN/classes/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/xt.jar $!
ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar $ORIGIN/classes/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar";
++#else
++ Value = "${${$ORIGIN/$UNO_SETTINGS:PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/$UNO_SETTINGS:PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $ORIGIN/classes/jurt.jar $ORIGIN/classes/ridl.jar $ORIGIN/classes/java_uno.jar $ORIGIN/classes/sandbox.jar file:///usr/share/java/bsh.jar $ORIGIN/classes/classes.jar $ORIGIN/classes/commonwizards.jar $ORIGIN/classes/htmlsoff.jar $ORIGIN/classes/java_uno_accessbridge.jar $ORIGIN/classes/js.jar $ORIGIN/classes/juh.jar $ORIGIN/classes/jut.jar $ORIGIN/classes/letter.jar $ORIGIN/classes/officebean.jar $ORIGIN/classes/query.jar $ORIGIN/classes/report.jar $ORIGIN/classes/ScriptFramework.jar $ORIGIN/classes/ScriptProviderForBeanShell.jar $ORIGIN/classes/ScriptProviderForJava.jar $ORIGIN/classes/ScriptProviderForJavaScript.jar $ORIGIN/classes/tutorial.jar $ORIGIN/classes/unoil.jar $ORIGIN/classes/web.jar $ORIGIN/classes/xmerge.jar $ORIGIN/classes/XMergeBridge.jar $ORIGIN/classes/XSLTFilter.jar $ORIGIN/classes/XSLTValidate.jar $ORIGIN/classes/x!
t.jar $ORIGIN/classes/activation.jar $ORIGIN/classes/agenda.jar $ORIGIN/classes/aportisdoc.jar $ORIGIN/classes/avmedia.jar $ORIGIN/classes/email.jar $ORIGIN/classes/fax.jar $ORIGIN/classes/pexcel.jar $ORIGIN/classes/pocketword.jar $ORIGIN/classes/mail.jar file:///usr/share/java/hsqldb.jar $ORIGIN/classes/sdbc_hsqldb.jar file:///usr/share/java/xerces-j2.jar file:///usr/share/java/xalan-j2.jar file:///usr/share/java/xml-commons-apis-1.0.jar";
++#endif
+ End
+
+Index: source/xmerge/build.xml
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v
+retrieving revision 1.2
+diff -u -p -u -r1.2 build.xml
+--- openoffice.org.orig/xmerge/source/xmerge/build.xml 24 Oct 2005 17:57:33 -0000 1.2
++++ openoffice.org/xmerge/source/xmerge/build.xml 5 Nov 2005 19:24:16 -0000
+@@ -58,9 +58,8 @@
+ <property file="../inc/antbuild.properties"/>
+
+ <path id="classpath">
+- <pathelement location="${solar.jar}/parser.jar"/>
+- <pathelement location="${solar.jar}/jaxp.jar"/>
+- <pathelement location="${solar.jar}/xerces.jar"/>
++ <pathelement location="/usr/share/java/xerces-j2.jar"/>
++ <pathelement location="/usr/share/java/xalan-j2.jar"/>
+ <pathelement location="${solar.jar}/unoil.jar"/>
+ <pathelement location="${solar.jar}/ridl.jar"/>
+ <pathelement location="${solar.jar}/jurt.jar"/>
+Index: source/config/fragments/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
+retrieving revision 1.14
+diff -u -p -u -r1.14 makefile.mk
+--- openoffice.org.orig/filter/source/config/fragments/makefile.mk 25 Oct 2005 11:56:16 -0000 1.14
++++ openoffice.org/filter/source/config/fragments/makefile.mk 7 Nov 2005 13:46:28 -0000
+@@ -149,7 +149,11 @@ ALLTAR: \
+ MERGE:=python ../tools/merge/pyAltFCFGMerge
+ .ELSE
+ MERGE := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
++.IF "$(SYSTEM_XALAN)"="YES"
++PACKLANG := $(JAVAI) $(JAVACPS) /usr/share/java/xalan-j2.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
++.ELSE
+ PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
++.ENDIF
+ .ENDIF
+
+ # -----------------------------------------------------------------------------
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
SRC680_m123/desktop/scripts/soffice.sh | 4 ++++
osl/unx/signal.c | 0
sal/osl/unx/signal.c | 9 +++++++++
3 files changed, 13 insertions(+)
Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 22 Aug 2005 11:50:19 -0000 1.1
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -23,3 +23,26 @@
break;
;;
*)
+Index: osl/unx/signal.c
+===================================================================
+RCS file: /cvs/porting/sal/osl/unx/signal.c,v
+retrieving revision 1.28
+diff -u -p -u -r1.28 signal.c
+--- openoffice.org.orig/sal/osl/unx/signal.c 8 Sep 2005 15:00:57 -0000 1.28
++++ openoffice.org/sal/osl/unx/signal.c 3 Nov 2005 11:42:52 -0000
+@@ -184,6 +184,15 @@ static sal_Bool is_soffice_Impl (void)
+ if (strProgName)
+ {
+ index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "soffice");
++
++ if (index == -1)
++ index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "swriter");
++ if (index == -1)
++ index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "simpress");
++ if (index == -1)
++ index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "scalc");
++ if (index == -1)
++ index = rtl_str_indexOfStr (rtl_string_getStr (strProgName), "sdraw");
+ rtl_string_release (strProgName);
+ }
+ return (index != -1);
openoffice.org-1.9.125.ooo54586.nfslock.sal.patch:
soffice.sh | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
Index: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.125.ooo54586.nfslock.sal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.125.ooo54586.nfslock.sal.patch 28 Sep 2005 13:24:05 -0000 1.1
+++ openoffice.org-1.9.125.ooo54586.nfslock.sal.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -1,39 +1,15 @@
-Index: sal/osl/unx/file.cxx
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/file.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 file.cxx
---- openoffice.org.orig/sal/osl/unx/file.cxx 31 May 2005 17:07:41 -0000 1.8
-+++ openoffice.org/sal/osl/unx/file.cxx 23 Aug 2005 16:42:43 -0000
-@@ -650,6 +652,8 @@ oslFileError osl_openFile( rtl_uString*
- fd = open( buffer, flags, mode );
- if ( fd >= 0 )
- {
-+ sal_Bool got_flock;
-+
- /* check if file lock is enabled and clear l_type member of flock otherwise */
- if( (char *) -1 == pFileLockEnvVar )
- {
-@@ -663,8 +667,21 @@ oslFileError osl_openFile( rtl_uString*
- if( NULL == pFileLockEnvVar )
- aflock.l_type = 0;
+--- OOO680_m3/desktop/scripts/soffice.sh.orig 2005-11-04 11:02:47.000000000 +0000
++++ OOO680_m3/desktop/scripts/soffice.sh 2005-11-04 11:03:13.000000000 +0000
+@@ -44,9 +44,10 @@
+ # export STAR_PROFILE_LOCKING_DISABLED
+ #
-+ got_flock = sal_False;
- /* lock the file if flock.l_type is set */
-- if( F_WRLCK != aflock.l_type || -1 != fcntl( fd, F_SETLK, &aflock ) )
-+ if( F_WRLCK != aflock.l_type)
-+ got_flock = sal_True;
-+ if( -1 != fcntl( fd, F_SETLK, &aflock ) )
-+ got_flock = sal_True;
-+ else if( errno == EAGAIN )
-+ errno = EACCES; /* misleading synonym */
-+ else if( errno == ENOLCK )
-+ { /* locking not supported */
-+ errno = 0;
-+ got_flock = sal_True;
-+ }
-+
-+ if (got_flock)
- {
- /* allocate memory for impl structure */
- pHandleImpl = (oslFileHandleImpl*) rtl_allocateMemory( sizeof(oslFileHandleImpl) );
++#http://www.openoffice.org/issues/show_bug.cgi?id=54586
+ # file locking now enabled by default
+-SAL_ENABLE_FILE_LOCKING=1
+-export SAL_ENABLE_FILE_LOCKING
++#SAL_ENABLE_FILE_LOCKING=1
++#export SAL_ENABLE_FILE_LOCKING
+
+ # the following test is needed on Linux PPC with IBM j2sdk142
+ if [ `uname -s` = "Linux" -a "`uname -m`" = "ppc" ] ; then
openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch:
config_office/configure.in | 20 ++
config_office/set_soenv.in | 1
source/cxxhelp/provider/makefile.mk | 0
source/cxxhelp/provider/urlparameter.cxx | 0
util/makefile.mk | 0
xmlhelp/source/cxxhelp/provider/makefile.mk | 6
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 220 +++++++++++++++++++----
xmlhelp/util/makefile.mk | 13 +
8 files changed, 222 insertions(+), 38 deletions(-)
Index: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 28 Sep 2005 13:24:05 -0000 1.1
+++ openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -1,6 +1,6 @@
--- openoffice.org.orig/config_office/configure.in 2005-08-30 15:45:40.000000000 +0100
+++ openoffice.org/config_office/configure.in 2005-08-30 15:56:10.000000000 +0100
-@@ -233,6 +233,9 @@
+@@ -239,6 +239,9 @@
AC_ARG_WITH(system-sablot,
[ --with-system-sablot Use sablot already on system
],,)
@@ -10,7 +10,7 @@
AC_ARG_WITH(system-odbc,
[ --with-system-odbc-headers Use the odbc headers already on system
],,)
-@@ -2613,6 +2616,22 @@
+@@ -2644,6 +2647,22 @@
AC_SUBST(DB_JAR)
dnl ===================================================================
@@ -33,11 +33,7 @@
dnl Check for system sablot
dnl ===================================================================
AC_MSG_CHECKING([which sablot to use])
-@@ -2631,9 +2650,11 @@
- else
- AC_MSG_RESULT([internal])
- SYSTEM_SABLOT=NO
-+ BUILD_TYPE="$BUILD_TYPE SABLOT"
+@@ -2666,6 +2685,7 @@
fi
AC_SUBST(SYSTEM_SABLOT)
AC_SUBST(SABLOT_LIBS)
@@ -56,19 +52,6 @@
ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" );
ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" );
ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" );
-Index: prj/build.lst
-===================================================================
-RCS file: /cvs/util/xmlhelp/prj/build.lst,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 build.lst
---- openoffice.org.orig/xmlhelp/prj/build.lst 14 Feb 2002 13:22:16 -0000 1.8
-+++ openoffice.org/xmlhelp/prj/build.lst 30 Aug 2005 15:09:51 -0000
-@@ -1,4 +1,4 @@
--xh xmlhelp : ucbhelper XmlSearch sablot jut unoil berkeleydb NULL
-+xh xmlhelp : ucbhelper XmlSearch SABLOT:sablot jut unoil berkeleydb NULL
- 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
Index: source/cxxhelp/provider/makefile.mk
===================================================================
RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/makefile.mk,v
openoffice.org-1.9.128.ooo54479.systemicu.patch:
config_office/configure.in | 52 ++++++++--------
config_office/set_soenv.in | 6 -
i18npool/inc/collator_unicode.hxx | 1
i18npool/prj/build.lst | 2
i18npool/source/breakiterator/breakiterator_unicode.cxx | 20 ++++--
i18npool/source/breakiterator/makefile.mk | 8 +-
i18npool/source/collator/collator_unicode.cxx | 7 +-
inc/collator_unicode.hxx | 0
linguistic/source/hhconvdic.cxx | 2
prj/build.lst | 0
scp2/prj/build.lst | 2
scp2/source/ooo/file_library_ooo.scp | 4 +
scp2/source/ooo/makefile.mk | 6 +
scp2/source/ooo/shortcut_ooo.scp | 30 ---------
source/breakiterator/breakiterator_unicode.cxx | 0
source/breakiterator/makefile.mk | 0
source/collator/collator_unicode.cxx | 0
source/hhconvdic.cxx | 0
vcl/prj/build.lst | 2
19 files changed, 71 insertions(+), 71 deletions(-)
Index: openoffice.org-1.9.128.ooo54479.systemicu.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.128.ooo54479.systemicu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.128.ooo54479.systemicu.patch 28 Sep 2005 13:24:05 -0000 1.1
+++ openoffice.org-1.9.128.ooo54479.systemicu.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -101,46 +101,6 @@
};
#define COLLATOR( algorithm ) \
-Index: prj/build.lst
-===================================================================
-RCS file: /cvs/l10n/i18npool/prj/build.lst,v
-retrieving revision 1.17
-diff -u -p -u -r1.17 build.lst
---- openoffice.org.orig/i18npool/prj/build.lst 24 Apr 2003 11:54:37 -0000 1.17
-+++ openoffice.org/i18npool/prj/build.lst 13 Sep 2005 13:49:44 -0000
-@@ -1,4 +1,4 @@
--inp i18npool : bridges sax stoc comphelper tools icu i18nutil regexp NULL
-+inp i18npool : bridges sax stoc comphelper tools ICU:icu i18nutil regexp NULL
- inp i18npool usr1 - all inp_mkout NULL
- inp i18npool\source\unotypes nmake - all inp_utypes NULL
- inp i18npool\source\registerservices nmake - all inp_rserv inp_utypes NULL
-Index: source/breakiterator/breakiterator_unicode.cxx
-===================================================================
-RCS file: /cvs/l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx,v
-retrieving revision 1.18
-diff -u -p -u -r1.18 breakiterator_unicode.cxx
---- openoffice.org.orig/i18npool/source/breakiterator/breakiterator_unicode.cxx 25 Feb 2005 10:08:13 -0000 1.18
-+++ openoffice.org/i18npool/source/breakiterator/breakiterator_unicode.cxx 13 Sep 2005 13:49:44 -0000
-@@ -68,7 +68,9 @@ U_CDECL_BEGIN
- extern const char OpenOffice_icu_dat[];
- U_CDECL_END
-
--using namespace ::com::sun::star::uno;
-+using ::com::sun::star::uno::RuntimeException;
-+using ::com::sun::star::uno::Reference;
-+using ::com::sun::star::uno::Sequence;
- using namespace ::com::sun::star::lang;
- using namespace ::rtl;
-
-@@ -104,7 +106,7 @@ static icu::BreakIterator* loadICURuleBa
- if ( !U_SUCCESS(status) ) throw ERROR;
-
- status = U_ZERO_ERROR;
-- icu::BreakIterator* breakiterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", name, &status), status);
-+ icu::BreakIterator* breakiterator = new RuleBasedBreakIterator(udata_open("OpenOffice_icu/OpenOffice", "brk", name, &status), status);
- if ( !U_SUCCESS(status) ) throw ERROR;
-
- return breakiterator;
Index: source/breakiterator/makefile.mk
===================================================================
RCS file: /cvs/l10n/i18npool/source/breakiterator/makefile.mk,v
@@ -380,3 +340,59 @@
vc vcl usr1 - all vc_mkout NULL
vc vcl\source\unotypes nmake - all vc_unot NULL
vc vcl\source\glyphs nmake - all vc_glyphs vc_unot NULL
+Index: prj/build.lst
+===================================================================
+RCS file: /cvs/l10n/i18npool/prj/build.lst,v
+retrieving revision 1.18
+diff -u -r1.18 build.lst
+--- openoffice.org.orig/i18npool/prj/build.lst 1 Nov 2005 14:51:56 -0000 1.18
++++ openoffice.org/i18npool/prj/build.lst 5 Nov 2005 16:13:03 -0000
+@@ -1,4 +1,4 @@
+-inp i18npool : bridges sax stoc comphelper icu i18nutil regexp NULL
++inp i18npool : bridges sax stoc comphelper ICU:icu i18nutil regexp NULL
+ inp i18npool usr1 - all inp_mkout NULL
+ inp i18npool\source\unotypes nmake - all inp_utypes NULL
+ inp i18npool\source\registerservices nmake - all inp_rserv inp_utypes NULL
+Index: source/breakiterator/breakiterator_unicode.cxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/breakiterator/breakiterator_unicode.cxx,v
+retrieving revision 1.20
+diff -u -r1.20 breakiterator_unicode.cxx
+--- openoffice.org.orgi/i18npool/source/breakiterator/breakiterator_unicode.cxx 17 Oct 2005 15:42:30 -0000 1.20
++++ openoffice.org/i18npool/source/breakiterator/breakiterator_unicode.cxx 5 Nov 2005 16:14:56 -0000
+@@ -42,7 +42,9 @@
+ extern const char OpenOffice_icu_dat[];
+ U_CDECL_END
+
+-using namespace ::com::sun::star::uno;
++using ::com::sun::star::uno::RuntimeException;
++using ::com::sun::star::uno::Reference;
++using ::com::sun::star::uno::Sequence;
+ using namespace ::com::sun::star::lang;
+ using namespace ::rtl;
+
+@@ -91,12 +93,20 @@
+ if ( !U_SUCCESS(status) ) throw ERROR;
+
+ status = U_ZERO_ERROR;
+- aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk",
++ UDataMemory *pData;
++ if (!rLocale.Language.getLength())
++ pData=0;
++ else
++ pData = udata_open("OpenOffice_icu/OpenOffice", "brk",
+ OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
+- RTL_TEXTENCODING_ASCII_US).getStr(), &status), status);
+- if (!U_SUCCESS(status) ) {
++ RTL_TEXTENCODING_ASCII_US).getStr(), &status);
++
++ aBreakIterator = pData ? new RuleBasedBreakIterator(pData, status) : 0;
++ if (!U_SUCCESS(status) || !aBreakIterator) {
+ status = U_ZERO_ERROR;
+- aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", rule, &status), status);
++ pData = udata_open("OpenOffice_icu/OpenOffice", "brk", rule, &status);
++ if (U_SUCCESS(status) && pData)
++ aBreakIterator = new RuleBasedBreakIterator(pData, status);
+ if (!U_SUCCESS(status) ) aBreakIterator=NULL;
+ }
+ }
openoffice.org-1.9.129.ooo54603.fontconfig.patch:
fontmanager/fontcache.cxx | 2
fontmanager/fontmanager.cxx | 9
inc/psprint/fontmanager.hxx | 0
psprint/fontmanager.hxx | 13 -
psprint/source/fontmanager/fontconfig.cxx | 269 ++++++++++++++++++-----
source/fontmanager/fontcache.cxx | 0
source/fontmanager/fontconfig.cxx | 0
source/fontmanager/fontmanager.cxx | 0
vcl/inc/outdev.h | 3
vcl/inc/outfont.hxx | 15 +
vcl/source/gdi/outdev3.cxx | 338 +++++++++++++++++++++---------
vcl/source/window/window.cxx | 5
vcl/util/makefile.mk | 2
13 files changed, 487 insertions(+), 169 deletions(-)
Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch 28 Sep 2005 13:24:05 -0000 1.1
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -53,7 +53,7 @@
diff -ru vcl.preconfig/source/gdi/outdev3.cxx vcl/source/gdi/outdev3.cxx
--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx 2005-09-12 13:37:04.000000000 +0100
+++ openoffice.org/vcl/source/gdi/outdev3.cxx 2005-09-12 15:26:08.000000000 +0100
-@@ -185,6 +185,9 @@
+@@ -168,6 +168,9 @@
#include <memory>
#include <algorithm>
@@ -63,7 +63,7 @@
// =======================================================================
DBG_NAMEEX( OutputDevice );
-@@ -2670,6 +2673,124 @@
+@@ -2656,6 +2659,124 @@ ImplFontCache::~ImplFontCache()
}
}
@@ -188,7 +188,7 @@
// -----------------------------------------------------------------------
ImplFontEntry* ImplFontCache::Get( ImplDevFontList* pFontList,
-@@ -2707,8 +2828,12 @@
+@@ -2693,8 +2814,12 @@ ImplFontEntry* ImplFontCache::Get( ImplD
if( !pEntry ) // no direct cache hit
{
@@ -203,13 +203,13 @@
DBG_ASSERT( (pFontFamily != NULL), "ImplFontCache::Get() No logical font found!" );
aFontSelData.maSearchName = pFontFamily->GetSearchName();
-@@ -3028,109 +3153,102 @@
+@@ -3014,115 +3139,101 @@ ImplDevFontListData* ImplDevFontList::Im
// -----------------------------------------------------------------------
ImplFontEntry* ImplFontCache::GetFallback( ImplDevFontList* pFontList,
- const Font& rOrigFont, const Size& rSize, int nFallbackLevel )
-+ const Font& rOrigFont, const Size& rSize, int nFallbackLevel,
-+ sal_Unicode *pMissingUnicodes, int nMissingUnicodes )
++ const Font& rOrigFont, const Size& rSize, int nFallbackLevel,
++ sal_Unicode *pMissingUnicodes, int nMissingUnicodes )
{
- // make sure the fontlist knows it's fallbacks
- if( !pFontList->HasFallbacks() )
@@ -245,9 +245,11 @@
- "shayyalmt", "naskmt", "",
- "david", "nachlieli", "lucidagrande", "",
- "norasi", "angsanaupc", "",
+- "khmerossystem", "",
- 0
- };
-
+- bool bHasEudc = false;
- int nMaxLevel = 0;
- int nBestQuality = 0;
- ImplDevFontListData** pFallbackList = NULL;
@@ -303,22 +305,26 @@
- if( !pFallbackList )
- pFallbackList = new ImplDevFontListData*[ MAX_FALLBACK ];
- pFallbackList[ nMaxLevel ] = pFallbackFont;
+- if( !bHasEudc && !nMaxLevel )
+- bHasEudc = (0 == strncmp( *ppNames, "eudc", 5 ));
- }
- }
+ if ( !cached )
+ {
+ String aName(GetFcSubstitute( aSelData, pMissingUnicodes, nMissingUnicodes ));
-+ if (aName.Len())
++ if (aName.Len())
+ aSelData.maSearchName = aName;
+ }
-- // sort the fonts for glyph fallback by quality (highest first)
+- // sort the list of fonts for glyph fallback by quality (highest first)
+- // #i33947# keep the EUDC font at the front of the list
- // an insertion sort is good enough for this short list
-- for( int i = 1, j; i < nMaxLevel; ++i )
+- const int nSortStart = bHasEudc ? 1 : 0;
+- for( int i = nSortStart+1, j; i < nMaxLevel; ++i )
- {
- ImplDevFontListData* pTestFont = pFallbackList[ i ];
- int nTestQuality = pTestFont->GetMinQuality();
-- for( j = i; --j >= 0; )
+- for( j = i; --j >= nSortStart; )
- if( nTestQuality > pFallbackList[j]->GetMinQuality() )
- pFallbackList[ j+1 ] = pFallbackList[ j ];
- else
@@ -348,7 +354,6 @@
+ if( pFontData->IsSymbolFont() )
+ if( aSelData.maTargetName != aSelData.maSearchName )
+ pFallbackFont->mpConversion = ImplGetRecodeData( aSelData.maTargetName, aSelData.maSearchName );
-+
+ // add the new entry to the cache
+ maFontInstanceList[ aSelData ] = pFallbackFont;
+ new_entry = true;
@@ -392,7 +397,7 @@
if( pFallbackFont && !pFallbackFont->mbInit )
{
// HACK: maMetrics are irrelevant for fallback fonts, but
-@@ -3139,6 +3257,27 @@
+@@ -3131,6 +3242,27 @@ ImplFontEntry* ImplFontCache::GetFallbac
pFallbackFont->maMetric.maStyleName = String();
}
@@ -420,7 +425,7 @@
return pFallbackFont;
}
-@@ -6105,7 +6244,7 @@
+@@ -6097,7 +6229,7 @@ SalLayout* OutputDevice::ImplLayout( con
// do glyph fallback if needed
// #105768# avoid fallback for very small font sizes
if( aLayoutArgs.NeedFallback() )
@@ -429,7 +434,7 @@
pSalLayout = ImplGlyphFallbackLayout( pSalLayout, aLayoutArgs );
// position, justify, etc. the layout
-@@ -6149,6 +6288,17 @@
+@@ -6141,6 +6273,17 @@ SalLayout* OutputDevice::ImplGlyphFallba
rLayoutArgs.ResetPos();
}
#endif
@@ -447,7 +452,7 @@
ImplFontSelectData aFontSelData = mpFontEntry->maFontSelData;
Size aFontSize( aFontSelData.mnWidth, aFontSelData.mnHeight );
-@@ -6165,7 +6315,8 @@
+@@ -6157,7 +6300,8 @@ SalLayout* OutputDevice::ImplGlyphFallba
{
// find a font family suited for glyph fallback
ImplFontEntry* pFallbackFont = mpFontCache->GetFallback( mpFontList,
@@ -457,15 +462,15 @@
if( !pFallbackFont )
break;
-@@ -6217,6 +6368,8 @@
+@@ -6208,6 +6352,8 @@ SalLayout* OutputDevice::ImplGlyphFallba
+ if( !rLayoutArgs.PrepareFallback() )
break;
}
-
-+ delete[] pMissingUnicodes;
+
++ delete[] pMissingUnicodes;
+
if( pMultiSalLayout && pMultiSalLayout->LayoutText( rLayoutArgs ) )
pSalLayout = pMultiSalLayout;
-
diff -ru vcl.preconfig/source/window/window.cxx vcl/source/window/window.cxx
--- openoffice.org.orig/vcl/source/window/window.cxx 2005-09-12 13:37:04.000000000 +0100
+++ openoffice.org/vcl/source/window/window.cxx 2005-09-12 16:18:20.000000000 +0100
@@ -568,14 +573,58 @@
PrintFontManager::PrintFont* pFont = clonePrintFont( *font );
rNewFonts.push_back( pFont );
}
+Index: source/fontmanager/fontmanager.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/fontmanager/fontmanager.cxx,v
+retrieving revision 1.59
+diff -u -r1.59 fontmanager.cxx
+--- openoffice.org.orig/psprint/usource/fontmanager/fontmanager.cxx 5 Aug 2005 12:53:31 -0000 1.59
++++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx 12 Sep 2005 16:21:14 -0000
+@@ -1155,7 +1155,8 @@ PrintFontManager::PrintFontManager() :
+ m_nNextFontID( 1 ),
+ m_pAtoms( new MultiAtomProvider() ),
+ m_nNextDirAtom( 1 ),
+- m_pFontCache( NULL )
++ m_pFontCache( NULL ),
++ m_bFontconfigSuccess(false)
+ {
+ for( unsigned int i = 0; i < sizeof( aAdobeCodes )/sizeof( aAdobeCodes[0] ); i++ )
+ {
+@@ -2109,7 +2110,7 @@ void PrintFontManager::initialize( void*
+ #endif
+
+ // first try fontconfig
+- bool bFontconfigSuccess = initFontconfig();
++ m_bFontconfigSuccess = initFontconfig();
+
+ // part one - look for downloadable fonts
+ rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
+@@ -2131,7 +2132,7 @@ void PrintFontManager::initialize( void*
+ }
+
+ // don't search through many directories fontconfig already told us about
+- if( ! bFontconfigSuccess )
++ if( ! m_bFontconfigSuccess )
+ {
+ Display *pDisplay = (Display*)pInitDisplay;
+
+@@ -2209,7 +2210,7 @@ void PrintFontManager::initialize( void*
+ }
+ }
+ #endif /* SOLARIS */
+- } // ! bFontconfigSuccess
++ } // ! m_bFontconfigSuccess
+
+ // fill XLFD aliases from fonts.alias files
+ initFontsAlias();
Index: source/fontmanager/fontconfig.cxx
===================================================================
RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v
-retrieving revision 1.9
-diff -u -r1.9 fontconfig.cxx
---- openoffice.org.orig/psprint/usource/fontmanager/fontconfig.cxx 9 Aug 2005 10:59:52 -0000 1.9
-+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 12 Sep 2005 16:21:14 -0000
-@@ -70,10 +70,12 @@
+retrieving revision 1.14
+diff -u -p -u -r1.14 fontconfig.cxx
+--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 27 Oct 2005 07:55:13 -0000 1.14
++++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 5 Nov 2005 11:22:58 -0000
+@@ -44,10 +44,12 @@ typedef void FcConfig;
typedef void FcObjectSet;
typedef void FcPattern;
typedef void FcFontSet;
@@ -588,7 +637,7 @@
#endif
#include <cstdio>
-@@ -106,6 +108,7 @@
+@@ -80,6 +82,7 @@ class FontCfgWrapper
{
void* m_pLib;
FcConfig* m_pDefConfig;
@@ -596,7 +645,7 @@
FcBool (*m_pFcInit)();
FcConfig* (*m_pFcConfigGetCurrent)();
-@@ -114,17 +117,23 @@
+@@ -88,17 +91,23 @@ class FontCfgWrapper
FcPattern* (*m_pFcPatternCreate)();
void (*m_pFcPatternDestroy)(FcPattern*);
FcFontSet* (*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*);
@@ -621,7 +670,7 @@
FcBool (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
void* loadSymbol( const char* );
-@@ -140,6 +149,7 @@
+@@ -114,6 +123,7 @@ public:
{ return m_pLib != NULL;}
FcConfig* getDefConfig() { return m_pDefConfig; }
@@ -629,7 +678,7 @@
FcBool FcInit()
{ return m_pFcInit(); }
-@@ -169,14 +179,28 @@
+@@ -143,14 +153,28 @@ public:
FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet )
{ return m_pFcFontList( pConfig, pPattern, pSet ); }
@@ -659,7 +708,7 @@
FcResult FcPatternGetString( const FcPattern* pPattern, const char* object, int n, FcChar8** s )
{ return m_pFcPatternGetString( pPattern, object, n, s ); }
-@@ -190,12 +214,16 @@
+@@ -164,12 +188,16 @@ public:
{ return m_pFcPatternGetBool( pPattern, object, n, s ); }
void FcDefaultSubstitute( FcPattern* pPattern )
{ m_pFcDefaultSubstitute( pPattern ); }
@@ -678,7 +727,7 @@
FcBool FcPatternAddString( FcPattern* pPattern, const char* pObject, const FcChar8* pString )
{ return m_pFcPatternAddString( pPattern, pObject, pString ); }
};
-@@ -212,7 +240,8 @@
+@@ -186,7 +214,8 @@ void* FontCfgWrapper::loadSymbol( const
FontCfgWrapper::FontCfgWrapper()
: m_pLib( NULL ),
@@ -688,7 +737,7 @@
{
#ifdef ENABLE_FONTCONFIG
OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libfontconfig.so.1" ) );
-@@ -246,12 +275,20 @@
+@@ -220,12 +249,20 @@ FontCfgWrapper::FontCfgWrapper()
loadSymbol( "FcPatternDestroy" );
m_pFcFontList = (FcFontSet*(*)(FcConfig*,FcPattern*,FcObjectSet*))
loadSymbol( "FcFontList" );
@@ -709,7 +758,7 @@
m_pFcPatternGetString = (FcResult(*)(const FcPattern*,const char*,int,FcChar8**))
loadSymbol( "FcPatternGetString" );
m_pFcPatternGetInteger = (FcResult(*)(const FcPattern*,const char*,int,int*))
-@@ -262,12 +299,16 @@
+@@ -236,12 +273,16 @@ FontCfgWrapper::FontCfgWrapper()
loadSymbol( "FcPatternGetBool" );
m_pFcDefaultSubstitute = (void(*)(FcPattern *))
loadSymbol( "FcDefaultSubstitute" );
@@ -728,7 +777,7 @@
m_pFcPatternAddString = (FcBool(*)(FcPattern*,const char*,const FcChar8*))
loadSymbol( "FcPatternAddString" );
-@@ -279,17 +320,23 @@
+@@ -253,17 +294,23 @@ FontCfgWrapper::FontCfgWrapper()
m_pFcPatternCreate &&
m_pFcPatternDestroy &&
m_pFcFontList &&
@@ -753,8 +802,8 @@
m_pFcPatternAddString
) )
{
-@@ -307,10 +354,35 @@
- osl_unloadModule( m_pLib );
+@@ -281,10 +328,35 @@ FontCfgWrapper::FontCfgWrapper()
+ osl_unloadModule( (oslModule)m_pLib );
m_pLib = NULL;
}
+
@@ -787,9 +836,9 @@
+ if( m_pOutlineSet )
+ FcFontSetDestroy( m_pOutlineSet );
if( m_pLib )
- osl_unloadModule( m_pLib );
+ osl_unloadModule( (oslModule)m_pLib );
}
-@@ -345,18 +417,7 @@
+@@ -319,19 +391,8 @@ bool PrintFontManager::initFontconfig()
if( ! rWrapper.isValid() )
return false;
@@ -805,11 +854,12 @@
- (void *) NULL );
- FcPattern* pPattern = rWrapper.FcPatternCreate();
- FcFontSet* pFSet = rWrapper.FcFontList( pConfig, pPattern, pOSet );
+ rtl_TextEncoding aThreadTextEncoding = osl_getThreadTextEncoding();
+ FcFontSet* pFSet = rWrapper.getFontSet();
if( pFSet )
{
-@@ -399,6 +460,8 @@
+@@ -374,6 +434,8 @@ bool PrintFontManager::initFontconfig()
);
#endif
@@ -818,7 +868,7 @@
// only outline fonts are usable to psprint anyway
if( eOutRes == FcResultMatch && ! outline )
continue;
-@@ -537,14 +600,6 @@
+@@ -516,14 +578,6 @@ bool PrintFontManager::initFontconfig()
}
}
@@ -833,7 +883,7 @@
// how does one get rid of the config ?
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "inserted %d fonts from fontconfig\n", nFonts );
-@@ -558,39 +613,14 @@
+@@ -537,39 +591,14 @@ void PrintFontManager::deinitFontconfig(
FontCfgWrapper::release();
}
@@ -877,7 +927,7 @@
{
case italic::Italic: nSlant = FC_SLANT_ITALIC;break;
case italic::Oblique: nSlant = FC_SLANT_OBLIQUE;break;
-@@ -599,10 +629,10 @@
+@@ -578,10 +607,10 @@ bool PrintFontManager::matchFont( FastPr
}
rWrapper.FcPatternAddInteger( pPattern, FC_SLANT, nSlant );
}
@@ -890,7 +940,7 @@
{
case weight::Thin: nWeight = FC_WEIGHT_THIN;break;
case weight::UltraLight: nWeight = FC_WEIGHT_ULTRALIGHT;break;
-@@ -619,10 +649,10 @@
+@@ -598,10 +627,10 @@ bool PrintFontManager::matchFont( FastPr
}
rWrapper.FcPatternAddInteger( pPattern, FC_WEIGHT, nWeight );
}
@@ -903,7 +953,7 @@
{
case width::UltraCondensed: nWidth = FC_WIDTH_ULTRACONDENSED;break;
case width::ExtraCondensed: nWidth = FC_WIDTH_EXTRACONDENSED;break;
-@@ -638,10 +668,10 @@
+@@ -617,10 +646,10 @@ bool PrintFontManager::matchFont( FastPr
}
rWrapper.FcPatternAddInteger( pPattern, FC_WIDTH, nWidth );
}
@@ -916,7 +966,7 @@
{
case pitch::Fixed: nSpacing = FC_MONO;break;
case pitch::Variable: nSpacing = FC_PROPORTIONAL;break;
-@@ -649,12 +679,122 @@
+@@ -628,12 +657,123 @@ bool PrintFontManager::matchFont( FastPr
break;
}
rWrapper.FcPatternAddInteger( pPattern, FC_SPACING, nSpacing );
@@ -947,6 +997,7 @@
+ {
+ OString maTargetName = OUStringToOString(*aIter, RTL_TEXTENCODING_UTF8);
+ rWrapper.FcPatternAddString(pPattern, FC_FAMILY, (FcChar8*)maTargetName.getStr());
++ break;
+ }
+
+ if( rLangAttrib.Len() )
@@ -1040,47 +1091,3 @@
bool bSuccess = false;
if( pResult )
{
-Index: source/fontmanager/fontmanager.cxx
-===================================================================
-RCS file: /cvs/gsl/psprint/source/fontmanager/fontmanager.cxx,v
-retrieving revision 1.59
-diff -u -r1.59 fontmanager.cxx
---- openoffice.org.orig/psprint/usource/fontmanager/fontmanager.cxx 5 Aug 2005 12:53:31 -0000 1.59
-+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx 12 Sep 2005 16:21:14 -0000
-@@ -1177,7 +1177,8 @@
- m_nNextFontID( 1 ),
- m_pAtoms( new MultiAtomProvider() ),
- m_nNextDirAtom( 1 ),
-- m_pFontCache( NULL )
-+ m_pFontCache( NULL ),
-+ m_bFontconfigSuccess(false)
- {
- for( unsigned int i = 0; i < sizeof( aAdobeCodes )/sizeof( aAdobeCodes[0] ); i++ )
- {
-@@ -2129,7 +2130,7 @@
- #endif
-
- // first try fontconfig
-- bool bFontconfigSuccess = initFontconfig();
-+ m_bFontconfigSuccess = initFontconfig();
-
- // part one - look for downloadable fonts
- rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-@@ -2151,7 +2152,7 @@
- }
-
- // don't search through many directories fontconfig already told us about
-- if( ! bFontconfigSuccess )
-+ if( ! m_bFontconfigSuccess )
- {
- Display *pDisplay = (Display*)pInitDisplay;
-
-@@ -2229,7 +2230,7 @@
- }
- }
- #endif /* SOLARIS */
-- } // ! bFontconfigSuccess
-+ } // ! m_bFontconfigSuccess
-
- // fill XLFD aliases from fonts.alias files
- initFontsAlias();
openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch:
bin/deliver.pl | 0
config_office/set_soenv.in | 9 ++++++---
helpcontent2/util/target.pmk | 5 ++++-
prj/d.lst | 0
solenv/bin/deliver.pl | 4 +++-
source/com/sun/star/help/makefile.mk | 0
util/target.pmk | 0
xmlhelp/prj/d.lst | 1 +
xmlhelp/source/com/sun/star/help/makefile.mk | 17 +++++++++++++++++
9 files changed, 31 insertions(+), 5 deletions(-)
Index: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch 28 Sep 2005 13:24:05 -0000 1.1
+++ openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -42,15 +42,15 @@
diff -u -p -u -r1.10 target.pmk
--- openoffice.org.orig/helpcontent2/util/target.pmk 8 Sep 2005 03:01:39 -0000 1.10
+++ openoffice.org/helpcontent2/util/target.pmk 16 Sep 2005 11:12:39 -0000
-@@ -46,5 +46,8 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$
+@@ -46,5 +46,8 @@
- $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(MISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(MISC)$/xhp_changed.flag
+ $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag
@+-$(MKDIR) -p $(@:d)
+.IF "$(JDK)" != "gcj"
- $(JAVAI) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(MISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(MISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+ $(JAVAI) $(JAVA_LIBRARY_PATH) -cp $(my_cp) com.sun.star.help.HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
-
+.ELSE
-+ HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(MISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(MISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
++ HelpLinker @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -idx $(PRJ)$/source$/auxiliary$/index.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
+.ENDIF
Index: bin/deliver.pl
===================================================================
@@ -105,7 +105,7 @@
+ $(JAVACOMPILER) --main=com.sun.star.help.HelpLinker -o $(BIN)$/HelpLinker \
+ -O2 -Wl,-Bsymbolic -findirect-dispatch -fjni -fno-assert -Wno-deprecated \
+ $(JAVACPS) $(CLASSPATH) $(JAVAFILES) $(SOLARLIB) -L$(LB) \
-+ -ldb.jar -lxmlsearch.jar -lunoil.jar -ljurt.jar -lridl.jar -lparser.jar
++ -ldb.jar -lxmlsearch.jar -lxt.jar -lunoil.jar -ljurt.jar -lridl.jar
+
+$(LB)$/libdb.jar.a:
+ $(JAVACOMPILER) -c -O2 -findirect-dispatch -fjni $(DB_JAR) -o $(LB)$/libdb.jar.a
openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch:
CreateDb.java | 72 +++++++++++++++++++++++----------------------
HelpDatabases.java | 80 +++++++++++++++++++++++++++-----------------------
HelpIndexer.java | 57 ++++++++++++++++++++---------------
HelpKeyword.java | 10 +++---
HelpLinker.java | 44 +++++++++++++++------------
HelpURLParameter.java | 32 ++++++++++----------
StringDbt.java | 24 +++++++--------
7 files changed, 170 insertions(+), 149 deletions(-)
Index: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch 28 Sep 2005 13:24:05 -0000 1.1
+++ openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -237,7 +237,7 @@
} catch (FileNotFoundException fnfe) {
--- openoffice.org.orig/xmlhelp/source/com/sun/star/help/HelpKeyword.java.ark 2005-07-23 01:21:45.000000000 +0200
+++ openoffice.org/xmlhelp/source/com/sun/star/help/HelpKeyword.java 2005-07-23 02:06:20.000000000 +0200
-@@ -9,8 +9,8 @@
+@@ -9,8 +9,8 @@ package com.sun.star.help;
import java.util.Enumeration;
import java.util.Hashtable;
@@ -248,16 +248,16 @@
/**
* @author ab106281
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ public class HelpKeyword {
data.append(id);
}
- void dump(Db table) {
+ void dump(Database table) {
- Enumeration enum = _hash.keys();
+ Enumeration enumer = _hash.keys();
int j = 0;
String[] list = new String[_hash.size()];
-@@ -71,8 +71,8 @@
+@@ -71,8 +71,8 @@ public class HelpKeyword {
StringDbt key = new StringDbt(list[i]);
StringDbt value = new StringDbt(data.getString());
try {
openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch:
dictionaries/prj/build.lst | 3
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 37 +++++++--
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 40 ++++++++--
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 39 ++++++++-
prj/build.lst | 0
source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 0
source/spellcheck/spell/sspellimp.cxx | 0
source/thesaurus/libnth/nthesimp.cxx | 0
8 files changed, 100 insertions(+), 19 deletions(-)
Index: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch 28 Sep 2005 13:24:05 -0000 1.3
+++ openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch 20 Nov 2005 14:51:54 -0000 1.4
@@ -276,12 +276,12 @@
di dictionaries usr1 - all di_mkout NULL
di dictionaries\diclst nmake - all di_diclst NULL
+di dictionaries\contrib nmake - all di_contrib di_diclst NULL
+ di dictionaries\cs_CZ nmake - all di_cs_CZ di_diclst NULL
di dictionaries\da_DK nmake - all di_da_DK di_diclst NULL
di dictionaries\de_DE nmake - all di_de_DE di_diclst NULL
- di dictionaries\en_GB nmake - all di_en_GB di_diclst NULL
-@@ -9,4 +10,4 @@
+@@ -10,4 +11,4 @@
di dictionaries\ru_RU nmake - all di_ru_RU di_diclst NULL
di dictionaries\th_TH nmake - all di_th_TH di_diclst NULL
di dictionaries\sw_TZ nmake - all di_sw_TZ di_diclst NULL
--di dictionaries\util nmake - all di_util di_da_DK di_de_DE di_en_GB di_en_US di_it_IT di_ru_RU di_th_TH di_sw_TZ di_diclst NULL
-+di dictionaries\util nmake - all di_util di_contrib di_da_DK di_de_DE di_en_GB di_en_US di_it_IT di_ru_RU di_th_TH di_sw_TZ di_diclst NULL
+-di dictionaries\util nmake - all di_util di_cs_CZ di_da_DK di_de_DE di_en_GB di_en_US di_it_IT di_ru_RU di_th_TH di_sw_TZ di_diclst NULL
++di dictionaries\util nmake - all di_util di_contrib di_cs_CZ di_da_DK di_de_DE di_en_GB di_en_US di_it_IT di_ru_RU di_th_TH di_sw_TZ di_diclst NULL
openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 0
com/sun/star/wizards/letter/LetterWizardDialogResources.java | 0
desktop/source/app/langselect.cxx | 18 -
desktop/source/app/langselect.hxx | 2
desktop/source/migration/wizard.cxx | 19 -
framework/source/services/substitutepathvars.cxx | 93 +++++++
framework/util/makefile.mk | 1
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 8
registry/schema/org/openoffice/Office/Common.xcs | 0
sfx2/source/appl/sfxhelp.cxx | 66 ++++-
source/app/langselect.cxx | 0
source/app/langselect.hxx | 0
source/appl/sfxhelp.cxx | 0
source/dialog/optgdlg.cxx | 0
source/dialog/optgdlg.hxx | 0
source/formwizard/dbwizres.src | 0
source/migration/wizard.cxx | 0
source/rc/resmgr.cxx | 0
source/services/substitutepathvars.cxx | 0
source/treeview/tvread.cxx | 0
source/ui/misc/glosdoc.cxx | 0
svx/source/dialog/optgdlg.cxx | 132 ++++++----
svx/source/dialog/optgdlg.hxx | 3
sw/source/ui/misc/glosdoc.cxx | 14 -
tools/source/rc/resmgr.cxx | 19 +
util/makefile.mk | 0
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 24 +
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java | 8
wizards/source/formwizard/dbwizres.src | 11
xmlhelp/source/treeview/tvread.cxx | 4
30 files changed, 309 insertions(+), 113 deletions(-)
Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 28 Sep 2005 13:24:05 -0000 1.2
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 20 Nov 2005 14:51:54 -0000 1.3
@@ -5,16 +5,44 @@
diff -u -p -r1.14 langselect.cxx
--- openoffice.org.orig/desktop/source/app/langselect.cxx 11 Mar 2005 10:47:45 -0000 1.14
+++ openoffice.org/desktop/source/app/langselect.cxx 29 Mar 2005 09:01:28 -0000
-@@ -118,7 +118,7 @@ Locale LanguageSelection::IsoStringToLoc
- bool LanguageSelection::prepareLanguage()
- {
+@@ -136,7 +136,7 @@
+ {
+ }
// get the selected UI language as string
- OUString aLocaleString = getLanguageString();
+ OUString aLocaleString = getLanguageString(true);
if ( aLocaleString.getLength() > 0 )
{
- OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
-@@ -199,7 +199,7 @@ void LanguageSelection::setDefaultLocale
+ try
+@@ -178,9 +178,13 @@
+ OUString usWesternName = OUString::createFromAscii("DefaultLocale");
+ Reference< XPropertySet > xProp(getConfigAccess(
+ "org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
++#if 0
+ OUString usValue;
+ xProp->getPropertyValue(usWesternName) >>= usValue;
+ if (usValue.getLength() == 0)
++#else
++ if (1)
++#endif
+ {
+ // there is no western document language selected
+ // if the selected locale is a western locale, this
+@@ -224,9 +228,13 @@
+ usName = OUString::createFromAscii("DefaultLocale_CTL");
+ break;
+ }
++#if 0
+ OUString usValue;
+ xProp->getPropertyValue(usName) >>= usValue;
+ if (usValue.getLength() == 0)
++#else
++ if (1)
++#endif
+ {
+ // there is no document language set, for the script type selected
+ // in the UI
+@@ -245,7 +253,7 @@
}
}
@@ -23,7 +51,7 @@
{
// did we already find a language?
if (bFoundLanguage)
-@@ -208,7 +208,7 @@ OUString LanguageSelection::getLanguageS
+@@ -254,7 +262,7 @@
OUString aUserLanguage = getUserLanguage();
if (aUserLanguage.getLength() > 0 )
{
@@ -32,7 +60,7 @@
{
// all is well
bFoundLanguage = sal_True;
-@@ -225,7 +225,7 @@ OUString LanguageSelection::getLanguageS
+@@ -271,7 +279,7 @@
aUserLanguage = getSystemLanguage();
if (aUserLanguage.getLength() > 0 )
{
@@ -41,7 +69,7 @@
{
// great, system default language is available
bFoundLanguage = sal_True;
-@@ -235,7 +235,7 @@ OUString LanguageSelection::getLanguageS
+@@ -281,7 +289,7 @@
}
// fallback 1: en-US
OUString usFB = usFallbackLanguage;
@@ -103,11 +131,11 @@
Index: source/appl/sfxhelp.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/sfxhelp.cxx,v
-retrieving revision 1.64
-diff -u -p -u -r1.64 sfxhelp.cxx
---- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx 9 Jun 2005 13:54:45 -0000 1.64
-+++ openoffice.org/sfx2/source/appl/sfxhelp.cxx 10 Jun 2005 17:02:29 -0000
-@@ -125,6 +125,9 @@
+retrieving revision 1.66
+diff -u -p -u -r1.66 sfxhelp.cxx
+--- openoffice.org.orig/sfx2/source/appl/sfxhelp.cxx 7 Sep 2005 17:47:17 -0000 1.66
++++ openoffice.org/sfx2/source/appl/sfxhelp.cxx 24 Oct 2005 11:16:54 -0000
+@@ -99,6 +99,9 @@
#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
#endif
@@ -117,7 +145,7 @@
#ifndef _UTL_CONFIGMGR_HXX_
#include <unotools/configmgr.hxx>
#endif
-@@ -135,6 +138,11 @@
+@@ -109,6 +112,11 @@
#include <svtools/pathoptions.hxx>
#include <rtl/ustring.hxx>
#include <osl/process.h>
@@ -129,7 +157,7 @@
#include <rtl/uri.hxx>
#include <vcl/msgbox.hxx>
#include <svtools/ehdl.hxx>
-@@ -191,16 +199,50 @@ void NoHelpErrorBox::RequestHelp( const
+@@ -165,16 +173,50 @@ void NoHelpErrorBox::RequestHelp( const
#define STARTERLIST 0
@@ -188,7 +216,7 @@
// query part exists?
if ( bQuestionMark )
-@@ -215,6 +257,7 @@ void AppendConfigToken_Impl( String& rUR
+@@ -189,6 +231,7 @@ void AppendConfigToken_Impl( String& rUR
rURL += String( aLocaleStr );
rURL += DEFINE_CONST_UNICODE("&System=");
rURL += SvtHelpOptions().GetSystem();
@@ -196,45 +224,20 @@
}
// -----------------------------------------------------------------------
-Index: source/app/userinstall.cxx
-===================================================================
-RCS file: /cvs/framework/desktop/source/app/userinstall.cxx,v
-retrieving revision 1.16
-diff -u -p -u -r1.16 userinstall.cxx
---- openoffice.org.orig/desktop/source/app/userinstall.cxx 11 Mar 2005 10:48:28 -0000 1.16
-+++ openoffice.org/desktop/source/app/userinstall.cxx 9 Jun 2005 08:27:23 -0000
-@@ -330,27 +330,20 @@ namespace desktop {
- OUString aDefaultLocale( OUString::createFromAscii("DefaultLocale") );
- OUString aDefaultLocale_CJK( OUString::createFromAscii("DefaultLocale_CJK") );
- OUString aTmp;
-- if (aUserLanguage.equalsAscii("ja") || aUserLanguage.equalsAscii("ko")
-- || aUserLanguage.equalsAscii("zh-CN") || aUserLanguage.equalsAscii("zh-TW"))
-+ if (aLocale.Language.equalsAscii("ja") || aLocale.Language.equalsAscii("ko")
-+ || aLocale.Language.equalsAscii("zh"))
- {
- // only set the locales if there is not already a value set
- // (inititially there is no value set in the configuration)
- pset->getPropertyValue(aDefaultLocale) >>= aTmp;
- if (!aTmp.getLength())
- pset->setPropertyValue(aDefaultLocale, makeAny(OUString::createFromAscii("en-US")));
-- pset->getPropertyValue(aDefaultLocale_CJK) >>= aTmp;
-- if (!aTmp.getLength())
-- pset->setPropertyValue(aDefaultLocale_CJK, makeAny(aUserLanguage));
-+ pset->setPropertyValue(aDefaultLocale_CJK, makeAny(aUserLanguage));
- } else
- {
-- // only set the locales if there is not already a value set
-- // (inititially there is no value set in the configuration)
-- pset->getPropertyValue(aDefaultLocale) >>= aTmp;
-- if (!aTmp.getLength())
-- pset->setPropertyValue(aDefaultLocale, makeAny(aUserLanguage));
-+ pset->setPropertyValue(aDefaultLocale, makeAny(aUserLanguage));
- }
- Reference< XChangesBatch >(pset, UNO_QUERY_THROW)->commitChanges();
--
- v.Value = makeAny(OUString::createFromAscii("org.openoffice.Setup"));
- theArgs[0] <<= v;
- Reference< XHierarchicalPropertySet> hpset(
+@@ -426,11 +469,8 @@ SfxHelp::SfxHelp() :
+
+ pImp = new SfxHelp_Impl( bIsDebug );
+
+- Any aLocale =
+- ::utl::ConfigManager::GetConfigManager()->GetDirectConfigProperty( ::utl::ConfigManager::LOCALE );
+- ::rtl::OUString aLocaleStr;
+- if ( !( aLocale >>= aLocaleStr ) )
+- aLocaleStr = ::rtl::OUString( DEFINE_CONST_UNICODE("en") );
++ ::rtl::OUString aLocaleStr = HelpLocaleString();
++
+ sal_Int32 nSepPos = aLocaleStr.indexOf( '_' );
+ if ( nSepPos != -1 )
+ {
Index: source/services/substitutepathvars.cxx
===================================================================
RCS file: /cvs/framework/framework/source/services/substitutepathvars.cxx,v
@@ -491,24 +494,6 @@
setControlProperty("optSenderDefine", "Enabled", new Boolean(bState));
setControlProperty("optSenderPlaceholder", "Enabled", new Boolean(bState));
setControlProperty("lblSenderAddress", "Enabled", new Boolean(bState));
-@@ -856,7 +881,7 @@ public class LetterWizardDialogImpl exte
-
- if (ProdName.startsWith("Open")) {
- //Add Languages for OpenOffice.org
-- Norms = new String[16];
-+ Norms = new String[18];
-
- Norms[0] = "en-US";
- Norms[1] = "de";
-@@ -874,6 +899,8 @@ public class LetterWizardDialogImpl exte
- Norms[13] = "da";
- Norms[14] = "hu";
- Norms[15] = "hr";
-+ Norms[16] = "en-GB";
-+ Norms[17] = "sk";
- } else {
- Norms = new String[11];
-
Index: com/sun/star/wizards/letter/LetterWizardDialogResources.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java,v
@@ -531,44 +516,6 @@
String resOverwriteWarning;
String resTemplateDescription;
-@@ -149,31 +149,31 @@ public class LetterWizardDialogResources
- loadCommonResources();
- }
-
-- private void loadCommonResources() {
-+ private void loadCommonResources() {
- resOverwriteWarning = getResText(RID_RID_COMMON_START + 19);
- resTemplateDescription = getResText(RID_RID_COMMON_START + 20);
- }
-
-- private void loadRoadmapResources() {
-+ private void loadRoadmapResources() {
- for (int i = 1; i < 7; i++) {
- RoadmapLabels[i] = getResText(RID_LETTERWIZARDROADMAP_START + i);
- }
- }
-
-- private void loadSalutationResources() {
-+ private void loadSalutationResources() {
- for (int i = 1; i < 4; i++) {
- SalutationLabels[i-1] = getResText(RID_LETTERWIZARDSALUTATION_START + i);
- }
- }
-
-- private void loadGreetingResources() {
-+ private void loadGreetingResources() {
- for (int i = 1; i < 4; i++) {
- GreetingLabels[i-1] = getResText(RID_LETTERWIZARDGREETING_START + i);
- }
- }
-
-- private void loadLanguageResources() {
-- for (int i = 1; i < 17; i++) {
-+ private void loadLanguageResources() {
-+ for (int i = 1; i < 19; i++) {
- LanguageLabels[i-1] = getResText(RID_LETTERWIZARDLANGUAGE_START + i);
- }
-
Index: source/formwizard/dbwizres.src
===================================================================
RCS file: /cvs/installation/wizards/source/formwizard/dbwizres.src,v
@@ -594,54 +541,272 @@
// ============================================================================
// ============================ ======================
+Index: source/treeview/tvread.cxx
+===================================================================
+RCS file: /cvs/util/xmlhelp/source/treeview/tvread.cxx,v
+retrieving revision 1.16
+diff -u -p -u -r1.16 tvread.cxx
+--- openoffice.org.orig/xmlhelp/source/treeview/tvread.cxx 23 Mar 2005 13:04:52 -0000 1.16
++++ openoffice.org/xmlhelp/source/treeview/tvread.cxx 24 Oct 2005 11:15:48 -0000
+@@ -701,7 +701,9 @@ ConfigData TVChildTarget::init( const Re
+ osl::FileBase::E_None == osl::DirectoryItem::get( url + locale.copy( 0,idx ),
+ aDirItem ) )
+ ret = locale.copy( 0,idx );
+-
++ else
++ ret = rtl::OUString::createFromAscii("en");
++
+ url = url + ret;
+
+ // first of all, try do determine whether there are any *.tree files present
Index: source/dialog/optgdlg.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/optgdlg.cxx,v
-retrieving revision 1.23
-diff -u -p -u -r1.23 optgdlg.cxx
---- openoffice.org.orig/svx/source/dialog/optgdlg.cxx 1 Apr 2005 12:25:23 -0000 1.23
-+++ openoffice.org/svx/source/dialog/optgdlg.cxx 25 Aug 2005 12:31:20 -0000
-@@ -1646,6 +1646,7 @@ void OfaLanguagesTabPage::Reset( const S
- SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
+retrieving revision 1.24
+diff -u -p -u -r1.24 optgdlg.cxx
+--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx 8 Sep 2005 21:42:52 -0000 1.24
++++ openoffice.org/svx/source/dialog/optgdlg.cxx 26 Oct 2005 09:45:33 -0000
+@@ -1573,53 +1573,17 @@ BOOL OfaLanguagesTabPage::FillItemSet( S
+
+ return FALSE;
+ }
+-//-----------------------------------------------------------------------------
+-void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
+-{
+- OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString();
+- if ( sLang.getLength() )
+- aLocaleSettingLB.SelectLanguage(lcl_LangStringToLangType(sLang));
+- else
+- aLocaleSettingLB.SelectLanguage( LANGUAGE_SYSTEM );
+- sal_Bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE);
+- aLocaleSettingLB.Enable(!bReadonly);
+- aLocaleSettingFT.Enable(!bReadonly);
+- aLocaleSettingFI.Show(bReadonly);
+
+- //
+- aDecimalSeparatorCB.Check( pLangConfig->aSysLocaleOptions.IsDecimalSeparatorAsLocale());
+- aDecimalSeparatorCB.SaveValue();
+-
+- // let LocaleSettingHdl enable/disable checkboxes for CJK/CTL support
+- // #i15812# must be done *before* the configured currency is set
+- // and update the decimal separator used for the given locale
+- LocaleSettingHdl(&aLocaleSettingLB);
+-
+- // configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default
+- String aAbbrev;
+- LanguageType eLang;
+- const NfCurrencyEntry* pCurr = NULL;
+- sLang = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString();
+- if ( sLang.getLength() )
+- {
+- SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( aAbbrev, eLang, sLang );
+- pCurr = SvNumberFormatter::GetCurrencyEntry( aAbbrev, eLang );
+- }
+- // if pCurr==NULL the SYSTEM entry is selected
+- USHORT nPos = aCurrencyLB.GetEntryPos( (void*) pCurr );
+- aCurrencyLB.SelectEntryPos( nPos );
+- bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_CURRENCY);
+- aCurrencyLB.Enable(!bReadonly);
+- aCurrencyFT.Enable(!bReadonly);
+- aCurrencyFI.Show(bReadonly);
+-
+- //western/CJK/CLK language
+- LanguageType eCurLang = LANGUAGE_NONE;
+- LanguageType eCurLangCJK = LANGUAGE_NONE;
+- LanguageType eCurLangCTL = LANGUAGE_NONE;
+- SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
++void OfaLanguagesTabPage::ResetLang( const SfxItemSet& rSet )
++{
++ //western/CJK/CLK language
++ LanguageType eCurLang = LANGUAGE_NONE;
++ LanguageType eCurLangCJK = LANGUAGE_NONE;
++ LanguageType eCurLangCTL = LANGUAGE_NONE;
++ SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
//collect the configuration values first
aCurrentDocCB.Enable(FALSE);
+ aCurrentDocCB.Hide();
//
Any aWestLang;
Any aCJKLang;
-@@ -1669,7 +1670,7 @@ void OfaLanguagesTabPage::Reset( const S
+@@ -1643,8 +1607,12 @@ void OfaLanguagesTabPage::Reset( const S
//overwrite them by the values provided by the DocShell
if(pCurrentDocShell)
{
-- aCurrentDocCB.Enable(TRUE);
-+ aCurrentDocCB.Enable(FALSE);
++ Link aLink( LINK( this, OfaLanguagesTabPage, RegisterModify ) );
++ aCurrentDocCB.SetClickHdl( aLink );
++
+ aCurrentDocCB.Enable(TRUE);
aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
++ aCurrentDocCB.Show();
const SfxPoolItem* pLang;
if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, FALSE, &pLang))
-@@ -1701,7 +1702,7 @@ void OfaLanguagesTabPage::Reset( const S
+ eCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
+@@ -1674,11 +1642,51 @@ void OfaLanguagesTabPage::Reset( const S
+ aAsianLanguageLB.SaveValue();
aComplexLanguageLB.SaveValue();
aCurrentDocCB.SaveValue();
++}
- sal_Bool bEnable = !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale") );
+- aWesternLanguageFT.Enable( bEnable );
+- aWesternLanguageLB.Enable( bEnable );
+- aWesternLanguageFI.Show(!bEnable);
++//-----------------------------------------------------------------------------
++void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
++{
++ OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString();
++ if ( sLang.getLength() )
++ aLocaleSettingLB.SelectLanguage(lcl_LangStringToLangType(sLang));
++ else
++ aLocaleSettingLB.SelectLanguage( LANGUAGE_SYSTEM );
++ sal_Bool bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE);
++ aLocaleSettingLB.Enable(!bReadonly);
++ aLocaleSettingFT.Enable(!bReadonly);
++ aLocaleSettingFI.Show(bReadonly);
++
++ //
++ aDecimalSeparatorCB.Check( pLangConfig->aSysLocaleOptions.IsDecimalSeparatorAsLocale());
++ aDecimalSeparatorCB.SaveValue();
++
++ // let LocaleSettingHdl enable/disable checkboxes for CJK/CTL support
++ // #i15812# must be done *before* the configured currency is set
++ // and update the decimal separator used for the given locale
++ LocaleSettingHdl(&aLocaleSettingLB);
++
++ // configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default
++ String aAbbrev;
++ LanguageType eLang;
++ const NfCurrencyEntry* pCurr = NULL;
++ sLang = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString();
++ if ( sLang.getLength() )
++ {
++ SvtSysLocaleOptions::GetCurrencyAbbrevAndLanguage( aAbbrev, eLang, sLang );
++ pCurr = SvNumberFormatter::GetCurrencyEntry( aAbbrev, eLang );
++ }
++ // if pCurr==NULL the SYSTEM entry is selected
++ USHORT nPos = aCurrencyLB.GetEntryPos( (void*) pCurr );
++ aCurrencyLB.SelectEntryPos( nPos );
++ bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_CURRENCY);
++ aCurrencyLB.Enable(!bReadonly);
++ aCurrencyFT.Enable(!bReadonly);
++ aCurrencyFI.Show(bReadonly);
++
++ ResetLang( rSet );
++
++ RegisterModify( &aCurrentDocCB );
+
+ // #i15812# controls for CJK/CTL already enabled/disabled from LocaleSettingHdl
+ #if 0
+@@ -1694,6 +1702,26 @@ void OfaLanguagesTabPage::Reset( const S
+ /* -----------------------------20.04.01 15:09--------------------------------
+
+ ---------------------------------------------------------------------------*/
++IMPL_LINK( OfaLanguagesTabPage, RegisterModify, CheckBox*, pBox )
++{
++ sal_Bool bCheck = pBox->IsChecked();
++
+ sal_Bool bEnable = sal_False;
- aWesternLanguageFT.Enable( bEnable );
- aWesternLanguageLB.Enable( bEnable );
- aWesternLanguageFI.Show(!bEnable);
-@@ -1727,7 +1728,7 @@ IMPL_LINK( OfaLanguagesTabPage, Support
++ if (bCheck)
++ bEnable = !pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale") );
++ else
++ ResetLang( GetItemSet() );
++
++ aWesternLanguageFT.Enable( bEnable );
++ aWesternLanguageLB.Enable( bEnable );
++ aWesternLanguageFI.Show(!bEnable);
++
++ SupportHdl( &aCTLSupportCB );
++ SupportHdl( &aAsianSupportCB );
++
++ return 0;
++}
++
+ IMPL_LINK( OfaLanguagesTabPage, SupportHdl, CheckBox*, pBox )
+ {
+ DBG_ASSERT( pBox, "OfaLanguagesTabPage::SupportHdl(): pBox invalid" );
+@@ -1701,7 +1729,9 @@ IMPL_LINK( OfaLanguagesTabPage, Support
sal_Bool bCheck = pBox->IsChecked();
if ( &aAsianSupportCB == pBox )
{
- sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale_CJK"));
-+ sal_Bool bReadonly = sal_True;
++ sal_Bool bReadonly = !aCurrentDocCB.IsChecked();
++ if (!bReadonly)
++ bReadonly = pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale_CJK"));
bCheck = ( bCheck && !bReadonly );
aAsianLanguageFT.Enable( bCheck );
aAsianLanguageLB.Enable( bCheck );
-@@ -1737,7 +1738,7 @@ IMPL_LINK( OfaLanguagesTabPage, Support
+@@ -1711,7 +1741,9 @@ IMPL_LINK( OfaLanguagesTabPage, Support
}
else if ( &aCTLSupportCB == pBox )
{
- sal_Bool bReadonly = pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale_CTL"));
-+ sal_Bool bReadonly = sal_True;
++ sal_Bool bReadonly = !aCurrentDocCB.IsChecked();
++ if (!bReadonly)
++ bReadonly = pLangConfig->aLinguConfig.IsReadOnly( C2U("DefaultLocale_CTL"));
bCheck = ( bCheck && !bReadonly );
aComplexLanguageFT.Enable( bCheck );
aComplexLanguageLB.Enable( bCheck );
+Index: source/dialog/optgdlg.hxx
+===================================================================
+RCS file: /cvs/graphics/svx/source/dialog/optgdlg.hxx,v
+retrieving revision 1.14
+diff -u -p -u -r1.14 optgdlg.hxx
+--- openoffice.org.orig/svx/source/dialog/optgdlg.hxx 8 Sep 2005 21:43:23 -0000 1.14
++++ openoffice.org/svx/source/dialog/optgdlg.hxx 26 Oct 2005 09:45:44 -0000
+@@ -209,6 +209,9 @@ class OfaLanguagesTabPage : public SfxTa
+
+ DECL_LINK( SupportHdl, CheckBox* ) ;
+ DECL_LINK( LocaleSettingHdl, SvxLanguageBox* ) ;
++ DECL_LINK( RegisterModify, CheckBox* );
++
++ void ResetLang( const SfxItemSet& rSet );
+
+ public:
+ OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet );
+Index: source/rc/resmgr.cxx
+===================================================================
+RCS file: /cvs/util/tools/source/rc/resmgr.cxx,v
+retrieving revision 1.37
+diff -u -p -r1.37 resmgr.cxx
+--- openoffice.org.orig/tools/source/rc/resmgr.cxx 18 Mar 2005 17:45:56 -0000 1.37
++++ openoffice.org/tools/source/rc/resmgr.cxx 29 Mar 2005 14:56:58 -0000
+@@ -372,6 +372,21 @@ void ResMgrContainer::init()
+ #endif
+ }
+
++namespace
++{
++ bool IsAmericanEnglish(const com::sun::star::lang::Locale &rLocale)
++ {
++ if (
++ rLocale.Language.equalsIgnoreAsciiCaseAscii("en") &&
++ rLocale.Country.equalsIgnoreAsciiCaseAscii("US")
++ )
++ {
++ return true;
++ }
++ return false;
++ }
++}
++
+ InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
+ com::sun::star::lang::Locale& rLocale,
+ bool bForceNewInstance
+@@ -414,7 +429,7 @@ InternalResMgr* ResMgrContainer::getResM
+ }
+ break;
+ }
+- if( nTries == 0 && !aLocale.Language.equalsIgnoreAsciiCaseAscii( "en" ) )
++ if( nTries == 0 && !IsAmericanEnglish(aLocale) )
+ {
+ // locale fallback failed
+ // fallback to en-US locale
+@@ -503,7 +518,7 @@ InternalResMgr* ResMgrContainer::getNext
+ aLocale.Variant = OUString();
+ else if( aLocale.Country.getLength() )
+ aLocale.Country = OUString();
+- else if( ! aLocale.Language.equalsIgnoreAsciiCaseAscii( "en" ) )
++ else if( !IsAmericanEnglish(aLocale) )
+ {
+ aLocale.Language = OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) );
+ aLocale.Country = OUString( RTL_CONSTASCII_USTRINGPARAM( "US" ) );
openoffice.org-1.9.89.ooo44027.pthreadchange.patch:
config_office/configure.in | 3 +++
openoffice.org/solenv/inc/unxlngs3904.mk | 2 +-
sal/osl/unx/process.c | 2 +-
solenv/inc/unxlngi4.mk | 2 +-
solenv/inc/unxlngi5.mk | 2 +-
solenv/inc/unxlngi6.mk | 2 +-
solenv/inc/unxlngp.mk | 2 +-
solenv/inc/unxlngppc.mk | 2 +-
solenv/inc/unxlngppc4.mk | 2 +-
solenv/inc/unxlngr.mk | 2 +-
solenv/inc/unxlngs.mk | 2 +-
solenv/inc/unxlngx6.mk | 2 +-
solenv/inc/unxlnxi.mk | 2 +-
13 files changed, 15 insertions(+), 12 deletions(-)
Index: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.89.ooo44027.pthreadchange.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.89.ooo44027.pthreadchange.patch 7 Apr 2005 15:10:47 -0000 1.1
+++ openoffice.org-1.9.89.ooo44027.pthreadchange.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -1,16 +1,144 @@
-Index: osl/unx/process.c
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/process.c,v
-retrieving revision 1.35
-diff -u -r1.35 process.c
---- openoffice.org.orig/sal/osl/unx/process.c 28 Oct 2004 16:25:13 -0000 1.35
-+++ openoffice.org/sal/osl/unx/process.c 3 Apr 2005 02:24:55 -0000
+--- openoffice.org.orig/sal/osl/unx/process.c 2005-01-27 23:02:00.000000000 +0100
++++ openoffice.org/sal/osl/unx/process.c 2005-01-27 23:04:54.000000000 +0100
@@ -533,7 +533,7 @@
for (i = 0; data.m_pszEnv[i] != NULL; i++)
putenv(data.m_pszEnv[i]);
-#if defined(LINUX)
-+#if 0
++#if defined(LINUX) && !defined(NPTL)
/* mfe: linux likes to have just one thread when the exec family is called */
/* this np function has this purpose ... */
pthread_kill_other_threads_np();
+--- openoffice.org.orig/config_office/configure.in 2005-01-27 23:04:31.000000000 +0100
++++ openoffice.org/config_office/configure.in 2005-01-27 23:06:28.000000000 +0100
+@@ -546,6 +546,9 @@
+ test_gtk=yes
+ test_kde=yes
+ test_cups=yes
++ if getconf GNU_LIBPTHREAD_VERSION |grep -q NPTL; then
++ PTHREAD_CFLAGS="-DNPTL"
++ fi
+ _os=Linux
+ ;;
+ gnu)
+--- openoffice.org.orig/solenv/inc/unxlngp.mk 2005-01-28 00:28:08.000000000 +0100
++++ openoffice.org/solenv/inc/unxlngp.mk 2005-01-28 00:28:18.000000000 +0100
+@@ -65,7 +65,7 @@
+ AFLAGS=
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-D_PTHREADS -D_REENTRANT -DGLIBC=2
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DGLIBC=2
+ CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
+ CDEFS+=-DNO_INET_ON_DEMAND -DX86 -DNEW_SOLAR
+
+--- openoffice.org.orig/solenv/inc/unxlngr.mk 2005-01-28 00:28:33.000000000 +0100
++++ openoffice.org/solenv/inc/unxlngr.mk 2005-01-28 00:28:40.000000000 +0100
+@@ -73,7 +73,7 @@
+ LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-DGLIBC=2 -DARM32 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
++CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DARM32 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+ # this is a platform with JAVA support
+ .IF "$(SOLAR_JAVA)"!=""
+--- openoffice.org.orig/solenv/inc/unxlngi5.mk 2005-01-28 00:27:54.000000000 +0100
++++ openoffice.org/solenv/inc/unxlngi5.mk 2005-01-28 00:28:02.000000000 +0100
+@@ -72,7 +72,7 @@
+ #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
++CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+ # enable visibility define in "sal/types.h"
+ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+--- openoffice.org.orig/solenv/inc/unxlngppc4.mk 2005-01-28 00:28:18.000000000 +0100
++++ openoffice.org/solenv/inc/unxlngppc4.mk 2005-01-28 00:28:24.000000000 +0100
+@@ -72,7 +72,7 @@
+ #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DPOWERPC -DPPC
++CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DPOWERPC -DPPC
+
+ # this is a platform with JAVA support
+ .IF "$(SOLAR_JAVA)"!=""
+--- openoffice.org/solenv/inc/unxlngs3904.mk 2005-01-28 00:28:40.000000000 +0100
++++ openoffice.org/solenv/inc/unxlngs3904.mk 2005-01-28 00:28:47.000000000 +0100
+@@ -72,7 +72,7 @@
+ #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
++CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+ # this is a platform with JAVA support
+ .IF "$(SOLAR_JAVA)"!=""
+--- openoffice.org.orig/solenv/inc/unxlngs.mk 2005-01-28 00:28:47.000000000 +0100
++++ openoffice.org/solenv/inc/unxlngs.mk 2005-01-28 00:28:53.000000000 +0100
+@@ -72,7 +72,7 @@
+ #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DSPARC -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
++CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DSPARC -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+ # this is a platform with JAVA support
+ .IF "$(SOLAR_JAVA)"!=""
+--- openoffice.org.orig/solenv/inc/unxlngppc.mk 2005-01-28 00:28:24.000000000 +0100
++++ openoffice.org/solenv/inc/unxlngppc.mk 2005-01-28 00:28:33.000000000 +0100
+@@ -73,7 +73,7 @@
+ #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DPOWERPC -DPPC
++CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DPOWERPC -DPPC
+
+ # this is a platform with JAVA support
+ .IF "$(SOLAR_JAVA)"!=""
+--- openoffice.org.orig/solenv/inc/unxlngi4.mk 2005-01-28 00:27:47.000000000 +0100
++++ openoffice.org/solenv/inc/unxlngi4.mk 2005-01-28 00:27:54.000000000 +0100
+@@ -72,7 +72,7 @@
+ #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
++CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+ # enable visibility define in "sal/types.h"
+ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+--- openoffice.org.orig/solenv/inc/unxlngi6.mk 2005-01-28 00:28:03.000000000 +0100
++++ openoffice.org/solenv/inc/unxlngi6.mk 2005-01-28 00:28:08.000000000 +0100
+@@ -72,7 +72,7 @@
+ #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
++CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+ # enable visibility define in "sal/types.h"
+ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+--- openoffice.org.orig/solenv/inc/unxlnxi.mk 2005-01-28 00:29:00.000000000 +0100
++++ openoffice.org/solenv/inc/unxlnxi.mk 2005-01-28 00:29:06.000000000 +0100
+@@ -64,7 +64,7 @@
+ AFLAGS=
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-D_PTHREADS
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS
+ CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
+ CDEFS+=-DNO_INET_ON_DEMAND -DX86 -DNEW_SOLAR
+
+--- openoffice.org.orig/solenv/inc/unxlngx6.mk 5 Oct 2005 11:36:34 -0000 1.2
++++ openoffice.org/solenv/inc/unxlngx6.mk 1 Nov 2005 19:12:24 -0000
+@@ -45,7 +45,7 @@ JAVAFLAGSDEBUG=-g
+ #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+
+ # _PTHREADS is needed for the stl
+-CDEFS+=-DGLIBC=2 -DX86_64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
++CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -DX86_64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400
+
+ # enable visibility define in "sal/types.h"
+ .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- openoffice.org.spec 2 Nov 2005 10:39:38 -0000 1.216
+++ openoffice.org.spec 20 Nov 2005 14:51:54 -0000 1.217
@@ -1,5 +1,7 @@
-%define ooo2ver 3
-%define ooo_rpm_release 2.cmc
+%define oootag SRC680
+%define ooomilestone 141
+%define rh_rpm_release 1
+
%define build_fc5 0
%define build_fc4 1
%define build_rhel4 0
@@ -11,19 +13,19 @@
%if %{build_rhel4}
%define usegcc3 1
-%define release_extension 0
+%define rh_rpm_extension 0
%define internalxmlsec 1
%define internalicu 1
%define internaljavabits 1
%define includeemailmerge 1
%define cripplemenus 1
%define seperatebase 1
-%define gnomeprintui 1
+%define gnomeprintui 0
%define galangpack 1
%endif
%if %{build_fc4}
%define usegcc3 0
-%define release_extension 1
+%define rh_rpm_extension 1
%define internalxmlsec 1
%define internalicu 1
%define internaljavabits 1
@@ -35,7 +37,7 @@
%endif
%if %{build_fc5}
%define usegcc3 0
-%define release_extension 2
+%define rh_rpm_extension 2
%define internalxmlsec 0
%define internalicu 0
%define internaljavabits 0
@@ -103,17 +105,19 @@
%define langpack_langs en-US
%endif
+%define ooo_base_name %{oootag}_m%{ooomilestone}
+
ExclusiveArch: %{ix86} ppc
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 2.0.0
-Release: %{ooo2ver}.%{ooo_rpm_release}.%{release_extension}
+Version: 2.0.1
+Release: 0.%{ooomilestone}.%{rh_rpm_release}.%{rh_rpm_extension}
Epoch: 1
License: LGPL
Group: Applications/Productivity
URL: http://www.openoffice.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source: OOO680_m%{ooo2ver}.tar.bz2
+Source: %{ooo_base_name}.tar.bz2
Source1: openoffice.org-jakubicons.tar.gz
Source2: openoffice.org-myspell-contrib.tar.gz
Source3: GSI_ta-IN.sdf
@@ -122,7 +126,6 @@
Source6: RegisterAndLicence.xcu
Source7: opens___.ttf
Source8: GSI_ga.sdf
-Source9: javavendors.xml
BuildRequires: tcsh, perl, sed, zip, bzip2, unzip, tar, findutils
BuildRequires: autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib
BuildRequires: gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip
@@ -154,63 +157,40 @@
Patch4: openoffice.org-1.9.97.rh156067.noversionedicons.patch
Patch5: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
Patch6: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
-Patch7: openoffice.org-1.9.74.ooo41875.mktemp.patch
-Patch8: openoffice.org-1.9.84.ooo44843.sdcasting.patch
-Patch9: openoffice.org-1.9.84.ooo44846.svxcasting.patch
-Patch10: openoffice.org-1.9.84.ooo45162.svxcasting2.patch
-Patch11: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
-Patch12: openoffice.org-1.9.87.warnnoterroronmissing.patch
-Patch13: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
-Patch14: openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
-Patch15: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
-Patch16: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch
-Patch17: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
-Patch18: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
-Patch19: openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch
-Patch20: openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
-Patch21: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch22: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
-Patch23: openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
-Patch24: workspace.vcl39.patch
-Patch25: openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
-Patch26: openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
-Patch27: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
-Patch28: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
-Patch29: openoffice.org-1.9.112.ooo50875.gtkslowunderkde.vcl.patch
-Patch30: openoffice.org-1.9.114.ooo51637.solenv.pyuno.patch
-Patch31: openoffice.org-1.9.114.ooo51638.mailmerge.patch
-Patch32: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
-Patch33: openoffice.org-1.9.116.oooXXXXX.extensions.evolution.patch
-Patch34: openoffice.org-1.9.117.ooo51912.nullpointer.wizards.patch
-Patch35: openoffice.org-1.9.117.ooo52023.evoadb2.nognuconst.patch
-Patch36: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
-Patch37: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
-Patch38: workspace.javapatch.patch
-Patch39: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
-Patch40: openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
-Patch41: openoffice.org-1.9.112.ooo53025.exception.package.patch
-Patch42: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch43: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
-Patch44: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
-Patch45: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
-Patch46: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
-Patch47: workspace.impress57.patch
-Patch48: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
-Patch49: workspace.gslpatches6.patch
-Patch50: workspace.dmake43p01.patch
-Patch51: workspace.emblock1.patch
-Patch52: openoffice.org-1.9.128.ooo54479.systemicu.patch
-Patch53: workspace.cmcfixes18.patch
-Patch54: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
-Patch55: openoffice.org-1.9.104-berkeleydb-jni-casting-misuse.patch
-Patch56: openoffice.org-1.9.114.ooo51718.rpath.patch
-Patch57: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch58: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
-Patch59: workspace.cmcfixes19.patch
-Patch60: workspace.atkbridge.patch
-Patch61: openoffice.org-1.9.130.oooXXXXX.sysui.linkforce.patch
-Patch62: openoffice.org-1.9.112.ooo51724.testtools.patch
-Patch63: openoffice.org-2.0.0.ooo55603.mythes.crash.patch
+Patch7: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
+Patch8: openoffice.org-1.9.84.ooo45725.lingucomponent.contribdict.patch
+Patch9: openoffice.org-1.9.87.warnnoterroronmissing.patch
+Patch10: openoffice.org-1.9.89.ooo44027.pthreadchange.patch
+Patch11: openoffice.org-1.9.96.ooo35641.noxfonts.vcl.patch
+Patch12: openoffice.org-1.9.97.ooo48256.nolongname.sysui.patch
+Patch13: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch14: openoffice.org-1.9.106.ooo44627.sal.brokencondition.patch
+Patch15: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch16: openoffice.org-1.9.108.ooo9290.goodies.epstoepdf.patch
+Patch17: openoffice.org-1.9.112.ooo50857.gtkslowunderkde.vcl.patch
+Patch18: openoffice.org-1.9.115.ooo51931.systemxmlsec.patch
+Patch19: workspace.dbwizardpp1.patch
+Patch20: openoffice.org-1.9.117.ooo49720.mozillanspr.extensions.patch
+Patch21: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch
+Patch22: openoffice.org-1.9.122.ooo52974.systemhsqldbbeanshell.patch
+Patch23: openoffice.org-1.9.130.ooo54692.fasterhelpcontent2.patch
+Patch24: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
+Patch25: openoffice.org-1.9.114.ooo51718.rpath.patch
+Patch26: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch27: openoffice.org-1.9.125.ooo53612.systemnp_sdk.extensions.patch
+Patch28: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
+Patch29: openoffice.org-1.9.125.ooo53723.bulletexport.vcl.patch
+Patch30: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch
+Patch31: openoffice.org-1.9.125.ooo54040.savecrash.svtools.patch
+Patch32: workspace.dmake43p01.patch
+Patch33: openoffice.org-1.9.128.ooo54479.systemicu.patch
+Patch34: openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
+Patch35: workspace.atkbridge.patch
+Patch36: workspace.cmcfixes20.patch
+Patch37: openoffice.org-2.0.0.ooo56536.sw.rtfcrash.patch
+Patch38: workspace.jaxpapi.patch
+Patch39: openoffice.org-2.0.1.oooXXXXX.extensions.openldapapi.patch
+Patch40: openoffice.org-2.0.1.oooXXXXX.m400.buildissues.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -243,7 +223,7 @@
# We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
# rpm doesn't "do the right thing" if only the packages are Required.
Requires: libbluecurve.so, libcrux-engine.so
-Requires: %{libgcj} >= 4.0.0, java-1.4.2-gcj-compat
+Requires: %{libgcj} >= 4.0.0
%if ! %{internaljavabits}
Requires: hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2, xerces-j2
%endif
@@ -813,7 +793,7 @@
Provides additional zulu translations for %{name}
%prep
-%setup -q -n OOO680_m%{ooo2ver}
+%setup -q -n %{ooo_base_name}
%patch0 -p1 -b .rh133741.alwaysgtk.desktop.patch
%patch1 -p1 -b .rh161886.rpath.desktop.patch
%patch2 -p1 -b .rh151357.setlangtolocale.patch
@@ -825,70 +805,45 @@
%if %{cripplemenus}
%patch6 -p1 -b .rh156677.cripplemenus.sysui.patch
%endif
-%patch7 -p1 -b .ooo41875.mktemp.patch
-%patch8 -p1 -b .ooo44843.sdcasting.patch
-%patch9 -p1 -b .ooo44846.svxcasting.patch
-%patch10 -p1 -b .ooo45162.svxcasting2.patch
-%patch11 -p1 -b .ooo45725.lingucomponent.contribdict.patch
-%patch12 -p1 -b .warnnoterroronmissing.patch
-%patch13 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
-%patch14 -p1 -b .ooo35627.parallel.cppumaker.patch
-%patch15 -p1 -b .ooo44027.pthreadchange.patch
-%patch16 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
-%patch17 -p1 -b .ooo35641.noxfonts.vcl.patch
-%patch18 -p1 -b .ooo48256.nolongname.sysui.patch
-%patch19 -p1 -b .ooo48600.rtfparseerror.svx.patch
-%patch20 -p1 -b .ooo48610.searchalltemplates.wizards.patch
-%patch21 -p1 -b .ooo54603.fontconfig.patch
-%patch22 -p1 -b .ooo44627.sal.brokencondition.patch
-%patch23 -p1 -b .ooo50172.icu.tamilvowelslikepango.patch
-%patch24 -p1 -b .workspace.vcl39.patch
-%patch25 -p1 -b .ooo48814.solenv.nostripwithsimpleinstall.patch
-%patch26 -p1 -b .ooo47323.binfilter.stupiddetect.patch
-%patch27 -p1 -b .NONE.gcc3gcj4.patch
-%patch28 -p1 -b .ooo9290.goodies.epstoepdf.patch
-%patch29 -p1 -b .ooo50875.gtkslowunderkde.vcl.patch
-%patch30 -p1 -b .ooo51637.solenv.pyuno.patch
-%if %{includeemailmerge}
-%patch31 -p1 -b .ooo51638.mailmerge.patch
+%patch7 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
+%patch8 -p1 -b .ooo45725.lingucomponent.contribdict.patch
+%patch9 -p1 -b .warnnoterroronmissing.patch
+%patch10 -p1 -b .ooo44027.pthreadchange.patch
+%patch11 -p1 -b .ooo35641.noxfonts.vcl.patch
+%patch12 -p1 -b .ooo48256.nolongname.sysui.patch
+%patch13 -p1 -b .ooo54603.fontconfig.patch
+%patch14 -p1 -b .ooo44627.sal.brokencondition.patch
+%patch15 -p1 -b .NONE.gcc3gcj4.patch
+%patch16 -p1 -b .ooo9290.goodies.epstoepdf.patch
+%patch17 -p1 -b .ooo50857.gtkslowunderkde.vcl.patch
+%patch18 -p1 -b .ooo51931.systemxmlsec.patch
+%patch19 -p1 -b .workspace.dbwizardpp1.patch
+%patch20 -p1 -b .ooo49720.mozillanspr.extensions.patch
+%patch21 -p1 -b .ooo52428.execshield.bridges.patch
+%if ! %{internaljavabits}
+%patch22 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
+%patch23 -p1 -b .ooo54692.fasterhelpcontent2.patch
+%patch24 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%else
+%patch25 -p1 -b .ooo51718.rpath.patch
%endif
-%patch32 -p1 -b .ooo51931.systemxmlsec.patch
-%patch33 -p1 -b .oooXXXXX.extensions.evolution.patch
-%patch34 -p1 -b .ooo51912.nullpointer.wizards.patch
-%patch35 -p1 -b .ooo52023.evoadb2.nognuconst.patch
-%patch36 -p1 -b .ooo49720.mozillanspr.extensions.patch
-%patch37 -p1 -b .ooo52428.execshield.bridges.patch
-%patch38 -p1 -b .workspace.javapatch.patch
-%patch39 -p1 -b .ooo52974.systemhsqldbbeanshell.patch
-%patch40 -p1 -b .ooo52626.workspacerestore.vcl.patch
-%patch41 -p1 -b .ooo53025.exception.package.patch
-%patch42 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch43 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
-%patch44 -p1 -b .ooo54586.nfslock.sal.patch
-%patch45 -p1 -b .ooo53723.bulletexport.vcl.patch
-%patch46 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
-%patch47 -p1 -b .workspace.impress57.patch
-%patch48 -p1 -b .ooo54040.savecrash.svtools.patch
-%patch49 -p1 -b .workspace.gslpatches6.patch
-%patch50 -p1 -b .dmake43p01.patch
-%patch51 -p1 -b .workspace.emblock1.patch
+%patch26 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch27 -p1 -b .ooo53612.systemnp_sdk.extensions.patch
+%patch28 -p1 -b .ooo54586.nfslock.sal.patch
+%patch29 -p1 -b .ooo53723.bulletexport.vcl.patch
+%patch30 -p1 -b .ooo30380.uselibxslt.xmlhelp.patch
+%patch31 -p1 -b .ooo54040.savecrash.svtools.patch
+%patch32 -p1 -b .dmake43p01.patch
%if ! %{internalicu}
-%patch52 -p1 -b .ooo54479.systemicu.patch
+%patch33 -p1 -b .ooo54479.systemicu.patch
%endif
-%patch53 -p1 -b .workspace.cmcfixes18.patch
-#%patch54 -p1 -b .ooo54692.fasterhelpcontent2.patch
-%if %{internaljavabits}
-%patch55 -p1 -b .berkeleydb-jni-casting-misuse.patch
-%patch56 -p1 -b .ooo51718.rpath.patch
-%else
-%patch57 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
-%endif
-%patch58 -p1 -b .ooo54959.negativeindent.sw.patch
-%patch59 -p1 -b .workspace.cmcfixes19.patch
-%patch60 -p1 -b .workspace.atkbridge.patch
-%patch61 -p1 -b .oooXXXXX.sysui.linkforce.patch
-%patch62 -p1 -b .ooo51724.testtools.patch
-%patch63 -p1 -b .ooo55603.mythes.crash.patch
+%patch34 -p1 -b .ooo54959.negativeindent.sw.patch
+%patch35 -p1 -b .workspace.atkbridge.patch
+%patch36 -p1 -b .workspace.cmcfixes20.patch
+%patch37 -p1 -b .ooo56536.sw.rtfcrash.patch
+%patch38 -p1 -b .workspace.jaxpapi.patch
+%patch39 -p1 -b .oooXXXXX.extensions.openldapapi.patch
+%patch40 -p1 -b .oooXXXXX.m400.buildissues.patch
%if %{includingexternals}
#start ludicrous workaround
@@ -899,14 +854,14 @@
echo "$find_provides | grep -v libxmlsec1 | grep -v libdb- | grep -v libicu" >> find-provides
echo "exit 0" >> find-provides
chmod +x find-provides
-%define __find_provides %{_builddir}/OOO680_m%{ooo2ver}/find-provides
+%define __find_provides %{_builddir}/%{ooo_base_name}/find-provides
find_requires="%{__find_requires}"
echo "#!/bin/sh" > find-requires
echo "$find_requires | grep -v libxmlsec1 | grep -v libdb- | grep -v libicu | grep -v \(" >> find-requires
echo "exit 0" >> find-requires
chmod +x find-requires
-%define __find_requires %{_builddir}/OOO680_m%{ooo2ver}/find-requires
+%define __find_requires %{_builddir}/%{ooo_base_name}/find-requires
#end ludicrous workaround
%endif
@@ -923,7 +878,7 @@
fi
cd config_office
autoconf
-%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc %{extraflags} %{withlang}
+%configure --with-java=%{gij} --disable-crashdump --disable-epm --disable-qadevooo --disable-odk --disable-fontooo --disable-mathmldtd --disable-pasf --enable-symbols --enable-openldap --enable-evolution2 --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --without-system-mspack --without-fonts --without-nas --without-gpc --with-images=industrial %{extraflags} %{withlang}
cd ..
./bootstrap
source Linux*Env.Set.sh
@@ -949,7 +904,7 @@
#make no rpms in sysui for menus
export RPM=true
#Set the "This product has been created by..." in Help->About
-export USER="RedHat Inc."
+export USER="Red Hat, Inc."
unset USERNAME
#don't duplicate english helpcontent about the place
unset DEFAULT_TO_ENGLISH_FOR_PACKING
@@ -960,31 +915,35 @@
export GCJ_LDFLAGS="-L`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`"
%endif
+#use the RPM_OPT_FLAGS but remove the OOo overridden ones
+for i in $RPM_OPT_FLAGS; do
+ case "$i" in
+ -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables) continue;;
+ esac
+ ARCH_FLAGS="$ARCH_FLAGS $i"
+done
+export ARCH_FLAGS
+
+%if %{build_fc4}
# gcc#19870# gcj access problems, monsterous hack to force all java through
# a sed script which replaces private and protected with public, shudder!
cp %{SOURCE5} solenv/bin/gcj
chmod u+x solenv/bin/gcj
export TRUEJAVACOMPILER=$JAVACOMPILER
export JAVACOMPILER=`pwd`/solenv/bin/gcj
+%endif
+
+rm -rf external/common/jaxp.jar external/common/parser.jar
%if ! %{internaljavabits}
-export CLASSPATH=/usr/share/java/xalan-j2.jar:/usr/share/java/xerces-j2.jar
-export XML_CLASSPATH=$CLASSPATH
+export XML_CLASSPATH=/usr/share/java/xalan-j2.jar:/usr/share/java/xerces-j2.jar
export SYSTEM_XALAN="YES"
export BUILD_TYPE=`echo $BUILD_TYPE | sed -e "s/XALAN//"`
%else
export BUILD_TYPE="$BUILD_TYPE xalan"
+export ARCH_FLAGS="$ARCH_FLAGS -fno-strict-aliasing"
%endif
-#use the RPM_OPT_FLAGS but remove the OOo overridden ones
-for i in $RPM_OPT_FLAGS; do
- case "$i" in
- -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables) continue;;
- esac
- ARCH_FLAGS="$ARCH_FLAGS $i"
-done
-export ARCH_FLAGS
-
# see tamil translation issue rh#159381#, remove when complete and upstreamed
cd transex3/prj
build --dlv_switch link --all -P$MAXBUILDS
@@ -1003,16 +962,25 @@
#getting an unpackaged install
export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
echo start en-US install time is `date`
-dmake openoffice_en-US
-echo start en-US install time is `date`
+if ! dmake openoffice_en-US; then
+ if [ $MAXPROCESS -a $MAXPROCESS -gt 1 ]; then
+ echo parallel en_US langpack creation failure, diskspace: `df -h . | tail -n 1` - restarting unparallel dmake...
+ unset MAXPROCESS
+ fi
+ echo - ---dump log start---
+ cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
+ echo - ---dump log end---
+ dmake openoffice_en-US
+fi
+echo end en-US install time is `date`
%if %{langpacks}
echo start langpack install time is `date`
if ! dmake ooolanguagepack; then
if [ $MAXPROCESS -a $MAXPROCESS -gt 1 ]; then
echo parallel langpack creation failure, diskspace: `df -h . | tail -n 1` - restarting unparallel dmake...
unset MAXPROCESS
- dmake ooolanguagepack
fi
+ dmake ooolanguagepack
fi
echo end langpack install time is `date`, diskspace: `df -h . | tail -n 1`
%endif
@@ -1084,6 +1052,12 @@
#remove script to munge OOo2 mime info into system, we'll do that
rm -f $RPM_BUILD_ROOT/%{instdir}/program/update-mime-data
+#remove the email mailmerge impl if packageing without it
+%if ! %{includeemailmerge}
+rm -rf $RPM_BUILD_ROOT/%{instdir}/program/mailmerge.py*
+rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
+%endif
+
#ensure that no sneaky un-prelinkable, un-fpic or non executable shared libs
#have snuck through
pic=0
@@ -1120,9 +1094,6 @@
#use ooo-build opens___.ttf with greater coverage
cp -f %{SOURCE7} $RPM_BUILD_ROOT/%{instdir}/share/fonts/truetype/opens___.ttf
-#force only libgcj as supported java solution
-cp -f %{SOURCE9} $RPM_BUILD_ROOT/%{instdir}/share/config/javavendors.xml
-
#make up some /usr/bin scripts
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
@@ -1130,7 +1101,9 @@
echo exec %{instdir}/program/soffice \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
+%if %{build_fc4}
cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0 $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
+%endif
echo \#\!/bin/sh > $RPM_BUILD_ROOT/usr/bin/ooffice
echo exec %{instdir}/program/soffice \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/ooffice
@@ -1201,6 +1174,8 @@
%files langpack-af_ZA
%defattr(-,root,root)
%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/af
%dir %{instdir}/program
%dir %{instdir}/program/resource
%{instdir}/program/resource/*680af.res
@@ -1237,6 +1212,9 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ar.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ar.xcu
%files langpack-bg_BG
%defattr(-,root,root)
@@ -1263,6 +1241,8 @@
%files langpack-bn_IN
%defattr(-,root,root)
%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/bn
%dir %{instdir}/share
%{instdir}/program/resource/*680bn.res
%{instdir}/share/readme/LICENSE_bn*
@@ -1581,6 +1561,9 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-gu-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_gu-IN.xcu
%files langpack-pa_IN
%defattr(-,root,root)
@@ -1599,6 +1582,9 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-pa-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_pa-IN.xcu
%files langpack-he_IL
%defattr(-,root,root)
@@ -1620,10 +1606,15 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-he.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_he.xcu
%files langpack-hi_IN
%defattr(-,root,root)
%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/hi-IN
%dir %{instdir}/share
%{instdir}/program/resource/*680hi-IN.res
%{instdir}/share/readme/LICENSE_hi-IN*
@@ -1638,10 +1629,15 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-hi-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_hi-IN.xcu
%files langpack-hu_HU
%defattr(-,root,root)
%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/hu
%{instdir}/program/resource/*680hu.res
%dir %{instdir}/share
%dir %{instdir}/share/dict
@@ -1725,6 +1721,11 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ja.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_ja.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ja.xcu
%files langpack-ko_KR
%defattr(-,root,root)
@@ -1745,10 +1746,18 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ko.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_ko.xcu
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ko.xcu
%files langpack-lt_LT
%defattr(-,root,root)
%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/lt
%{instdir}/program/resource/*680lt.res
%dir %{instdir}/share
%dir %{instdir}/share/dict
@@ -1837,6 +1846,8 @@
%files langpack-nn_NO
%defattr(-,root,root)
%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/nn
%{instdir}/program/resource/*680nn.res
%dir %{instdir}/share
%dir %{instdir}/share/dict
@@ -1973,6 +1984,8 @@
%files langpack-sl_SI
%defattr(-,root,root)
%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/sl
%{instdir}/program/resource/*680sl.res
%dir %{instdir}/share
%dir %{instdir}/share/dict
@@ -2031,10 +2044,15 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-ta-IN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_ta-IN.xcu
%files langpack-th_TH
%defattr(-,root,root)
%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/th
%dir %{instdir}/share
%dir %{instdir}/share/dict
%dir %{instdir}/share/dict/ooo
@@ -2052,6 +2070,9 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-th.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_th.xcu
%files langpack-tr_TR
%defattr(-,root,root)
@@ -2092,6 +2113,11 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zh-CN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_zh-CN.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-CN.xcu
%files langpack-zh_TW
%defattr(-,root,root)
@@ -2112,10 +2138,17 @@
%dir %{instdir}/share/registry/modules/org/openoffice
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-zh-TW.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
+%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-cjk_zh-TW.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
+%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-TW.xcu
%files langpack-zu_ZA
%defattr(-,root,root)
%dir %{instdir}
+%dir %{instdir}/help
+%{instdir}/help/zu
%{instdir}/program/resource/*680zu.res
%dir %{instdir}/share
%dir %{instdir}/share/dict
@@ -2172,10 +2205,8 @@
%{instdir}/program/classes/avmedia.jar
%{instdir}/program/classes/classes.jar
%{instdir}/program/classes/commonwizards.jar
-%{instdir}/program/classes/docbook.jar
%{instdir}/program/classes/fax.jar
%{instdir}/program/classes/form.jar
-%{instdir}/program/classes/htmlsoff.jar
%{instdir}/program/classes/java_uno.jar
%{instdir}/program/classes/java_uno_accessbridge.jar
%{instdir}/program/classes/js.jar
@@ -2197,7 +2228,6 @@
%{instdir}/program/classes/unoil.jar
%{instdir}/program/classes/unoloader.jar
%{instdir}/program/classes/web.jar
-%{instdir}/program/classes/XFlatXml.jar
%{instdir}/program/classes/XMergeBridge.jar
%{instdir}/program/classes/xmerge.jar
%{instdir}/program/classes/XSLTFilter.jar
@@ -2217,6 +2247,7 @@
%{instdir}/program/fps_gnome.uno.so
%{instdir}/program/fps_office.uno.so
%{instdir}/program/fsstorage.uno.so
+%{instdir}/program/gengal*
%{instdir}/program/gnome-open-url
%{instdir}/program/gnome-open-url.bin
%{instdir}/program/hatchwindowfactory.uno.so
@@ -2236,6 +2267,7 @@
%{instdir}/program/legacy_binfilters.rdb
%{instdir}/program/libabp680*.so
%{instdir}/program/libadabas2.so
+%{instdir}/program/libagg680*.so
%{instdir}/program/libavmedia680*.so
%{instdir}/program/libbasctl680*.so
%{instdir}/program/libbasegfx680*.so
@@ -2447,8 +2479,8 @@
%{instdir}/program/regtypeprov.uno.so
%{instdir}/program/remotebridge.uno.so
%dir %{instdir}/program/resource
-%{instdir}/program/resource/abp680en-US.res
%{instdir}/program/resource/avmedia680en-US.res
+%{instdir}/program/resource/abp680en-US.res
%{instdir}/program/resource/basctl680en-US.res
%{instdir}/program/resource/bf_frm680en-US.res
%{instdir}/program/resource/bf_ofa680en-US.res
@@ -2541,6 +2573,7 @@
%{instdir}/program/uriproc.uno.so
%{instdir}/program/uuresolver.uno.so
%{instdir}/program/vclcanvas.uno.so
+%{instdir}/program/versionrc
%{instdir}/program/viewdoc
%dir %{instdir}/share
%{instdir}/share/Scripts
@@ -2549,6 +2582,7 @@
%{instdir}/share/basic
%dir %{instdir}/share/config
%{instdir}/share/config/images.zip
+%{instdir}/share/config/images_industrial.zip
%{instdir}/share/config/javavendors.xml
%{instdir}/share/config/psetup.xpm
%{instdir}/share/config/psetupl.xpm
@@ -2633,9 +2667,6 @@
%dir %{instdir}/share/registry/modules/org/openoffice/Office
%{instdir}/share/registry/modules/org/openoffice/Office/Embedding
%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/*cjk*
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/*ctl*
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-en-US.xcu
@@ -2679,6 +2710,7 @@
%{instdir}/share/registry/schema/org/openoffice/Office/Labels.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Linguistic.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Math.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/OptionsDialog.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Recovery.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/SFX.xcs
@@ -2708,6 +2740,7 @@
%{instdir}/share/registry/schema/org/openoffice/Office/UI/Factories.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
@@ -2746,7 +2779,9 @@
#spellchecking lib
%{instdir}/program/liblnth680*.so
#launchers
+%if %{build_fc4}
%{_bindir}/openoffice.org-1.9
+%endif
%{_bindir}/openoffice.org-2.0
%{_bindir}/ooffice
%{_bindir}/ooviewdoc
@@ -2787,6 +2822,11 @@
%{instdir}/program/sbase
%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_database_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu
%{_bindir}/oobase
%dir %{_datadir}/applications
%{_datadir}/applications/openoffice.org-*-base.desktop
@@ -2798,18 +2838,26 @@
%post core
update-desktop-database -q %{_datadir}/applications
for theme in hicolor; do
- touch --no-create %{_datadir}/icons/$theme
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/$theme
+ if test -f "%{_datadir}/icons/$theme"; then
+ if test -f "%{_datadir}/icons/$theme/index.theme"; then
+ touch --no-create %{_datadir}/icons/$theme
+ gtk-update-icon-cache -q %{_datadir}/icons/$theme
+ fi
+ fi
fi
done
%postun core
update-desktop-database -q %{_datadir}/applications
for theme in hicolor; do
- touch --no-create %{_datadir}/icons/$theme
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/$theme
+ if test -f "%{_datadir}/icons/$theme"; then
+ if test -f "%{_datadir}/icons/$theme/index.theme"; then
+ touch --no-create %{_datadir}/icons/$theme
+ gtk-update-icon-cache -q %{_datadir}/icons/$theme
+ fi
+ fi
fi
done
@@ -2826,6 +2874,13 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_database_filters.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu
+%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
+%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu
%{_bindir}/oobase
%dir %{_datadir}/applications
%{_datadir}/applications/openoffice.org-*-base.desktop
@@ -3002,11 +3057,6 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-writer.xcu
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-writer.xcu
-%dir %{instdir}/share/registry/modules/org/openoffice/Office/Writer
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ja.xcu
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_ko.xcu
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-CN.xcu
-%{instdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-cjk_zh-TW.xcu
%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_global_filters.xcu
@@ -3244,11 +3294,68 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Thu Oct 20 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.2
-- provide openoffice.org-1.9 script for rh#171302#
+* Thu Nov 17 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.141.1
+- next version
+- hi-IN translations upstreamed
+- loads of translated help
-* Fri Oct 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.1
+* Tue Nov 15 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.140.1
+- drop integrated workspace.oooemailmerge.patch
+- drop integrated workspace.javapatch.patch
+- drop integrated workspace.systemlibxmlfix.patch
+
+* Wed Nov 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.139.1
+- drop integrated openoffice.org-1.9.108.ooo47323.binfilter.stupiddetect.patch
+- openoffice.org-1.9.97.ooo48600.rtfparseerror.svx.patch -> javapatch
+- drop integrated openoffice.org-1.9.112.ooo53025.exception.package.patch
+- gcc#22132# fixed
+ + drop openoffice.org-1.9.84.ooo44843.sdcasting.patch
+ + drop openoffice.org-1.9.84.ooo44846.svxcasting.patch
+ + drop openoffice.org-1.9.84.ooo45162.svxcasting2.patch
+- workaround deprecated openldap api usage
+- add industrial set of icons
+
+* Wed Nov 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.138.3
+- fix problem with icu rule searching with null locale
+
+* Fri Nov 04 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.138.1
+- drop integrated openoffice.org-1.9.74.ooo41875.mktemp.patch
+- drop integrated openoffice.org-1.9.89.ooo35627.parallel.cppumaker.patch
+- drop integrated openoffice.org-1.9.97.ooo48610.searchalltemplates.wizards.patch
+- drop integrated openoffice.org-1.9.106.ooo50172.icu.tamilvowelslikepango.patch
+- drop integrated workspace.vcl39.patch
+ - CACHE_MAGIC of rh2 changed back to default 2. No broken caches of "2"
+ should exist to cause ambiguity
+- drop integrated openoffice.org-1.9.108.ooo48814.solenv.nostripwithsimpleinstall.patch
+- drop integrated openoffice.org-1.9.122.ooo52626.workspacerestore.vcl.patch
+- drop integrated workspace.impress57.patch
+- drop integrated workspace.gslpatches6.patch
+- drop integrated workspace.emblock1.patch
+- drop integrated workspace.cmcfixes18.patch
+- drop integrated workspace.cmcfixes19.patch
+- add workspace.systemlibxmlfix.patch
+- additional hungarian help
+
+* Fri Oct 28 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.8
+- ooo#53397# SEGV signal installation needs to be extended to include
+ custom application launcher names
+- reenable faster helpcontent2 building
+
+* Fri Oct 28 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.7
+- rh#171918# wrong LDAP stuff gets launched from wizard
+- upstream patches as cmcfixes20
+- rh#171844# make another stab at the klipper problem
+- ooo#57107# updated hindi translation
+- rh#159381# be less of a gcj bigot
+- rh#172149# need more stuff in the classpath for macro creating
+
+* Fri Oct 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.6
+- rh#171425#/ooo#56536# weird SwTxtNode is not a SwTxtNode problem
+
+* Fri Oct 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.5
- get RPM_OPT_FLAGS in operation minus -fasynchronous-unwind-tables
+
+* Fri Oct 14 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.1
- release candidate 3
- alias en_US thesasurus for other en varients
- can crash on empty thesasurus rh#170091#/ooo#55603#
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/sources,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- sources 3 Nov 2005 10:24:07 -0000 1.81
+++ sources 20 Nov 2005 14:51:54 -0000 1.82
@@ -1,10 +1,10 @@
a66c6ab52b2eb2deaa7ff85595276b15 GSI_ta-IN.sdf
176aa81d51a6ed28c5e9a14696a8d208 openoffice.org-jakubicons.tar.gz
-11c0541fa373a327d1c134887ce511e7 openoffice.org-simple-crash_report.sh
a4a22f6b80a4f02c01bbe0400e131e57 RegisterAndLicence.xcu
66ee360bd11d33b0ba2283922d853706 opens___.ttf
f2fc336c9bd7672a13e58d39bbb4553f GSI_ga.sdf
-49c02048e40f0b51a97abdb94d97dc1f javavendors.xml
-bc67b66be8f80c0ef695a5b03ad09890 OOO680_m3.tar.bz2
-e134623af5c26a275caafb05f7f267c7 openoffice.org-myspell-contrib.tar.gz
1825a3b182fd46e08075a42257cfc6aa gcj-sed.sh
+27071256f362853388826f79580ce5c5 SRC680_m140.tar.bz2
+ab46792df4dd81f27a9c08d1e18a35a8 openoffice.org-simple-crash_report.sh
+2cd37ed5f2ac9fa129f6aaaa3491988f openoffice.org-myspell-contrib.tar.gz
+ed74f0b2cde6c49bb1e68e9bcf11451d SRC680_m141.tar.bz2
workspace.atkbridge.patch:
SRC680_m130/desktop/scripts/soffice.sh | 4
comphelper/source/misc/accessiblewrapper.cxx | 5
openoffice.org/vcl/unx/gtk/a11y/TODO | 49 +
openoffice.org/vcl/unx/gtk/a11y/atkaction.cxx | 93 ++
openoffice.org/vcl/unx/gtk/a11y/atkcomponent.cxx | 206 +++++
openoffice.org/vcl/unx/gtk/a11y/atkeditabletext.cxx | 96 ++
openoffice.org/vcl/unx/gtk/a11y/atkfactory.cxx | 203 +++++
openoffice.org/vcl/unx/gtk/a11y/atkhypertext.cxx | 230 ++++++
openoffice.org/vcl/unx/gtk/a11y/atkimage.cxx | 59 +
openoffice.org/vcl/unx/gtk/a11y/atklistener.cxx | 387 ++++++++++
openoffice.org/vcl/unx/gtk/a11y/atklistener.hxx | 88 ++
openoffice.org/vcl/unx/gtk/a11y/atkselection.cxx | 120 +++
openoffice.org/vcl/unx/gtk/a11y/atktable.cxx | 331 ++++++++
openoffice.org/vcl/unx/gtk/a11y/atktext.cxx | 226 ++++++
openoffice.org/vcl/unx/gtk/a11y/atkutil.cxx | 425 +++++++++++
openoffice.org/vcl/unx/gtk/a11y/atkutil.hxx | 45 +
openoffice.org/vcl/unx/gtk/a11y/atkvalue.cxx | 69 +
openoffice.org/vcl/unx/gtk/a11y/atkwrapper.cxx | 676 ++++++++++++++++++
openoffice.org/vcl/unx/gtk/a11y/atkwrapper.hxx | 84 ++
openoffice.org/vcl/unx/gtk/a11y/makefile.mk | 108 ++
openoffice.org/vcl/unx/inc/plugins/gtk/atkfactory.hxx | 51 +
vcl/prj/build.lst | 3
vcl/source/app/svapp.cxx | 10
vcl/source/window/menu.cxx | 9
vcl/unx/gtk/app/gtkinst.cxx | 1
vcl/unx/gtk/window/gtkframe.cxx | 193 +++++
vcl/unx/inc/plugins/gtk/gtkframe.hxx | 8
vcl/util/makefile.mk | 1
28 files changed, 3765 insertions(+), 15 deletions(-)
Index: workspace.atkbridge.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/workspace.atkbridge.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.atkbridge.patch 2 Oct 2005 10:24:31 -0000 1.1
+++ workspace.atkbridge.patch 20 Nov 2005 14:51:54 -0000 1.2
@@ -4116,13 +4116,14 @@
$(SLB)$/gtkwin.lib
--- SRC680_m130/desktop/scripts/soffice.gail.sh 2005-09-30 15:34:21.000000000 +0100
+++ SRC680_m130/desktop/scripts/soffice.sh 2005-09-30 15:34:56.000000000 +0100
-@@ -35,6 +35,9 @@
+@@ -35,6 +35,10 @@
#*************************************************************************
if [ -z $SAL_USE_VCLPLUGIN ]; then export SAL_USE_VCLPLUGIN=gtk; fi
+if [ true == `gconftool-2 -g "/desktop/gnome/interface/accessibility"` ]; then
+export GTK_MODULES="gail:atk-bridge $GTK_MODULES"
+fi
++export SAL_IGNOREXERRORS=true
#
# STAR_PROFILE_LOCKING_DISABLED=1
--- openoffice.org-1.9.74.ooo41875.mktemp.patch DELETED ---
--- openoffice.org-1.9.84.ooo44843.sdcasting.patch DELETED ---
--- openoffice.org-1.9.84.ooo44846.svxcasting.patch DELETED ---
--- openoffice.org-1.9.84.ooo45162.svxcasting2.patch DELETED ---
- Previous message (by thread): rpms/kernel/devel patch-2.6.15-rc2.bz2.sign, NONE, 1.1 .cvsignore, 1.279, 1.280 kernel-2.6.spec, 1.1696, 1.1697 linux-2.6-build-userspace-headers-warning.patch, 1.6, 1.7 linux-2.6-execshield.patch, 1.3, 1.4 sources, 1.220, 1.221 upstream, 1.205, 1.206 linux-2.6-ppc64-eeh-panic.patch, 1.4, NONE linux-2.6.15-rc1-ppc64-pci.patch, 1.1, NONE linux-2.6.15-rc1-ppc64-sparsemem.patch, 1.1, NONE patch-2.6.15-rc1.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/openoffice.org/FC-4 openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list