summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-04-21 17:46:30 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-04-21 17:46:30 +0100
commita1b04dfe54c1c17994daf1d1ed9dd8c669927367 (patch)
tree2ae8eb61497d95764912f2ab4b7e7315923937e1 /meta/packages
parent939925365fe9d334bed48e4bbfcf083a0ef4e8e4 (diff)
downloadpoky-a1b04dfe54c1c17994daf1d1ed9dd8c669927367.tar.gz
mozilla-headless: Use the upstream hg repository now and add missing DEPENDS on libidl
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless/configurefix.patch203
-rw-r--r--meta/packages/mozilla-headless/mozilla-headless_git.bb10
2 files changed, 114 insertions, 99 deletions
diff --git a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
index 8a5fbbb77f..e02e4af2b6 100644
--- a/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
+++ b/meta/packages/mozilla-headless/mozilla-headless/configurefix.patch
@@ -1,7 +1,7 @@
1Index: git/configure.in 1Index: offscreen/configure.in
2=================================================================== 2===================================================================
3--- git.orig/configure.in 2009-01-27 16:11:22.000000000 +0000 3--- offscreen.orig/configure.in 2009-04-16 22:51:48.000000000 +0100
4+++ git/configure.in 2009-01-27 16:16:45.000000000 +0000 4+++ offscreen/configure.in 2009-04-16 23:07:48.000000000 +0100
5@@ -62,7 +62,6 @@ 5@@ -62,7 +62,6 @@
6 6
7 AC_PREREQ(2.13) 7 AC_PREREQ(2.13)
@@ -18,7 +18,7 @@ Index: git/configure.in
18 18
19 dnl Set the version number of the libs included with mozilla 19 dnl Set the version number of the libs included with mozilla
20 dnl ======================================================== 20 dnl ========================================================
21@@ -137,6 +135,9 @@ 21@@ -136,6 +134,9 @@
22 22
23 MSMANIFEST_TOOL= 23 MSMANIFEST_TOOL=
24 24
@@ -28,7 +28,7 @@ Index: git/configure.in
28 dnl Set various checks 28 dnl Set various checks
29 dnl ======================================================== 29 dnl ========================================================
30 MISSING_X= 30 MISSING_X=
31@@ -263,7 +264,7 @@ 31@@ -281,7 +282,7 @@
32 ;; 32 ;;
33 esac 33 esac
34 34
@@ -37,7 +37,7 @@ Index: git/configure.in
37 echo "cross compiling from $host to $target" 37 echo "cross compiling from $host to $target"
38 cross_compiling=yes 38 cross_compiling=yes
39 39
40@@ -301,7 +302,7 @@ 40@@ -319,7 +320,7 @@
41 41
42 AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works]) 42 AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
43 AC_TRY_COMPILE([], [return(0);], 43 AC_TRY_COMPILE([], [return(0);],
@@ -46,7 +46,7 @@ Index: git/configure.in
46 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) ) 46 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
47 47
48 CC="$HOST_CXX" 48 CC="$HOST_CXX"
49@@ -309,7 +310,7 @@ 49@@ -327,7 +328,7 @@
50 50
51 AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works]) 51 AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
52 AC_TRY_COMPILE([], [return(0);], 52 AC_TRY_COMPILE([], [return(0);],
@@ -55,7 +55,7 @@ Index: git/configure.in
55 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) ) 55 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
56 56
57 CC=$_SAVE_CC 57 CC=$_SAVE_CC
58@@ -330,7 +331,7 @@ 58@@ -348,7 +349,7 @@
59 ;; 59 ;;
60 esac 60 esac
61 61
@@ -64,7 +64,7 @@ Index: git/configure.in
64 unset ac_cv_prog_CC 64 unset ac_cv_prog_CC
65 AC_PROG_CC 65 AC_PROG_CC
66 AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :) 66 AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
67@@ -354,37 +355,7 @@ 67@@ -372,37 +373,6 @@
68 AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :) 68 AC_CHECK_PROGS(STRIP, $STRIP "${target_alias}-strip" "${target}-strip", :)
69 AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :) 69 AC_CHECK_PROGS(WINDRES, $WINDRES "${target_alias}-windres" "${target}-windres", :)
70 AC_DEFINE(CROSS_COMPILE) 70 AC_DEFINE(CROSS_COMPILE)
@@ -72,7 +72,7 @@ Index: git/configure.in
72- AC_PROG_CC 72- AC_PROG_CC
73- AC_PROG_CXX 73- AC_PROG_CXX
74- AC_PROG_RANLIB 74- AC_PROG_RANLIB
75- AC_PATH_PROGS(AS, $AS as, $CC) 75- MOZ_PATH_PROGS(AS, $AS as, $CC)
76- AC_CHECK_PROGS(AR, ar, :) 76- AC_CHECK_PROGS(AR, ar, :)
77- AC_CHECK_PROGS(LD, ld, :) 77- AC_CHECK_PROGS(LD, ld, :)
78- AC_CHECK_PROGS(STRIP, strip, :) 78- AC_CHECK_PROGS(STRIP, strip, :)
@@ -99,11 +99,10 @@ Index: git/configure.in
99- HOST_AR="$AR" 99- HOST_AR="$AR"
100- fi 100- fi
101-fi 101-fi
102+
103 102
104 GNU_AS= 103 GNU_AS=
105 GNU_LD= 104 GNU_LD=
106@@ -1467,6 +1438,7 @@ 105@@ -1569,6 +1539,7 @@
107 ' 106 '
108 107
109 dnl test that the macros actually work: 108 dnl test that the macros actually work:
@@ -111,7 +110,7 @@ Index: git/configure.in
111 AC_MSG_CHECKING(that static assertion macros used in autoconf tests work) 110 AC_MSG_CHECKING(that static assertion macros used in autoconf tests work)
112 AC_CACHE_VAL(ac_cv_static_assertion_macros_work, 111 AC_CACHE_VAL(ac_cv_static_assertion_macros_work,
113 [AC_LANG_SAVE 112 [AC_LANG_SAVE
114@@ -2625,9 +2597,13 @@ 113@@ -2730,9 +2701,13 @@
115 AC_LANG_C 114 AC_LANG_C
116 AC_HEADER_STDC 115 AC_HEADER_STDC
117 AC_C_CONST 116 AC_C_CONST
@@ -125,7 +124,7 @@ Index: git/configure.in
125 AC_TYPE_SIZE_T 124 AC_TYPE_SIZE_T
126 AC_STRUCT_ST_BLKSIZE 125 AC_STRUCT_ST_BLKSIZE
127 AC_MSG_CHECKING(for siginfo_t) 126 AC_MSG_CHECKING(for siginfo_t)
128@@ -3009,19 +2985,9 @@ 127@@ -3115,19 +3090,9 @@
129 dnl We don't want to link against libm or libpthread on Darwin since 128 dnl We don't want to link against libm or libpthread on Darwin since
130 dnl they both are just symlinks to libSystem and explicitly linking 129 dnl they both are just symlinks to libSystem and explicitly linking
131 dnl against libSystem causes issues when debugging (see bug 299601). 130 dnl against libSystem causes issues when debugging (see bug 299601).
@@ -146,7 +145,7 @@ Index: git/configure.in
146 145
147 _SAVE_CFLAGS="$CFLAGS" 146 _SAVE_CFLAGS="$CFLAGS"
148 CFLAGS="$CFLAGS -D_GNU_SOURCE" 147 CFLAGS="$CFLAGS -D_GNU_SOURCE"
149@@ -6763,18 +6729,13 @@ 148@@ -6931,18 +6896,13 @@
150 149
151 # Demangle only for debug or trace-malloc builds 150 # Demangle only for debug or trace-malloc builds
152 MOZ_DEMANGLE_SYMBOLS= 151 MOZ_DEMANGLE_SYMBOLS=
@@ -167,7 +166,7 @@ Index: git/configure.in
167 166
168 dnl ======================================================== 167 dnl ========================================================
169 dnl = 168 dnl =
170@@ -7288,10 +7249,7 @@ 169@@ -7454,10 +7414,7 @@
171 dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back 170 dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
172 dnl to either libIDL1 or libIDL2. 171 dnl to either libIDL1 or libIDL2.
173 if test -z "$_LIBIDL_FOUND"; then 172 if test -z "$_LIBIDL_FOUND"; then
@@ -178,19 +177,21 @@ Index: git/configure.in
178 fi 177 fi
179 dnl 178 dnl
180 dnl If we don't have a libIDL config program & not cross-compiling, 179 dnl If we don't have a libIDL config program & not cross-compiling,
181@@ -7364,11 +7322,7 @@ 180@@ -7529,13 +7486,7 @@
181 fi
182 182
183 if test -z "$SKIP_PATH_CHECKS"; then 183 if test -z "$SKIP_PATH_CHECKS"; then
184 if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then 184-if test -z "${GLIB_CFLAGS}" || test -z "${GLIB_LIBS}" ; then
185- if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then 185- if test "$MOZ_ENABLE_GTK2" || test "$USE_ELF_DYNSTR_GC" || test "$MOZ_ENABLE_HEADLESS"; then
186 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0) 186 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 1.3.7 gobject-2.0)
187- else 187- else
188- AM_PATH_GLIB(${GLIB_VERSION}) 188- AM_PATH_GLIB(${GLIB_VERSION})
189- fi 189- fi
190 fi 190-fi
191 fi 191 fi
192 192
193@@ -8214,10 +8168,7 @@ 193 if test -z "${GLIB_GMODULE_LIBS}" -a -n "${GLIB_CONFIG}"; then
194@@ -8346,10 +8297,7 @@
194 HAVE_WCRTOMB 195 HAVE_WCRTOMB
195 " 196 "
196 197
@@ -202,7 +203,7 @@ Index: git/configure.in
202 ) 203 )
203 204
204 # Save the defines header file before autoconf removes it. 205 # Save the defines header file before autoconf removes it.
205@@ -8276,28 +8227,9 @@ 206@@ -8408,31 +8356,11 @@
206 dnl To add new Makefiles, edit allmakefiles.sh. 207 dnl To add new Makefiles, edit allmakefiles.sh.
207 dnl allmakefiles.sh sets the variable, MAKEFILES. 208 dnl allmakefiles.sh sets the variable, MAKEFILES.
208 . ${srcdir}/allmakefiles.sh 209 . ${srcdir}/allmakefiles.sh
@@ -225,14 +226,16 @@ Index: git/configure.in
225-. ./conftest.sh 226-. ./conftest.sh
226-rm conftest.sh 227-rm conftest.sh
227 228
228-echo $MAKEFILES > unallmakefiles 229 echo $MAKEFILES > unallmakefiles
229 230
230-AC_OUTPUT($MAKEFILES) 231 mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
231+echo $MAKEFILES > unallmakefiles
232 232
233-AC_OUTPUT($MAKEFILES)
234-
233 dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff 235 dnl Prevent the regeneration of cairo-features.h forcing rebuilds of gfx stuff
234 if test "$CAIRO_FEATURES_H"; then 236 if test "$CAIRO_FEATURES_H"; then
235@@ -8323,14 +8255,14 @@ 237 if cmp -s $CAIRO_FEATURES_H "$CAIRO_FEATURES_H".orig; then
238@@ -8458,14 +8386,14 @@
236 HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS" 239 HOST_LDFLAGS="$_SUBDIR_HOST_LDFLAGS"
237 RC= 240 RC=
238 241
@@ -250,7 +253,7 @@ Index: git/configure.in
250 if test -z "$MOZ_DEBUG"; then 253 if test -z "$MOZ_DEBUG"; then
251 ac_configure_args="$ac_configure_args --disable-debug" 254 ac_configure_args="$ac_configure_args --disable-debug"
252 fi 255 fi
253@@ -8346,8 +8278,7 @@ 256@@ -8481,8 +8409,7 @@
254 if test -n "$USE_ARM_KUSER"; then 257 if test -n "$USE_ARM_KUSER"; then
255 ac_configure_args="$ac_configure_args --with-arm-kuser" 258 ac_configure_args="$ac_configure_args --with-arm-kuser"
256 fi 259 fi
@@ -260,7 +263,7 @@ Index: git/configure.in
260 fi 263 fi
261 264
262 if test -z "$MOZ_NATIVE_NSPR"; then 265 if test -z "$MOZ_NATIVE_NSPR"; then
263@@ -8364,7 +8295,6 @@ 266@@ -8499,7 +8426,6 @@
264 267
265 # Run the SpiderMonkey 'configure' script. 268 # Run the SpiderMonkey 'configure' script.
266 dist=$MOZ_BUILD_ROOT/dist 269 dist=$MOZ_BUILD_ROOT/dist
@@ -268,7 +271,7 @@ Index: git/configure.in
268 ac_configure_args="$ac_configure_args --enable-threadsafe" 271 ac_configure_args="$ac_configure_args --enable-threadsafe"
269 if test -z "$MOZ_NATIVE_NSPR"; then 272 if test -z "$MOZ_NATIVE_NSPR"; then
270 ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'" 273 ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"
271@@ -8378,7 +8308,11 @@ 274@@ -8513,11 +8439,14 @@
272 if test "$MOZ_MEMORY"; then 275 if test "$MOZ_MEMORY"; then
273 ac_configure_args="$ac_configure_args --enable-jemalloc" 276 ac_configure_args="$ac_configure_args --enable-jemalloc"
274 fi 277 fi
@@ -277,15 +280,18 @@ Index: git/configure.in
277+AC_CONFIG_SUBDIRS(js/src) 280+AC_CONFIG_SUBDIRS(js/src)
278 281
279 fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR 282 fi # COMPILE_ENVIRONMENT && !LIBXUL_SDK_DIR
280+ 283
281+m4_pattern_allow(AS_BIN) 284+m4_pattern_allow(AS_BIN)
282+ 285+
283+AC_OUTPUT($MAKEFILES) 286+AC_OUTPUT($MAKEFILES)
284+ 287+
285Index: git/js/src/configure.in 288 dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
289 dnl Needs to be at the end to respect possible changes from NSPR configure
290 if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
291Index: offscreen/js/src/configure.in
286=================================================================== 292===================================================================
287--- git.orig/js/src/configure.in 2009-01-27 16:11:53.000000000 +0000 293--- offscreen.orig/js/src/configure.in 2009-04-16 22:51:49.000000000 +0100
288+++ git/js/src/configure.in 2009-01-27 16:16:45.000000000 +0000 294+++ offscreen/js/src/configure.in 2009-04-16 23:06:42.000000000 +0100
289@@ -62,7 +62,6 @@ 295@@ -62,7 +62,6 @@
290 296
291 AC_PREREQ(2.13) 297 AC_PREREQ(2.13)
@@ -313,7 +319,7 @@ Index: git/js/src/configure.in
313 dnl Set various checks 319 dnl Set various checks
314 dnl ======================================================== 320 dnl ========================================================
315 MISSING_X= 321 MISSING_X=
316@@ -201,7 +205,7 @@ 322@@ -200,7 +204,7 @@
317 323
318 if test "$COMPILE_ENVIRONMENT"; then 324 if test "$COMPILE_ENVIRONMENT"; then
319 325
@@ -322,7 +328,7 @@ Index: git/js/src/configure.in
322 echo "cross compiling from $host to $target" 328 echo "cross compiling from $host to $target"
323 329
324 _SAVE_CC="$CC" 330 _SAVE_CC="$CC"
325@@ -238,7 +242,7 @@ 331@@ -237,7 +241,7 @@
326 332
327 AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works]) 333 AC_MSG_CHECKING([whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works])
328 AC_TRY_COMPILE([], [return(0);], 334 AC_TRY_COMPILE([], [return(0);],
@@ -331,7 +337,7 @@ Index: git/js/src/configure.in
331 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) ) 337 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CC cannot create executables.]) )
332 338
333 CC="$HOST_CXX" 339 CC="$HOST_CXX"
334@@ -246,7 +250,7 @@ 340@@ -245,7 +249,7 @@
335 341
336 AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works]) 342 AC_MSG_CHECKING([whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works])
337 AC_TRY_COMPILE([], [return(0);], 343 AC_TRY_COMPILE([], [return(0);],
@@ -340,7 +346,7 @@ Index: git/js/src/configure.in
340 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) ) 346 AC_MSG_ERROR([installation or configuration problem: host compiler $HOST_CXX cannot create executables.]) )
341 347
342 CC=$_SAVE_CC 348 CC=$_SAVE_CC
343@@ -267,7 +271,7 @@ 349@@ -266,7 +270,7 @@
344 ;; 350 ;;
345 esac 351 esac
346 352
@@ -349,7 +355,7 @@ Index: git/js/src/configure.in
349 unset ac_cv_prog_CC 355 unset ac_cv_prog_CC
350 AC_PROG_CC 356 AC_PROG_CC
351 AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :) 357 AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", :)
352@@ -297,37 +301,6 @@ 358@@ -296,37 +300,6 @@
353 dnl able to run ppc code in a translated environment, making a cross 359 dnl able to run ppc code in a translated environment, making a cross
354 dnl compiler appear native. So we override that here. 360 dnl compiler appear native. So we override that here.
355 cross_compiling=yes 361 cross_compiling=yes
@@ -357,7 +363,7 @@ Index: git/js/src/configure.in
357- AC_PROG_CC 363- AC_PROG_CC
358- AC_PROG_CXX 364- AC_PROG_CXX
359- AC_PROG_RANLIB 365- AC_PROG_RANLIB
360- AC_PATH_PROGS(AS, $AS as, $CC) 366- MOZ_PATH_PROGS(AS, $AS as, $CC)
361- AC_CHECK_PROGS(AR, ar, :) 367- AC_CHECK_PROGS(AR, ar, :)
362- AC_CHECK_PROGS(LD, ld, :) 368- AC_CHECK_PROGS(LD, ld, :)
363- AC_CHECK_PROGS(STRIP, strip, :) 369- AC_CHECK_PROGS(STRIP, strip, :)
@@ -387,7 +393,7 @@ Index: git/js/src/configure.in
387 393
388 GNU_AS= 394 GNU_AS=
389 GNU_LD= 395 GNU_LD=
390@@ -1396,6 +1369,8 @@ 396@@ -1435,6 +1408,8 @@
391 fi # GNU_CC 397 fi # GNU_CC
392 fi # COMPILE_ENVIRONMENT 398 fi # COMPILE_ENVIRONMENT
393 399
@@ -396,7 +402,7 @@ Index: git/js/src/configure.in
396 dnl ================================================================= 402 dnl =================================================================
397 dnl Set up and test static assertion macros used to avoid AC_TRY_RUN, 403 dnl Set up and test static assertion macros used to avoid AC_TRY_RUN,
398 dnl which is bad when cross compiling. 404 dnl which is bad when cross compiling.
399@@ -2524,9 +2499,13 @@ 405@@ -2565,9 +2540,13 @@
400 AC_LANG_C 406 AC_LANG_C
401 AC_HEADER_STDC 407 AC_HEADER_STDC
402 AC_C_CONST 408 AC_C_CONST
@@ -410,7 +416,7 @@ Index: git/js/src/configure.in
410 AC_TYPE_SIZE_T 416 AC_TYPE_SIZE_T
411 AC_STRUCT_ST_BLKSIZE 417 AC_STRUCT_ST_BLKSIZE
412 AC_MSG_CHECKING(for siginfo_t) 418 AC_MSG_CHECKING(for siginfo_t)
413@@ -2551,7 +2530,8 @@ 419@@ -2592,7 +2571,8 @@
414 420
415 AC_CHECK_HEADER(stdint.h) 421 AC_CHECK_HEADER(stdint.h)
416 if test "$ac_cv_header_stdint_h" = yes; then 422 if test "$ac_cv_header_stdint_h" = yes; then
@@ -420,7 +426,7 @@ Index: git/js/src/configure.in
420 else 426 else
421 dnl We'll figure them out for ourselves. List more likely types 427 dnl We'll figure them out for ourselves. List more likely types
422 dnl earlier. If we ever really encounter a size for which none of 428 dnl earlier. If we ever really encounter a size for which none of
423@@ -2937,10 +2917,7 @@ 429@@ -2990,10 +2970,7 @@
424 ;; 430 ;;
425 *) 431 *)
426 AC_CHECK_LIB(m, atan) 432 AC_CHECK_LIB(m, atan)
@@ -432,7 +438,7 @@ Index: git/js/src/configure.in
432 ;; 438 ;;
433 esac 439 esac
434 440
435@@ -3839,6 +3816,7 @@ 441@@ -3908,6 +3885,7 @@
436 [ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR. 442 [ --with-nspr-libs=LIBS Pass LIBS to LD when linking code that uses NSPR.
437 See --with-nspr-cflags for more details.], 443 See --with-nspr-cflags for more details.],
438 NSPR_LIBS=$withval) 444 NSPR_LIBS=$withval)
@@ -440,7 +446,7 @@ Index: git/js/src/configure.in
440 AC_SUBST(NSPR_CFLAGS) 446 AC_SUBST(NSPR_CFLAGS)
441 AC_SUBST(NSPR_LIBS) 447 AC_SUBST(NSPR_LIBS)
442 448
443@@ -4467,18 +4445,11 @@ 449@@ -4542,18 +4520,11 @@
444 450
445 # Demangle only for debug or trace-malloc builds 451 # Demangle only for debug or trace-malloc builds
446 MOZ_DEMANGLE_SYMBOLS= 452 MOZ_DEMANGLE_SYMBOLS=
@@ -459,7 +465,7 @@ Index: git/js/src/configure.in
459 465
460 dnl ======================================================== 466 dnl ========================================================
461 dnl = 467 dnl =
462@@ -5161,6 +5132,8 @@ 468@@ -5256,6 +5227,8 @@
463 done 469 done
464 AC_SUBST(LIBS_PATH) 470 AC_SUBST(LIBS_PATH)
465 471
@@ -468,15 +474,15 @@ Index: git/js/src/configure.in
468 dnl ======================================================== 474 dnl ========================================================
469 dnl JavaScript shell 475 dnl JavaScript shell
470 dnl ======================================================== 476 dnl ========================================================
471@@ -5292,3 +5265,4 @@ 477@@ -5396,3 +5369,4 @@
472 # 'js-config' in Makefile.in. 478 # 'js-config' in Makefile.in.
473 AC_MSG_RESULT(invoking make to create js-config script) 479 AC_MSG_RESULT(invoking make to create js-config script)
474 $MAKE js-config 480 $MAKE js-config
475+ 481+
476Index: git/nsprpub/configure.in 482Index: offscreen/nsprpub/configure.in
477=================================================================== 483===================================================================
478--- git.orig/nsprpub/configure.in 2009-01-27 16:12:40.000000000 +0000 484--- offscreen.orig/nsprpub/configure.in 2009-04-16 18:09:00.000000000 +0100
479+++ git/nsprpub/configure.in 2009-01-27 16:16:45.000000000 +0000 485+++ offscreen/nsprpub/configure.in 2009-04-16 23:06:42.000000000 +0100
480@@ -42,7 +42,6 @@ 486@@ -42,7 +42,6 @@
481 AC_PREREQ(2.12) 487 AC_PREREQ(2.12)
482 AC_INIT(config/libc_r.h) 488 AC_INIT(config/libc_r.h)
@@ -556,7 +562,7 @@ Index: git/nsprpub/configure.in
556 562
557 dnl ======================================================== 563 dnl ========================================================
558 dnl Check for gcc -pipe support 564 dnl Check for gcc -pipe support
559@@ -2254,10 +2226,7 @@ 565@@ -2249,10 +2221,7 @@
560 *-darwin*|*-beos*) 566 *-darwin*|*-beos*)
561 ;; 567 ;;
562 *) 568 *)
@@ -568,7 +574,7 @@ Index: git/nsprpub/configure.in
568 esac 574 esac
569 575
570 576
571@@ -2874,6 +2843,8 @@ 577@@ -2869,6 +2838,8 @@
572 dnl pr/tests/w16gui/Makefile 578 dnl pr/tests/w16gui/Makefile
573 dnl tools/Makefile 579 dnl tools/Makefile
574 580
@@ -577,17 +583,17 @@ Index: git/nsprpub/configure.in
577 if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then 583 if test -z "$USE_PTHREADS" && test -z "$USE_BTHREADS"; then
578 MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile" 584 MAKEFILES="$MAKEFILES pr/src/threads/combined/Makefile"
579 elif test -n "$USE_PTHREADS"; then 585 elif test -n "$USE_PTHREADS"; then
580@@ -2889,3 +2860,5 @@ 586@@ -2884,3 +2855,5 @@
581 echo $MAKEFILES > unallmakefiles 587 echo $MAKEFILES > unallmakefiles
582 588
583 AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config]) 589 AC_OUTPUT([$MAKEFILES], [chmod +x config/nspr-config])
584+ 590+
585+ 591+
586Index: git/toolkit/toolkit-makefiles.sh 592Index: offscreen/toolkit/toolkit-makefiles.sh
587=================================================================== 593===================================================================
588--- git.orig/toolkit/toolkit-makefiles.sh 2009-01-27 16:13:11.000000000 +0000 594--- offscreen.orig/toolkit/toolkit-makefiles.sh 2009-04-16 22:51:50.000000000 +0100
589+++ git/toolkit/toolkit-makefiles.sh 2009-01-27 16:16:45.000000000 +0000 595+++ offscreen/toolkit/toolkit-makefiles.sh 2009-04-16 23:06:42.000000000 +0100
590@@ -632,7 +632,6 @@ 596@@ -628,7 +628,6 @@
591 toolkit/crashreporter/client/Makefile 597 toolkit/crashreporter/client/Makefile
592 toolkit/crashreporter/google-breakpad/src/client/Makefile 598 toolkit/crashreporter/google-breakpad/src/client/Makefile
593 toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile 599 toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile
@@ -595,15 +601,15 @@ Index: git/toolkit/toolkit-makefiles.sh
595 toolkit/crashreporter/google-breakpad/src/client/windows/handler/Makefile 601 toolkit/crashreporter/google-breakpad/src/client/windows/handler/Makefile
596 toolkit/crashreporter/google-breakpad/src/client/windows/sender/Makefile 602 toolkit/crashreporter/google-breakpad/src/client/windows/sender/Makefile
597 toolkit/crashreporter/google-breakpad/src/common/Makefile 603 toolkit/crashreporter/google-breakpad/src/common/Makefile
598Index: git/js/src/Makefile.in 604Index: offscreen/js/src/Makefile.in
599=================================================================== 605===================================================================
600--- git.orig/js/src/Makefile.in 2009-01-27 16:11:52.000000000 +0000 606--- offscreen.orig/js/src/Makefile.in 2009-04-16 18:07:56.000000000 +0100
601+++ git/js/src/Makefile.in 2009-01-27 16:16:45.000000000 +0000 607+++ offscreen/js/src/Makefile.in 2009-04-16 23:06:42.000000000 +0100
602@@ -513,20 +513,8 @@ 608@@ -507,20 +507,8 @@
603 609
604 export:: jsautocfg.h 610 export:: jsautocfg.h
605 611
606-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) 612-ifeq (,$(CROSS_COMPILE)$(GNU_CC)$(filter-out WINNT,$(OS_ARCH)))
607 jsautocfg.h: 613 jsautocfg.h:
608 touch $@ 614 touch $@
609-else 615-else
@@ -620,7 +626,7 @@ Index: git/js/src/Makefile.in
620 626
621 # jscpucfg is a strange target 627 # jscpucfg is a strange target
622 # Needs to be built with the host compiler but needs to include 628 # Needs to be built with the host compiler but needs to include
623@@ -556,7 +544,7 @@ 629@@ -550,7 +538,7 @@
624 echo no need to build jscpucfg $< 630 echo no need to build jscpucfg $<
625 else 631 else
626 jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in 632 jscpucfg$(HOST_BIN_SUFFIX): jscpucfg.cpp Makefile.in
@@ -629,10 +635,10 @@ Index: git/js/src/Makefile.in
629 endif 635 endif
630 endif 636 endif
631 637
632Index: git/js/src/xpconnect/loader/mozJSComponentLoader.cpp 638Index: offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp
633=================================================================== 639===================================================================
634--- git.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-01-27 16:11:55.000000000 +0000 640--- offscreen.orig/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-04-16 18:08:00.000000000 +0100
635+++ git/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-01-27 16:16:45.000000000 +0000 641+++ offscreen/js/src/xpconnect/loader/mozJSComponentLoader.cpp 2009-04-16 23:06:42.000000000 +0100
636@@ -47,6 +47,8 @@ 642@@ -47,6 +47,8 @@
637 643
638 #include <stdarg.h> 644 #include <stdarg.h>
@@ -642,10 +648,10 @@ Index: git/js/src/xpconnect/loader/mozJSComponentLoader.cpp
642 #include "prlog.h" 648 #include "prlog.h"
643 649
644 #include "nsCOMPtr.h" 650 #include "nsCOMPtr.h"
645Index: git/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 651Index: offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
646=================================================================== 652===================================================================
647--- git.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-01-27 16:11:55.000000000 +0000 653--- offscreen.orig/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-04-16 18:08:00.000000000 +0100
648+++ git/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-01-27 16:16:45.000000000 +0000 654+++ offscreen/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp 2009-04-16 23:06:42.000000000 +0100
649@@ -39,6 +39,8 @@ 655@@ -39,6 +39,8 @@
650 * 656 *
651 * ***** END LICENSE BLOCK ***** */ 657 * ***** END LICENSE BLOCK ***** */
@@ -655,10 +661,10 @@ Index: git/js/src/xpconnect/loader/mozJSSubScriptLoader.cpp
655 #if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER) 661 #if !defined(XPCONNECT_STANDALONE) && !defined(NO_SUBSCRIPT_LOADER)
656 662
657 #include "mozJSSubScriptLoader.h" 663 #include "mozJSSubScriptLoader.h"
658Index: git/modules/lcms/include/icc34.h 664Index: offscreen/modules/lcms/include/icc34.h
659=================================================================== 665===================================================================
660--- git.orig/modules/lcms/include/icc34.h 2009-01-27 16:12:31.000000000 +0000 666--- offscreen.orig/modules/lcms/include/icc34.h 2009-04-16 18:08:47.000000000 +0100
661+++ git/modules/lcms/include/icc34.h 2009-01-27 16:16:45.000000000 +0000 667+++ offscreen/modules/lcms/include/icc34.h 2009-04-16 23:06:42.000000000 +0100
662@@ -144,7 +144,7 @@ 668@@ -144,7 +144,7 @@
663 */ 669 */
664 670
@@ -668,10 +674,10 @@ Index: git/modules/lcms/include/icc34.h
668 /* 674 /*
669 June 9, 2003, Adapted for use with configure by Bob Friesenhahn 675 June 9, 2003, Adapted for use with configure by Bob Friesenhahn
670 Added the stupid check for autoconf by Marti Maria. 676 Added the stupid check for autoconf by Marti Maria.
671Index: git/toolkit/mozapps/update/src/updater/Makefile.in 677Index: offscreen/toolkit/mozapps/update/src/updater/Makefile.in
672=================================================================== 678===================================================================
673--- git.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-01-27 16:13:09.000000000 +0000 679--- offscreen.orig/toolkit/mozapps/update/src/updater/Makefile.in 2009-04-16 18:09:35.000000000 +0100
674+++ git/toolkit/mozapps/update/src/updater/Makefile.in 2009-01-27 16:16:45.000000000 +0000 680+++ offscreen/toolkit/mozapps/update/src/updater/Makefile.in 2009-04-16 23:06:42.000000000 +0100
675@@ -59,7 +59,7 @@ 681@@ -59,7 +59,7 @@
676 682
677 LIBS += \ 683 LIBS += \
@@ -681,10 +687,10 @@ Index: git/toolkit/mozapps/update/src/updater/Makefile.in
681 $(NULL) 687 $(NULL)
682 688
683 ifeq ($(OS_ARCH),WINNT) 689 ifeq ($(OS_ARCH),WINNT)
684Index: git/xpcom/sample/program/Makefile.in 690Index: offscreen/xpcom/sample/program/Makefile.in
685=================================================================== 691===================================================================
686--- git.orig/xpcom/sample/program/Makefile.in 2009-01-27 16:13:18.000000000 +0000 692--- offscreen.orig/xpcom/sample/program/Makefile.in 2009-04-16 18:09:47.000000000 +0100
687+++ git/xpcom/sample/program/Makefile.in 2009-01-27 16:16:45.000000000 +0000 693+++ offscreen/xpcom/sample/program/Makefile.in 2009-04-16 23:06:42.000000000 +0100
688@@ -57,7 +57,7 @@ 694@@ -57,7 +57,7 @@
689 # that the application be linked against the XPCOM dynamic library or the NSPR 695 # that the application be linked against the XPCOM dynamic library or the NSPR
690 # dynamic libraries. 696 # dynamic libraries.
@@ -694,10 +700,10 @@ Index: git/xpcom/sample/program/Makefile.in
694 $(NULL) 700 $(NULL)
695 701
696 # Need to link with CoreFoundation on Mac 702 # Need to link with CoreFoundation on Mac
697Index: git/xpcom/tools/registry/Makefile.in 703Index: offscreen/xpcom/tools/registry/Makefile.in
698=================================================================== 704===================================================================
699--- git.orig/xpcom/tools/registry/Makefile.in 2009-01-27 16:13:18.000000000 +0000 705--- offscreen.orig/xpcom/tools/registry/Makefile.in 2009-04-16 18:09:48.000000000 +0100
700+++ git/xpcom/tools/registry/Makefile.in 2009-01-27 16:16:45.000000000 +0000 706+++ offscreen/xpcom/tools/registry/Makefile.in 2009-04-16 23:06:42.000000000 +0100
701@@ -54,7 +54,7 @@ 707@@ -54,7 +54,7 @@
702 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) 708 SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
703 709
@@ -707,10 +713,10 @@ Index: git/xpcom/tools/registry/Makefile.in
707 $(NULL) 713 $(NULL)
708 714
709 # Need to link with CoreFoundation on Mac 715 # Need to link with CoreFoundation on Mac
710Index: git/xulrunner/app/Makefile.in 716Index: offscreen/xulrunner/app/Makefile.in
711=================================================================== 717===================================================================
712--- git.orig/xulrunner/app/Makefile.in 2009-01-27 16:13:19.000000000 +0000 718--- offscreen.orig/xulrunner/app/Makefile.in 2009-04-16 18:09:50.000000000 +0100
713+++ git/xulrunner/app/Makefile.in 2009-01-27 16:16:45.000000000 +0000 719+++ offscreen/xulrunner/app/Makefile.in 2009-04-16 23:06:42.000000000 +0100
714@@ -180,7 +180,7 @@ 720@@ -180,7 +180,7 @@
715 RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\" 721 RCFLAGS += -DXULRUNNER_ICO=\"$(DIST)/branding/xulrunner.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
716 endif 722 endif
@@ -720,10 +726,10 @@ Index: git/xulrunner/app/Makefile.in
720 726
721 include $(topsrcdir)/config/rules.mk 727 include $(topsrcdir)/config/rules.mk
722 728
723Index: git/xulrunner/stub/Makefile.in 729Index: offscreen/xulrunner/stub/Makefile.in
724=================================================================== 730===================================================================
725--- git.orig/xulrunner/stub/Makefile.in 2009-01-27 16:13:20.000000000 +0000 731--- offscreen.orig/xulrunner/stub/Makefile.in 2009-04-16 18:09:50.000000000 +0100
726+++ git/xulrunner/stub/Makefile.in 2009-01-27 16:16:45.000000000 +0000 732+++ offscreen/xulrunner/stub/Makefile.in 2009-04-16 23:06:42.000000000 +0100
727@@ -101,7 +101,7 @@ 733@@ -101,7 +101,7 @@
728 endif 734 endif
729 endif 735 endif
@@ -733,10 +739,10 @@ Index: git/xulrunner/stub/Makefile.in
733 739
734 include $(topsrcdir)/config/rules.mk 740 include $(topsrcdir)/config/rules.mk
735 741
736Index: git/modules/plugin/test/testplugin/Makefile.in 742Index: offscreen/modules/plugin/test/testplugin/Makefile.in
737=================================================================== 743===================================================================
738--- git.orig/modules/plugin/test/testplugin/Makefile.in 2009-01-27 16:12:37.000000000 +0000 744--- offscreen.orig/modules/plugin/test/testplugin/Makefile.in 2009-04-16 18:08:56.000000000 +0100
739+++ git/modules/plugin/test/testplugin/Makefile.in 2009-01-27 16:16:45.000000000 +0000 745+++ offscreen/modules/plugin/test/testplugin/Makefile.in 2009-04-16 23:06:42.000000000 +0100
740@@ -63,9 +63,7 @@ 746@@ -63,9 +63,7 @@
741 CMMSRCS = nptest_macosx.mm 747 CMMSRCS = nptest_macosx.mm
742 endif 748 endif
@@ -745,12 +751,12 @@ Index: git/modules/plugin/test/testplugin/Makefile.in
745 CPPSRCS += nptest_gtk2.cpp 751 CPPSRCS += nptest_gtk2.cpp
746-endif 752-endif
747 753
748 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) 754 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
749 CPPSRCS += nptest_windows.cpp 755 CPPSRCS += nptest_qt.cpp
750Index: git/xulrunner/installer/libxul-unstable.pc.in 756Index: offscreen/xulrunner/installer/libxul-unstable.pc.in
751=================================================================== 757===================================================================
752--- git.orig/xulrunner/installer/libxul-unstable.pc.in 2009-01-27 18:07:55.000000000 +0000 758--- offscreen.orig/xulrunner/installer/libxul-unstable.pc.in 2009-04-16 18:09:50.000000000 +0100
753+++ git/xulrunner/installer/libxul-unstable.pc.in 2009-01-28 15:19:22.000000000 +0000 759+++ offscreen/xulrunner/installer/libxul-unstable.pc.in 2009-04-16 23:06:42.000000000 +0100
754@@ -8,5 +8,5 @@ 760@@ -8,5 +8,5 @@
755 Description: The Mozilla Runtime and Embedding Engine (unstable API) 761 Description: The Mozilla Runtime and Embedding Engine (unstable API)
756 Version: %MOZILLA_VERSION% 762 Version: %MOZILLA_VERSION%
@@ -758,3 +764,12 @@ Index: git/xulrunner/installer/libxul-unstable.pc.in
758-Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom 764-Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
759+Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom -lsmime3 -lnss3 -lssl3 -lnssutil3 -L${sdkdir}/../xulrunner-1.9.2a1pre 765+Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom -lsmime3 -lnss3 -lssl3 -lnssutil3 -L${sdkdir}/../xulrunner-1.9.2a1pre
760 Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS% 766 Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
767Index: offscreen/js/src/aclocal.m4
768===================================================================
769--- offscreen.orig/js/src/aclocal.m4 2009-04-16 18:07:56.000000000 +0100
770+++ offscreen/js/src/aclocal.m4 2009-04-16 23:06:42.000000000 +0100
771@@ -9,4 +9,3 @@
772 builtin(include, build/autoconf/moznbytetype.m4)dnl
773 builtin(include, build/autoconf/mozprog.m4)dnl
774
775-MOZ_PROG_CHECKMSYS()
diff --git a/meta/packages/mozilla-headless/mozilla-headless_git.bb b/meta/packages/mozilla-headless/mozilla-headless_git.bb
index 9a016ad69b..7e59ed35f7 100644
--- a/meta/packages/mozilla-headless/mozilla-headless_git.bb
+++ b/meta/packages/mozilla-headless/mozilla-headless_git.bb
@@ -1,14 +1,14 @@
1 1
2SRC_URI = "git://git.o-hand.com/${PN}.git;protocol=git \ 2SRC_URI = "hg://hg.mozilla.org/incubator;protocol=http;rev=c6fe23d41598;module=offscreen \
3 file://configurefix.patch;patch=1 \ 3 file://configurefix.patch;patch=1 \
4 file://jsautocfg.h \ 4 file://jsautocfg.h \
5 file://mozconfig" 5 file://mozconfig"
6PV = "0.0+git${SRCREV}" 6PV = "0.0+hg-1.0+c6fe23d41598"
7PR = "r8" 7PR = "r0"
8 8
9S = "${WORKDIR}/git" 9S = "${WORKDIR}/offscreen"
10 10
11DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3" 11DEPENDS = "gconf gnome-vfs pango dbus-glib alsa-lib libidl-native sqlite3 libidl"
12 12
13FILES_${PN} += "${libdir}/xulrunner-1.9.2a1pre" 13FILES_${PN} += "${libdir}/xulrunner-1.9.2a1pre"
14FILES_${PN}-dev += "${libdir}/xulrunner-devel-1.9.2a1pre" 14FILES_${PN}-dev += "${libdir}/xulrunner-devel-1.9.2a1pre"