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/base/Makefile.in
51 ===================================================================
52 RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v
53 retrieving revision 1.3.2.7
54 diff -u -r1.3.2.7 Makefile.in
55 --- mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7
56 +++ mozilla/minimo/base/Makefile.in 20 Sep 2006 12:10:50 -0000
59 # this should move into the toolkit!
60 LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
61 -CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
64 RCINCLUDE = wince/SplashScreen.rc
69 -FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
70 -FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
71 -FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
73 include $(topsrcdir)/config/static-config.mk
75 EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
77 # (same as in mozilla/js/src/Makefile.in)
81 +# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
82 +LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
86 - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
87 - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
90 -GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
94 Index: mozilla/minimo/base/Minimo.cpp
95 ===================================================================
96 RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v
97 retrieving revision 1.1.2.11
98 diff -u -r1.1.2.11 Minimo.cpp
99 --- mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11
100 +++ mozilla/minimo/base/Minimo.cpp 20 Sep 2006 12:10:52 -0000
102 CreateListenerWindow();
105 -#ifdef MOZ_WIDGET_GTK2
106 +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
107 +#if defined(MOZ_WIDGET_GTK)
110 gtk_init(&argc, &argv);
112 + gtk_widget_set_default_visual(gdk_rgb_get_visual());
113 + gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
116 #ifdef HACKY_PRE_LOAD_LIBRARY
117 Index: mozilla/minimo/base/SplashScreen.cpp
118 ===================================================================
119 RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v
120 retrieving revision 1.1.2.3
121 diff -u -r1.1.2.3 SplashScreen.cpp
122 --- mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3
123 +++ mozilla/minimo/base/SplashScreen.cpp 20 Sep 2006 12:10:52 -0000
125 void KillSplashScreen() {}
126 void GetScreenSize(unsigned long* x, unsigned long* y)
128 +#ifdef MOZ_WIDGET_GTK2
129 + GdkDisplay* display = gdk_display_get_default();
130 + if (display != NULL)
133 + screen = gdk_display_get_default_screen(display);
134 + *x = gdk_screen_get_width(screen);
135 + *y = gdk_screen_get_height(screen);
140 // we need to figure this out.
143 +#ifdef MOZ_WIDGET_GTK2
149 Index: mozilla/minimo/chrome/content/minimo.js
150 ===================================================================
151 RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v
152 retrieving revision 1.9.2.90
153 diff -u -r1.9.2.90 minimo.js
154 --- mozilla/minimo/chrome/content/minimo.js 11 Jul 2006 19:37:04 -0000 1.9.2.90
155 +++ mozilla/minimo/chrome/content/minimo.js 20 Sep 2006 12:10:56 -0000
156 @@ -1313,7 +1313,7 @@
157 43 const FIND_LINKS = 2;
158 http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
160 - gBrowser.fastFind.find(vQuery,0);
161 + gBrowser.fastFind.find(vQuery,0,this.mHasFocus);
165 @@ -1324,7 +1324,7 @@
167 function DoBrowserFindNext() {
169 - gBrowser.fastFind.findNext();
170 + gBrowser.fastFind.findNext(this.mHasFocus);
174 Index: mozilla/minimo/config/linux_package.sh
175 ===================================================================
176 RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v
177 retrieving revision 1.8.2.3
178 diff -u -r1.8.2.3 linux_package.sh
179 --- mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3
180 +++ mozilla/minimo/config/linux_package.sh 20 Sep 2006 12:10:57 -0000
182 cp -pRL bin/libnssckbi.so minimo
183 cp -pRL bin/libsmime3.so minimo
184 cp -pRL bin/libsoftokn3.so minimo
185 -cp -pRL bin/libsoftokn3.chk minimo
186 cp -pRL bin/libfreebl3.so minimo
187 -cp -pRL bin/libfreebl3.chk minimo
188 cp -pRL bin/libssl3.so minimo
190 mkdir -p minimo/chrome
192 cp -pRL bin/components/nsHelperAppDlg.js minimo/components
193 cp -pRL bin/components/nsProgressDialog.js minimo/components
195 -cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
197 mkdir -p minimo/greprefs
198 cp -pRL bin/greprefs/* minimo/greprefs
202 echo Linking XPT files.
204 -bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
205 +host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
207 echo Chewing on chrome
209 Index: mozilla/profile/dirserviceprovider/src/Makefile.in
210 ===================================================================
211 RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v
212 retrieving revision 1.7
213 diff -u -r1.7 Makefile.in
214 --- mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7
215 +++ mozilla/profile/dirserviceprovider/src/Makefile.in 20 Sep 2006 12:11:17 -0000
218 MODULE = profdirserviceprovider
219 LIBRARY_NAME = profdirserviceprovider_s
221 MOZILLA_INTERNAL_API = 1
224 Index: mozilla/security/coreconf/Linux.mk
225 ===================================================================
226 RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
227 retrieving revision 1.18.18.1
228 diff -u -r1.18.18.1 Linux.mk
229 --- mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1
230 +++ mozilla/security/coreconf/Linux.mk 20 Sep 2006 12:11:19 -0000
232 OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
235 +ifeq ($(OS_TEST),arm)
236 + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
239 OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
250 Index: mozilla/security/coreconf/arch.mk
251 ===================================================================
252 RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v
253 retrieving revision 1.17.14.2
254 diff -u -r1.17.14.2 arch.mk
255 --- mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2
256 +++ mozilla/security/coreconf/arch.mk 20 Sep 2006 12:11:20 -0000
261 -OS_ARCH := $(subst /,_,$(shell uname -s))
265 # Attempt to differentiate between sparc and x86 Solaris
268 -OS_TEST := $(shell uname -m)
269 -ifeq ($(OS_TEST),i86pc)
270 - OS_RELEASE := $(shell uname -r)_$(OS_TEST)
272 - OS_RELEASE := $(shell uname -r)
278 # Force the IRIX64 machines to use IRIX.
279 Index: mozilla/toolkit/components/build/Makefile.in
280 ===================================================================
281 RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v
282 retrieving revision 1.24.2.10
283 diff -u -r1.24.2.10 Makefile.in
284 --- mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10
285 +++ mozilla/toolkit/components/build/Makefile.in 20 Sep 2006 12:11:34 -0000
289 SHARED_LIBRARY_LIBS = \
290 - ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
294 Index: mozilla/toolkit/components/startup/src/Makefile.in
295 ===================================================================
296 RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v
297 retrieving revision 1.7
298 diff -u -r1.7 Makefile.in
299 --- mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7
300 +++ mozilla/toolkit/components/startup/src/Makefile.in 20 Sep 2006 12:11:36 -0000
303 MODULE = toolkitcomps
304 LIBRARY_NAME = appstartup_s
309 Index: mozilla/toolkit/xre/Makefile.in
310 ===================================================================
311 RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v
312 retrieving revision 1.48.2.3
313 diff -u -r1.48.2.3 Makefile.in
314 --- mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3
315 +++ mozilla/toolkit/xre/Makefile.in 20 Sep 2006 12:11:42 -0000
319 LIBRARY_NAME = xulapp_s
326 include $(topsrcdir)/config/rules.mk
328 -ifdef BUILD_STATIC_LIBS
330 - @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
331 -# embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
332 -# FINAL_LINK_COMPS to keep the two lists in sync :-(
333 - @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
338 -I$(topsrcdir)/xpfe/bootstrap \
339 Index: mozilla/xpcom/build/Makefile.in
340 ===================================================================
341 RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v
342 retrieving revision 1.90.2.2
343 diff -u -r1.90.2.2 Makefile.in
344 --- mozilla/xpcom/build/Makefile.in 29 Jan 2006 16:51:02 -0000 1.90.2.2
345 +++ mozilla/xpcom/build/Makefile.in 20 Sep 2006 12:11:47 -0000
349 # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
353 MOZILLA_INTERNAL_API = 1
355 Index: mozilla/xpfe/browser/src/Makefile.in
356 ===================================================================
357 RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v
358 retrieving revision 1.70
359 diff -u -r1.70 Makefile.in
360 --- mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70
361 +++ mozilla/xpfe/browser/src/Makefile.in 20 Sep 2006 12:11:54 -0000
365 LIBRARY_NAME = mozbrwsr_s
369 MODULE_NAME = nsBrowserModule
370 Index: mozilla/xpfe/components/build/Makefile.in
371 ===================================================================
372 RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v
373 retrieving revision 1.69.8.1
374 diff -u -r1.69.8.1 Makefile.in
375 --- mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1
376 +++ mozilla/xpfe/components/build/Makefile.in 20 Sep 2006 12:11:55 -0000
380 LIBRARY_NAME = appcomps
383 MODULE_NAME = application
385 Index: mozilla/xpfe/components/filepicker/src/Makefile.in
386 ===================================================================
387 RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v
388 retrieving revision 1.9.8.1
389 diff -u -r1.9.8.1 Makefile.in
390 --- mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1
391 +++ mozilla/xpfe/components/filepicker/src/Makefile.in 20 Sep 2006 12:11:56 -0000
394 LIBRARY_NAME = fileview
395 SHORT_LIBNAME = fileview
398 MODULE_NAME = nsFileViewModule
399 MOZILLA_INTERNAL_API = 1
400 Index: mozilla/xpfe/components/find/src/Makefile.in
401 ===================================================================
402 RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v
403 retrieving revision 1.37
404 diff -u -r1.37 Makefile.in
405 --- mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37
406 +++ mozilla/xpfe/components/find/src/Makefile.in 20 Sep 2006 12:11:56 -0000
409 XPIDL_MODULE = mozfind
410 LIBRARY_NAME = mozfind
413 MODULE_NAME = nsFindComponent