1 |
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig |
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig |
2 |
--- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969 |
--- mozilla-orig/.mozconfig 1969-12-31 19:00:00.000000000 -0500 |
3 |
+++ mozilla/.mozconfig Mon Jun 19 15:10:13 2006 |
+++ mozilla/.mozconfig 2007-03-15 12:41:23.000000000 -0400 |
4 |
@@ -0,0 +1,44 @@ |
@@ -0,0 +1,42 @@ |
5 |
+# sh |
+# sh |
6 |
+# Build configuration script |
+# Build configuration script |
7 |
+# |
+# |
13 |
+# Options for client.mk. |
+# Options for client.mk. |
14 |
+# environment variables to set |
+# environment variables to set |
15 |
+#mk_add_options MOZILLA_OFFICIAL=1 |
+#mk_add_options MOZILLA_OFFICIAL=1 |
|
+#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ |
|
16 |
+ |
+ |
17 |
+# Options for 'configure' (same as command-line options). |
+# Options for 'configure' (same as command-line options). |
18 |
+ac_add_options --enable-official-branding |
+ac_add_options --enable-official-branding |
35 |
+ac_add_options --disable-debug |
+ac_add_options --disable-debug |
36 |
+ac_add_options --disable-tests |
+ac_add_options --disable-tests |
37 |
+ac_add_options --enable-strip |
+ac_add_options --enable-strip |
38 |
+ac_add_options --enable-optimize='-Os' |
+ac_add_options --enable-optimize='-O2' |
39 |
+ac_add_options --enable-macos-target=10.3 |
+ac_add_options --enable-macos-target=10.3 |
40 |
+ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox1.5 |
+ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox1.5 |
41 |
+ac_add_options --with-system-jpeg=@PREFIX@ |
+ac_add_options --with-system-jpeg=@PREFIX@ |
42 |
+ac_add_options --with-system-png=@PREFIX@ |
+ac_add_options --with-system-png=@PREFIX@ |
|
+ac_add_options --with-system-zlib=/usr |
|
43 |
+ac_add_options --with-freetype-prefix=@PREFIX@/lib/freetype219 |
+ac_add_options --with-freetype-prefix=@PREFIX@/lib/freetype219 |
44 |
+ |
+ |
45 |
+#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2 |
+#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2 |
46 |
+#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin |
+#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin |
47 |
diff -ruN mozilla-orig/browser/app/mozilla.in mozilla/browser/app/mozilla.in |
diff -ruN mozilla-orig/browser/app/mozilla.in mozilla/browser/app/mozilla.in |
48 |
--- mozilla-orig/browser/app/mozilla.in Tue Sep 20 17:13:03 2005 |
--- mozilla-orig/browser/app/mozilla.in 2005-09-20 17:13:03.000000000 -0400 |
49 |
+++ mozilla/browser/app/mozilla.in Mon Jun 19 15:10:13 2006 |
+++ mozilla/browser/app/mozilla.in 2007-03-15 12:41:23.000000000 -0400 |
50 |
@@ -99,7 +99,9 @@ |
@@ -99,7 +99,9 @@ |
51 |
# If not, then start resolving symlinks until we find run-mozilla.sh |
# If not, then start resolving symlinks until we find run-mozilla.sh |
52 |
found=0 |
found=0 |
58 |
progbase=`basename "$progname"` |
progbase=`basename "$progname"` |
59 |
run_moz="$curdir/run-mozilla.sh" |
run_moz="$curdir/run-mozilla.sh" |
60 |
if test -x "$run_moz"; then |
if test -x "$run_moz"; then |
61 |
@@ -140,9 +142,75 @@ |
@@ -140,10 +142,76 @@ |
62 |
debugging=0 |
debugging=0 |
63 |
MOZILLA_BIN="${progbase}-bin" |
MOZILLA_BIN="${progbase}-bin" |
64 |
|
|
80 |
if [ "$OSTYPE" = "beos" ]; then |
if [ "$OSTYPE" = "beos" ]; then |
81 |
mimeset -F "$MOZILLA_BIN" |
mimeset -F "$MOZILLA_BIN" |
82 |
fi |
fi |
83 |
+ |
|
84 |
+ALREADY_RUNNING=`check_running` |
+ALREADY_RUNNING=`check_running` |
85 |
+ |
+ |
86 |
+################################################################ Parse Arguments |
+################################################################ Parse Arguments |
131 |
+fi |
+fi |
132 |
+# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 |
+# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 |
133 |
+########################################################################### Main |
+########################################################################### Main |
134 |
|
+ |
135 |
pass_arg_count=0 |
pass_arg_count=0 |
136 |
while [ $# -gt $pass_arg_count ] |
while [ $# -gt $pass_arg_count ] |
137 |
|
do |
138 |
diff -ruN mozilla-orig/browser/components/build/Makefile.in mozilla/browser/components/build/Makefile.in |
diff -ruN mozilla-orig/browser/components/build/Makefile.in mozilla/browser/components/build/Makefile.in |
139 |
--- mozilla-orig/browser/components/build/Makefile.in Wed Jun 22 22:25:04 2005 |
--- mozilla-orig/browser/components/build/Makefile.in 2005-06-22 22:25:04.000000000 -0400 |
140 |
+++ mozilla/browser/components/build/Makefile.in Mon Jun 19 15:10:13 2006 |
+++ mozilla/browser/components/build/Makefile.in 2007-03-15 12:41:24.000000000 -0400 |
141 |
@@ -74,6 +74,12 @@ |
@@ -74,6 +74,12 @@ |
142 |
$(MOZ_COMPONENT_LIBS) \ |
$(MOZ_COMPONENT_LIBS) \ |
143 |
$(NULL) |
$(NULL) |
152 |
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) |
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) |
153 |
EXTRA_DSO_LDOPTS += \ |
EXTRA_DSO_LDOPTS += \ |
154 |
diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html |
diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html |
155 |
--- mozilla-orig/browser/locales/en-US/profile/bookmarks.html Thu Nov 3 03:30:35 2005 |
--- mozilla-orig/browser/locales/en-US/profile/bookmarks.html 2005-11-03 03:30:35.000000000 -0500 |
156 |
+++ mozilla/browser/locales/en-US/profile/bookmarks.html Mon Jun 19 15:10:14 2006 |
+++ mozilla/browser/locales/en-US/profile/bookmarks.html 2007-03-15 12:41:24.000000000 -0400 |
157 |
@@ -12,6 +12,7 @@ |
@@ -12,6 +12,7 @@ |
158 |
<DL><p> |
<DL><p> |
159 |
<DT><A HREF="http://www.mozilla.com/products/firefox/central.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$GvPhC3">Getting Started</A> |
<DT><A HREF="http://www.mozilla.com/products/firefox/central.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$GvPhC3">Getting Started</A> |
163 |
<HR> |
<HR> |
164 |
<DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3> |
<DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3> |
165 |
diff -ruN mozilla-orig/build/unix/mozilla-config.in mozilla/build/unix/mozilla-config.in |
diff -ruN mozilla-orig/build/unix/mozilla-config.in mozilla/build/unix/mozilla-config.in |
166 |
--- mozilla-orig/build/unix/mozilla-config.in Thu Apr 22 16:17:59 2004 |
--- mozilla-orig/build/unix/mozilla-config.in 2004-04-22 16:17:59.000000000 -0400 |
167 |
+++ mozilla/build/unix/mozilla-config.in Mon Jun 19 15:01:39 2006 |
+++ mozilla/build/unix/mozilla-config.in 2007-03-15 12:41:24.000000000 -0400 |
168 |
@@ -115,7 +115,7 @@ |
@@ -115,7 +115,7 @@ |
169 |
fi |
fi |
170 |
|
|
175 |
|
|
176 |
if test "$echo_libs" = "yes"; then |
if test "$echo_libs" = "yes"; then |
177 |
diff -ruN mozilla-orig/build/unix/mozilla-xpcom.pc.in mozilla/build/unix/mozilla-xpcom.pc.in |
diff -ruN mozilla-orig/build/unix/mozilla-xpcom.pc.in mozilla/build/unix/mozilla-xpcom.pc.in |
178 |
--- mozilla-orig/build/unix/mozilla-xpcom.pc.in Tue Jul 5 19:21:52 2005 |
--- mozilla-orig/build/unix/mozilla-xpcom.pc.in 2005-07-05 19:21:52.000000000 -0400 |
179 |
+++ mozilla/build/unix/mozilla-xpcom.pc.in Mon Jun 19 15:03:51 2006 |
+++ mozilla/build/unix/mozilla-xpcom.pc.in 2007-03-15 12:41:24.000000000 -0400 |
180 |
@@ -8,5 +8,5 @@ |
@@ -8,5 +8,5 @@ |
181 |
Description: The Mozilla Cross Platform Component Library |
Description: The Mozilla Cross Platform Component Library |
182 |
Version: %MOZILLA_VERSION% |
Version: %MOZILLA_VERSION% |
185 |
+Libs: -L${libdir} -lxpcom -lxpcom_core |
+Libs: -L${libdir} -lxpcom -lxpcom_core |
186 |
Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string |
Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string |
187 |
diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in |
diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in |
188 |
--- mozilla-orig/config/autoconf.mk.in Fri Apr 21 16:50:30 2006 |
--- mozilla-orig/config/autoconf.mk.in 2006-04-21 16:50:30.000000000 -0400 |
189 |
+++ mozilla/config/autoconf.mk.in Mon Jun 19 15:10:14 2006 |
+++ mozilla/config/autoconf.mk.in 2007-03-15 12:41:24.000000000 -0400 |
190 |
@@ -56,14 +56,14 @@ |
@@ -56,14 +56,14 @@ |
191 |
prefix = @prefix@ |
prefix = @prefix@ |
192 |
exec_prefix = @exec_prefix@ |
exec_prefix = @exec_prefix@ |
207 |
|
|
208 |
DIST = $(DEPTH)/dist |
DIST = $(DEPTH)/dist |
209 |
diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk |
diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk |
210 |
--- mozilla-orig/config/config.mk Thu Apr 6 12:28:13 2006 |
--- mozilla-orig/config/config.mk 2006-04-06 12:28:13.000000000 -0400 |
211 |
+++ mozilla/config/config.mk Mon Jun 19 15:10:14 2006 |
+++ mozilla/config/config.mk 2007-03-15 12:41:24.000000000 -0400 |
212 |
@@ -679,7 +679,7 @@ |
@@ -679,7 +679,7 @@ |
213 |
ifeq ($(OS_ARCH),Darwin) |
ifeq ($(OS_ARCH),Darwin) |
214 |
ifdef USE_PREBINDING |
ifdef USE_PREBINDING |
219 |
ifdef NEXT_ROOT |
ifdef NEXT_ROOT |
220 |
export NEXT_ROOT |
export NEXT_ROOT |
221 |
diff -ruN mozilla-orig/configure mozilla/configure |
diff -ruN mozilla-orig/configure mozilla/configure |
222 |
--- mozilla-orig/configure Fri Apr 21 17:41:39 2006 |
--- mozilla-orig/configure 2006-08-23 12:40:33.000000000 -0400 |
223 |
+++ mozilla/configure Mon Jun 19 15:10:14 2006 |
+++ mozilla/configure 2007-03-15 12:41:24.000000000 -0400 |
224 |
@@ -5410,7 +5410,7 @@ |
@@ -5516,7 +5516,7 @@ |
225 |
;; |
;; |
226 |
|
|
227 |
*-darwin*) |
*-darwin*) |
230 |
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' |
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"' |
231 |
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" |
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" |
232 |
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin' |
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin' |
233 |
@@ -5696,10 +5696,10 @@ |
@@ -5802,10 +5802,10 @@ |
234 |
|
|
235 |
*-darwin*) |
*-darwin*) |
236 |
_PEDANTIC= |
_PEDANTIC= |
245 |
_PLATFORM_DEFAULT_TOOLKIT='mac' |
_PLATFORM_DEFAULT_TOOLKIT='mac' |
246 |
MOZ_ENABLE_POSTSCRIPT= |
MOZ_ENABLE_POSTSCRIPT= |
247 |
diff -ruN mozilla-orig/fink/applications/firefox.desktop mozilla/fink/applications/firefox.desktop |
diff -ruN mozilla-orig/fink/applications/firefox.desktop mozilla/fink/applications/firefox.desktop |
248 |
--- mozilla-orig/fink/applications/firefox.desktop Wed Dec 31 19:00:00 1969 |
--- mozilla-orig/fink/applications/firefox.desktop 1969-12-31 19:00:00.000000000 -0500 |
249 |
+++ mozilla/fink/applications/firefox.desktop Mon Jun 19 15:10:14 2006 |
+++ mozilla/fink/applications/firefox.desktop 2007-03-15 12:41:24.000000000 -0400 |
250 |
@@ -0,0 +1,10 @@ |
@@ -0,0 +1,10 @@ |
251 |
+[Desktop Entry] |
+[Desktop Entry] |
252 |
+Encoding=UTF-8 |
+Encoding=UTF-8 |
259 |
+Categories=Application;Network |
+Categories=Application;Network |
260 |
+StartupNotify=true |
+StartupNotify=true |
261 |
diff -ruN mozilla-orig/fink/fink.js mozilla/fink/fink.js |
diff -ruN mozilla-orig/fink/fink.js mozilla/fink/fink.js |
262 |
--- mozilla-orig/fink/fink.js Wed Dec 31 19:00:00 1969 |
--- mozilla-orig/fink/fink.js 1969-12-31 19:00:00.000000000 -0500 |
263 |
+++ mozilla/fink/fink.js Mon Jun 19 15:10:14 2006 |
+++ mozilla/fink/fink.js 2007-03-15 12:41:24.000000000 -0400 |
264 |
@@ -0,0 +1,27 @@ |
@@ -0,0 +1,27 @@ |
265 |
+pref("general.useragent.extra.vendorComment", "Fink Community Edition"); |
+pref("general.useragent.extra.vendorComment", "Fink Community Edition"); |
266 |
+ |
+ |
290 |
+//pref("font.scale.aa_bitmap.always", false); |
+//pref("font.scale.aa_bitmap.always", false); |
291 |
+//pref("font.scale.aa_bitmap.min", 6); |
+//pref("font.scale.aa_bitmap.min", 6); |
292 |
diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp |
diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp |
293 |
--- mozilla-orig/modules/libpref/src/nsPrefService.cpp Fri May 13 20:30:08 2005 |
--- mozilla-orig/modules/libpref/src/nsPrefService.cpp 2005-05-13 20:30:08.000000000 -0400 |
294 |
+++ mozilla/modules/libpref/src/nsPrefService.cpp Mon Jun 19 15:10:14 2006 |
+++ mozilla/modules/libpref/src/nsPrefService.cpp 2007-03-15 12:41:24.000000000 -0400 |
295 |
@@ -748,6 +748,7 @@ |
@@ -748,6 +748,7 @@ |
296 |
#elif defined(XP_BEOS) |
#elif defined(XP_BEOS) |
297 |
"beos.js" |
"beos.js" |
301 |
|
|
302 |
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); |
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles)); |
303 |
diff -ruN mozilla-orig/nsprpub/config/nspr.m4 mozilla/nsprpub/config/nspr.m4 |
diff -ruN mozilla-orig/nsprpub/config/nspr.m4 mozilla/nsprpub/config/nspr.m4 |
304 |
--- mozilla-orig/nsprpub/config/nspr.m4 Fri May 11 20:36:57 2001 |
--- mozilla-orig/nsprpub/config/nspr.m4 2001-05-11 20:36:57.000000000 -0400 |
305 |
+++ mozilla/nsprpub/config/nspr.m4 Mon Jun 19 17:06:49 2006 |
+++ mozilla/nsprpub/config/nspr.m4 2007-03-15 12:41:24.000000000 -0400 |
306 |
@@ -5,7 +5,7 @@ |
@@ -5,7 +5,7 @@ |
307 |
|
|
308 |
dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) |
dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) |
313 |
|
|
314 |
AC_ARG_WITH(nspr-prefix, |
AC_ARG_WITH(nspr-prefix, |
315 |
diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure |
diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure |
316 |
--- mozilla-orig/nsprpub/configure Wed Feb 22 18:03:10 2006 |
--- mozilla-orig/nsprpub/configure 2007-01-16 17:36:21.000000000 -0500 |
317 |
+++ mozilla/nsprpub/configure Mon Jun 19 15:10:14 2006 |
+++ mozilla/nsprpub/configure 2007-03-15 12:41:24.000000000 -0400 |
318 |
@@ -3338,9 +3338,6 @@ |
@@ -3338,9 +3338,6 @@ |
319 |
|
|
320 |
# Add Mac OS X support for loading CFM & CFBundle plugins |
# Add Mac OS X support for loading CFM & CFBundle plugins |
325 |
|
|
326 |
OS_TARGET=MacOSX |
OS_TARGET=MacOSX |
327 |
|
|
328 |
@@ -4960,8 +4957,6 @@ |
@@ -4956,8 +4953,6 @@ |
329 |
|
|
330 |
|
|
331 |
case $target in |
case $target in |
333 |
- ;; |
- ;; |
334 |
*) |
*) |
335 |
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 |
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 |
336 |
echo "configure:4968: checking for dlopen in -ldl" >&5 |
echo "configure:4964: checking for dlopen in -ldl" >&5 |
337 |
diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h mozilla/nsprpub/pr/include/md/_darwin.h |
diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h mozilla/nsprpub/pr/include/md/_darwin.h |
338 |
--- mozilla-orig/nsprpub/pr/include/md/_darwin.h Tue Jan 10 18:16:38 2006 |
--- mozilla-orig/nsprpub/pr/include/md/_darwin.h 2006-12-06 13:02:35.000000000 -0500 |
339 |
+++ mozilla/nsprpub/pr/include/md/_darwin.h Mon Jun 19 15:10:14 2006 |
+++ mozilla/nsprpub/pr/include/md/_darwin.h 2007-03-15 12:41:24.000000000 -0400 |
340 |
@@ -62,7 +62,8 @@ |
@@ -62,7 +62,8 @@ |
341 |
|
|
342 |
#undef HAVE_STACK_GROWING_UP |
#undef HAVE_STACK_GROWING_UP |
346 |
+#define USE_DLFCN |
+#define USE_DLFCN |
347 |
#define _PR_HAVE_SOCKADDR_LEN |
#define _PR_HAVE_SOCKADDR_LEN |
348 |
#define _PR_STAT_HAS_ST_ATIMESPEC |
#define _PR_STAT_HAS_ST_ATIMESPEC |
349 |
#define _PR_NO_LARGE_FILES |
#define _PR_HAVE_LARGE_OFF_T |
350 |
diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in mozilla/nsprpub/pr/src/Makefile.in |
diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in mozilla/nsprpub/pr/src/Makefile.in |
351 |
--- mozilla-orig/nsprpub/pr/src/Makefile.in Mon Feb 13 13:48:14 2006 |
--- mozilla-orig/nsprpub/pr/src/Makefile.in 2006-10-18 20:39:28.000000000 -0400 |
352 |
+++ mozilla/nsprpub/pr/src/Makefile.in Mon Jun 19 15:10:14 2006 |
+++ mozilla/nsprpub/pr/src/Makefile.in 2007-03-15 12:41:24.000000000 -0400 |
353 |
@@ -204,9 +204,9 @@ |
@@ -204,9 +204,9 @@ |
354 |
endif |
endif |
355 |
endif |
endif |
364 |
ifdef GC_LEAK_DETECTOR |
ifdef GC_LEAK_DETECTOR |
365 |
EXTRA_LIBS = -L$(dist_libdir) -lboehm |
EXTRA_LIBS = -L$(dist_libdir) -lboehm |
366 |
diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c |
diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c |
367 |
--- mozilla-orig/nsprpub/pr/src/linking/prlink.c Thu Aug 18 13:24:29 2005 |
--- mozilla-orig/nsprpub/pr/src/linking/prlink.c 2006-10-06 19:36:22.000000000 -0400 |
368 |
+++ mozilla/nsprpub/pr/src/linking/prlink.c Mon Jun 19 15:10:14 2006 |
+++ mozilla/nsprpub/pr/src/linking/prlink.c 2007-03-15 12:41:24.000000000 -0400 |
369 |
@@ -154,7 +154,8 @@ |
@@ -158,7 +158,8 @@ |
370 |
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \ |
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \ |
371 |
|| defined(WIN16) || defined(XP_OS2) \ |
|| defined(WIN16) || defined(XP_OS2) \ |
372 |
|| ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__)) |
|| ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__)) |
375 |
+/* #define NEED_LEADING_UNDERSCORE */ |
+/* #define NEED_LEADING_UNDERSCORE */ |
376 |
#endif |
#endif |
377 |
|
|
378 |
/************************************************************************/ |
#define PR_LD_PATHW 0x8000 /* for PR_LibSpec_PathnameU */ |
379 |
diff -ruN mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h |
diff -ruN mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h |
380 |
--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Thu Feb 23 14:37:11 2006 |
--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-02-23 14:37:11.000000000 -0500 |
381 |
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Mon Jun 19 15:10:14 2006 |
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2007-03-15 12:41:25.000000000 -0400 |
382 |
@@ -163,7 +163,7 @@ |
@@ -163,7 +163,7 @@ |
383 |
/* Define KEEP_STACK_16_BYTE_ALIGNED if the stack needs to maintain alignment |
/* Define KEEP_STACK_16_BYTE_ALIGNED if the stack needs to maintain alignment |
384 |
* in a CALL for some good reason (like ABI compliance). */ |
* in a CALL for some good reason (like ABI compliance). */ |
389 |
#define KEEP_STACK_16_BYTE_ALIGNED |
#define KEEP_STACK_16_BYTE_ALIGNED |
390 |
#endif |
#endif |
391 |
diff -ruN mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp |
diff -ruN mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp |
392 |
--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp Mon Oct 24 01:42:28 2005 |
--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp 2005-10-24 01:42:28.000000000 -0400 |
393 |
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp Mon Jun 19 15:10:14 2006 |
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp 2007-03-15 12:41:25.000000000 -0400 |
394 |
@@ -104,7 +104,7 @@ |
@@ -104,7 +104,7 @@ |
395 |
|
|
396 |
#ifdef __GNUC__ /* Gnu Compiler. */ |
#ifdef __GNUC__ /* Gnu Compiler. */ |