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