diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-08-28 08:29:56 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-08-28 08:29:56 +0000 |
| commit | 7756c4ae4af8b8a5c430bc82a252954ffda2801f (patch) | |
| tree | c6f900223b8c51f80d6c5bca2e31032f072cfa0b /editors/openoffice-1.1-devel/files | |
| parent | Update to 2.2.6.1. (diff) | |
1. remove duplicated helpcontent_01.tgz in DISTFILES
section
2. update to SRX645_m75 of 20050816 version (base of rc3)
3. add #i22253# (bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx)
patch to make it work
4. No longer needs DISPLAYHACK
5. better generate.pl
Notes
Notes:
svn path=/head/; revision=141050
Diffstat (limited to 'editors/openoffice-1.1-devel/files')
| -rw-r--r-- | editors/openoffice-1.1-devel/files/generate.pl | 10 | ||||
| -rw-r--r-- | editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx | 21 |
2 files changed, 26 insertions, 5 deletions
diff --git a/editors/openoffice-1.1-devel/files/generate.pl b/editors/openoffice-1.1-devel/files/generate.pl index fefeb8158d98..9c958192fc6c 100644 --- a/editors/openoffice-1.1-devel/files/generate.pl +++ b/editors/openoffice-1.1-devel/files/generate.pl @@ -1,12 +1,13 @@ #!/usr/bin/perl - # generate full build shell script for OpenOffice.org # Whom: Maho Nakata <maho@FreeBSD.org> # $FreeBSD$ print "#!/bin/csh\n"; -print "/usr/bin/time make WITH_CCACHE=yes deinstall clean package package-rename solver sdk deinstall clean >& log.en\n"; -print "/usr/bin/time make ALL_LOCALIZED_LANGS=yes >& log.all\n"; +print "make deinstall clean\n"; +print "/usr/bin/time -h make WITH_CCACHE=yes install package package-rename solver sdk deinstall clean >& log.en\n"; +print "rm work/.configure* work/.build* \n"; +print "/usr/bin/time -h make ALL_LOCALIZED_LANGS=yes >& log.all\n"; open ( FILE, "< Makefile.localized") ; while(<FILE>){ @@ -14,8 +15,7 @@ while(<FILE>){ @tmp2=split ('"',$tmp[3]); if ( $tmp[1] eq "\${LOCALIZED_LANG}") { $LANG=$tmp2[1]; print "make TWEAK_L10N=yes LOCALIZED_LANG=$LANG pre-everything\n"; - print "/usr/bin/time make LOCALIZED_LANG=$LANG WITH_CCACHE=yes deinstall package package-rename deinstall >& log.$LANG\n"; + print "/usr/bin/time -h make LOCALIZED_LANG=$LANG WITH_CCACHE=yes package package-rename deinstall >& log.$LANG\n"; } } close FILE; - diff --git a/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx new file mode 100644 index 000000000000..11088e05cd62 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx @@ -0,0 +1,21 @@ +Issutracker : #i22253# +CWS : N/A +Author : <mrauch@openoffice.org> (JCA) +Description : + +Index: bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx +=================================================================== +RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx,v +retrieving revision 1.4 +diff -u -r1.4 except.cxx +--- bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 28 Apr 2003 16:41:25 -0000 1.4 ++++ bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx 13 Aug 2005 04:40:14 -0000 +@@ -182,7 +182,7 @@ + buf.append( 'E' ); + + OString symName( buf.makeStringAndClear() ); +- rtti = (type_info *)dlsym( m_hApp, symName.getStr() ); ++ rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() ); + + if (rtti) + { |