diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-08-13 11:32:35 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-08-13 11:32:35 +0000 |
| commit | df1f3aaff68d2de1a67cfa00981fa16afe4aa926 (patch) | |
| tree | a767f452824afec4ac167bc302926a6682060bc4 /editors/openoffice-1.1 | |
| parent | Fix distfile fetching. (diff) | |
1. if we set CPUTYPE in /etc/make.conf, OOo build fails [1].
2. openoffice-1.1 crashes for second invocation; some file is missing.
this is exactly same as #i22253#, and fortunately OOo worked for some
older version I don't remember.
PR: 84787 [2]
Submitted by: Jack L.[1], achix mantzix <achix@smadev.internal.net> [2]
and Jens Ressack <rehsack@liwing.de> [2]
Approved by: portmgr(clement)
Notes
Notes:
svn path=/head/; revision=140871
Diffstat (limited to 'editors/openoffice-1.1')
| -rw-r--r-- | editors/openoffice-1.1/Makefile | 3 | ||||
| -rw-r--r-- | editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx | 21 |
2 files changed, 23 insertions, 1 deletions
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index b653866a600b..74710b11e132 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openoffice -PORTVERSION= 1.1.5.rc2 +PORTVERSION= 1.1.5.rc2.1 CATEGORIES+= editors MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/rc/1.1.5rc2/&,} \ ${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:moz \ @@ -43,6 +43,7 @@ USE_PERL5= yes USE_BISON= yes USE_GMAKE= yes USE_REINPLACE= yes +WITHOUT_CPU_CFLAGS= true .if !defined(WITHOUT_JAVA) USE_JAVA= yes diff --git a/editors/openoffice-1.1/files/patch-bridges+source+cpp_uno+gcc3_freebsd_intel+except.cxx b/editors/openoffice-1.1/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/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) + { |