diff options
Diffstat (limited to 'meta-extras/packages/mozilla/minimo/minimo.patch')
-rw-r--r-- | meta-extras/packages/mozilla/minimo/minimo.patch | 356 |
1 files changed, 0 insertions, 356 deletions
diff --git a/meta-extras/packages/mozilla/minimo/minimo.patch b/meta-extras/packages/mozilla/minimo/minimo.patch deleted file mode 100644 index 8894ee7f45..0000000000 --- a/meta-extras/packages/mozilla/minimo/minimo.patch +++ /dev/null | |||
@@ -1,356 +0,0 @@ | |||
1 | Index: mozilla/content/html/content/src/nsFormSubmission.cpp | ||
2 | =================================================================== | ||
3 | --- mozilla.orig/content/html/content/src/nsFormSubmission.cpp 2005-07-13 18:55:59.000000000 +0200 | ||
4 | +++ mozilla/content/html/content/src/nsFormSubmission.cpp 2007-05-10 12:11:20.000000000 +0200 | ||
5 | @@ -1315,11 +1315,6 @@ | ||
6 | nsresult rv = NS_OK; | ||
7 | |||
8 | nsCAutoString charset(aCharset); | ||
9 | - // canonical name is passed so that we just have to check against | ||
10 | - // *our* canonical names listed in charsetaliases.properties | ||
11 | - if (charset.EqualsLiteral("ISO-8859-1")) { | ||
12 | - charset.AssignLiteral("windows-1252"); | ||
13 | - } | ||
14 | |||
15 | // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of | ||
16 | // MS IE/Opera). | ||
17 | Index: mozilla/embedding/base/Makefile.in | ||
18 | =================================================================== | ||
19 | --- mozilla.orig/embedding/base/Makefile.in 2006-02-14 06:28:31.000000000 +0100 | ||
20 | +++ mozilla/embedding/base/Makefile.in 2007-05-10 12:11:20.000000000 +0200 | ||
21 | @@ -43,6 +43,7 @@ | ||
22 | |||
23 | MODULE = embed_base | ||
24 | LIBRARY_NAME = embed_base_s | ||
25 | +EXPORT_LIBRARY = 1 | ||
26 | XPIDL_MODULE = embed_base | ||
27 | |||
28 | include $(DEPTH)/config/autoconf.mk | ||
29 | Index: mozilla/js/src/Makefile.in | ||
30 | =================================================================== | ||
31 | --- mozilla.orig/js/src/Makefile.in 2006-07-28 00:56:20.000000000 +0200 | ||
32 | +++ mozilla/js/src/Makefile.in 2007-05-10 12:11:21.000000000 +0200 | ||
33 | @@ -46,6 +46,7 @@ | ||
34 | |||
35 | MODULE = js | ||
36 | LIBRARY_NAME = mozjs | ||
37 | +EXPORT_LIBRARY = 1 | ||
38 | LIB_IS_C_ONLY = 1 | ||
39 | GRE_MODULE = 1 | ||
40 | |||
41 | Index: mozilla/minimo/Makefile.in | ||
42 | =================================================================== | ||
43 | --- mozilla.orig/minimo/Makefile.in 2006-07-24 21:40:53.000000000 +0200 | ||
44 | +++ mozilla/minimo/Makefile.in 2007-05-10 12:13:46.000000000 +0200 | ||
45 | @@ -41,6 +41,6 @@ | ||
46 | |||
47 | include $(DEPTH)/config/autoconf.mk | ||
48 | |||
49 | -DIRS = config components chrome locales customization base extensions | ||
50 | +DIRS = config chrome locales customization base extensions | ||
51 | |||
52 | include $(topsrcdir)/config/rules.mk | ||
53 | Index: mozilla/minimo/base/Makefile.in | ||
54 | =================================================================== | ||
55 | --- mozilla.orig/minimo/base/Makefile.in 2006-08-09 17:42:26.000000000 +0200 | ||
56 | +++ mozilla/minimo/base/Makefile.in 2007-05-10 12:11:21.000000000 +0200 | ||
57 | @@ -96,7 +96,6 @@ | ||
58 | |||
59 | # this should move into the toolkit! | ||
60 | LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/ | ||
61 | -CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp | ||
62 | |||
63 | ifdef WINCE | ||
64 | RCINCLUDE = wince/SplashScreen.rc | ||
65 | @@ -143,10 +142,6 @@ | ||
66 | endif | ||
67 | |||
68 | |||
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 | ||
72 | - | ||
73 | include $(topsrcdir)/config/static-config.mk | ||
74 | |||
75 | EXTRA_DEPS += $(STATIC_EXTRA_DEPS) | ||
76 | @@ -180,14 +175,11 @@ | ||
77 | # (same as in mozilla/js/src/Makefile.in) | ||
78 | ifdef WINCE | ||
79 | LDFLAGS += -OPT:NOICF | ||
80 | +else | ||
81 | +# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem. | ||
82 | +LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P | ||
83 | endif | ||
84 | |||
85 | -export:: | ||
86 | - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp . | ||
87 | - $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp . | ||
88 | - | ||
89 | - | ||
90 | -GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp | ||
91 | |||
92 | ifdef WINCE | ||
93 | package:: | ||
94 | Index: mozilla/minimo/base/Minimo.cpp | ||
95 | =================================================================== | ||
96 | --- mozilla.orig/minimo/base/Minimo.cpp 2006-10-27 22:30:36.000000000 +0200 | ||
97 | +++ mozilla/minimo/base/Minimo.cpp 2007-05-10 12:13:21.000000000 +0200 | ||
98 | @@ -813,6 +813,8 @@ | ||
99 | #ifdef MOZ_WIDGET_GTK2 | ||
100 | gtk_set_locale(); | ||
101 | gtk_init(&argc, &argv); | ||
102 | + gtk_widget_set_default_visual(gdk_rgb_get_visual()); | ||
103 | + gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); | ||
104 | #endif | ||
105 | |||
106 | #ifdef HACKY_PRE_LOAD_LIBRARY | ||
107 | Index: mozilla/minimo/base/SplashScreen.cpp | ||
108 | =================================================================== | ||
109 | --- mozilla.orig/minimo/base/SplashScreen.cpp 2006-08-21 21:00:24.000000000 +0200 | ||
110 | +++ mozilla/minimo/base/SplashScreen.cpp 2007-05-10 12:11:22.000000000 +0200 | ||
111 | @@ -202,9 +202,24 @@ | ||
112 | void KillSplashScreen() {} | ||
113 | void GetScreenSize(unsigned long* x, unsigned long* y) | ||
114 | { | ||
115 | +#ifdef MOZ_WIDGET_GTK2 | ||
116 | + GdkDisplay* display = gdk_display_get_default(); | ||
117 | + if (display != NULL) | ||
118 | + { | ||
119 | + GdkScreen *screen; | ||
120 | + screen = gdk_display_get_default_screen(display); | ||
121 | + *x = gdk_screen_get_width(screen); | ||
122 | + *y = gdk_screen_get_height(screen); | ||
123 | + } | ||
124 | + else | ||
125 | + { | ||
126 | +#endif | ||
127 | // we need to figure this out. | ||
128 | *x = 240; | ||
129 | *y = 320; | ||
130 | +#ifdef MOZ_WIDGET_GTK2 | ||
131 | + } | ||
132 | +#endif | ||
133 | } | ||
134 | |||
135 | |||
136 | Index: mozilla/minimo/config/linux_package.sh | ||
137 | =================================================================== | ||
138 | --- mozilla.orig/minimo/config/linux_package.sh 2006-06-30 18:35:19.000000000 +0200 | ||
139 | +++ mozilla/minimo/config/linux_package.sh 2007-05-10 12:11:22.000000000 +0200 | ||
140 | @@ -29,9 +29,7 @@ | ||
141 | cp -pRL bin/libnssckbi.so minimo | ||
142 | cp -pRL bin/libsmime3.so minimo | ||
143 | cp -pRL bin/libsoftokn3.so minimo | ||
144 | -cp -pRL bin/libsoftokn3.chk minimo | ||
145 | cp -pRL bin/libfreebl3.so minimo | ||
146 | -cp -pRL bin/libfreebl3.chk minimo | ||
147 | cp -pRL bin/libssl3.so minimo | ||
148 | |||
149 | mkdir -p minimo/chrome | ||
150 | @@ -62,8 +60,6 @@ | ||
151 | cp -pRL bin/components/nsHelperAppDlg.js minimo/components | ||
152 | cp -pRL bin/components/nsProgressDialog.js minimo/components | ||
153 | |||
154 | -cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components | ||
155 | - | ||
156 | mkdir -p minimo/greprefs | ||
157 | cp -pRL bin/greprefs/* minimo/greprefs | ||
158 | |||
159 | @@ -80,7 +76,7 @@ | ||
160 | |||
161 | echo Linking XPT files. | ||
162 | |||
163 | -bin/xpt_link minimo/components/all.xpt bin/components/*.xpt | ||
164 | +host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt | ||
165 | |||
166 | echo Chewing on chrome | ||
167 | |||
168 | Index: mozilla/profile/dirserviceprovider/src/Makefile.in | ||
169 | =================================================================== | ||
170 | --- mozilla.orig/profile/dirserviceprovider/src/Makefile.in 2005-04-06 05:35:21.000000000 +0200 | ||
171 | +++ mozilla/profile/dirserviceprovider/src/Makefile.in 2007-05-10 12:11:23.000000000 +0200 | ||
172 | @@ -44,6 +44,7 @@ | ||
173 | |||
174 | MODULE = profdirserviceprovider | ||
175 | LIBRARY_NAME = profdirserviceprovider_s | ||
176 | +EXPORT_LIBRARY = 1 | ||
177 | MOZILLA_INTERNAL_API = 1 | ||
178 | |||
179 | REQUIRES = xpcom \ | ||
180 | Index: mozilla/security/coreconf/Linux.mk | ||
181 | =================================================================== | ||
182 | --- mozilla.orig/security/coreconf/Linux.mk 2006-02-03 23:26:36.000000000 +0100 | ||
183 | +++ mozilla/security/coreconf/Linux.mk 2007-05-10 12:11:23.000000000 +0200 | ||
184 | @@ -117,6 +117,10 @@ | ||
185 | OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE | ||
186 | CPU_ARCH = mips | ||
187 | else | ||
188 | +ifeq ($(OS_TEST),arm) | ||
189 | + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE | ||
190 | + CPU_ARCH = arm | ||
191 | +else | ||
192 | OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE | ||
193 | CPU_ARCH = x86 | ||
194 | endif | ||
195 | @@ -133,6 +137,7 @@ | ||
196 | endif | ||
197 | endif | ||
198 | endif | ||
199 | +endif | ||
200 | |||
201 | |||
202 | LIBC_TAG = _glibc | ||
203 | Index: mozilla/security/coreconf/arch.mk | ||
204 | =================================================================== | ||
205 | --- mozilla.orig/security/coreconf/arch.mk 2006-02-03 23:26:36.000000000 +0100 | ||
206 | +++ mozilla/security/coreconf/arch.mk 2007-05-10 12:11:24.000000000 +0200 | ||
207 | @@ -60,18 +60,14 @@ | ||
208 | 64BIT_TAG= | ||
209 | endif | ||
210 | |||
211 | -OS_ARCH := $(subst /,_,$(shell uname -s)) | ||
212 | +OS_ARCH := Linux | ||
213 | |||
214 | # | ||
215 | # Attempt to differentiate between sparc and x86 Solaris | ||
216 | # | ||
217 | |||
218 | -OS_TEST := $(shell uname -m) | ||
219 | -ifeq ($(OS_TEST),i86pc) | ||
220 | - OS_RELEASE := $(shell uname -r)_$(OS_TEST) | ||
221 | -else | ||
222 | - OS_RELEASE := $(shell uname -r) | ||
223 | -endif | ||
224 | +OS_TEST := arm | ||
225 | +OS_RELEASE := 2.6 | ||
226 | |||
227 | # | ||
228 | # Force the IRIX64 machines to use IRIX. | ||
229 | Index: mozilla/toolkit/components/build/Makefile.in | ||
230 | =================================================================== | ||
231 | --- mozilla.orig/toolkit/components/build/Makefile.in 2006-07-13 22:08:29.000000000 +0200 | ||
232 | +++ mozilla/toolkit/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200 | ||
233 | @@ -112,7 +112,6 @@ | ||
234 | $(NULL) | ||
235 | |||
236 | SHARED_LIBRARY_LIBS = \ | ||
237 | - ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \ | ||
238 | $(NULL) | ||
239 | |||
240 | ifdef MOZ_XPINSTALL | ||
241 | Index: mozilla/toolkit/components/startup/src/Makefile.in | ||
242 | =================================================================== | ||
243 | --- mozilla.orig/toolkit/components/startup/src/Makefile.in 2005-07-27 22:42:44.000000000 +0200 | ||
244 | +++ mozilla/toolkit/components/startup/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200 | ||
245 | @@ -43,6 +43,7 @@ | ||
246 | |||
247 | MODULE = toolkitcomps | ||
248 | LIBRARY_NAME = appstartup_s | ||
249 | +EXPORT_LIBRARY = 1 | ||
250 | FORCE_STATIC_LIB = 1 | ||
251 | LIBXUL_LIBRARY = 1 | ||
252 | |||
253 | Index: mozilla/toolkit/xre/Makefile.in | ||
254 | =================================================================== | ||
255 | --- mozilla.orig/toolkit/xre/Makefile.in 2007-02-06 08:13:20.000000000 +0100 | ||
256 | +++ mozilla/toolkit/xre/Makefile.in 2007-05-10 12:11:27.000000000 +0200 | ||
257 | @@ -45,7 +45,6 @@ | ||
258 | |||
259 | MODULE = xulapp | ||
260 | LIBRARY_NAME = xulapp_s | ||
261 | -EXPORT_LIBRARY = 1 | ||
262 | LIBXUL_LIBRARY = 1 | ||
263 | |||
264 | REQUIRES = \ | ||
265 | @@ -180,14 +179,6 @@ | ||
266 | |||
267 | include $(topsrcdir)/config/rules.mk | ||
268 | |||
269 | -ifdef BUILD_STATIC_LIBS | ||
270 | -export:: | ||
271 | - @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner | ||
272 | -# embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to | ||
273 | -# FINAL_LINK_COMPS to keep the two lists in sync :-( | ||
274 | - @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) "" | ||
275 | -endif | ||
276 | - | ||
277 | LOCAL_INCLUDES += \ | ||
278 | -I$(srcdir) \ | ||
279 | -I$(topsrcdir)/xpfe/bootstrap \ | ||
280 | Index: mozilla/xpcom/build/Makefile.in | ||
281 | =================================================================== | ||
282 | --- mozilla.orig/xpcom/build/Makefile.in 2006-01-29 17:51:02.000000000 +0100 | ||
283 | +++ mozilla/xpcom/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200 | ||
284 | @@ -61,7 +61,7 @@ | ||
285 | endif | ||
286 | |||
287 | # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list | ||
288 | -#EXPORT_LIBRARY = 1 | ||
289 | +EXPORT_LIBRARY = 1 | ||
290 | GRE_MODULE = 1 | ||
291 | MOZILLA_INTERNAL_API = 1 | ||
292 | |||
293 | Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp | ||
294 | =================================================================== | ||
295 | --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2004-04-18 16:18:18.000000000 +0200 | ||
296 | +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2007-05-10 12:11:27.000000000 +0200 | ||
297 | @@ -45,9 +45,9 @@ | ||
298 | #endif | ||
299 | |||
300 | /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ | ||
301 | -static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); | ||
302 | +nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); | ||
303 | |||
304 | -static nsresult | ||
305 | +nsresult | ||
306 | PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) | ||
307 | { | ||
308 | #define PARAM_BUFFER_COUNT 16 | ||
309 | Index: mozilla/xpfe/browser/src/Makefile.in | ||
310 | =================================================================== | ||
311 | --- mozilla.orig/xpfe/browser/src/Makefile.in 2005-03-18 22:23:45.000000000 +0100 | ||
312 | +++ mozilla/xpfe/browser/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200 | ||
313 | @@ -44,6 +44,7 @@ | ||
314 | |||
315 | MODULE = browser | ||
316 | LIBRARY_NAME = mozbrwsr_s | ||
317 | +EXPORT_LIBRARY = 1 | ||
318 | FORCE_STATIC_LIB = 1 | ||
319 | LIBXUL_LIBRARY = 1 | ||
320 | MODULE_NAME = nsBrowserModule | ||
321 | Index: mozilla/xpfe/components/build/Makefile.in | ||
322 | =================================================================== | ||
323 | --- mozilla.orig/xpfe/components/build/Makefile.in 2005-09-27 02:15:25.000000000 +0200 | ||
324 | +++ mozilla/xpfe/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200 | ||
325 | @@ -44,7 +44,6 @@ | ||
326 | |||
327 | MODULE = appcomps | ||
328 | LIBRARY_NAME = appcomps | ||
329 | -EXPORT_LIBRARY = 1 | ||
330 | IS_COMPONENT = 1 | ||
331 | MODULE_NAME = application | ||
332 | LIBXUL_LIBRARY = 1 | ||
333 | Index: mozilla/xpfe/components/filepicker/src/Makefile.in | ||
334 | =================================================================== | ||
335 | --- mozilla.orig/xpfe/components/filepicker/src/Makefile.in 2006-05-22 18:29:32.000000000 +0200 | ||
336 | +++ mozilla/xpfe/components/filepicker/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200 | ||
337 | @@ -47,7 +47,6 @@ | ||
338 | MODULE = filepicker | ||
339 | LIBRARY_NAME = fileview | ||
340 | SHORT_LIBNAME = fileview | ||
341 | -EXPORT_LIBRARY = 1 | ||
342 | IS_COMPONENT = 1 | ||
343 | MODULE_NAME = nsFileViewModule | ||
344 | MOZILLA_INTERNAL_API = 1 | ||
345 | Index: mozilla/xpfe/components/find/src/Makefile.in | ||
346 | =================================================================== | ||
347 | --- mozilla.orig/xpfe/components/find/src/Makefile.in 2005-03-18 22:23:46.000000000 +0100 | ||
348 | +++ mozilla/xpfe/components/find/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200 | ||
349 | @@ -45,7 +45,6 @@ | ||
350 | MODULE = appcomps | ||
351 | XPIDL_MODULE = mozfind | ||
352 | LIBRARY_NAME = mozfind | ||
353 | -EXPORT_LIBRARY = 1 | ||
354 | IS_COMPONENT = 1 | ||
355 | MODULE_NAME = nsFindComponent | ||
356 | LIBXUL_LIBRARY = 1 | ||