1 |
armin76 09/04/03 09:51:39 |
2 |
|
3 |
Added: 000_flex-configure-LANG.patch |
4 |
001-xul_gentoo_install_dirs.patch |
5 |
002-bzXXX_pc_honour_system_nspr_nss.patch |
6 |
055_firefox-2.0_gfbsd-pthreads.patch |
7 |
063_firefox-rpath-3.patch |
8 |
064_firefox-nsplugins-v3.patch |
9 |
068_firefox-nss-gentoo-fix.patch |
10 |
080_gcc-4.4-elif.patch 090-unaligned.patch |
11 |
095_glibc_maxpathlen.patch |
12 |
100-system-hunspell-corrections.patch |
13 |
800-bsd_include.patch |
14 |
Log: |
15 |
Bump patchset to fix unaligned accesses, bug #251603, patch by Friedrich Oslage <bluebird at gentoo dot org> |
16 |
|
17 |
Revision Changes Path |
18 |
1.1 src/patchsets/xulrunner/1.9.0.8/000_flex-configure-LANG.patch |
19 |
|
20 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/000_flex-configure-LANG.patch?rev=1.1&view=markup |
21 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/000_flex-configure-LANG.patch?rev=1.1&content-type=text/plain |
22 |
|
23 |
Index: 000_flex-configure-LANG.patch |
24 |
=================================================================== |
25 |
The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in |
26 |
option parsing, it may break. |
27 |
|
28 |
http://bugs.gentoo.org/103483 |
29 |
|
30 |
--- configure |
31 |
+++ configure |
32 |
@@ -54,6 +54,16 @@ |
33 |
infodir='${prefix}/info' |
34 |
mandir='${prefix}/man' |
35 |
|
36 |
+# NLS nuisances. |
37 |
+# Only set these to C if already set. These must not be set unconditionally |
38 |
+# because not all systems understand e.g. LANG=C (notably SCO). |
39 |
+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! |
40 |
+# Non-C LC_CTYPE values break the ctype check. |
41 |
+if test "${LANG+set}" = set; then LANG=C; export LANG; fi |
42 |
+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi |
43 |
+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi |
44 |
+if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi |
45 |
+ |
46 |
# Initialize some other variables. |
47 |
subdirs= |
48 |
MFLAGS= MAKEFLAGS= |
49 |
@@ -452,16 +463,6 @@ |
50 |
esac |
51 |
done |
52 |
|
53 |
-# NLS nuisances. |
54 |
-# Only set these to C if already set. These must not be set unconditionally |
55 |
-# because not all systems understand e.g. LANG=C (notably SCO). |
56 |
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! |
57 |
-# Non-C LC_CTYPE values break the ctype check. |
58 |
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi |
59 |
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi |
60 |
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi |
61 |
-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi |
62 |
- |
63 |
# confdefs.h avoids OS command line length limits that DEFS can exceed. |
64 |
rm -rf conftest* confdefs.h |
65 |
# AIX cpp loses on an empty file, so make sure it contains at least a newline. |
66 |
|
67 |
|
68 |
|
69 |
1.1 src/patchsets/xulrunner/1.9.0.8/001-xul_gentoo_install_dirs.patch |
70 |
|
71 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/001-xul_gentoo_install_dirs.patch?rev=1.1&view=markup |
72 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/001-xul_gentoo_install_dirs.patch?rev=1.1&content-type=text/plain |
73 |
|
74 |
Index: 001-xul_gentoo_install_dirs.patch |
75 |
=================================================================== |
76 |
--- config/autoconf.mk.in.orig 2007-08-03 22:02:32.000000000 +0200 |
77 |
+++ config/autoconf.mk.in 2007-08-03 22:07:00.000000000 +0200 |
78 |
@@ -58,14 +58,14 @@ |
79 |
prefix = @prefix@ |
80 |
exec_prefix = @exec_prefix@ |
81 |
bindir = @bindir@ |
82 |
-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
83 |
+includedir = @includedir@/$(MOZ_APP_NAME)-1.9 |
84 |
libdir = @libdir@ |
85 |
datadir = @datadir@ |
86 |
mandir = @mandir@ |
87 |
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
88 |
+idldir = $(includedir)/idl |
89 |
|
90 |
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) |
91 |
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) |
92 |
+installdir = $(libdir)/$(MOZ_APP_NAME)-1.9 |
93 |
+sdkdir = $(libdir)/$(MOZ_APP_NAME)-1.9 |
94 |
|
95 |
DIST = $(DEPTH)/dist |
96 |
LIBXUL_SDK = @LIBXUL_SDK@ |
97 |
|
98 |
|
99 |
|
100 |
1.1 src/patchsets/xulrunner/1.9.0.8/002-bzXXX_pc_honour_system_nspr_nss.patch |
101 |
|
102 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/002-bzXXX_pc_honour_system_nspr_nss.patch?rev=1.1&view=markup |
103 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/002-bzXXX_pc_honour_system_nspr_nss.patch?rev=1.1&content-type=text/plain |
104 |
|
105 |
Index: 002-bzXXX_pc_honour_system_nspr_nss.patch |
106 |
=================================================================== |
107 |
--- |
108 |
xulrunner/installer/Makefile.in | 17 ++++++++++++++--- |
109 |
xulrunner/installer/libxul-embedding-unstable.pc.in | 2 +- |
110 |
xulrunner/installer/libxul-embedding.pc.in | 2 +- |
111 |
xulrunner/installer/mozilla-nss.pc.in | 6 +++--- |
112 |
4 files changed, 19 insertions(+), 8 deletions(-) |
113 |
|
114 |
Index: mozilla/xulrunner/installer/Makefile.in |
115 |
=================================================================== |
116 |
--- mozilla.orig/xulrunner/installer/Makefile.in |
117 |
+++ mozilla/xulrunner/installer/Makefile.in |
118 |
@@ -90,40 +90,51 @@ |
119 |
mozilla-plugin.pc \ |
120 |
mozilla-gtkmozembed.pc \ |
121 |
mozilla-gtkmozembed-embedding.pc \ |
122 |
$(NULL) |
123 |
|
124 |
ifdef MOZ_NATIVE_NSPR |
125 |
NSPR_NAME=nspr |
126 |
NSPR_VERSION=$(shell $(NSPR_CONFIG) --version) |
127 |
+FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags) |
128 |
+FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs) |
129 |
else |
130 |
-pkg_config_files += mozilla-nspr.pc |
131 |
NSPR_NAME=mozilla-nspr |
132 |
FULL_NSPR_CFLAGS=-I\$${includedir}/stable |
133 |
FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nspr-config --libs)) |
134 |
NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version) |
135 |
endif |
136 |
+pkg_config_files += mozilla-nspr.pc |
137 |
|
138 |
$(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS)) |
139 |
|
140 |
-ifndef MOZ_NATIVE_NSS |
141 |
-pkg_config_files += mozilla-nss.pc |
142 |
+ifdef MOZ_NATIVE_NSS |
143 |
+NSPR_VERSION=$(shell $(NSS_CONFIG) --version) |
144 |
+FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags) |
145 |
+FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs) |
146 |
+else |
147 |
+NSS_VERSION=$(shell $(DEPTH)/nsprpub/config/nss-config --version) |
148 |
+FULL_NSS_CFLAGS=-I\$${includedir}/stable |
149 |
+FULL_NSS_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nss-config --libs)) |
150 |
endif |
151 |
+pkg_config_files += mozilla-nss.pc |
152 |
|
153 |
%.pc: $(srcdir)/%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk |
154 |
cat $< | sed \ |
155 |
-e "s|%prefix%|$(prefix)|" \ |
156 |
-e "s|%includedir%|$(includedir)|" \ |
157 |
-e "s|%idldir%|$(idldir)|" \ |
158 |
-e "s|%sdkdir%|$(sdkdir)|" \ |
159 |
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ |
160 |
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ |
161 |
-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ |
162 |
-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ |
163 |
+ -e "s|%FULL_NSS_LIBS%|$(FULL_NSS_LIBS)|" \ |
164 |
+ -e "s|%FULL_NSS_CFLAGS%|$(FULL_NSS_CFLAGS)|" \ |
165 |
-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ |
166 |
-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@ |
167 |
chmod 644 $@ |
168 |
|
169 |
install:: $(pkg_config_files) |
170 |
@echo pkg_config_file: $(pkg_config_files) |
171 |
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig |
172 |
|
173 |
Index: mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in |
174 |
=================================================================== |
175 |
--- mozilla.orig/xulrunner/installer/libxul-embedding-unstable.pc.in |
176 |
+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in |
177 |
@@ -3,9 +3,9 @@ |
178 |
includedir=%includedir% |
179 |
idldir=%idldir% |
180 |
includetype=unstable |
181 |
|
182 |
Name: libxul-embedding-unstable |
183 |
Description: Static library for version-independent embedding of the Mozilla runtime (unstable API) |
184 |
Version: %MOZILLA_VERSION% |
185 |
Libs: -L${sdkdir}/lib -lxpcomglue |
186 |
-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar |
187 |
+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS% |
188 |
Index: mozilla/xulrunner/installer/libxul-embedding.pc.in |
189 |
=================================================================== |
190 |
--- mozilla.orig/xulrunner/installer/libxul-embedding.pc.in |
191 |
+++ mozilla/xulrunner/installer/libxul-embedding.pc.in |
192 |
@@ -7,9 +7,9 @@ |
193 |
# Note: the default pkg-config cflags will only list include directories |
194 |
# that contain stable (frozen or safe for linking) header files. To include |
195 |
# nonfrozen headers, run pkg-config with --define-variable=includetype=unstable |
196 |
|
197 |
Name: libxul-embedding |
198 |
Description: Static library for version-independent embedding of the Mozilla runtime |
199 |
Version: %MOZILLA_VERSION% |
200 |
Libs: -L${sdkdir}/lib -lxpcomglue |
201 |
-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar |
202 |
+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS% |
203 |
Index: mozilla/xulrunner/installer/mozilla-nss.pc.in |
204 |
=================================================================== |
205 |
--- mozilla.orig/xulrunner/installer/mozilla-nss.pc.in |
206 |
+++ mozilla/xulrunner/installer/mozilla-nss.pc.in |
207 |
@@ -1,10 +1,10 @@ |
208 |
prefix=%prefix% |
209 |
sdkdir=%sdkdir% |
210 |
includedir=%includedir% |
211 |
|
212 |
Name: NSS |
213 |
Description: Mozilla Network Security Services |
214 |
-Version: %MOZILLA_VERSION% |
215 |
+Version: %NSS_VERSION% |
216 |
Requires: %NSPR_NAME% >= %NSPR_VERSION% |
217 |
-Libs: -L${sdkdir}/lib -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3 |
218 |
-Cflags: -I${includedir}/stable |
219 |
+Libs: %FULL_NSS_LIBS% |
220 |
+Cflags: %FULL_NSS_CFLAGS% |
221 |
|
222 |
|
223 |
|
224 |
1.1 src/patchsets/xulrunner/1.9.0.8/055_firefox-2.0_gfbsd-pthreads.patch |
225 |
|
226 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/055_firefox-2.0_gfbsd-pthreads.patch?rev=1.1&view=markup |
227 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/055_firefox-2.0_gfbsd-pthreads.patch?rev=1.1&content-type=text/plain |
228 |
|
229 |
Index: 055_firefox-2.0_gfbsd-pthreads.patch |
230 |
=================================================================== |
231 |
# https://bugs.gentoo.org/show_bug.cgi?id=169825 |
232 |
|
233 |
--- mozilla/config/rules.mk.orig Thu Sep 14 14:07:03 2006 |
234 |
+++ mozilla/config/rules.mk Wed Oct 18 11:00:09 2006 |
235 |
@@ -442,9 +442,7 @@ |
236 |
endif |
237 |
|
238 |
ifeq ($(OS_ARCH),FreeBSD) |
239 |
-ifdef IS_COMPONENT |
240 |
-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic |
241 |
-endif |
242 |
+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc |
243 |
endif |
244 |
|
245 |
ifeq ($(OS_ARCH),NetBSD) |
246 |
--- mozilla/configure.in.orig 2007-02-06 02:37:37 -0300 |
247 |
+++ mozilla/configure.in 2007-03-07 15:35:41 -0300 |
248 |
@@ -2667,7 +2667,7 @@ |
249 |
*-hpux11.*) |
250 |
;; |
251 |
*) |
252 |
- AC_CHECK_LIB(c_r, gethostbyname_r) |
253 |
+ AC_SEARCH_LIBS([gethostbyname_r], [c_r]) |
254 |
;; |
255 |
esac |
256 |
AC_CHECK_LIB(m, atan) |
257 |
--- mozilla/configure.in.orig 2007-02-06 02:37:37 -0300 |
258 |
+++ mozilla/configure.in 2007-03-07 13:59:53 -0300 |
259 |
@@ -2839,11 +2839,12 @@ |
260 |
*-*-freebsd*) |
261 |
AC_DEFINE(_REENTRANT) |
262 |
AC_DEFINE(_THREAD_SAFE) |
263 |
- dnl -pthread links in -lc_r, so don't specify it explicitly. |
264 |
- if test "$ac_cv_have_dash_pthread" = "yes"; then |
265 |
- _PTHREAD_LDFLAGS="-pthread" |
266 |
+ dnl use the environment PTHREAD_LIBS |
267 |
+ if test -n "$PTHREAD_LIBS"; then |
268 |
+ _PTHREAD_LDFLAGS="$PTHREAD_LIBS" |
269 |
else |
270 |
- _PTHREAD_LDFLAGS="-lc_r" |
271 |
+ _PTHREAD_LDFLAGS="-lpthread" |
272 |
fi |
273 |
+ LDFLAGS="${_PTHREAD_LDFLAGS} ${LDFLAGS}" |
274 |
;; |
275 |
|
276 |
|
277 |
|
278 |
1.1 src/patchsets/xulrunner/1.9.0.8/063_firefox-rpath-3.patch |
279 |
|
280 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/063_firefox-rpath-3.patch?rev=1.1&view=markup |
281 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/063_firefox-rpath-3.patch?rev=1.1&content-type=text/plain |
282 |
|
283 |
Index: 063_firefox-rpath-3.patch |
284 |
=================================================================== |
285 |
# Gentoo http://bugs.gentoo.org/show_bug.cgi?id=100597 |
286 |
|
287 |
--- mozilla/config/rules.mk.orig 2006-07-07 06:13:36.000000000 +0200 |
288 |
+++ mozilla/config/rules.mk 2006-07-19 13:22:04.000000000 +0200 |
289 |
@@ -510,7 +510,12 @@ |
290 |
# |
291 |
ifeq ($(OS_ARCH),Linux) |
292 |
ifdef IS_COMPONENT |
293 |
+DSO_LDOPTS += -Wl,-rpath,'$$ORIGIN:$$ORIGIN/..' |
294 |
+OS_LDFLAGS += -Wl,-rpath,'$$ORIGIN:$$ORIGIN/..' |
295 |
EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic |
296 |
+else |
297 |
+DSO_LDOPTS += -Wl,-rpath,'$$ORIGIN' |
298 |
+OS_LDFLAGS += -Wl,-rpath,'$$ORIGIN' |
299 |
endif |
300 |
endif |
301 |
|
302 |
|
303 |
|
304 |
|
305 |
1.1 src/patchsets/xulrunner/1.9.0.8/064_firefox-nsplugins-v3.patch |
306 |
|
307 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/064_firefox-nsplugins-v3.patch?rev=1.1&view=markup |
308 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/064_firefox-nsplugins-v3.patch?rev=1.1&content-type=text/plain |
309 |
|
310 |
Index: 064_firefox-nsplugins-v3.patch |
311 |
=================================================================== |
312 |
# Gentoo's Add a search path for plugins. by agriffis |
313 |
|
314 |
--- xpcom/io/nsAppFileLocationProvider.cpp.original 2007-02-14 00:59:21.000000000 +0100 |
315 |
+++ xpcom/io/nsAppFileLocationProvider.cpp 2007-02-14 01:17:35.000000000 +0100 |
316 |
@@ -205,6 +205,14 @@ |
317 |
if (NS_SUCCEEDED(rv)) |
318 |
rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME); |
319 |
} |
320 |
+ else if (nsCRT::strcmp(prop, GENTOO_NSPLUGINS_DIR) == 0) |
321 |
+ { |
322 |
+ rv = NS_NewNativeLocalFile(nsDependentCString(GENTOO_NSPLUGINS_DIR), PR_TRUE, getter_AddRefs(localFile)); |
323 |
+ } |
324 |
+ else if (nsCRT::strcmp(prop, GENTOO_NSBROWSER_PLUGINS_DIR) == 0) |
325 |
+ { |
326 |
+ rv = NS_NewNativeLocalFile(nsDependentCString(GENTOO_NSBROWSER_PLUGINS_DIR), PR_TRUE, getter_AddRefs(localFile)); |
327 |
+ } |
328 |
#ifdef XP_MACOSX |
329 |
else if (nsCRT::strcmp(prop, NS_MACOSX_USER_PLUGIN_DIR) == 0) |
330 |
{ |
331 |
@@ -592,7 +600,7 @@ |
332 |
|
333 |
*_retval = new nsAppDirectoryEnumerator(this, keys); |
334 |
#else |
335 |
- static const char* keys[] = { nsnull, NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, nsnull }; |
336 |
+ static const char* keys[] = { nsnull, GENTOO_NSPLUGINS_DIR, GENTOO_NSBROWSER_PLUGINS_DIR, NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, nsnull }; |
337 |
if (!keys[0] && !(keys[0] = PR_GetEnv("MOZ_PLUGIN_PATH"))) { |
338 |
static const char nullstr = 0; |
339 |
keys[0] = &nullstr; |
340 |
|
341 |
|
342 |
|
343 |
1.1 src/patchsets/xulrunner/1.9.0.8/068_firefox-nss-gentoo-fix.patch |
344 |
|
345 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/068_firefox-nss-gentoo-fix.patch?rev=1.1&view=markup |
346 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/068_firefox-nss-gentoo-fix.patch?rev=1.1&content-type=text/plain |
347 |
|
348 |
Index: 068_firefox-nss-gentoo-fix.patch |
349 |
=================================================================== |
350 |
--- security/manager/ssl/src/nsNSSComponent.cpp.orig 2007-05-27 21:04:27.000000000 +0200 |
351 |
+++ security/manager/ssl/src/nsNSSComponent.cpp 2007-05-27 21:17:56.000000000 +0200 |
352 |
@@ -130,6 +130,8 @@ |
353 |
|
354 |
#define NS_CRYPTO_HASH_BUFFER_SIZE 4096 |
355 |
|
356 |
+#define GENTOO_NSS_LIBDIR NS_LITERAL_CSTRING ("nss") |
357 |
+ |
358 |
static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID); |
359 |
int nsNSSComponent::mInstanceCount = 0; |
360 |
|
361 |
@@ -708,11 +710,11 @@ |
362 |
return; |
363 |
|
364 |
const char *possible_ckbi_locations[] = { |
365 |
- NS_XPCOM_CURRENT_PROCESS_DIR, |
366 |
- NS_GRE_DIR, |
367 |
- 0 // This special value means: |
368 |
+ 0,// This special value means: |
369 |
// search for ckbi in the directories on the shared |
370 |
// library/DLL search path |
371 |
+ NS_XPCOM_CURRENT_PROCESS_DIR, |
372 |
+ NS_GRE_DIR |
373 |
}; |
374 |
|
375 |
for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) { |
376 |
@@ -721,7 +723,16 @@ |
377 |
|
378 |
if (!possible_ckbi_locations[il]) |
379 |
{ |
380 |
- fullLibraryPath = PR_GetLibraryName(nsnull, "nssckbi"); |
381 |
+ |
382 |
+ directoryService->Get( NS_UNIX_LIB_DIR, |
383 |
+ NS_GET_IID(nsILocalFile), |
384 |
+ getter_AddRefs(mozFile)); |
385 |
+ |
386 |
+ if (!mozFile) { |
387 |
+ continue; |
388 |
+ } |
389 |
+ |
390 |
+ mozFile->AppendNative(GENTOO_NSS_LIBDIR); |
391 |
} |
392 |
else |
393 |
{ |
394 |
@@ -733,11 +744,12 @@ |
395 |
continue; |
396 |
} |
397 |
|
398 |
- nsCAutoString processDir; |
399 |
- mozFile->GetNativePath(processDir); |
400 |
- fullLibraryPath = PR_GetLibraryName(processDir.get(), "nssckbi"); |
401 |
} |
402 |
|
403 |
+ nsCAutoString processDir; |
404 |
+ mozFile->GetNativePath(processDir); |
405 |
+ fullLibraryPath = PR_GetLibraryName(processDir.get(), "nssckbi"); |
406 |
+ |
407 |
if (!fullLibraryPath) { |
408 |
continue; |
409 |
} |
410 |
--- config/config.mk.orig 2007-05-27 23:32:35.000000000 +0200 |
411 |
+++ config/config.mk 2007-05-27 23:34:30.000000000 +0200 |
412 |
@@ -778,6 +778,7 @@ |
413 |
|
414 |
DEFINES += -DOSTYPE=\"$(OS_CONFIG)\" |
415 |
DEFINES += -DOSARCH=$(OS_ARCH) |
416 |
+DEFINES += -DGENTOO_LIB_DIR=\"$(libdir)\" |
417 |
|
418 |
# For profiling |
419 |
ifdef ENABLE_EAZEL_PROFILER |
420 |
--- xpcom/io/SpecialSystemDirectory.cpp.orig 2007-05-27 23:36:29.000000000 +0200 |
421 |
+++ xpcom/io/SpecialSystemDirectory.cpp 2007-05-27 23:37:48.000000000 +0200 |
422 |
@@ -560,7 +560,7 @@ |
423 |
PR_TRUE, |
424 |
aFile); |
425 |
case Unix_LibDirectory: |
426 |
- return NS_NewNativeLocalFile(nsDependentCString("/usr/local/lib/netscape/"), |
427 |
+ return NS_NewNativeLocalFile(nsDependentCString(GENTOO_LIB_DIR), |
428 |
PR_TRUE, |
429 |
aFile); |
430 |
|
431 |
|
432 |
|
433 |
|
434 |
1.1 src/patchsets/xulrunner/1.9.0.8/080_gcc-4.4-elif.patch |
435 |
|
436 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/080_gcc-4.4-elif.patch?rev=1.1&view=markup |
437 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/080_gcc-4.4-elif.patch?rev=1.1&content-type=text/plain |
438 |
|
439 |
Index: 080_gcc-4.4-elif.patch |
440 |
=================================================================== |
441 |
diff -Naurp mozilla-orig/toolkit/xre/nsAppRunner.cpp mozilla/toolkit/xre/nsAppRunner.cpp |
442 |
--- mozilla-orig/toolkit/xre/nsAppRunner.cpp 2008-11-17 08:36:43.000000000 -0600 |
443 |
+++ mozilla/toolkit/xre/nsAppRunner.cpp 2009-03-01 20:35:11.000000000 -0600 |
444 |
@@ -1459,7 +1459,7 @@ XRE_GetBinaryPath(const char* argv0, nsI |
445 |
if (NS_FAILED(rv)) |
446 |
return rv; |
447 |
|
448 |
-#elif |
449 |
+#else |
450 |
#error Oops, you need platform-specific code here |
451 |
#endif |
452 |
|
453 |
|
454 |
|
455 |
|
456 |
1.1 src/patchsets/xulrunner/1.9.0.8/090-unaligned.patch |
457 |
|
458 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/090-unaligned.patch?rev=1.1&view=markup |
459 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/090-unaligned.patch?rev=1.1&content-type=text/plain |
460 |
|
461 |
Index: 090-unaligned.patch |
462 |
=================================================================== |
463 |
diff -ur mozilla.orig/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp mozilla/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp |
464 |
--- mozilla.orig/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp 2009-04-01 12:47:52.000000000 +0000 |
465 |
+++ mozilla/toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp 2009-04-01 12:48:38.000000000 +0000 |
466 |
@@ -332,7 +332,9 @@ |
467 |
(mHaveComplete && mCompleteHash < entry.mCompleteHash)); |
468 |
} |
469 |
|
470 |
- PRInt64 mId; |
471 |
+ char __dummy_to_make_mid_aligned[4]; |
472 |
+ |
473 |
+ PRInt64 mId __attribute__ ((packed)); |
474 |
|
475 |
nsUrlClassifierDomainHash mKey; |
476 |
|
477 |
@@ -2023,8 +2025,9 @@ |
478 |
return NS_ERROR_FAILURE; |
479 |
} |
480 |
const nsCSubstring& str = Substring(chunk, start, 4); |
481 |
- const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading()); |
482 |
- entry->mAddChunkId = PR_ntohl(*p); |
483 |
+ PRUint32 p; |
484 |
+ memcpy(&p, reinterpret_cast<const PRUint32*>(str.BeginReading()), 4); |
485 |
+ entry->mAddChunkId = PR_ntohl(p); |
486 |
if (entry->mAddChunkId == 0) { |
487 |
NS_WARNING("Received invalid chunk number."); |
488 |
return NS_ERROR_FAILURE; |
489 |
@@ -2052,8 +2055,9 @@ |
490 |
|
491 |
if (chunkType == CHUNK_SUB) { |
492 |
const nsCSubstring& str = Substring(chunk, start, 4); |
493 |
- const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading()); |
494 |
- entry->mAddChunkId = PR_ntohl(*p); |
495 |
+ PRUint32 p; |
496 |
+ memcpy(&p, reinterpret_cast<const PRUint32*>(str.BeginReading()), 4); |
497 |
+ entry->mAddChunkId = PR_ntohl(p); |
498 |
if (entry->mAddChunkId == 0) { |
499 |
NS_WARNING("Received invalid chunk number."); |
500 |
return NS_ERROR_FAILURE; |
501 |
|
502 |
|
503 |
|
504 |
1.1 src/patchsets/xulrunner/1.9.0.8/095_glibc_maxpathlen.patch |
505 |
|
506 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/095_glibc_maxpathlen.patch?rev=1.1&view=markup |
507 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/095_glibc_maxpathlen.patch?rev=1.1&content-type=text/plain |
508 |
|
509 |
Index: 095_glibc_maxpathlen.patch |
510 |
=================================================================== |
511 |
--- toolkit/mozapps/update/src/updater/updater.cpp.old Tue Oct 21 16:36:29 2008 +1300 |
512 |
+++ toolkit/mozapps/update/src/updater/updater.cpp Mon Oct 20 22:55:57 2008 -0500 |
513 |
@@ -118,7 +118,9 @@ void LaunchChild(int argc, char **argv); |
514 |
#endif |
515 |
|
516 |
#ifndef MAXPATHLEN |
517 |
-# ifdef MAX_PATH |
518 |
+# ifdef PATH_MAX |
519 |
+# define MAXPATHLEN PATH_MAX |
520 |
+# elif defined(_MAX_PATH) |
521 |
# define MAXPATHLEN MAX_PATH |
522 |
# elif defined(_MAX_PATH) |
523 |
# define MAXPATHLEN _MAX_PATH |
524 |
--- toolkit/xre/nsAppRunner.h.old Tue Oct 21 16:36:29 2008 +1300 |
525 |
+++ toolkit/xre/nsAppRunner.h Mon Oct 20 22:55:57 2008 -0500 |
526 |
@@ -40,10 +40,14 @@ |
527 |
|
528 |
#ifdef XP_WIN |
529 |
#include <windows.h> |
530 |
+#else |
531 |
+#include <limits.h> |
532 |
#endif |
533 |
|
534 |
#ifndef MAXPATHLEN |
535 |
-#ifdef _MAX_PATH |
536 |
+#ifdef PATH_MAX |
537 |
+#define MAXPATHLEN PATH_MAX |
538 |
+#elif defined(_MAX_PATH) |
539 |
#define MAXPATHLEN _MAX_PATH |
540 |
#elif defined(CCHMAXPATH) |
541 |
#define MAXPATHLEN CCHMAXPATH |
542 |
--- xpcom/build/nsXPCOMPrivate.h.old Tue Oct 21 16:36:29 2008 +1300 |
543 |
+++ xpcom/build/nsXPCOMPrivate.h Mon Oct 20 22:55:57 2008 -0500 |
544 |
@@ -231,6 +231,7 @@ NS_GetFrozenFunctions(XPCOMFunctions *en |
545 |
#define XUL_DLL "libxul"MOZ_DLL_SUFFIX |
546 |
|
547 |
#else // Unix |
548 |
+#include <limits.h> // for PATH_MAX |
549 |
|
550 |
#define XPCOM_DLL "libxpcom"MOZ_DLL_SUFFIX |
551 |
|
552 |
|
553 |
|
554 |
|
555 |
|
556 |
1.1 src/patchsets/xulrunner/1.9.0.8/100-system-hunspell-corrections.patch |
557 |
|
558 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/100-system-hunspell-corrections.patch?rev=1.1&view=markup |
559 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/100-system-hunspell-corrections.patch?rev=1.1&content-type=text/plain |
560 |
|
561 |
Index: 100-system-hunspell-corrections.patch |
562 |
=================================================================== |
563 |
--- ./extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2008-02-15 19:21:21.000000000 +0000 |
564 |
+++ ./extensions/spellcheck/hunspell/src/mozHunspell.cpp 2008-02-15 19:23:20.000000000 +0000 |
565 |
@@ -63,6 +63,9 @@ |
566 |
#include "nsISimpleEnumerator.h" |
567 |
#include "nsIDirectoryEnumerator.h" |
568 |
#include "nsIFile.h" |
569 |
+#ifdef MOZ_NATIVE_HUNSPELL |
570 |
+#include "nsILocalFile.h" |
571 |
+#endif |
572 |
#include "nsDirectoryServiceUtils.h" |
573 |
#include "nsDirectoryServiceDefs.h" |
574 |
#include "mozISpellI18NManager.h" |
575 |
@@ -307,7 +310,16 @@ |
576 |
return; |
577 |
|
578 |
nsCOMPtr<nsIFile> dictDir; |
579 |
- rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY, |
580 |
+ #ifdef MOZ_NATIVE_HUNSPELL |
581 |
+ nsCOMPtr<nsILocalFile> localFile; |
582 |
+ rv = NS_NewNativeLocalFile(nsDependentCString("/usr/share/myspell"),PR_TRUE, getter_AddRefs(localFile)); |
583 |
+ if (localFile && NS_SUCCEEDED(rv)) { |
584 |
+ localFile->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(dictDir)); |
585 |
+ LoadDictionariesFromDir(dictDir); |
586 |
+ } |
587 |
+ else { |
588 |
+ #endif |
589 |
+ rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY, |
590 |
NS_GET_IID(nsIFile), getter_AddRefs(dictDir)); |
591 |
if (NS_SUCCEEDED(rv)) { |
592 |
LoadDictionariesFromDir(dictDir); |
593 |
@@ -332,6 +344,9 @@ |
594 |
LoadDictionariesFromDir(appDir); |
595 |
} |
596 |
} |
597 |
+#ifdef MOZ_NATIVE_HUNSPELL |
598 |
+ } |
599 |
+#endif |
600 |
|
601 |
nsCOMPtr<nsISimpleEnumerator> dictDirs; |
602 |
rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, |
603 |
--- ./extensions/spellcheck/src/Makefile.in.orig 2008-02-15 19:25:58.000000000 +0000 |
604 |
+++ ./extensions/spellcheck/src/Makefile.in 2008-02-15 19:28:36.000000000 +0000 |
605 |
@@ -63,9 +63,16 @@ |
606 |
txtsvc \ |
607 |
uconv \ |
608 |
unicharutil \ |
609 |
+ xulapp \ |
610 |
$(NULL) |
611 |
|
612 |
-CPPSRCS = \ |
613 |
+ifdef MOZ_NATIVE_HUNSPELL |
614 |
+CPPSRCS += mozHunspell.cpp |
615 |
+ifdef MOZ_XUL_APP |
616 |
+CPPSRCS += mozHunspellDirProvider.cpp |
617 |
+endif |
618 |
+endif |
619 |
+CPPSRCS += \ |
620 |
mozSpellCheckerFactory.cpp \ |
621 |
mozSpellChecker.cpp \ |
622 |
mozPersonalDictionary.cpp \ |
623 |
@@ -80,8 +87,14 @@ |
624 |
SHARED_LIBRARY_LIBS += ../osxspell/src/$(LIB_PREFIX)osxspell_s.$(LIB_SUFFIX) |
625 |
LOCAL_INCLUDES += -I$(srcdir)/../osxspell/src |
626 |
else |
627 |
+ifndef MOZ_NATIVE_HUNSPELL |
628 |
SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX) |
629 |
LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src |
630 |
+else |
631 |
+LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS) \ |
632 |
+ -DMOZ_NATIVE_HUNSPELL \ |
633 |
+ $(NULL) |
634 |
+endif |
635 |
endif |
636 |
|
637 |
EXTRA_DSO_LDOPTS = \ |
638 |
@@ -96,3 +112,18 @@ |
639 |
LOCAL_INCLUDES += \ |
640 |
-I$(topsrcdir)/xpcom/io \ |
641 |
$(NULL) |
642 |
+ |
643 |
+ifdef MOZ_NATIVE_HUNSPELL |
644 |
+export:: $(srcdir)/../hunspell/src/mozHunspell.cpp |
645 |
+ $(INSTALL) $(srcdir)/../hunspell/src/mozHunspell.* . |
646 |
+GARBAGE += mozHunspell.$(OBJ_SUFFIX) mozHunspell.cpp |
647 |
+clean:: |
648 |
+ rm -f mozHunspell.* |
649 |
+ifdef MOZ_XUL_APP |
650 |
+export:: $(srcdir)/../hunspell/src/mozHunspellDirProvider.cpp |
651 |
+ $(INSTALL) $(srcdir)/../hunspell/src/mozHunspellDirProvider.* . |
652 |
+GARBAGE += mozHunspellDirProvider.$(OBJ_SUFFIX) mozHunspellDirProvider.cpp |
653 |
+clean:: |
654 |
+ rm -f mozHunspellDirProvider.* |
655 |
+endif |
656 |
+endif |
657 |
--- ./extensions/spellcheck/Makefile.in.orig 2008-02-15 19:23:39.000000000 +0000 |
658 |
+++ ./extensions/spellcheck/Makefile.in 2008-02-15 19:24:34.000000000 +0000 |
659 |
@@ -42,13 +42,19 @@ |
660 |
include $(DEPTH)/config/autoconf.mk |
661 |
|
662 |
MODULE = spellchecker |
663 |
-DIRS = idl locales |
664 |
+ifndef MOZ_NATIVE_HUNSPELL |
665 |
+DIRS = idl locales |
666 |
+else |
667 |
+DIRS = idl |
668 |
+endif |
669 |
|
670 |
ifeq (camino,$(MOZ_BUILD_APP)) |
671 |
DIRS += osxspell |
672 |
else |
673 |
+ifndef MOZ_NATIVE_HUNSPELL |
674 |
DIRS += hunspell |
675 |
endif |
676 |
+endif |
677 |
|
678 |
DIRS += src |
679 |
|
680 |
|
681 |
|
682 |
1.1 src/patchsets/xulrunner/1.9.0.8/800-bsd_include.patch |
683 |
|
684 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/800-bsd_include.patch?rev=1.1&view=markup |
685 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/xulrunner/1.9.0.8/800-bsd_include.patch?rev=1.1&content-type=text/plain |
686 |
|
687 |
Index: 800-bsd_include.patch |
688 |
=================================================================== |
689 |
--- configure.in.old 2007-12-10 12:29:54 +0000 |
690 |
+++ configure.in 2007-12-10 12:38:19 +0000 |
691 |
@@ -2862,6 +2862,7 @@ |
692 |
;; |
693 |
*) |
694 |
AC_CHECK_LIB(m, atan) |
695 |
+ AC_CHECK_HEADER(dlfcn.h, AC_DEFINE(HAVE_DLCNF_H)) |
696 |
AC_CHECK_LIB(dl, dlopen, |
697 |
AC_CHECK_HEADER(dlfcn.h, |
698 |
LIBS="-ldl $LIBS" |
699 |
--- xpcom/base/nsStackWalk.cpp.old 2007-12-10 12:43:02 +0000 |
700 |
+++ xpcom/base/nsStackWalk.cpp 2007-12-10 12:43:51 +0000 |
701 |
@@ -1111,7 +1111,7 @@ |
702 |
#define __USE_GNU |
703 |
#endif |
704 |
|
705 |
-#if defined(HAVE_LIBDL) || defined(XP_MACOSX) |
706 |
+#if defined(HAVE_DLCNF_H) || defined(XP_MACOSX) |
707 |
#include <dlfcn.h> |
708 |
#endif |