Issue 5936 - OOO_STABLE_1/X11+Aqua: setup2 needs patch to build
Summary: OOO_STABLE_1/X11+Aqua: setup2 needs patch to build
Status: CLOSED FIXED
Alias: None
Product: porting
Classification: Code
Component: code (show other issues)
Version: OOo 1.0.0
Hardware: Mac Mac OS X, all
: P3 Trivial (vote)
Target Milestone: OOo 1.0.4
Assignee: ed
QA Contact: issues@porting
URL:
Keywords: merge_pending
Depends on:
Blocks: 2588
  Show dependency tree
 
Reported: 2002-06-18 08:08 UTC by ed
Modified: 2004-05-19 16:54 UTC (History)
3 users (show)

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


Attachments
cd $SRCROOT/setup2; patch -p0 < setup2.OOO_STABLE_1.061702.patch (12.42 KB, patch)
2002-06-18 08:08 UTC, ed
no flags Details | Diff
Supercedes previous patch. Apply by executing: cd $SRC_ROOT/setup2 ; patch -p0 < /path/to/patch/file (12.82 KB, patch)
2002-09-25 22:59 UTC, pluby
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this issue.
Description ed 2002-06-18 08:08:13 UTC
setup2 needs a patch to fix up some OS X specific problems with source file
delivery, aqua vs unx guibase, etc.  There was some support in setup2 on the
branch, but not all.

* THIS PATCH SHOULD BE VERIFIED AS CROSS PLATFORM SAFE BEFORE COMMITTING *

While I did my best, I don't have another unix to test out on and verify I
didn't mistakenly get any .IFs in the makefiles wrong.
Comment 1 ed 2002-06-18 08:08:53 UTC
Created attachment 2009 [details]
cd $SRCROOT/setup2; patch -p0 < setup2.OOO_STABLE_1.061702.patch
Comment 2 jens-heiner.rechtien 2002-08-05 18:06:15 UTC
Hi Ed and Dan,

Makefile.rc is obsolete, we should remove it from 
OOO_STABLE_1_PORTS. No need to include it into the patch.

The hardcoding of "test" in the shell scripts is not the right thing 
to do, see issue #6160#. I think we should remove it completely.

Let's postpone this one, I'll take care of the shell script issue.

Heiner
Comment 3 pluby 2002-09-25 22:59:29 UTC
Created attachment 2964 [details]
Supercedes previous patch. Apply by executing: cd $SRC_ROOT/setup2 ;  patch  -p0 < /path/to/patch/file
Comment 4 pluby 2002-09-25 23:01:04 UTC
Latest patch reduces the number of "*** malloc" warnings that are
generated by the setup program
Comment 5 ed 2002-10-12 14:31:41 UTC
Added keyword approval_pending
Comment 6 khendricks 2002-11-21 14:03:35 UTC
Approved 
 
Kevin 
  
Comment 7 fa 2002-11-21 22:45:30 UTC
092502 patch committed to _PORTS.

Dan
Comment 8 fa 2002-11-21 23:13:58 UTC
Changed to merge_pending.

Merge:
1) setup2.OOO_STABLE_1_PORTS.092502.patch

Dan
Comment 9 fa 2004-05-19 16:54:14 UTC
patch is obsolete or code ahs been fixed.  closing
Comment 10 fa 2004-05-19 16:54:24 UTC
.
Comment 11 fa 2004-05-19 16:54:31 UTC
.