summaryrefslogtreecommitdiffstats
path: root/meta/packages/mozilla/minimo/minimo.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/mozilla/minimo/minimo.patch')
-rw-r--r--meta/packages/mozilla/minimo/minimo.patch843
1 files changed, 316 insertions, 527 deletions
diff --git a/meta/packages/mozilla/minimo/minimo.patch b/meta/packages/mozilla/minimo/minimo.patch
index a1f9291167..8894ee7f45 100644
--- a/meta/packages/mozilla/minimo/minimo.patch
+++ b/meta/packages/mozilla/minimo/minimo.patch
@@ -1,567 +1,356 @@
1Index: mozilla/content/html/content/src/nsFormSubmission.cpp 1Index: mozilla/content/html/content/src/nsFormSubmission.cpp
2=================================================================== 2===================================================================
3RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v 3--- mozilla.orig/content/html/content/src/nsFormSubmission.cpp 2005-07-13 18:55:59.000000000 +0200
4retrieving revision 1.46 4+++ mozilla/content/html/content/src/nsFormSubmission.cpp 2007-05-10 12:11:20.000000000 +0200
5diff --context=3 -r1.46 nsFormSubmission.cpp 5@@ -1315,11 +1315,6 @@
6*** mozilla/content/html/content/src/nsFormSubmission.cpp 13 Jul 2005 16:55:59 -0000 1.46 6 nsresult rv = NS_OK;
7--- mozilla/content/html/content/src/nsFormSubmission.cpp 21 Jul 2006 00:27:14 -0000 7
8*************** 8 nsCAutoString charset(aCharset);
9*** 1315,1325 **** 9- // canonical name is passed so that we just have to check against
10 nsresult rv = NS_OK; 10- // *our* canonical names listed in charsetaliases.properties
11 11- if (charset.EqualsLiteral("ISO-8859-1")) {
12 nsCAutoString charset(aCharset); 12- charset.AssignLiteral("windows-1252");
13- // canonical name is passed so that we just have to check against 13- }
14- // *our* canonical names listed in charsetaliases.properties 14
15- if (charset.EqualsLiteral("ISO-8859-1")) { 15 // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of
16- charset.AssignLiteral("windows-1252"); 16 // MS IE/Opera).
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 ----
22Index: mozilla/embedding/base/Makefile.in 17Index: mozilla/embedding/base/Makefile.in
23=================================================================== 18===================================================================
24RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v 19--- mozilla.orig/embedding/base/Makefile.in 2006-02-14 06:28:31.000000000 +0100
25retrieving revision 1.34.8.2 20+++ mozilla/embedding/base/Makefile.in 2007-05-10 12:11:20.000000000 +0200
26diff --context=3 -r1.34.8.2 Makefile.in 21@@ -43,6 +43,7 @@
27*** mozilla/embedding/base/Makefile.in 14 Feb 2006 05:28:31 -0000 1.34.8.2 22
28--- mozilla/embedding/base/Makefile.in 21 Jul 2006 00:27:14 -0000 23 MODULE = embed_base
29*************** 24 LIBRARY_NAME = embed_base_s
30*** 43,48 **** 25+EXPORT_LIBRARY = 1
31--- 43,49 ---- 26 XPIDL_MODULE = embed_base
32 27
33 MODULE = embed_base 28 include $(DEPTH)/config/autoconf.mk
34 LIBRARY_NAME = embed_base_s
35+ EXPORT_LIBRARY = 1
36 XPIDL_MODULE = embed_base
37
38 include $(DEPTH)/config/autoconf.mk
39Index: mozilla/js/src/Makefile.in 29Index: mozilla/js/src/Makefile.in
40=================================================================== 30===================================================================
41RCS file: /cvsroot/mozilla/js/src/Makefile.in,v 31--- mozilla.orig/js/src/Makefile.in 2006-07-28 00:56:20.000000000 +0200
42retrieving revision 3.95.4.4 32+++ mozilla/js/src/Makefile.in 2007-05-10 12:11:21.000000000 +0200
43diff --context=3 -r3.95.4.4 Makefile.in 33@@ -46,6 +46,7 @@
44*** mozilla/js/src/Makefile.in 7 Jul 2006 02:12:02 -0000 3.95.4.4 34
45--- mozilla/js/src/Makefile.in 21 Jul 2006 00:27:14 -0000 35 MODULE = js
46*************** 36 LIBRARY_NAME = mozjs
47*** 46,51 **** 37+EXPORT_LIBRARY = 1
48--- 46,52 ---- 38 LIB_IS_C_ONLY = 1
49 39 GRE_MODULE = 1
50 MODULE = js 40
51 LIBRARY_NAME = mozjs
52+ EXPORT_LIBRARY = 1
53 LIB_IS_C_ONLY = 1
54 GRE_MODULE = 1
55
56Index: mozilla/minimo/Makefile.in 41Index: mozilla/minimo/Makefile.in
57=================================================================== 42===================================================================
58RCS file: /cvsroot/mozilla/minimo/Makefile.in,v 43--- mozilla.orig/minimo/Makefile.in 2006-07-24 21:40:53.000000000 +0200
59retrieving revision 1.1.2.2 44+++ mozilla/minimo/Makefile.in 2007-05-10 12:13:46.000000000 +0200
60diff --context=3 -r1.1.2.2 Makefile.in 45@@ -41,6 +41,6 @@
61*** mozilla/minimo/Makefile.in 29 Jun 2006 06:11:30 -0000 1.1.2.2 46
62--- mozilla/minimo/Makefile.in 21 Jul 2006 00:27:14 -0000 47 include $(DEPTH)/config/autoconf.mk
63*************** 48
64*** 41,46 **** 49-DIRS = config components chrome locales customization base extensions
65 50+DIRS = config chrome locales customization base extensions
66 include $(DEPTH)/config/autoconf.mk 51
67 52 include $(topsrcdir)/config/rules.mk
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
78Index: mozilla/minimo/base/Makefile.in 53Index: mozilla/minimo/base/Makefile.in
79=================================================================== 54===================================================================
80RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v 55--- mozilla.orig/minimo/base/Makefile.in 2006-08-09 17:42:26.000000000 +0200
81retrieving revision 1.3.2.7 56+++ mozilla/minimo/base/Makefile.in 2007-05-10 12:11:21.000000000 +0200
82diff --context=3 -r1.3.2.7 Makefile.in 57@@ -96,7 +96,6 @@
83*** mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7 58
84--- mozilla/minimo/base/Makefile.in 21 Jul 2006 00:27:14 -0000 59 # this should move into the toolkit!
85*************** 60 LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/
86*** 95,101 **** 61-CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
87 62
88 # this should move into the toolkit! 63 ifdef WINCE
89 LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/ 64 RCINCLUDE = wince/SplashScreen.rc
90- CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp 65@@ -143,10 +142,6 @@
91 66 endif
92 ifdef WINCE 67
93 RCINCLUDE = wince/SplashScreen.rc 68
94--- 95,100 ---- 69-FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps
95*************** 70-FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names
96*** 139,148 **** 71-FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs
97 endif 72-
98 73 include $(topsrcdir)/config/static-config.mk
99 74
100- FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps 75 EXTRA_DEPS += $(STATIC_EXTRA_DEPS)
101- FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names 76@@ -180,14 +175,11 @@
102- FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs 77 # (same as in mozilla/js/src/Makefile.in)
103- 78 ifdef WINCE
104 include $(topsrcdir)/config/static-config.mk 79 LDFLAGS += -OPT:NOICF
105 80+else
106 EXTRA_DEPS += $(STATIC_EXTRA_DEPS) 81+# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem.
107--- 138,143 ---- 82+LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P
108*************** 83 endif
109*** 176,189 **** 84
110 # (same as in mozilla/js/src/Makefile.in) 85-export::
111 ifdef WINCE 86- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp .
112 LDFLAGS += -OPT:NOICF 87- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp .
113 endif 88-
114 89-
115- export:: 90-GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp
116- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp . 91
117- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp . 92 ifdef WINCE
118- 93 package::
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::
136Index: mozilla/minimo/base/Minimo.cpp 94Index: mozilla/minimo/base/Minimo.cpp
137=================================================================== 95===================================================================
138RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v 96--- mozilla.orig/minimo/base/Minimo.cpp 2006-10-27 22:30:36.000000000 +0200
139retrieving revision 1.1.2.11 97+++ mozilla/minimo/base/Minimo.cpp 2007-05-10 12:13:21.000000000 +0200
140diff --context=3 -r1.1.2.11 Minimo.cpp 98@@ -813,6 +813,8 @@
141*** mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11 99 #ifdef MOZ_WIDGET_GTK2
142--- mozilla/minimo/base/Minimo.cpp 21 Jul 2006 00:27:15 -0000 100 gtk_set_locale();
143*************** 101 gtk_init(&argc, &argv);
144*** 781,789 **** 102+ gtk_widget_set_default_visual(gdk_rgb_get_visual());
145 CreateListenerWindow(); 103+ gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
146 #endif 104 #endif
147 105
148! #ifdef MOZ_WIDGET_GTK2 106 #ifdef HACKY_PRE_LOAD_LIBRARY
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
169Index: mozilla/minimo/base/SplashScreen.cpp 107Index: mozilla/minimo/base/SplashScreen.cpp
170=================================================================== 108===================================================================
171RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v 109--- mozilla.orig/minimo/base/SplashScreen.cpp 2006-08-21 21:00:24.000000000 +0200
172retrieving revision 1.1.2.3 110+++ mozilla/minimo/base/SplashScreen.cpp 2007-05-10 12:11:22.000000000 +0200
173diff --context=3 -r1.1.2.3 SplashScreen.cpp 111@@ -202,9 +202,24 @@
174*** mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3 112 void KillSplashScreen() {}
175--- mozilla/minimo/base/SplashScreen.cpp 21 Jul 2006 00:27:15 -0000 113 void GetScreenSize(unsigned long* x, unsigned long* y)
176*************** 114 {
177*** 180,188 **** 115+#ifdef MOZ_WIDGET_GTK2
178--- 180,203 ---- 116+ GdkDisplay* display = gdk_display_get_default();
179 void KillSplashScreen() {} 117+ if (display != NULL)
180 void GetScreenSize(unsigned long* x, unsigned long* y) 118+ {
181 { 119+ GdkScreen *screen;
182+ #ifdef MOZ_WIDGET_GTK2 120+ screen = gdk_display_get_default_screen(display);
183+ GdkDisplay* display = gdk_display_get_default(); 121+ *x = gdk_screen_get_width(screen);
184+ if (display != NULL) 122+ *y = gdk_screen_get_height(screen);
185+ { 123+ }
186+ GdkScreen *screen; 124+ else
187+ screen = gdk_display_get_default_screen(display); 125+ {
188+ *x = gdk_screen_get_width(screen); 126+#endif
189+ *y = gdk_screen_get_height(screen); 127 // we need to figure this out.
190+ } 128 *x = 240;
191+ else 129 *y = 320;
192+ { 130+#ifdef MOZ_WIDGET_GTK2
193+ #endif 131+ }
194 // we need to figure this out. 132+#endif
195 *x = 240; 133 }
196 *y = 320; 134
197+ #ifdef MOZ_WIDGET_GTK2 135
198+ }
199+ #endif
200 }
201
202
203Index: mozilla/minimo/chrome/content/minimo.js
204===================================================================
205RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v
206retrieving revision 1.9.2.90
207diff --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 }
244Index: mozilla/minimo/config/linux_package.sh 136Index: mozilla/minimo/config/linux_package.sh
245=================================================================== 137===================================================================
246RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v 138--- mozilla.orig/minimo/config/linux_package.sh 2006-06-30 18:35:19.000000000 +0200
247retrieving revision 1.8.2.3 139+++ mozilla/minimo/config/linux_package.sh 2007-05-10 12:11:22.000000000 +0200
248diff --context=3 -r1.8.2.3 linux_package.sh 140@@ -29,9 +29,7 @@
249*** mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3 141 cp -pRL bin/libnssckbi.so minimo
250--- mozilla/minimo/config/linux_package.sh 21 Jul 2006 00:27:16 -0000 142 cp -pRL bin/libsmime3.so minimo
251*************** 143 cp -pRL bin/libsoftokn3.so minimo
252*** 29,37 **** 144-cp -pRL bin/libsoftokn3.chk minimo
253 cp -pRL bin/libnssckbi.so minimo 145 cp -pRL bin/libfreebl3.so minimo
254 cp -pRL bin/libsmime3.so minimo 146-cp -pRL bin/libfreebl3.chk minimo
255 cp -pRL bin/libsoftokn3.so minimo 147 cp -pRL bin/libssl3.so minimo
256- cp -pRL bin/libsoftokn3.chk minimo 148
257 cp -pRL bin/libfreebl3.so minimo 149 mkdir -p minimo/chrome
258- cp -pRL bin/libfreebl3.chk minimo 150@@ -62,8 +60,6 @@
259 cp -pRL bin/libssl3.so minimo 151 cp -pRL bin/components/nsHelperAppDlg.js minimo/components
260 152 cp -pRL bin/components/nsProgressDialog.js minimo/components
261 mkdir -p minimo/chrome 153
262--- 29,35 ---- 154-cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
263*************** 155-
264*** 62,69 **** 156 mkdir -p minimo/greprefs
265 cp -pRL bin/components/nsHelperAppDlg.js minimo/components 157 cp -pRL bin/greprefs/* minimo/greprefs
266 cp -pRL bin/components/nsProgressDialog.js minimo/components 158
267 159@@ -80,7 +76,7 @@
268- cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components 160
269- 161 echo Linking XPT files.
270 mkdir -p minimo/greprefs 162
271 cp -pRL bin/greprefs/* minimo/greprefs 163-bin/xpt_link minimo/components/all.xpt bin/components/*.xpt
272 164+host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt
273--- 60,65 ---- 165
274*************** 166 echo Chewing on chrome
275*** 80,86 **** 167
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
291Index: mozilla/profile/dirserviceprovider/src/Makefile.in 168Index: mozilla/profile/dirserviceprovider/src/Makefile.in
292=================================================================== 169===================================================================
293RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v 170--- mozilla.orig/profile/dirserviceprovider/src/Makefile.in 2005-04-06 05:35:21.000000000 +0200
294retrieving revision 1.7 171+++ mozilla/profile/dirserviceprovider/src/Makefile.in 2007-05-10 12:11:23.000000000 +0200
295diff --context=3 -r1.7 Makefile.in 172@@ -44,6 +44,7 @@
296*** mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7 173
297--- mozilla/profile/dirserviceprovider/src/Makefile.in 21 Jul 2006 00:27:16 -0000 174 MODULE = profdirserviceprovider
298*************** 175 LIBRARY_NAME = profdirserviceprovider_s
299*** 44,49 **** 176+EXPORT_LIBRARY = 1
300--- 44,50 ---- 177 MOZILLA_INTERNAL_API = 1
301 178
302 MODULE = profdirserviceprovider 179 REQUIRES = xpcom \
303 LIBRARY_NAME = profdirserviceprovider_s
304+ EXPORT_LIBRARY = 1
305 MOZILLA_INTERNAL_API = 1
306
307 REQUIRES = xpcom \
308Index: mozilla/security/coreconf/Linux.mk 180Index: mozilla/security/coreconf/Linux.mk
309=================================================================== 181===================================================================
310RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v 182--- mozilla.orig/security/coreconf/Linux.mk 2006-02-03 23:26:36.000000000 +0100
311retrieving revision 1.18.18.1 183+++ mozilla/security/coreconf/Linux.mk 2007-05-10 12:11:23.000000000 +0200
312diff --context=3 -r1.18.18.1 Linux.mk 184@@ -117,6 +117,10 @@
313*** mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1 185 OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
314--- mozilla/security/coreconf/Linux.mk 21 Jul 2006 00:27:16 -0000 186 CPU_ARCH = mips
315*************** 187 else
316*** 117,122 **** 188+ifeq ($(OS_TEST),arm)
317--- 117,126 ---- 189+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
318 OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE 190+ CPU_ARCH = arm
319 CPU_ARCH = mips 191+else
320 else 192 OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
321+ ifeq ($(OS_TEST),arm) 193 CPU_ARCH = x86
322+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE 194 endif
323+ CPU_ARCH = arm 195@@ -133,6 +137,7 @@
324+ else 196 endif
325 OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE 197 endif
326 CPU_ARCH = x86 198 endif
327 endif 199+endif
328*************** 200
329*** 133,138 **** 201
330--- 137,143 ---- 202 LIBC_TAG = _glibc
331 endif
332 endif
333 endif
334+ endif
335
336
337 LIBC_TAG = _glibc
338Index: mozilla/security/coreconf/arch.mk 203Index: mozilla/security/coreconf/arch.mk
339=================================================================== 204===================================================================
340RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v 205--- mozilla.orig/security/coreconf/arch.mk 2006-02-03 23:26:36.000000000 +0100
341retrieving revision 1.17.14.2 206+++ mozilla/security/coreconf/arch.mk 2007-05-10 12:11:24.000000000 +0200
342diff --context=3 -r1.17.14.2 arch.mk 207@@ -60,18 +60,14 @@
343*** mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2 208 64BIT_TAG=
344--- mozilla/security/coreconf/arch.mk 21 Jul 2006 00:27:16 -0000 209 endif
345*************** 210
346*** 60,77 **** 211-OS_ARCH := $(subst /,_,$(shell uname -s))
347 64BIT_TAG= 212+OS_ARCH := Linux
348 endif 213
349 214 #
350! OS_ARCH := $(subst /,_,$(shell uname -s)) 215 # Attempt to differentiate between sparc and x86 Solaris
351 216 #
352 # 217
353 # Attempt to differentiate between sparc and x86 Solaris 218-OS_TEST := $(shell uname -m)
354 # 219-ifeq ($(OS_TEST),i86pc)
355 220- OS_RELEASE := $(shell uname -r)_$(OS_TEST)
356! OS_TEST := $(shell uname -m) 221-else
357! ifeq ($(OS_TEST),i86pc) 222- OS_RELEASE := $(shell uname -r)
358! OS_RELEASE := $(shell uname -r)_$(OS_TEST) 223-endif
359! else 224+OS_TEST := arm
360! OS_RELEASE := $(shell uname -r) 225+OS_RELEASE := 2.6
361! endif 226
362 227 #
363 # 228 # Force the IRIX64 machines to use IRIX.
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.
380Index: mozilla/toolkit/components/build/Makefile.in 229Index: mozilla/toolkit/components/build/Makefile.in
381=================================================================== 230===================================================================
382RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v 231--- mozilla.orig/toolkit/components/build/Makefile.in 2006-07-13 22:08:29.000000000 +0200
383retrieving revision 1.24.2.10 232+++ mozilla/toolkit/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
384diff --context=3 -r1.24.2.10 Makefile.in 233@@ -112,7 +112,6 @@
385*** mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10 234 $(NULL)
386--- mozilla/toolkit/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000 235
387*************** 236 SHARED_LIBRARY_LIBS = \
388*** 112,118 **** 237- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
389 $(NULL) 238 $(NULL)
390 239
391 SHARED_LIBRARY_LIBS = \ 240 ifdef MOZ_XPINSTALL
392- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \
393 $(NULL)
394
395 ifdef MOZ_XPINSTALL
396--- 112,117 ----
397Index: mozilla/toolkit/components/startup/src/Makefile.in 241Index: mozilla/toolkit/components/startup/src/Makefile.in
398=================================================================== 242===================================================================
399RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v 243--- mozilla.orig/toolkit/components/startup/src/Makefile.in 2005-07-27 22:42:44.000000000 +0200
400retrieving revision 1.7 244+++ mozilla/toolkit/components/startup/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
401diff --context=3 -r1.7 Makefile.in 245@@ -43,6 +43,7 @@
402*** mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7 246
403--- mozilla/toolkit/components/startup/src/Makefile.in 21 Jul 2006 00:27:17 -0000 247 MODULE = toolkitcomps
404*************** 248 LIBRARY_NAME = appstartup_s
405*** 43,48 **** 249+EXPORT_LIBRARY = 1
406--- 43,49 ---- 250 FORCE_STATIC_LIB = 1
407 251 LIBXUL_LIBRARY = 1
408 MODULE = toolkitcomps 252
409 LIBRARY_NAME = appstartup_s
410+ EXPORT_LIBRARY = 1
411 FORCE_STATIC_LIB = 1
412 LIBXUL_LIBRARY = 1
413
414Index: mozilla/toolkit/xre/Makefile.in 253Index: mozilla/toolkit/xre/Makefile.in
415=================================================================== 254===================================================================
416RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v 255--- mozilla.orig/toolkit/xre/Makefile.in 2007-02-06 08:13:20.000000000 +0100
417retrieving revision 1.48.2.3 256+++ mozilla/toolkit/xre/Makefile.in 2007-05-10 12:11:27.000000000 +0200
418diff --context=3 -r1.48.2.3 Makefile.in 257@@ -45,7 +45,6 @@
419*** mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3 258
420--- mozilla/toolkit/xre/Makefile.in 21 Jul 2006 00:27:17 -0000 259 MODULE = xulapp
421*************** 260 LIBRARY_NAME = xulapp_s
422*** 45,51 **** 261-EXPORT_LIBRARY = 1
423 262 LIBXUL_LIBRARY = 1
424 MODULE = xulapp 263
425 LIBRARY_NAME = xulapp_s 264 REQUIRES = \
426- EXPORT_LIBRARY = 1 265@@ -180,14 +179,6 @@
427 LIBXUL_LIBRARY = 1 266
428 267 include $(topsrcdir)/config/rules.mk
429 REQUIRES = \ 268
430--- 45,50 ---- 269-ifdef BUILD_STATIC_LIBS
431*************** 270-export::
432*** 176,189 **** 271- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner
433 272-# embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to
434 include $(topsrcdir)/config/rules.mk 273-# FINAL_LINK_COMPS to keep the two lists in sync :-(
435 274- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) ""
436- ifdef BUILD_STATIC_LIBS 275-endif
437- export:: 276-
438- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner 277 LOCAL_INCLUDES += \
439- # embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to 278 -I$(srcdir) \
440- # FINAL_LINK_COMPS to keep the two lists in sync :-( 279 -I$(topsrcdir)/xpfe/bootstrap \
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 ----
448Index: mozilla/xpcom/build/Makefile.in 280Index: mozilla/xpcom/build/Makefile.in
449=================================================================== 281===================================================================
450RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v 282--- mozilla.orig/xpcom/build/Makefile.in 2006-01-29 17:51:02.000000000 +0100
451retrieving revision 1.90.2.2 283+++ mozilla/xpcom/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
452diff --context=3 -r1.90.2.2 Makefile.in 284@@ -61,7 +61,7 @@
453*** mozilla/xpcom/build/Makefile.in 29 Jan 2006 16:51:02 -0000 1.90.2.2 285 endif
454--- mozilla/xpcom/build/Makefile.in 21 Jul 2006 00:27:17 -0000 286
455*************** 287 # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list
456*** 61,67 **** 288-#EXPORT_LIBRARY = 1
457 endif 289+EXPORT_LIBRARY = 1
458 290 GRE_MODULE = 1
459 # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list 291 MOZILLA_INTERNAL_API = 1
460! #EXPORT_LIBRARY = 1 292
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
472Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 293Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
473=================================================================== 294===================================================================
474RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v 295--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2004-04-18 16:18:18.000000000 +0200
475retrieving revision 1.7 296+++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2007-05-10 12:11:27.000000000 +0200
476diff --context=3 -r1.7 xptcstubs_arm.cpp 297@@ -45,9 +45,9 @@
477*** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 18 Apr 2004 14:18:18 -0000 1.7 298 #endif
478--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 21 Jul 2006 00:27:17 -0000 299
479*************** 300 /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */
480*** 45,53 **** 301-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
481 #endif 302+nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch");
482 303
483 /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ 304-static nsresult
484! static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); 305+nsresult
485 306 PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args)
486! static nsresult 307 {
487 PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) 308 #define PARAM_BUFFER_COUNT 16
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
500Index: mozilla/xpfe/browser/src/Makefile.in 309Index: mozilla/xpfe/browser/src/Makefile.in
501=================================================================== 310===================================================================
502RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v 311--- mozilla.orig/xpfe/browser/src/Makefile.in 2005-03-18 22:23:45.000000000 +0100
503retrieving revision 1.70 312+++ mozilla/xpfe/browser/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
504diff --context=3 -r1.70 Makefile.in 313@@ -44,6 +44,7 @@
505*** mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70 314
506--- mozilla/xpfe/browser/src/Makefile.in 21 Jul 2006 00:27:17 -0000 315 MODULE = browser
507*************** 316 LIBRARY_NAME = mozbrwsr_s
508*** 44,49 **** 317+EXPORT_LIBRARY = 1
509--- 44,50 ---- 318 FORCE_STATIC_LIB = 1
510 319 LIBXUL_LIBRARY = 1
511 MODULE = browser 320 MODULE_NAME = nsBrowserModule
512 LIBRARY_NAME = mozbrwsr_s
513+ EXPORT_LIBRARY = 1
514 FORCE_STATIC_LIB = 1
515 LIBXUL_LIBRARY = 1
516 MODULE_NAME = nsBrowserModule
517Index: mozilla/xpfe/components/build/Makefile.in 321Index: mozilla/xpfe/components/build/Makefile.in
518=================================================================== 322===================================================================
519RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v 323--- mozilla.orig/xpfe/components/build/Makefile.in 2005-09-27 02:15:25.000000000 +0200
520retrieving revision 1.69.8.1 324+++ mozilla/xpfe/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200
521diff --context=3 -r1.69.8.1 Makefile.in 325@@ -44,7 +44,6 @@
522*** mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1 326
523--- mozilla/xpfe/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000 327 MODULE = appcomps
524*************** 328 LIBRARY_NAME = appcomps
525*** 44,50 **** 329-EXPORT_LIBRARY = 1
526 330 IS_COMPONENT = 1
527 MODULE = appcomps 331 MODULE_NAME = application
528 LIBRARY_NAME = appcomps 332 LIBXUL_LIBRARY = 1
529- EXPORT_LIBRARY = 1
530 IS_COMPONENT = 1
531 MODULE_NAME = application
532 LIBXUL_LIBRARY = 1
533--- 44,49 ----
534Index: mozilla/xpfe/components/filepicker/src/Makefile.in 333Index: mozilla/xpfe/components/filepicker/src/Makefile.in
535=================================================================== 334===================================================================
536RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v 335--- mozilla.orig/xpfe/components/filepicker/src/Makefile.in 2006-05-22 18:29:32.000000000 +0200
537retrieving revision 1.9.8.1 336+++ mozilla/xpfe/components/filepicker/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
538diff --context=3 -r1.9.8.1 Makefile.in 337@@ -47,7 +47,6 @@
539*** mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1 338 MODULE = filepicker
540--- mozilla/xpfe/components/filepicker/src/Makefile.in 21 Jul 2006 00:27:17 -0000 339 LIBRARY_NAME = fileview
541*************** 340 SHORT_LIBNAME = fileview
542*** 47,53 **** 341-EXPORT_LIBRARY = 1
543 MODULE = filepicker 342 IS_COMPONENT = 1
544 LIBRARY_NAME = fileview 343 MODULE_NAME = nsFileViewModule
545 SHORT_LIBNAME = fileview 344 MOZILLA_INTERNAL_API = 1
546- EXPORT_LIBRARY = 1
547 IS_COMPONENT = 1
548 MODULE_NAME = nsFileViewModule
549 MOZILLA_INTERNAL_API = 1
550--- 47,52 ----
551Index: mozilla/xpfe/components/find/src/Makefile.in 345Index: mozilla/xpfe/components/find/src/Makefile.in
552=================================================================== 346===================================================================
553RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v 347--- mozilla.orig/xpfe/components/find/src/Makefile.in 2005-03-18 22:23:46.000000000 +0100
554retrieving revision 1.37 348+++ mozilla/xpfe/components/find/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200
555diff --context=3 -r1.37 Makefile.in 349@@ -45,7 +45,6 @@
556*** mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37 350 MODULE = appcomps
557--- mozilla/xpfe/components/find/src/Makefile.in 21 Jul 2006 00:27:17 -0000 351 XPIDL_MODULE = mozfind
558*************** 352 LIBRARY_NAME = mozfind
559*** 45,51 **** 353-EXPORT_LIBRARY = 1
560 MODULE = appcomps 354 IS_COMPONENT = 1
561 XPIDL_MODULE = mozfind 355 MODULE_NAME = nsFindComponent
562 LIBRARY_NAME = mozfind 356 LIBXUL_LIBRARY = 1
563- EXPORT_LIBRARY = 1
564 IS_COMPONENT = 1
565 MODULE_NAME = nsFindComponent
566 LIBXUL_LIBRARY = 1
567--- 45,50 ----
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 16:48:46 +0000