Issue 63732 - external STLport fixes
Summary: external STLport fixes
Status: CLOSED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: code (show other issues)
Version: 680m161
Hardware: All Linux, all
: P3 Trivial (vote)
Target Milestone: OOo 2.2
Assignee: jens-heiner.rechtien
QA Contact: Unknown
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-03-28 17:24 UTC by geki
Modified: 2006-11-27 17:38 UTC (History)
2 users (show)

See Also:
Issue Type: PATCH
Latest Confirmation in: ---
Developer Difficulty: ---


Attachments
fix includes (1.69 KB, patch)
2006-03-28 17:25 UTC, geki
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this issue.
Description geki 2006-03-28 17:24:40 UTC
Topic says it.
Comment 1 geki 2006-03-28 17:25:15 UTC
Created attachment 35314 [details]
fix includes
Comment 2 Martin Hollmichel 2006-04-10 13:40:11 UTC
reassign for review.
Comment 3 kaib 2006-04-12 14:39:07 UTC
Looks good to me. I'm surprised it has gone through earlier .. :-)
Comment 4 jens-heiner.rechtien 2006-04-12 17:17:51 UTC
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.
Comment 5 geki 2006-04-12 17:44:07 UTC
Ok. That new.h -> new change is in CWS tl18, see bug 60828
Comment 6 jens-heiner.rechtien 2006-04-18 17:50:56 UTC
@geki: changes will go into hr33. 
Comment 7 geki 2006-04-21 14:47:01 UTC
@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 )
Comment 8 jens-heiner.rechtien 2006-04-21 14:56:55 UTC
@geki: will have a look at it
Comment 9 geki 2006-04-30 16:17:05 UTC
@hr: Would it be ok for you to include
http://go-oo.org/patches/src680/dont-copy-and-install-stlport.diff into CWS hr33?
Comment 10 jens-heiner.rechtien 2006-05-02 10:58:58 UTC
@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.
Comment 11 geki 2006-05-02 11:29:03 UTC
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.
Comment 12 jens-heiner.rechtien 2006-05-03 13:31:59 UTC
@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.
Comment 13 jens-heiner.rechtien 2006-05-03 13:35:41 UTC
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
Comment 14 jens-heiner.rechtien 2006-05-03 13:37:09 UTC
set target milestone to OOo-2.0.4
Comment 15 geki 2006-05-03 16:45:22 UTC
@hr: It is ok.

I just hoped we could get the trivial fixes into CWS/upstream already. :)
Comment 16 geki 2006-05-08 00:04:34 UTC
verified
Comment 17 jens-heiner.rechtien 2006-11-20 16:08:13 UTC
Close issue.
Comment 18 jens-heiner.rechtien 2006-11-20 16:14:31 UTC
accidentally closed, reopen
Comment 19 jens-heiner.rechtien 2006-11-20 16:15:14 UTC
resolve issue
Comment 20 jens-heiner.rechtien 2006-11-20 16:16:05 UTC
set to verified.
Comment 21 Martin Hollmichel 2006-11-21 10:41:08 UTC
set target to 2.2
Comment 22 jens-heiner.rechtien 2006-11-27 17:38:28 UTC
Closed.