| 1 |
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
|
| 2 |
--- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969
|
| 3 |
+++ mozilla/.mozconfig Mon Jun 19 15:10:13 2006
|
| 4 |
@@ -0,0 +1,44 @@
|
| 5 |
+# sh
|
| 6 |
+# Build configuration script
|
| 7 |
+#
|
| 8 |
+# See http://www.mozilla.org/build/unix.html for build instructions.
|
| 9 |
+#
|
| 10 |
+
|
| 11 |
+. $topsrcdir/browser/config/mozconfig
|
| 12 |
+
|
| 13 |
+# Options for client.mk.
|
| 14 |
+# environment variables to set
|
| 15 |
+#mk_add_options MOZILLA_OFFICIAL=1
|
| 16 |
+#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@
|
| 17 |
+
|
| 18 |
+# Options for 'configure' (same as command-line options).
|
| 19 |
+ac_add_options --enable-official-branding
|
| 20 |
+ac_add_options --enable-default-toolkit=gtk2
|
| 21 |
+ac_add_options --enable-xft
|
| 22 |
+#ac_add_options --disable-xft
|
| 23 |
+#ac_add_options --enable-freetype2
|
| 24 |
+ac_add_options --disable-freetype2
|
| 25 |
+ac_add_options --enable-postscript
|
| 26 |
+ac_add_options --enable-xinerama
|
| 27 |
+ac_add_options --with-pthreads
|
| 28 |
+ac_add_options --disable-gnomevfs
|
| 29 |
+ac_add_options --disable-gnomeui
|
| 30 |
+ac_add_options --enable-extensions=default,-gnomevfs,xforms,schema-validation
|
| 31 |
+ac_add_options --enable-canvas
|
| 32 |
+ac_add_options --enable-svg
|
| 33 |
+
|
| 34 |
+# prebinding disabled or otherwise don't get binary
|
| 35 |
+ac_add_options --disable-prebinding
|
| 36 |
+ac_add_options --disable-debug
|
| 37 |
+ac_add_options --disable-tests
|
| 38 |
+ac_add_options --enable-strip
|
| 39 |
+ac_add_options --enable-optimize='-Os'
|
| 40 |
+ac_add_options --enable-macos-target=10.3
|
| 41 |
+ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox1.5
|
| 42 |
+ac_add_options --with-system-jpeg=@PREFIX@
|
| 43 |
+ac_add_options --with-system-png=@PREFIX@
|
| 44 |
+ac_add_options --with-system-zlib=/usr
|
| 45 |
+ac_add_options --with-freetype-prefix=@PREFIX@/lib/freetype219
|
| 46 |
+
|
| 47 |
+#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2
|
| 48 |
+#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin
|
| 49 |
diff -ruN mozilla-orig/browser/app/mozilla.in mozilla/browser/app/mozilla.in
|
| 50 |
--- mozilla-orig/browser/app/mozilla.in Tue Sep 20 17:13:03 2005
|
| 51 |
+++ mozilla/browser/app/mozilla.in Mon Jun 19 15:10:13 2006
|
| 52 |
@@ -99,7 +99,9 @@
|
| 53 |
# If not, then start resolving symlinks until we find run-mozilla.sh
|
| 54 |
found=0
|
| 55 |
progname="$0"
|
| 56 |
-curdir=`dirname "$progname"`
|
| 57 |
+#curdir=`dirname "$progname"`
|
| 58 |
+# looking in %p/bin, not %p/lib/firefox, so fixing to $moz_libdir
|
| 59 |
+curdir="$moz_libdir"
|
| 60 |
progbase=`basename "$progname"`
|
| 61 |
run_moz="$curdir/run-mozilla.sh"
|
| 62 |
if test -x "$run_moz"; then
|
| 63 |
@@ -140,9 +142,75 @@
|
| 64 |
debugging=0
|
| 65 |
MOZILLA_BIN="${progbase}-bin"
|
| 66 |
|
| 67 |
+# The following is to check for a currently running instance.
|
| 68 |
+# This is taken almost verbatim from the Mozilla RPM package's launch script.
|
| 69 |
+MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
|
| 70 |
+check_running() {
|
| 71 |
+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
|
| 72 |
+ RETURN_VAL=$?
|
| 73 |
+ if [ $RETURN_VAL -eq 0 ]; then
|
| 74 |
+ echo 1
|
| 75 |
+ return 1
|
| 76 |
+ else
|
| 77 |
+ echo 0
|
| 78 |
+ return 0
|
| 79 |
+ fi
|
| 80 |
+}
|
| 81 |
+
|
| 82 |
if [ "$OSTYPE" = "beos" ]; then
|
| 83 |
mimeset -F "$MOZILLA_BIN"
|
| 84 |
fi
|
| 85 |
+
|
| 86 |
+ALREADY_RUNNING=`check_running`
|
| 87 |
+
|
| 88 |
+################################################################ Parse Arguments
|
| 89 |
+# If there's a command line argument but it doesn't begin with a -
|
| 90 |
+# it's probably a url. Try to send it to a running instance.
|
| 91 |
+_USE_EXIST=0
|
| 92 |
+_optOne="$1"
|
| 93 |
+case "${_optOne}" in
|
| 94 |
+ -*)
|
| 95 |
+ ;;
|
| 96 |
+ *)
|
| 97 |
+ _USE_EXIST=1
|
| 98 |
+ ;;
|
| 99 |
+esac
|
| 100 |
+
|
| 101 |
+_optLast=
|
| 102 |
+for i in "$@"; do
|
| 103 |
+ _optLast="${i}"
|
| 104 |
+done #last arg
|
| 105 |
+
|
| 106 |
+if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
|
| 107 |
+ # Last argument seems to be a local file/directory
|
| 108 |
+ # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
|
| 109 |
+ # If it is just "relatively" (./file) specified, make it absolutely
|
| 110 |
+ [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
|
| 111 |
+fi
|
| 112 |
+################################################################ Parse Arguments
|
| 113 |
+
|
| 114 |
+########################################################################### Main
|
| 115 |
+if [ $ALREADY_RUNNING -eq 1 ]; then
|
| 116 |
+ # There's an instance already running. Use it.
|
| 117 |
+ # Any command line args passed in?
|
| 118 |
+ if [ $# -gt 0 ]; then
|
| 119 |
+ # There were "some" command line args.
|
| 120 |
+ if [ ${_USE_EXIST} -eq 1 ]; then
|
| 121 |
+ # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
|
| 122 |
+ _remote_cmd="openURL(${_optLast})"
|
| 123 |
+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
|
| 124 |
+ unset _remote_cmd
|
| 125 |
+ exit $?
|
| 126 |
+ fi
|
| 127 |
+ else
|
| 128 |
+ # No command line args. Open new window/tab
|
| 129 |
+ #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
|
| 130 |
+ "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
|
| 131 |
+ exit $?
|
| 132 |
+ fi
|
| 133 |
+fi
|
| 134 |
+# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
|
| 135 |
+########################################################################### Main
|
| 136 |
|
| 137 |
pass_arg_count=0
|
| 138 |
while [ $# -gt $pass_arg_count ]
|
| 139 |
diff -ruN mozilla-orig/browser/components/build/Makefile.in mozilla/browser/components/build/Makefile.in
|
| 140 |
--- mozilla-orig/browser/components/build/Makefile.in Wed Jun 22 22:25:04 2005
|
| 141 |
+++ mozilla/browser/components/build/Makefile.in Mon Jun 19 15:10:13 2006
|
| 142 |
@@ -74,6 +74,12 @@
|
| 143 |
$(MOZ_COMPONENT_LIBS) \
|
| 144 |
$(NULL)
|
| 145 |
|
| 146 |
+# fix for building on Mac/X11 (bug 257773)
|
| 147 |
+# dependencies for gkgfx
|
| 148 |
+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
|
| 149 |
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
|
| 150 |
+endif
|
| 151 |
+
|
| 152 |
# Need to link to CoreFoundation for Mac Migrators (PList reading code)
|
| 153 |
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
| 154 |
EXTRA_DSO_LDOPTS += \
|
| 155 |
diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html
|
| 156 |
--- mozilla-orig/browser/locales/en-US/profile/bookmarks.html Thu Nov 3 03:30:35 2005
|
| 157 |
+++ mozilla/browser/locales/en-US/profile/bookmarks.html Mon Jun 19 15:10:14 2006
|
| 158 |
@@ -12,6 +12,7 @@
|
| 159 |
<DL><p>
|
| 160 |
<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>
|
| 161 |
<DT><A HREF="http://fxfeeds.mozilla.com/" LAST_MODIFIED="1094668003" FEEDURL="http://fxfeeds.mozilla.com/rss20.xml" ID="rdf:#$HvPhC3">Latest Headlines</A>
|
| 162 |
+ <DT><A HREF="http://fink.sourceforge.net/">Fink - Home</A>
|
| 163 |
</DL><p>
|
| 164 |
<HR>
|
| 165 |
<DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3>
|
| 166 |
diff -ruN mozilla-orig/build/unix/mozilla-config.in mozilla/build/unix/mozilla-config.in
|
| 167 |
--- mozilla-orig/build/unix/mozilla-config.in Thu Apr 22 16:17:59 2004
|
| 168 |
+++ mozilla/build/unix/mozilla-config.in Mon Jun 19 15:01:39 2006
|
| 169 |
@@ -115,7 +115,7 @@
|
| 170 |
fi
|
| 171 |
|
| 172 |
_nspr_libs="%FULL_NSPR_LIBS%"
|
| 173 |
-_xpcom_libs="-lxpcom $_nspr_libs"
|
| 174 |
+_xpcom_libs="-lxpcom -lxpcom_core $_nspr_libs"
|
| 175 |
_js_libs="-ljs"
|
| 176 |
|
| 177 |
if test "$echo_libs" = "yes"; then
|
| 178 |
diff -ruN mozilla-orig/build/unix/mozilla-xpcom.pc.in mozilla/build/unix/mozilla-xpcom.pc.in
|
| 179 |
--- mozilla-orig/build/unix/mozilla-xpcom.pc.in Tue Jul 5 19:21:52 2005
|
| 180 |
+++ mozilla/build/unix/mozilla-xpcom.pc.in Mon Jun 19 15:03:51 2006
|
| 181 |
@@ -8,5 +8,5 @@
|
| 182 |
Description: The Mozilla Cross Platform Component Library
|
| 183 |
Version: %MOZILLA_VERSION%
|
| 184 |
Requires: %NSPR_NAME% >= %NSPR_VERSION%
|
| 185 |
-Libs: -L${libdir} -lxpcom
|
| 186 |
+Libs: -L${libdir} -lxpcom -lxpcom_core
|
| 187 |
Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
|
| 188 |
diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
|
| 189 |
--- mozilla-orig/config/autoconf.mk.in Fri Apr 21 16:50:30 2006
|
| 190 |
+++ mozilla/config/autoconf.mk.in Mon Jun 19 15:10:14 2006
|
| 191 |
@@ -56,14 +56,14 @@
|
| 192 |
prefix = @prefix@
|
| 193 |
exec_prefix = @exec_prefix@
|
| 194 |
bindir = @bindir@
|
| 195 |
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 196 |
+includedir = @includedir@/$(MOZ_APP_NAME)1.5
|
| 197 |
libdir = @libdir@
|
| 198 |
datadir = @datadir@
|
| 199 |
mandir = @mandir@
|
| 200 |
-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 201 |
+idldir = @datadir@/idl/$(MOZ_APP_NAME)1.5
|
| 202 |
|
| 203 |
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 204 |
-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
|
| 205 |
+mozappdir = $(libdir)/$(MOZ_APP_NAME)1.5
|
| 206 |
+mredir = $(libdir)/mre/mre1.5
|
| 207 |
mrelibdir = $(mredir)/lib
|
| 208 |
|
| 209 |
DIST = $(DEPTH)/dist
|
| 210 |
diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
|
| 211 |
--- mozilla-orig/config/config.mk Thu Apr 6 12:28:13 2006
|
| 212 |
+++ mozilla/config/config.mk Mon Jun 19 15:10:14 2006
|
| 213 |
@@ -679,7 +679,7 @@
|
| 214 |
ifeq ($(OS_ARCH),Darwin)
|
| 215 |
ifdef USE_PREBINDING
|
| 216 |
export LD_PREBIND=1
|
| 217 |
-export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
|
| 218 |
+export LD_PREBIND_ALLOW_OVERLAP=1
|
| 219 |
endif # USE_PREBINDING
|
| 220 |
ifdef NEXT_ROOT
|
| 221 |
export NEXT_ROOT
|
| 222 |
diff -ruN mozilla-orig/configure mozilla/configure
|
| 223 |
--- mozilla-orig/configure Fri Apr 21 17:41:39 2006
|
| 224 |
+++ mozilla/configure Mon Jun 19 15:10:14 2006
|
| 225 |
@@ -5410,7 +5410,7 @@
|
| 226 |
;;
|
| 227 |
|
| 228 |
*-darwin*)
|
| 229 |
- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
|
| 230 |
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
| 231 |
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
|
| 232 |
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
| 233 |
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin'
|
| 234 |
@@ -5696,10 +5696,10 @@
|
| 235 |
|
| 236 |
*-darwin*)
|
| 237 |
_PEDANTIC=
|
| 238 |
- CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
|
| 239 |
- CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
|
| 240 |
+ CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
|
| 241 |
+ CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
|
| 242 |
DLL_SUFFIX=".dylib"
|
| 243 |
- DSO_LDOPTS=''
|
| 244 |
+ DSO_LDOPTS='-framework CoreFoundation'
|
| 245 |
STRIP="$STRIP -x -S"
|
| 246 |
_PLATFORM_DEFAULT_TOOLKIT='mac'
|
| 247 |
MOZ_ENABLE_POSTSCRIPT=
|
| 248 |
diff -ruN mozilla-orig/fink/applications/firefox.desktop mozilla/fink/applications/firefox.desktop
|
| 249 |
--- mozilla-orig/fink/applications/firefox.desktop Wed Dec 31 19:00:00 1969
|
| 250 |
+++ mozilla/fink/applications/firefox.desktop Mon Jun 19 15:10:14 2006
|
| 251 |
@@ -0,0 +1,10 @@
|
| 252 |
+[Desktop Entry]
|
| 253 |
+Encoding=UTF-8
|
| 254 |
+Name=Firefox Web Browser
|
| 255 |
+Comment=Browse the World Wide Web
|
| 256 |
+Exec=firefox
|
| 257 |
+Icon=firefox.xpm
|
| 258 |
+Terminal=false
|
| 259 |
+Type=Application
|
| 260 |
+Categories=Application;Network
|
| 261 |
+StartupNotify=true
|
| 262 |
diff -ruN mozilla-orig/fink/fink.js mozilla/fink/fink.js
|
| 263 |
--- mozilla-orig/fink/fink.js Wed Dec 31 19:00:00 1969
|
| 264 |
+++ mozilla/fink/fink.js Mon Jun 19 15:10:14 2006
|
| 265 |
@@ -0,0 +1,27 @@
|
| 266 |
+pref("general.useragent.extra.vendorComment", "Fink Community Edition");
|
| 267 |
+
|
| 268 |
+// Give a default font set that can do BOLD
|
| 269 |
+pref("font.name.serif.x-western", "Bitstream Vera Serif");
|
| 270 |
+pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
|
| 271 |
+pref("font.size.variable.x-western", 15);
|
| 272 |
+
|
| 273 |
+// TrueType
|
| 274 |
+//pref("font.FreeType2.enable", true);
|
| 275 |
+//pref("font.freetype2.shared-library", "@PREFIX@/lib/freetype219/lib/libfreetype.6.dylib");
|
| 276 |
+//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
|
| 277 |
+//pref("font.freetype2.autohinted", true);
|
| 278 |
+//pref("font.freetype2.unhinted", true);
|
| 279 |
+//pref("font.antialias.min", 10);
|
| 280 |
+//pref("font.embedded_bitmaps.max", 1000000);
|
| 281 |
+//pref("font.scale.tt_bitmap.dark_text.min", 64);
|
| 282 |
+//pref("font.scale.tt_bitmap.dark_text.gain", "0.0");
|
| 283 |
+//pref("font.directory.truetype.1", "/Library/Fonts");
|
| 284 |
+//pref("font.directory.truetype.2", "/Network/Library/Fonts");
|
| 285 |
+//pref("font.directory.truetype.3", "/System/Library/Fonts");
|
| 286 |
+//pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
|
| 287 |
+//pref("font.directory.truetype.5", "@PREFIX@/share/fonts/truetype");
|
| 288 |
+
|
| 289 |
+// AA with Bitmap scaling.
|
| 290 |
+//pref("font.scale.aa_bitmap.enable", true);
|
| 291 |
+//pref("font.scale.aa_bitmap.always", false);
|
| 292 |
+//pref("font.scale.aa_bitmap.min", 6);
|
| 293 |
diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp
|
| 294 |
--- mozilla-orig/modules/libpref/src/nsPrefService.cpp Fri May 13 20:30:08 2005
|
| 295 |
+++ mozilla/modules/libpref/src/nsPrefService.cpp Mon Jun 19 15:10:14 2006
|
| 296 |
@@ -748,6 +748,7 @@
|
| 297 |
#elif defined(XP_BEOS)
|
| 298 |
"beos.js"
|
| 299 |
#endif
|
| 300 |
+ , "fink.js"
|
| 301 |
};
|
| 302 |
|
| 303 |
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
|
| 304 |
diff -ruN mozilla-orig/nsprpub/config/nspr.m4 mozilla/nsprpub/config/nspr.m4
|
| 305 |
--- mozilla-orig/nsprpub/config/nspr.m4 Fri May 11 20:36:57 2001
|
| 306 |
+++ mozilla/nsprpub/config/nspr.m4 Mon Jun 19 17:06:49 2006
|
| 307 |
@@ -5,7 +5,7 @@
|
| 308 |
|
| 309 |
dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
| 310 |
dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
|
| 311 |
-AC_DEFUN(AM_PATH_NSPR,
|
| 312 |
+AC_DEFUN([AM_PATH_NSPR],
|
| 313 |
[dnl
|
| 314 |
|
| 315 |
AC_ARG_WITH(nspr-prefix,
|
| 316 |
diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
|
| 317 |
--- mozilla-orig/nsprpub/configure Wed Feb 22 18:03:10 2006
|
| 318 |
+++ mozilla/nsprpub/configure Mon Jun 19 15:10:14 2006
|
| 319 |
@@ -3338,9 +3338,6 @@
|
| 320 |
|
| 321 |
# Add Mac OS X support for loading CFM & CFBundle plugins
|
| 322 |
if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
|
| 323 |
- cat >> confdefs.h <<\EOF
|
| 324 |
-#define XP_MACOSX 1
|
| 325 |
-EOF
|
| 326 |
|
| 327 |
OS_TARGET=MacOSX
|
| 328 |
|
| 329 |
@@ -4960,8 +4957,6 @@
|
| 330 |
|
| 331 |
|
| 332 |
case $target in
|
| 333 |
-*-darwin*)
|
| 334 |
- ;;
|
| 335 |
*)
|
| 336 |
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
| 337 |
echo "configure:4968: checking for dlopen in -ldl" >&5
|
| 338 |
diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h mozilla/nsprpub/pr/include/md/_darwin.h
|
| 339 |
--- mozilla-orig/nsprpub/pr/include/md/_darwin.h Tue Jan 10 18:16:38 2006
|
| 340 |
+++ mozilla/nsprpub/pr/include/md/_darwin.h Mon Jun 19 15:10:14 2006
|
| 341 |
@@ -62,7 +62,8 @@
|
| 342 |
|
| 343 |
#undef HAVE_STACK_GROWING_UP
|
| 344 |
#define HAVE_DLL
|
| 345 |
-#define USE_MACH_DYLD
|
| 346 |
+/* #define USE_MACH_DYLD */
|
| 347 |
+#define USE_DLFCN
|
| 348 |
#define _PR_HAVE_SOCKADDR_LEN
|
| 349 |
#define _PR_STAT_HAS_ST_ATIMESPEC
|
| 350 |
#define _PR_NO_LARGE_FILES
|
| 351 |
diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in mozilla/nsprpub/pr/src/Makefile.in
|
| 352 |
--- mozilla-orig/nsprpub/pr/src/Makefile.in Mon Feb 13 13:48:14 2006
|
| 353 |
+++ mozilla/nsprpub/pr/src/Makefile.in Mon Jun 19 15:10:14 2006
|
| 354 |
@@ -204,9 +204,9 @@
|
| 355 |
endif
|
| 356 |
endif
|
| 357 |
|
| 358 |
-ifeq ($(OS_TARGET),MacOSX)
|
| 359 |
-OS_LIBS = -framework CoreServices -framework CoreFoundation
|
| 360 |
-endif
|
| 361 |
+#ifeq ($(OS_TARGET),MacOSX)
|
| 362 |
+#OS_LIBS = -framework CoreServices -framework CoreFoundation
|
| 363 |
+#endif
|
| 364 |
|
| 365 |
ifdef GC_LEAK_DETECTOR
|
| 366 |
EXTRA_LIBS = -L$(dist_libdir) -lboehm
|
| 367 |
diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
|
| 368 |
--- mozilla-orig/nsprpub/pr/src/linking/prlink.c Thu Aug 18 13:24:29 2005
|
| 369 |
+++ mozilla/nsprpub/pr/src/linking/prlink.c Mon Jun 19 15:10:14 2006
|
| 370 |
@@ -154,7 +154,8 @@
|
| 371 |
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
|
| 372 |
|| defined(WIN16) || defined(XP_OS2) \
|
| 373 |
|| ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
|
| 374 |
-#define NEED_LEADING_UNDERSCORE
|
| 375 |
+/* On MacOSX 10.3, dlsym does not accept symbols with '_'. */
|
| 376 |
+/* #define NEED_LEADING_UNDERSCORE */
|
| 377 |
#endif
|
| 378 |
|
| 379 |
/************************************************************************/
|
| 380 |
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
|
| 381 |
--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Thu Feb 23 14:37:11 2006
|
| 382 |
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Mon Jun 19 15:10:14 2006
|
| 383 |
@@ -163,7 +163,7 @@
|
| 384 |
/* Define KEEP_STACK_16_BYTE_ALIGNED if the stack needs to maintain alignment
|
| 385 |
* in a CALL for some good reason (like ABI compliance). */
|
| 386 |
|
| 387 |
-#ifdef XP_MACOSX
|
| 388 |
+#ifdef __APPLE__
|
| 389 |
/* http://developer.apple.com/documentation/DeveloperTools/Conceptual/LowLevelABI/Articles/IA32.html */
|
| 390 |
#define KEEP_STACK_16_BYTE_ALIGNED
|
| 391 |
#endif
|
| 392 |
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
|
| 393 |
--- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp Mon Oct 24 01:42:28 2005
|
| 394 |
+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp Mon Jun 19 15:10:14 2006
|
| 395 |
@@ -104,7 +104,7 @@
|
| 396 |
|
| 397 |
#ifdef __GNUC__ /* Gnu Compiler. */
|
| 398 |
|
| 399 |
-#ifdef XP_MACOSX
|
| 400 |
+#ifdef __APPLE__
|
| 401 |
/* Make sure the stack is 16-byte aligned. Do that by aligning to 16 bytes and
|
| 402 |
* then subtracting 4 so the three subsequent pushes result in a 16-byte aligned
|
| 403 |
* stack. */
|
Parent Directory
| 
Revision Log