/[fink]/10.3/seamonkey.patch
ViewVC logotype

Contents of /10.3/seamonkey.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.8 - (show annotations) (download)
Fri Sep 29 17:00:44 2006 UTC (17 years, 7 months ago) by nieder
Branch: MAIN
CVS Tags: HEAD
Changes since 1.7: +0 -0 lines
FILE REMOVED 
remove the file from the tree
1 diff -Naur mozilla-1.7.2.old/.mozconfig mozilla-1.7.2.new/.mozconfig
2 --- mozilla-orig//.mozconfig Thu Jan 1 09:00:00 1970
3 +++ mozilla/.mozconfig Sat Aug 21 02:12:35 2004
4 @@ -0,0 +1,34 @@
5 +ac_add_options --enable-xft
6 +ac_add_options --disable-freetype2
7 +ac_add_options --enable-calendar
8 +ac_add_options --enable-optimize="-O3"
9 +ac_add_options --enable-shared
10 +ac_add_options --disable-debug
11 +ac_add_options --enable-application=suite
12 +ac_add_options --enable-macos-target=10.4
13 +ac_add_options --enable-default-toolkit=gtk2
14 +ac_add_options --with-pthreads
15 +ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/seamonkey
16 +ac_add_options --mandir=@PREFIX@/share/man
17 +ac_add_options --enable-strip
18 +ac_add_options --enable-extensions=all
19 +ac_add_options --enable-image-decoders=all
20 +ac_add_options --enable-ldap-experimental
21 +ac_add_options --enable-necko-protocols=all
22 +ac_add_options --enable-ctl
23 +ac_add_options --enable-xinerama
24 +#ac_add_options --with-system-mng
25 +ac_add_options --with-system-jpeg
26 +ac_add_options --with-system-png
27 +ac_add_options --with-system-zlib
28 +ac_add_options --enable-postscript
29 +ac_add_options --enable-ipv6
30 +ac_add_options --disable-tests
31 +ac_add_options --with-x
32 +ac_add_options --enable-canvas
33 +#ac_add_options --with-qtdir=@PREFIX@
34 +ac_add_options --enable-pango
35 +ac_add_options --enable-svg
36 +ac_add_options --enable-update-packaging
37 +ac_add_options --enable-storage
38 +ac_add_options --enable-profilesharing
39 +ac_add_options --enable-cplus
40 +##########
41 +# --enable-default-toolkit=cairo-gtk2 not useable (also w/o --enable-system-cairo) :
42 +# "nsCairoRenderingContext.cpp:99: error: 'cairo_set_target_surface_DEPRECATED_BY_cairo_create' was not declared in this scope"
43 +# : files in src refer (not always!) to a deprecated version cairo...
44 +# https://bugzilla.mozilla.org/show_bug.cgi?id=334250
45 +## can't enable static : "configure: error: Only one of --enable-shared or --enable-static must be specified."
46 +# no -fstrict-aliasing in '--enable-optimize', else "dereferencing type-punned pointer will break strict-aliasing rules" warnings
47 +# dropped "--enable-xpctools" . Add --enable-javaxpcom (needs xulrunner ?); --with-nss ?
48 +# Also "--enable-boehm" leads to trouble...; probably not important (for a 'production' pkg): according to
49 +# http://www.hpl.hp.com/personal/Hans_Boehm/gc/ , it is only used as a leak detector.
50 diff -ruN mozilla-orig/config/add-chrome.pl mozilla/config/add-chrome.pl
51 --- mozilla-orig/config/add-chrome.pl Wed Jun 1 10:20:34 2005
52 +++ mozilla/config/add-chrome.pl Mon Aug 21 11:03:47 2006
53 @@ -14,7 +14,7 @@
54 my $jarFileName = $ARGV[4];
55
56 my $win32 = ($^O =~ /((MS)?win32)|msys|cygwin|os2/i) ? 1 : 0;
57 -my $macos = ($^O =~ /MacOS|darwin/i) ? 1 : 0;
58 +my $macos = 0;
59 my $unix = !($win32 || $macos) ? 1 : 0;
60
61 sub foreignPlatformFile
62 diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
63 --- mozilla-orig/config/autoconf.mk.in Fri Apr 21 16:50:30 2006
64 +++ mozilla/config/autoconf.mk.in Mon Aug 21 11:03:47 2006
65 @@ -56,14 +56,14 @@
66 prefix = @prefix@
67 exec_prefix = @exec_prefix@
68 bindir = @bindir@
69 -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
70 +includedir = @includedir@/$(MOZ_APP_NAME)
71 libdir = @libdir@
72 datadir = @datadir@
73 mandir = @mandir@
74 -idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
75 +idldir = @datadir@/idl/$(MOZ_APP_NAME)
76
77 -mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
78 -mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
79 +mozappdir = $(libdir)/$(MOZ_APP_NAME)
80 +mredir = $(libdir)/mre/mre
81 mrelibdir = $(mredir)/lib
82
83 DIST = $(DEPTH)/dist
84 diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
85 --- mozilla-orig/config/config.mk Thu Apr 6 12:28:13 2006
86 +++ mozilla/config/config.mk Mon Aug 21 11:03:47 2006
87 @@ -679,7 +679,7 @@
88 ifeq ($(OS_ARCH),Darwin)
89 ifdef USE_PREBINDING
90 export LD_PREBIND=1
91 -export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
92 +export LD_PREBIND_ALLOW_OVERLAP=1
93 endif # USE_PREBINDING
94 ifdef NEXT_ROOT
95 export NEXT_ROOT
96 @@ -759,7 +759,7 @@
97 # Tell the linker where NSS is, if we're building crypto
98 ifeq ($(OS_ARCH),Darwin)
99 ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS)))
100 -MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library))
101 +MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file @PREFIX@/lib/seamonkey/$(library):$(DIST)/bin/$(library))
102 endif
103 endif
104 endif
105 diff -ruN mozilla-orig/config/rules.mk mozilla/config/rules.mk
106 --- mozilla-orig/config/rules.mk Fri Apr 28 15:25:51 2006
107 +++ mozilla/config/rules.mk Mon Aug 21 11:03:47 2006
108 @@ -424,7 +424,7 @@
109 ifdef IS_COMPONENT
110 EXTRA_DSO_LDOPTS += -bundle
111 else
112 -EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
113 +EXTRA_DSO_LDOPTS += -dynamiclib -install_name $(mozappdir)/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
114 endif
115 endif
116 endif
117 diff -ruN mozilla-orig/configure mozilla/configure
118 --- mozilla-orig/configure Fri Jun 16 16:04:20 2006
119 +++ mozilla/configure Mon Aug 21 11:03:47 2006
120 @@ -5516,7 +5516,7 @@
121 ;;
122
123 *-darwin*)
124 - HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
125 + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
126 HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
127 HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
128 MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin'
129 @@ -5802,8 +5802,8 @@
130
131 *-darwin*)
132 _PEDANTIC=
133 - CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
134 - CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
135 + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
136 + CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
137 DLL_SUFFIX=".dylib"
138 DSO_LDOPTS=''
139 STRIP="$STRIP -x -S"
140 diff -ruN mozilla-orig/directory/c-sdk/config/config.mk mozilla/directory/c-sdk/config/config.mk
141 --- mozilla-orig/directory/c-sdk/config/config.mk Sun Feb 23 10:54:18 2003
142 +++ mozilla/directory/c-sdk/config/config.mk Mon Aug 21 11:03:47 2006
143 @@ -60,10 +60,10 @@
144
145 NFSPWD = $(MOD_DEPTH)/config/nfspwd
146
147 -CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
148 - $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
149 -CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
150 - $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
151 +CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\
152 + $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS)
153 +CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\
154 + $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS)
155 # For purify
156 NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
157 $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
158 diff -ruN mozilla-orig/directory/c-sdk/configure mozilla/directory/c-sdk/configure
159 --- mozilla-orig/directory/c-sdk/configure Wed Feb 22 18:58:25 2006
160 +++ mozilla/directory/c-sdk/configure Mon Aug 21 11:03:47 2006
161 @@ -3330,7 +3330,7 @@
162 CPU_ARCH=ppc
163 ;;
164 esac
165 - DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@'
166 + DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/seamonkey/$@'
167 # Use the standard preprocessor (cpp)
168 CFLAGS="$CFLAGS -no-cpp-precomp"
169 MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
170 diff -ruN mozilla-orig/fink/applications/Seamonkey-address.desktop mozilla/fink/applications/Seamonkey-address.desktop
171 --- mozilla-orig/fink/applications/Seamonkey-address.desktop Wed Dec 31 19:00:00 1969
172 +++ mozilla/fink/applications/Seamonkey-address.desktop Mon Aug 21 11:03:47 2006
173 @@ -0,0 +1,11 @@
174 +[Desktop Entry]
175 +Encoding=UTF-8
176 +Name=Seamonkey Addressbook
177 +Comment=Addressbook from Seamonkey Mailnews
178 +Exec=seamonkey -addressbook
179 +Icon=seamonkey-addressbook.xpm
180 +Terminal=false
181 +MultipleArgs=false
182 +Type=Application
183 +Categories=Application;Network
184 +StartupNotify=true
185 diff -ruN mozilla-orig/fink/applications/Seamonkey-calendar.desktop mozilla/fink/applications/Seamonkey-calendar.desktop
186 --- mozilla-orig/fink/applications/Seamonkey-calendar.desktop Wed Dec 31 19:00:00 1969
187 +++ mozilla/fink/applications/Seamonkey-calendar.desktop Mon Aug 21 11:03:47 2006
188 @@ -0,0 +1,11 @@
189 +[Desktop Entry]
190 +Encoding=UTF-8
191 +Name=Seamonkey Calendar
192 +Comment=Seamonkey Calendar
193 +Exec=seamonkey -calendar
194 +Icon=seamonkey-calendar.xpm
195 +Terminal=false
196 +MultipleArgs=false
197 +Type=Application
198 +Categories=Application;Network
199 +StartupNotify=true
200 diff -ruN mozilla-orig/fink/applications/Seamonkey-chatzilla.desktop mozilla/fink/applications/Seamonkey-chatzilla.desktop
201 --- mozilla-orig/fink/applications/Seamonkey-chatzilla.desktop Wed Dec 31 19:00:00 1969
202 +++ mozilla/fink/applications/Seamonkey-chatzilla.desktop Mon Aug 21 11:03:47 2006
203 @@ -0,0 +1,11 @@
204 +[Desktop Entry]
205 +Encoding=UTF-8
206 +Name=Chatzilla
207 +Comment=Seamonkey Chatzilla IRC client
208 +Exec=seamonkey -chat
209 +Icon=seamonkey-chatzilla.xpm
210 +Terminal=false
211 +MultipleArgs=false
212 +Type=Application
213 +Categories=Application;Network
214 +StartupNotify=true
215 diff -ruN mozilla-orig/fink/applications/Seamonkey-editor.desktop mozilla/fink/applications/Seamonkey-editor.desktop
216 --- mozilla-orig/fink/applications/Seamonkey-editor.desktop Wed Dec 31 19:00:00 1969
217 +++ mozilla/fink/applications/Seamonkey-editor.desktop Mon Aug 21 11:03:47 2006
218 @@ -0,0 +1,10 @@
219 +[Desktop Entry]
220 +Encoding=UTF-8
221 +Name=Seamonkey Composer
222 +Comment=HTML editor from Seamonkey project
223 +Exec=seamonkey -edit
224 +Icon=seamonkey-editor.xpm
225 +Terminal=false
226 +Type=Application
227 +Categories=Application;Network
228 +StartupNotify=true
229 diff -ruN mozilla-orig/fink/applications/Seamonkey-mail-composer.desktop mozilla/fink/applications/Seamonkey-mail-composer.desktop
230 --- mozilla-orig/fink/applications/Seamonkey-mail-composer.desktop Wed Dec 31 19:00:00 1969
231 +++ mozilla/fink/applications/Seamonkey-mail-composer.desktop Mon Aug 21 11:03:47 2006
232 @@ -0,0 +1,11 @@
233 +[Desktop Entry]
234 +Encoding=UTF-8
235 +Name=Seamonkey Mail Composer
236 +Comment=Seamonkey Mail Composer
237 +Exec=seamonkey -compose
238 +Icon=seamonkey-mail-composer.xpm
239 +Terminal=false
240 +MultipleArgs=false
241 +Type=Application
242 +Categories=Application;Network
243 +StartupNotify=true
244 diff -ruN mozilla-orig/fink/applications/Seamonkey-mail.desktop mozilla/fink/applications/Seamonkey-mail.desktop
245 --- mozilla-orig/fink/applications/Seamonkey-mail.desktop Wed Dec 31 19:00:00 1969
246 +++ mozilla/fink/applications/Seamonkey-mail.desktop Mon Aug 21 11:03:47 2006
247 @@ -0,0 +1,11 @@
248 +[Desktop Entry]
249 +Encoding=UTF-8
250 +Name=Seamonkey Mail
251 +Comment=Seamonkey Mail
252 +Exec=seamonkey -mail
253 +Icon=seamonkey-mailnews.xpm
254 +Terminal=false
255 +MultipleArgs=false
256 +Type=Application
257 +Categories=Application;Network
258 +StartupNotify=true
259 diff -ruN mozilla-orig/fink/applications/Seamonkey-news.desktop mozilla/fink/applications/Seamonkey-news.desktop
260 --- mozilla-orig/fink/applications/Seamonkey-news.desktop Wed Dec 31 19:00:00 1969
261 +++ mozilla/fink/applications/Seamonkey-news.desktop Mon Aug 21 11:03:47 2006
262 @@ -0,0 +1,11 @@
263 +[Desktop Entry]
264 +Encoding=UTF-8
265 +Name=Seamonkey News
266 +Comment=Seamonkey News
267 +Exec=seamonkey -news
268 +Icon=seamonkey-mailnews.xpm
269 +Terminal=false
270 +MultipleArgs=false
271 +Type=Application
272 +Categories=Application;Network
273 +StartupNotify=true
274 diff -ruN mozilla-orig/fink/applications/Seamonkey.desktop mozilla/fink/applications/Seamonkey.desktop
275 --- mozilla-orig/fink/applications/Seamonkey.desktop Wed Dec 31 19:00:00 1969
276 +++ mozilla/fink/applications/Seamonkey.desktop Mon Aug 21 11:03:47 2006
277 @@ -0,0 +1,10 @@
278 +[Desktop Entry]
279 +Encoding=UTF-8
280 +Name=Seamonkey Web Browser
281 +Comment=Browse the World Wide Web
282 +Exec=seamonkey
283 +Icon=seamonkey.xpm
284 +Terminal=false
285 +Type=Application
286 +Categories=Application;Network
287 +StartupNotify=true
288 diff -ruN mozilla-orig/fink/chrome.d/default mozilla/fink/chrome.d/default
289 --- mozilla-orig/fink/chrome.d/default Wed Dec 31 19:00:00 1969
290 +++ mozilla/fink/chrome.d/default Mon Aug 21 11:03:47 2006
291 @@ -0,0 +1,2 @@
292 +skin,install,select,modern/1.0
293 +locale,install,select,en-US
294 diff -ruN mozilla-orig/fink/mozilla mozilla/fink/mozilla
295 --- mozilla-orig/fink/mozilla Wed Dec 31 19:00:00 1969
296 +++ mozilla/fink/mozilla Mon Aug 21 11:03:47 2006
297 @@ -0,0 +1,98 @@
298 +#!/bin/sh
299 +#
300 +# The contents of this file are subject to the Netscape Public
301 +# License Version 1.1 (the "License"); you may not use this file
302 +# except in compliance with the License. You may obtain a copy of
303 +# the License at http://www.mozilla.org/NPL/
304 +#
305 +# Software distributed under the License is distributed on an "AS
306 +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
307 +# implied. See the License for the specific language governing
308 +# rights and limitations under the License.
309 +#
310 +# The Original Code is mozilla.org code.
311 +#
312 +# The Initial Developer of the Original Code is Netscape
313 +# Communications Corporation. Portions created by Netscape are
314 +# Copyright (C) 1998 Netscape Communications Corporation. All
315 +# Rights Reserved.
316 +#
317 +# Contributor(s):
318 +#
319 +
320 +##
321 +## Usage:
322 +##
323 +## $ mozilla
324 +##
325 +## This script is meant to run a mozilla program from the mozilla
326 +## rpm installation.
327 +##
328 +## The script will setup all the environment voodoo needed to make
329 +## mozilla work.
330 +
331 +##
332 +## Variables
333 +##
334 +## Set MOZILLA_FIVE_HOME
335 +##
336 +MOZILLA_FIVE_HOME="@PREFIX@/lib/seamonkey"
337 +export MOZILLA_FIVE_HOME
338 +
339 +MOZ_PROGRAM="${MOZILLA_FIVE_HOME}/seamonkey-bin"
340 +
341 +##
342 +## Set DYLD_LIBRARY_PATH
343 +##
344 +DYLD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}:${MOZILLA_FIVE_HOME}/components:${MOZILLA_FIVE_HOME}/plugins:${MOZILLA_FIVE_HOME}/ipc/modules:/usr/X11R6/lib:@PREFIX@/lib:$DYLD_LIBRARY_PATH
345 +export DYLD_LIBRARY_PATH
346 +
347 +# If there is no command line argument at all then try to open a new
348 +# window in an already running instance.
349 +
350 +if [ -z "$1" ]; then
351 + $MOZ_PROGRAM -remote "openurl(about:blank,new-window)" >/dev/null
352 + RETURN_VAL=$?
353 + if [ "$RETURN_VAL" -eq "2" ]; then
354 + $MOZ_PROGRAM ${1+"$@"}
355 + RETURN_VAL=$?
356 + fi
357 + exit $RETURN_VAL
358 +fi
359 +
360 +# If there's a command line argument but it doesn't begin with a -
361 +# it's probably a url. Try to send it to a running instance.
362 +
363 +USE_EXIST=0
364 +opt="$1"
365 +case "$opt" in
366 + -*) ;;
367 + *) USE_EXIST=1 ;;
368 +esac
369 +
370 +if [ "${USE_EXIST}" -eq "1" ]; then
371 + # check to make sure that the command contains at least a :/ in it.
372 + echo $opt | grep -e ':/' 2>/dev/null >/dev/null
373 + RETURN_VAL=$?
374 + if [ "$RETURN_VAL" -eq "1" ]; then
375 + # does it begin with a / ?
376 + echo $opt | grep -e '^/' >/dev/null
377 + RETURN_VAL=$?
378 + if [ "$RETURN_VAL" -eq "0" ]; then
379 + opt="file:$opt"
380 + elif [ -e `pwd`/$opt ]; then
381 + opt="`pwd`/$opt"
382 + else
383 + opt="http://$opt"
384 + fi
385 + fi
386 + $MOZ_PROGRAM -remote "openurl($opt,new-window)" >/dev/null
387 + RETURN_VAL=$?
388 + if [ "$RETURN_VAL" -eq "2" ]; then
389 + $MOZ_PROGRAM ${1+"$@"}
390 + RETURN_VAL=$?
391 + fi
392 + exit $RETURN_VAL
393 +fi
394 +
395 +$MOZ_PROGRAM ${1+"$@"}
396 diff -ruN mozilla-orig/fink/prefs.js mozilla/fink/prefs.js
397 --- mozilla-orig/fink/prefs.js Wed Dec 31 19:00:00 1969
398 +++ mozilla/fink/prefs.js Mon Aug 21 11:03:47 2006
399 @@ -0,0 +1,23 @@
400 +// XIM style
401 +pref("xim.input_style", "over-the-spot");
402 +
403 +// TrueType
404 +pref("font.FreeType2.enable", true);
405 +pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
406 +pref("font.FreeType2.autohinted", true);
407 +pref("font.FreeType2.unhinted", true);
408 +pref("font.antialias.min", 10);
409 +pref("font.embedded_bitmaps.max", 1000000);
410 +pref("font.scale.tt_bitmap.dark_text.min", 64);
411 +pref("font.scale.tt_bitmap.dark_text.gain", "0.0");
412 +pref("font.directory.truetype.1", "/Library/Fonts");
413 +pref("font.directory.truetype.2", "/Network/Library/Fonts");
414 +pref("font.directory.truetype.3", "/System/Library/Fonts");
415 +pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
416 +pref("font.directory.truetype.5", "@PREFIX@/share/fonts/truetype");
417 +
418 +// AA with Bitmap scaling.
419 +pref("font.scale.aa_bitmap.enable", true);
420 +pref("font.scale.aa_bitmap.always", false);
421 +pref("font.scale.aa_bitmap.min", 6);
422 +
423 diff -ruN mozilla-orig/fink/update-seamonkey-chrome mozilla/fink/update-seamonkey-chrome
424 --- mozilla-orig/fink/update-seamonkey-chrome Wed Dec 31 19:00:00 1969
425 +++ mozilla/fink/update-seamonkey-chrome Mon Aug 21 11:03:47 2006
426 @@ -0,0 +1,20 @@
427 +#!/bin/sh -e
428 +
429 +ulimit -s unlimited || true
430 +
431 +MOZILLA_FIVE_HOME=@PREFIX@/lib/seamonkey
432 +CHROME_DIR=@PREFIX@/var/lib/seamonkey/chrome.d
433 +
434 +export DYLD_LIBRARY_PATH=${MOZILLA_FIVE_HOME}:${MOZILLA_FIVE_HOME}/components:${MOZILLA_FIVE_HOME}/plugins:${MOZILLA_FIVE_HOME}/ipc/modules:/usr/X11R6/lib:@PREFIX@/lib:$DYLD_LIBRARY_PATH
435 +cd ${MOZILLA_FIVE_HOME}
436 +TMPFILE=`tempfile`
437 +cat ${CHROME_DIR}/* >>${TMPFILE}
438 +mv ${TMPFILE} chrome/installed-chrome.txt
439 +chmod 644 chrome/installed-chrome.txt
440 +
441 +rm -f chrome/{c,o,s}*.rdf components/*.dat
442 +sudo -H ./run-mozilla.sh ${MOZILLA_FIVE_HOME}/regxpcom || true
443 +sudo -H ./run-mozilla.sh ${MOZILLA_FIVE_HOME}/regchrome || true
444 +
445 +echo "Done registering components"
446 +exit 0
447 diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp
448 --- mozilla-orig/modules/libpref/src/nsPrefService.cpp Fri May 13 20:30:08 2005
449 +++ mozilla/modules/libpref/src/nsPrefService.cpp Mon Aug 21 11:03:47 2006
450 @@ -748,6 +748,7 @@
451 #elif defined(XP_BEOS)
452 "beos.js"
453 #endif
454 + , "fink.js"
455 };
456
457 rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
458 diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
459 --- mozilla-orig/nsprpub/configure Wed Feb 22 18:03:10 2006
460 +++ mozilla/nsprpub/configure Mon Aug 21 11:03:47 2006
461 @@ -3326,7 +3326,7 @@
462 ;;
463 esac
464 DSO_CFLAGS=-fPIC
465 - DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'
466 + DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/seamonkey/$@ -headerpad_max_install_names'
467 # Use the standard preprocessor (cpp)
468 CFLAGS="$CFLAGS -no-cpp-precomp"
469 MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
470 @@ -3338,9 +3338,6 @@
471
472 # Add Mac OS X support for loading CFM & CFBundle plugins
473 if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
474 - cat >> confdefs.h <<\EOF
475 -#define XP_MACOSX 1
476 -EOF
477
478 OS_TARGET=MacOSX
479
480 @@ -4960,8 +4957,6 @@
481
482
483 case $target in
484 -*-darwin*)
485 - ;;
486 *)
487 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
488 echo "configure:4968: checking for dlopen in -ldl" >&5
489 diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h mozilla/nsprpub/pr/include/md/_darwin.h
490 --- mozilla-orig/nsprpub/pr/include/md/_darwin.h Tue Jan 10 18:16:38 2006
491 +++ mozilla/nsprpub/pr/include/md/_darwin.h Mon Aug 21 11:03:47 2006
492 @@ -62,7 +62,8 @@
493
494 #undef HAVE_STACK_GROWING_UP
495 #define HAVE_DLL
496 -#define USE_MACH_DYLD
497 +/* #define USE_MACH_DYLD */
498 +#define USE_DLFCN
499 #define _PR_HAVE_SOCKADDR_LEN
500 #define _PR_STAT_HAS_ST_ATIMESPEC
501 #define _PR_NO_LARGE_FILES
502 diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in mozilla/nsprpub/pr/src/Makefile.in
503 --- mozilla-orig/nsprpub/pr/src/Makefile.in Mon Feb 13 13:48:14 2006
504 +++ mozilla/nsprpub/pr/src/Makefile.in Mon Aug 21 11:03:47 2006
505 @@ -204,9 +204,9 @@
506 endif
507 endif
508
509 -ifeq ($(OS_TARGET),MacOSX)
510 -OS_LIBS = -framework CoreServices -framework CoreFoundation
511 -endif
512 +#ifeq ($(OS_TARGET),MacOSX)
513 +#OS_LIBS = -framework CoreServices -framework CoreFoundation
514 +#endif
515
516 ifdef GC_LEAK_DETECTOR
517 EXTRA_LIBS = -L$(dist_libdir) -lboehm
518 diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
519 --- mozilla-orig/nsprpub/pr/src/linking/prlink.c Thu Aug 18 13:24:29 2005
520 +++ mozilla/nsprpub/pr/src/linking/prlink.c Mon Aug 21 11:03:47 2006
521 @@ -154,7 +154,8 @@
522 #if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
523 || defined(WIN16) || defined(XP_OS2) \
524 || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
525 -#define NEED_LEADING_UNDERSCORE
526 +/* On MacOSX 10.3, dlsym does not accept symbols with '_'.
527 +/* #define NEED_LEADING_UNDERSCORE */
528 #endif
529
530 /************************************************************************/
531 diff -ruN mozilla-orig/security/nss/cmd/platlibs.mk mozilla/security/nss/cmd/platlibs.mk
532 --- mozilla-orig/security/nss/cmd/platlibs.mk Wed Apr 6 17:35:41 2005
533 +++ mozilla/security/nss/cmd/platlibs.mk Mon Aug 21 11:03:47 2006
534 @@ -211,7 +211,7 @@
535 endif
536
537 ifeq ($(OS_ARCH), Darwin)
538 -EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
539 +EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/seamonkey/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
540 endif
541
542
543 diff -ruN mozilla-orig/security/nss/lib/smime/config.mk mozilla/security/nss/lib/smime/config.mk
544 --- mozilla-orig/security/nss/lib/smime/config.mk Mon May 24 20:13:09 2004
545 +++ mozilla/security/nss/lib/smime/config.mk Mon Aug 21 11:03:48 2006
546 @@ -74,7 +74,7 @@
547 $(NULL)
548
549 ifeq ($(OS_ARCH), Darwin)
550 -EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
551 +EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/seamonkey/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
552 endif
553
554 endif
555 diff -ruN mozilla-orig/security/nss/lib/ssl/config.mk mozilla/security/nss/lib/ssl/config.mk
556 --- mozilla-orig/security/nss/lib/ssl/config.mk Mon May 24 20:13:12 2004
557 +++ mozilla/security/nss/lib/ssl/config.mk Mon Aug 21 11:03:48 2006
558 @@ -83,7 +83,7 @@
559 endif
560
561 ifeq ($(OS_ARCH), Darwin)
562 -EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
563 +EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/seamonkey/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
564 endif
565
566 ifeq ($(OS_TARGET),SunOS)
567 diff -ruN mozilla-orig/themes/Makefile.in mozilla/themes/Makefile.in
568 --- mozilla-orig/themes/Makefile.in Fri Mar 11 14:39:35 2005
569 +++ mozilla/themes/Makefile.in Mon Aug 21 11:03:48 2006
570 @@ -50,7 +50,9 @@
571
572 # select classic as the default skin
573 libs::
574 - echo skin,install,select,classic/1.0 >> $(DIST)/bin/chrome/installed-chrome.txt
575 +# fix later
576 +# echo skin,install,select,classic/1.0 >> $(DIST)/bin/chrome/installed-chrome.txt
577
578 install::
579 - echo skin,install,select,classic/1.0 >> $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
580 +# fix later
581 +# echo skin,install,select,classic/1.0 >> $(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
  ViewVC Help
Powered by ViewVC 1.1.17