Issue 6078

Summary: OOO_STABLE_1/X11+Aqua: scp needs patch to build
Product: porting Reporter: ed
Component: codeAssignee: ed
Status: CLOSED FIXED QA Contact: issues@porting <issues>
Severity: Trivial    
Priority: P3 CC: dan, issues, jens-heiner.rechtien
Version: OOo 1.0.0Keywords: merge_pending
Target Milestone: OOo 1.0.4   
Hardware: Mac   
OS: Mac OS X, all   
Issue Type: PATCH Latest Confirmation in: ---
Developer Difficulty: ---
Issue Depends on: 5900, 7811, 7949    
Issue Blocks: 2588    
Attachments:
Description Flags
cd $SRCROOT/scp; patch -p0 < scp.OOO_STABLE_1.062302.patch
none
** supercedes previous patch, requires fresh copy of scp ** to apply: rm -rf $SRCROOT/scp; cd $SRCROOT; cvs co -rOOO_STABLE_1 scp; cd scp; patch -p0 < scp.OOO_STABLE_1.062402.patch
none
Fixes OOO setup program errors. Supercedes previous patch.
none
Fixes NO_STLPORT problem when building tools/bootstrp. Supercedes previous patch. Apply to clean checkout of solenv using the following commands: cd $SRC_ROOT/solenv ; patch -p0 < /path/to/patch/file
none
Fixes pthread_detach problem on Mac OS X 10.2. Supercedes previous patch. Apply to clean checkout of sal using the following commands: cd $SRC_ROOT/sal; patch -p0 < /path/to/patch/file (text/plain)
none
Adds bundling of libdl.0.dylib built by patches in issue 7949. Supercedes previous patch. Apply to clean checkout of scp using the following commands: cd $SRC_ROOT/scp ; patch -p0 < /path/to/patch/file
none
Fixes missing license and readme files in Mac OS X setup. Apply to clean checkout of readlicense using the following commands: cd $SRC_ROOT/readlicense ; patch -p0 < /path/to/patch/file
none
Adds back moz libraries. Supercedes previous patch. Apply to clean checkout of scp using the following commands: cd $SRC_ROOT/scp ; patch -p0 < /path/to/patch/file none

Description ed 2002-06-23 21:24:08 UTC 
This patch allows SCP to successfully use the CONCAT7 macro and to
deliver shared libraries with either the extensions .dylib or .so on a
unix platform.

*** THIS PATCH SHOULD BE CHECKED AS XPLATFORM COMPATIBLE BEFORE COMMITTING ***

It requires the product.OOO_STABLE_1.062302.patch file to be applied
from Issue 5900.
Comment 1 ed 2002-06-23 21:24:45 UTC 
Created attachment 2053 [details]
cd $SRCROOT/scp; patch -p0 < scp.OOO_STABLE_1.062302.patch
Comment 2 ed 2002-06-24 09:50:36 UTC 
Created attachment 2058 [details]
** supercedes previous patch, requires fresh copy of scp **  to apply:  rm -rf $SRCROOT/scp; cd $SRCROOT; cvs co -rOOO_STABLE_1 scp; cd scp; patch -p0 < scp.OOO_STABLE_1.062402.patch
Comment 3 ed 2002-06-24 09:57:41 UTC 
the most recent patch adds in appropriate periods and removes
quotations from within the CONCAT# macros that wouldn't be properly
applied and result in mislocated files when building instsetoo
Comment 4 jens-heiner.rechtien 2002-08-06 12:29:26 UTC 
Approved. (HR + IS)
Comment 5 pluby 2002-09-24 00:10:26 UTC 
Created attachment 2950 [details]
Fixes OOO setup program errors. Supercedes previous patch.
Comment 6 pluby 2002-09-24 00:13:29 UTC 
Lastest patch - scp.OOO_STABLE_1_PORTS.092302.patch adds installation
of libstaticmxp.dylib to the setup program and eliminates installation
of the 2 "moz" libraries. The patch should be applied to a clean
checkout using the following commands:

  cd $SRCROOT/scp ; patch -p0 < /path/to/patch/file
Comment 7 pluby 2002-09-28 18:56:13 UTC 
Created attachment 2989 [details]
Fixes NO_STLPORT problem when building tools/bootstrp. Supercedes previous patch. Apply to clean checkout of solenv using the following commands: cd $SRC_ROOT/solenv ; patch -p0 < /path/to/patch/file
Comment 8 pluby 2002-09-28 18:57:58 UTC 
Created attachment 2990 [details]
Fixes pthread_detach problem on Mac OS X 10.2. Supercedes previous patch. Apply to clean checkout of sal using the following commands: cd $SRC_ROOT/sal; patch -p0 < /path/to/patch/file (text/plain)
Comment 9 pluby 2002-09-28 19:02:05 UTC 
Ignore the following 2 patches. I accidently posted these to this
issue instead of the correct issue (issue 7458):

solenv.OOO_STABLE_1_PORTS.092702.patch
sal.OOO_STABLE_1_PORTS.092802.patch

If only there was a way to delete these.
Comment 10 pluby 2002-09-28 19:11:05 UTC 
Created attachment 2993 [details]
Adds bundling of libdl.0.dylib built by patches in issue 7949. Supercedes previous patch. Apply to clean checkout of scp using the following commands: cd $SRC_ROOT/scp ; patch -p0 < /path/to/patch/file
Comment 11 pluby 2002-09-28 19:15:25 UTC 
Created attachment 2994 [details]
Fixes missing license and readme files in Mac OS X setup. Apply to clean checkout of readlicense using the following commands: cd $SRC_ROOT/readlicense ; patch -p0 < /path/to/patch/file
Comment 12 pluby 2002-09-30 18:13:56 UTC 
Created attachment 3021 [details]
Adds back moz libraries. Supercedes previous patch. Apply to clean checkout of scp using the following commands: cd $SRC_ROOT/scp ; patch -p0 < /path/to/patch/file
Comment 13 ed 2002-10-12 14:15:31 UTC 
added approval pending keyword
Comment 14 khendricks 2002-11-21 14:26:41 UTC 
 Hi, 
 
Both approved. 
 
This patch is required to be in place when the product patches go in 
otherwise breakage will happen 
 
(i..e no UNXSUFFIX will exist for any unx platofrm until this patch 
goes in). 
 
Kevin
Comment 15 fa 2002-11-21 22:34:13 UTC 
Committed 
readlicense.OOO_STABLE_1_PORTS.092702.patch
scp.OOO_STABLE_1_PORTS.092902.patch

to _PORTS.  Note that I modified the scp patch and added support for
libdtransaqua for #ifdef QUARTZ rather than libdtransX11.

Dan
Comment 16 fa 2002-11-21 23:13:25 UTC 
Changed to merge_pending.

Merge:
1) scp.OOO_STABLE_1_PORTS.092902.patch
2) readlicense.OOO_STABLE_1_PORTS.092702.patch

Dan
Comment 17 fa 2004-05-19 16:55:53 UTC 
code fixed or patches are obsolete.  closing
Comment 18 fa 2004-05-19 16:56:05 UTC 
.