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 -u -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 20 Sep 2006 12:09:34 -0000
11 nsCAutoString charset(aCharset);
12 - // canonical name is passed so that we just have to check against
13 - // *our* canonical names listed in charsetaliases.properties
14 - if (charset.EqualsLiteral("ISO-8859-1")) {
15 - charset.AssignLiteral("windows-1252");
18 // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
20 Index: mozilla/embedding/base/Makefile.in
21 ===================================================================
22 RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v
23 retrieving revision 1.34.8.2
24 diff -u -r1.34.8.2 Makefile.in
25 --- mozilla/embedding/base/Makefile.in 14 Feb 2006 05:28:31 -0000 1.34.8.2
26 +++ mozilla/embedding/base/Makefile.in 20 Sep 2006 12:09:47 -0000
30 LIBRARY_NAME = embed_base_s
32 XPIDL_MODULE = embed_base
34 include $(DEPTH)/config/autoconf.mk
35 Index: mozilla/js/src/Makefile.in
36 ===================================================================
37 RCS file: /cvsroot/mozilla/js/src/Makefile.in,v
38 retrieving revision 3.95.4.4
39 diff -u -r3.95.4.4 Makefile.in
40 --- mozilla/js/src/Makefile.in 7 Jul 2006 02:12:02 -0000 3.95.4.4
41 +++ mozilla/js/src/Makefile.in 20 Sep 2006 12:10:22 -0000
50 Index: mozilla/minimo/Makefile.in
51 ===================================================================
52 RCS file: /cvsroot/mozilla/minimo/Makefile.in,v
53 retrieving revision 1.1.2.2
54 diff -u -r1.1.2.2 Makefile.in
55 --- mozilla/minimo/Makefile.in 29 Jun 2006 06:11:30 -0000 1.1.2.2
56 +++ mozilla/minimo/Makefile.in 20 Sep 2006 12:10:50 -0000
59 include $(DEPTH)/config/autoconf.mk
61 -DIRS = config components chrome locales customization base
62 +DIRS = config chrome locales customization base
64 include $(topsrcdir)/config/rules.mk
65 Index: mozilla/minimo/base/Makefile.in
66 ===================================================================
67 RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v
68 retrieving revision 1.3.2.7
69 diff -u -r1.3.2.7 Makefile.in
70 --- mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7
71 +++ mozilla/minimo/base/Makefile.in 20 Sep 2006 12:10:50 -0000
74 # this should move into the toolkit!
75 LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
76 -CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
79 RCINCLUDE = wince/SplashScreen.rc
84 -FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
85 -FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
86 -FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
88 include $(topsrcdir)/config/static-config.mk
90 EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
92 # (same as in mozilla/js/src/Makefile.in)
96 +# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
97 +LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
101 - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
102 - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
105 -GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
109 Index: mozilla/minimo/base/Minimo.cpp
110 ===================================================================
111 RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v
112 retrieving revision 1.1.2.11
113 diff -u -r1.1.2.11 Minimo.cpp
114 --- mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11
115 +++ mozilla/minimo/base/Minimo.cpp 20 Sep 2006 12:10:52 -0000
117 CreateListenerWindow();
120 -#ifdef MOZ_WIDGET_GTK2
121 +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
122 +#if defined(MOZ_WIDGET_GTK)
125 gtk_init(&argc, &argv);
127 + gtk_widget_set_default_visual(gdk_rgb_get_visual());
128 + gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
131 #ifdef HACKY_PRE_LOAD_LIBRARY
132 Index: mozilla/minimo/base/SplashScreen.cpp
133 ===================================================================
134 RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v
135 retrieving revision 1.1.2.3
136 diff -u -r1.1.2.3 SplashScreen.cpp
137 --- mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3
138 +++ mozilla/minimo/base/SplashScreen.cpp 20 Sep 2006 12:10:52 -0000
140 void KillSplashScreen() {}
141 void GetScreenSize(unsigned long* x, unsigned long* y)
143 +#ifdef MOZ_WIDGET_GTK2
144 + GdkDisplay* display = gdk_display_get_default();
145 + if (display != NULL)
148 + screen = gdk_display_get_default_screen(display);
149 + *x = gdk_screen_get_width(screen);
150 + *y = gdk_screen_get_height(screen);
155 // we need to figure this out.
158 +#ifdef MOZ_WIDGET_GTK2
164 Index: mozilla/minimo/chrome/content/minimo.js
165 ===================================================================
166 RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v
167 retrieving revision 1.9.2.90
168 diff -u -r1.9.2.90 minimo.js
169 --- mozilla/minimo/chrome/content/minimo.js 11 Jul 2006 19:37:04 -0000 1.9.2.90
170 +++ mozilla/minimo/chrome/content/minimo.js 20 Sep 2006 12:10:56 -0000
171 @@ -1313,7 +1313,7 @@
172 43 const FIND_LINKS = 2;
173 http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
175 - gBrowser.fastFind.find(vQuery,0);
176 + gBrowser.fastFind.find(vQuery,0,this.mHasFocus);
180 @@ -1324,7 +1324,7 @@
182 function DoBrowserFindNext() {
184 - gBrowser.fastFind.findNext();
185 + gBrowser.fastFind.findNext(this.mHasFocus);
189 Index: mozilla/minimo/config/linux_package.sh
190 ===================================================================
191 RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v
192 retrieving revision 1.8.2.3
193 diff -u -r1.8.2.3 linux_package.sh
194 --- mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3
195 +++ mozilla/minimo/config/linux_package.sh 20 Sep 2006 12:10:57 -0000
197 cp -pRL bin/libnssckbi.so minimo
198 cp -pRL bin/libsmime3.so minimo
199 cp -pRL bin/libsoftokn3.so minimo
200 -cp -pRL bin/libsoftokn3.chk minimo
201 cp -pRL bin/libfreebl3.so minimo
202 -cp -pRL bin/libfreebl3.chk minimo
203 cp -pRL bin/libssl3.so minimo
205 mkdir -p minimo/chrome
207 cp -pRL bin/components/nsHelperAppDlg.js minimo/components
208 cp -pRL bin/components/nsProgressDialog.js minimo/components
210 -cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
212 mkdir -p minimo/greprefs
213 cp -pRL bin/greprefs/* minimo/greprefs
217 echo Linking XPT files.
219 -bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
220 +host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
222 echo Chewing on chrome
224 Index: mozilla/profile/dirserviceprovider/src/Makefile.in
225 ===================================================================
226 RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v
227 retrieving revision 1.7
228 diff -u -r1.7 Makefile.in
229 --- mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7
230 +++ mozilla/profile/dirserviceprovider/src/Makefile.in 20 Sep 2006 12:11:17 -0000
233 MODULE = profdirserviceprovider
234 LIBRARY_NAME = profdirserviceprovider_s
236 MOZILLA_INTERNAL_API = 1
239 Index: mozilla/security/coreconf/Linux.mk
240 ===================================================================
241 RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
242 retrieving revision 1.18.18.1
243 diff -u -r1.18.18.1 Linux.mk
244 --- mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1
245 +++ mozilla/security/coreconf/Linux.mk 20 Sep 2006 12:11:19 -0000
247 OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
250 +ifeq ($(OS_TEST),arm)
251 + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
254 OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
265 Index: mozilla/security/coreconf/arch.mk
266 ===================================================================
267 RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v
268 retrieving revision 1.17.14.2
269 diff -u -r1.17.14.2 arch.mk
270 --- mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2
271 +++ mozilla/security/coreconf/arch.mk 20 Sep 2006 12:11:20 -0000
276 -OS_ARCH := $(subst /,_,$(shell uname -s))
280 # Attempt to differentiate between sparc and x86 Solaris
283 -OS_TEST := $(shell uname -m)
284 -ifeq ($(OS_TEST),i86pc)
285 - OS_RELEASE := $(shell uname -r)_$(OS_TEST)
287 - OS_RELEASE := $(shell uname -r)
293 # Force the IRIX64 machines to use IRIX.
294 Index: mozilla/toolkit/components/build/Makefile.in
295 ===================================================================
296 RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v
297 retrieving revision 1.24.2.10
298 diff -u -r1.24.2.10 Makefile.in
299 --- mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10
300 +++ mozilla/toolkit/components/build/Makefile.in 20 Sep 2006 12:11:34 -0000
304 SHARED_LIBRARY_LIBS = \
305 - ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
309 Index: mozilla/toolkit/components/startup/src/Makefile.in
310 ===================================================================
311 RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v
312 retrieving revision 1.7
313 diff -u -r1.7 Makefile.in
314 --- mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7
315 +++ mozilla/toolkit/components/startup/src/Makefile.in 20 Sep 2006 12:11:36 -0000
318 MODULE = toolkitcomps
319 LIBRARY_NAME = appstartup_s
324 Index: mozilla/toolkit/xre/Makefile.in
325 ===================================================================
326 RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v
327 retrieving revision 1.48.2.3
328 diff -u -r1.48.2.3 Makefile.in
329 --- mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3
330 +++ mozilla/toolkit/xre/Makefile.in 20 Sep 2006 12:11:42 -0000
334 LIBRARY_NAME = xulapp_s
341 include $(topsrcdir)/config/rules.mk
343 -ifdef BUILD_STATIC_LIBS
345 - @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
346 -# embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
347 -# FINAL_LINK_COMPS to keep the two lists in sync :-(
348 - @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
353 -I$(topsrcdir)/xpfe/bootstrap \
354 Index: mozilla/xpcom/build/Makefile.in
355 ===================================================================
356 RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v
357 retrieving revision 1.90.2.2
358 diff -u -r1.90.2.2 Makefile.in
359 --- mozilla/xpcom/build/Makefile.in 29 Jan 2006 16:51:02 -0000 1.90.2.2
360 +++ mozilla/xpcom/build/Makefile.in 20 Sep 2006 12:11:47 -0000
364 # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
368 MOZILLA_INTERNAL_API = 1
370 Index: mozilla/xpfe/browser/src/Makefile.in
371 ===================================================================
372 RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v
373 retrieving revision 1.70
374 diff -u -r1.70 Makefile.in
375 --- mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70
376 +++ mozilla/xpfe/browser/src/Makefile.in 20 Sep 2006 12:11:54 -0000
380 LIBRARY_NAME = mozbrwsr_s
384 MODULE_NAME = nsBrowserModule
385 Index: mozilla/xpfe/components/build/Makefile.in
386 ===================================================================
387 RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v
388 retrieving revision 1.69.8.1
389 diff -u -r1.69.8.1 Makefile.in
390 --- mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1
391 +++ mozilla/xpfe/components/build/Makefile.in 20 Sep 2006 12:11:55 -0000
395 LIBRARY_NAME = appcomps
398 MODULE_NAME = application
400 Index: mozilla/xpfe/components/filepicker/src/Makefile.in
401 ===================================================================
402 RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v
403 retrieving revision 1.9.8.1
404 diff -u -r1.9.8.1 Makefile.in
405 --- mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1
406 +++ mozilla/xpfe/components/filepicker/src/Makefile.in 20 Sep 2006 12:11:56 -0000
409 LIBRARY_NAME = fileview
410 SHORT_LIBNAME = fileview
413 MODULE_NAME = nsFileViewModule
414 MOZILLA_INTERNAL_API = 1
415 Index: mozilla/xpfe/components/find/src/Makefile.in
416 ===================================================================
417 RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v
418 retrieving revision 1.37
419 diff -u -r1.37 Makefile.in
420 --- mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37
421 +++ mozilla/xpfe/components/find/src/Makefile.in 20 Sep 2006 12:11:56 -0000
424 XPIDL_MODULE = mozfind
425 LIBRARY_NAME = mozfind
428 MODULE_NAME = nsFindComponent