diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-06-15 07:16:17 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-06-15 07:16:17 +0000 |
commit | 611d847cdbdd182c3b9f3aa8bd12195e4373899a (patch) | |
tree | 13335e6640520f1860e8174edc0d9ec6f18287ba /moz | |
parent | 55e032bc26c7c2dca63ebb8ac69b868ca6a92c3e (diff) |
INTEGRATION: CWS macosx08 (1.2.10); FILE MERGED
2005/06/04 13:31:06 ericb 1.2.10.3: #i48810# correct fix for mozilla build on Mac OSX when a .mozconfig already exists in HOME
2005/05/23 22:24:34 ericb 1.2.10.2: #i48810# new patch lighter for Mozilla build environment on Mac OSX
2005/05/22 22:16:43 ericb 1.2.10.1: #i48810# Mozilla 1.7.5 can be build with this patch on Mac OSX
Diffstat (limited to 'moz')
-rw-r--r-- | moz/mozilla-source-1.7.5.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/moz/mozilla-source-1.7.5.patch b/moz/mozilla-source-1.7.5.patch index 04884776ca5c..f61e12be7342 100644 --- a/moz/mozilla-source-1.7.5.patch +++ b/moz/mozilla-source-1.7.5.patch @@ -1,3 +1,25 @@ +*** misc/mozilla/build/autoconf/mozconfig-find Fri Jul 16 20:13:24 2004 +--- misc/build/mozilla/build/autoconf/mozconfig-find Sat Jun 4 14:56:18 2005 +*************** +*** 51,60 **** + $topsrcdir/.mozconfig \ + $topsrcdir/mozconfig \ + $topsrcdir/mozconfig.sh \ +! $topsrcdir/myconfig.sh \ +! $HOME/.mozconfig \ +! $HOME/.mozconfig.sh \ +! $HOME/.mozmyconfig.sh + do + if test -f $_config; then + echo $_config; +--- 51,57 ---- + $topsrcdir/.mozconfig \ + $topsrcdir/mozconfig \ + $topsrcdir/mozconfig.sh \ +! $topsrcdir/myconfig.sh + do + if test -f $_config; then + echo $_config; diff -ru misc/mozilla/gfx/idl/nsIFreeType2.idl misc/build/mozilla/gfx/idl/nsIFreeType2.idl --- misc/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-15 21:09:33.000000000 -0400 +++ misc/build/mozilla/gfx/idl/nsIFreeType2.idl 2005-01-09 13:23:32.968750000 -0500 |