| 1 |
nieder |
1.1 |
diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
|
| 2 |
|
|
--- mozilla-orig/.mozconfig Wed Dec 31 19:00:00 1969
|
| 3 |
|
|
+++ mozilla/.mozconfig Tue Nov 29 16:45:51 2005
|
| 4 |
|
|
@@ -0,0 +1,43 @@
|
| 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_MAKE_FLAGS=-j4
|
| 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='-O2'
|
| 40 |
|
|
+ac_add_options --enable-macos-target=10.3
|
| 41 |
|
|
+ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox
|
| 42 |
|
|
+ac_add_options --with-system-jpeg=@PREFIX@
|
| 43 |
|
|
+ac_add_options --with-system-zlib=@PREFIX@
|
| 44 |
|
|
+ac_add_options --with-system-png=@PREFIX@
|
| 45 |
|
|
+
|
| 46 |
|
|
+#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2
|
| 47 |
|
|
+#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin
|
| 48 |
|
|
diff -ruN mozilla-orig/browser/components/build/Makefile.in mozilla/browser/components/build/Makefile.in
|
| 49 |
|
|
--- mozilla-orig/browser/components/build/Makefile.in Mon Nov 7 21:25:21 2005
|
| 50 |
|
|
+++ mozilla/browser/components/build/Makefile.in Tue Nov 29 16:28:40 2005
|
| 51 |
|
|
@@ -94,6 +94,12 @@
|
| 52 |
|
|
$(MOZ_COMPONENT_LIBS) \
|
| 53 |
|
|
$(NULL)
|
| 54 |
|
|
|
| 55 |
|
|
+# fix for building on Mac/X11 (bug 257773)
|
| 56 |
|
|
+# dependencies for gkgfx
|
| 57 |
|
|
+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
|
| 58 |
|
|
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
|
| 59 |
|
|
+endif
|
| 60 |
|
|
+
|
| 61 |
|
|
# Need to link to CoreFoundation for Mac Migrators (PList reading code)
|
| 62 |
|
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
| 63 |
|
|
EXTRA_DSO_LDOPTS += \
|
| 64 |
|
|
diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html
|
| 65 |
|
|
--- mozilla-orig/browser/locales/en-US/profile/bookmarks.html Mon Sep 26 20:12:43 2005
|
| 66 |
|
|
+++ mozilla/browser/locales/en-US/profile/bookmarks.html Tue Nov 29 16:28:40 2005
|
| 67 |
|
|
@@ -12,6 +12,7 @@
|
| 68 |
|
|
<DL><p>
|
| 69 |
|
|
<DT><A HREF="http://www.mozilla.org/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>
|
| 70 |
|
|
<DT><A HREF="http://fxfeeds.mozilla.org/" LAST_MODIFIED="1094668003" FEEDURL="http://fxfeeds.mozilla.org/rss20.xml" ID="rdf:#$HvPhC3">Latest Headlines</A>
|
| 71 |
|
|
+ <DT><A HREF="http://fink.sourceforge.net/">Fink - Home</A>
|
| 72 |
|
|
</DL><p>
|
| 73 |
|
|
<HR>
|
| 74 |
|
|
<DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3>
|
| 75 |
|
|
diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
|
| 76 |
|
|
--- mozilla-orig/config/autoconf.mk.in Tue Nov 22 12:20:26 2005
|
| 77 |
|
|
+++ mozilla/config/autoconf.mk.in Tue Nov 29 16:28:40 2005
|
| 78 |
|
|
@@ -54,14 +54,14 @@
|
| 79 |
|
|
prefix = @prefix@
|
| 80 |
|
|
exec_prefix = @exec_prefix@
|
| 81 |
|
|
bindir = @bindir@
|
| 82 |
|
|
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 83 |
|
|
+includedir = @includedir@/$(MOZ_APP_NAME)
|
| 84 |
|
|
libdir = @libdir@
|
| 85 |
|
|
datadir = @datadir@
|
| 86 |
|
|
mandir = @mandir@
|
| 87 |
|
|
-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 88 |
|
|
+idldir = @datadir@/idl/$(MOZ_APP_NAME)
|
| 89 |
|
|
|
| 90 |
|
|
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
| 91 |
|
|
-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
|
| 92 |
|
|
+mozappdir = $(libdir)/$(MOZ_APP_NAME)
|
| 93 |
|
|
+mredir = $(libdir)/mre/mre
|
| 94 |
|
|
mrelibdir = $(mredir)/lib
|
| 95 |
|
|
|
| 96 |
|
|
DIST = $(DEPTH)/dist
|
| 97 |
|
|
diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
|
| 98 |
|
|
--- mozilla-orig/config/config.mk Wed Nov 16 15:59:21 2005
|
| 99 |
|
|
+++ mozilla/config/config.mk Tue Nov 29 16:36:23 2005
|
| 100 |
|
|
@@ -689,7 +689,7 @@
|
| 101 |
|
|
ifeq ($(OS_ARCH),Darwin)
|
| 102 |
|
|
ifdef USE_PREBINDING
|
| 103 |
|
|
export LD_PREBIND=1
|
| 104 |
|
|
-export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
|
| 105 |
|
|
+export LD_PREBIND_ALLOW_OVERLAP=1
|
| 106 |
|
|
endif # USE_PREBINDING
|
| 107 |
|
|
ifdef NEXT_ROOT
|
| 108 |
|
|
export NEXT_ROOT
|
| 109 |
|
|
@@ -766,7 +766,7 @@
|
| 110 |
|
|
# Tell the linker where NSS is, if we're building crypto
|
| 111 |
|
|
ifeq ($(OS_ARCH),Darwin)
|
| 112 |
|
|
ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS)))
|
| 113 |
|
|
-MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library))
|
| 114 |
|
|
+MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @PREFIX@/lib/firefox/$(library):$(DIST)/bin/$(library))
|
| 115 |
|
|
endif
|
| 116 |
|
|
endif
|
| 117 |
|
|
endif
|
| 118 |
|
|
diff -ruN mozilla-orig/config/rules.mk mozilla/config/rules.mk
|
| 119 |
|
|
--- mozilla-orig/config/rules.mk Tue Nov 8 18:08:05 2005
|
| 120 |
|
|
+++ mozilla/config/rules.mk Tue Nov 29 16:36:17 2005
|
| 121 |
|
|
@@ -424,7 +424,7 @@
|
| 122 |
|
|
ifdef IS_COMPONENT
|
| 123 |
|
|
EXTRA_DSO_LDOPTS += -bundle
|
| 124 |
|
|
else
|
| 125 |
|
|
-EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
|
| 126 |
|
|
+EXTRA_DSO_LDOPTS += -dynamiclib -install_name @PREFIX@/lib/firefox/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
|
| 127 |
|
|
endif
|
| 128 |
|
|
endif
|
| 129 |
|
|
endif
|
| 130 |
|
|
diff -ruN mozilla-orig/configure mozilla/configure
|
| 131 |
|
|
--- mozilla-orig/configure Tue Nov 29 14:04:31 2005
|
| 132 |
|
|
+++ mozilla/configure Tue Nov 29 16:28:41 2005
|
| 133 |
|
|
@@ -5492,7 +5492,7 @@
|
| 134 |
|
|
;;
|
| 135 |
|
|
|
| 136 |
|
|
*-darwin*)
|
| 137 |
|
|
- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
|
| 138 |
|
|
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
| 139 |
|
|
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
|
| 140 |
|
|
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
| 141 |
|
|
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin'
|
| 142 |
|
|
@@ -5780,8 +5780,8 @@
|
| 143 |
|
|
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
| 144 |
|
|
|
| 145 |
|
|
_PEDANTIC=
|
| 146 |
|
|
- CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
|
| 147 |
|
|
- CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
|
| 148 |
|
|
+ CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
|
| 149 |
|
|
+ CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
|
| 150 |
|
|
DLL_SUFFIX=".dylib"
|
| 151 |
|
|
DSO_LDOPTS=''
|
| 152 |
|
|
STRIP="$STRIP -x -S"
|
| 153 |
|
|
diff -ruN mozilla-orig/fink/applications/firefox.desktop mozilla/fink/applications/firefox.desktop
|
| 154 |
|
|
--- mozilla-orig/fink/applications/firefox.desktop Wed Dec 31 19:00:00 1969
|
| 155 |
|
|
+++ mozilla/fink/applications/firefox.desktop Tue Nov 29 16:28:41 2005
|
| 156 |
|
|
@@ -0,0 +1,10 @@
|
| 157 |
|
|
+[Desktop Entry]
|
| 158 |
|
|
+Encoding=UTF-8
|
| 159 |
|
|
+Name=Firefox Web Browser
|
| 160 |
|
|
+Comment=Browse the World Wide Web
|
| 161 |
|
|
+Exec=firefox
|
| 162 |
|
|
+Icon=firefox.xpm
|
| 163 |
|
|
+Terminal=false
|
| 164 |
|
|
+Type=Application
|
| 165 |
|
|
+Categories=Application;Network
|
| 166 |
|
|
+StartupNotify=true
|
| 167 |
|
|
diff -ruN mozilla-orig/fink/fink.js mozilla/fink/fink.js
|
| 168 |
|
|
--- mozilla-orig/fink/fink.js Wed Dec 31 19:00:00 1969
|
| 169 |
|
|
+++ mozilla/fink/fink.js Tue Nov 29 16:28:41 2005
|
| 170 |
|
|
@@ -0,0 +1,22 @@
|
| 171 |
|
|
+pref("general.useragent.extra.vendorComment", "Fink Community Edition");
|
| 172 |
|
|
+
|
| 173 |
|
|
+// TrueType
|
| 174 |
|
|
+//pref("font.FreeType2.enable", true);
|
| 175 |
|
|
+//pref("font.freetype2.shared-library", "@PREFIX@/lib/freetype219/lib/libfreetype.6.dylib");
|
| 176 |
|
|
+//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
|
| 177 |
|
|
+//pref("font.freetype2.autohinted", true);
|
| 178 |
|
|
+//pref("font.freetype2.unhinted", true);
|
| 179 |
|
|
+//pref("font.antialias.min", 10);
|
| 180 |
|
|
+//pref("font.embedded_bitmaps.max", 1000000);
|
| 181 |
|
|
+//pref("font.scale.tt_bitmap.dark_text.min", 64);
|
| 182 |
|
|
+//pref("font.scale.tt_bitmap.dark_text.gain", "0.0");
|
| 183 |
|
|
+//pref("font.directory.truetype.1", "/Library/Fonts");
|
| 184 |
|
|
+//pref("font.directory.truetype.2", "/Network/Library/Fonts");
|
| 185 |
|
|
+//pref("font.directory.truetype.3", "/System/Library/Fonts");
|
| 186 |
|
|
+//pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
|
| 187 |
|
|
+//pref("font.directory.truetype.5", "@PREFIX@/share/fonts/truetype");
|
| 188 |
|
|
+
|
| 189 |
|
|
+// AA with Bitmap scaling.
|
| 190 |
|
|
+//pref("font.scale.aa_bitmap.enable", true);
|
| 191 |
|
|
+//pref("font.scale.aa_bitmap.always", false);
|
| 192 |
|
|
+//pref("font.scale.aa_bitmap.min", 6);
|
| 193 |
|
|
diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp
|
| 194 |
|
|
--- mozilla-orig/modules/libpref/src/nsPrefService.cpp Fri May 13 20:30:08 2005
|
| 195 |
|
|
+++ mozilla/modules/libpref/src/nsPrefService.cpp Tue Nov 29 16:28:41 2005
|
| 196 |
|
|
@@ -748,6 +748,7 @@
|
| 197 |
|
|
#elif defined(XP_BEOS)
|
| 198 |
|
|
"beos.js"
|
| 199 |
|
|
#endif
|
| 200 |
|
|
+ , "fink.js"
|
| 201 |
|
|
};
|
| 202 |
|
|
|
| 203 |
|
|
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
|
| 204 |
|
|
diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
|
| 205 |
|
|
--- mozilla-orig/nsprpub/configure Wed Nov 23 00:56:56 2005
|
| 206 |
|
|
+++ mozilla/nsprpub/configure Tue Nov 29 16:36:06 2005
|
| 207 |
|
|
@@ -3402,7 +3402,7 @@
|
| 208 |
|
|
;;
|
| 209 |
|
|
esac
|
| 210 |
|
|
DSO_CFLAGS=-fPIC
|
| 211 |
|
|
- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
|
| 212 |
|
|
+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/firefox/$@ -headerpad_max_install_names'
|
| 213 |
|
|
# Use the standard preprocessor (cpp)
|
| 214 |
|
|
CFLAGS="$CFLAGS -no-cpp-precomp"
|
| 215 |
|
|
MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
|
| 216 |
|
|
@@ -3417,9 +3417,6 @@
|
| 217 |
|
|
|
| 218 |
|
|
# Add Mac OS X support for loading CFM & CFBundle plugins
|
| 219 |
|
|
if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
|
| 220 |
|
|
- cat >> confdefs.h <<\EOF
|
| 221 |
|
|
-#define XP_MACOSX 1
|
| 222 |
|
|
-EOF
|
| 223 |
|
|
|
| 224 |
|
|
OS_TARGET=MacOSX
|
| 225 |
|
|
|
| 226 |
|
|
@@ -5071,8 +5068,6 @@
|
| 227 |
|
|
|
| 228 |
|
|
|
| 229 |
|
|
case $target in
|
| 230 |
|
|
-*-darwin*)
|
| 231 |
|
|
- ;;
|
| 232 |
|
|
*)
|
| 233 |
|
|
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
| 234 |
|
|
echo "configure:5079: checking for dlopen in -ldl" >&5
|
| 235 |
|
|
diff -ruN mozilla-orig/nsprpub/configure.in mozilla/nsprpub/configure.in
|
| 236 |
|
|
--- mozilla-orig/nsprpub/configure.in Wed Nov 23 00:56:56 2005
|
| 237 |
|
|
+++ mozilla/nsprpub/configure.in Tue Nov 29 16:35:58 2005
|
| 238 |
|
|
@@ -938,7 +938,7 @@
|
| 239 |
|
|
;;
|
| 240 |
|
|
esac
|
| 241 |
|
|
DSO_CFLAGS=-fPIC
|
| 242 |
|
|
- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
|
| 243 |
|
|
+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/firefox/$@ -headerpad_max_install_names'
|
| 244 |
|
|
# Use the standard preprocessor (cpp)
|
| 245 |
|
|
CFLAGS="$CFLAGS -no-cpp-precomp"
|
| 246 |
|
|
MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
|
| 247 |
|
|
diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h mozilla/nsprpub/pr/include/md/_darwin.h
|
| 248 |
|
|
--- mozilla-orig/nsprpub/pr/include/md/_darwin.h Mon Aug 15 13:53:33 2005
|
| 249 |
|
|
+++ mozilla/nsprpub/pr/include/md/_darwin.h Tue Nov 29 16:28:41 2005
|
| 250 |
|
|
@@ -62,7 +62,8 @@
|
| 251 |
|
|
|
| 252 |
|
|
#undef HAVE_STACK_GROWING_UP
|
| 253 |
|
|
#define HAVE_DLL
|
| 254 |
|
|
-#define USE_MACH_DYLD
|
| 255 |
|
|
+/* #define USE_MACH_DYLD */
|
| 256 |
|
|
+#define USE_DLFCN
|
| 257 |
|
|
#define _PR_HAVE_SOCKADDR_LEN
|
| 258 |
|
|
#define _PR_STAT_HAS_ST_ATIMESPEC
|
| 259 |
|
|
#define _PR_NO_LARGE_FILES
|
| 260 |
|
|
diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in mozilla/nsprpub/pr/src/Makefile.in
|
| 261 |
|
|
--- mozilla-orig/nsprpub/pr/src/Makefile.in Fri Oct 21 14:15:47 2005
|
| 262 |
|
|
+++ mozilla/nsprpub/pr/src/Makefile.in Tue Nov 29 16:28:41 2005
|
| 263 |
|
|
@@ -204,9 +204,9 @@
|
| 264 |
|
|
endif
|
| 265 |
|
|
endif
|
| 266 |
|
|
|
| 267 |
|
|
-ifeq ($(OS_TARGET),MacOSX)
|
| 268 |
|
|
-OS_LIBS = -framework CoreServices -framework CoreFoundation
|
| 269 |
|
|
-endif
|
| 270 |
|
|
+#ifeq ($(OS_TARGET),MacOSX)
|
| 271 |
|
|
+#OS_LIBS = -framework CoreServices -framework CoreFoundation
|
| 272 |
|
|
+#endif
|
| 273 |
|
|
|
| 274 |
|
|
ifdef GC_LEAK_DETECTOR
|
| 275 |
|
|
EXTRA_LIBS = -L$(dist_libdir) -lboehm
|
| 276 |
|
|
diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
|
| 277 |
|
|
--- mozilla-orig/nsprpub/pr/src/linking/prlink.c Mon Nov 7 17:07:32 2005
|
| 278 |
|
|
+++ mozilla/nsprpub/pr/src/linking/prlink.c Tue Nov 29 16:28:41 2005
|
| 279 |
|
|
@@ -154,7 +154,8 @@
|
| 280 |
|
|
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
|
| 281 |
|
|
|| defined(WIN16) || defined(XP_OS2) \
|
| 282 |
|
|
|| ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
|
| 283 |
|
|
-#define NEED_LEADING_UNDERSCORE
|
| 284 |
|
|
+/* On MacOSX 10.3, dlsym does not accept symbols with '_'. */
|
| 285 |
|
|
+/* #define NEED_LEADING_UNDERSCORE */
|
| 286 |
|
|
#endif
|
| 287 |
|
|
|
| 288 |
|
|
/************************************************************************/
|
| 289 |
|
|
diff -ruN mozilla-orig/security/coreconf/Darwin.mk mozilla/security/coreconf/Darwin.mk
|
| 290 |
|
|
--- mozilla-orig/security/coreconf/Darwin.mk Thu Oct 27 20:08:14 2005
|
| 291 |
|
|
+++ mozilla/security/coreconf/Darwin.mk Tue Nov 29 16:34:51 2005
|
| 292 |
|
|
@@ -106,7 +106,7 @@
|
| 293 |
|
|
ARCH = darwin
|
| 294 |
|
|
|
| 295 |
|
|
# May override this with -bundle to create a loadable module.
|
| 296 |
|
|
-DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names $(DARWIN_SDK_DSOFLAGS)
|
| 297 |
|
|
+DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @PREFIX@/lib/firefox/$(notdir $@) -headerpad_max_install_names $(DARWIN_SDK_DSOFLAGS)
|
| 298 |
|
|
|
| 299 |
|
|
MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
|
| 300 |
|
|
DLL_SUFFIX = dylib
|
| 301 |
|
|
diff -ruN mozilla-orig/security/nss/cmd/platlibs.mk mozilla/security/nss/cmd/platlibs.mk
|
| 302 |
|
|
--- mozilla-orig/security/nss/cmd/platlibs.mk Wed Apr 6 17:35:41 2005
|
| 303 |
|
|
+++ mozilla/security/nss/cmd/platlibs.mk Tue Nov 29 16:34:39 2005
|
| 304 |
|
|
@@ -211,7 +211,7 @@
|
| 305 |
|
|
endif
|
| 306 |
|
|
|
| 307 |
|
|
ifeq ($(OS_ARCH), Darwin)
|
| 308 |
|
|
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 309 |
|
|
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 310 |
|
|
endif
|
| 311 |
|
|
|
| 312 |
|
|
|
| 313 |
|
|
diff -ruN mozilla-orig/security/nss/lib/smime/config.mk mozilla/security/nss/lib/smime/config.mk
|
| 314 |
|
|
--- mozilla-orig/security/nss/lib/smime/config.mk Mon May 24 20:13:09 2004
|
| 315 |
|
|
+++ mozilla/security/nss/lib/smime/config.mk Tue Nov 29 16:34:34 2005
|
| 316 |
|
|
@@ -74,7 +74,7 @@
|
| 317 |
|
|
$(NULL)
|
| 318 |
|
|
|
| 319 |
|
|
ifeq ($(OS_ARCH), Darwin)
|
| 320 |
|
|
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 321 |
|
|
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 322 |
|
|
endif
|
| 323 |
|
|
|
| 324 |
|
|
endif
|
| 325 |
|
|
diff -ruN mozilla-orig/security/nss/lib/ssl/config.mk mozilla/security/nss/lib/ssl/config.mk
|
| 326 |
|
|
--- mozilla-orig/security/nss/lib/ssl/config.mk Mon May 24 20:13:12 2004
|
| 327 |
|
|
+++ mozilla/security/nss/lib/ssl/config.mk Tue Nov 29 16:34:28 2005
|
| 328 |
|
|
@@ -83,7 +83,7 @@
|
| 329 |
|
|
endif
|
| 330 |
|
|
|
| 331 |
|
|
ifeq ($(OS_ARCH), Darwin)
|
| 332 |
|
|
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 333 |
|
|
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
| 334 |
|
|
endif
|
| 335 |
|
|
|
| 336 |
|
|
ifeq ($(OS_TARGET),SunOS)
|
Parent Directory
| 
Revision Log