Apache OpenOffice (AOO) Bugzilla – Issue 63732
external STLport fixes
Last modified: 2006-11-27 17:38:28 UTC
Topic says it.
Created attachment 35314 [details] fix includes
reassign for review.
Looks good to me. I'm surprised it has gone through earlier .. :-)
I'll try the fixes on hr33. Most of them are certainly OK, but there was one caveat regarding <new> vs <new.h> on one of the more broken platforms. I just can't remember what is was.
Ok. That new.h -> new change is in CWS tl18, see bug 60828
@geki: changes will go into hr33.
@hr: Any chance to have a look at bug 63770. Especially the patch: http://ooo.ximian.com/patches/src680/system-stlport5.diff There are some trivial fixes for system STLport5 support. ( iterator <-> const_iterator changes )
@geki: will have a look at it
@hr: Would it be ok for you to include http://go-oo.org/patches/src680/dont-copy-and-install-stlport.diff into CWS hr33?
@geki: No problem, but I don't understand why "USE_SYSTEM_STL" is not enough to trigger the system stl approach. With other words I do not really like the use of "STLPORT4" in the "or" statement.
In scp2 USE_SYSTEM_STL triggers whether or not to install stlport libraries. 1. USE_SYSTEM_STL is set if '--without-stlport4' is configured. This uses gcc stl. 2. STLPORT4 is set if '--with-stlport4=/usr' is configured. This uses system STLport. In both cases OOo should not ship own stlport libraries if you got them on the system already. Just saw I checked the STLPORT4 in a bad way. It should be: "$(STLPORT4)" != "NO_STLPORT4" Fixed in ooo-build.
@geki: I see. The configure variable is a terrible misnomer (NO_STLPORT4) implies for me no STLport4 at all, not just no system provided stlport4. Spawned issue #65036 to rename it to something more sensible.
Patch 1 (includes) and 3 (installation) integrated in hr33. I did not include the changes for STLport5 (patch2) in hr33, this should be done via issue #63770. @geki: Hope this is OK
set target milestone to OOo-2.0.4
@hr: It is ok. I just hoped we could get the trivial fixes into CWS/upstream already. :)
verified
Close issue.
accidentally closed, reopen
resolve issue
set to verified.
set target to 2.2
Closed.