1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
|
Index: mozilla/content/html/content/src/nsFormSubmission.cpp
===================================================================
RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v
retrieving revision 1.46
diff -u -r1.46 nsFormSubmission.cpp
--- mozilla/content/html/content/src/nsFormSubmission.cpp 13 Jul 2005 16:55:59 -0000 1.46
+++ mozilla/content/html/content/src/nsFormSubmission.cpp 20 Sep 2006 12:09:34 -0000
@@ -1315,11 +1315,6 @@
nsresult rv = NS_OK;
nsCAutoString charset(aCharset);
- // canonical name is passed so that we just have to check against
- // *our* canonical names listed in charsetaliases.properties
- if (charset.EqualsLiteral("ISO-8859-1")) {
- charset.AssignLiteral("windows-1252");
- }
// use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
// MS IE/Opera).
Index: mozilla/embedding/base/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v
retrieving revision 1.34.8.2
diff -u -r1.34.8.2 Makefile.in
--- mozilla/embedding/base/Makefile.in 14 Feb 2006 05:28:31 -0000 1.34.8.2
+++ mozilla/embedding/base/Makefile.in 20 Sep 2006 12:09:47 -0000
@@ -43,6 +43,7 @@
MODULE = embed_base
LIBRARY_NAME = embed_base_s
+EXPORT_LIBRARY = 1
XPIDL_MODULE = embed_base
include $(DEPTH)/config/autoconf.mk
Index: mozilla/js/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/js/src/Makefile.in,v
retrieving revision 3.95.4.4
diff -u -r3.95.4.4 Makefile.in
--- mozilla/js/src/Makefile.in 7 Jul 2006 02:12:02 -0000 3.95.4.4
+++ mozilla/js/src/Makefile.in 20 Sep 2006 12:10:22 -0000
@@ -46,6 +46,7 @@
MODULE = js
LIBRARY_NAME = mozjs
+EXPORT_LIBRARY = 1
LIB_IS_C_ONLY = 1
GRE_MODULE = 1
Index: mozilla/minimo/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/minimo/Makefile.in,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 Makefile.in
--- mozilla/minimo/Makefile.in 29 Jun 2006 06:11:30 -0000 1.1.2.2
+++ mozilla/minimo/Makefile.in 20 Sep 2006 12:10:50 -0000
@@ -41,6 +41,6 @@
include $(DEPTH)/config/autoconf.mk
-DIRS = config components chrome locales customization base
+DIRS = config chrome locales customization base
include $(topsrcdir)/config/rules.mk
Index: mozilla/minimo/base/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v
retrieving revision 1.3.2.7
diff -u -r1.3.2.7 Makefile.in
--- mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7
+++ mozilla/minimo/base/Makefile.in 20 Sep 2006 12:10:50 -0000
@@ -95,7 +95,6 @@
# this should move into the toolkit!
LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
-CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
ifdef WINCE
RCINCLUDE = wince/SplashScreen.rc
@@ -139,10 +138,6 @@
endif
-FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
-FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
-FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
-
include $(topsrcdir)/config/static-config.mk
EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
@@ -176,14 +171,11 @@
# (same as in mozilla/js/src/Makefile.in)
ifdef WINCE
LDFLAGS += -OPT:NOICF
+else
+# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
+LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
endif
-export::
- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
-
-
-GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
ifdef WINCE
package::
Index: mozilla/minimo/base/Minimo.cpp
===================================================================
RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v
retrieving revision 1.1.2.11
diff -u -r1.1.2.11 Minimo.cpp
--- mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11
+++ mozilla/minimo/base/Minimo.cpp 20 Sep 2006 12:10:52 -0000
@@ -781,9 +781,14 @@
CreateListenerWindow();
#endif
-#ifdef MOZ_WIDGET_GTK2
+#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2)
+#if defined(MOZ_WIDGET_GTK)
gtk_set_locale();
+#endif
gtk_init(&argc, &argv);
+
+ gtk_widget_set_default_visual(gdk_rgb_get_visual());
+ gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
#endif
#ifdef HACKY_PRE_LOAD_LIBRARY
Index: mozilla/minimo/base/SplashScreen.cpp
===================================================================
RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 SplashScreen.cpp
--- mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3
+++ mozilla/minimo/base/SplashScreen.cpp 20 Sep 2006 12:10:52 -0000
@@ -180,9 +180,24 @@
void KillSplashScreen() {}
void GetScreenSize(unsigned long* x, unsigned long* y)
{
+#ifdef MOZ_WIDGET_GTK2
+ GdkDisplay* display = gdk_display_get_default();
+ if (display != NULL)
+ {
+ GdkScreen *screen;
+ screen = gdk_display_get_default_screen(display);
+ *x = gdk_screen_get_width(screen);
+ *y = gdk_screen_get_height(screen);
+ }
+ else
+ {
+#endif
// we need to figure this out.
*x = 240;
*y = 320;
+#ifdef MOZ_WIDGET_GTK2
+ }
+#endif
}
Index: mozilla/minimo/chrome/content/minimo.js
===================================================================
RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v
retrieving revision 1.9.2.90
diff -u -r1.9.2.90 minimo.js
--- mozilla/minimo/chrome/content/minimo.js 11 Jul 2006 19:37:04 -0000 1.9.2.90
+++ mozilla/minimo/chrome/content/minimo.js 20 Sep 2006 12:10:56 -0000
@@ -1313,7 +1313,7 @@
43 const FIND_LINKS = 2;
http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js
*/
- gBrowser.fastFind.find(vQuery,0);
+ gBrowser.fastFind.find(vQuery,0,this.mHasFocus);
}
} catch (e) {
onErrorHandler(e);
@@ -1324,7 +1324,7 @@
function DoBrowserFindNext() {
try {
- gBrowser.fastFind.findNext();
+ gBrowser.fastFind.findNext(this.mHasFocus);
} catch (e) {
onErrorHandler(e);
}
Index: mozilla/minimo/config/linux_package.sh
===================================================================
RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v
retrieving revision 1.8.2.3
diff -u -r1.8.2.3 linux_package.sh
--- mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3
+++ mozilla/minimo/config/linux_package.sh 20 Sep 2006 12:10:57 -0000
@@ -29,9 +29,7 @@
cp -pRL bin/libnssckbi.so minimo
cp -pRL bin/libsmime3.so minimo
cp -pRL bin/libsoftokn3.so minimo
-cp -pRL bin/libsoftokn3.chk minimo
cp -pRL bin/libfreebl3.so minimo
-cp -pRL bin/libfreebl3.chk minimo
cp -pRL bin/libssl3.so minimo
mkdir -p minimo/chrome
@@ -62,8 +60,6 @@
cp -pRL bin/components/nsHelperAppDlg.js minimo/components
cp -pRL bin/components/nsProgressDialog.js minimo/components
-cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
-
mkdir -p minimo/greprefs
cp -pRL bin/greprefs/* minimo/greprefs
@@ -80,7 +76,7 @@
echo Linking XPT files.
-bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
+host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
echo Chewing on chrome
Index: mozilla/profile/dirserviceprovider/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7
+++ mozilla/profile/dirserviceprovider/src/Makefile.in 20 Sep 2006 12:11:17 -0000
@@ -44,6 +44,7 @@
MODULE = profdirserviceprovider
LIBRARY_NAME = profdirserviceprovider_s
+EXPORT_LIBRARY = 1
MOZILLA_INTERNAL_API = 1
REQUIRES = xpcom \
Index: mozilla/security/coreconf/Linux.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
retrieving revision 1.18.18.1
diff -u -r1.18.18.1 Linux.mk
--- mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1
+++ mozilla/security/coreconf/Linux.mk 20 Sep 2006 12:11:19 -0000
@@ -117,6 +117,10 @@
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = mips
else
+ifeq ($(OS_TEST),arm)
+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = arm
+else
OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
CPU_ARCH = x86
endif
@@ -133,6 +137,7 @@
endif
endif
endif
+endif
LIBC_TAG = _glibc
Index: mozilla/security/coreconf/arch.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v
retrieving revision 1.17.14.2
diff -u -r1.17.14.2 arch.mk
--- mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2
+++ mozilla/security/coreconf/arch.mk 20 Sep 2006 12:11:20 -0000
@@ -60,18 +60,14 @@
64BIT_TAG=
endif
-OS_ARCH := $(subst /,_,$(shell uname -s))
+OS_ARCH := Linux
#
# Attempt to differentiate between sparc and x86 Solaris
#
-OS_TEST := $(shell uname -m)
-ifeq ($(OS_TEST),i86pc)
- OS_RELEASE := $(shell uname -r)_$(OS_TEST)
-else
- OS_RELEASE := $(shell uname -r)
-endif
+OS_TEST := arm
+OS_RELEASE := 2.6
#
# Force the IRIX64 machines to use IRIX.
Index: mozilla/toolkit/components/build/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v
retrieving revision 1.24.2.10
diff -u -r1.24.2.10 Makefile.in
--- mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10
+++ mozilla/toolkit/components/build/Makefile.in 20 Sep 2006 12:11:34 -0000
@@ -112,7 +112,6 @@
$(NULL)
SHARED_LIBRARY_LIBS = \
- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
$(NULL)
ifdef MOZ_XPINSTALL
Index: mozilla/toolkit/components/startup/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v
retrieving revision 1.7
diff -u -r1.7 Makefile.in
--- mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7
+++ mozilla/toolkit/components/startup/src/Makefile.in 20 Sep 2006 12:11:36 -0000
@@ -43,6 +43,7 @@
MODULE = toolkitcomps
LIBRARY_NAME = appstartup_s
+EXPORT_LIBRARY = 1
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
Index: mozilla/toolkit/xre/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v
retrieving revision 1.48.2.3
diff -u -r1.48.2.3 Makefile.in
--- mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3
+++ mozilla/toolkit/xre/Makefile.in 20 Sep 2006 12:11:42 -0000
@@ -45,7 +45,6 @@
MODULE = xulapp
LIBRARY_NAME = xulapp_s
-EXPORT_LIBRARY = 1
LIBXUL_LIBRARY = 1
REQUIRES = \
@@ -176,14 +175,6 @@
include $(topsrcdir)/config/rules.mk
-ifdef BUILD_STATIC_LIBS
-export::
- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
-# embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
-# FINAL_LINK_COMPS to keep the two lists in sync :-(
- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
-endif
-
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(topsrcdir)/xpfe/bootstrap \
Index: mozilla/xpcom/build/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v
retrieving revision 1.90.2.2
diff -u -r1.90.2.2 Makefile.in
--- mozilla/xpcom/build/Makefile.in 29 Jan 2006 16:51:02 -0000 1.90.2.2
+++ mozilla/xpcom/build/Makefile.in 20 Sep 2006 12:11:47 -0000
@@ -61,7 +61,7 @@
endif
# Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
-#EXPORT_LIBRARY = 1
+EXPORT_LIBRARY = 1
GRE_MODULE = 1
MOZILLA_INTERNAL_API = 1
Index: mozilla/xpfe/browser/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v
retrieving revision 1.70
diff -u -r1.70 Makefile.in
--- mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70
+++ mozilla/xpfe/browser/src/Makefile.in 20 Sep 2006 12:11:54 -0000
@@ -44,6 +44,7 @@
MODULE = browser
LIBRARY_NAME = mozbrwsr_s
+EXPORT_LIBRARY = 1
FORCE_STATIC_LIB = 1
LIBXUL_LIBRARY = 1
MODULE_NAME = nsBrowserModule
Index: mozilla/xpfe/components/build/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v
retrieving revision 1.69.8.1
diff -u -r1.69.8.1 Makefile.in
--- mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1
+++ mozilla/xpfe/components/build/Makefile.in 20 Sep 2006 12:11:55 -0000
@@ -44,7 +44,6 @@
MODULE = appcomps
LIBRARY_NAME = appcomps
-EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = application
LIBXUL_LIBRARY = 1
Index: mozilla/xpfe/components/filepicker/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v
retrieving revision 1.9.8.1
diff -u -r1.9.8.1 Makefile.in
--- mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1
+++ mozilla/xpfe/components/filepicker/src/Makefile.in 20 Sep 2006 12:11:56 -0000
@@ -47,7 +47,6 @@
MODULE = filepicker
LIBRARY_NAME = fileview
SHORT_LIBNAME = fileview
-EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsFileViewModule
MOZILLA_INTERNAL_API = 1
Index: mozilla/xpfe/components/find/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v
retrieving revision 1.37
diff -u -r1.37 Makefile.in
--- mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37
+++ mozilla/xpfe/components/find/src/Makefile.in 20 Sep 2006 12:11:56 -0000
@@ -45,7 +45,6 @@
MODULE = appcomps
XPIDL_MODULE = mozfind
LIBRARY_NAME = mozfind
-EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsFindComponent
LIBXUL_LIBRARY = 1
|
