rpms/openoffice.org/devel openoffice.org-2.2.0.ooo53397.linkopt.patch, NONE, 1.1 openoffice.org.spec, 1.1110, 1.1111
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Mar 16 11:24:20 UTC 2007
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27461
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.2.0.ooo53397.linkopt.patch
Log Message:
test build
openoffice.org-2.2.0.ooo53397.linkopt.patch:
UnoControls/prj/build.lst | 2
UnoControls/util/makefile.mk | 2
automation/prj/build.lst | 2
automation/util/makefile.mk | 44 ---
avmedia/source/gstreamer/makefile.mk | 2
avmedia/source/xine/makefile.mk | 2
avmedia/util/makefile.mk | 2
basctl/util/makefile.mk | 13 -
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 | 10
binfilter/bf_goodies/util/makefile.mk | 3
binfilter/bf_linguistic/source/makefile.mk | 8
binfilter/bf_offmgr/util/makefile.mk | 9
binfilter/bf_sc/util/makefile.mk | 13 -
binfilter/bf_sch/util/makefile.mk | 9
binfilter/bf_sd/util/makefile.mk | 13 -
binfilter/bf_starmath/util/makefile.mk | 10
binfilter/bf_svx/util/makefile.mk | 15 -
binfilter/bf_sw/util/makefile.mk | 12
binfilter/bf_xmloff/util/makefile.mk | 12
binfilter/binfilterdetect/source/makefile.mk | 8
binfilter/filter/source/bf_migrate/makefile.mk | 8
binfilter/filter/source/bf_offwrp/makefile.mk | 12
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/null/makefile.mk | 2
canvas/source/tools/makefile.mk | 2
canvas/source/vcl/makefile.mk | 2
chart2/source/controller/makefile.mk | 14 -
chart2/source/model/makefile.mk | 4
chart2/source/tools/makefile.mk | 2
chart2/source/view/makefile.mk | 11
comphelper/prj/d.lst | 2
comphelper/source/misc/facreg.cxx | 9
comphelper/util/makefile.mk | 2
configmgr/prj/build.lst | 2
configmgr/util/makefile.mk | 4
connectivity/source/cpool/makefile.mk | 2
connectivity/source/dbtools/makefile.mk | 4
connectivity/source/drivers/adabas/makefile.mk | 2
connectivity/source/drivers/calc/makefile.mk | 8
connectivity/source/drivers/dbase/makefile.mk | 7
connectivity/source/drivers/evoab/makefile.mk | 10
connectivity/source/drivers/evoab2/makefile.mk | 9
connectivity/source/drivers/file/makefile.mk | 7
connectivity/source/drivers/flat/makefile.mk | 10
connectivity/source/drivers/hsqldb/makefile.mk | 2
connectivity/source/drivers/jdbc/makefile.mk | 2
connectivity/source/drivers/mysql/makefile.mk | 3
connectivity/source/drivers/odbc/makefile.mk | 2
cppcanvas/util/makefile.mk | 2
dbaccess/source/filter/migration/makefile.mk | 7
dbaccess/source/filter/xml/makefile.mk | 13 -
dbaccess/util/makefile.mk | 27 --
desktop/prj/build.lst | 2
desktop/prj/d.lst | 2
desktop/source/app/appinit.cxx | 96 +++++++
desktop/source/app/makefile.mk | 44 +--
desktop/source/deployment/gui/makefile.mk | 12
desktop/source/deployment/makefile.mk | 8
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 | 7
desktop/util/makefile.mk | 121 +++++----
dtrans/prj/build.lst | 2
dtrans/source/X11/makefile.mk | 2
embeddedobj/source/msole/makefile.mk | 6
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 | 8
extensions/source/packer/makefile.mk | 2
extensions/source/plugin/unx/makefile.mk | 2
extensions/source/plugin/util/makefile.mk | 9
extensions/source/preload/makefile.mk | 7
extensions/source/propctrlr/makefile.mk | 10
extensions/source/resource/makefile.mk | 8
extensions/source/scanner/makefile.mk | 16 -
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/source/makefile.mk | 4
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 | 6
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 | 10
filter/source/xsltfilter/makefile.mk | 5
forms/util/makefile.mk | 12
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 | 13 -
goodies/source/unographic/graphicuno.cxx | 13 -
goodies/util/makefile.mk | 2
i18npool/prj/d.lst | 2
i18npool/source/isolang/makefile.mk | 2
idl/util/makefile.mk | 5
inc/docfile.hxx | 0
inc/insdlg.hxx | 0
inc/macros/registration.hxx | 0
instsetoo_native/util/openoffice.lst | 6
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 7
lingucomponent/source/spellcheck/spell/makefile.mk | 7
lingucomponent/source/thesaurus/libnth/makefile.mk | 7
linguistic/source/makefile.mk | 10
openoffice.org.orig/libsofficecheckpoint1/prj/build.lst | 3
openoffice.org.orig/svtools/source/productregistration/makefile.mk | 5
openoffice.org/canvas/source/cairo/makefile.mk | 2
openoffice.org/desktop/source/deployment/misc/makefile.mk | 5
openoffice.org/libsofficecheckpoint1/makefile.mk | 31 ++
openoffice.org/libsofficecheckpoint1/prj/d.lst | 1
openoffice.org/package/prj/build.lst | 2
openoffice.org/xmloff/source/transform/makefile.mk | 10
package/source/xstor/makefile.mk | 4
package/util/makefile.mk | 3
padmin/source/makefile.mk | 10
prj/build.lst | 2
prj/d.lst | 0
psprint/prj/build.lst | 2
psprint/util/makefile.mk | 4
rsc/prj/build.lst | 2
rsc/source/prj/makefile.mk | 4
sc/util/makefile.mk | 36 --
scaddins/source/analysis/makefile.mk | 3
scaddins/source/datefunc/makefile.mk | 3
sch/util/makefile.mk | 17 -
scp2/source/ooo/file_library_ooo.scp | 111 --------
scp2/source/ooo/module_hidden_ooo.scp | 23 -
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/source/filter/eppt/makefile.mk | 12
sd/util/makefile.mk | 41 ---
sfx2/inc/docfile.hxx | 7
sfx2/prj/build.lst | 2
sfx2/prj/d.lst | 3
sfx2/source/appl/appuno.cxx | 11
sfx2/source/doc/docfile.cxx | 5
sfx2/util/makefile.mk | 66 +++--
shell/source/unix/sysshell/makefile.mk | 4
sj2/util/makefile.mk | 4
slideshow/util/makefile.mk | 8
so3/inc/insdlg.hxx | 8
so3/prj/d.lst | 2
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/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/appl/appuno.cxx | 0
source/awt/vclxwindow.cxx | 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/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/dialogs/insdlg.cxx | 0
source/dlgprov/makefile.mk | 0
source/doc/docfile.cxx | 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/makefile.mk | 0
source/generic/makefile.mk | 0
source/gengal/makefile.mk | 0
source/hatchwindow/makefile.mk | 0
source/helper/registerservices.cxx | 0
source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 0
source/inv/makefile.mk | 0
source/isolang/makefile.mk | 0
source/makefile.mk | 0
source/migration/services/makefile.mk | 0
source/misc/facreg.cxx | 0
source/misc/unoservices.cxx | 0
source/model/makefile.mk | 0
source/msfilter/powerpoint/makefile.mk | 0
source/msole/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/packer/makefile.mk | 0
source/passwordcontainer/makefile.mk | 0
source/pdf/makefile.mk | 0
source/pkgchk/makefile.mk | 0
source/pkgchk/unopkg/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/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/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/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/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/vcl/makefile.mk | 0
source/view/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 | 6
svtools/prj/build.lst | 6
svtools/prj/d.lst | 3
svtools/source/dialogs/insdlg.cxx | 2
svtools/source/fsstor/makefile.mk | 5
svtools/source/hatchwindow/makefile.mk | 4
svtools/source/passwordcontainer/makefile.mk | 3
svtools/source/uno/registerservices.cxx | 10
svtools/uno/makefile.mk | 8
svtools/util/makefile.mk | 128 +++-------
svx/prj/build.lst | 2
svx/source/gengal/makefile.mk | 13 -
svx/source/unodialogs/textconversiondlgs/makefile.mk | 8
svx/util/makefile.mk | 29 --
sw/util/makefile.mk | 40 ---
toolkit/prj/d.lst | 2
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 | 24 +
ucb/prj/build.lst | 2
ucb/prj/d.lst | 2
ucb/source/core/makefile.mk | 4
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 | 6
ucb/source/ucp/hierarchy/makefile.mk | 4
ucb/source/ucp/package/makefile.mk | 4
ucb/source/ucp/tdoc/makefile.mk | 4
ucb/source/ucp/webdav/makefile.mk | 2
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/components/factory.cxx | 11
vcl/util/makefile.mk | 43 +--
vcl/workben/makefile.mk | 18 -
workben/makefile.mk | 0
writerperfect/util/makefile.mk | 10
xmlhelp/source/treeview/makefile.mk | 2
xmlhelp/util/makefile.mk | 3
xmloff/prj/build.lst | 2
xmloff/prj/d.lst | 3
xmloff/source/core/facreg.cxx | 9
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 | 20 -
408 files changed, 843 insertions(+), 1468 deletions(-)
--- NEW FILE openoffice.org-2.2.0.ooo53397.linkopt.patch ---
Index: util/makefile.mk
===================================================================
RCS file: /cvs/script/basctl/util/makefile.mk,v
retrieving revision 1.22
diff -u -r1.22 makefile.mk
--- openoffice.org.orig/basctl/util/makefile.mk 7 Apr 2006 08:46:54 -0000 1.22
+++ openoffice.org/basctl/util/makefile.mk 10 Mar 2007 21:10:44 -0000
@@ -58,19 +58,8 @@
SHL1BASE = 0x1d800000
SHL1STDLIBS= \
$(SVXLIB) \
- $(SFX2LIB) \
- $(BASICLIB) \
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(SOTLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(XMLSCRIPTLIB) \
- $(COMPHELPERLIB) \
+ -lsoffice \
$(CPPUHELPERLIB) \
- $(UCBHELPERLIB) \
$(CPPULIB) \
$(SALLIB)
Index: prj/d.lst
===================================================================
RCS file: /cvs/script/basic/prj/d.lst,v
retrieving revision 1.15.22.1
diff -u -r1.15.22.1 d.lst
--- openoffice.org.orig/basic/prj/d.lst 29 Jan 2007 11:38:00 -0000 1.15.22.1
+++ openoffice.org/basic/prj/d.lst 9 Mar 2007 15:51:31 -0000
@@ -18,6 +18,8 @@
..\%__SRC%\lib\sample.lib %_DEST%\lib%_EXT%\sample.lib
..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a
+..\%__SRC%\lib\liblinkopt.*.a %_DEST%\lib%_EXT%\liblinkopt.*.a
+
mkdir: %_DEST%\inc%_EXT%\basic
hedabu: ..\inc\sbdef.hxx %_DEST%\inc%_EXT%\basic\sbdef.hxx
hedabu: ..\inc\sbmod.hxx %_DEST%\inc%_EXT%\basic\sbmod.hxx
Index: source/uno/sbservices.cxx
===================================================================
RCS file: /cvs/script/basic/source/uno/sbservices.cxx,v
retrieving revision 1.3
diff -u -r1.3 sbservices.cxx
--- openoffice.org.orig/basic/source/uno/sbservices.cxx 5 Dec 2006 12:04:54 -0000 1.3
+++ openoffice.org/basic/source/uno/sbservices.cxx 9 Mar 2007 15:51:42 -0000
@@ -70,5 +70,16 @@
} // namespace basic
//........................................................................
-IMPLEMENT_COMPONENT_LIBRARY_API( ::basic::BasicModule, ::basic::initializeModule )
+extern "C" sal_Bool SAL_CALL sb_component_writeInfo(
+ void* pServiceManager, void* pRegistryKey )
+{
+ ::basic::initializeModule();
+ return ::basic::BasicModule::getInstance().writeComponentInfos( pServiceManager, pRegistryKey );
+}
+extern "C" void* SAL_CALL sb_component_getFactory(
+ const sal_Char* pImplementationName, void* pServiceManager, void* pRegistryKey )
+{
+ ::basic::initializeModule();
+ return ::basic::BasicModule::getInstance().getComponentFactory( pImplementationName, pServiceManager, pRegistryKey );
+}
Index: util/makefile.mk
===================================================================
RCS file: /cvs/script/basic/util/makefile.mk,v
retrieving revision 1.18
diff -u -r1.18 makefile.mk
--- openoffice.org.orig/basic/util/makefile.mk 8 Nov 2006 11:55:15 -0000 1.18
+++ openoffice.org/basic/util/makefile.mk 9 Mar 2007 15:51:42 -0000
@@ -55,7 +55,7 @@
$(SLB)$/runtime.lib \
$(SLB)$/sbx.lib
-SHL1TARGET= sb$(UPD)$(DLLPOSTFIX)
+LIB1ARCHIV= $(LB)$/liblinkopt.sb.a
SHL1IMPLIB= basic
SHL1STDLIBS= \
Index: bf_forms/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_forms/util/makefile.mk,v
retrieving revision 1.7
diff -u -r1.7 makefile.mk
--- openoffice.org.orig/binfilter/bf_forms/util/makefile.mk 19 Jul 2006 13:14:05 -0000 1.7
+++ openoffice.org/binfilter/bf_forms/util/makefile.mk 11 Mar 2007 12:48:23 -0000
@@ -71,19 +71,11 @@
$(ONELIB) \
$(CPPULIB) \
$(CPPUHELPERLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(VCLLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
$(BFSVXLIB) \
$(LEGACYSMGRLIB) \
$(VOSLIB) \
- $(UNOTOOLSLIB) \
- $(COMPHELPERLIB) \
$(DBTOOLSLIB) \
- $(TKLIB) \
- $(SO2LIB)
+ -lsoffice
SHL1LIBS=$(LIB1TARGET)
SHL1DEPN= $(LIB1TARGET) \
Index: bf_goodies/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_goodies/util/makefile.mk,v
retrieving revision 1.2
diff -u -r1.2 makefile.mk
--- openoffice.org.orig/binfilter/bf_goodies/util/makefile.mk 14 Nov 2006 11:58:50 -0000 1.2
+++ openoffice.org/binfilter/bf_goodies/util/makefile.mk 11 Mar 2007 12:48:23 -0000
@@ -73,8 +73,7 @@
#DEF1EXPORTFILE =bf_goodies.dxp
SHL1STDLIBS= \
- $(GOODIESLIB) \
- $(TOOLSLIB) \
+ -lsoffice \
$(SALLIB)
# --- Targets -------------------------------------------------------------
Index: bf_linguistic/source/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_linguistic/source/makefile.mk,v
retrieving revision 1.10
diff -u -r1.10 makefile.mk
--- openoffice.org.orig/binfilter/bf_linguistic/source/makefile.mk 19 Jul 2006 13:14:22 -0000 1.10
+++ openoffice.org/binfilter/bf_linguistic/source/makefile.mk 11 Mar 2007 12:48:23 -0000
@@ -83,16 +83,10 @@
$(CPPUHELPERLIB) \
$(UNOLIB) \
$(VOSLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
$(BFSVXLIB) \
$(LEGACYSMGRLIB) \
$(SALLIB) \
- $(UCBHELPERLIB) \
- $(UNOTOOLSLIB)
+ -lsoffice
# build DLL
SHL1LIBS= $(SLB)$/$(TARGET).lib
Index: bf_offmgr/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_offmgr/util/makefile.mk,v
retrieving revision 1.9
diff -u -r1.9 makefile.mk
--- openoffice.org.orig/binfilter/bf_offmgr/util/makefile.mk 14 Nov 2006 11:59:14 -0000 1.9
+++ openoffice.org/binfilter/bf_offmgr/util/makefile.mk 11 Mar 2007 12:48:23 -0000
@@ -81,19 +81,12 @@
SHL2STDLIBS+= \
$(BFSVXLIB) \
$(LEGACYSMGRLIB) \
- $(BASICLIB) \
$(BFGOODIESLIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
- $(VCLLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(COMPHELPERLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
$(VOSLIB) \
$(SALLIB) \
- $(SO2LIB)
+ -lsoffice
.IF "$(GUI)"=="WNT"
SHL2STDLIBS += $(LIBPRE) advapi32.lib
Index: bf_sc/util/makefile.mk
===================================================================
RCS file: /cvs/framework/binfilter/bf_sc/util/makefile.mk,v
retrieving revision 1.16
diff -u -r1.16 makefile.mk
--- openoffice.org.orig/binfilter/bf_sc/util/makefile.mk 14 Nov 2006 11:59:50 -0000 1.16
+++ openoffice.org/binfilter/bf_sc/util/makefile.mk 11 Mar 2007 12:48:24 -0000
@@ -81,26 +81,15 @@
# dynamic libraries
SHL1STDLIBS+= \
- $(BASICLIB) \
$(LEGACYSMGRLIB) \
- $(SO2LIB) \
- $(SVTOOLLIB) \
- $(SVLLIB) \
[...6456 lines suppressed...]
File gid_File_Lib_Spa
@@ -2049,13 +1987,22 @@
#endif
-STD_LIB_FILE_PATCH( gid_File_Lib_Svl, svl )
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svtools, svt )
SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH( gid_File_Lib_Svtmisc, svtmisc.uno )
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Svx, svx)
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_TextConversionDlgs, textconversiondlgs)
+File gid_File_Lib_Soffice
+ Name = "libsoffice.so";
+ Carrier = gid_Datacarrier;
+ Time = "0200";
+ Date = "29022004";
+ UnixRights = 444;
+ Styles = (PACKED,UNO_COMPONENT,PATCH);
+ Dir = gid_Dir_Program;
+ RegistryID = gid_Starregistry_Services_Rdb;
+End
+
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sw , sw)
STD_LIB_FILE_PATCH( gid_File_Lib_Swui, swui)
@@ -2104,10 +2051,6 @@
SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_Lib_Tinstrm,textinstream.uno)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Tk, tk )
-
-STD_LIB_FILE_PATCH( gid_File_Lib_Tools, tl )
-
SPECIAL_UNO_COMPONENT_LIB_FILE_PATCH(gid_File_Lib_Toutstrm,textoutstream.uno)
File gid_File_Lib_Tvhlp1
@@ -2134,17 +2077,6 @@
#endif
End
-File gid_File_Lib_Ucbhelper
- TXT_FILE_BODY;
- Dir = gid_Dir_Program;
- Styles = (PACKED,PATCH);
- #ifdef UNX
- Name = STRING(CONCAT3(libucbhelper3,COMID,UNXSUFFIX));
- #else
- Name = STRING(CONCAT3(ucbhelper3,COMID,.dll));
- #endif
-End
-
File gid_File_Lib_Ucpchelp1
TXT_FILE_BODY;
#ifdef UNX
@@ -2161,8 +2093,6 @@
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
#endif
-SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1)
-
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpftp1,ucpftp1)
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucphier1,ucphier1)
@@ -2242,8 +2172,6 @@
#endif
End
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Utl , utl)
-
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Uui, uui )
File gid_File_Lib_Uuresolver
@@ -2271,14 +2199,6 @@
STD_LIB_FILE_PATCH( gid_File_Lib_BaseGfx, basegfx )
-File gid_File_Lib_Vcl
- Name = LIBNAME(vcl);
- TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
- Dir = gid_Dir_Program;
- RegistryID = gid_Starregistry_Services_Rdb;
-End
-
#ifdef USE_PASF
#ifndef SYSTEM_PORTAUDIO
@@ -2346,18 +2266,9 @@
// STD_UNO_LIB_FILE( gid_File_Lib_Wrp, wrp)
-STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Xcr, xcr)
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Xmx , xmx)
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Xof , xof)
-File gid_File_Lib_Xo
- Name = LIBNAME(xo);
- TXT_FILE_BODY;
- Styles = (PACKED,UNO_COMPONENT,PATCH);
- Dir = gid_Dir_Program;
- RegistryID = gid_Starregistry_Services_Rdb;
-End
-
SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Xstor,xstor)
STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Xsltdlg, xsltdlg )
diff -ru scp2.orig/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/module_hidden_ooo.scp 2007-03-16 08:53:21.000000000 +0000
+++ openoffice.org/scp2/source/ooo/module_hidden_ooo.scp 2007-03-16 10:32:32.000000000 +0000
@@ -202,11 +202,6 @@
gid_File_Lib_Dbfile,
gid_File_Lib_Flat,
gid_File_Lib_Frm,
- gid_File_Lib_Fwe,
- gid_File_Lib_Fwi,
- gid_File_Lib_Fwk,
- gid_File_Lib_Fwl,
- gid_File_Lib_Go,
gid_File_Lib_Hyph,
gid_File_Lib_J,
gid_File_Lib_Lks,
@@ -222,40 +217,29 @@
gid_File_Lib_Sf_Prothdlr,
gid_File_Lib_Psp,
gid_File_Lib_Res,
- gid_File_Lib_Sb,
gid_File_Lib_Sch,
gid_File_Lib_Schd,
gid_File_Lib_Scn,
gid_File_Lib_Sd,
gid_File_Lib_Sdd,
gid_File_Lib_Sdui,
- gid_File_Lib_Sfx,
- gid_File_Lib_So,
- gid_File_Lib_Sot,
gid_File_Lib_Spa,
gid_File_Lib_Spell,
gid_File_Lib_Spl,
gid_File_Lib_Sts,
- gid_File_Lib_Svl,
- gid_File_Lib_Svtools,
gid_File_Lib_Svx,
gid_File_Lib_AVMedia,
gid_File_Lib_AVMediaWin,
gid_File_Lib_AVMediaGStreamer,
gid_File_Lib_BaseGfx,
gid_File_Lib_Sysdtrans,
+ gid_File_Lib_Soffice,
gid_File_Lib_Sw,
gid_File_Lib_TextConversionDlgs,
- gid_File_Lib_Tk,
- gid_File_Lib_Tools,
- gid_File_Lib_Utl,
gid_File_Lib_Uui,
- gid_File_Lib_Vcl,
- gid_File_Lib_Xcr,
gid_File_Lib_Xmlfa,
gid_File_Lib_Xmlfd,
gid_File_Lib_Xmx,
- gid_File_Lib_Xo,
gid_File_Lib_Xof,
gid_File_Lib_Xsltdlg,
gid_File_Lib_Xsltfilter,
@@ -268,7 +252,6 @@
gid_File_Lib_CppCanvas,
gid_File_Lib_Agg,
gid_File_Lib_Dbext,
- gid_File_Lib_Fwm,
gid_File_Lib_Lprx2,
gid_File_Lib_Lprxw,
gid_File_Lib_Tfu);
@@ -295,7 +278,6 @@
gid_File_Lib_Dlgprov,
gid_File_Lib_Stringresource,
gid_File_Lib_Ldapbe2,
- gid_File_Lib_Comphelper2,
gid_File_Lib_Cppu,
gid_File_Lib_Cppuhelper,
gid_File_Lib_Defreg,
@@ -324,7 +306,6 @@
gid_File_Lib_I18npool,
gid_File_Lib_I18nregexp,
gid_File_Lib_I18nsearch,
- gid_File_Lib_I18nisolang,
gid_File_Lib_I18nutil,
gid_File_Lib_Icudata,
gid_File_Lib_Icui18n,
@@ -412,10 +393,8 @@
gid_File_Lib_Sndfile,
gid_File_Lib_Tvhlp1,
gid_File_Lib_Ucb1,
- gid_File_Lib_Ucbhelper,
gid_File_Lib_Ucpchelp1,
gid_File_Lib_Ucpdav1,
- gid_File_Lib_Ucpfile1,
gid_File_Lib_Ucpftp1,
gid_File_Lib_Ucphier1,
gid_File_Lib_Ucppkg1,
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1110
retrieving revision 1.1111
diff -u -r1.1110 -r1.1111
--- openoffice.org.spec 15 Mar 2007 19:42:08 -0000 1.1110
+++ openoffice.org.spec 16 Mar 2007 11:24:18 -0000 1.1111
@@ -1,14 +1,16 @@
%define oootag OOF680
%define ooomilestone 12
-%define rh_rpm_release 1
+%define rh_rpm_release 1.0
# gcc#19664#
%define stlvisibilityfcked 1
# undef to get english only and no-langpacks for a quick smoketest build
-%define langpacks 1
+%define langpacks 0
%define gtkprintui 1
+%define linkopt 1
+
%if %{stlvisibilityfcked}
%define stlflags --with-stlport4
%else
@@ -23,7 +25,8 @@
%define ooo_base_name %{oootag}_m%{ooomilestone}
-ExclusiveArch: ppc %{ix86} x86_64
+#ExclusiveArch: ppc %{ix86} x86_64
+ExclusiveArch: %{ix86}
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
Version: 2.2.0
@@ -128,6 +131,9 @@
Patch71: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
Patch72: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
Patch73: openoffice.org-2.2.0.rh232389.solenv.tango.patch
+%if %{linkopt}
+Patch74: openoffice.org-2.2.0.ooo53397.linkopt.patch
+%endif
%define instdir %{_libdir}/openoffice.org
@@ -1048,6 +1054,9 @@
%patch71 -p1 -b .ooo75190.shell.newrecentlyused.patch
%patch72 -p1 -b .ooo75329.xdguserdir.patch
%patch73 -p1 -b .rh232389.solenv.tango.patch
+%if %{linkopt}
+%patch74 -p1 -b .ooo53397.linkopt.patch
+%endif
cp %{SOURCE1} extras/source/database/evolocal.odb
@@ -1107,11 +1116,15 @@
#start of jakub based suggestion on prelink optimization
cd ../desktop/source/app
+%if ! %{linkopt}
sed -i -e "s/OBJ/SLO/" makefile.mk
dmake
+%endif
cd ../../util
+%if ! %{linkopt}
`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
+%endif
`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
@@ -1134,8 +1147,10 @@
echo - ---dump log end---
dmake openoffice_en-US
fi
+%if ! %{linkopt}
cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
+%endif
cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
@@ -1598,7 +1613,6 @@
%{instdir}/program/libcached1.so
%{instdir}/program/libcanvastools680*.so
%{instdir}/program/libcollator_data.so
-%{instdir}/program/libcomphelp4gcc3.so
%{instdir}/program/libcppcanvas680*.so
%{instdir}/program/libcppu.so
%{instdir}/program/libcppu.so.3
@@ -1636,7 +1650,6 @@
%{instdir}/program/libeti680*.so
%{instdir}/program/libexp680*.so
%{instdir}/program/libfwm680*.so
-%{instdir}/program/libi18nisolang*.so
%{instdir}/program/libicd680*.so
%{instdir}/program/libicg680*.so
%{instdir}/program/libidx680*.so
@@ -1656,12 +1669,7 @@
%{instdir}/program/libfilterconfig1.so
%{instdir}/program/libflat680*.so
%{instdir}/program/libfrm680*.so
-%{instdir}/program/libfwe680*.so
-%{instdir}/program/libfwi680*.so
-%{instdir}/program/libfwk680*.so
-%{instdir}/program/libfwl680*.so
%{instdir}/program/libgcc3_uno.so
-%{instdir}/program/libgo680*.so
%{instdir}/program/libhsqldb2.so
%{instdir}/program/libhyphen680*.so
%{instdir}/program/libi18nregexpgcc3.so
@@ -1708,7 +1716,6 @@
%{instdir}/program/libsalhelper3gcc3.so
%{instdir}/program/libsalhelpergcc3.so
%{instdir}/program/libsalhelpergcc3.so.3
-%{instdir}/program/libsb680*.so
%{instdir}/program/libsch680*.so
%{instdir}/program/libschd680*.so
%{instdir}/program/libscn680*.so
@@ -1718,9 +1725,6 @@
%{instdir}/program/libsdbt680*so
%{instdir}/program/libsdd680*.so
%{instdir}/program/libsdui680*.so
-%{instdir}/program/libsfx680*.so
-%{instdir}/program/libso680*.so
-%{instdir}/program/libsot680*.so
%{instdir}/program/libspa680*.so
%{instdir}/program/libspell680*.so
%{instdir}/program/libspl680*.so
@@ -1728,21 +1732,15 @@
%{instdir}/program/libstore.so
%{instdir}/program/libstore.so.3
%{instdir}/program/libsts680*.so
-%{instdir}/program/libsvl680*.so
-%{instdir}/program/libsvt680*.so
%{instdir}/program/libsvx680*.so
%{instdir}/program/libsw680*.so
%{instdir}/program/libtextconv_dict.so
%{instdir}/program/libtextconversiondlgs680*.so
%{instdir}/program/libtfu680*.so
-%{instdir}/program/libtk680*.so
-%{instdir}/program/libtl680*.so
%{instdir}/program/libtvhlp1.so
%{instdir}/program/libucb1.so
-%{instdir}/program/libucbhelper3gcc3.so
%{instdir}/program/libucpchelp1.so
%{instdir}/program/libucpdav1.so
-%{instdir}/program/libucpfile1.so
%{instdir}/program/libucpftp1.so
%{instdir}/program/libucphier1.so
%{instdir}/program/libucppkg1.so
@@ -1757,16 +1755,12 @@
%{instdir}/program/libunoxml680*.so
%{instdir}/program/libupdchk680*.so
%{instdir}/program/liburp_uno.so
-%{instdir}/program/libutl680*.so
%{instdir}/program/libuui680*.so
-%{instdir}/program/libvcl680*.so
%{instdir}/program/libvclplug_*680*.so
%{instdir}/program/libvos3gcc3.so
-%{instdir}/program/libxcr680*.so
%{instdir}/program/libxmlfa680*.so
%{instdir}/program/libxmlfd680*.so
%{instdir}/program/libxmx680*.so
-%{instdir}/program/libxo680*.so
%{instdir}/program/libxof680*.so
%{instdir}/program/libxsec_fw.so
%{instdir}/program/libxsec_xmlsec.so
@@ -2127,7 +2121,30 @@
%dir %{_datadir}/mimelnk
%dir %{_datadir}/mimelnk/application
%{_datadir}/mimelnk/application/*extension*
-
+#linkopt libs
+%if ! %{linkopt}
+%{instdir}/program/libcomphelp4gcc3.so
+%{instdir}/program/libucbhelper3gcc3.so
+%{instdir}/program/libi18nisolang*.so
+%{instdir}/program/libfwe680*.so
+%{instdir}/program/libfwi680*.so
+%{instdir}/program/libfwk680*.so
+%{instdir}/program/libfwl680*.so
+%{instdir}/program/libgo680*.so
+%{instdir}/program/libsb680*.so
+%{instdir}/program/libso680*.so
+%{instdir}/program/libsfx680*.so
+%{instdir}/program/libsot680*.so
+%{instdir}/program/libsvl680*.so
+%{instdir}/program/libsvt680*.so
+%{instdir}/program/libtk680*.so
+%{instdir}/program/libtl680*.so
+%{instdir}/program/libucpfile1.so
+%{instdir}/program/libutl680*.so
+%{instdir}/program/libvcl680*.so
+%{instdir}/program/libxcr680*.so
+%{instdir}/program/libxo680*.so
+%endif
%post core
update-desktop-database -q %{_datadir}/applications
@@ -2599,6 +2616,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Fri Mar 16 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-12.1.0
+- link opt testbuild
+
* Thu Mar 15 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.0-12.1
- Resolves: rhbz#232389 enable tango theme
- support xdguserdir translated user dirs
More information about the fedora-cvs-commits
mailing list