Apache OpenOffice (AOO) Bugzilla – Issue 6078
OOO_STABLE_1/X11+Aqua: scp needs patch to build
Last modified: 2004-05-19 16:56:05 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.
Created attachment 2053 [details] cd $SRCROOT/scp; patch -p0 < scp.OOO_STABLE_1.062302.patch
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
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
Approved. (HR + IS)
Created attachment 2950 [details] Fixes OOO setup program errors. Supercedes previous patch.
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
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
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)
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.
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
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
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
added approval pending keyword
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
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
Changed to merge_pending. Merge: 1) scp.OOO_STABLE_1_PORTS.092902.patch 2) readlicense.OOO_STABLE_1_PORTS.092702.patch Dan
code fixed or patches are obsolete. closing
.