1 |
diff -ruN mozilla-1.0-orig/.mozconfig mozilla-1.0/.mozconfig
|
2 |
--- mozilla-1.0-orig/.mozconfig Wed Dec 31 18:00:00 1969
|
3 |
+++ mozilla-1.0/.mozconfig Thu Dec 2 09:41:18 2004
|
4 |
@@ -0,0 +1,45 @@
|
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-default-toolkit=gtk2
|
20 |
+ac_add_options --enable-xft
|
21 |
+#ac_add_options --disable-xft
|
22 |
+#ac_add_options --enable-freetype2
|
23 |
+ac_add_options --disable-freetype2
|
24 |
+ac_add_options --enable-xinerama
|
25 |
+ac_add_options --with-pthreads
|
26 |
+ac_add_options --disable-gnomevfs
|
27 |
+
|
28 |
+#ac_add_options --enable-official-branding
|
29 |
+#ac_add_options --disable-shared
|
30 |
+#ac_add_options --enable-static
|
31 |
+#ac_add_options --enable-prebinding
|
32 |
+ac_add_options --disable-prebinding
|
33 |
+ac_add_options --disable-debug
|
34 |
+ac_add_options --disable-tests
|
35 |
+ac_add_options --enable-strip
|
36 |
+ac_add_options --enable-optimize='-O2'
|
37 |
+ac_add_options --enable-macos-target=10.3
|
38 |
+ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox
|
39 |
+ac_add_options --with-system-jpeg=@PREFIX@
|
40 |
+ac_add_options --with-system-zlib=@PREFIX@
|
41 |
+ac_add_options --with-system-png=@PREFIX@
|
42 |
+#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2
|
43 |
+#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin
|
44 |
+
|
45 |
+# SVG stuff
|
46 |
+#ac_add_options --enable-svg
|
47 |
+#ac_add_options --enable-svg-renderer-libart
|
48 |
+#mk_add_options MOZ_INTERNAL_LIBART_LGPL=1
|
49 |
+#MOZ_INTERNAL_LIBART_LGPL=1
|
50 |
diff -ruN mozilla-1.0-orig/browser/components/build/Makefile.in mozilla-1.0/browser/components/build/Makefile.in
|
51 |
--- mozilla-1.0-orig/browser/components/build/Makefile.in Thu Jul 15 15:43:54 2004
|
52 |
+++ mozilla-1.0/browser/components/build/Makefile.in Mon Nov 29 11:48:53 2004
|
53 |
@@ -75,6 +75,11 @@
|
54 |
$(MOZ_COMPONENT_LIBS) \
|
55 |
$(NULL)
|
56 |
|
57 |
+# dependencies for gkgfx
|
58 |
+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
|
59 |
+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
|
60 |
+endif
|
61 |
+
|
62 |
# Need to link to CoreFoundation for Mac Migrators (PList reading code)
|
63 |
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
64 |
EXTRA_DSO_LDOPTS += \
|
65 |
diff -ruN mozilla-1.0-orig/browser/config/mozconfig mozilla-1.0/browser/config/mozconfig
|
66 |
--- mozilla-1.0-orig/browser/config/mozconfig Wed Jul 7 03:31:10 2004
|
67 |
+++ mozilla-1.0/browser/config/mozconfig Mon Nov 29 11:48:53 2004
|
68 |
@@ -8,7 +8,7 @@
|
69 |
|
70 |
ac_add_options --disable-ldap
|
71 |
ac_add_options --disable-mailnews
|
72 |
-ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs,negotiateauth
|
73 |
+ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,negotiateauth
|
74 |
ac_add_options --enable-crypto
|
75 |
ac_add_options --disable-composer
|
76 |
ac_add_options --enable-single-profile
|
77 |
diff -ruN mozilla-1.0-orig/browser/locales/en-US/profile/bookmarks.html mozilla-1.0/browser/locales/en-US/profile/bookmarks.html
|
78 |
--- mozilla-1.0-orig/browser/locales/en-US/profile/bookmarks.html Mon Nov 1 17:54:10 2004
|
79 |
+++ mozilla-1.0/browser/locales/en-US/profile/bookmarks.html Mon Nov 29 11:48:53 2004
|
80 |
@@ -12,6 +12,7 @@
|
81 |
<DL><p>
|
82 |
<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>
|
83 |
<DT><A HREF="http://fxfeeds.mozilla.org/" LAST_MODIFIED="1094668003" FEEDURL="http://fxfeeds.mozilla.org/rss20.xml" ID="rdf:#$HvPhC3">Latest Headlines</A>
|
84 |
+ <DT><A HREF="http://fink.sourceforge.net/" >Fink - Home</A>
|
85 |
</DL><p>
|
86 |
<HR>
|
87 |
<DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3>
|
88 |
diff -ruN mozilla-1.0-orig/config/add-chrome.pl mozilla-1.0/config/add-chrome.pl
|
89 |
--- mozilla-1.0-orig/config/add-chrome.pl Fri Feb 20 16:14:12 2004
|
90 |
+++ mozilla-1.0/config/add-chrome.pl Mon Nov 29 11:48:53 2004
|
91 |
@@ -14,7 +14,7 @@
|
92 |
my $jarFileName = $ARGV[4];
|
93 |
|
94 |
my $win32 = ($^O =~ /((MS)?win32)|cygwin|os2/i) ? 1 : 0;
|
95 |
-my $macos = ($^O =~ /MacOS|darwin/i) ? 1 : 0;
|
96 |
+my $macos = 0;
|
97 |
my $unix = !($win32 || $macos) ? 1 : 0;
|
98 |
|
99 |
sub foreignPlatformFile
|
100 |
diff -ruN mozilla-1.0-orig/config/autoconf.mk.in mozilla-1.0/config/autoconf.mk.in
|
101 |
--- mozilla-1.0-orig/config/autoconf.mk.in Sat Oct 30 23:29:54 2004
|
102 |
+++ mozilla-1.0/config/autoconf.mk.in Mon Nov 29 11:48:53 2004
|
103 |
@@ -32,14 +32,14 @@
|
104 |
prefix = @prefix@
|
105 |
exec_prefix = @exec_prefix@
|
106 |
bindir = @bindir@
|
107 |
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
108 |
+includedir = @includedir@/$(MOZ_APP_NAME)
|
109 |
libdir = @libdir@
|
110 |
datadir = @datadir@
|
111 |
mandir = @mandir@
|
112 |
-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
113 |
+idldir = @datadir@/idl/$(MOZ_APP_NAME)
|
114 |
|
115 |
-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
|
116 |
-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
|
117 |
+mozappdir = $(libdir)/$(MOZ_APP_NAME)
|
118 |
+mredir = $(libdir)/mre/mre
|
119 |
mrelibdir = $(mredir)/lib
|
120 |
|
121 |
DIST = $(DEPTH)/dist
|
122 |
diff -ruN mozilla-1.0-orig/config/config.mk mozilla-1.0/config/config.mk
|
123 |
--- mozilla-1.0-orig/config/config.mk Mon Oct 11 23:11:11 2004
|
124 |
+++ mozilla-1.0/config/config.mk Mon Nov 29 11:48:53 2004
|
125 |
@@ -712,7 +712,7 @@
|
126 |
ifeq ($(OS_ARCH),Darwin)
|
127 |
ifdef USE_PREBINDING
|
128 |
export LD_PREBIND=1
|
129 |
-export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
|
130 |
+export LD_PREBIND_ALLOW_OVERLAP=1
|
131 |
endif
|
132 |
ifdef MACOS_SDK_DIR
|
133 |
export NEXT_ROOT=$(MACOS_SDK_DIR)
|
134 |
@@ -765,7 +765,7 @@
|
135 |
# Tell the linker where NSS is, if we're building crypto
|
136 |
ifeq ($(OS_ARCH),Darwin)
|
137 |
ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS)))
|
138 |
-MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library))
|
139 |
+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))
|
140 |
endif
|
141 |
endif
|
142 |
endif
|
143 |
diff -ruN mozilla-1.0-orig/config/rules.mk mozilla-1.0/config/rules.mk
|
144 |
--- mozilla-1.0-orig/config/rules.mk Wed Aug 11 14:44:17 2004
|
145 |
+++ mozilla-1.0/config/rules.mk Mon Nov 29 11:48:53 2004
|
146 |
@@ -421,7 +421,7 @@
|
147 |
ifdef IS_COMPONENT
|
148 |
EXTRA_DSO_LDOPTS += -bundle
|
149 |
else
|
150 |
-EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
|
151 |
+EXTRA_DSO_LDOPTS += -dynamiclib -install_name \$(mozappdir)/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
|
152 |
endif
|
153 |
endif
|
154 |
endif
|
155 |
diff -ruN mozilla-1.0-orig/configure mozilla-1.0/configure
|
156 |
--- mozilla-1.0-orig/configure Sun Oct 31 01:17:58 2004
|
157 |
+++ mozilla-1.0/configure Mon Nov 29 11:48:53 2004
|
158 |
@@ -4996,7 +4996,7 @@
|
159 |
;;
|
160 |
|
161 |
*-darwin*)
|
162 |
- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
|
163 |
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
|
164 |
HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
|
165 |
HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
|
166 |
;;
|
167 |
@@ -5227,8 +5227,8 @@
|
168 |
|
169 |
*-darwin*)
|
170 |
_PEDANTIC=
|
171 |
- CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
|
172 |
- CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
|
173 |
+ CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
|
174 |
+ CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
|
175 |
DLL_SUFFIX=".dylib"
|
176 |
DSO_LDOPTS=''
|
177 |
STRIP="$STRIP -x -S"
|
178 |
diff -ruN mozilla-1.0-orig/directory/c-sdk/config/config.mk mozilla-1.0/directory/c-sdk/config/config.mk
|
179 |
--- mozilla-1.0-orig/directory/c-sdk/config/config.mk Sun Feb 23 09:54:18 2003
|
180 |
+++ mozilla-1.0/directory/c-sdk/config/config.mk Mon Nov 29 11:48:53 2004
|
181 |
@@ -60,10 +60,10 @@
|
182 |
|
183 |
NFSPWD = $(MOD_DEPTH)/config/nfspwd
|
184 |
|
185 |
-CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
|
186 |
- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
|
187 |
-CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
|
188 |
- $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
|
189 |
+CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\
|
190 |
+ $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS)
|
191 |
+CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\
|
192 |
+ $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS)
|
193 |
# For purify
|
194 |
NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
|
195 |
$(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
|
196 |
diff -ruN mozilla-1.0-orig/directory/c-sdk/configure mozilla-1.0/directory/c-sdk/configure
|
197 |
--- mozilla-1.0-orig/directory/c-sdk/configure Tue Sep 14 16:10:26 2004
|
198 |
+++ mozilla-1.0/directory/c-sdk/configure Mon Nov 29 11:48:53 2004
|
199 |
@@ -3401,7 +3401,7 @@
|
200 |
|
201 |
CPU_ARCH=ppc
|
202 |
fi
|
203 |
- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@'
|
204 |
+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/firefox/$@'
|
205 |
# Use the standard preprocessor (cpp)
|
206 |
CFLAGS="$CFLAGS -no-cpp-precomp"
|
207 |
MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
|
208 |
diff -ruN mozilla-1.0-orig/fink/applications/firefox.desktop mozilla-1.0/fink/applications/firefox.desktop
|
209 |
--- mozilla-1.0-orig/fink/applications/firefox.desktop Wed Dec 31 18:00:00 1969
|
210 |
+++ mozilla-1.0/fink/applications/firefox.desktop Mon Nov 29 11:48:53 2004
|
211 |
@@ -0,0 +1,10 @@
|
212 |
+[Desktop Entry]
|
213 |
+Encoding=UTF-8
|
214 |
+Name=Firefox Web Browser
|
215 |
+Comment=Browse the World Wide Web
|
216 |
+Exec=firefox
|
217 |
+Icon=firefox.xpm
|
218 |
+Terminal=false
|
219 |
+Type=Application
|
220 |
+Categories=Application;Network
|
221 |
+StartupNotify=true
|
222 |
diff -ruN mozilla-1.0-orig/fink/prefs.js mozilla-1.0/fink/prefs.js
|
223 |
--- mozilla-1.0-orig/fink/prefs.js Wed Dec 31 18:00:00 1969
|
224 |
+++ mozilla-1.0/fink/prefs.js Thu Dec 2 09:41:47 2004
|
225 |
@@ -0,0 +1,22 @@
|
226 |
+pref("general.useragent.vendorComment", "Fink Community Edition");
|
227 |
+
|
228 |
+// TrueType
|
229 |
+//pref("font.FreeType2.enable", true);
|
230 |
+//pref("font.freetype2.shared-library", "@PREFIX@/lib/libfreetype.6.dylib");
|
231 |
+//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
|
232 |
+//pref("font.freetype2.autohinted", true);
|
233 |
+//pref("font.freetype2.unhinted", true);
|
234 |
+//pref("font.antialias.min", 10);
|
235 |
+//pref("font.embedded_bitmaps.max", 1000000);
|
236 |
+//pref("font.scale.tt_bitmap.dark_text.min", 64);
|
237 |
+//pref("font.scale.tt_bitmap.dark_text.gain", "0.0");
|
238 |
+//pref("font.directory.truetype.1", "/Library/Fonts");
|
239 |
+//pref("font.directory.truetype.2", "/Network/Library/Fonts");
|
240 |
+//pref("font.directory.truetype.3", "/System/Library/Fonts");
|
241 |
+//pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
|
242 |
+//pref("font.directory.truetype.5", "@PREFIX@/share/fonts/truetype");
|
243 |
+
|
244 |
+// AA with Bitmap scaling.
|
245 |
+//pref("font.scale.aa_bitmap.enable", true);
|
246 |
+//pref("font.scale.aa_bitmap.always", false);
|
247 |
+//pref("font.scale.aa_bitmap.min", 6);
|
248 |
diff -ruN mozilla-1.0-orig/modules/libpref/src/nsPrefService.cpp mozilla-1.0/modules/libpref/src/nsPrefService.cpp
|
249 |
--- mozilla-1.0-orig/modules/libpref/src/nsPrefService.cpp Mon Jul 26 02:52:43 2004
|
250 |
+++ mozilla-1.0/modules/libpref/src/nsPrefService.cpp Mon Nov 29 11:48:53 2004
|
251 |
@@ -747,6 +747,7 @@
|
252 |
#elif defined(XP_BEOS)
|
253 |
"beos.js"
|
254 |
#endif
|
255 |
+ , "fink.js"
|
256 |
};
|
257 |
|
258 |
rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
|
259 |
diff -ruN mozilla-1.0-orig/nsprpub/configure mozilla-1.0/nsprpub/configure
|
260 |
--- mozilla-1.0-orig/nsprpub/configure Tue Sep 14 16:10:26 2004
|
261 |
+++ mozilla-1.0/nsprpub/configure Mon Nov 29 11:48:53 2004
|
262 |
@@ -3305,7 +3305,7 @@
|
263 |
|
264 |
CPU_ARCH=ppc
|
265 |
fi
|
266 |
- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
|
267 |
+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/firefox/$@ -headerpad_max_install_names'
|
268 |
# Use the standard preprocessor (cpp)
|
269 |
CFLAGS="$CFLAGS -no-cpp-precomp"
|
270 |
MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
|
271 |
@@ -3320,9 +3320,6 @@
|
272 |
|
273 |
# Add Mac OS X support for loading CFM & CFBundle plugins
|
274 |
if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
|
275 |
- cat >> confdefs.h <<\EOF
|
276 |
-#define XP_MACOSX 1
|
277 |
-EOF
|
278 |
|
279 |
OS_TARGET=MacOSX
|
280 |
|
281 |
@@ -4845,8 +4842,6 @@
|
282 |
|
283 |
|
284 |
case $target in
|
285 |
-*-darwin*)
|
286 |
- ;;
|
287 |
*)
|
288 |
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
289 |
echo "configure:4853: checking for dlopen in -ldl" >&5
|
290 |
diff -ruN mozilla-1.0-orig/nsprpub/pr/include/md/_darwin.h mozilla-1.0/nsprpub/pr/include/md/_darwin.h
|
291 |
--- mozilla-1.0-orig/nsprpub/pr/include/md/_darwin.h Wed Nov 26 19:30:44 2003
|
292 |
+++ mozilla-1.0/nsprpub/pr/include/md/_darwin.h Mon Nov 29 11:48:53 2004
|
293 |
@@ -55,7 +55,8 @@
|
294 |
|
295 |
#undef HAVE_STACK_GROWING_UP
|
296 |
#define HAVE_DLL
|
297 |
-#define USE_MACH_DYLD
|
298 |
+/* #define USE_MACH_DYLD */
|
299 |
+#define USE_DLFCN
|
300 |
#define _PR_HAVE_SOCKADDR_LEN
|
301 |
#define _PR_STAT_HAS_ST_ATIMESPEC
|
302 |
#define _PR_NO_LARGE_FILES
|
303 |
diff -ruN mozilla-1.0-orig/nsprpub/pr/src/Makefile.in mozilla-1.0/nsprpub/pr/src/Makefile.in
|
304 |
--- mozilla-1.0-orig/nsprpub/pr/src/Makefile.in Mon Mar 22 18:40:17 2004
|
305 |
+++ mozilla-1.0/nsprpub/pr/src/Makefile.in Mon Nov 29 11:48:53 2004
|
306 |
@@ -199,9 +199,9 @@
|
307 |
endif
|
308 |
endif
|
309 |
|
310 |
-ifeq ($(OS_TARGET),MacOSX)
|
311 |
-OS_LIBS = -framework CoreServices -framework CoreFoundation
|
312 |
-endif
|
313 |
+#ifeq ($(OS_TARGET),MacOSX)
|
314 |
+#OS_LIBS = -framework CoreServices -framework CoreFoundation
|
315 |
+#endif
|
316 |
|
317 |
ifdef GC_LEAK_DETECTOR
|
318 |
EXTRA_LIBS = -L$(dist_libdir) -lboehm
|
319 |
diff -ruN mozilla-1.0-orig/nsprpub/pr/src/linking/prlink.c mozilla-1.0/nsprpub/pr/src/linking/prlink.c
|
320 |
--- mozilla-1.0-orig/nsprpub/pr/src/linking/prlink.c Tue Jan 20 13:46:21 2004
|
321 |
+++ mozilla-1.0/nsprpub/pr/src/linking/prlink.c Mon Nov 29 11:48:53 2004
|
322 |
@@ -164,7 +164,8 @@
|
323 |
#if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
|
324 |
|| defined(WIN16) || defined(XP_OS2) \
|
325 |
|| ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
|
326 |
-#define NEED_LEADING_UNDERSCORE
|
327 |
+/* On MacOSX 10.3, dlsym does not accept symbols with '_'.
|
328 |
+/* #define NEED_LEADING_UNDERSCORE */
|
329 |
#endif
|
330 |
|
331 |
#ifdef XP_PC
|
332 |
diff -ruN mozilla-1.0-orig/security/coreconf/Darwin.mk mozilla-1.0/security/coreconf/Darwin.mk
|
333 |
--- mozilla-1.0-orig/security/coreconf/Darwin.mk Wed Nov 12 19:59:22 2003
|
334 |
+++ mozilla-1.0/security/coreconf/Darwin.mk Mon Nov 29 11:48:53 2004
|
335 |
@@ -68,7 +68,7 @@
|
336 |
ARCH = darwin
|
337 |
|
338 |
# May override this with -bundle to create a loadable module.
|
339 |
-DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
|
340 |
+DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1 -install_name @PREFIX@/lib/firefox/$(notdir $@) -headerpad_max_install_names
|
341 |
|
342 |
MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
|
343 |
DLL_SUFFIX = dylib
|
344 |
diff -ruN mozilla-1.0-orig/security/nss/cmd/platlibs.mk mozilla-1.0/security/nss/cmd/platlibs.mk
|
345 |
--- mozilla-1.0-orig/security/nss/cmd/platlibs.mk Fri Oct 15 16:13:50 2004
|
346 |
+++ mozilla-1.0/security/nss/cmd/platlibs.mk Mon Nov 29 11:48:53 2004
|
347 |
@@ -207,7 +207,7 @@
|
348 |
endif
|
349 |
|
350 |
ifeq ($(OS_ARCH), Darwin)
|
351 |
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
352 |
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
353 |
endif
|
354 |
|
355 |
|
356 |
diff -ruN mozilla-1.0-orig/security/nss/lib/smime/config.mk mozilla-1.0/security/nss/lib/smime/config.mk
|
357 |
--- mozilla-1.0-orig/security/nss/lib/smime/config.mk Fri Oct 15 16:13:56 2004
|
358 |
+++ mozilla-1.0/security/nss/lib/smime/config.mk Mon Nov 29 11:48:53 2004
|
359 |
@@ -70,7 +70,7 @@
|
360 |
$(NULL)
|
361 |
|
362 |
ifeq ($(OS_ARCH), Darwin)
|
363 |
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
364 |
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
365 |
endif
|
366 |
|
367 |
endif
|
368 |
diff -ruN mozilla-1.0-orig/security/nss/lib/ssl/config.mk mozilla-1.0/security/nss/lib/ssl/config.mk
|
369 |
--- mozilla-1.0-orig/security/nss/lib/ssl/config.mk Fri Oct 15 16:13:57 2004
|
370 |
+++ mozilla-1.0/security/nss/lib/ssl/config.mk Mon Nov 29 11:48:53 2004
|
371 |
@@ -75,7 +75,7 @@
|
372 |
endif
|
373 |
|
374 |
ifeq ($(OS_ARCH), Darwin)
|
375 |
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
376 |
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
|
377 |
endif
|
378 |
|
379 |
ifeq ($(OS_TARGET),SunOS)
|
380 |
diff -ruN mozilla-1.0-orig/themes/Makefile.in mozilla-1.0/themes/Makefile.in
|
381 |
--- mozilla-1.0-orig/themes/Makefile.in Sun May 16 13:16:49 2004
|
382 |
+++ mozilla-1.0/themes/Makefile.in Mon Nov 29 11:48:53 2004
|
383 |
@@ -54,7 +54,9 @@
|
384 |
|
385 |
# select classic as the default skin
|
386 |
libs::
|
387 |
- echo skin,install,select,classic/1.0 >> $(DIST)/bin/chrome/installed-chrome.txt
|
388 |
+# fix later
|
389 |
+# echo skin,install,select,classic/1.0 >> $(DIST)/bin/chrome/installed-chrome.txt
|
390 |
|
391 |
install::
|
392 |
- echo skin,install,select,classic/1.0 >> $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
|
393 |
+# fix later
|
394 |
+# echo skin,install,select,classic/1.0 >> $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
|