Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Jory Pratt (anarchy)" <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/mozilla-firefox/3.6: 001-firefox_gentoo_install_dirs.patch 100-bz386904_config_rules_install_dist_files.patch 116-gentoo_no_app_updates.patch 137-bz460917_att350845_reload_new_plugins-gentoo-update.patch 300-xulrunner-fix-jemalloc-vs-aslr.patch 301-xulrunner-xpctools.patch 302_fix-java-xpcom.patch 400-libdl.patch 401-libsydney_oss.patch 402-oggzfbsd.patch 700-sparc-build.patch
Date: Fri, 29 Jan 2010 15:36:19
Message-Id: E1NastN-0005nW-L1@stork.gentoo.org
1 anarchy 10/01/29 15:36:17
2
3 Added: 001-firefox_gentoo_install_dirs.patch
4 100-bz386904_config_rules_install_dist_files.patch
5 116-gentoo_no_app_updates.patch
6 137-bz460917_att350845_reload_new_plugins-gentoo-update.patch
7 300-xulrunner-fix-jemalloc-vs-aslr.patch
8 301-xulrunner-xpctools.patch
9 302_fix-java-xpcom.patch 400-libdl.patch
10 401-libsydney_oss.patch 402-oggzfbsd.patch
11 700-sparc-build.patch
12 Log:
13 firefox 3.6 patchset
14
15 Revision Changes Path
16 1.1 src/patchsets/mozilla-firefox/3.6/001-firefox_gentoo_install_dirs.patch
17
18 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/001-firefox_gentoo_install_dirs.patch?rev=1.1&view=markup
19 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/001-firefox_gentoo_install_dirs.patch?rev=1.1&content-type=text/plain
20
21 Index: 001-firefox_gentoo_install_dirs.patch
22 ===================================================================
23 --- config/autoconf.mk.in.orig 2007-08-03 22:02:32.000000000 +0200
24 +++ config/autoconf.mk.in 2007-08-03 22:07:00.000000000 +0200
25 @@ -58,14 +58,14 @@
26 prefix = @prefix@
27 exec_prefix = @exec_prefix@
28 bindir = @bindir@
29 -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
30 +includedir = @includedir@/mozilla-firefox
31 libdir = @libdir@
32 datadir = @datadir@
33 mandir = @mandir@
34 -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
35 +idldir = $(includedir)/idl
36
37 -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
38 -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
39 +installdir = $(libdir)/mozilla-firefox
40 +sdkdir = $(libdir)/mozilla-firefox
41
42 DIST = $(DEPTH)/dist
43 LIBXUL_SDK = @LIBXUL_SDK@
44
45
46
47 1.1 src/patchsets/mozilla-firefox/3.6/100-bz386904_config_rules_install_dist_files.patch
48
49 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/100-bz386904_config_rules_install_dist_files.patch?rev=1.1&view=markup
50 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/100-bz386904_config_rules_install_dist_files.patch?rev=1.1&content-type=text/plain
51
52 Index: 100-bz386904_config_rules_install_dist_files.patch
53 ===================================================================
54 This is from:
55 https://bugzilla.mozilla.org/show_bug.cgi?id=386904
56 https://bugzilla.mozilla.org/attachment.cgi?id=270967
57
58
59 -- Summary:
60
61 This patch implements DIST_FILES install:: target as well as
62 DIST_CHROME_FILES install target.
63
64 -- Evaluation:
65
66 DIST_FILES is now used in browser/app/Makefile.in to install
67 application.ini; however, DEST_FILES is only implemented for
68 libs::, but not for install::.
69
70 In consequence, make install'ed installs of firefox now break
71 with missing application.ini file.
72
73 When writing this fix, it became obvious that DIST_CHROME_FILES
74 install: target is missing too ... though it doesn't cause any
75 problems because its not really used.
76
77 ---
78 config/rules.mk | 28 ++++++++++++++++++++++++++++
79 1 file changed, 28 insertions(+)
80
81 Index: mozilla/config/rules.mk
82 ===================================================================
83 --- mozilla.orig/config/rules.mk 2007-08-18 15:15:17.000000000 +0000
84 +++ mozilla/config/rules.mk 2007-08-18 15:15:36.000000000 +0000
85 @@ -1699,28 +1699,56 @@
86 @$(EXIT_ON_ERROR) \
87 for f in $(DIST_FILES); do \
88 dest=$(FINAL_TARGET)/`basename $$f`; \
89 $(RM) -f $$dest; \
90 $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \
91 $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
92 $(srcdir)/$$f > $$dest; \
93 done
94 +
95 +install:: $(DIST_FILES)
96 +ifndef XPI_NAME
97 +ifndef NO_INSTALL
98 + @$(EXIT_ON_ERROR) \
99 + for f in $(DIST_FILES); do \
100 + dest=$(DESTDIR)$(mozappdir)/`basename $$f`; \
101 + $(RM) -f $$dest; \
102 + $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \
103 + $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
104 + $(srcdir)/$$f > $$dest; \
105 + done
106 +endif
107 +endif
108 endif
109
110 ifneq ($(DIST_CHROME_FILES),)
111 libs:: $(DIST_CHROME_FILES)
112 @$(EXIT_ON_ERROR) \
113 for f in $(DIST_CHROME_FILES); do \
114 dest=$(FINAL_TARGET)/chrome/`basename $$f`; \
115 $(RM) -f $$dest; \
116 $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \
117 $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
118 $(srcdir)/$$f > $$dest; \
119 done
120 +
121 +install:: $(DIST_CHROME_FILES)
122 +ifndef XPI_NAME
123 +ifndef NO_INSTALL
124 + @$(EXIT_ON_ERROR) \
125 + for f in $(DIST_CHROME_FILES); do \
126 + dest=$(DESTDIR)$(mozappdir)/chrome/`basename $$f`; \
127 + $(RM) -f $$dest; \
128 + $(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \
129 + $(XULAPP_DEFINES) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
130 + $(srcdir)/$$f > $$dest; \
131 + done
132 +endif
133 +endif
134 endif
135
136 ifneq ($(XPI_PKGNAME),)
137 libs realchrome::
138 ifdef STRIP_XPI
139 ifndef MOZ_DEBUG
140 @echo "Stripping $(XPI_PKGNAME) package directory..."
141 @echo $(FINAL_TARGET)
142
143
144
145 1.1 src/patchsets/mozilla-firefox/3.6/116-gentoo_no_app_updates.patch
146
147 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/116-gentoo_no_app_updates.patch?rev=1.1&view=markup
148 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/116-gentoo_no_app_updates.patch?rev=1.1&content-type=text/plain
149
150 Index: 116-gentoo_no_app_updates.patch
151 ===================================================================
152 --- browser/components/preferences/advanced.js 2009-11-24 22:12:34.000000000 -0600
153 +++ browser/components/preferences/advanced.js-new 2009-12-02 10:26:18.378458863 -0600
154 @@ -408,7 +408,7 @@
155 var enabledPref = document.getElementById("app.update.enabled");
156 var enableAppUpdate = document.getElementById("enableAppUpdate");
157
158 - enableAppUpdate.disabled = !aus.canCheckForUpdates || enabledPref.locked;
159 + enableAppUpdate.disabled = true;
160 },
161
162 /**
163 @@ -423,8 +423,7 @@
164 var updateModeLabel = document.getElementById("updateModeLabel");
165 var updateMode = document.getElementById("updateMode");
166
167 - var disable = enabledPref.locked || !enabledPref.value ||
168 - autoPref.locked;
169 + var disable = true;
170 updateModeLabel.disabled = updateMode.disabled = disable;
171 },
172
173 @@ -440,8 +439,7 @@
174
175 var warnIncompatible = document.getElementById("warnIncompatible");
176
177 - var disable = enabledPref.locked || !enabledPref.value || autoPref.locked ||
178 - !autoPref.value || modePref.locked;
179 + var disable = true;
180 warnIncompatible.disabled = disable;
181 },
182
183
184
185 1.1 src/patchsets/mozilla-firefox/3.6/137-bz460917_att350845_reload_new_plugins-gentoo-update.patch
186
187 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/137-bz460917_att350845_reload_new_plugins-gentoo-update.patch?rev=1.1&view=markup
188 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/137-bz460917_att350845_reload_new_plugins-gentoo-update.patch?rev=1.1&content-type=text/plain
189
190 Index: 137-bz460917_att350845_reload_new_plugins-gentoo-update.patch
191 ===================================================================
192 ---
193 browser/base/content/browser.js | 21 +++++++++++++++++++++
194 1 file changed, 21 insertions(+)
195
196 Index: mozilla/browser/base/content/browser.js
197 ===================================================================
198 --- mozilla.orig/browser/base/content/browser.js
199 +++ mozilla/browser/base/content/browser.js
200 @@ -5904,12 +5904,20 @@
201 var pluginInfo = getPluginInfo(aEvent.target);
202 missingPluginsArray[pluginInfo.mimetype] = pluginInfo;
203
204 + gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
205 + gMissingPluginInstaller.refreshBrowser,
206 + false);
207 +
208 if (missingPluginsArray) {
209 window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
210 "PFSWindow", "chrome,centerscreen,resizable=yes",
211 {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
212 }
213
214 + gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
215 + gMissingPluginInstaller.refreshBrowser,
216 + false);
217 +
218 aEvent.stopPropagation();
219 }
220
221 @@ -5985,11 +5993,19 @@
222 function showPluginsMissing() {
223 // get the urls of missing plugins
224 var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
225 +
226 + gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
227 + gMissingPluginInstaller.refreshBrowser,
228 + false);
229 +
230 if (missingPluginsArray) {
231 window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
232 "PFSWindow", "chrome,centerscreen,resizable=yes",
233 {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
234 }
235 + gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
236 + gMissingPluginInstaller.refreshBrowser,
237 + false);
238 }
239
240 if (aEvent.type == "PluginBlocklisted") {
241 @@ -6078,6 +6094,13 @@
242 notificationBox.removeNotification(notification);
243 }
244 // reload the browser to make the new plugin show.
245 +
246 + // reload plugins
247 + var pm = Components.classes["@mozilla.org/plugin/manager;1"]
248 + .getService(Components.interfaces.nsIPluginManager);
249 + pm.reloadPlugins(false);
250 +
251 + // ... and reload the browser to activate new plugins available
252 browser.reload();
253 }
254
255
256
257
258 1.1 src/patchsets/mozilla-firefox/3.6/300-xulrunner-fix-jemalloc-vs-aslr.patch
259
260 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/300-xulrunner-fix-jemalloc-vs-aslr.patch?rev=1.1&view=markup
261 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/300-xulrunner-fix-jemalloc-vs-aslr.patch?rev=1.1&content-type=text/plain
262
263 Index: 300-xulrunner-fix-jemalloc-vs-aslr.patch
264 ===================================================================
265 diff -urpx 'cscope*' -x '.*.swp' mozilla-1.9.1-orig/memory/jemalloc/jemalloc.c mozilla-1.9.1/memory/jemalloc/jemalloc.c
266 --- mozilla-1.9.1-orig/memory/jemalloc/jemalloc.c 2009-07-30 17:30:25.000000000 +0200
267 +++ mozilla-1.9.1/memory/jemalloc/jemalloc.c 2009-08-10 14:28:59.000000000 +0200
268 @@ -392,7 +392,7 @@ __FBSDID("$FreeBSD: head/lib/libc/stdlib
269 static const bool __isthreaded = true;
270 #endif
271
272 -#if defined(MOZ_MEMORY_SOLARIS) && defined(MAP_ALIGN) && !defined(JEMALLOC_NEVER_USES_MAP_ALIGN)
273 +#if defined(MOZ_MEMORY_SOLARIS) || defined(MOZ_MEMORY_LINUX) || defined(MOZ_MEMORY_BSD)
274 #define JEMALLOC_USES_MAP_ALIGN /* Required on Solaris 10. Might improve performance elsewhere. */
275 #endif
276
277 @@ -2305,20 +2305,31 @@ pages_map_align(size_t size, int pfd, si
278 * We don't use MAP_FIXED here, because it can cause the *replacement*
279 * of existing mappings, and we only want to create new mappings.
280 */
281 -#ifdef MALLOC_PAGEFILE
282 - if (pfd != -1) {
283 - ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
284 - MAP_NOSYNC | MAP_ALIGN, pfd, 0);
285 - } else
286 -#endif
287 - {
288 - ret = mmap((void *)alignment, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
289 - MAP_NOSYNC | MAP_ALIGN | MAP_ANON, -1, 0);
290 - }
291 + ret = mmap(NULL, size + alignment, PROT_READ | PROT_WRITE, MAP_PRIVATE |
292 + MAP_NOSYNC| MAP_ANON, -1, 0);
293 assert(ret != NULL);
294
295 if (ret == MAP_FAILED)
296 ret = NULL;
297 + else {
298 + uintptr_t aligned_ret;
299 + size_t extra_size;
300 +
301 + aligned_ret = (uintptr_t)ret + alignment - 1;
302 + aligned_ret &= ~(alignment - 1);
303 + extra_size = aligned_ret - (uintptr_t)ret;
304 + munmap(ret, extra_size);
305 + munmap(ret + extra_size + size, alignment - extra_size);
306 + ret = (void *)aligned_ret;
307 +#ifdef MALLOC_PAGEFILE
308 + if (pfd != -1) {
309 + ret = mmap(ret, size, PROT_READ | PROT_WRITE, MAP_PRIVATE |
310 + MAP_NOSYNC | MAP_FIXED, pfd, 0);
311 + }
312 + if (ret == MAP_FAILED)
313 + ret = NULL;
314 +#endif
315 + }
316 return (ret);
317 }
318 #endif
319
320
321
322
323 1.1 src/patchsets/mozilla-firefox/3.6/301-xulrunner-xpctools.patch
324
325 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/301-xulrunner-xpctools.patch?rev=1.1&view=markup
326 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/301-xulrunner-xpctools.patch?rev=1.1&content-type=text/plain
327
328 Index: 301-xulrunner-xpctools.patch
329 ===================================================================
330 --- js/src/xpconnect/src/Makefile.in~ 2009-09-20 13:13:15.508713367 -0500
331 +++ js/src/xpconnect/src/Makefile.in 2009-09-20 13:14:30.994713367 -0500
332 @@ -77,6 +77,10 @@
333 widget \
334 $(NULL)
335
336 +ifdef MOZ_XPCTOOLS
337 +DEFINES += -DXPC_TOOLS_SUPPORT
338 +REQUIRES += xpctools
339 +endif
340
341 CPPSRCS = \
342 nsScriptError.cpp \
343 @@ -174,11 +178,6 @@
344
345 endif # ENABLE_JIT
346
347 -ifdef MOZ_XPCTOOLS
348 -DEFINES += -DXPC_TOOLS_SUPPORT
349 -REQUIRES += xpctools
350 -endif
351 -
352 ifdef XPC_IDISPATCH_SUPPORT
353 DEFINES += -DXPC_IDISPATCH_SUPPORT
354 ifdef XPC_COMOBJECT
355
356
357
358 1.1 src/patchsets/mozilla-firefox/3.6/302_fix-java-xpcom.patch
359
360 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/302_fix-java-xpcom.patch?rev=1.1&view=markup
361 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/302_fix-java-xpcom.patch?rev=1.1&content-type=text/plain
362
363 Index: 302_fix-java-xpcom.patch
364 ===================================================================
365 # HG changeset patch
366 # User Jory A. Pratt <anarchy@g.o>
367 # Date 1258130700 28800
368 # Node ID 1484f0779ccd57df9f00aba55a9331959ec6a7fc
369 # Parent 215ca7a9e2ba566194dd8194f41e8b14defd95a9
370 Bug 448386 - Build error _javagen/org/mozilla/interfaces/nsIMicrosummaryService with xulrunner, r=ted.mielczarek
371
372 --- a/config/rules.mk Fri Dec 04 01:01:00 2009 -0800
373 +++ b/config/rules.mk Fri Nov 13 08:45:00 2009 -0800
374 @@ -1785,7 +1785,7 @@ _JAVA_GEN_DIR = $(JAVA_GEN_DIR)/$(JAVA_I
375
376 $(JAVA_GEN_DIR)/.%.java.pp: %.idl $(XPIDL_COMPILE) $(_JAVA_GEN_DIR)
377 $(REPORT_BUILD)
378 - $(ELOG) $(XPIDL_COMPILE) -m java -w -I$(srcdir) -I$(IDL_DIR) -o $(_JAVA_GEN_DIR)/$* $(_VPATH_SRCS)
379 + $(ELOG) $(XPIDL_COMPILE) -m java -w $(XPIDL_FLAGS) -I$(srcdir) -I$(IDL_DIR) -o $(_JAVA_GEN_DIR)/$* $(_VPATH_SRCS)
380 @touch $@
381
382 # "Install" generated Java interfaces. We segregate them based on the XPI_NAME.
383 --- a/js/src/config/rules.mk Fri Dec 04 01:01:00 2009 -0800
384 +++ b/js/src/config/rules.mk Fri Nov 13 08:45:00 2009 -0800
385 @@ -1785,7 +1785,7 @@ _JAVA_GEN_DIR = $(JAVA_GEN_DIR)/$(JAVA_I
386
387 $(JAVA_GEN_DIR)/.%.java.pp: %.idl $(XPIDL_COMPILE) $(_JAVA_GEN_DIR)
388 $(REPORT_BUILD)
389 - $(ELOG) $(XPIDL_COMPILE) -m java -w -I$(srcdir) -I$(IDL_DIR) -o $(_JAVA_GEN_DIR)/$* $(_VPATH_SRCS)
390 + $(ELOG) $(XPIDL_COMPILE) -m java -w $(XPIDL_FLAGS) -I$(srcdir) -I$(IDL_DIR) -o $(_JAVA_GEN_DIR)/$* $(_VPATH_SRCS)
391 @touch $@
392
393 # "Install" generated Java interfaces. We segregate them based on the XPI_NAME.
394
395
396
397
398
399 1.1 src/patchsets/mozilla-firefox/3.6/400-libdl.patch
400
401 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/400-libdl.patch?rev=1.1&view=markup
402 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/400-libdl.patch?rev=1.1&content-type=text/plain
403
404 Index: 400-libdl.patch
405 ===================================================================
406 Check for dlopen in the libc too.
407 Some systems (eg FreeBSD) provide it there.
408
409 --- mozilla-1.9.2/configure.in.old 2010-01-11 00:15:26 +0100
410 +++ mozilla-1.9.2/configure.in 2010-01-11 00:27:10 +0100
411 @@ -3129,10 +3129,15 @@
412 ;;
413 *)
414 AC_CHECK_LIB(m, atan)
415 - AC_CHECK_LIB(dl, dlopen,
416 - AC_CHECK_HEADER(dlfcn.h,
417 - LIBS="-ldl $LIBS"
418 - AC_DEFINE(HAVE_LIBDL)))
419 + ac_cv_my_have_libdl=no
420 + AC_CHECK_FUNC(dlopen,
421 + ac_cv_my_have_libdl=yes,
422 + AC_CHECK_LIB(dl, dlopen,
423 + ac_cv_my_have_libdl=yes
424 + LIBS="-ldl $LIBS"))
425 + if test "${ac_cv_my_have_libdl}" = "yes"; then
426 + AC_CHECK_HEADER(dlfcn.h, AC_DEFINE(HAVE_LIBDL))
427 + fi
428 ;;
429 esac
430
431
432
433
434 1.1 src/patchsets/mozilla-firefox/3.6/401-libsydney_oss.patch
435
436 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/401-libsydney_oss.patch?rev=1.1&view=markup
437 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/401-libsydney_oss.patch?rev=1.1&content-type=text/plain
438
439 Index: 401-libsydney_oss.patch
440 ===================================================================
441 --- mozilla-1.9.2/media/libsydneyaudio/src/Makefile.in.orig 2009-08-11 16:28:21.000000000 +0200
442 +++ mozilla-1.9.2/media/libsydneyaudio/src/Makefile.in 2009-08-11 16:29:08.000000000 +0200
443 @@ -45,6 +45,12 @@
444 LIBRARY_NAME = sydneyaudio
445 FORCE_STATIC_LIB= 1
446
447 +ifeq ($(OS_ARCH),FreeBSD)
448 +CSRCS = \
449 + sydney_audio_oss.c \
450 + $(NULL)
451 +endif
452 +
453 ifeq ($(OS_ARCH),Linux)
454 CSRCS = \
455 sydney_audio_alsa.c \
456
457
458
459 1.1 src/patchsets/mozilla-firefox/3.6/402-oggzfbsd.patch
460
461 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/402-oggzfbsd.patch?rev=1.1&view=markup
462 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/402-oggzfbsd.patch?rev=1.1&content-type=text/plain
463
464 Index: 402-oggzfbsd.patch
465 ===================================================================
466 --- mozilla-1.9.2/media/liboggz/include/oggz/oggz_off_t_generated.h.old 2010-01-11 01:52:46 +0100
467 +++ mozilla-1.9.2/media/liboggz/include/oggz/oggz_off_t_generated.h 2010-01-11 01:53:03 +0100
468 @@ -59,7 +59,7 @@
469
470 #include <sys/types.h>
471
472 -#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
473 +#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined(__FreeBSD__)
474 typedef off_t oggz_off_t;
475 #else
476 typedef loff_t oggz_off_t;
477
478
479
480 1.1 src/patchsets/mozilla-firefox/3.6/700-sparc-build.patch
481
482 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/700-sparc-build.patch?rev=1.1&view=markup
483 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/mozilla-firefox/3.6/700-sparc-build.patch?rev=1.1&content-type=text/plain
484
485 Index: 700-sparc-build.patch
486 ===================================================================
487 diff -ur mozilla-1.9.2.orig/js/src/nanojit/CodeAlloc.cpp mozilla-1.9.2/js/src/nanojit/CodeAlloc.cpp
488 --- mozilla-1.9.2.orig/js/src/nanojit/CodeAlloc.cpp 2010-01-26 19:38:51.000000000 +0000
489 +++ mozilla-1.9.2/js/src/nanojit/CodeAlloc.cpp 2010-01-26 19:41:53.000000000 +0000
490 @@ -247,8 +247,20 @@
491 #endif
492
493 #ifdef AVMPLUS_SPARC
494 +#ifdef __linux__ // bugzilla 502369
495 +void sync_instruction_memory(caddr_t v, u_int len)
496 +{
497 + caddr_t end = v + len;
498 + caddr_t p = v;
499 + while (p < end) {
500 + asm("flush %0" : : "r" (p));
501 + p += 32;
502 + }
503 +}
504 +#else
505 extern "C" void sync_instruction_memory(caddr_t v, u_int len);
506 #endif
507 +#endif
508
509 #if defined NANOJIT_IA32 || defined NANOJIT_X64
510 // intel chips have dcache/icache interlock
Report Message
Find on MARC Find on Google Groups