rpms/openoffice.org/devel openoffice.org-2.2.0.ooo53397.linkopt.patch, 1.8, 1.9 openoffice.org.spec, 1.1162, 1.1163 workspace.glyphadv.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 12 15:34:56 UTC 2007
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28544
Modified Files:
openoffice.org-2.2.0.ooo53397.linkopt.patch
openoffice.org.spec
Removed Files:
workspace.glyphadv.patch
Log Message:
linkopt work
openoffice.org-2.2.0.ooo53397.linkopt.patch:
OOF680_m14/solenv/bin/mklinkscript.pl | 48
OOF680_m14/sw/util/symbolorder | 5110 ++++++++++
UnoControls/prj/build.lst | 2
UnoControls/util/makefile.mk | 3
automation/prj/build.lst | 2
automation/util/makefile.mk | 52
avmedia/source/gstreamer/makefile.mk | 2
avmedia/source/xine/makefile.mk | 2
avmedia/util/makefile.mk | 2
basctl/util/makefile.mk | 13
basegfx/prj/d.lst | 2
basegfx/util/makefile.mk | 2
basic/prj/d.lst | 2
basic/source/uno/sbservices.cxx | 13
basic/util/makefile.mk | 2
bf_forms/util/makefile.mk | 0
bf_goodies/util/makefile.mk | 0
bf_linguistic/source/makefile.mk | 0
bf_offmgr/util/makefile.mk | 0
bf_sc/util/makefile.mk | 0
bf_sch/util/makefile.mk | 0
bf_sd/util/makefile.mk | 0
bf_starmath/util/makefile.mk | 0
bf_svx/util/makefile.mk | 0
bf_sw/util/makefile.mk | 0
bf_xmloff/util/makefile.mk | 0
binfilter/bf_forms/util/makefile.mk | 11
binfilter/bf_goodies/util/makefile.mk | 3
binfilter/bf_linguistic/source/makefile.mk | 9
binfilter/bf_offmgr/util/makefile.mk | 10
binfilter/bf_sc/util/makefile.mk | 14
binfilter/bf_sch/util/makefile.mk | 9
binfilter/bf_sd/util/makefile.mk | 14
binfilter/bf_starmath/util/makefile.mk | 10
binfilter/bf_svx/util/makefile.mk | 16
binfilter/bf_sw/util/makefile.mk | 13
binfilter/bf_xmloff/util/makefile.mk | 13
binfilter/binfilterdetect/source/makefile.mk | 8
binfilter/filter/source/bf_migrate/makefile.mk | 9
binfilter/filter/source/bf_offwrp/makefile.mk | 14
binfilter/inc/bf_sfx2/docfile.hxx | 2
binfilterdetect/source/makefile.mk | 0
bmpmaker/makefile.mk | 0
bootstrp/addexes2/makefile.mk | 0
bootstrp/makefile.mk | 0
canvas/prj/build.lst | 2
canvas/source/cairo/makefile.mk | 2
canvas/source/null/makefile.mk | 2
canvas/source/tools/makefile.mk | 2
canvas/source/vcl/makefile.mk | 2
chart2/source/controller/makefile.mk | 15
chart2/source/model/makefile.mk | 4
chart2/source/tools/makefile.mk | 5
chart2/source/view/makefile.mk | 14
comphelper/prj/d.lst | 2
comphelper/source/misc/facreg.cxx | 9
comphelper/util/makefile.mk | 2
configmgr/prj/d.lst | 2
configmgr/source/backendhelper/componentdf.cxx | 13
configmgr/source/backendhelper/makefile.mk | 2
configmgr/source/misc/configunoreg.cxx | 13
configmgr/source/platformbe/componentdefn.cxx | 14
configmgr/source/platformbe/makefile.mk | 2
configmgr/util/makefile.mk | 22
connectivity/source/cpool/makefile.mk | 3
connectivity/source/dbtools/makefile.mk | 5
connectivity/source/drivers/adabas/makefile.mk | 3
connectivity/source/drivers/calc/makefile.mk | 9
connectivity/source/drivers/dbase/makefile.mk | 8
connectivity/source/drivers/evoab/makefile.mk | 11
connectivity/source/drivers/evoab2/makefile.mk | 10
connectivity/source/drivers/file/makefile.mk | 8
connectivity/source/drivers/flat/makefile.mk | 11
connectivity/source/drivers/hsqldb/makefile.mk | 3
connectivity/source/drivers/jdbc/makefile.mk | 3
connectivity/source/drivers/mysql/makefile.mk | 4
connectivity/source/drivers/odbc/makefile.mk | 3
connectivity/source/manager/makefile.mk | 1
dbaccess/source/filter/migration/makefile.mk | 7
dbaccess/source/filter/xml/makefile.mk | 13
desktop/prj/build.lst | 16
desktop/prj/d.lst | 2
desktop/source/app/appinit.cxx | 152
desktop/source/app/makefile.mk | 44
desktop/source/deployment/gui/makefile.mk | 12
desktop/source/deployment/makefile.mk | 8
desktop/source/deployment/misc/makefile.mk | 5
desktop/source/migration/services/makefile.mk | 6
desktop/source/offacc/makefile.mk | 2
desktop/source/pkgchk/makefile.mk | 13
desktop/source/pkgchk/unopkg/makefile.mk | 12
desktop/source/so_comp/makefile.mk | 8
desktop/source/splash/makefile.mk | 15
desktop/source/splash/services_spl.cxx | 12
desktop/util/makefile.mk | 148
dtrans/prj/build.lst | 2
dtrans/prj/d.lst | 2
dtrans/source/X11/X11_service.cxx | 11
dtrans/source/X11/makefile.mk | 12
embeddedobj/source/msole/makefile.mk | 7
embeddedobj/util/makefile.mk | 2
extensions/source/abpilot/makefile.mk | 11
extensions/source/bibliography/makefile.mk | 9
extensions/source/dbpilots/makefile.mk | 7
extensions/source/nsplugin/source/makefile.mk | 9
extensions/source/packer/makefile.mk | 2
extensions/source/plugin/unx/makefile.mk | 3
extensions/source/plugin/util/makefile.mk | 10
extensions/source/preload/makefile.mk | 7
extensions/source/propctrlr/makefile.mk | 10
extensions/source/resource/makefile.mk | 9
extensions/source/scanner/makefile.mk | 17
extensions/source/svg/makefile.mk | 4
extensions/source/update/ui/makefile.mk | 6
extensions/source/xmlextract/makefile.mk | 4
fileaccess/prj/build.lst | 2
fileaccess/prj/d.lst | 2
fileaccess/source/FileAccess.cxx | 10
fileaccess/source/makefile.mk | 18
filter/source/bf_migrate/makefile.mk | 0
filter/source/bf_offwrp/makefile.mk | 0
filter/source/config/cache/makefile.mk | 7
filter/source/filtertracer/makefile.mk | 5
filter/source/flash/makefile.mk | 7
filter/source/msfilter/powerpoint/makefile.mk | 3
filter/source/pdf/makefile.mk | 9
filter/source/svg/makefile.mk | 7
filter/source/xmlfilteradaptor/makefile.mk | 4
filter/source/xmlfilterdetect/makefile.mk | 3
filter/source/xsltdialog/makefile.mk | 11
filter/source/xsltfilter/makefile.mk | 6
fpicker/source/generic/makefile.mk | 3
fpicker/source/office/makefile.mk | 9
fpicker/source/unx/gnome/makefile.mk | 4
framework/inc/macros/registration.hxx | 20
framework/prj/d.lst | 2
framework/source/register/register3rdcomponents.cxx | 10
framework/source/register/registerservices.cxx | 10
framework/source/register/registertemp.cxx | 10
framework/util/makefile.mk | 61
goodies/prj/d.lst | 2
goodies/source/filter.vcl/egif/makefile.mk | 2
goodies/source/filter.vcl/eos2met/makefile.mk | 2
goodies/source/filter.vcl/epbm/makefile.mk | 2
goodies/source/filter.vcl/epgm/makefile.mk | 2
goodies/source/filter.vcl/epict/makefile.mk | 2
goodies/source/filter.vcl/eppm/makefile.mk | 2
goodies/source/filter.vcl/eps/makefile.mk | 2
goodies/source/filter.vcl/eras/makefile.mk | 2
goodies/source/filter.vcl/etiff/makefile.mk | 2
goodies/source/filter.vcl/expm/makefile.mk | 2
goodies/source/filter.vcl/icgm/makefile.mk | 5
goodies/source/filter.vcl/idxf/makefile.mk | 2
goodies/source/filter.vcl/ieps/makefile.mk | 2
goodies/source/filter.vcl/ios2met/makefile.mk | 2
goodies/source/filter.vcl/ipbm/makefile.mk | 2
goodies/source/filter.vcl/ipcd/makefile.mk | 2
goodies/source/filter.vcl/ipcx/makefile.mk | 2
goodies/source/filter.vcl/ipict/makefile.mk | 2
goodies/source/filter.vcl/ipsd/makefile.mk | 2
goodies/source/filter.vcl/iras/makefile.mk | 2
goodies/source/filter.vcl/itga/makefile.mk | 2
goodies/source/filter.vcl/itiff/makefile.mk | 2
goodies/source/inv/makefile.mk | 17
goodies/source/unographic/graphicuno.cxx | 13
goodies/util/makefile.mk | 2
i18npool/prj/d.lst | 2
i18npool/source/isolang/makefile.mk | 2
i18npool/source/registerservices/registerservices.cxx | 9
i18npool/util/makefile.mk | 2
i18nutil/prj/d.lst | 3
i18nutil/source/utility/makefile.mk | 15
idl/util/makefile.mk | 5
inc/bf_sfx2/docfile.hxx | 0
inc/insdlg.hxx | 0
inc/macros/registration.hxx | 0
inc/transbnd.hxx | 0
instsetoo_native/util/openoffice.lst | 6
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 8
lingucomponent/source/spellcheck/spell/makefile.mk | 8
lingucomponent/source/thesaurus/libnth/makefile.mk | 8
linguistic/source/makefile.mk | 12
msole/makefile.mk | 0
openoffice.org/cppcanvas/util/makefile.mk | 2
openoffice.org/dbaccess/util/makefile.mk | 29
openoffice.org/forms/util/makefile.mk | 13
openoffice.org/libsofficecheckpoint1/makefile.mk | 36
openoffice.org/libsofficecheckpoint1/prj/build.lst | 3
openoffice.org/libsofficecheckpoint1/prj/d.lst | 1
package/prj/build.lst | 2
package/prj/d.lst | 2
package/source/manifest/UnoRegister.cxx | 10
package/source/xstor/makefile.mk | 4
package/util/makefile.mk | 9
padmin/source/makefile.mk | 11
prj/build.lst | 2
prj/d.lst | 0
psprint/prj/d.lst | 2
psprint/util/makefile.mk | 2
regexp/source/makefile.mk | 2
rsc/prj/build.lst | 2
rsc/source/prj/makefile.mk | 6
sc/util/makefile.mk | 36
scaddins/source/analysis/makefile.mk | 4
scaddins/source/datefunc/makefile.mk | 4
sch/util/makefile.mk | 18
scp2/source/gnome/file_gnome.scp | 18
scp2/source/gnome/module_gnome.scp | 2
scp2/source/ooo/file_library_ooo.scp | 245
scp2/source/ooo/module_hidden_ooo.scp | 37
scripting/source/basprov/makefile.mk | 8
scripting/source/dlgprov/makefile.mk | 5
scripting/source/protocolhandler/makefile.mk | 4
scripting/source/stringresource/makefile.mk | 2
scripting/source/vbaevents/makefile.mk | 5
scripting/util/makefile.mk | 4
sd/prj/build.lst | 2
sd/source/filter/eppt/makefile.mk | 12
sd/util/makefile.mk | 45
sfx2/prj/build.lst | 2
sfx2/prj/d.lst | 3
sfx2/source/appl/appuno.cxx | 11
sfx2/util/makefile.mk | 70
shell/prj/d.lst | 2
shell/source/backends/desktopbe/desktopbecdef.cxx | 13
shell/source/backends/desktopbe/makefile.mk | 12
shell/source/backends/gconfbe/gconfbecdef.cxx | 12
shell/source/backends/gconfbe/makefile.mk | 12
shell/source/backends/localebe/localebecdef.cxx | 12
shell/source/backends/localebe/makefile.mk | 12
shell/source/unix/sysshell/makefile.mk | 4
sj2/prj/d.lst | 2
sj2/util/makefile.mk | 6
slideshow/util/makefile.mk | 9
so3/inc/insdlg.hxx | 7
so3/inc/transbnd.hxx | 12
so3/prj/d.lst | 2
so3/source/dialog/insdlg.cxx | 4
so3/source/inplace/outplace.cxx | 1
so3/source/persist/transbnd.cxx | 4
so3/util/makefile.mk | 3
solenv/bin/modules/installer/configuration.pm | 4
solenv/bin/modules/installer/profiles.pm | 4
sot/prj/d.lst | 2
sot/source/unoolestorage/register.cxx | 9
sot/util/makefile.mk | 2
source/FileAccess.cxx | 0
source/X11/X11_service.cxx | 0
source/X11/makefile.mk | 0
source/abpilot/makefile.mk | 0
source/analysis/makefile.mk | 0
source/app/appinit.cxx | 0
source/app/makefile.mk | 0
source/app/svapp.cxx | 0
source/appl/appuno.cxx | 0
source/awt/vclxtoolkit.cxx | 0
source/awt/vclxwindow.cxx | 0
source/backendhelper/componentdf.cxx | 0
source/backendhelper/makefile.mk | 0
source/backends/desktopbe/desktopbecdef.cxx | 0
source/backends/desktopbe/makefile.mk | 0
source/backends/gconfbe/gconfbecdef.cxx | 0
source/backends/gconfbe/makefile.mk | 0
source/backends/localebe/localebecdef.cxx | 0
source/backends/localebe/makefile.mk | 0
source/basprov/makefile.mk | 0
source/bibliography/makefile.mk | 0
source/cairo/makefile.mk | 0
source/components/factory.cxx | 0
source/config/cache/makefile.mk | 0
source/controller/makefile.mk | 0
source/core/facreg.cxx | 0
source/core/makefile.mk | 0
source/core/ucbserv.cxx | 0
source/cpool/makefile.mk | 0
source/datefunc/makefile.mk | 0
source/dbpilots/makefile.mk | 0
source/dbtools/makefile.mk | 0
source/deployment/gui/makefile.mk | 0
source/deployment/makefile.mk | 0
source/deployment/misc/makefile.mk | 0
source/dialog/insdlg.cxx | 0
source/dlgprov/makefile.mk | 0
source/drivers/adabas/makefile.mk | 0
source/drivers/calc/makefile.mk | 0
source/drivers/dbase/makefile.mk | 0
source/drivers/evoab/makefile.mk | 0
source/drivers/evoab2/makefile.mk | 0
source/drivers/file/makefile.mk | 0
source/drivers/flat/makefile.mk | 0
source/drivers/hsqldb/makefile.mk | 0
source/drivers/jdbc/makefile.mk | 0
source/drivers/mysql/makefile.mk | 0
source/drivers/odbc/makefile.mk | 0
source/filter.vcl/egif/makefile.mk | 0
source/filter.vcl/eos2met/makefile.mk | 0
source/filter.vcl/epbm/makefile.mk | 0
source/filter.vcl/epgm/makefile.mk | 0
source/filter.vcl/epict/makefile.mk | 0
source/filter.vcl/eppm/makefile.mk | 0
source/filter.vcl/eps/makefile.mk | 0
source/filter.vcl/eras/makefile.mk | 0
source/filter.vcl/etiff/makefile.mk | 0
source/filter.vcl/expm/makefile.mk | 0
source/filter.vcl/icgm/makefile.mk | 0
source/filter.vcl/idxf/makefile.mk | 0
source/filter.vcl/ieps/makefile.mk | 0
source/filter.vcl/ios2met/makefile.mk | 0
source/filter.vcl/ipbm/makefile.mk | 0
source/filter.vcl/ipcd/makefile.mk | 0
source/filter.vcl/ipcx/makefile.mk | 0
source/filter.vcl/ipict/makefile.mk | 0
source/filter.vcl/ipsd/makefile.mk | 0
source/filter.vcl/iras/makefile.mk | 0
source/filter.vcl/itga/makefile.mk | 0
source/filter.vcl/itiff/makefile.mk | 0
source/filter/eppt/makefile.mk | 0
source/filter/migration/makefile.mk | 0
source/filter/xml/makefile.mk | 0
source/filtertracer/makefile.mk | 0
source/flash/makefile.mk | 0
source/fsstor/fsfactory.cxx | 0
source/fsstor/fsstorage.cxx | 0
source/fsstor/makefile.mk | 0
source/generic/makefile.mk | 0
source/gengal/makefile.mk | 0
source/gnome/file_gnome.scp | 0
source/gnome/module_gnome.scp | 0
source/hatchwindow/makefile.mk | 0
source/helper/registerservices.cxx | 0
source/helpprovider/makefile.mk | 0
source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 0
source/inplace/outplace.cxx | 0
source/inv/makefile.mk | 0
source/isolang/makefile.mk | 0
source/makefile.mk | 0
source/manager/makefile.mk | 0
source/manifest/UnoRegister.cxx | 0
source/migration/services/makefile.mk | 0
source/misc/configunoreg.cxx | 0
source/misc/facreg.cxx | 0
source/misc/unoservices.cxx | 0
source/model/makefile.mk | 0
source/msfilter/powerpoint/makefile.mk | 0
source/nsplugin/source/makefile.mk | 0
source/null/makefile.mk | 0
source/offacc/makefile.mk | 0
source/office/makefile.mk | 0
source/ooo/file_library_ooo.scp | 0
source/ooo/module_hidden_ooo.scp | 0
source/packer/makefile.mk | 0
source/passwordcontainer/makefile.mk | 0
source/pdf/makefile.mk | 0
source/persist/transbnd.cxx | 0
source/pkgchk/makefile.mk | 0
source/pkgchk/unopkg/makefile.mk | 0
source/platformbe/componentdefn.cxx | 0
source/platformbe/makefile.mk | 0
source/plugin/unx/makefile.mk | 0
source/plugin/util/makefile.mk | 0
source/preload/makefile.mk | 0
source/prj/makefile.mk | 0
source/productregistration/makefile.mk | 0
source/propctrlr/makefile.mk | 0
source/protocolhandler/makefile.mk | 0
source/register/register3rdcomponents.cxx | 0
source/register/registerservices.cxx | 0
source/register/registertemp.cxx | 0
source/registerservices/registerservices.cxx | 0
source/resource/makefile.mk | 0
source/scanner/makefile.mk | 0
source/service/makefile.mk | 0
source/so_comp/makefile.mk | 0
source/spellcheck/spell/makefile.mk | 0
source/splash/makefile.mk | 0
source/splash/services_spl.cxx | 0
source/stringresource/makefile.mk | 0
source/svg/makefile.mk | 0
source/thesaurus/libnth/makefile.mk | 0
source/tools/makefile.mk | 0
source/transform/makefile.mk | 0
source/treeview/makefile.mk | 0
source/ucbhelper/xtempfile.cxx | 0
source/ucp/expand/makefile.mk | 0
source/ucp/file/makefile.mk | 0
source/ucp/file/prov.cxx | 0
source/ucp/ftp/makefile.mk | 0
source/ucp/gvfs/makefile.mk | 0
source/ucp/gvfs/provider.cxx | 0
source/ucp/hierarchy/makefile.mk | 0
source/ucp/package/makefile.mk | 0
source/ucp/tdoc/makefile.mk | 0
source/ucp/webdav/makefile.mk | 0
source/unix/sysshell/makefile.mk | 0
source/uno/registerservices.cxx | 0
source/uno/sbservices.cxx | 0
source/unodialogs/textconversiondlgs/makefile.mk | 0
source/unographic/graphicuno.cxx | 0
source/unoolestorage/register.cxx | 0
source/unx/gnome/makefile.mk | 0
source/update/ui/makefile.mk | 0
source/utility/makefile.mk | 0
source/vcl/makefile.mk | 0
source/view/makefile.mk | 0
source/xine/makefile.mk | 0
source/xmlextract/makefile.mk | 0
source/xmlfilteradaptor/makefile.mk | 0
source/xmlfilterdetect/makefile.mk | 0
source/xsltdialog/makefile.mk | 0
source/xsltfilter/makefile.mk | 0
source/xstor/makefile.mk | 0
starmath/util/makefile.mk | 19
svtools/bmpmaker/makefile.mk | 8
svtools/prj/build.lst | 6
svtools/prj/d.lst | 3
svtools/source/fsstor/fsfactory.cxx | 10
svtools/source/fsstor/fsstorage.cxx | 2
svtools/source/fsstor/makefile.mk | 16
svtools/source/hatchwindow/makefile.mk | 4
svtools/source/passwordcontainer/makefile.mk | 3
svtools/source/productregistration/makefile.mk | 5
svtools/source/uno/registerservices.cxx | 10
svtools/uno/makefile.mk | 9
svtools/util/makefile.mk | 130
svx/prj/build.lst | 2
svx/source/gengal/makefile.mk | 14
svx/source/unodialogs/textconversiondlgs/makefile.mk | 8
svx/util/makefile.mk | 33
sw/prj/build.lst | 2
sw/util/makefile.mk | 49
toolkit/prj/d.lst | 2
toolkit/source/awt/vclxtoolkit.cxx | 12
toolkit/source/awt/vclxwindow.cxx | 6
toolkit/source/helper/registerservices.cxx | 9
toolkit/util/makefile.mk | 3
tools/bootstrp/addexes2/makefile.mk | 2
tools/bootstrp/makefile.mk | 6
tools/prj/d.lst | 2
tools/util/makefile.mk | 2
transex3/source/makefile.mk | 37
ucb/prj/build.lst | 2
ucb/prj/d.lst | 2
ucb/source/core/makefile.mk | 19
ucb/source/core/ucbserv.cxx | 11
ucb/source/ucp/expand/makefile.mk | 2
ucb/source/ucp/file/makefile.mk | 2
ucb/source/ucp/file/prov.cxx | 11
ucb/source/ucp/ftp/makefile.mk | 2
ucb/source/ucp/gvfs/makefile.mk | 17
ucb/source/ucp/gvfs/provider.cxx | 11
ucb/source/ucp/hierarchy/makefile.mk | 5
ucb/source/ucp/package/makefile.mk | 5
ucb/source/ucp/tdoc/makefile.mk | 5
ucb/source/ucp/webdav/makefile.mk | 3
ucbhelper/prj/d.lst | 2
ucbhelper/util/makefile.mk | 2
uno/makefile.mk | 0
unotools/prj/d.lst | 2
unotools/source/ucbhelper/xtempfile.cxx | 10
unotools/util/makefile.mk | 2
unoxml/prj/build.lst | 2
unoxml/source/service/makefile.mk | 3
util/makefile.mk | 0
util/openoffice.lst | 0
uui/util/makefile.mk | 7
vcl/prj/d.lst | 3
vcl/source/app/svapp.cxx | 13
vcl/source/components/factory.cxx | 11
vcl/util/makefile.mk | 60
vcl/workben/makefile.mk | 22
vos/util/makefile.mk | 22
workben/makefile.mk | 0
writerperfect/util/makefile.mk | 10
xmlhelp/source/helpprovider/makefile.mk | 3
xmlhelp/source/treeview/makefile.mk | 3
xmlhelp/util/makefile.mk | 4
xmloff/prj/build.lst | 2
xmloff/prj/d.lst | 3
xmloff/source/core/facreg.cxx | 9
xmloff/source/transform/makefile.mk | 10
xmloff/util/makefile.mk | 67
xmlscript/prj/d.lst | 2
xmlscript/source/misc/unoservices.cxx | 10
xmlscript/util/makefile.mk | 3
xmlsecurity/util/makefile.mk | 21
485 files changed, 6269 insertions(+), 2001 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.8 -r 1.9 openoffice.org-2.2.0.ooo53397.linkopt.patch
Index: openoffice.org-2.2.0.ooo53397.linkopt.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo53397.linkopt.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-2.2.0.ooo53397.linkopt.patch 31 Mar 2007 15:54:41 -0000 1.8
+++ openoffice.org-2.2.0.ooo53397.linkopt.patch 12 Apr 2007 15:34:53 -0000 1.9
@@ -3252,86 +3252,6 @@
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
-Index: util/makefile.mk
-===================================================================
-RCS file: /cvs/sw/sw/util/makefile.mk,v
-retrieving revision 1.57
-diff -u -r1.57 makefile.mk
---- openoffice.org.orig/sw/util/makefile.mk 2 Jan 2007 16:55:04 -0000 1.57
-+++ openoffice.org/sw/util/makefile.mk 27 Mar 2007 19:29:53 -0000
-@@ -107,29 +107,13 @@
-
- # dynamic libraries
- SHL1STDLIBS+= \
-+ -lsoffice \
- $(SVXLIB) \
-- $(SFXLIB) \
-- $(XMLOFFLIB) \
-- $(BASICLIB) \
-- $(GOODIESLIB) \
-- $(BASEGFXLIB) \
-- $(SVTOOLLIB) \
-- $(TKLIB) \
-- $(VCLLIB) \
-- $(SVLLIB) \
-- $(SOTLIB) \
-- $(UNOTOOLSLIB) \
-- $(TOOLSLIB) \
-- $(I18NISOLANGLIB) \
-- $(COMPHELPERLIB) \
-- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
-- $(VOSLIB) \
- $(SALLIB) \
- $(SALHELPERLIB) \
- $(ICUUCLIB) \
-- $(I18NUTILLIB) \
- $(AVMEDIALIB) \
- $(XML2LIB)
-
-@@ -155,15 +139,7 @@
- DEF2NAME= $(SHL2TARGET)
-
- SHL2STDLIBS= \
-- $(SFX2LIB) \
-- $(SVTOOLLIB) \
-- $(SVLLIB) \
-- $(VCLLIB) \
-- $(SOTLIB) \
-- $(TOOLSLIB) \
-- $(UCBHELPERLIB) \
-- $(UNOTOOLSLIB) \
-- $(COMPHELPERLIB) \
-+ -lsoffice \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-@@ -189,22 +165,11 @@
-
- SHL3STDLIBS= \
- $(ISWLIB) \
-+ -lsoffice \
- $(SVXLIB) \
-- $(SFX2LIB) \
-- $(BASICLIB) \
-- $(SVTOOLLIB) \
-- $(TKLIB) \
-- $(VCLLIB) \
-- $(SOTLIB) \
-- $(SVLLIB) \
-- $(UNOTOOLSLIB) \
-- $(TOOLSLIB) \
-- $(COMPHELPERLIB) \
-- $(UCBHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
-- $(SALLIB) \
-- $(SOTLIB)
-+ $(SALLIB)
-
- SHL3LIBS= $(SLB)$/swui.lib
- LIB3TARGET = $(SLB)$/swui.lib
Index: prj/d.lst
===================================================================
RCS file: /cvs/gsl/toolkit/prj/d.lst,v
@@ -7331,333 +7251,119 @@
const sal_Char* pImplementationName,
void* pServiceManager,
void*)
-Index: util/makefile.mk
+Index: source/app/svapp.cxx
===================================================================
-RCS file: /cvs/framework/desktop/util/makefile.mk,v
-retrieving revision 1.65
-diff -u -r1.65 makefile.mk
---- openoffice.org.orig/desktop/util/makefile.mk 2 Jan 2007 16:17:33 -0000 1.65
-+++ openoffice.org/desktop/util/makefile.mk 29 Mar 2007 08:03:52 -0000
-@@ -48,25 +48,24 @@
- VERINFONAME=verinfo
-
- TARGETOBJS= \
-- $(OBJ)$/main.obj \
-- $(OBJ)$/app.obj \
-- $(OBJ)$/lockfile.obj \
-- $(OBJ)$/lockfile2.obj \
-- $(OBJ)$/intro.obj \
-- $(OBJ)$/officeipcthread.obj \
-- $(OBJ)$/appinit.obj \
-- $(OBJ)$/cmdlineargs.obj \
-- $(OBJ)$/oinstanceprovider.obj \
-- $(OBJ)$/opluginframefactory.obj \
-- $(OBJ)$/appsys.obj \
-- $(OBJ)$/desktopresid.obj \
-- $(OBJ)$/dispatchwatcher.obj \
-- $(OBJ)$/configinit.obj \
-- $(OBJ)$/checkinstall.obj \
-- $(OBJ)$/cmdlinehelp.obj \
-- $(OBJ)$/langselect.obj \
-- $(OBJ)$/userinstall.obj \
-- $(OBJ)$/desktopcontext.obj
-+ $(SLO)$/main.obj \
-+ $(SLO)$/app.obj \
-+ $(SLO)$/lockfile.obj \
-+ $(SLO)$/lockfile2.obj \
-+ $(SLO)$/intro.obj \
-+ $(SLO)$/officeipcthread.obj \
-+ $(SLO)$/appinit.obj \
-+ $(SLO)$/cmdlineargs.obj \
-+ $(SLO)$/oinstanceprovider.obj \
-+ $(SLO)$/opluginframefactory.obj \
-+ $(SLO)$/desktopresid.obj \
-+ $(SLO)$/dispatchwatcher.obj \
-+ $(SLO)$/configinit.obj \
-+ $(SLO)$/checkinstall.obj \
-+ $(SLO)$/cmdlinehelp.obj \
-+ $(SLO)$/langselect.obj \
-+ $(SLO)$/userinstall.obj \
-+ $(SLO)$/desktopcontext.obj
+RCS file: /cvs/gsl/vcl/source/app/svapp.cxx,v
+retrieving revision 1.72.106.2
+diff -u -r1.72.106.2 svapp.cxx
+--- openoffice.org.orig/vcl/source/app/svapp.cxx 24 Jan 2007 13:31:59 -0000 1.72.106.2
++++ openoffice.org/vcl/source/app/svapp.cxx 20 Mar 2007 11:00:24 -0000
+@@ -144,6 +144,7 @@
+ #include <utility>
+ #include "lazydelete.hxx"
++#include <dlfcn.h>
+ using namespace ::com::sun::star::uno;
-@@ -82,7 +81,7 @@
+@@ -1667,16 +1669,10 @@
+ static BOOL bAlreadyTriedToCreate = FALSE;
+ if ( !pSVData->mpUnoWrapper && bCreateIfNotExist && !bAlreadyTriedToCreate )
+ {
+- ::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( "tk", TRUE );
+- oslModule hTkLib = osl_loadModule( aLibName.pData, SAL_LOADMODULE_DEFAULT );
+- if ( hTkLib )
++ FN_TkCreateUnoWrapper fnCreateWrapper = (FN_TkCreateUnoWrapper)dlsym(RTLD_DEFAULT, "CreateUnoWrapper");
++ if ( fnCreateWrapper )
+ {
+- ::rtl::OUString aFunctionName( RTL_CONSTASCII_USTRINGPARAM( "CreateUnoWrapper" ) );
+- FN_TkCreateUnoWrapper fnCreateWrapper = (FN_TkCreateUnoWrapper)osl_getFunctionSymbol( hTkLib, aFunctionName.pData );
+- if ( fnCreateWrapper )
+- {
+- pSVData->mpUnoWrapper = fnCreateWrapper();
+- }
++ pSVData->mpUnoWrapper = fnCreateWrapper();
+ }
+ DBG_ASSERT( pSVData->mpUnoWrapper, "UnoWrapper could not be created!" );
+ bAlreadyTriedToCreate = TRUE;
+Index: source/awt/vclxtoolkit.cxx
+===================================================================
+RCS file: /cvs/gsl/toolkit/source/awt/vclxtoolkit.cxx,v
+retrieving revision 1.53
+diff -u -r1.53 vclxtoolkit.cxx
+--- openoffice.org.orig/toolkit/source/awt/vclxtoolkit.cxx 20 Dec 2006 13:52:30 -0000 1.53
++++ openoffice.org/toolkit/source/awt/vclxtoolkit.cxx 20 Mar 2007 11:01:15 -0000
+@@ -249,6 +249,8 @@
+ #include <comphelper/processfactory.hxx>
+ #endif
- LIB1TARGET=$(SLB)$/$(TARGET).lib
- LIB1FILES=$(TARGETOBJS)
--LIB1FILES += $(OBJ)$/copyright_ascii_sun.obj
-+LIB1FILES += $(SLO)$/copyright_ascii_sun.obj
++#include <dlfcn.h>
++
+ namespace css = ::com::sun::star;
[...5624 lines suppressed...]
+- $(OBJ)$/dispatchwatcher.obj \
+- $(OBJ)$/configinit.obj \
+- $(OBJ)$/checkinstall.obj \
+- $(OBJ)$/cmdlinehelp.obj \
+- $(OBJ)$/langselect.obj \
+- $(OBJ)$/userinstall.obj \
+- $(OBJ)$/desktopcontext.obj
++ $(SLO)$/main.obj \
++ $(SLO)$/app.obj \
++ $(SLO)$/lockfile.obj \
++ $(SLO)$/lockfile2.obj \
++ $(SLO)$/intro.obj \
++ $(SLO)$/officeipcthread.obj \
++ $(SLO)$/appinit.obj \
++ $(SLO)$/cmdlineargs.obj \
++ $(SLO)$/oinstanceprovider.obj \
++ $(SLO)$/opluginframefactory.obj \
++ $(SLO)$/desktopresid.obj \
++ $(SLO)$/dispatchwatcher.obj \
++ $(SLO)$/configinit.obj \
++ $(SLO)$/checkinstall.obj \
++ $(SLO)$/cmdlinehelp.obj \
++ $(SLO)$/langselect.obj \
++ $(SLO)$/userinstall.obj \
++ $(SLO)$/desktopcontext.obj
+
+
+
+@@ -82,7 +81,7 @@
+
+ LIB1TARGET=$(SLB)$/$(TARGET).lib
+ LIB1FILES=$(TARGETOBJS)
+-LIB1FILES += $(OBJ)$/copyright_ascii_sun.obj
++LIB1FILES += $(SLO)$/copyright_ascii_sun.obj
+
+ #LIB2TARGET=$(SLB)$/officeloader.lib
+ #LIB2FILES=$(OBJ)$/officeloader.obj
+@@ -101,9 +100,9 @@
+ # winXX is handled like solaris for now
+ APP1_STDPRE=
+ APP1_STDPOST=$(CPPULIB) $(CPPUHELPERLIB) $(UNOLIB) $(TOOLSLIB) \
+- $(VOSLIB) $(SALLIB)
++ $(SALLIB)
+ .ELSE
+-APP1_STDPRE=$(SALLIB) $(VOSLIB) $(TOOLSLIB) $(UNOLIB) $(CPPULIB) \
++APP1_STDPRE=$(SALLIB) $(UNOLIB) $(CPPULIB) \
+ $(CPPUHELPERLIB)
+ APP1_STDPOST=
+ .ENDIF
+@@ -114,20 +113,79 @@
+ $(SRS)$/wizard.srs
+
+ APP1TARGET=so$/$(TARGET)
++SHL1TARGET=$(TARGET)
++SHL1OBJS=$(TARGETOBJS)
++SHL1DEPN=$(MISC)$/ldorder
++
++PKGCONFIG_MODULES=gtk+-unix-print-2.0 gnome-vfs-2.0 gconf-2.0 gobject-2.0 ORBit-2.0 glib-2.0
++.INCLUDE: pkg_config.mk
++
++SHL1STDLIBS+= \
++ -Wl,-T,$(MISC)$/ldorder \
++ -Wl,--whole-archive \
++ -llinkopt.comphelp \
++ -llinkopt.basegfx \
++ -llinkopt.vos \
++ -llinkopt.i18npool.uno \
++ -llinkopt.i18nutil \
++ -llinkopt.sot \
++ -llinkopt.fwe \
++ -llinkopt.svt \
++ -llinkopt.fwi \
++ -llinkopt.tk \
++ -llinkopt.fwk \
++ -llinkopt.tl \
++ -llinkopt.fwl \
++ -llinkopt.ucbhelper \
++ -llinkopt.fwm \
++ -llinkopt.ucb \
++ -llinkopt.ucpgvfs \
++ -llinkopt.ucpfile \
++ -llinkopt.go \
++ -llinkopt.utl \
++ -llinkopt.i18nisolang \
++ -llinkopt.vcl \
++ -llinkopt.psp \
++ -llinkopt.xo \
++ -llinkopt.sb \
++ -llinkopt.xcr \
++ -llinkopt.sfx \
++ -llinkopt.so \
++ -llinkopt.j_g \
++ -llinkopt.fileacc \
++ -llinkopt.desktopbe \
++ -llinkopt.gconfbe \
++ -llinkopt.localebe \
++ -llinkopt.dtransX11 \
++ -llinkopt.spl \
++ -llinkopt.configmgr \
++ -llinkopt.sysmgr \
++ -llinkopt.behelper \
++ -llinkopt.package \
++ -llinkopt.fsstorage.uno \
++ -Wl,--no-whole-archive \
++ $(ICUUCLIB) \
++ $(ICUINLIB) \
++ $(ICULELIB) \
++ $(JVMFWKLIB) \
++ $(JVMACCESSLIB) \
++ $(SYSSHELLLIB) \
++ $(CPPULIB) \
++ $(CPPUHELPERLIB) \
++ $(SALHELPERLIB) \
++ $(SALLIB) \
++ $(PKGCONFIG_LIBS) \
++ $(FREETYPELIB) \
++ -lfontconfig \
++ -lX11 \
++ $(JPEG3RDLIB) \
++ $(ZLIB3RDLIB)
++
+ APP1NOSAL=TRUE
+ APP1STDLIBS= \
+- $(VCLLIB) \
+- $(SVLLIB) \
+- $(SVTOOLLIB) \
+- $(UNOTOOLSLIB) \
+- $(TOOLSLIB) \
+- $(I18NISOLANGLIB) \
+- $(COMPHELPERLIB) \
+- $(UCBHELPERLIB) \
+- $(VOSLIB) \
++ -lsoffice \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+- $(TKLIB) \
+ $(SALLIB)
+
+
+@@ -141,8 +199,7 @@
+ # $(COMPHELPERLIB) \
+ # $(SALHELPERLIB) \
+
+-APP1OBJS=$(TARGETOBJS)
+-APP1OBJS += $(OBJ)$/copyright_ascii_sun.obj
++APP1OBJS += $(SLO)$/copyright_ascii_sun.obj
+
+ .IF "$(GUI)" == "UNX"
+ .IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
+@@ -170,22 +227,12 @@
+ APP5TARGET=soffice
+ APP5NOSAL=TRUE
+ APP5STDLIBS= \
+- $(VCLLIB) \
+- $(SVLLIB) \
+- $(SVTOOLLIB) \
+- $(UNOTOOLSLIB) \
+- $(TOOLSLIB) \
+- $(I18NISOLANGLIB) \
+- $(COMPHELPERLIB) \
+- $(UCBHELPERLIB) \
+- $(VOSLIB) \
++ -lsoffice \
+ $(CPPUHELPERLIB) \
+ $(CPPULIB) \
+- $(SALLIB) \
+- $(TKLIB)
++ $(SALLIB)
+
+-APP5OBJS=$(TARGETOBJS)
+-APP5OBJS += $(OBJ)$/copyright_ascii_ooo.obj
++APP5OBJS += $(SLO)$/copyright_ascii_ooo.obj
+
+ .IF "$(OS)" == "LINUX"
+ APP5STDLIBS+= -lXext -lSM -lICE
+@@ -211,7 +258,7 @@
+ APP6LINKRES=$(MISC)$/soffice6.res
+ APP6ICON=$(SOLARRESDIR)$/icons/so8-main-app.ico
+ APP6OBJS = \
+- $(OBJ)$/officeloader.obj
++ $(SLO)$/officeloader.obj
+ STDLIB6=advapi32.lib
+
+ APP7TARGET=officeloader
+@@ -222,7 +269,7 @@
+ APP7LINKRES=$(MISC)$/ooffice7.res
+ APP7ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
+ APP7OBJS = \
+- $(OBJ)$/officeloader.obj
++ $(SLO)$/officeloader.obj
+ STDLIB7=advapi32.lib
+ .ENDIF # WNT
+
+@@ -286,3 +333,6 @@
+ $(BIN)$/so: makefile.mk
+ @echo APP5 : $(APP5TARGET)
+ @+-mkdir $(BIN)$/so >& $(NULLDEV)
++
++$(MISC)$/ldorder: symbolorder
++ mklinkscript.pl symbolorder > $(MISC)$/ldorder
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1162
retrieving revision 1.1163
diff -u -r1.1162 -r1.1163
--- openoffice.org.spec 11 Apr 2007 07:15:05 -0000 1.1162
+++ openoffice.org.spec 12 Apr 2007 15:34:54 -0000 1.1163
@@ -128,11 +128,8 @@
Patch69: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
Patch70: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
Patch71: openoffice.org-2.2.0.rh232389.tango.patch
-%if %{linkopt}
Patch72: openoffice.org-2.2.0.ooo53397.linkopt.patch
-%endif
Patch73: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch74: workspace.glyphadv.patch
%define instdir %{_libdir}/openoffice.org
@@ -1056,10 +1053,13 @@
%patch72 -p1 -b .ooo53397.linkopt.patch
%endif
%patch73 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch74 -p1 -b .workspace.glyphadv.patch
cp %{SOURCE1} extras/source/database/evolocal.odb
+%if %{linkopt}
+chmod a+x solenv/bin/mklinkscript.pl
+%endif
+
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
#don't build localized helps which are poorly translated
@@ -2629,6 +2629,7 @@
%changelog
* Wed Apr 11 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.5
- Resolves: rhbz#235828 INIFILE optimization breaks addins
+- Resolves: rhbz#235325 crash on launch of x86_64 soffice.bin
* Fri Apr 06 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-14.4
- Resolves: rhbz#235341 pdf overlapping characters
--- workspace.glyphadv.patch DELETED ---
More information about the fedora-cvs-commits
mailing list