Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 82678 Details for
Bug 124660
openoffice does not build with gcc-4.1
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Hack to disable pyuno stuff to workaround segfault.
disable-python-uno-bridge.diff (text/plain), 5.83 KB, created by
Hanno Zysik (geki)
on 2006-03-20 09:30:55 UTC
(
hide
)
Description:
Hack to disable pyuno stuff to workaround segfault.
Filename:
MIME Type:
Creator:
Hanno Zysik (geki)
Created:
2006-03-20 09:30:55 UTC
Size:
5.83 KB
patch
obsolete
>--- instsetoo_native/util/makefile.mk.orig 2006-03-20 00:46:27.000000000 +0100 >+++ instsetoo_native/util/makefile.mk 2006-03-20 00:47:52.000000000 +0100 >@@ -75,12 +75,7 @@ > > .INCLUDE: target.mk > >-LOCALPYFILES= \ >- $(BIN)$/uno.py \ >- $(BIN)$/unohelper.py \ >- $(BIN)$/pythonloader.py \ >- $(BIN)$/pythonscript.py \ >- $(BIN)$/mailmerge.py >+LOCALPYFILES= > > # PKGFORMAT taken from environment. See possible > # values below. >--- postprocess/prj/build.lst.orig 2006-03-19 17:53:50.000000000 +0100 >+++ postprocess/prj/build.lst 2006-03-19 17:54:11.000000000 +0100 >@@ -1,4 +1,4 @@ >-po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools NULL >+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:readlicense_oo SO:top unodevtools NULL > po postprocess usr1 - all po_mkout NULL > po postprocess\checkxml nmake - all po_checkxml NULL > po postprocess\checkdeliver nmake - all po_checkdlv NULL >--- scp2/prj/build.lst.orig 2006-03-20 11:41:25.000000000 +0100 >+++ scp2/prj/build.lst 2006-03-20 11:41:50.000000000 +0100 >@@ -13,7 +13,6 @@ > cp scp2\source\lingu nmake - all cp_lingu cp_langmacros NULL > cp scp2\source\math nmake - all cp_math cp_langmacros NULL > cp scp2\source\ooo nmake - all cp_ooo cp_langmacros NULL >-cp scp2\source\python nmake - all cp_python cp_langmacros NULL > cp scp2\source\quickstart nmake - all cp_quickstart cp_langmacros NULL > cp scp2\source\sdkoo nmake - all cp_sdkoo cp_langmacros NULL > cp scp2\source\testtool nmake - all cp_testtool cp_langmacros NULL >@@ -22,4 +21,4 @@ > cp scp2\source\xsltfilter nmake - all cp_xsltfilter cp_langmacros NULL > cp scp2\source\winexplorerext nmake - all cp_winexplorerext cp_langmacros NULL > cp scp2\source\ure nmake - all cp_ure cp_langmacros NULL >-cp scp2\util nmake - all cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo NULL >+cp scp2\util nmake - all cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_lingu cp_math cp_ooo cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo NULL >--- scp2/source/javafilter/file_javafilter.scp.orig 2006-03-20 12:15:42.000000000 +0100 >+++ scp2/source/javafilter/file_javafilter.scp 2006-03-20 12:17:07.000000000 +0100 >@@ -104,7 +104,5 @@ > STD_JAR_FILE_PATCH( gid_File_Jar_Aportisdoc, aportisdoc ) > STD_JAR_FILE( gid_File_Jar_Pexcel, pexcel ) > STD_JAR_FILE( gid_File_Jar_Pocketword, pocketword ) >-STD_JAR_FILE_PATCH( gid_File_Jar_Xmerge, xmerge ) >-UNO_JAR_FILE_PATCH( gid_File_Jar_Xmergebridge, XMergeBridge ) > > #endif >--- scp2/util/makefile.mk.orig 2006-03-20 11:42:12.000000000 +0100 >+++ scp2/util/makefile.mk 2006-03-20 11:45:33.000000000 +0100 >@@ -84,12 +84,7 @@ > module_lingu.par \ > file_lingu.par \ > module_xsltfilter.par \ >- file_xsltfilter.par \ >- module_python.par \ >- module_python_mailmerge.par \ >- file_python.par \ >- profileitem_python.par \ >- shortcut_python.par >+ file_xsltfilter.par > > .IF "$(SOLAR_JAVA)"!="" > SCP1FILES += \ >@@ -197,11 +192,7 @@ > module_lingu.par \ > file_lingu.par \ > module_xsltfilter.par \ >- file_xsltfilter.par \ >- module_python.par \ >- module_python_mailmerge.par \ >- file_python.par \ >- profileitem_python.par >+ file_xsltfilter.par > > .IF "$(SOLAR_JAVA)"!="" > SCP2FILES += \ >--- testtools/prj/build.lst.orig 2006-03-19 17:53:42.000000000 +0100 >+++ testtools/prj/build.lst 2006-03-19 17:54:29.000000000 +0100 >@@ -1,6 +1,5 @@ >-tt testtools : cpputools io remotebridges stoc javaunohelper pyuno NULL >+tt testtools : cpputools io remotebridges stoc javaunohelper NULL > tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_javaTestObjs NULL > tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl NULL > tt testtools\source\bridgetest\idl nmake - all tt_bridgetest_idl NULL > tt testtools\com\sun\star\comp\bridge nmake - all tt_javaTestObjs tt_bridgetest_idl NULL >-tt testtools\source\bridgetest\pyuno nmake - all tt_pyuno tt_bridgetest NULL
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 124660
:
81136
|
81174
| 82678 |
82680
|
82681