1 Index: mozilla/content/html/content/src/nsFormSubmission.cpp
2 ===================================================================
3 RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v
4 retrieving revision 1.46
5 diff --context=3 -r1.46 nsFormSubmission.cpp
6 *** mozilla/content/html/content/src/nsFormSubmission.cpp 13 Jul 2005 16:55:59 -0000 1.46
7 --- mozilla/content/html/content/src/nsFormSubmission.cpp 21 Jul 2006 00:27:14 -0000
12 nsCAutoString charset(aCharset);
13 - // canonical name is passed so that we just have to check against
14 - // *our* canonical names listed in charsetaliases.properties
15 - if (charset.EqualsLiteral("ISO-8859-1")) {
16 - charset.AssignLiteral("windows-1252");
19 // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
22 Index: mozilla/embedding/base/Makefile.in
23 ===================================================================
24 RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v
25 retrieving revision 1.34.8.2
26 diff --context=3 -r1.34.8.2 Makefile.in
27 *** mozilla/embedding/base/Makefile.in 14 Feb 2006 05:28:31 -0000 1.34.8.2
28 --- mozilla/embedding/base/Makefile.in 21 Jul 2006 00:27:14 -0000
34 LIBRARY_NAME = embed_base_s
36 XPIDL_MODULE = embed_base
38 include $(DEPTH)/config/autoconf.mk
39 Index: mozilla/js/src/Makefile.in
40 ===================================================================
41 RCS file: /cvsroot/mozilla/js/src/Makefile.in,v
42 retrieving revision 3.95.4.4
43 diff --context=3 -r3.95.4.4 Makefile.in
44 *** mozilla/js/src/Makefile.in 7 Jul 2006 02:12:02 -0000 3.95.4.4
45 --- mozilla/js/src/Makefile.in 21 Jul 2006 00:27:14 -0000
56 Index: mozilla/minimo/Makefile.in
57 ===================================================================
58 RCS file: /cvsroot/mozilla/minimo/Makefile.in,v
59 retrieving revision 1.1.2.2
60 diff --context=3 -r1.1.2.2 Makefile.in
61 *** mozilla/minimo/Makefile.in 29 Jun 2006 06:11:30 -0000 1.1.2.2
62 --- mozilla/minimo/Makefile.in 21 Jul 2006 00:27:14 -0000
66 include $(DEPTH)/config/autoconf.mk
68 ! DIRS = config components chrome locales customization base
70 include $(topsrcdir)/config/rules.mk
73 include $(DEPTH)/config/autoconf.mk
75 ! DIRS = config chrome locales customization base
77 include $(topsrcdir)/config/rules.mk
78 Index: mozilla/minimo/base/Makefile.in
79 ===================================================================
80 RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v
81 retrieving revision 1.3.2.7
82 diff --context=3 -r1.3.2.7 Makefile.in
83 *** mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7
84 --- mozilla/minimo/base/Makefile.in 21 Jul 2006 00:27:14 -0000
88 # this should move into the toolkit!
89 LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
90 - CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
93 RCINCLUDE = wince/SplashScreen.rc
100 - FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
101 - FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
102 - FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
104 include $(topsrcdir)/config/static-config.mk
106 EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
110 # (same as in mozilla/js/src/Makefile.in)
112 LDFLAGS += -OPT:NOICF
116 - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
117 - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
120 - GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
125 # (same as in mozilla/js/src/Makefile.in)
127 LDFLAGS += -OPT:NOICF
129 + # Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
130 + LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
136 Index: mozilla/minimo/base/Minimo.cpp
137 ===================================================================
138 RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v
139 retrieving revision 1.1.2.11
140 diff --context=3 -r1.1.2.11 Minimo.cpp
141 *** mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11
142 --- mozilla/minimo/base/Minimo.cpp 21 Jul 2006 00:27:15 -0000
145 CreateListenerWindow();
148 ! #ifdef MOZ_WIDGET_GTK2
150 gtk_init(&argc, &argv);
153 #ifdef HACKY_PRE_LOAD_LIBRARY
155 CreateListenerWindow();
158 ! #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
159 ! #if defined(MOZ_WIDGET_GTK)
162 gtk_init(&argc, &argv);
164 + gtk_widget_set_default_visual(gdk_rgb_get_visual());
165 + gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
168 #ifdef HACKY_PRE_LOAD_LIBRARY
169 Index: mozilla/minimo/base/SplashScreen.cpp
170 ===================================================================
171 RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v
172 retrieving revision 1.1.2.3
173 diff --context=3 -r1.1.2.3 SplashScreen.cpp
174 *** mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3
175 --- mozilla/minimo/base/SplashScreen.cpp 21 Jul 2006 00:27:15 -0000
179 void KillSplashScreen() {}
180 void GetScreenSize(unsigned long* x, unsigned long* y)
182 + #ifdef MOZ_WIDGET_GTK2
183 + GdkDisplay* display = gdk_display_get_default();
184 + if (display != NULL)
187 + screen = gdk_display_get_default_screen(display);
188 + *x = gdk_screen_get_width(screen);
189 + *y = gdk_screen_get_height(screen);
194 // we need to figure this out.
197 + #ifdef MOZ_WIDGET_GTK2
203 Index: mozilla/minimo/chrome/content/minimo.js
204 ===================================================================
205 RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v
206 retrieving revision 1.9.2.90
207 diff --context=3 -r1.9.2.90 minimo.js
208 *** mozilla/minimo/chrome/content/minimo.js 11 Jul 2006 19:37:04 -0000 1.9.2.90
209 --- mozilla/minimo/chrome/content/minimo.js 21 Jul 2006 00:27:16 -0000
212 43 const FIND_LINKS = 2;
213 http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
215 ! gBrowser.fastFind.find(vQuery,0);
220 43 const FIND_LINKS = 2;
221 http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
223 ! gBrowser.fastFind.find(vQuery,0,this.mHasFocus);
230 function DoBrowserFindNext() {
232 ! gBrowser.fastFind.findNext();
238 function DoBrowserFindNext() {
240 ! gBrowser.fastFind.findNext(this.mHasFocus);
244 Index: mozilla/minimo/config/linux_package.sh
245 ===================================================================
246 RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v
247 retrieving revision 1.8.2.3
248 diff --context=3 -r1.8.2.3 linux_package.sh
249 *** mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3
250 --- mozilla/minimo/config/linux_package.sh 21 Jul 2006 00:27:16 -0000
253 cp -pRL bin/libnssckbi.so minimo
254 cp -pRL bin/libsmime3.so minimo
255 cp -pRL bin/libsoftokn3.so minimo
256 - cp -pRL bin/libsoftokn3.chk minimo
257 cp -pRL bin/libfreebl3.so minimo
258 - cp -pRL bin/libfreebl3.chk minimo
259 cp -pRL bin/libssl3.so minimo
261 mkdir -p minimo/chrome
265 cp -pRL bin/components/nsHelperAppDlg.js minimo/components
266 cp -pRL bin/components/nsProgressDialog.js minimo/components
268 - cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
270 mkdir -p minimo/greprefs
271 cp -pRL bin/greprefs/* minimo/greprefs
277 echo Linking XPT files.
279 ! bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
281 echo Chewing on chrome
285 echo Linking XPT files.
287 ! host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
289 echo Chewing on chrome
291 Index: mozilla/profile/dirserviceprovider/src/Makefile.in
292 ===================================================================
293 RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v
294 retrieving revision 1.7
295 diff --context=3 -r1.7 Makefile.in
296 *** mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7
297 --- mozilla/profile/dirserviceprovider/src/Makefile.in 21 Jul 2006 00:27:16 -0000
302 MODULE = profdirserviceprovider
303 LIBRARY_NAME = profdirserviceprovider_s
305 MOZILLA_INTERNAL_API = 1
308 Index: mozilla/security/coreconf/Linux.mk
309 ===================================================================
310 RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
311 retrieving revision 1.18.18.1
312 diff --context=3 -r1.18.18.1 Linux.mk
313 *** mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1
314 --- mozilla/security/coreconf/Linux.mk 21 Jul 2006 00:27:16 -0000
318 OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
321 + ifeq ($(OS_TEST),arm)
322 + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
325 OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
338 Index: mozilla/security/coreconf/arch.mk
339 ===================================================================
340 RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v
341 retrieving revision 1.17.14.2
342 diff --context=3 -r1.17.14.2 arch.mk
343 *** mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2
344 --- mozilla/security/coreconf/arch.mk 21 Jul 2006 00:27:16 -0000
350 ! OS_ARCH := $(subst /,_,$(shell uname -s))
353 # Attempt to differentiate between sparc and x86 Solaris
356 ! OS_TEST := $(shell uname -m)
357 ! ifeq ($(OS_TEST),i86pc)
358 ! OS_RELEASE := $(shell uname -r)_$(OS_TEST)
360 ! OS_RELEASE := $(shell uname -r)
364 # Force the IRIX64 machines to use IRIX.
372 # Attempt to differentiate between sparc and x86 Solaris
379 # Force the IRIX64 machines to use IRIX.
380 Index: mozilla/toolkit/components/build/Makefile.in
381 ===================================================================
382 RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v
383 retrieving revision 1.24.2.10
384 diff --context=3 -r1.24.2.10 Makefile.in
385 *** mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10
386 --- mozilla/toolkit/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000
391 SHARED_LIBRARY_LIBS = \
392 - ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
397 Index: mozilla/toolkit/components/startup/src/Makefile.in
398 ===================================================================
399 RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v
400 retrieving revision 1.7
401 diff --context=3 -r1.7 Makefile.in
402 *** mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7
403 --- mozilla/toolkit/components/startup/src/Makefile.in 21 Jul 2006 00:27:17 -0000
408 MODULE = toolkitcomps
409 LIBRARY_NAME = appstartup_s
414 Index: mozilla/toolkit/xre/Makefile.in
415 ===================================================================
416 RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v
417 retrieving revision 1.48.2.3
418 diff --context=3 -r1.48.2.3 Makefile.in
419 *** mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3
420 --- mozilla/toolkit/xre/Makefile.in 21 Jul 2006 00:27:17 -0000
425 LIBRARY_NAME = xulapp_s
434 include $(topsrcdir)/config/rules.mk
436 - ifdef BUILD_STATIC_LIBS
438 - @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
439 - # embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
440 - # FINAL_LINK_COMPS to keep the two lists in sync :-(
441 - @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
446 -I$(topsrcdir)/xpfe/bootstrap \
448 Index: mozilla/xpcom/build/Makefile.in
449 ===================================================================
450 RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v
451 retrieving revision 1.90.2.2
452 diff --context=3 -r1.90.2.2 Makefile.in
453 *** mozilla/xpcom/build/Makefile.in 29 Jan 2006 16:51:02 -0000 1.90.2.2
454 --- mozilla/xpcom/build/Makefile.in 21 Jul 2006 00:27:17 -0000
459 # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
460 ! #EXPORT_LIBRARY = 1
462 MOZILLA_INTERNAL_API = 1
467 # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
470 MOZILLA_INTERNAL_API = 1
472 Index: mozilla/xpfe/browser/src/Makefile.in
473 ===================================================================
474 RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v
475 retrieving revision 1.70
476 diff --context=3 -r1.70 Makefile.in
477 *** mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70
478 --- mozilla/xpfe/browser/src/Makefile.in 21 Jul 2006 00:27:17 -0000
484 LIBRARY_NAME = mozbrwsr_s
488 MODULE_NAME = nsBrowserModule
489 Index: mozilla/xpfe/components/build/Makefile.in
490 ===================================================================
491 RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v
492 retrieving revision 1.69.8.1
493 diff --context=3 -r1.69.8.1 Makefile.in
494 *** mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1
495 --- mozilla/xpfe/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000
500 LIBRARY_NAME = appcomps
503 MODULE_NAME = application
506 Index: mozilla/xpfe/components/filepicker/src/Makefile.in
507 ===================================================================
508 RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v
509 retrieving revision 1.9.8.1
510 diff --context=3 -r1.9.8.1 Makefile.in
511 *** mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1
512 --- mozilla/xpfe/components/filepicker/src/Makefile.in 21 Jul 2006 00:27:17 -0000
516 LIBRARY_NAME = fileview
517 SHORT_LIBNAME = fileview
520 MODULE_NAME = nsFileViewModule
521 MOZILLA_INTERNAL_API = 1
523 Index: mozilla/xpfe/components/find/src/Makefile.in
524 ===================================================================
525 RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v
526 retrieving revision 1.37
527 diff --context=3 -r1.37 Makefile.in
528 *** mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37
529 --- mozilla/xpfe/components/find/src/Makefile.in 21 Jul 2006 00:27:17 -0000
533 XPIDL_MODULE = mozfind
534 LIBRARY_NAME = mozfind
537 MODULE_NAME = nsFindComponent