diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-05-09 10:39:10 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-05-09 10:39:10 +0000 |
commit | ff0fe2be89778bf06ba0287911eac31c141be415 (patch) | |
tree | 434c9872c2c522fec9dfa616284d9b130b7cfe4d /meta/packages/mozilla/minimo/minimo.patch | |
parent | 79efb6c8b3e9926d8ba591391bfc8b9e58c39896 (diff) | |
download | poky-ff0fe2be89778bf06ba0287911eac31c141be415.tar.gz |
minimo: added 0.016 version with EABI patches - works in qemuarm
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1622 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/mozilla/minimo/minimo.patch')
-rw-r--r-- | meta/packages/mozilla/minimo/minimo.patch | 567 |
1 files changed, 567 insertions, 0 deletions
diff --git a/meta/packages/mozilla/minimo/minimo.patch b/meta/packages/mozilla/minimo/minimo.patch new file mode 100644 index 0000000000..a1f9291167 --- /dev/null +++ b/meta/packages/mozilla/minimo/minimo.patch | |||
@@ -0,0 +1,567 @@ | |||
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 | ||
8 | *************** | ||
9 | *** 1315,1325 **** | ||
10 | nsresult rv = NS_OK; | ||
11 | |||
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"); | ||
17 | - } | ||
18 | |||
19 | // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of | ||
20 | // MS IE/Opera). | ||
21 | --- 1315,1320 ---- | ||
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 | ||
29 | *************** | ||
30 | *** 43,48 **** | ||
31 | --- 43,49 ---- | ||
32 | |||
33 | MODULE = embed_base | ||
34 | LIBRARY_NAME = embed_base_s | ||
35 | + EXPORT_LIBRARY = 1 | ||
36 | XPIDL_MODULE = embed_base | ||
37 | |||
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 | ||
46 | *************** | ||
47 | *** 46,51 **** | ||
48 | --- 46,52 ---- | ||
49 | |||
50 | MODULE = js | ||
51 | LIBRARY_NAME = mozjs | ||
52 | + EXPORT_LIBRARY = 1 | ||
53 | LIB_IS_C_ONLY = 1 | ||
54 | GRE_MODULE = 1 | ||
55 | |||
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 | ||
63 | *************** | ||
64 | *** 41,46 **** | ||
65 | |||
66 | include $(DEPTH)/config/autoconf.mk | ||
67 | |||
68 | ! DIRS = config components chrome locales customization base | ||
69 | |||
70 | include $(topsrcdir)/config/rules.mk | ||
71 | --- 41,46 ---- | ||
72 | |||
73 | include $(DEPTH)/config/autoconf.mk | ||
74 | |||
75 | ! DIRS = config chrome locales customization base | ||
76 | |||
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 | ||
85 | *************** | ||
86 | *** 95,101 **** | ||
87 | |||
88 | # this should move into the toolkit! | ||
89 | LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/ | ||
90 | - CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp | ||
91 | |||
92 | ifdef WINCE | ||
93 | RCINCLUDE = wince/SplashScreen.rc | ||
94 | --- 95,100 ---- | ||
95 | *************** | ||
96 | *** 139,148 **** | ||
97 | endif | ||
98 | |||
99 | |||
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 | ||
103 | - | ||
104 | include $(topsrcdir)/config/static-config.mk | ||
105 | |||
106 | EXTRA_DEPS += $(STATIC_EXTRA_DEPS) | ||
107 | --- 138,143 ---- | ||
108 | *************** | ||
109 | *** 176,189 **** | ||
110 | # (same as in mozilla/js/src/Makefile.in) | ||
111 | ifdef WINCE | ||
112 | LDFLAGS += -OPT:NOICF | ||
113 | endif | ||
114 | |||
115 | - export:: | ||
116 | - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp . | ||
117 | - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp . | ||
118 | - | ||
119 | - | ||
120 | - GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp | ||
121 | |||
122 | ifdef WINCE | ||
123 | package:: | ||
124 | --- 171,181 ---- | ||
125 | # (same as in mozilla/js/src/Makefile.in) | ||
126 | ifdef WINCE | ||
127 | LDFLAGS += -OPT:NOICF | ||
128 | + else | ||
129 | + # Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem. | ||
130 | + LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P | ||
131 | endif | ||
132 | |||
133 | |||
134 | ifdef WINCE | ||
135 | package:: | ||
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 | ||
143 | *************** | ||
144 | *** 781,789 **** | ||
145 | CreateListenerWindow(); | ||
146 | #endif | ||
147 | |||
148 | ! #ifdef MOZ_WIDGET_GTK2 | ||
149 | gtk_set_locale(); | ||
150 | gtk_init(&argc, &argv); | ||
151 | #endif | ||
152 | |||
153 | #ifdef HACKY_PRE_LOAD_LIBRARY | ||
154 | --- 781,794 ---- | ||
155 | CreateListenerWindow(); | ||
156 | #endif | ||
157 | |||
158 | ! #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) | ||
159 | ! #if defined(MOZ_WIDGET_GTK) | ||
160 | gtk_set_locale(); | ||
161 | + #endif | ||
162 | gtk_init(&argc, &argv); | ||
163 | + | ||
164 | + gtk_widget_set_default_visual(gdk_rgb_get_visual()); | ||
165 | + gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); | ||
166 | #endif | ||
167 | |||
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 | ||
176 | *************** | ||
177 | *** 180,188 **** | ||
178 | --- 180,203 ---- | ||
179 | void KillSplashScreen() {} | ||
180 | void GetScreenSize(unsigned long* x, unsigned long* y) | ||
181 | { | ||
182 | + #ifdef MOZ_WIDGET_GTK2 | ||
183 | + GdkDisplay* display = gdk_display_get_default(); | ||
184 | + if (display != NULL) | ||
185 | + { | ||
186 | + GdkScreen *screen; | ||
187 | + screen = gdk_display_get_default_screen(display); | ||
188 | + *x = gdk_screen_get_width(screen); | ||
189 | + *y = gdk_screen_get_height(screen); | ||
190 | + } | ||
191 | + else | ||
192 | + { | ||
193 | + #endif | ||
194 | // we need to figure this out. | ||
195 | *x = 240; | ||
196 | *y = 320; | ||
197 | + #ifdef MOZ_WIDGET_GTK2 | ||
198 | + } | ||
199 | + #endif | ||
200 | } | ||
201 | |||
202 | |||
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 | ||
210 | *************** | ||
211 | *** 1313,1319 **** | ||
212 | 43 const FIND_LINKS = 2; | ||
213 | http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js | ||
214 | */ | ||
215 | ! gBrowser.fastFind.find(vQuery,0); | ||
216 | } | ||
217 | } catch (e) { | ||
218 | onErrorHandler(e); | ||
219 | --- 1313,1319 ---- | ||
220 | 43 const FIND_LINKS = 2; | ||
221 | http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js | ||
222 | */ | ||
223 | ! gBrowser.fastFind.find(vQuery,0,this.mHasFocus); | ||
224 | } | ||
225 | } catch (e) { | ||
226 | onErrorHandler(e); | ||
227 | *************** | ||
228 | *** 1324,1330 **** | ||
229 | |||
230 | function DoBrowserFindNext() { | ||
231 | try { | ||
232 | ! gBrowser.fastFind.findNext(); | ||
233 | } catch (e) { | ||
234 | onErrorHandler(e); | ||
235 | } | ||
236 | --- 1324,1330 ---- | ||
237 | |||
238 | function DoBrowserFindNext() { | ||
239 | try { | ||
240 | ! gBrowser.fastFind.findNext(this.mHasFocus); | ||
241 | } catch (e) { | ||
242 | onErrorHandler(e); | ||
243 | } | ||
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 | ||
251 | *************** | ||
252 | *** 29,37 **** | ||
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 | ||
260 | |||
261 | mkdir -p minimo/chrome | ||
262 | --- 29,35 ---- | ||
263 | *************** | ||
264 | *** 62,69 **** | ||
265 | cp -pRL bin/components/nsHelperAppDlg.js minimo/components | ||
266 | cp -pRL bin/components/nsProgressDialog.js minimo/components | ||
267 | |||
268 | - cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components | ||
269 | - | ||
270 | mkdir -p minimo/greprefs | ||
271 | cp -pRL bin/greprefs/* minimo/greprefs | ||
272 | |||
273 | --- 60,65 ---- | ||
274 | *************** | ||
275 | *** 80,86 **** | ||
276 | |||
277 | echo Linking XPT files. | ||
278 | |||
279 | ! bin/xpt_link minimo/components/all.xpt bin/components/*.xpt | ||
280 | |||
281 | echo Chewing on chrome | ||
282 | |||
283 | --- 76,82 ---- | ||
284 | |||
285 | echo Linking XPT files. | ||
286 | |||
287 | ! host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt | ||
288 | |||
289 | echo Chewing on chrome | ||
290 | |||
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 | ||
298 | *************** | ||
299 | *** 44,49 **** | ||
300 | --- 44,50 ---- | ||
301 | |||
302 | MODULE = profdirserviceprovider | ||
303 | LIBRARY_NAME = profdirserviceprovider_s | ||
304 | + EXPORT_LIBRARY = 1 | ||
305 | MOZILLA_INTERNAL_API = 1 | ||
306 | |||
307 | REQUIRES = xpcom \ | ||
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 | ||
315 | *************** | ||
316 | *** 117,122 **** | ||
317 | --- 117,126 ---- | ||
318 | OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE | ||
319 | CPU_ARCH = mips | ||
320 | else | ||
321 | + ifeq ($(OS_TEST),arm) | ||
322 | + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE | ||
323 | + CPU_ARCH = arm | ||
324 | + else | ||
325 | OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE | ||
326 | CPU_ARCH = x86 | ||
327 | endif | ||
328 | *************** | ||
329 | *** 133,138 **** | ||
330 | --- 137,143 ---- | ||
331 | endif | ||
332 | endif | ||
333 | endif | ||
334 | + endif | ||
335 | |||
336 | |||
337 | LIBC_TAG = _glibc | ||
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 | ||
345 | *************** | ||
346 | *** 60,77 **** | ||
347 | 64BIT_TAG= | ||
348 | endif | ||
349 | |||
350 | ! OS_ARCH := $(subst /,_,$(shell uname -s)) | ||
351 | |||
352 | # | ||
353 | # Attempt to differentiate between sparc and x86 Solaris | ||
354 | # | ||
355 | |||
356 | ! OS_TEST := $(shell uname -m) | ||
357 | ! ifeq ($(OS_TEST),i86pc) | ||
358 | ! OS_RELEASE := $(shell uname -r)_$(OS_TEST) | ||
359 | ! else | ||
360 | ! OS_RELEASE := $(shell uname -r) | ||
361 | ! endif | ||
362 | |||
363 | # | ||
364 | # Force the IRIX64 machines to use IRIX. | ||
365 | --- 60,73 ---- | ||
366 | 64BIT_TAG= | ||
367 | endif | ||
368 | |||
369 | ! OS_ARCH := Linux | ||
370 | |||
371 | # | ||
372 | # Attempt to differentiate between sparc and x86 Solaris | ||
373 | # | ||
374 | |||
375 | ! OS_TEST := arm | ||
376 | ! OS_RELEASE := 2.6 | ||
377 | |||
378 | # | ||
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 | ||
387 | *************** | ||
388 | *** 112,118 **** | ||
389 | $(NULL) | ||
390 | |||
391 | SHARED_LIBRARY_LIBS = \ | ||
392 | - ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \ | ||
393 | $(NULL) | ||
394 | |||
395 | ifdef MOZ_XPINSTALL | ||
396 | --- 112,117 ---- | ||
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 | ||
404 | *************** | ||
405 | *** 43,48 **** | ||
406 | --- 43,49 ---- | ||
407 | |||
408 | MODULE = toolkitcomps | ||
409 | LIBRARY_NAME = appstartup_s | ||
410 | + EXPORT_LIBRARY = 1 | ||
411 | FORCE_STATIC_LIB = 1 | ||
412 | LIBXUL_LIBRARY = 1 | ||
413 | |||
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 | ||
421 | *************** | ||
422 | *** 45,51 **** | ||
423 | |||
424 | MODULE = xulapp | ||
425 | LIBRARY_NAME = xulapp_s | ||
426 | - EXPORT_LIBRARY = 1 | ||
427 | LIBXUL_LIBRARY = 1 | ||
428 | |||
429 | REQUIRES = \ | ||
430 | --- 45,50 ---- | ||
431 | *************** | ||
432 | *** 176,189 **** | ||
433 | |||
434 | include $(topsrcdir)/config/rules.mk | ||
435 | |||
436 | - ifdef BUILD_STATIC_LIBS | ||
437 | - export:: | ||
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) "" | ||
442 | - endif | ||
443 | - | ||
444 | LOCAL_INCLUDES += \ | ||
445 | -I$(srcdir) \ | ||
446 | -I$(topsrcdir)/xpfe/bootstrap \ | ||
447 | --- 175,180 ---- | ||
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 | ||
455 | *************** | ||
456 | *** 61,67 **** | ||
457 | endif | ||
458 | |||
459 | # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list | ||
460 | ! #EXPORT_LIBRARY = 1 | ||
461 | GRE_MODULE = 1 | ||
462 | MOZILLA_INTERNAL_API = 1 | ||
463 | |||
464 | --- 61,67 ---- | ||
465 | endif | ||
466 | |||
467 | # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list | ||
468 | ! EXPORT_LIBRARY = 1 | ||
469 | GRE_MODULE = 1 | ||
470 | MOZILLA_INTERNAL_API = 1 | ||
471 | |||
472 | Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp | ||
473 | =================================================================== | ||
474 | RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v | ||
475 | retrieving revision 1.7 | ||
476 | diff --context=3 -r1.7 xptcstubs_arm.cpp | ||
477 | *** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 18 Apr 2004 14:18:18 -0000 1.7 | ||
478 | --- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 21 Jul 2006 00:27:17 -0000 | ||
479 | *************** | ||
480 | *** 45,53 **** | ||
481 | #endif | ||
482 | |||
483 | /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ | ||
484 | ! static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); | ||
485 | |||
486 | ! static nsresult | ||
487 | PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) | ||
488 | { | ||
489 | #define PARAM_BUFFER_COUNT 16 | ||
490 | --- 45,53 ---- | ||
491 | #endif | ||
492 | |||
493 | /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ | ||
494 | ! nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); | ||
495 | |||
496 | ! nsresult | ||
497 | PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) | ||
498 | { | ||
499 | #define PARAM_BUFFER_COUNT 16 | ||
500 | Index: mozilla/xpfe/browser/src/Makefile.in | ||
501 | =================================================================== | ||
502 | RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v | ||
503 | retrieving revision 1.70 | ||
504 | diff --context=3 -r1.70 Makefile.in | ||
505 | *** mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70 | ||
506 | --- mozilla/xpfe/browser/src/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
507 | *************** | ||
508 | *** 44,49 **** | ||
509 | --- 44,50 ---- | ||
510 | |||
511 | MODULE = browser | ||
512 | LIBRARY_NAME = mozbrwsr_s | ||
513 | + EXPORT_LIBRARY = 1 | ||
514 | FORCE_STATIC_LIB = 1 | ||
515 | LIBXUL_LIBRARY = 1 | ||
516 | MODULE_NAME = nsBrowserModule | ||
517 | Index: mozilla/xpfe/components/build/Makefile.in | ||
518 | =================================================================== | ||
519 | RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v | ||
520 | retrieving revision 1.69.8.1 | ||
521 | diff --context=3 -r1.69.8.1 Makefile.in | ||
522 | *** mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1 | ||
523 | --- mozilla/xpfe/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
524 | *************** | ||
525 | *** 44,50 **** | ||
526 | |||
527 | MODULE = appcomps | ||
528 | LIBRARY_NAME = appcomps | ||
529 | - EXPORT_LIBRARY = 1 | ||
530 | IS_COMPONENT = 1 | ||
531 | MODULE_NAME = application | ||
532 | LIBXUL_LIBRARY = 1 | ||
533 | --- 44,49 ---- | ||
534 | Index: mozilla/xpfe/components/filepicker/src/Makefile.in | ||
535 | =================================================================== | ||
536 | RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v | ||
537 | retrieving revision 1.9.8.1 | ||
538 | diff --context=3 -r1.9.8.1 Makefile.in | ||
539 | *** mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1 | ||
540 | --- mozilla/xpfe/components/filepicker/src/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
541 | *************** | ||
542 | *** 47,53 **** | ||
543 | MODULE = filepicker | ||
544 | LIBRARY_NAME = fileview | ||
545 | SHORT_LIBNAME = fileview | ||
546 | - EXPORT_LIBRARY = 1 | ||
547 | IS_COMPONENT = 1 | ||
548 | MODULE_NAME = nsFileViewModule | ||
549 | MOZILLA_INTERNAL_API = 1 | ||
550 | --- 47,52 ---- | ||
551 | Index: mozilla/xpfe/components/find/src/Makefile.in | ||
552 | =================================================================== | ||
553 | RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v | ||
554 | retrieving revision 1.37 | ||
555 | diff --context=3 -r1.37 Makefile.in | ||
556 | *** mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37 | ||
557 | --- mozilla/xpfe/components/find/src/Makefile.in 21 Jul 2006 00:27:17 -0000 | ||
558 | *************** | ||
559 | *** 45,51 **** | ||
560 | MODULE = appcomps | ||
561 | XPIDL_MODULE = mozfind | ||
562 | LIBRARY_NAME = mozfind | ||
563 | - EXPORT_LIBRARY = 1 | ||
564 | IS_COMPONENT = 1 | ||
565 | MODULE_NAME = nsFindComponent | ||
566 | LIBXUL_LIBRARY = 1 | ||
567 | --- 45,50 ---- | ||